X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7b63a01e9bf64f1d9ff3f39d01bb7800032c44b..e669ddde233a87d1e80ce2b102d0a18ce9daedfe:/src/gtk/win_gtk.cpp?ds=inline

diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp
index acace1f565..bf4bd7fc2d 100644
--- a/src/gtk/win_gtk.cpp
+++ b/src/gtk/win_gtk.cpp
@@ -19,8 +19,7 @@ borders, and RTL.
 For scrolling, the "set_scroll_adjustments" signal is implemented
 to make wxPizza appear scrollable to GTK+, allowing it to be put in a
 GtkScrolledWindow.  Child widget positions are adjusted for the scrolling
-position in size_allocate.  A second same-size GdkWindow is placed behind
-widget->window, to allow GDK to use a more efficient scrolling technique.
+position in size_allocate.
 
 For borders, space is reserved in realize and size_allocate.  The border is
 drawn on wxPizza's parent GdkWindow.
@@ -53,36 +52,21 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
     int w = alloc->width - 2 * border_x;
     if (w < 0) w = 0;
 
-    if (GTK_WIDGET_REALIZED(widget) && (is_move || is_resize))
+    if (gtk_widget_get_realized(widget) && (is_move || is_resize))
     {
         int h = alloc->height - 2 * border_y;
         if (h < 0) h = 0;
 
-        if (pizza->m_is_scrollable)
-        {
-            // two windows, both same size
-            gdk_window_move_resize(pizza->m_backing_window,
-                alloc->x + border_x, alloc->y + border_y, w, h);
-            if (is_resize)
-                gdk_window_resize(widget->window, w, h);
-        }
-        else
+        gdk_window_move_resize(widget->window,
+            alloc->x + border_x, alloc->y + border_y, w, h);
+
+        if (is_resize && (border_x || border_y))
         {
-            // one window
-            gdk_window_move_resize(widget->window,
-                alloc->x + border_x, alloc->y + border_y, w, h);
-
-            if (is_resize && (border_x || border_y))
-            {
-                // old and new border areas need to be invalidated,
-                // otherwise they will not be erased/redrawn properly
-                const GtkAllocation& a1 = widget->allocation;
-                const GtkAllocation& a2 = *alloc;
-                GdkRectangle r1 = { a1.x, a1.y, a1.width, a1.height };
-                GdkRectangle r2 = { a2.x, a2.y, a2.width, a2.height };
-                gdk_window_invalidate_rect(widget->parent->window, &r1, false);
-                gdk_window_invalidate_rect(widget->parent->window, &r2, false);
-            }
+            // 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);
         }
     }
 
@@ -92,7 +76,7 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
     for (const GList* list = pizza->m_fixed.children; list; list = list->next)
     {
         const GtkFixedChild* child = static_cast<GtkFixedChild*>(list->data);
-        if (GTK_WIDGET_VISIBLE(child->widget))
+        if (gtk_widget_get_visible(child->widget))
         {
             GtkAllocation child_alloc;
             // note that child positions do not take border into
@@ -105,9 +89,7 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
             child_alloc.width  = req.width;
             child_alloc.height = req.height;
             if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL)
-            {
                 child_alloc.x = w - child_alloc.x - child_alloc.width;
-            }
             gtk_widget_size_allocate(child->widget, &child_alloc);
         }
     }
@@ -118,7 +100,7 @@ static void realize(GtkWidget* widget)
     parent_class->realize(widget);
 
     wxPizza* pizza = WX_PIZZA(widget);
-    if (pizza->m_border_style || pizza->m_is_scrollable)
+    if (pizza->m_border_style)
     {
         int border_x, border_y;
         pizza->get_border_widths(border_x, border_y);
@@ -128,68 +110,32 @@ static void realize(GtkWidget* widget)
         int h = widget->allocation.height - 2 * border_y;
         if (w < 0) w = 0;
         if (h < 0) h = 0;
-        if (pizza->m_is_scrollable)
-        {
-            // second window is created if wxWindow is scrollable
-            GdkWindowAttr attr;
-            attr.event_mask = 0;
-            attr.x = x;
-            attr.y = y;
-            attr.width  = w;
-            attr.height = h;
-            attr.wclass = GDK_INPUT_OUTPUT;
-            attr.visual = gtk_widget_get_visual(widget);
-            attr.colormap = gtk_widget_get_colormap(widget);
-            attr.window_type = GDK_WINDOW_CHILD;
-
-            pizza->m_backing_window = gdk_window_new(
-                gdk_window_get_parent(widget->window),
-                &attr,
-                GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP);
-
-            gdk_window_set_user_data(pizza->m_backing_window, widget);
-            gdk_window_reparent(widget->window, pizza->m_backing_window, 0, 0);
-            gdk_window_resize(widget->window, w, h);
-
-            // Parts of m_backing_window may be exposed temporarily while
-            // resizing. Setting the backing pixmap to None prevents those
-            // areas from being briefly painted black.
-            gdk_window_set_back_pixmap(pizza->m_backing_window, NULL, false);
-        }
-        else
-            gdk_window_move_resize(widget->window, x, y, w, h);
+        gdk_window_move_resize(widget->window, x, y, w, h);
     }
 }
 
-static void unrealize(GtkWidget* widget)
+static void show(GtkWidget* widget)
 {
-    parent_class->unrealize(widget);
-
-    wxPizza* pizza = WX_PIZZA(widget);
-    if (pizza->m_backing_window)
+    if (widget->parent && WX_PIZZA(widget)->m_border_style)
     {
-        gdk_window_set_user_data(pizza->m_backing_window, NULL);
-        gdk_window_destroy(pizza->m_backing_window);
-        pizza->m_backing_window = NULL;
+        // invalidate whole allocation so borders will be drawn properly
+        const GtkAllocation& a = widget->allocation;
+        gtk_widget_queue_draw_area(widget->parent, a.x, a.y, a.width, a.height);
     }
-}
 
-static void map(GtkWidget* widget)
-{
-    parent_class->map(widget);
-
-    wxPizza* pizza = WX_PIZZA(widget);
-    if (pizza->m_backing_window)
-        gdk_window_show(pizza->m_backing_window);
+    parent_class->show(widget);
 }
 
-static void unmap(GtkWidget* widget)
+static void hide(GtkWidget* widget)
 {
-    parent_class->unmap(widget);
+    if (widget->parent && WX_PIZZA(widget)->m_border_style)
+    {
+        // invalidate whole allocation so borders will be erased properly
+        const GtkAllocation& a = widget->allocation;
+        gtk_widget_queue_draw_area(widget->parent, a.x, a.y, a.width, a.height);
+    }
 
-    wxPizza* pizza = WX_PIZZA(widget);
-    if (pizza->m_backing_window)
-        gdk_window_hide(pizza->m_backing_window);
+    parent_class->hide(widget);
 }
 
 // not used, but needs to exist so gtk_widget_set_scroll_adjustments will work
@@ -241,9 +187,8 @@ static void class_init(void* g_class, void*)
     GtkWidgetClass* widget_class = (GtkWidgetClass*)g_class;
     widget_class->size_allocate = size_allocate;
     widget_class->realize = realize;
-    widget_class->unrealize = unrealize;
-    widget_class->map = map;
-    widget_class->unmap = unmap;
+    widget_class->show = show;
+    widget_class->hide = hide;
     wxPizzaClass* klass = (wxPizzaClass*)g_class;
 
     // needed to make widget appear scrollable to GTK+
@@ -286,13 +231,16 @@ GtkWidget* wxPizza::New(long windowStyle)
 {
     GtkWidget* widget = GTK_WIDGET(g_object_new(type(), NULL));
     wxPizza* pizza = WX_PIZZA(widget);
-    pizza->m_backing_window = NULL;
     pizza->m_scroll_x = 0;
     pizza->m_scroll_y = 0;
     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(3,0,0) || defined(GTK_DISABLE_DEPRECATED)
+    gtk_widget_set_has_window(widget, true);
+#else
     gtk_fixed_set_has_window(GTK_FIXED(widget), true);
+#endif
     gtk_widget_add_events(widget,
         GDK_EXPOSURE_MASK |
         GDK_SCROLL_MASK |
@@ -329,6 +277,11 @@ void wxPizza::move(GtkWidget* widget, int x, int y)
     }
 }
 
+void wxPizza::put(GtkWidget* widget, int x, int y)
+{
+    gtk_fixed_put(&m_fixed, widget, x, y);
+}
+
 struct AdjustData {
     GdkWindow* window;
     int dx, dy;
@@ -341,7 +294,7 @@ static void scroll_adjust(GtkWidget* widget, void* data)
     const AdjustData* p = static_cast<AdjustData*>(data);
     widget->allocation.x += p->dx;
     widget->allocation.y += p->dy;
-    
+
     if (widget->window == p->window)
     {
         // GtkFrame requires a queue_resize, otherwise parts of
@@ -376,24 +329,24 @@ void wxPizza::get_border_widths(int& x, int& y)
     x = y = 0;
     if (m_border_style == 0)
         return;
-        
+
 #ifndef __WXUNIVERSAL__
     if (m_border_style & wxBORDER_SIMPLE)
         x = y = 1;
-    else if (m_is_scrollable || (m_border_style & wxBORDER_THEME))
+    else if (m_is_scrollable /* || (m_border_style & wxBORDER_THEME) */)
     {
         GtkWidget *style_widget = wxGTKPrivate::GetTreeWidget();
-            
+
         if (style_widget->style)
         {
             x = style_widget->style->xthickness;
             y = style_widget->style->ythickness;
         }
     }
-    else 
+    else
     {
         GtkWidget *style_widget = wxGTKPrivate::GetEntryWidget();
-            
+
         if (style_widget->style)
         {
             x = style_widget->style->xthickness;