Mercurial > dwindows
comparison gtk/dw.c @ 273:95bfcd2deb94
Slight change to get it to work on GTK 2.x, although there is a momentary
display of the window at the incorrect size which I don't like. This
may require more fine tuning.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Wed, 05 Mar 2003 21:13:24 +0000 |
parents | 49ac97060328 |
children | df0665ba147f |
comparison
equal
deleted
inserted
replaced
272:49ac97060328 | 273:95bfcd2deb94 |
---|---|
1195 int width = (int)gtk_object_get_data(GTK_OBJECT(handle), "_dw_width"); | 1195 int width = (int)gtk_object_get_data(GTK_OBJECT(handle), "_dw_width"); |
1196 int height = (int)gtk_object_get_data(GTK_OBJECT(handle), "_dw_height"); | 1196 int height = (int)gtk_object_get_data(GTK_OBJECT(handle), "_dw_height"); |
1197 | 1197 |
1198 if(width && height) | 1198 if(width && height) |
1199 { | 1199 { |
1200 gdk_window_resize(GTK_WIDGET(handle)->window, width, height); | 1200 gtk_widget_set_usize(handle, width, height); |
1201 gtk_object_set_data(GTK_OBJECT(handle), "_dw_width", 0); | 1201 gtk_object_set_data(GTK_OBJECT(handle), "_dw_width", 0); |
1202 gtk_object_set_data(GTK_OBJECT(handle), "_dw_height", 0); | 1202 gtk_object_set_data(GTK_OBJECT(handle), "_dw_height", 0); |
1203 } | 1203 } |
1204 | 1204 |
1205 gdk_window_raise(GTK_WIDGET(handle)->window); | 1205 gdk_window_raise(GTK_WIDGET(handle)->window); |
1206 gdk_flush(); | 1206 gdk_flush(); |
1207 gdk_window_show(GTK_WIDGET(handle)->window); | 1207 gdk_window_show(GTK_WIDGET(handle)->window); |
1208 gdk_flush(); | 1208 gdk_flush(); |
1209 } | 1209 } |
1210 defaultitem = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "defaultitem"); | 1210 defaultitem = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(handle), "_dw_defaultitem"); |
1211 if(defaultitem) | 1211 if(defaultitem) |
1212 gtk_widget_grab_focus(defaultitem); | 1212 gtk_widget_grab_focus(defaultitem); |
1213 DW_MUTEX_UNLOCK; | 1213 DW_MUTEX_UNLOCK; |
1214 return 0; | 1214 return 0; |
1215 } | 1215 } |
7048 | 7048 |
7049 if(!window) | 7049 if(!window) |
7050 return; | 7050 return; |
7051 | 7051 |
7052 DW_MUTEX_LOCK; | 7052 DW_MUTEX_LOCK; |
7053 gtk_object_set_data(GTK_OBJECT(window), "defaultitem", (gpointer)defaultitem); | 7053 gtk_object_set_data(GTK_OBJECT(window), "_dw_defaultitem", (gpointer)defaultitem); |
7054 DW_MUTEX_UNLOCK; | 7054 DW_MUTEX_UNLOCK; |
7055 } | 7055 } |
7056 | 7056 |
7057 /* | 7057 /* |
7058 * Sets window to click the default dialog item when an ENTER is pressed. | 7058 * Sets window to click the default dialog item when an ENTER is pressed. |