No real changes, just fix misspellings in comments in wxGTK code.

[wxWidgets.git] / src / gtk / win_gtk.cpp

diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp
index 2d599c12b727749c8daee5151063dbdbac7de50b..256e94f60ca32fff7c8369b9c0488462643cd9f1 100644 (file)
--- a/src/gtk/win_gtk.cpp
+++ b/src/gtk/win_gtk.cpp
@@ -39,34 +39,36 @@ struct wxPizzaClass
 
 static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
 {
 
 static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
 {

-    const bool is_resize =
-        widget->allocation.width  != alloc->width ||
-        widget->allocation.height != alloc->height;
-    const bool is_move =
-        widget->allocation.x != alloc->x ||
-        widget->allocation.y != alloc->y;
-

     wxPizza* pizza = WX_PIZZA(widget);
     int border_x, border_y;
     pizza->get_border_widths(border_x, border_y);
     int w = alloc->width - 2 * border_x;
     if (w < 0) w = 0;
 
     wxPizza* pizza = WX_PIZZA(widget);
     int border_x, border_y;
     pizza->get_border_widths(border_x, border_y);
     int w = alloc->width - 2 * border_x;
     if (w < 0) w = 0;
 

-    if (gtk_widget_get_realized(widget) && (is_move || is_resize))
+    if (gtk_widget_get_realized(widget))

     {
         int h = alloc->height - 2 * border_y;
         if (h < 0) h = 0;
     {
         int h = alloc->height - 2 * border_y;
         if (h < 0) h = 0;

+        const int x = alloc->x + border_x;
+        const int y = alloc->y + border_y;

 
 

-        gdk_window_move_resize(widget->window,
-            alloc->x + border_x, alloc->y + border_y, w, h);
+        GdkWindow* window = gtk_widget_get_window(widget);
+        int old_x, old_y;
+        gdk_window_get_position(window, &old_x, &old_y);

 
 

-        if (is_resize && (border_x || border_y))
+        if (x != old_x || y != old_y ||
+            w != gdk_window_get_width(window) || h != gdk_window_get_height(window))

         {
         {

-            // old and new border areas need to be invalidated,
-            // otherwise they will not be erased/redrawn properly
-            GdkWindow* parent = gtk_widget_get_parent_window(widget);
-            gdk_window_invalidate_rect(parent, &widget->allocation, false);
-            gdk_window_invalidate_rect(parent, alloc, false);
+            gdk_window_move_resize(window, x, y, w, h);
+
+            if (border_x + border_y)
+            {
+                // old and new border areas need to be invalidated,
+                // otherwise they will not be erased/redrawn properly
+                GdkWindow* parent = gtk_widget_get_parent_window(widget);
+                gdk_window_invalidate_rect(parent, &widget->allocation, false);
+                gdk_window_invalidate_rect(parent, alloc, false);
+            }

         }
     }
 
         }
     }
 


@@ -236,7 +238,7 @@ GtkWidget* wxPizza::New(long windowStyle)
     pizza->m_is_scrollable = (windowStyle & (wxHSCROLL | wxVSCROLL)) != 0;
     // mask off border styles not useable with wxPizza
     pizza->m_border_style = int(windowStyle & BORDER_STYLES);
     pizza->m_is_scrollable = (windowStyle & (wxHSCROLL | wxVSCROLL)) != 0;
     // mask off border styles not useable with wxPizza
     pizza->m_border_style = int(windowStyle & BORDER_STYLES);

-#if GTK_CHECK_VERSION(2,20,0)
+#if GTK_CHECK_VERSION(3,0,0) || defined(GTK_DISABLE_DEPRECATED)

     gtk_widget_set_has_window(widget, true);
 #else
     gtk_fixed_set_has_window(GTK_FIXED(widget), true);
     gtk_widget_set_has_window(widget, true);
 #else
     gtk_fixed_set_has_window(GTK_FIXED(widget), true);