diff gtk3/dw.c @ 1470:a317c2ec1d4c

On GTK2 gtk_window_move() needs to be called after mapping the window... but before calling gdk_window_get_frame_extents() so do it in another step. Also a couple minor code fixes on GTK2 and GTK3.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 20 Dec 2011 14:30:10 +0000
parents b9efb744cfbd
children 26dbd11399d6
line wrap: on
line diff
--- a/gtk3/dw.c	Tue Dec 20 12:44:41 2011 +0000
+++ b/gtk3/dw.c	Tue Dec 20 14:30:10 2011 +0000
@@ -8759,7 +8759,7 @@
                gdk_window_get_frame_extents(window, &frame);
                width = frame.width;
                height = frame.height;
-            }            
+            }
          }
          else
          {
@@ -8784,7 +8784,7 @@
             /* Check to see if there is a pending size request too */
             width = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_width"));
             height = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_height"));
-            if(width | height)
+            if(!width || !height)
             {
                /* Ask what GTK is planning on suggesting for the window size */
                gtk_window_get_size(GTK_WINDOW(handle), !width ? &width : NULL, !height ? &height : NULL);