derive wxSTC from wxTextEntryBase to provide even more wxTextCtrl-like methods (see...

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 94b65ad038102ec53bd23b33d712efedfd971ce9..d87eec8b6a45f3ab0f3a7bf75a5982a70bb0444d 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -375,6 +375,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
 //-----------------------------------------------------------------------------


@@ -387,27 +418,13 @@ 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;
 }


@@ -624,7 +641,10 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
         }
     }
 
         }
     }
 

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


@@ -761,7 +781,7 @@ bool wxTopLevelWindowGTK::Show( bool show )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 

-    bool deferShow = show && m_deferShow;
+    bool deferShow = show && m_deferShow && !m_isShown;

     if (deferShow)
     {
         m_deferShow =
     if (deferShow)
     {
         m_deferShow =


@@ -975,6 +995,8 @@ void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
 
 void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)
 {
 
 void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)
 {

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

     if (m_decorSize != decorSize)
     {
         const wxSize diff = decorSize - m_decorSize;
     if (m_decorSize != decorSize)
     {
         const wxSize diff = decorSize - m_decorSize;


@@ -1021,6 +1043,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();