Check for menu title being non-empty when appending it to the menu bar.

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

diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp
index b3aeed5a4a0242ebc0a5ea92c81d3b621e8cfddc..b261e37fda06cbceb771f92752d08e58e26b8b69 100644 (file)
--- a/src/gtk/win_gtk.cpp
+++ b/src/gtk/win_gtk.cpp
@@ -19,7 +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
 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
+position in size_allocate.  A second same-size GdkWindow is placed in front of

 widget->window, to allow GDK to use a more efficient scrolling technique.
 
 For borders, space is reserved in realize and size_allocate.  The border is
 widget->window, to allow GDK to use a more efficient scrolling technique.
 
 For borders, space is reserved in realize and size_allocate.  The border is


@@ -30,14 +30,6 @@ For RTL, child widget positions are mirrored in size_allocate.
 
 static GtkWidgetClass* parent_class;
 
 
 static GtkWidgetClass* parent_class;
 

-static inline GdkWindow* get_backing_window(GtkWidget* widget)
-{
-    GdkWindow* w = NULL;
-    if (widget->window && WX_PIZZA(widget)->m_is_scrollable)
-        w = gdk_window_get_parent(widget->window);
-    return w;
-}
-

 extern "C" {
 
 struct wxPizzaClass
 extern "C" {
 
 struct wxPizzaClass


@@ -66,14 +58,13 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
         int h = alloc->height - 2 * border_y;
         if (h < 0) h = 0;
 
         int h = alloc->height - 2 * border_y;
         if (h < 0) h = 0;
 

-        if (pizza->m_is_scrollable)
+        if (pizza->m_draw_window != widget->window)

         {
             // two windows, both same size
         {
             // two windows, both same size

-            GdkWindow* backing_window = gdk_window_get_parent(widget->window);
-            gdk_window_move_resize(backing_window,
+            gdk_window_move_resize(widget->window,

                 alloc->x + border_x, alloc->y + border_y, w, h);
             if (is_resize)
                 alloc->x + border_x, alloc->y + border_y, w, h);
             if (is_resize)

-                gdk_window_resize(widget->window, w, h);
+                gdk_window_resize(pizza->m_draw_window, w, h);

         }
         else
         {
         }
         else
         {


@@ -85,12 +76,9 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
             {
                 // old and new border areas need to be invalidated,
                 // otherwise they will not be erased/redrawn properly
             {
                 // 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);
+                GdkWindow* parent = gtk_widget_get_parent_window(widget);
+                gdk_window_invalidate_rect(parent, &widget->allocation, false);
+                gdk_window_invalidate_rect(parent, alloc, false);

             }
         }
     }
             }
         }
     }


@@ -125,6 +113,7 @@ static void realize(GtkWidget* widget)
     parent_class->realize(widget);
 
     wxPizza* pizza = WX_PIZZA(widget);
     parent_class->realize(widget);
 
     wxPizza* pizza = WX_PIZZA(widget);

+    pizza->m_draw_window = widget->window;

     if (pizza->m_border_style || pizza->m_is_scrollable)
     {
         int border_x, border_y;
     if (pizza->m_border_style || pizza->m_is_scrollable)
     {
         int border_x, border_y;


@@ -149,19 +138,27 @@ static void realize(GtkWidget* widget)
             attr.colormap = gtk_widget_get_colormap(widget);
             attr.window_type = GDK_WINDOW_CHILD;
 
             attr.colormap = gtk_widget_get_colormap(widget);
             attr.window_type = GDK_WINDOW_CHILD;
 

-            GdkWindow* backing_window = gdk_window_new(
+            // existing widget->window becomes m_draw_window,
+            // new widget->window created as parent of m_draw_window
+            widget->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_get_parent(widget->window),
                 &attr,
                 GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP);
 

-            gdk_window_set_user_data(backing_window, widget);
-            gdk_window_reparent(widget->window, backing_window, 0, 0);
-            gdk_window_resize(widget->window, w, h);
+            gdk_window_set_user_data(widget->window, widget);
+            gdk_window_reparent(pizza->m_draw_window, widget->window, 0, 0);
+            gdk_window_resize(pizza->m_draw_window, w, h);

 
             // Parts of backing window may be exposed temporarily while
             // resizing. Setting the backing pixmap to None prevents those
             // areas from being briefly painted black.
 
             // Parts of 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(backing_window, NULL, false);
+            gdk_window_set_back_pixmap(widget->window, NULL, false);
+
+            for (const GList* list = pizza->m_fixed.children; list; list = list->next)
+            {
+                const GtkFixedChild* child = static_cast<GtkFixedChild*>(list->data);
+                gtk_widget_set_parent_window(child->widget, pizza->m_draw_window);
+            }

         }
         else
             gdk_window_move_resize(widget->window, x, y, w, h);
         }
         else
             gdk_window_move_resize(widget->window, x, y, w, h);


@@ -170,34 +167,33 @@ static void realize(GtkWidget* widget)
 
 static void unrealize(GtkWidget* widget)
 {
 
 static void unrealize(GtkWidget* widget)
 {

-    GdkWindow* backing_window = get_backing_window(widget);
-
-    parent_class->unrealize(widget);
-
-    if (backing_window)
+    wxPizza* pizza = WX_PIZZA(widget);
+    if (pizza->m_draw_window != widget->window)

     {
     {

-        gdk_window_set_user_data(backing_window, NULL);
-        gdk_window_destroy(backing_window);
+        gdk_window_set_user_data(pizza->m_draw_window, NULL);
+        gdk_window_destroy(pizza->m_draw_window);

     }
     }

+    pizza->m_draw_window = NULL;
+
+    parent_class->unrealize(widget);

 }
 
 static void map(GtkWidget* widget)
 {
 }
 
 static void map(GtkWidget* widget)
 {

-    GdkWindow* backing_window = get_backing_window(widget);
-    if (backing_window)
-        gdk_window_show(backing_window);
-

     parent_class->map(widget);
     parent_class->map(widget);

+
+    GdkWindow* window = WX_PIZZA(widget)->m_draw_window;
+    if (window != widget->window)
+        gdk_window_show(window);

 }
 
 static void unmap(GtkWidget* widget)
 {
 }
 
 static void unmap(GtkWidget* widget)
 {

-    GdkWindow* backing_window = get_backing_window(widget);
+    GdkWindow* window = WX_PIZZA(widget)->m_draw_window;
+    if (window != widget->window)
+        gdk_window_hide(window);

 
     parent_class->unmap(widget);
 
     parent_class->unmap(widget);

-
-    if (backing_window)
-        gdk_window_hide(backing_window);

 }
 
 // not used, but needs to exist so gtk_widget_set_scroll_adjustments will work
 }
 
 // not used, but needs to exist so gtk_widget_set_scroll_adjustments will work


@@ -294,6 +290,7 @@ GtkWidget* wxPizza::New(long windowStyle)
 {
     GtkWidget* widget = GTK_WIDGET(g_object_new(type(), NULL));
     wxPizza* pizza = WX_PIZZA(widget);
 {
     GtkWidget* widget = GTK_WIDGET(g_object_new(type(), NULL));
     wxPizza* pizza = WX_PIZZA(widget);

+    pizza->m_draw_window = NULL;

     pizza->m_scroll_x = 0;
     pizza->m_scroll_y = 0;
     pizza->m_is_scrollable = (windowStyle & (wxHSCROLL | wxVSCROLL)) != 0;
     pizza->m_scroll_x = 0;
     pizza->m_scroll_y = 0;
     pizza->m_is_scrollable = (windowStyle & (wxHSCROLL | wxVSCROLL)) != 0;


@@ -336,6 +333,13 @@ 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);
+    if (m_draw_window != GTK_WIDGET(this)->window)
+        gtk_widget_set_parent_window(widget, m_draw_window);
+}
+

 struct AdjustData {
     GdkWindow* window;
     int dx, dy;
 struct AdjustData {
     GdkWindow* window;
     int dx, dy;


@@ -368,12 +372,12 @@ void wxPizza::scroll(int dx, int dy)
         dx = -dx;
     m_scroll_x -= dx;
     m_scroll_y -= dy;
         dx = -dx;
     m_scroll_x -= dx;
     m_scroll_y -= dy;

-    if (widget->window)
+    if (m_draw_window)

     {
     {

-        gdk_window_scroll(widget->window, dx, dy);
+        gdk_window_scroll(m_draw_window, dx, dy);

         // Adjust child allocations. Doing a queue_resize on the children is not
         // enough, sometimes they redraw in the wrong place during fast scrolling.
         // Adjust child allocations. Doing a queue_resize on the children is not
         // enough, sometimes they redraw in the wrong place during fast scrolling.

-        AdjustData data = { widget->window, dx, dy };
+        AdjustData data = { m_draw_window, dx, dy };

         gtk_container_forall(GTK_CONTAINER(widget), scroll_adjust, &data);
     }
 }
         gtk_container_forall(GTK_CONTAINER(widget), scroll_adjust, &data);
     }
 }