simplify DoSetClientSize

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index c052cd6388fa239ebcce5a9832854ecc3eed5717..9265754229a977090d59aaae9da215809698cbc3 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -91,7 +91,6 @@ protected:
 #endif // wxUSE_STATUSBAR
 
     // override wxWindow methods to take into account tool/menu/statusbars
 #endif // wxUSE_STATUSBAR
 
     // override wxWindow methods to take into account tool/menu/statusbars

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

     virtual void DoGetClientSize( int *width, int *height ) const;
 
 #if wxUSE_MENUS_NATIVE
     virtual void DoGetClientSize( int *width, int *height ) const;
 
 #if wxUSE_MENUS_NATIVE

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 5ce91c006ead8aba9612d38f33bf0c0b7bea5620..ee20c378be3493131f6d069d4fb9b222cb6c6db5 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -164,8 +164,6 @@ protected:
     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);

-    virtual void DoSetClientSize(int width, int height);
-    virtual void DoGetClientSize( int *width, int *height ) const;

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index fcc7ff98719a8bb289230ffffa58f9204d0cdc7e..7c0998c7df2145f810c304436f7126cc8a805325 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -120,8 +120,7 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-    // move the window to the specified location and resize it: this is called
-    // from both DoSetSize() and DoSetClientSize()
+    // move the window to the specified location and resize it

     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // take into account WM decorations here
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // take into account WM decorations here


@@ -131,11 +130,10 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
 
     // override these methods to take into account tool/menu/statusbars
                            int sizeFlags = wxSIZE_AUTO);
 
     // override these methods to take into account tool/menu/statusbars

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

     virtual void DoGetClientSize(int *width, int *height) const;
 
     // this method takes the size of the window not taking account of
     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()
+    // decorations

     void GTKDoSetSize(int width, int height);
 
 
     void GTKDoSetSize(int width, int height);
 
 

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 027d3bf090b56d3141f3b61103f2e7bd9f8848b8..754e601fc54935a1827bf86e5a24c27963ef45e0 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -265,55 +265,6 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
         *height = 0;
 }
 
         *height = 0;
 }
 

-void wxFrame::DoSetClientSize( int width, int height )
-{
-    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
-
-#if wxUSE_MENUS_NATIVE
-        // menu bar
-        if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR) != 0))
-        {
-            if (!m_menuBarDetached)
-                height += m_menuBarHeight;
-            else
-                height += wxPLACE_HOLDER;
-        }
-#endif // wxUSE_MENUS_NATIVE
-
-#if wxUSE_STATUSBAR
-        // status bar
-        if (m_frameStatusBar && m_frameStatusBar->IsShown() &&
-            !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR) != 0))
-            height += wxSTATUS_HEIGHT;
-#endif
-
-#if wxUSE_TOOLBAR
-        // tool bar
-        if (m_frameToolBar && m_frameToolBar->IsShown())
-        {
-            if (m_toolBarDetached)
-            {
-                height += wxPLACE_HOLDER;
-            }
-            else
-            {
-                int x, y;
-                m_frameToolBar->GetSize( &x, &y );
-                if ( m_frameToolBar->IsVertical() )
-                {
-                    width += x;
-                }
-                else
-                {
-                    height += y;
-                }
-            }
-        }
-#endif
-
-    wxTopLevelWindow::DoSetClientSize( width, height );
-}
-

 void wxFrame::GtkOnSize()
 {
     // avoid recursions
 void wxFrame::GtkOnSize()
 {
     // avoid recursions

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index df17918271d86b360449ef7491b1752f4cd8eed7..51027b628d81651dd13e737f865ea77892172982 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -353,16 +353,6 @@ void wxMDIChildFrame::DoSetSize( int x, int y, int width, int height, int sizeFl
     wxWindow::DoSetSize( x, y, width, height, sizeFlags );
 }
 
     wxWindow::DoSetSize( x, y, width, height, sizeFlags );
 }
 

-void wxMDIChildFrame::DoSetClientSize(int width, int height)
-{
-    wxWindow::DoSetClientSize( width, height );
-}
-
-void wxMDIChildFrame::DoGetClientSize( int *width, int *height ) const
-{
-    wxWindow::DoGetClientSize( width, height );
-}
-

 void wxMDIChildFrame::AddChild( wxWindowBase *child )
 {
     wxWindow::AddChild(child);
 void wxMDIChildFrame::AddChild( wxWindowBase *child )
 {
     wxWindow::AddChild(child);

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 77e2dd60833dd477715cdf7582ca9001fc5fc4a8..16588492bf0acaa1b28c77612b1cff6688d43011 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -977,11 +977,6 @@ void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
     }
 }
 
     }
 }
 

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index d88e7964eb133b21c587b6666504203f7b462df9..0b1aff6fa8b1d61bbdcb963365475c73e6da6ee3 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2868,25 +2868,9 @@ void wxWindowGTK::DoSetClientSize( int width, int height )
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
 
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
 

-    if (m_wxwindow)
-    {
-        int dw = 0;
-        int dh = 0;
-
-        if (m_hasScrolling)
-        {
-            GetScrollbarWidth(m_widget, dw, dh);
-        }
-
-        const int border = GTK_CONTAINER(m_wxwindow)->border_width;
-        dw += 2 * border;
-        dh += 2 * border;
-
-        width += dw;
-        height += dh;
-    }
-
-    SetSize(width, height);
+    const wxSize size = GetSize();
+    const wxSize clientSize = GetClientSize();
+    SetSize(width + (size.x - clientSize.x), height + (size.y - clientSize.y));

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