comparison gtk/dw.c @ 550:ebb26cb6bfb2

Fixes to the box packing padding code on Unix. An old workaround was improperly resetting the padding variable when it shouldn't.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 11 Apr 2004 03:14:21 +0000
parents a284fde5d471
children f4093dce8155
comparison
equal deleted inserted replaced
549:b744c2b86df8 550:ebb26cb6bfb2
7486 { 7486 {
7487 GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox"); 7487 GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox");
7488 7488
7489 if(eventbox) 7489 if(eventbox)
7490 { 7490 {
7491 int boxpad = (int)gtk_object_get_data(GTK_OBJECT(item), "_dw_boxpad");
7491 gtk_container_add(GTK_CONTAINER(eventbox), item); 7492 gtk_container_add(GTK_CONTAINER(eventbox), item);
7492 pad = (int)gtk_object_get_data(GTK_OBJECT(item), "_dw_boxpad"); 7493 gtk_container_border_width(GTK_CONTAINER(eventbox), boxpad);
7493 item = eventbox; 7494 item = eventbox;
7494 } 7495 }
7495 } 7496 }
7496 else 7497 else
7497 { 7498 {
7529 { 7530 {
7530 GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox"); 7531 GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox");
7531 7532
7532 if(eventbox) 7533 if(eventbox)
7533 { 7534 {
7535 int boxpad = (int)gtk_object_get_data(GTK_OBJECT(item), "_dw_boxpad");
7534 gtk_container_add(GTK_CONTAINER(eventbox), item); 7536 gtk_container_add(GTK_CONTAINER(eventbox), item);
7535 pad = (int)gtk_object_get_data(GTK_OBJECT(item), "_dw_boxpad"); 7537 gtk_container_border_width(GTK_CONTAINER(eventbox), boxpad);
7536 item = eventbox; 7538 item = eventbox;
7537 } 7539 }
7538 } 7540 }
7539 else 7541 else
7540 { 7542 {
8720 { 8722 {
8721 GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox"); 8723 GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox");
8722 8724
8723 if(eventbox) 8725 if(eventbox)
8724 { 8726 {
8727 int boxpad = (int)gtk_object_get_data(GTK_OBJECT(item), "_dw_boxpad");
8725 gtk_container_add(GTK_CONTAINER(eventbox), item); 8728 gtk_container_add(GTK_CONTAINER(eventbox), item);
8726 pad = (int)gtk_object_get_data(GTK_OBJECT(item), "_dw_boxpad"); 8729 gtk_container_border_width(GTK_CONTAINER(eventbox), boxpad);
8727 item = eventbox; 8730 item = eventbox;
8728 } 8731 }
8729 } 8732 }
8730 else 8733 else
8731 { 8734 {
8771 { 8774 {
8772 GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox"); 8775 GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox");
8773 8776
8774 if(eventbox) 8777 if(eventbox)
8775 { 8778 {
8779 int boxpad = (int)gtk_object_get_data(GTK_OBJECT(item), "_dw_boxpad");
8776 gtk_container_add(GTK_CONTAINER(eventbox), item); 8780 gtk_container_add(GTK_CONTAINER(eventbox), item);
8777 pad = (int)gtk_object_get_data(GTK_OBJECT(item), "_dw_boxpad"); 8781 gtk_container_border_width(GTK_CONTAINER(eventbox), boxpad);
8778 item = eventbox; 8782 item = eventbox;
8779 } 8783 }
8780 } 8784 }
8781 else 8785 else
8782 { 8786 {