make GetSize() return the size of the window including the decorations and updated...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 62d85bec8a991244824dc30e87cf8bb3502dc415..22223832c6b2be6ac9edcc3e0f35ac1c22f5832f 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -31,6 +31,7 @@ wxGTK:
 
 - Implemented support for underlined fonts in wxStaticText
 - wxTopLevelWindow::SetSizeHints size increments now work
 
 - Implemented support for underlined fonts in wxStaticText
 - wxTopLevelWindow::SetSizeHints size increments now work

+- wxTopLevelWindow::GetSize() returns the size including the WM decorations

 
 wxMSW:
 
 
 wxMSW:
 

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index e714803be9a62274019aa3a7b71a871049c41d61..c5d99c5de4d601b7f3c7d3940a26a821b18c0f09 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -122,20 +122,28 @@ protected:
     // from both DoSetSize() and DoSetClientSize()
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // from both DoSetSize() and DoSetClientSize()
     virtual void DoMoveWindow(int x, int y, int width, int height);
 

-    // override wxWindow methods to take into account tool/menu/statusbars
+    // take into account WM decorations here
+    virtual void DoGetSize(int *width, int *height) const;

     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);

-                                 
+
+    // override these methods to take into account tool/menu/statusbars

     virtual void DoSetClientSize(int width, int height);
     virtual void DoSetClientSize(int width, int height);

-    virtual void DoGetClientSize( int *width, int *height ) const;
+    virtual void DoGetClientSize(int *width, int *height) const;
+
+    // this method takes the size of the window not taking account of
+    // decorations and is used by both DoSetSize() and DoSetClientSize()
+    void GTKDoSetSize(int width, int height);

 
 

-    wxString      m_title;
+
+    // string shown in the title bar
+    wxString m_title;

 
     // is the frame currently iconized?
     bool m_isIconized;
 
     // is the frame currently iconized?
     bool m_isIconized;

-    // is the frame currently grabbed explicitly
-    // by the application?
+
+    // is the frame currently grabbed explicitly by the application?

     bool m_grabbed;
 };
 
     bool m_grabbed;
 };
 

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index cb8a7b56ac6b22627cff1063fc55cb7fbeb7326e..3d4a155fc78828e730baa08ae9e4dbccae7e6484 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -242,7 +242,7 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
         // Tell the wxWindow class about the new size
         win->m_width = alloc->width;
         win->m_height = alloc->height;
         // Tell the wxWindow class about the new size
         win->m_width = alloc->width;
         win->m_height = alloc->height;

-        
+

         win->GtkUpdateSize();
     }
 }
         win->GtkUpdateSize();
     }
 }


@@ -629,7 +629,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     {
         m_gdkDecor = 0;
         m_gdkFunc = 0;
     {
         m_gdkDecor = 0;
         m_gdkFunc = 0;

-        
+

         if ((style & wxRESIZE_BORDER) != 0)
            m_gdkFunc |= GDK_FUNC_RESIZE;
     }
         if ((style & wxRESIZE_BORDER) != 0)
            m_gdkFunc |= GDK_FUNC_RESIZE;
     }


@@ -700,10 +700,10 @@ bool wxTopLevelWindowGTK::EnableCloseButton( bool enable )
         m_gdkFunc |= GDK_FUNC_CLOSE;
     else
         m_gdkFunc &= ~GDK_FUNC_CLOSE;
         m_gdkFunc |= GDK_FUNC_CLOSE;
     else
         m_gdkFunc &= ~GDK_FUNC_CLOSE;

-    
+

     if (GTK_WIDGET_REALIZED(m_widget) && (m_widget->window))
         gdk_window_set_functions( m_widget->window, (GdkWMFunction)m_gdkFunc );
     if (GTK_WIDGET_REALIZED(m_widget) && (m_widget->window))
         gdk_window_set_functions( m_widget->window, (GdkWMFunction)m_gdkFunc );

-        
+

     return true;
 }
 
     return true;
 }
 


@@ -845,88 +845,129 @@ void wxTopLevelWindowGTK::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXU
     wxFAIL_MSG( wxT("DoMoveWindow called for wxTopLevelWindowGTK") );
 }
 
     wxFAIL_MSG( wxT("DoMoveWindow called for wxTopLevelWindowGTK") );
 }
 

+// ----------------------------------------------------------------------------
+// window geometry
+// ----------------------------------------------------------------------------
+
+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;
+    }
+
+    m_resizing = false;
+}
+

 void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
 void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {

-    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+    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") );
 
 
     // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 

-    // avoid recursions
-    if (m_resizing)
-        return;
-    m_resizing = true;

 
 

+    // deal with the position first

     int old_x = m_x;
     int old_y = m_y;
 
     int old_x = m_x;
     int old_y = m_y;
 

-    int old_width = m_width;
-    int old_height = m_height;
-
-    if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)
+    if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )

     {
     {

-        if (x != -1) m_x = x;
-        if (y != -1) m_y = y;
+        // -1 means "use existing" unless the flag above is specified
+        if ( x != -1 )
+            m_x = x;
+        if ( y != -1 )
+            m_y = y;

     }
     }

-    else
+    else // wxSIZE_ALLOW_MINUS_ONE

     {
         m_x = x;
         m_y = y;
     }
     {
         m_x = x;
         m_y = y;
     }

-    if (width != -1) m_width = width;
-    if (height != -1) m_height = height;
-    
-/*
-    if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
+
+    if ( m_x != old_x || m_y != old_y )

     {
     {

-        if (width == -1) m_width = 80;
+        gtk_window_move( GTK_WINDOW(m_widget), m_x, m_y );

     }
 
     }
 

-    if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT)
+
+    // 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 )

     {
     {

-       if (height == -1) m_height = 26;
+        int wTotal,
+            hTotal;
+        DoGetSize(&wTotal, &hTotal);
+
+        int wUndec,
+            hUndec;
+        wxTopLevelWindowBase::DoGetSize(&wUndec, &hUndec);
+
+        if ( width != -1 )
+            width -= wTotal - wUndec;
+        if ( height != -1 )
+            height -= hTotal - hUndec;

     }
     }

-*/
-
-    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
+    GTKDoSetSize(width, height);
+}

 
 

-    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;
+void wxTopLevelWindowGTK::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_widget, wxT("invalid frame") );

 
 

-    if ((m_x != -1) || (m_y != -1))
+    if ( !m_widget->window )

     {
     {

-        if ((m_x != old_x) || (m_y != old_y))
-        {
-            gtk_window_move( GTK_WINDOW(m_widget), m_x, m_y );
-        }
+        // this can happen if we're called before the window is realized, so
+        // don't assert but just return the stored values
+        wxTopLevelWindowBase::DoGetSize(width, height);
+        return;

     }
 
     }
 

-    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;
-    }
+    GdkRectangle rect;
+    gdk_window_get_frame_extents(m_widget->window, &rect);

 
 

-    m_resizing = false;
+    if ( width )
+        *width = rect.width;
+    if ( height )
+        *height = rect.height;

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


@@ -949,10 +990,7 @@ void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
 
 void wxTopLevelWindowGTK::DoSetClientSize( int width, int height )
 {
 
 void wxTopLevelWindowGTK::DoSetClientSize( int width, int height )
 {

-    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
-
-    DoSetSize(-1, -1,
-              width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle, 0);
+    GTKDoSetSize(width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle);

 }
 
 void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
 }
 
 void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,