fixed bug introduced by my previous GtkUpdateSize() commit

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 7ff1880195e87b8c66fa28a14567e9d4e84f6b52..acad4c3355008758d82b4433380af2b790a247c1 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -216,7 +216,7 @@ bool wxFrame::Create( wxWindow *parent,
                       long style,
                       const wxString &name )
 {
                       long style,
                       const wxString &name )
 {

-    bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig, 
+    bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig,

                                        style, name);
     m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
     return rt;
                                        style, name);
     m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
     return rt;


@@ -235,7 +235,7 @@ wxFrame::~wxFrame()
 void wxFrame::DoGetClientSize( int *width, int *height ) const
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 void wxFrame::DoGetClientSize( int *width, int *height ) const
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

-    
+

     wxTopLevelWindow::DoGetClientSize( width, height );
 
     if (height)
     wxTopLevelWindow::DoGetClientSize( width, height );
 
     if (height)


@@ -253,7 +253,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
 
 #if wxUSE_STATUSBAR
         // status bar
 
 #if wxUSE_STATUSBAR
         // status bar

-        if (m_frameStatusBar && m_frameStatusBar->IsShown()) 
+        if (m_frameStatusBar && m_frameStatusBar->IsShown())

             (*height) -= wxSTATUS_HEIGHT;
 #endif // wxUSE_STATUSBAR
 
             (*height) -= wxSTATUS_HEIGHT;
 #endif // wxUSE_STATUSBAR
 


@@ -443,7 +443,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
                 ww = m_width - 2*m_miniEdge;
                 hh = m_toolBarDetached ? wxPLACE_HOLDER
                                        : m_frameToolBar->m_height;
                 ww = m_width - 2*m_miniEdge;
                 hh = m_toolBarDetached ? wxPLACE_HOLDER
                                        : m_frameToolBar->m_height;

-                                       
+

                 client_area_y_offset += hh;
             }
 
                 client_area_y_offset += hh;
             }
 


@@ -485,7 +485,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
     }
 #endif // wxUSE_STATUSBAR
 
     }
 #endif // wxUSE_STATUSBAR
 

-    GtkUpdateSize();
+    m_sizeSet = TRUE;

 
     // send size event to frame
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
 
     // send size event to frame
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 7ff1880195e87b8c66fa28a14567e9d4e84f6b52..acad4c3355008758d82b4433380af2b790a247c1 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -216,7 +216,7 @@ bool wxFrame::Create( wxWindow *parent,
                       long style,
                       const wxString &name )
 {
                       long style,
                       const wxString &name )
 {

-    bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig, 
+    bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig,

                                        style, name);
     m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
     return rt;
                                        style, name);
     m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
     return rt;


@@ -235,7 +235,7 @@ wxFrame::~wxFrame()
 void wxFrame::DoGetClientSize( int *width, int *height ) const
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 void wxFrame::DoGetClientSize( int *width, int *height ) const
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

-    
+

     wxTopLevelWindow::DoGetClientSize( width, height );
 
     if (height)
     wxTopLevelWindow::DoGetClientSize( width, height );
 
     if (height)


@@ -253,7 +253,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
 
 #if wxUSE_STATUSBAR
         // status bar
 
 #if wxUSE_STATUSBAR
         // status bar

-        if (m_frameStatusBar && m_frameStatusBar->IsShown()) 
+        if (m_frameStatusBar && m_frameStatusBar->IsShown())

             (*height) -= wxSTATUS_HEIGHT;
 #endif // wxUSE_STATUSBAR
 
             (*height) -= wxSTATUS_HEIGHT;
 #endif // wxUSE_STATUSBAR
 


@@ -443,7 +443,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
                 ww = m_width - 2*m_miniEdge;
                 hh = m_toolBarDetached ? wxPLACE_HOLDER
                                        : m_frameToolBar->m_height;
                 ww = m_width - 2*m_miniEdge;
                 hh = m_toolBarDetached ? wxPLACE_HOLDER
                                        : m_frameToolBar->m_height;

-                                       
+

                 client_area_y_offset += hh;
             }
 
                 client_area_y_offset += hh;
             }
 


@@ -485,7 +485,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
     }
 #endif // wxUSE_STATUSBAR
 
     }
 #endif // wxUSE_STATUSBAR
 

-    GtkUpdateSize();
+    m_sizeSet = TRUE;

 
     // send size event to frame
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
 
     // send size event to frame
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );