Add support for auto-orientable toolbars to AUI.

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 43690457a1dfac65dca928d3939e7797bc2ea8b5..5a77576b0a5e502426e33a55a69e94bb6b4ce52e 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -38,24 +38,33 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 

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

 
 #include "wx/unix/utilsx11.h"
 
 // XA_CARDINAL
 #include <X11/Xatom.h>
 
 
 #include "wx/unix/utilsx11.h"
 
 // XA_CARDINAL
 #include <X11/Xatom.h>
 

+#if wxUSE_LIBHILDON
+    #include <hildon-widgets/hildon-program.h>
+    #include <hildon-widgets/hildon-window.h>
+#endif // wxUSE_LIBHILDON
+
+#if wxUSE_LIBHILDON2
+    #include <hildon/hildon.h>
+#endif // wxUSE_LIBHILDON2
+

 // ----------------------------------------------------------------------------
 // data
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // data
 // ----------------------------------------------------------------------------
 

-extern int              g_openDialogs;
-extern wxWindowGTK     *g_delayedFocus;
+// this is incremented while a modal dialog is shown
+int wxOpenModalDialogsCount = 0;

 
 // the frame that is currently active (i.e. its child has focus). It is
 // used to generate wxActivateEvents
 
 // the frame that is currently active (i.e. its child has focus). It is
 // used to generate wxActivateEvents

-static wxTopLevelWindowGTK *g_activeFrame = (wxTopLevelWindowGTK*) NULL;
-static wxTopLevelWindowGTK *g_lastActiveFrame = (wxTopLevelWindowGTK*) NULL;
+static wxTopLevelWindowGTK *g_activeFrame = NULL;
+static wxTopLevelWindowGTK *g_lastActiveFrame = NULL;

 
 // if we detect that the app has got/lost the focus, we set this variable to
 // either TRUE or FALSE and an activate event will be sent during the next
 
 // if we detect that the app has got/lost the focus, we set this variable to
 // either TRUE or FALSE and an activate event will be sent during the next


@@ -156,7 +165,7 @@ static gboolean gtk_frame_focus_in_callback( GtkWidget *widget,
     wxLogTrace(wxT("activate"), wxT("Activating frame %p (from focus_in)"), g_activeFrame);
     wxActivateEvent event(wxEVT_ACTIVATE, true, g_activeFrame->GetId());
     event.SetEventObject(g_activeFrame);
     wxLogTrace(wxT("activate"), wxT("Activating frame %p (from focus_in)"), g_activeFrame);
     wxActivateEvent event(wxEVT_ACTIVATE, true, g_activeFrame->GetId());
     event.SetEventObject(g_activeFrame);

-    g_activeFrame->GetEventHandler()->ProcessEvent(event);
+    g_activeFrame->HandleWindowEvent(event);

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -167,9 +176,10 @@ static gboolean gtk_frame_focus_in_callback( GtkWidget *widget,
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static gboolean gtk_frame_focus_out_callback( GtkWidget *widget,
-                                          GdkEventFocus *WXUNUSED(gdk_event),
-                                          wxTopLevelWindowGTK *win )
+static
+gboolean gtk_frame_focus_out_callback(GtkWidget * WXUNUSED(widget),
+                                      GdkEventFocus *WXUNUSED(gdk_event),
+                                      wxTopLevelWindowGTK * WXUNUSED(win))

 {
     // if the focus goes out of our app alltogether, OnIdle() will send
     // wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset
 {
     // if the focus goes out of our app alltogether, OnIdle() will send
     // wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset


@@ -185,7 +195,7 @@ static gboolean gtk_frame_focus_out_callback( GtkWidget *widget,
         wxLogTrace(wxT("activate"), wxT("Activating frame %p (from focus_in)"), g_activeFrame);
         wxActivateEvent event(wxEVT_ACTIVATE, false, g_activeFrame->GetId());
         event.SetEventObject(g_activeFrame);
         wxLogTrace(wxT("activate"), wxT("Activating frame %p (from focus_in)"), g_activeFrame);
         wxActivateEvent event(wxEVT_ACTIVATE, false, g_activeFrame->GetId());
         event.SetEventObject(g_activeFrame);

-        g_activeFrame->GetEventHandler()->ProcessEvent(event);
+        g_activeFrame->HandleWindowEvent(event);

 
         g_activeFrame = NULL;
     }
 
         g_activeFrame = NULL;
     }


@@ -195,32 +205,32 @@ static gboolean gtk_frame_focus_out_callback( GtkWidget *widget,
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// "size_allocate"
+// "size_allocate" from m_wxwindow

 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxTopLevelWindowGTK *win )
+static void
+size_allocate(GtkWidget*, GtkAllocation* alloc, wxTopLevelWindowGTK* win)

 {
 {

-    if (!win->m_hasVMT)
-        return;
-
-    if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+    if (win->m_oldClientWidth  != alloc->width ||
+        win->m_oldClientHeight != alloc->height)

     {
     {

-/*
-        wxPrintf( wxT("gtk_frame_size_callback from ") );
-        if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-           wxPrintf( win->GetClassInfo()->GetClassName() );
-        wxPrintf( wxT(" %d %d %d %d\n"), (int)alloc->x,
-                                (int)alloc->y,
-                                (int)alloc->width,
-                                (int)alloc->height );
-*/
-
-        // Tell the wxWindow class about the new size
-        win->m_width = alloc->width;
-        win->m_height = alloc->height;
-
-        win->GtkUpdateSize();
+        win->m_oldClientWidth  = alloc->width;
+        win->m_oldClientHeight = alloc->height;
+
+        wxSize size(win->m_widget->allocation.width,
+                    win->m_widget->allocation.height);
+        size += win->m_decorSize;
+        win->m_width  = size.x;
+        win->m_height = size.y;
+
+        if (!win->IsIconized())
+        {
+            wxSizeEvent event(size, win->GetId());
+            event.SetEventObject(win);
+            win->HandleWindowEvent(event);
+        }
+        // else the window is currently unmapped, don't generate size events

     }
 }
 }
     }
 }
 }


@@ -230,19 +240,17 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 // ----------------------------------------------------------------------------
 
 extern "C" {
 // ----------------------------------------------------------------------------
 
 extern "C" {

+static

 void wxgtk_tlw_size_request_callback(GtkWidget * WXUNUSED(widget),
                                      GtkRequisition *requisition,
                                      wxTopLevelWindowGTK *win)
 {
     // we must return the size of the window without WM decorations, otherwise
     // GTK+ gets confused, so don't call just GetSize() here
 void wxgtk_tlw_size_request_callback(GtkWidget * WXUNUSED(widget),
                                      GtkRequisition *requisition,
                                      wxTopLevelWindowGTK *win)
 {
     // we must return the size of the window without WM decorations, otherwise
     // GTK+ gets confused, so don't call just GetSize() here

-    int w, h;
-    win->GTKDoGetSize(&w, &h);
-
-    requisition->height = h;
-    requisition->width = w;
+    win->GTKDoGetSize(&requisition->width, &requisition->height);

 }
 }
 }
 }

+

 //-----------------------------------------------------------------------------
 // "delete_event"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "delete_event"
 //-----------------------------------------------------------------------------


@@ -254,7 +262,7 @@ gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget),
                            wxTopLevelWindowGTK *win )
 {
     if (win->IsEnabled() &&
                            wxTopLevelWindowGTK *win )
 {
     if (win->IsEnabled() &&

-        (g_openDialogs == 0 || (win->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) ||
+        (wxOpenModalDialogsCount == 0 || (win->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) ||

          win->IsGrabbed()))
         win->Close();
 
          win->IsGrabbed()))
         win->Close();
 


@@ -262,7 +270,6 @@ gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget),
 }
 }
 
 }
 }
 

-

 //-----------------------------------------------------------------------------
 // "configure_event"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "configure_event"
 //-----------------------------------------------------------------------------


@@ -283,7 +290,7 @@ gtk_frame_configure_callback( GtkWidget* widget,
     win->m_y = point.y;
     wxMoveEvent mevent(point, win->GetId());
     mevent.SetEventObject( win );
     win->m_y = point.y;
     wxMoveEvent mevent(point, win->GetId());
     mevent.SetEventObject( win );

-    win->GetEventHandler()->ProcessEvent( mevent );
+    win->HandleWindowEvent( mevent );

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -293,7 +300,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" {


@@ -301,26 +308,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

 }
 }
 
 }
 }
 


@@ -330,11 +334,39 @@ gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget),
 
 extern "C" {
 static gboolean
 
 extern "C" {
 static gboolean

-gtk_frame_map_callback( GtkWidget * WXUNUSED(widget),
+gtk_frame_map_callback( GtkWidget*,

                         GdkEvent * WXUNUSED(event),
                         wxTopLevelWindow *win )
 {
                         GdkEvent * WXUNUSED(event),
                         wxTopLevelWindow *win )
 {

+    const bool wasIconized = win->IsIconized();

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

+    if (wasIconized)
+    {
+        // Because GetClientSize() returns (0,0) when IsIconized() is true,
+        // a size event must be generated, just in case GetClientSize() was
+        // called while iconized. This specifically happens when restoring a
+        // tlw that was "rolled up" with some WMs.
+        // Queue a resize rather than sending size event directly to allow
+        // children to be made visible first.
+        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);
+    }
+
+#if GTK_CHECK_VERSION(2,6,0)
+    if (!gtk_check_version(2,6,0))
+    {
+        // restore focus-on-map setting in case ShowWithoutActivating() was called
+        gtk_window_set_focus_on_map(GTK_WINDOW(win->m_widget), true);
+    }
+#endif // GTK+ 2.6+
+

     return false;
 }
 }
     return false;
 }
 }


@@ -349,73 +381,65 @@ gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget),
                           GdkEvent * WXUNUSED(event),
                           wxTopLevelWindow *win )
 {
                           GdkEvent * WXUNUSED(event),
                           wxTopLevelWindow *win )
 {

-    win->SetIconizeState(true);
+    // hiding the window doesn't count as minimizing it
+    if (win->IsShown())
+        win->SetIconizeState(true);

     return false;
 }
 }
 
     return false;
 }
 }
 

-//-----------------------------------------------------------------------------
-// "expose_event" of m_client

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-extern "C" {
-static gboolean
-gtk_window_expose_callback( GtkWidget *widget,
-                            GdkEventExpose *gdk_event,
-                            wxWindow *win )
+bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom)

 {
 {

-    GtkPizza *pizza = GTK_PIZZA(widget);
-
-    gtk_paint_flat_box (win->m_widget->style,
-                        pizza->bin_window, GTK_STATE_NORMAL,
-                        GTK_SHADOW_NONE,
-                        &gdk_event->area,
-                        win->m_widget,
-                        (char *)"base",
-                        0, 0, -1, -1);
-
-    return FALSE;
-}
+    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;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxTopLevelWindowGTK itself
-// ----------------------------------------------------------------------------
-

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// InsertChild for wxTopLevelWindowGTK
+// "property_notify_event" from m_widget

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-/* Callback for wxTopLevelWindowGTK. This very strange beast has to be used because
- * C++ has no virtual methods in a constructor. We have to emulate a
- * virtual function here as wxWidgets requires different ways to insert
- * a child in container classes. */
-
-static void wxInsertChildInTopLevelWindow( wxTopLevelWindowGTK* parent, wxWindow* child )
+extern "C" {
+static gboolean property_notify_event(
+    GtkWidget*, GdkEventProperty* event, wxTopLevelWindowGTK* win)

 {
 {

-    wxASSERT( GTK_IS_WIDGET(child->m_widget) );
-
-    if (!parent->m_insertInClientArea)
+    // Watch for changes to _NET_FRAME_EXTENTS property
+    static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
+    if (event->state == GDK_PROPERTY_NEW_VALUE && event->atom == property)

     {
     {

-        // these are outside the client area
-        wxTopLevelWindowGTK* frame = (wxTopLevelWindowGTK*) parent;
-        gtk_pizza_put( GTK_PIZZA(frame->m_mainWidget),
-                         child->m_widget,
-                         child->m_x,
-                         child->m_y,
-                         child->m_width,
-                         child->m_height );
-    }
-    else
-    {
-        // these are inside the client area
-        gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
-                         child->m_widget,
-                         child->m_x,
-                         child->m_y,
-                         child->m_width,
-                         child->m_height );
+        wxSize decorSize = win->m_decorSize;
+        int left, right, top, bottom;
+        if (wxGetFrameExtents(event->window, &left, &right, &top, &bottom))
+            decorSize.Set(left + right, top + bottom);
+
+        win->GTKUpdateDecorSize(decorSize);

     }
     }

+    return false;
+}

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


@@ -424,17 +448,16 @@ static void wxInsertChildInTopLevelWindow( wxTopLevelWindowGTK* parent, wxWindow
 
 void wxTopLevelWindowGTK::Init()
 {
 
 void wxTopLevelWindowGTK::Init()
 {

-    m_sizeSet = false;
-    m_miniEdge = 0;
-    m_miniTitle = 0;
-    m_mainWidget = (GtkWidget*) NULL;
-    m_insertInClientArea = true;
+    m_mainWidget = NULL;

     m_isIconized = false;
     m_fsIsShowing = false;
     m_isIconized = false;
     m_fsIsShowing = false;

-    m_fsSaveFlag = 0;

     m_themeEnabled = true;
     m_themeEnabled = true;

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

     m_grabbed = false;
     m_grabbed = false;

+    m_deferShow = true;
+    m_deferShowAllowed = true;
+    m_updateDecorSize = true;

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


@@ -464,15 +487,21 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
 
     m_title = title;
 
 
     m_title = title;
 

-    m_insertCallback = (wxInsertChildFunction) wxInsertChildInTopLevelWindow;
-

     // NB: m_widget may be !=NULL if it was created by derived class' Create,
     //     e.g. in wxTaskBarIconAreaGTK
     if (m_widget == NULL)
     {
     // NB: m_widget may be !=NULL if it was created by derived class' Create,
     //     e.g. in wxTaskBarIconAreaGTK
     if (m_widget == NULL)
     {

+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+        // we must create HildonWindow and not a normal GtkWindow as the latter
+        // doesn't look correctly in Maemo environment and it must also be
+        // registered with the main program object
+        m_widget = hildon_window_new();
+        hildon_program_add_window(wxTheApp->GetHildonProgram(),
+                                  HILDON_WINDOW(m_widget));
+#else // !wxUSE_LIBHILDON || !wxUSE_LIBHILDON2
+        m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);

         if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
         {
         if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
         {

-            m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);

             // Tell WM that this is a dialog window and make it center
             // on parent by default (this is what GtkDialog ctor does):
             gtk_window_set_type_hint(GTK_WINDOW(m_widget),
             // Tell WM that this is a dialog window and make it center
             // on parent by default (this is what GtkDialog ctor does):
             gtk_window_set_type_hint(GTK_WINDOW(m_widget),


@@ -482,26 +511,23 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
         }
         else
         {
         }
         else
         {

-            m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-#if GTK_CHECK_VERSION(2,1,0)
-            if (!gtk_check_version(2,1,0))
+            if (style & wxFRAME_TOOL_WINDOW)

             {
             {

-                if (style & wxFRAME_TOOL_WINDOW)
-                {
-                    gtk_window_set_type_hint(GTK_WINDOW(m_widget),
-                                             GDK_WINDOW_TYPE_HINT_UTILITY);
-
-                    // On some WMs, like KDE, a TOOL_WINDOW will still show
-                    // on the taskbar, but on Gnome a TOOL_WINDOW will not.
-                    // For consistency between WMs and with Windows, we
-                    // should set the NO_TASKBAR flag which will apply
-                    // the set_skip_taskbar_hint if it is available,
-                    // ensuring no taskbar entry will appear.
-                    style |= wxFRAME_NO_TASKBAR;
-                }
+                gtk_window_set_type_hint(GTK_WINDOW(m_widget),
+                                         GDK_WINDOW_TYPE_HINT_UTILITY);
+
+                // On some WMs, like KDE, a TOOL_WINDOW will still show
+                // on the taskbar, but on Gnome a TOOL_WINDOW will not.
+                // For consistency between WMs and with Windows, we
+                // should set the NO_TASKBAR flag which will apply
+                // the set_skip_taskbar_hint if it is available,
+                // ensuring no taskbar entry will appear.
+                style |= wxFRAME_NO_TASKBAR;

             }
             }

-#endif

         }
         }

+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON || !wxUSE_LIBHILDON2
+
+        g_object_ref(m_widget);

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


@@ -513,25 +539,17 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
                                       GTK_WINDOW(topParent->m_widget) );
     }
 
                                       GTK_WINDOW(topParent->m_widget) );
     }
 

-#if GTK_CHECK_VERSION(2,2,0)
-    if (!gtk_check_version(2,2,0))
+    if (style & wxFRAME_NO_TASKBAR)

     {
     {

-        if (style & wxFRAME_NO_TASKBAR)
-        {
-            gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), TRUE);
-        }
+        gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), TRUE);

     }
     }

-#endif

 
 

-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
+    if (style & wxSTAY_ON_TOP)

     {
     {

-        if (style & wxSTAY_ON_TOP)
-        {
-            gtk_window_set_keep_above(GTK_WINDOW(m_widget), TRUE);
-        }
+        gtk_window_set_keep_above(GTK_WINDOW(m_widget), TRUE);

     }
     }

-#endif
+    if (style & wxMAXIMIZE)
+        gtk_window_maximize(GTK_WINDOW(m_widget));

 
 #if 0
     if (!name.empty())
 
 #if 0
     if (!name.empty())


@@ -544,21 +562,14 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     g_signal_connect (m_widget, "delete_event",
                       G_CALLBACK (gtk_frame_delete_callback), this);
 
     g_signal_connect (m_widget, "delete_event",
                       G_CALLBACK (gtk_frame_delete_callback), this);
 

-    // m_mainWidget holds the toolbar, the menubar and the client area
-    m_mainWidget = gtk_pizza_new();
+    // m_mainWidget is a GtkVBox, holding the bars and client area (m_wxwindow)
+    m_mainWidget = gtk_vbox_new(false, 0);

     gtk_widget_show( m_mainWidget );
     GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
     gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
 
     gtk_widget_show( m_mainWidget );
     GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
     gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
 

-    if (m_miniEdge == 0) // wxMiniFrame has its own version.
-    {
-       // For m_mainWidget themes
-       g_signal_connect (m_mainWidget, "expose_event",
-                         G_CALLBACK (gtk_window_expose_callback), this);
-    }
-
-    // m_wxwindow only represents the client area without toolbar and menubar
-    m_wxwindow = gtk_pizza_new();
+    // m_wxwindow is the client area
+    m_wxwindow = wxPizza::New();

     gtk_widget_show( m_wxwindow );
     gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
 
     gtk_widget_show( m_wxwindow );
     gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
 


@@ -568,9 +579,8 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
 
     if (m_parent) m_parent->AddChild( this );
 
 
     if (m_parent) m_parent->AddChild( this );
 

-    // the user resized the frame by dragging etc.
-    g_signal_connect (m_widget, "size_allocate",
-                      G_CALLBACK (gtk_frame_size_callback), this);
+    g_signal_connect(m_wxwindow, "size_allocate",
+        G_CALLBACK(size_allocate), this);

 
     g_signal_connect (m_widget, "size_request",
                       G_CALLBACK (wxgtk_tlw_size_request_callback), this);
 
     g_signal_connect (m_widget, "size_request",
                       G_CALLBACK (wxgtk_tlw_size_request_callback), this);


@@ -579,8 +589,6 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     if ((m_x != -1) || (m_y != -1))
         gtk_widget_set_uposition( m_widget, m_x, m_y );
 
     if ((m_x != -1) || (m_y != -1))
         gtk_widget_set_uposition( m_widget, m_x, m_y );
 

-    gtk_window_set_default_size( GTK_WINDOW(m_widget), m_width, m_height );
-

     //  we cannot set MWM hints and icons before the widget has
     //  been realized, so we do this directly after realization
     g_signal_connect (m_widget, "realize",
     //  we cannot set MWM hints and icons before the widget has
     //  been realized, so we do this directly after realization
     g_signal_connect (m_widget, "realize",


@@ -602,69 +610,79 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     g_signal_connect_after (m_widget, "focus_out_event",
                       G_CALLBACK (gtk_frame_focus_out_callback), this);
 
     g_signal_connect_after (m_widget, "focus_out_event",
                       G_CALLBACK (gtk_frame_focus_out_callback), this);
 

-    // decorations
-    if ((style & wxSIMPLE_BORDER) || (style & wxNO_BORDER))
-    {
-        m_gdkDecor = 0;
-        m_gdkFunc = 0;
-    }
-    else
-    if (m_miniEdge > 0)
+    gtk_widget_add_events(m_widget, GDK_PROPERTY_CHANGE_MASK);
+    g_signal_connect(m_widget, "property_notify_event",
+        G_CALLBACK(property_notify_event), this);
+
+    // 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;
-
-        if ((style & wxRESIZE_BORDER) != 0)
-           m_gdkFunc |= GDK_FUNC_RESIZE;

     }
     }

-    else
+    else // have border

     {
     {

-        m_gdkDecor = (long) GDK_DECOR_BORDER;
-        m_gdkFunc = (long) GDK_FUNC_MOVE;
+        m_gdkDecor = GDK_DECOR_BORDER;

 
 

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

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

     return true;
 }
 
 wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
 {
     return true;
 }
 
 wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
 {

+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+    // it can also be a (standard) dialog
+    if ( HILDON_IS_WINDOW(m_widget) )
+    {
+        hildon_program_remove_window(wxTheApp->GetHildonProgram(),
+                                     HILDON_WINDOW(m_widget));
+    }
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+

     if (m_grabbed)
     {
     if (m_grabbed)
     {

-        wxFAIL_MSG(_T("Window still grabbed"));
+        wxFAIL_MSG(wxT("Window still grabbed"));

         RemoveGrab();
     }
 
         RemoveGrab();
     }
 

-    m_isBeingDeleted = true;
+    SendDestroyEvent();

 
     // it may also be GtkScrolledWindow in the case of an MDI child
     if (GTK_IS_WINDOW(m_widget))
 
     // it may also be GtkScrolledWindow in the case of an MDI child
     if (GTK_IS_WINDOW(m_widget))


@@ -691,7 +709,7 @@ bool wxTopLevelWindowGTK::EnableCloseButton( bool enable )
     return true;
 }
 
     return true;
 }
 

-bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
+bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)

 {
     if (show == m_fsIsShowing)
         return false; // return what?
 {
     if (show == m_fsIsShowing)
         return false; // return what?


@@ -702,32 +720,23 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
         wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(),
                                  (WXWindow)GDK_ROOT_WINDOW());
 
         wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(),
                                  (WXWindow)GDK_ROOT_WINDOW());
 

-#if GTK_CHECK_VERSION(2,2,0)

     // NB: gtk_window_fullscreen() uses freedesktop.org's WMspec extensions
     //     to switch to fullscreen, which is not always available. We must
     //     check if WM supports the spec and use legacy methods if it
     //     doesn't.
     // NB: gtk_window_fullscreen() uses freedesktop.org's WMspec extensions
     //     to switch to fullscreen, which is not always available. We must
     //     check if WM supports the spec and use legacy methods if it
     //     doesn't.

-    if ( (method == wxX11_FS_WMSPEC) && !gtk_check_version(2,2,0) )
+    if ( method == wxX11_FS_WMSPEC )

     {
         if (show)
     {
         if (show)

-        {
-            m_fsSaveFlag = style;

             gtk_window_fullscreen( GTK_WINDOW( m_widget ) );
             gtk_window_fullscreen( GTK_WINDOW( m_widget ) );

-        }

         else
         else

-        {
-            m_fsSaveFlag = 0;

             gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );
             gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );

-        }

     }
     else
     }
     else

-#endif // GTK+ >= 2.2.0

     {
         GdkWindow *window = m_widget->window;
 
         if (show)
         {
     {
         GdkWindow *window = m_widget->window;
 
         if (show)
         {

-            m_fsSaveFlag = style;

             GetPosition( &m_fsSaveFrame.x, &m_fsSaveFrame.y );
             GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height );
 
             GetPosition( &m_fsSaveFrame.x, &m_fsSaveFrame.y );
             GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height );
 


@@ -737,15 +746,11 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
             gint client_x, client_y, root_x, root_y;
             gint width, height;
 
             gint client_x, client_y, root_x, root_y;
             gint width, height;
 

-            if (method != wxX11_FS_WMSPEC)
-            {
-                // don't do it always, Metacity hates it
-                m_fsSaveGdkFunc = m_gdkFunc;
-                m_fsSaveGdkDecor = m_gdkDecor;
-                m_gdkFunc = m_gdkDecor = 0;
-                gdk_window_set_decorations(window, (GdkWMDecoration)0);
-                gdk_window_set_functions(window, (GdkWMFunction)0);
-            }
+            m_fsSaveGdkFunc = m_gdkFunc;
+            m_fsSaveGdkDecor = m_gdkDecor;
+            m_gdkFunc = m_gdkDecor = 0;
+            gdk_window_set_decorations(window, (GdkWMDecoration)0);
+            gdk_window_set_functions(window, (GdkWMFunction)0);

 
             gdk_window_get_origin (m_widget->window, &root_x, &root_y);
             gdk_window_get_geometry (m_widget->window, &client_x, &client_y,
 
             gdk_window_get_origin (m_widget->window, &root_x, &root_y);
             gdk_window_get_geometry (m_widget->window, &client_x, &client_y,


@@ -761,15 +766,10 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
         }
         else // hide
         {
         }
         else // hide
         {

-            m_fsSaveFlag = 0;
-            if (method != wxX11_FS_WMSPEC)
-            {
-                // don't do it always, Metacity hates it
-                m_gdkFunc = m_fsSaveGdkFunc;
-                m_gdkDecor = m_fsSaveGdkDecor;
-                gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor);
-                gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc);
-            }
+            m_gdkFunc = m_fsSaveGdkFunc;
+            m_gdkDecor = m_fsSaveGdkDecor;
+            gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor);
+            gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc);

 
             wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
                                     (WXWindow)GDK_ROOT_WINDOW(),
 
             wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
                                     (WXWindow)GDK_ROOT_WINDOW(),


@@ -783,7 +783,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
 
     // documented behaviour is to show the window if it's still hidden when
     // showing it full screen
 
     // documented behaviour is to show the window if it's still hidden when
     // showing it full screen

-    if ( show && !IsShown() )
+    if (show)

         Show();
 
     return true;
         Show();
 
     return true;


@@ -793,30 +793,126 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
 // overridden wxWindow methods
 // ----------------------------------------------------------------------------
 
 // overridden wxWindow methods
 // ----------------------------------------------------------------------------
 

+void wxTopLevelWindowGTK::Refresh( bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect) )
+{
+    wxCHECK_RET( m_widget, wxT("invalid frame") );
+
+    gtk_widget_queue_draw( m_widget );
+
+    if (m_wxwindow && m_wxwindow->window)
+        gdk_window_invalidate_rect( m_wxwindow->window, NULL, TRUE );
+}
+

 bool wxTopLevelWindowGTK::Show( bool show )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
 bool wxTopLevelWindowGTK::Show( bool show )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 

-    if (show == IsShown())
-        return false;
+    bool deferShow = show && !m_isShown && m_deferShow;
+    if (deferShow)
+    {
+        deferShow = m_deferShowAllowed && !GTK_WIDGET_REALIZED(m_widget);
+        if (deferShow)
+        {
+            deferShow = 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) != 0;
+        }
+        GdkScreen* screen = NULL;
+        if (deferShow)
+        {
+            screen = gtk_widget_get_screen(m_widget);
+            GdkAtom atom = gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false);
+            deferShow = gdk_x11_screen_supports_net_wm_hint(screen, atom) != 0;
+            // If _NET_REQUEST_FRAME_EXTENTS not supported, 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 = deferShow;
+        }
+        if (deferShow)
+        {
+            // Fluxbox support for _NET_REQUEST_FRAME_EXTENTS is broken
+            const char* name = gdk_x11_screen_get_window_manager_name(screen);
+            deferShow = strcmp(name, "Fluxbox") != 0;
+            m_updateDecorSize = deferShow;
+        }
+
+        m_deferShow = deferShow;
+    }
+    if (deferShow)
+    {
+        // Initial show. If WM supports _NET_REQUEST_FRAME_EXTENTS, defer
+        // calling gtk_widget_show() until _NET_FRAME_EXTENTS property
+        // notification is received, so correct frame extents are known.
+        // This allows resizing m_widget to keep the overall size in sync with
+        // 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 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);
+        if (alloc_width == 1)
+            m_widget->allocation.width = 1;
+
+        // send _NET_REQUEST_FRAME_EXTENTS
+        XClientMessageEvent xevent;
+        memset(&xevent, 0, sizeof(xevent));
+        xevent.type = ClientMessage;
+        xevent.window = gdk_x11_drawable_get_xid(m_widget->window);
+        xevent.message_type = gdk_x11_atom_to_xatom_for_display(
+            gdk_drawable_get_display(m_widget->window),
+            gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false));
+        xevent.format = 32;
+        Display* display = gdk_x11_drawable_get_xdisplay(m_widget->window);
+        XSendEvent(display, DefaultRootWindow(display), false,
+            SubstructureNotifyMask | SubstructureRedirectMask,
+            (XEvent*)&xevent);
+
+        // defer calling gtk_widget_show()
+        m_isShown = true;
+        return true;
+    }

 
 

-    if (!show)
+    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
+        // top down), before the initial size_allocate signals occur.
+        wxSizeEvent event(GetSize(), GetId());
+        event.SetEventObject(this);
+        HandleWindowEvent(event);
+    }
+
+    bool change = base_type::Show(show);
+
+    if (change && !show)

     {
         // make sure window has a non-default position, so when it is shown
         // again, it won't be repositioned by WM as if it were a new window
     {
         // make sure window has a non-default position, so when it is shown
         // again, it won't be repositioned by WM as if it were a new window

+        // Note that this must be done _after_ the window is hidden.

         gtk_window_move((GtkWindow*)m_widget, m_x, m_y);
     }
         gtk_window_move((GtkWindow*)m_widget, m_x, m_y);
     }

-    else if (!m_sizeSet)
+
+    return change;
+}
+
+void wxTopLevelWindowGTK::ShowWithoutActivating()
+{
+    if (!m_isShown)

     {
     {

-        /* by calling GtkOnSize here, we don't have to call
-           either after showing the frame, which would entail
-           much ugly flicker or from within the size_allocate
-           handler, because GTK 1.1.X forbids that. */
+#if GTK_CHECK_VERSION(2,6,0)
+        if (!gtk_check_version(2,6,0))
+            gtk_window_set_focus_on_map(GTK_WINDOW(m_widget), false);
+#endif // GTK+ 2.6+

 
 

-        GtkOnSize();
+        Show(true);

     }
     }

-
-    return wxTopLevelWindowBase::Show(show);

 }
 
 void wxTopLevelWindowGTK::Raise()
 }
 
 void wxTopLevelWindowGTK::Raise()


@@ -835,62 +931,36 @@ void wxTopLevelWindowGTK::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXU
 
 void wxTopLevelWindowGTK::GTKDoGetSize(int *width, int *height) const
 {
 
 void wxTopLevelWindowGTK::GTKDoGetSize(int *width, int *height) const
 {

-    return wxTopLevelWindowBase::DoGetSize(width, height);
-}
-
-void wxTopLevelWindowGTK::GTKDoSetSize(int width, int height)
-{
-    // avoid recursions
-    if (m_resizing)
-        return;
-    m_resizing = true;
-
-    int old_width = m_width;
-    int old_height = m_height;
-
-    if ( width != -1 )
-        m_width = width;
-    if ( height != -1 )
-        m_height = height;
-
-    // GPE's window manager doesn't like size hints at all, esp. when the user
-    // has to use the virtual keyboard, so don't constrain size there
-#ifndef __WXGPE__
-    int minWidth = GetMinWidth(),
-        minHeight = GetMinHeight(),
-        maxWidth = GetMaxWidth(),
-        maxHeight = GetMaxHeight();
-
-    if ( minWidth != -1 && m_width < minWidth )
-        m_width = minWidth;
-    if ( minHeight != -1 && m_height < minHeight )
-        m_height = minHeight;
-    if ( maxWidth != -1 && m_width > maxWidth )
-        m_width = maxWidth;
-    if ( maxHeight != -1 && m_height > maxHeight )
-        m_height = maxHeight;
-#endif // __WXGPE__
-
-    if ( m_width != old_width || m_height != old_height )
-    {
-        gtk_window_resize( GTK_WINDOW(m_widget), m_width, m_height );
-
-        /* we set the size in GtkOnSize, i.e. mostly the actual resizing is
-           done either directly before the frame is shown or in idle time
-           so that different calls to SetSize() don't lead to flicker. */
-        m_sizeSet = false;
+    wxSize size(m_width, m_height);
+    size -= m_decorSize;
+    if (size.x < 0) size.x = 0;
+    if (size.y < 0) size.y = 0;
+#if wxUSE_LIBHILDON2
+    if (width) {
+       if (size.x == 720)
+               *width = 696;
+       else
+               *width = size.x;

     }
     }

-
-    m_resizing = false;
+    if (height) {
+       if (size.y == 420)
+               *height = 396;
+       else if (size.y == 270)
+               *height = 246;
+            else
+               *height = size.y;
+    }
+#else // wxUSE_LIBHILDON2
+    if (width)  *width  = size.x;
+    if (height) *height = size.y;
+#endif // wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON2

 }
 
 void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxCHECK_RET( m_widget, wxT("invalid frame") );
 
 }
 
 void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxCHECK_RET( m_widget, wxT("invalid frame") );
 

-    // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow
-    wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
-
+    m_deferShowAllowed = true;

 
     // deal with the position first
     int old_x = m_x;
 
     // deal with the position first
     int old_x = m_x;


@@ -915,52 +985,39 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
         gtk_window_move( GTK_WINDOW(m_widget), m_x, m_y );
     }
 
         gtk_window_move( GTK_WINDOW(m_widget), m_x, m_y );
     }
 

-
-    // and now change the size: as we want to set the size of the entire
-    // window, including decorations, we must adjust the size passed to
-    // GTKDoSetSize() which takes with the size of undecorated frame only
-    if ( width != -1 || height != -1 )
+    const wxSize oldSize(m_width, m_height);
+    if (width >= 0)
+        m_width = width;
+    if (height >= 0)
+        m_height = height;
+    ConstrainSize();
+    if (m_width != oldSize.x || m_height != oldSize.y)

     {
     {

-        int wTotal,
-            hTotal;
-        DoGetSize(&wTotal, &hTotal);
-
-        int wUndec,
-            hUndec;
-        GTKDoGetSize(&wUndec, &hUndec);
-
-        if ( width != -1 )
-            width -= wTotal - wUndec;
-        if ( height != -1 )
-            height -= hTotal - hUndec;
+        int w, h;
+        GTKDoGetSize(&w, &h);
+        gtk_window_resize(GTK_WINDOW(m_widget), w, h);
+
+        GetClientSize(&m_oldClientWidth, &m_oldClientHeight);
+        wxSizeEvent event(GetSize(), GetId());
+        event.SetEventObject(this);
+        HandleWindowEvent(event);

     }
     }

-
-    GTKDoSetSize(width, height);

 }
 
 }
 

-void wxTopLevelWindowGTK::DoGetSize(int *width, int *height) const
+void wxTopLevelWindowGTK::DoSetClientSize(int width, int height)

 {
 {

-    wxCHECK_RET( m_widget, wxT("invalid frame") );
+    base_type::DoSetClientSize(width, height);

 
 

-    if ( !m_widget->window )
-    {
-        // this can happen if we're called before the window is realized, so
-        // don't assert but just return the stored values
-        GTKDoGetSize(width, height);
-        return;
-    }
-
-    GdkRectangle rect;
-    gdk_window_get_frame_extents(m_widget->window, &rect);
-
-    if ( width )
-        *width = rect.width;
-    if ( height )
-        *height = rect.height;
+    // Since client size is being explicitly set, don't change it later
+    // Has to be done after calling base because it calls SetSize,
+    // which sets this true
+    m_deferShowAllowed = false;

 }
 
 void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
 {
 }
 
 void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
 {

+    wxASSERT_MSG(m_widget, wxT("invalid frame"));
+

     if ( IsIconized() )
     {
         // for consistency with wxMSW, client area is supposed to be empty for
     if ( IsIconized() )
     {
         // for consistency with wxMSW, client area is supposed to be empty for


@@ -969,36 +1026,18 @@ void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
             *width = 0;
         if ( height )
             *height = 0;
             *width = 0;
         if ( height )
             *height = 0;

-
-        return;

     }
     }

-
-    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
-
-    if (height)
-    {
-        *height = m_height - 2 * m_miniEdge - m_miniTitle;
-        if (*height < 0)
-            *height = 0;
-    }
-    if (width)
+    else

     {
     {

-        *width = m_width - 2 * m_miniEdge;
-        if (*width < 0)
-            *width = 0;
+        GTKDoGetSize(width, height);

     }
 }
 
     }
 }
 

-void wxTopLevelWindowGTK::DoSetClientSize( int width, int height )
-{
-    GTKDoSetSize(width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle);
-}
-

 void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
                                           int maxW, int maxH,
                                           int incW, int incH )
 {
 void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
                                           int maxW, int maxH,
                                           int incW, int incH )
 {

-    wxTopLevelWindowBase::DoSetSizeHints( minW, minH, maxW, maxH, incW, incH );
+    base_type::DoSetSizeHints(minW, minH, maxW, maxH, incW, incH);

 
     const wxSize minSize = GetMinSize();
     const wxSize maxSize = GetMaxSize();
 
     const wxSize minSize = GetMinSize();
     const wxSize maxSize = GetMaxSize();


@@ -1007,14 +1046,22 @@ void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
     if (minSize.x > 0 || minSize.y > 0)
     {
         hints_mask |= GDK_HINT_MIN_SIZE;
     if (minSize.x > 0 || minSize.y > 0)
     {
         hints_mask |= GDK_HINT_MIN_SIZE;

-        hints.min_width  = minSize.x > 0 ? minSize.x : 0;
-        hints.min_height = minSize.y > 0 ? minSize.y : 0;
+        hints.min_width = minSize.x - m_decorSize.x;
+        if (hints.min_width < 0)
+            hints.min_width = 0;
+        hints.min_height = minSize.y - m_decorSize.y;
+        if (hints.min_height < 0)
+            hints.min_height = 0;

     }
     if (maxSize.x > 0 || maxSize.y > 0)
     {
         hints_mask |= GDK_HINT_MAX_SIZE;
     }
     if (maxSize.x > 0 || maxSize.y > 0)
     {
         hints_mask |= GDK_HINT_MAX_SIZE;

-        hints.max_width  = maxSize.x > 0 ? maxSize.x : INT_MAX;
-        hints.max_height = maxSize.y > 0 ? maxSize.y : INT_MAX;
+        hints.max_width = maxSize.x - m_decorSize.x;
+        if (hints.max_width < 0)
+            hints.max_width = INT_MAX;
+        hints.max_height = maxSize.y - m_decorSize.y;
+        if (hints.max_height < 0)
+            hints.max_height = INT_MAX;

     }
     if (incW > 0 || incH > 0)
     {
     }
     if (incW > 0 || incH > 0)
     {


@@ -1026,102 +1073,75 @@ void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
         (GtkWindow*)m_widget, NULL, &hints, (GdkWindowHints)hints_mask);
 }
 
         (GtkWindow*)m_widget, NULL, &hints, (GdkWindowHints)hints_mask);
 }
 

-
-void wxTopLevelWindowGTK::GtkOnSize()
+void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)

 {
 {

-    // avoid recursions
-    if (m_resizing) return;
-    m_resizing = true;
-
-    if ( m_wxwindow == NULL ) return;
-
-    /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses
-       wxWindow::Create to create it's GTK equivalent. m_mainWidget is only
-       set in wxFrame::Create so it is used to check what kind of frame we
-       have here. if m_mainWidget is NULL it is a wxMDIChildFrame and so we
-       skip the part which handles m_frameMenuBar, m_frameToolBar and (most
-       importantly) m_mainWidget */
-
-    int minWidth = GetMinWidth(),
-        minHeight = GetMinHeight(),
-        maxWidth = GetMaxWidth(),
-        maxHeight = GetMaxHeight();
-
-#ifdef __WXGPE__
-    // GPE's window manager doesn't like size hints
-    // at all, esp. when the user has to use the
-    // virtual keyboard.
-    minWidth = -1;
-    minHeight = -1;
-    maxWidth = -1;
-    maxHeight = -1;
-#endif
-
-    if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
-    if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;
-    if ((maxWidth != -1) && (m_width > maxWidth)) m_width = maxWidth;
-    if ((maxHeight != -1) && (m_height > maxHeight)) m_height = maxHeight;
-
-    if (m_mainWidget)
+    if (!IsMaximized() && !IsFullScreen())
+        GetCachedDecorSize() = decorSize;
+    if (m_updateDecorSize && m_decorSize != decorSize)

     {
     {

-        // m_mainWidget holds the menubar, the toolbar and the client area,
-        // which is represented by m_wxwindow.
-        int client_x = m_miniEdge;
-        int client_y = m_miniEdge + m_miniTitle;
-        int client_w = m_width - 2*m_miniEdge;
-        int client_h = m_height - 2*m_miniEdge - m_miniTitle;
-        if (client_w < 0)
-            client_w = 0;
-        if (client_h < 0)
-            client_h = 0;
-
-        // Let the parent perform the resize
-        gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
-                              m_wxwindow,
-                              client_x, client_y, client_w, client_h );
+        const wxSize diff = decorSize - m_decorSize;
+        m_decorSize = decorSize;
+        bool resized = false;
+        if (m_deferShow)
+        {
+            // keep overall size unchanged by shrinking m_widget
+            int w, h;
+            GTKDoGetSize(&w, &h);
+            // but not if size would be less than minimum, it won't take effect
+            const wxSize minSize = GetMinSize();
+            if (w >= minSize.x && h >= minSize.y)
+            {
+                gtk_window_resize(GTK_WINDOW(m_widget), w, h);
+                resized = true;
+            }
+        }
+        if (!resized)
+        {
+            // adjust overall size to match change in frame extents
+            m_width  += diff.x;
+            m_height += diff.y;
+            if (m_width  < 0) m_width  = 0;
+            if (m_height < 0) m_height = 0;
+            m_oldClientWidth = 0;
+            gtk_widget_queue_resize(m_wxwindow);
+        }

     }
     }

-    else
+    if (m_deferShow)

     {
     {

-        // If there is no m_mainWidget between m_widget and m_wxwindow there
-        // is no need to set the size or position of m_wxwindow.
+        // gtk_widget_show() was deferred, do it now
+        m_deferShow = false;
+        GetClientSize(&m_oldClientWidth, &m_oldClientHeight);
+        wxSizeEvent sizeEvent(GetSize(), GetId());
+        sizeEvent.SetEventObject(this);
+        HandleWindowEvent(sizeEvent);
+
+        gtk_widget_show(m_widget);
+
+        wxShowEvent showEvent(GetId(), true);
+        showEvent.SetEventObject(this);
+        HandleWindowEvent(showEvent);

     }
     }

+}

 
 

-    m_sizeSet = true;
-
-    // send size event to frame
-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
-
-    m_resizing = false;
+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()
 {
 }
 
 void wxTopLevelWindowGTK::OnInternalIdle()
 {

-    if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
-    {
-        GtkOnSize();
-
-        // we'll come back later
-        return;
-    }
-
-    // set the focus if not done yet and if we can already do it
-    if ( GTK_WIDGET_REALIZED(m_wxwindow) )
-    {
-        if ( g_delayedFocus &&
-             wxGetTopLevelParent((wxWindow*)g_delayedFocus) == this )
-        {
-            wxLogTrace(_T("focus"),
-                       _T("Setting focus from wxTLW::OnIdle() to %s(%s)"),
-                       g_delayedFocus->GetClassInfo()->GetClassName(),
-                       g_delayedFocus->GetLabel().c_str());
-
-            g_delayedFocus->SetFocus();
-            g_delayedFocus = NULL;
-        }
-    }
-

     wxWindow::OnInternalIdle();
 
     // Synthetize activate events.
     wxWindow::OnInternalIdle();
 
     // Synthetize activate events.


@@ -1159,18 +1179,19 @@ void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 

-    wxTopLevelWindowBase::SetIcons( icons );
-
-    GList *list = NULL;
+    base_type::SetIcons(icons);

 
 

-    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);

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


@@ -1227,7 +1248,7 @@ void wxTopLevelWindowGTK::AddGrab()
     {
         m_grabbed = true;
         gtk_grab_add( m_widget );
     {
         m_grabbed = true;
         gtk_grab_add( m_widget );

-        wxEventLoop().Run();
+        wxGUIEventLoop().Run();

         gtk_grab_remove( m_widget );
     }
 }
         gtk_grab_remove( m_widget );
     }
 }


@@ -1264,16 +1285,24 @@ static bool do_shape_combine_region(GdkWindow* window, const wxRegion& region)
 bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
 bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,

-                 _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
+                 wxT("Shaped windows must be created with the wxFRAME_SHAPED style."));
+
+    if ( GTK_WIDGET_REALIZED(m_widget) )
+    {
+        if ( m_wxwindow )
+            do_shape_combine_region(m_wxwindow->window, region);

 
 

-    GdkWindow *window = NULL;
-    if (m_wxwindow)
+        return do_shape_combine_region(m_widget->window, region);
+    }
+    else // not realized yet

     {
     {

-        window = GTK_PIZZA(m_wxwindow)->bin_window;
-        do_shape_combine_region(window, region);
+        // 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()


@@ -1286,10 +1315,11 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags)
     bool new_hint_value = false;
 
     // FIXME: This is a workaround to focus handling problem
     bool new_hint_value = false;
 
     // FIXME: This is a workaround to focus handling problem

-    // If RequestUserAttention is called for example right after a wxSleep, OnInternalIdle hasn't
-    // yet been processed, and the internal focus system is not up to date yet.
-    // wxYieldIfNeeded ensures the processing of it, but can have unwanted side effects - MR
-    ::wxYieldIfNeeded();
+    // If RequestUserAttention is called for example right after a wxSleep, OnInternalIdle
+    // hasn't yet been processed, and the internal focus system is not up to date yet.
+    // YieldFor(wxEVT_CATEGORY_UI) ensures the processing of it (hopefully it
+    // won't have side effects) - MR
+    wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI);

 
     if(m_urgency_hint >= 0)
         g_source_remove(m_urgency_hint);
 
     if(m_urgency_hint >= 0)
         g_source_remove(m_urgency_hint);


@@ -1318,10 +1348,8 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags)
 
 void wxTopLevelWindowGTK::SetWindowStyleFlag( long style )
 {
 
 void wxTopLevelWindowGTK::SetWindowStyleFlag( long style )
 {

-#if defined(__WXGTK24__) || GTK_CHECK_VERSION(2,2,0)

     // Store which styles were changed
     long styleChanges = style ^ m_windowStyle;
     // Store which styles were changed
     long styleChanges = style ^ m_windowStyle;

-#endif

 
     // Process wxWindow styles. This also updates the internal variable
     // Therefore m_windowStyle bits carry now the _new_ style values
 
     // Process wxWindow styles. This also updates the internal variable
     // Therefore m_windowStyle bits carry now the _new_ style values


@@ -1331,19 +1359,18 @@ void wxTopLevelWindowGTK::SetWindowStyleFlag( long style )
     if (!m_widget)
         return;
 
     if (!m_widget)
         return;
 

-#ifdef __WXGTK24__
-    if ( (styleChanges & wxSTAY_ON_TOP) && !gtk_check_version(2,4,0) )
-        gtk_window_set_keep_above(GTK_WINDOW(m_widget), m_windowStyle & wxSTAY_ON_TOP);
-#endif // GTK+ 2.4
-#if GTK_CHECK_VERSION(2,2,0)
-    if ( (styleChanges & wxFRAME_NO_TASKBAR) && !gtk_check_version(2,2,0) )
+    if ( styleChanges & wxSTAY_ON_TOP )

     {
     {

-        gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), m_windowStyle & wxFRAME_NO_TASKBAR);
+        gtk_window_set_keep_above(GTK_WINDOW(m_widget),
+                                  m_windowStyle & wxSTAY_ON_TOP);

     }
     }

-#endif // GTK+ 2.2
-}

 
 

-#include <X11/Xlib.h>
+    if ( styleChanges & wxFRAME_NO_TASKBAR )
+    {
+        gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget),
+                                         m_windowStyle & wxFRAME_NO_TASKBAR);
+    }
+}

 
 /* Get the X Window between child and the root window.
    This should usually be the WM managed XID */
 
 /* Get the X Window between child and the root window.
    This should usually be the WM managed XID */


@@ -1376,15 +1403,17 @@ bool wxTopLevelWindowGTK::SetTransparent(wxByte alpha)
     // from which the opacity property is checked from.
     Window win = wxGetTopmostWindowX11(dpy, GDK_WINDOW_XID (m_widget->window));
 
     // from which the opacity property is checked from.
     Window win = wxGetTopmostWindowX11(dpy, GDK_WINDOW_XID (m_widget->window));
 

-    unsigned int opacity = alpha * 0x1010101;

 
     // Using pure Xlib to not have a GTK version check mess due to gtk2.0 not having GdkDisplay
     if (alpha == 0xff)
         XDeleteProperty(dpy, win, XInternAtom(dpy, "_NET_WM_WINDOW_OPACITY", False));
     else
 
     // Using pure Xlib to not have a GTK version check mess due to gtk2.0 not having GdkDisplay
     if (alpha == 0xff)
         XDeleteProperty(dpy, win, XInternAtom(dpy, "_NET_WM_WINDOW_OPACITY", False));
     else

+    {
+        long opacity = alpha * 0x1010101L;

         XChangeProperty(dpy, win, XInternAtom(dpy, "_NET_WM_WINDOW_OPACITY", False),
                         XA_CARDINAL, 32, PropModeReplace,
                         (unsigned char *) &opacity, 1L);
         XChangeProperty(dpy, win, XInternAtom(dpy, "_NET_WM_WINDOW_OPACITY", False),
                         XA_CARDINAL, 32, PropModeReplace,
                         (unsigned char *) &opacity, 1L);

+    }

     XSync(dpy, False);
     return true;
 }
     XSync(dpy, False);
     return true;
 }


@@ -1392,7 +1421,7 @@ bool wxTopLevelWindowGTK::SetTransparent(wxByte alpha)
 bool wxTopLevelWindowGTK::CanSetTransparent()
 {
     // allow to override automatic detection as it's far from perfect
 bool wxTopLevelWindowGTK::CanSetTransparent()
 {
     // allow to override automatic detection as it's far from perfect

-    static const wxChar *SYSOPT_TRANSPARENT = wxT("gtk.tlw.can-set-transparent");
+    const wxString SYSOPT_TRANSPARENT = "gtk.tlw.can-set-transparent";

     if ( wxSystemOptions::HasOption(SYSOPT_TRANSPARENT) )
     {
         return wxSystemOptions::GetOptionInt(SYSOPT_TRANSPARENT) != 0;
     if ( wxSystemOptions::HasOption(SYSOPT_TRANSPARENT) )
     {
         return wxSystemOptions::GetOptionInt(SYSOPT_TRANSPARENT) != 0;