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 19909e87c6b94714ee2da552f0f16e40f7b7d2f2..b261e37fda06cbceb771f92752d08e58e26b8b69 100644 (file)
--- a/src/gtk/win_gtk.cpp
+++ b/src/gtk/win_gtk.cpp
@@ -8,8 +8,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/defs.h"
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/defs.h"

-#include "wx/gtk/win_gtk.h"
-#include "gtk/gtk.h"
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/win_gtk.h"

 
 /*
 wxPizza is a custom GTK+ widget derived from GtkFixed.  A custom widget
 
 /*
 wxPizza is a custom GTK+ widget derived from GtkFixed.  A custom widget


@@ -19,14 +19,11 @@ 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.
 
 widget->window, to allow GDK to use a more efficient scrolling technique.
 

-For borders, space is reserved in realize and size_allocate.
-For non-scrolling wxWindows, a second GdkWindow is used for the
-border; scrolling wxWindows draw their border on wxPizza's parent
-(a GtkScrolledWindow) GdkWindow.  Border widths for sunken and raised
-styles are taken from widget->style, so they will match the current theme.
+For borders, space is reserved in realize and size_allocate.  The border is
+drawn on wxPizza's parent GdkWindow.

 
 For RTL, child widget positions are mirrored in size_allocate.
 */
 
 For RTL, child widget positions are mirrored in size_allocate.
 */


@@ -50,8 +47,6 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
         widget->allocation.x != alloc->x ||
         widget->allocation.y != alloc->y;
 
         widget->allocation.x != alloc->x ||
         widget->allocation.y != alloc->y;
 

-    widget->allocation = *alloc;
-

     wxPizza* pizza = WX_PIZZA(widget);
     int border_x, border_y;
     pizza->get_border_widths(border_x, border_y);
     wxPizza* pizza = WX_PIZZA(widget);
     int border_x, border_y;
     pizza->get_border_widths(border_x, border_y);


@@ -63,42 +58,33 @@ 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)

         {
         {

-            // backing window is inside border
-            gdk_window_move_resize(pizza->m_backing_window,
+            // two windows, both same size
+            gdk_window_move_resize(widget->window,

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

+            if (is_resize)
+                gdk_window_resize(pizza->m_draw_window, w, h);

         }
         else
         {
         }
         else
         {

-            // border window (or only window if
-            // no-scroll no-border) is full size
-            GdkWindow* window = pizza->m_backing_window;
-            if (window == NULL)
-                window = widget->window;
-            gdk_window_move_resize(
-                window, alloc->x, alloc->y, alloc->width, alloc->height);
-        }
-        if (is_resize && pizza->m_backing_window)
-        {
-            // main window is inside border
-            if (pizza->m_is_scrollable)
-                gdk_window_resize(widget->window, w, h);
-            else
-                // need move as well as resize because border can change
-                gdk_window_move_resize(widget->window, border_x, border_y, w, h);
-
-            // wxWidgets turns off redraw-on-allocate by default,
-            // so border area needs to be invalidated
-            if (border_x > 1 || border_y > 1)
+            // 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))

             {
             {

-                if (pizza->m_is_scrollable)
-                    ; // invalidate does not seem to be needed in this case
-                else
-                    gdk_window_invalidate_rect(pizza->m_backing_window, NULL, 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);

             }
         }
     }
             }
         }
     }

+
+    widget->allocation = *alloc;
+

     // adjust child positions
     for (const GList* list = pizza->m_fixed.children; list; list = list->next)
     {
     // adjust child positions
     for (const GList* list = pizza->m_fixed.children; list; list = list->next)
     {


@@ -116,9 +102,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.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;
                 child_alloc.x = w - child_alloc.x - child_alloc.width;

-            }

             gtk_widget_size_allocate(child->widget, &child_alloc);
         }
     }
             gtk_widget_size_allocate(child->widget, &child_alloc);
         }
     }


@@ -129,79 +113,87 @@ static void realize(GtkWidget* widget)
     parent_class->realize(widget);
 
     wxPizza* pizza = WX_PIZZA(widget);
     parent_class->realize(widget);
 
     wxPizza* pizza = WX_PIZZA(widget);

-    // second window is created if there is a border, or wxWindow is scrollable
+    pizza->m_draw_window = widget->window;

     if (pizza->m_border_style || pizza->m_is_scrollable)
     {
     if (pizza->m_border_style || pizza->m_is_scrollable)
     {

-        GdkWindowAttr attr;
-        attr.event_mask = pizza->m_is_scrollable ? 0 : GDK_EXPOSURE_MASK;
-        attr.x = widget->allocation.x;
-        attr.y = widget->allocation.y;
-        attr.width = widget->allocation.width;
-        attr.height = widget->allocation.height;

         int border_x, border_y;
         pizza->get_border_widths(border_x, border_y);
         int border_x, border_y;
         pizza->get_border_widths(border_x, border_y);

+        int x = widget->allocation.x + border_x;
+        int y = widget->allocation.y + border_y;

         int w = widget->allocation.width  - 2 * border_x;
         int h = widget->allocation.height - 2 * border_y;
         if (w < 0) w = 0;
         if (h < 0) h = 0;
         if (pizza->m_is_scrollable)
         {
         int w = widget->allocation.width  - 2 * border_x;
         int h = widget->allocation.height - 2 * border_y;
         if (w < 0) w = 0;
         if (h < 0) h = 0;
         if (pizza->m_is_scrollable)
         {

-            attr.x += border_x;
-            attr.y += border_y;
+            // 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.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;
+
+            // 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_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.
+            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);
+            }

         }
         }

-        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);
-        if (pizza->m_is_scrollable)
-            gdk_window_reparent(widget->window, pizza->m_backing_window, 0, 0);

         else
         else

-            gdk_window_reparent(widget->window, pizza->m_backing_window, border_x, border_y);
-        gdk_window_resize(widget->window, w, h);
-        
-        widget->style = gtk_style_attach (widget->style, pizza->m_backing_window);
-        gtk_style_set_background (widget->style, pizza->m_backing_window, GTK_STATE_NORMAL);
+            gdk_window_move_resize(widget->window, x, y, w, h);

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

-    parent_class->unrealize(widget);
-

     wxPizza* pizza = WX_PIZZA(widget);
     wxPizza* pizza = WX_PIZZA(widget);

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

     {
     {

-        gdk_window_set_user_data(pizza->m_backing_window, NULL);
-        gdk_window_destroy(pizza->m_backing_window);
-        pizza->m_backing_window = NULL;
+        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)
 {
     parent_class->map(widget);
 
 }
 
 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);
+    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)
 {

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

 
 

-    wxPizza* pizza = WX_PIZZA(widget);
-    if (pizza->m_backing_window)
-        gdk_window_hide(pizza->m_backing_window);
+    parent_class->unmap(widget);

 }
 
 // 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


@@ -298,7 +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_backing_window = NULL;
+    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;


@@ -321,7 +313,6 @@ GtkWidget* wxPizza::New(long windowStyle)
         GDK_ENTER_NOTIFY_MASK |
         GDK_LEAVE_NOTIFY_MASK |
         GDK_FOCUS_CHANGE_MASK);
         GDK_ENTER_NOTIFY_MASK |
         GDK_LEAVE_NOTIFY_MASK |
         GDK_FOCUS_CHANGE_MASK);

-    gtk_container_set_resize_mode(GTK_CONTAINER(widget), GTK_RESIZE_QUEUE);

     return widget;
 }
 
     return widget;
 }
 


@@ -342,6 +333,38 @@ 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;
+};
+
+// Adjust allocations for all widgets using the GdkWindow which was just scrolled
+extern "C" {
+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
+        // the frame newly exposed by the scroll are not drawn.
+        // To be safe, do it for all widgets.
+        gtk_widget_queue_resize_no_redraw(widget);
+        if (GTK_IS_CONTAINER(widget))
+            gtk_container_forall(GTK_CONTAINER(widget), scroll_adjust, data);
+    }
+}
+}
+

 void wxPizza::scroll(int dx, int dy)
 {
     GtkWidget* widget = GTK_WIDGET(this);
 void wxPizza::scroll(int dx, int dy)
 {
     GtkWidget* widget = GTK_WIDGET(this);


@@ -349,31 +372,44 @@ 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)
-        gdk_window_scroll(widget->window, dx, dy);
-    const GList* list = m_fixed.children;
-    if (list)
+    if (m_draw_window)

     {
     {

-        const GtkFixedChild* child = static_cast<GtkFixedChild*>(list->data);
-        // queueing a resize on any child will update them all
-        gtk_widget_queue_resize(child->widget);
+        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.
+        AdjustData data = { m_draw_window, dx, dy };
+        gtk_container_forall(GTK_CONTAINER(widget), scroll_adjust, &data);

     }
 }
 
     }
 }
 

-extern GtkWidget *GetEntryWidget();
-

 void wxPizza::get_border_widths(int& x, int& y)
 {
     x = y = 0;
 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;
     if (m_border_style & wxBORDER_SIMPLE)
         x = y = 1;

-    else if (m_border_style)
+    else if (m_is_scrollable /* || (m_border_style & wxBORDER_THEME) */)

     {
     {

-        GtkWidget *entry_widget = GetEntryWidget();
-        if (entry_widget->style)
+        GtkWidget *style_widget = wxGTKPrivate::GetTreeWidget();
+
+        if (style_widget->style)
+        {
+            x = style_widget->style->xthickness;
+            y = style_widget->style->ythickness;
+        }
+    }
+    else
+    {
+        GtkWidget *style_widget = wxGTKPrivate::GetEntryWidget();
+
+        if (style_widget->style)

         {
         {

-            x = entry_widget->style->xthickness;
-            y = entry_widget->style->ythickness;
+            x = style_widget->style->xthickness;
+            y = style_widget->style->ythickness;

         }
     }
         }
     }

+#endif

 }
 }