New wxDC hierarchy

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 6a593bf782d0ca233047a6b01b74ddbff5b72de4..bfbbda8e3017cb63ed4503111264aaa7b498060b 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -42,15 +42,20 @@ extern wxList wxPendingDelete;
 static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
 {
     if (!win->HasVMT()) return;
 static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
 {
     if (!win->HasVMT()) return;

-
+    

 /*
     printf( "OnFrameResize from " );
     if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
         printf( win->GetClassInfo()->GetClassName() );
     printf( ".\n" );
 */
 /*
     printf( "OnFrameResize from " );
     if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
         printf( win->GetClassInfo()->GetClassName() );
     printf( ".\n" );
 */

-
-    win->GtkOnSize( alloc->x, alloc->y, alloc->width, alloc->height );
+    
+   if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+   {
+       win->m_sizeSet = FALSE;
+       win->m_width = alloc->width;
+       win->m_height = alloc->height;
+   }

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -103,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,


@@ -115,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 );


@@ -132,6 +137,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
     if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP;
   
     m_widget = gtk_window_new( win_type );
     if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP;
   
     m_widget = gtk_window_new( win_type );

+    

     if ((size.x != -1) && (size.y != -1))
         gtk_widget_set_usize( m_widget, m_width, m_height );
     if ((pos.x != -1) && (pos.y != -1))
     if ((size.x != -1) && (size.y != -1))
         gtk_widget_set_usize( m_widget, m_width, m_height );
     if ((pos.x != -1) && (pos.y != -1))


@@ -178,12 +184,16 @@ bool wxFrame::Show( bool show )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
   
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
   

-    if (show)
+    if (show && !m_sizeSet)

     {
     {

-        wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-        m_sizeSet = FALSE;
-        ProcessEvent( event );
+       // 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
+       // handler, because GTK 1.1.X forbids that.
+       
+        GtkOnSize( m_x, m_y, m_width, m_height );

     }
     }

+       

     return wxWindow::Show( show );
 }
 
     return wxWindow::Show( show );
 }
 


@@ -275,11 +285,9 @@ 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 );
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );

-    ProcessEvent( event );
+    GetEventHandler()->ProcessEvent( event );

 
     m_resizing = FALSE;
 }
 
     m_resizing = FALSE;
 }


@@ -342,8 +350,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     // m_x = x;
     // m_y = y;
 
     // m_x = x;
     // m_y = y;
 

-    if ((m_height == height) && (m_width == width) &&
-        (m_sizeSet)) return;
+    if (m_resizing) return;
+    m_resizing = TRUE;
+    

     if (!m_wxwindow) return;
   
     m_width = width;
     if (!m_wxwindow) return;
   
     m_width = width;


@@ -355,9 +364,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
 
     gtk_widget_set_usize( m_widget, m_width, m_height );
     if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
 
     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;  


@@ -390,12 +399,22 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, 0, m_height-wxSTATUS_HEIGHT );
         gtk_widget_set_usize( m_frameStatusBar->m_widget, m_width, wxSTATUS_HEIGHT );
     }
         gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, 0, m_height-wxSTATUS_HEIGHT );
         gtk_widget_set_usize( m_frameStatusBar->m_widget, m_width, wxSTATUS_HEIGHT );
     }

-
+    

     m_sizeSet = TRUE;
     
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     m_sizeSet = TRUE;
     
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );

-    ProcessEvent( event );
+    GetEventHandler()->ProcessEvent( event );
+    
+    m_resizing = FALSE;
+}
+
+void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) )
+{
+    if (!m_sizeSet)
+        GtkOnSize( m_x, m_y, m_width, m_height );
+  
+    DoMenuUpdates();

 }
 
 void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 }
 
 void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )


@@ -433,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 );

     }
 }
 
     }
 }
 


@@ -474,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


@@ -490,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;
 }


@@ -512,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;
 }