build fix

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index ef016719cd71181ea620f7e9f34dc747aed7c073..cf37ab6b711115727566dbfe2dd1dfe1dc5fa7ab 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -296,7 +296,7 @@ gtk_frame_configure_callback( GtkWidget* widget,
 // "realize" from m_widget
 //-----------------------------------------------------------------------------
 
 // "realize" from m_widget
 //-----------------------------------------------------------------------------
 

-// we cannot MWM hints and icons before the widget has been realized,
+// we cannot the WM hints and icons before the widget has been realized,

 // so we do this directly after realization
 
 extern "C" {
 // so we do this directly after realization
 
 extern "C" {


@@ -304,26 +304,23 @@ static void
 gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget),
                              wxTopLevelWindowGTK *win )
 {
 gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget),
                              wxTopLevelWindowGTK *win )
 {

-    // All this is for Motif Window Manager "hints" and is supposed to be
-    // recognized by other WM as well. Not tested.

     gdk_window_set_decorations(win->m_widget->window,
                                (GdkWMDecoration)win->m_gdkDecor);
     gdk_window_set_functions(win->m_widget->window,
                                (GdkWMFunction)win->m_gdkFunc);
 
     // GTK's shrinking/growing policy
     gdk_window_set_decorations(win->m_widget->window,
                                (GdkWMDecoration)win->m_gdkDecor);
     gdk_window_set_functions(win->m_widget->window,
                                (GdkWMFunction)win->m_gdkFunc);
 
     // GTK's shrinking/growing policy

-    if ((win->m_gdkFunc & GDK_FUNC_RESIZE) == 0)
+    if ( !(win->m_gdkFunc & GDK_FUNC_RESIZE) )

         gtk_window_set_resizable(GTK_WINDOW(win->m_widget), FALSE);
     else
         gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
 
         gtk_window_set_resizable(GTK_WINDOW(win->m_widget), FALSE);
     else
         gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
 

-    // reset the icon
-    wxIconBundle iconsOld = win->GetIcons();
-    if ( !iconsOld.IsEmpty() )
-    {
-        win->SetIcon( wxNullIcon );
-        win->SetIcons( iconsOld );
-    }
+    const wxIconBundle& icons = win->GetIcons();
+    if (icons.GetIconCount())
+        win->SetIcons(icons);
+
+    if (win->HasFlag(wxFRAME_SHAPED))
+        win->SetShape(win->m_shape); // it will really set the window shape now

 }
 }
 
 }
 }
 


@@ -338,9 +335,7 @@ gtk_frame_map_callback( GtkWidget*,
                         wxTopLevelWindow *win )
 {
     const bool wasIconized = win->IsIconized();
                         wxTopLevelWindow *win )
 {
     const bool wasIconized = win->IsIconized();

-

     win->SetIconizeState(false);
     win->SetIconizeState(false);

-

     if (wasIconized)
     {
         // Because GetClientSize() returns (0,0) when IsIconized() is true,
     if (wasIconized)
     {
         // Because GetClientSize() returns (0,0) when IsIconized() is true,


@@ -352,7 +347,13 @@ gtk_frame_map_callback( GtkWidget*,
         win->m_oldClientWidth = 0;
         gtk_widget_queue_resize(win->m_wxwindow);
     }
         win->m_oldClientWidth = 0;
         gtk_widget_queue_resize(win->m_wxwindow);
     }

-
+    // it is possible for m_isShown to be false here, see bug #9909
+    if (win->wxWindowBase::Show(true))
+    {
+        wxShowEvent eventShow(win->GetId(), true);
+        eventShow.SetEventObject(win);
+        win->GetEventHandler()->ProcessEvent(eventShow);
+    }

     return false;
 }
 }
     return false;
 }
 }


@@ -372,6 +373,37 @@ gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget),
 }
 }
 
 }
 }
 

+//-----------------------------------------------------------------------------
+
+bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom)
+{
+    static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
+    Atom xproperty = gdk_x11_atom_to_xatom_for_display(
+                        gdk_drawable_get_display(window), property);
+    Atom type;
+    int format;
+    gulong nitems, bytes_after;
+    guchar* data;
+    Status status = XGetWindowProperty(
+        gdk_x11_drawable_get_xdisplay(window),
+        gdk_x11_drawable_get_xid(window),
+        xproperty,
+        0, 4, false, XA_CARDINAL,
+        &type, &format, &nitems, &bytes_after, &data);
+    const bool success = status == Success && data && nitems == 4;
+    if (success)
+    {
+        long* p = (long*)data;
+        if (left)   *left   = int(p[0]);
+        if (right)  *right  = int(p[1]);
+        if (top)    *top    = int(p[2]);
+        if (bottom) *bottom = int(p[3]);
+    }
+    if (data)
+        XFree(data);
+    return success;
+}
+

 //-----------------------------------------------------------------------------
 // "property_notify_event" from m_widget
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "property_notify_event" from m_widget
 //-----------------------------------------------------------------------------


@@ -384,36 +416,18 @@ static gboolean property_notify_event(
     static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
     if (event->state == GDK_PROPERTY_NEW_VALUE && event->atom == property)
     {
     static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
     if (event->state == GDK_PROPERTY_NEW_VALUE && event->atom == property)
     {

-        Atom xproperty = gdk_x11_atom_to_xatom_for_display(
-                            gdk_drawable_get_display(event->window), property);
-        Atom type;
-        int format;
-        gulong nitems, bytes_after;
-        guchar* data;
-        Status status = XGetWindowProperty(
-            gdk_x11_drawable_get_xdisplay(event->window),
-            gdk_x11_drawable_get_xid(event->window),
-            xproperty,
-            0, 4, false, XA_CARDINAL,
-            &type, &format, &nitems, &bytes_after, &data);
-        if (status == Success && data && nitems == 4)
+        int left, right, top, bottom;
+        if (wxGetFrameExtents(event->window, &left, &right, &top, &bottom))

         {
         {

-            long* p = (long*)data;

             const wxSize decorSize =
             const wxSize decorSize =

-                wxSize(int(p[0] + p[1]), int(p[2] + p[3]));
+                wxSize(left + right, top + bottom);

             win->GTKUpdateDecorSize(decorSize);
         }
             win->GTKUpdateDecorSize(decorSize);
         }

-        if (data)
-            XFree(data);

     }
     return false;
 }
 }
 
     }
     return false;
 }
 }
 

-BEGIN_EVENT_TABLE(wxTopLevelWindowGTK, wxTopLevelWindowBase)
-    EVT_SYS_COLOUR_CHANGED(wxTopLevelWindowGTK::OnSysColourChanged)
-END_EVENT_TABLE()
-

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowGTK creation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowGTK creation
 // ----------------------------------------------------------------------------


@@ -424,9 +438,11 @@ void wxTopLevelWindowGTK::Init()
     m_isIconized = false;
     m_fsIsShowing = false;
     m_themeEnabled = true;
     m_isIconized = false;
     m_fsIsShowing = false;
     m_themeEnabled = true;

-    m_gdkDecor = m_gdkFunc = 0;
+    m_gdkDecor =
+    m_gdkFunc = 0;

     m_grabbed = false;
     m_deferShow = true;
     m_grabbed = false;
     m_deferShow = true;

+    m_updateDecorSize = true;

 
     m_urgency_hint = -2;
 }
 
     m_urgency_hint = -2;
 }


@@ -495,6 +511,8 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
             }
         }
 #endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
             }
         }
 #endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON

+
+        g_object_ref(m_widget);

     }
 
     wxWindow *topParent = wxGetTopLevelParent(m_parent);
     }
 
     wxWindow *topParent = wxGetTopLevelParent(m_parent);


@@ -579,49 +597,53 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     g_signal_connect(m_widget, "property_notify_event",
         G_CALLBACK(property_notify_event), this);
 
     g_signal_connect(m_widget, "property_notify_event",
         G_CALLBACK(property_notify_event), this);
 

-    // decorations
-    if ((style & wxSIMPLE_BORDER) || (style & wxNO_BORDER))
+    // translate wx decorations styles into Motif WM hints (they are recognized
+    // by other WMs as well)
+
+    // always enable moving the window as we have no separate flag for enabling
+    // it
+    m_gdkFunc = GDK_FUNC_MOVE;
+
+    if ( style & wxCLOSE_BOX )
+        m_gdkFunc |= GDK_FUNC_CLOSE;
+
+    if ( style & wxMINIMIZE_BOX )
+        m_gdkFunc |= GDK_FUNC_MINIMIZE;
+
+    if ( style & wxMAXIMIZE_BOX )
+        m_gdkFunc |= GDK_FUNC_MAXIMIZE;
+
+    if ( (style & wxSIMPLE_BORDER) || (style & wxNO_BORDER) )

     {
         m_gdkDecor = 0;
     {
         m_gdkDecor = 0;

-        m_gdkFunc = 0;

     }
     }

-    else
+    else // have border

     {
         m_gdkDecor = GDK_DECOR_BORDER;
     {
         m_gdkDecor = GDK_DECOR_BORDER;

-        m_gdkFunc = GDK_FUNC_MOVE;

 
 

-        // All this is for Motif Window Manager "hints" and is supposed to be
-        // recognized by other WMs as well.
-        if ((style & wxCAPTION) != 0)
-        {
+        if ( style & wxCAPTION )

             m_gdkDecor |= GDK_DECOR_TITLE;
             m_gdkDecor |= GDK_DECOR_TITLE;

-        }
-        if ((style & wxCLOSE_BOX) != 0)
-        {
-            m_gdkFunc |= GDK_FUNC_CLOSE;
-        }
-        if ((style & wxSYSTEM_MENU) != 0)
-        {
+
+        if ( style & wxSYSTEM_MENU )

             m_gdkDecor |= GDK_DECOR_MENU;
             m_gdkDecor |= GDK_DECOR_MENU;

-        }
-        if ((style & wxMINIMIZE_BOX) != 0)
-        {
-            m_gdkFunc |= GDK_FUNC_MINIMIZE;
+
+        if ( style & wxMINIMIZE_BOX )

             m_gdkDecor |= GDK_DECOR_MINIMIZE;
             m_gdkDecor |= GDK_DECOR_MINIMIZE;

-        }
-        if ((style & wxMAXIMIZE_BOX) != 0)
-        {
-            m_gdkFunc |= GDK_FUNC_MAXIMIZE;
+
+        if ( style & wxMAXIMIZE_BOX )

             m_gdkDecor |= GDK_DECOR_MAXIMIZE;
             m_gdkDecor |= GDK_DECOR_MAXIMIZE;

-        }
-        if ((style & wxRESIZE_BORDER) != 0)
+
+        if ( style & wxRESIZE_BORDER )

         {
            m_gdkFunc |= GDK_FUNC_RESIZE;
            m_gdkDecor |= GDK_DECOR_RESIZEH;
         }
     }
 
         {
            m_gdkFunc |= GDK_FUNC_RESIZE;
            m_gdkDecor |= GDK_DECOR_RESIZEH;
         }
     }
 

-    gtk_window_set_default_size(GTK_WINDOW(m_widget), m_width, m_height);
+    m_decorSize = GetCachedDecorSize();
+    int w, h;
+    GTKDoGetSize(&w, &h);
+    gtk_window_set_default_size(GTK_WINDOW(m_widget), w, h);

 
     return true;
 }
 
     return true;
 }


@@ -758,13 +780,32 @@ bool wxTopLevelWindowGTK::Show( bool show )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 

-    const bool wasRealized = GTK_WIDGET_REALIZED(m_widget);
-    bool deferShow =
-        show && m_deferShow && !wasRealized &&
-        g_signal_handler_find(m_widget,
-            GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
-            g_signal_lookup("property_notify_event", GTK_TYPE_WIDGET),
-            0, NULL, NULL, this);
+    bool deferShow = show && !m_isShown && m_deferShow;
+    if (deferShow)
+    {
+        deferShow = false;
+        if (!GTK_WIDGET_REALIZED(m_widget) &&
+            g_signal_handler_find(m_widget,
+                GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
+                g_signal_lookup("property_notify_event", GTK_TYPE_WIDGET),
+                0, NULL, NULL, this))
+        {
+            if (gdk_x11_screen_supports_net_wm_hint(
+                gtk_widget_get_screen(m_widget),
+                gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false)))
+            {
+                deferShow = true;
+            }
+            else
+            {
+                // Don't allow changes to m_decorSize, it breaks saving/restoring
+                // window size with GetSize()/SetSize() because it makes window
+                // bigger between each restore and save.
+                m_updateDecorSize = false;
+            }
+        }
+        m_deferShow = deferShow;
+    }

     if (deferShow)
     {
         // Initial show. If WM supports _NET_REQUEST_FRAME_EXTENTS, defer
     if (deferShow)
     {
         // Initial show. If WM supports _NET_REQUEST_FRAME_EXTENTS, defer


@@ -774,30 +815,17 @@ bool wxTopLevelWindowGTK::Show( bool show )
         // what wxWidgets expects it to be without an obvious change in the
         // window size immediately after it becomes visible.
 
         // what wxWidgets expects it to be without an obvious change in the
         // window size immediately after it becomes visible.
 

-        // Realize m_widget, so m_widget->window can be used. Realizing causes
-        // the widget tree to be size_allocated, which generates size events in
-        // the wrong order. So temporarily remove child from m_widget while
-        // realizing.
-        GtkWidget* child = GTK_BIN(m_widget)->child;
-        if (child)
-        {
-            g_object_ref(child);
-            gtk_container_remove(GTK_CONTAINER(m_widget), child);
-        }
+        // Realize m_widget, so m_widget->window can be used. Realizing normally
+        // causes the widget tree to be size_allocated, which generates size
+        // events in the wrong order. However, the size_allocates will not be
+        // done if the allocation is not the default (1,1).
+        const int alloc_width = m_widget->allocation.width;
+        if (alloc_width == 1)
+            m_widget->allocation.width = 2;

         gtk_widget_realize(m_widget);
         gtk_widget_realize(m_widget);

-        if (child)
-        {
-            gtk_container_add(GTK_CONTAINER(m_widget), child);
-            g_object_unref(child);
-        }
+        if (alloc_width == 1)
+            m_widget->allocation.width = 1;

 
 

-        m_deferShow =
-        deferShow = gdk_x11_screen_supports_net_wm_hint(
-            gdk_drawable_get_screen(m_widget->window),
-            gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false)) != 0;
-    }
-    if (deferShow)
-    {

         // send _NET_REQUEST_FRAME_EXTENTS
         XClientMessageEvent xevent;
         memset(&xevent, 0, sizeof(xevent));
         // send _NET_REQUEST_FRAME_EXTENTS
         XClientMessageEvent xevent;
         memset(&xevent, 0, sizeof(xevent));


@@ -817,7 +845,7 @@ bool wxTopLevelWindowGTK::Show( bool show )
         return true;
     }
 
         return true;
     }
 

-    if (show && !wasRealized)
+    if (show && !GTK_WIDGET_REALIZED(m_widget))

     {
         // size_allocate signals occur in reverse order (bottom to top).
         // Things work better if the initial wxSizeEvents are sent (from the
     {
         // size_allocate signals occur in reverse order (bottom to top).
         // Things work better if the initial wxSizeEvents are sent (from the


@@ -979,7 +1007,9 @@ void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
 
 void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)
 {
 
 void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)
 {

-    if (m_decorSize != decorSize)
+    if (!IsMaximized() && !IsFullScreen())
+        GetCachedDecorSize() = decorSize;
+    if (m_updateDecorSize && m_decorSize != decorSize)

     {
         const wxSize diff = decorSize - m_decorSize;
         m_decorSize = decorSize;
     {
         const wxSize diff = decorSize - m_decorSize;
         m_decorSize = decorSize;


@@ -1004,11 +1034,8 @@ void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)
             m_height += diff.y;
             if (m_width  < 0) m_width  = 0;
             if (m_height < 0) m_height = 0;
             m_height += diff.y;
             if (m_width  < 0) m_width  = 0;
             if (m_height < 0) m_height = 0;

-            if (!m_deferShow)
-            {
-                m_oldClientWidth = 0;
-                gtk_widget_queue_resize(m_wxwindow);
-            }
+            m_oldClientWidth = 0;
+            gtk_widget_queue_resize(m_wxwindow);

         }
     }
     if (m_deferShow)
         }
     }
     if (m_deferShow)


@@ -1028,6 +1055,23 @@ void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)
     }
 }
 
     }
 }
 

+wxSize& wxTopLevelWindowGTK::GetCachedDecorSize()
+{
+    static wxSize size[8];
+
+    int index = 0;
+    // title bar
+    if (m_gdkDecor & (GDK_DECOR_MENU | GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE | GDK_DECOR_TITLE))
+        index = 1;
+    // border
+    if (m_gdkDecor & GDK_DECOR_BORDER)
+        index |= 2;
+    // utility window decor can be different
+    if (m_windowStyle & wxFRAME_TOOL_WINDOW)
+        index |= 4;
+    return size[index];
+}
+

 void wxTopLevelWindowGTK::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 void wxTopLevelWindowGTK::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();


@@ -1069,16 +1113,17 @@ void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
 
     wxTopLevelWindowBase::SetIcons( icons );
 
 
     wxTopLevelWindowBase::SetIcons( icons );
 

-    GList *list = NULL;
-
-    const size_t numIcons = icons.GetIconCount();
-    for ( size_t i = 0; i < numIcons; i++ )
+    // Setting icons before window is realized can cause a GTK assertion if
+    // another TLW is realized before this one, and it has this one as it's
+    // transient parent. The life demo exibits this problem.
+    if (GTK_WIDGET_REALIZED(m_widget))

     {
     {

-        list = g_list_prepend(list, icons.GetIconByIndex(i).GetPixbuf());
+        GList* list = NULL;
+        for (size_t i = icons.GetIconCount(); i--;)
+            list = g_list_prepend(list, icons.GetIconByIndex(i).GetPixbuf());
+        gtk_window_set_icon_list(GTK_WINDOW(m_widget), list);
+        g_list_free(list);

     }
     }

-
-    gtk_window_set_icon_list(GTK_WINDOW(m_widget), list);
-    g_list_free(list);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1174,13 +1219,22 @@ bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
 
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
 

-    GdkWindow *window = NULL;
-    if (m_wxwindow)
+    if ( GTK_WIDGET_REALIZED(m_widget) )

     {
     {

-        do_shape_combine_region(m_wxwindow->window, region);
+        if ( m_wxwindow )
+            do_shape_combine_region(m_wxwindow->window, region);
+
+        return do_shape_combine_region(m_widget->window, region);
+    }
+    else // not realized yet
+    {
+        // store the shape to set, it will be really set once we're realized
+        m_shape = region;
+
+        // we don't know if we're going to succeed or fail, be optimistic by
+        // default
+        return true;

     }
     }

-    window = m_widget->window;
-    return do_shape_combine_region(window, region);

 }
 
 bool wxTopLevelWindowGTK::IsActive()
 }
 
 bool wxTopLevelWindowGTK::IsActive()


@@ -1322,16 +1376,3 @@ bool wxTopLevelWindowGTK::CanSetTransparent()
                            "Composite", &opcode, &event, &error);
 #endif
 }
                            "Composite", &opcode, &event, &error);
 #endif
 }

-
-void wxTopLevelWindowGTK::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-    // We don't know the order in which top-level windows will
-    // be notified, so we need to clear the system objects
-    // for each top-level window.
-    extern void wxClearGtkSystemObjects();
-    wxClearGtkSystemObjects();
-
-    // wxWindowBase::OnSysColourChanged will propagate event
-    // to children
-    event.Skip();
-}