New wxDC hierarchy

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index b01dfd8ae7d72f0798f8ecdda35844af21f31224..bfbbda8e3017cb63ed4503111264aaa7b498060b 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -108,7 +108,6 @@ wxFrame::wxFrame()
     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;
     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;

-    wxTopLevelWindows.Insert( this );

 }
 
 wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
 }
 
 wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,


@@ -120,13 +119,14 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;
     Create( parent, id, title, pos, size, style, name );
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;
     Create( parent, id, title, pos, size, style, name );

-    wxTopLevelWindows.Insert( this );

 }
 
 bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
 }
 
 bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {

+    wxTopLevelWindows.Append( this );
+    

     m_needParent = FALSE;
 
     PreCreation( parent, id, pos, size, style, name );
     m_needParent = FALSE;
 
     PreCreation( parent, id, pos, size, style, name );


@@ -186,15 +186,6 @@ bool wxFrame::Show( bool show )
   
     if (show && !m_sizeSet)
     {
   
     if (show && !m_sizeSet)
     {

-        // this yield call is required for a configure event
-        // to be sent by GTK to its windows. this will among
-       // others prompt all GtkScrolledWidgets to calculate
-       // if they need scrollbars which in turn is required
-       // for wxWindows to calculate the client size of its
-       // windows.
-       
-        wxYield();
-       

        // by calling GtkOnSize here, we don't have to call
        // either after showing the frame, which would entail
        // much ugly flicker nor from within the size_allocate
        // by calling GtkOnSize here, we don't have to call
        // either after showing the frame, which would entail
        // much ugly flicker nor from within the size_allocate


@@ -294,8 +285,6 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
         gtk_widget_set_usize( m_widget, m_width, m_height );
     }
   
         gtk_widget_set_usize( m_widget, m_width, m_height );
     }
   

-    m_sizeSet = TRUE;
-

     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );


@@ -374,10 +363,10 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth;
     if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
 
     if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth;
     if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
 

-//    gtk_widget_set_usize( m_widget, m_width, m_height );
+    gtk_widget_set_usize( m_widget, m_width, m_height );

     
     // This emulates the new wxMSW behaviour
     
     // This emulates the new wxMSW behaviour

-
+    

     if (m_frameMenuBar)
     {
         m_frameMenuBar->m_x = 1;  
     if (m_frameMenuBar)
     {
         m_frameMenuBar->m_x = 1;  


@@ -463,7 +452,7 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
         // yes: set it's size to fill all the frame
         int client_x, client_y;
         GetClientSize( &client_x, &client_y );
         // yes: set it's size to fill all the frame
         int client_x, client_y;
         GetClientSize( &client_x, &client_y );

-        child->SetSize( 1, 1, client_x-2, client_y);
+        child->SetSize( 1, 1, client_x-2, client_y-2 );

     }
 }
 
     }
 }
 


@@ -504,6 +493,8 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
                 m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
         }
     }
                 m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
         }
     }

+    
+    if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );

 }
 
 wxMenuBar *wxFrame::GetMenuBar(void) const
 }
 
 wxMenuBar *wxFrame::GetMenuBar(void) const


@@ -520,6 +511,8 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam
     m_frameToolBar = OnCreateToolBar( style, id, name );
   
     GetChildren()->DeleteObject( m_frameToolBar );
     m_frameToolBar = OnCreateToolBar( style, id, name );
   
     GetChildren()->DeleteObject( m_frameToolBar );

+    
+    if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );

   
     return m_frameToolBar;
 }
   
     return m_frameToolBar;
 }


@@ -542,6 +535,8 @@ wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, co
 
     m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
   
 
     m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
   

+    if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
+  

     return m_frameStatusBar;
 }
 
     return m_frameStatusBar;
 }