Mercurial > dwindows

changeset 493:84e471a4ec7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't warn in dw_box_pack_*() for groupboxes.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Mon, 24 Nov 2003 18:53:07 +0000
parents 9354c460d76b
children edcf9ec12f8c
files gtk/dw.c
diffstat 1 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/dw.c	Fri Nov 21 21:45:40 2003 +0000
+++ b/gtk/dw.c	Mon Nov 24 18:53:07 2003 +0000
@@ -6390,7 +6390,7 @@
 void dw_box_pack_end(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
 {
 	int warn = FALSE, _locked_by_me = FALSE;
-	GtkWidget *tmp;
+	GtkWidget *tmp, *tmpitem;
 
 	if(!box)
 		return;
@@ -6416,6 +6416,8 @@
 		gtk_widget_show(item);
 	}
 
+	tmpitem = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_boxhandle");
+
 	if(GTK_IS_TABLE(box))
 	{
 		int boxcount = (int)gtk_object_get_data(GTK_OBJECT(box), "_dw_boxcount");
@@ -6426,7 +6428,7 @@
 		 * due to a bug in the OS/2 and Win32 renderer and a limitation
 		 * of the GtkTable class.
 		 */
-		if(GTK_IS_TABLE(item))
+		if(GTK_IS_TABLE(item) || (tmpitem && GTK_IS_TABLE(tmpitem)))
 		{
 			GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox");
 
@@ -6469,7 +6471,7 @@
 	{
 		GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
 
-		if(GTK_IS_TABLE(item))
+		if(GTK_IS_TABLE(item) || (tmpitem && GTK_IS_TABLE(tmpitem)))
 		{
 			GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox");
 
@@ -7581,7 +7583,7 @@
 void dw_box_pack_start(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
 {
 	int warn = FALSE, _locked_by_me = FALSE;
-	GtkWidget *tmp;
+	GtkWidget *tmp, *tmpitem;
 
 	if(!box)
 		return;
@@ -7607,6 +7609,8 @@
 		gtk_widget_show(item);
 	}
 
+	tmpitem = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_boxhandle");
+
 	if(GTK_IS_TABLE(box))
 	{
 		int boxcount = (int)gtk_object_get_data(GTK_OBJECT(box), "_dw_boxcount");
@@ -7618,7 +7622,7 @@
 		 * due to a bug in the OS/2 and Win32 renderer and a limitation
 		 * of the GtkTable class.
 		 */
-		if(GTK_IS_TABLE(item))
+		if(GTK_IS_TABLE(item) || (tmpitem && GTK_IS_TABLE(tmpitem)))
 		{
 			GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox");
 
@@ -7669,7 +7673,7 @@
 	{
 		GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
 
-		if(GTK_IS_TABLE(item))
+		if(GTK_IS_TABLE(item) || (tmpitem && GTK_IS_TABLE(tmpitem)))
 		{
 			GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox");
 
@@ -7889,7 +7893,7 @@
 		{
 			temp = malloc(strlen(text) + strlen(folder) + 3);
 			strcpy(temp, text);
-            if(strcmp(text, "/"))
+			if(strcmp(text, "/"))
 				strcat(temp, "/");
 			strcat(temp, folder);
 			free(folder);