X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43a18898651f71010606d8682fdf88cfc1c02193..c19a8a9a7187281b757808e651358198352b8f11:/src/gtk1/frame.cpp

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 6a593bf782..a80ffe0666 100644
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/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;
-
+    
 /*
     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,8 @@ wxFrame::wxFrame()
     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;
-    wxTopLevelWindows.Insert( this );
+    m_miniEdge = 0;
+    m_miniTitle = 0;
 }
 
 wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
@@ -114,14 +120,17 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;
+    m_miniEdge = 0;
+    m_miniTitle = 0;
     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 )
 {
+    wxTopLevelWindows.Append( this );
+    
     m_needParent = FALSE;
 
     PreCreation( parent, id, pos, size, style, name );
@@ -132,6 +141,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 ((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 +188,16 @@ bool wxFrame::Show( bool show )
 {
     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 );
 }
 
@@ -203,7 +217,7 @@ bool wxFrame::Destroy()
 
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
-    wxPoint pt(0, 0);
+    wxPoint pt( m_miniEdge, m_miniEdge + m_miniTitle );
     if (m_frameMenuBar)
     {
         int h = 0;
@@ -275,11 +289,9 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
         gtk_widget_set_usize( m_widget, m_width, m_height );
     }
   
-    m_sizeSet = TRUE;
-
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
-    ProcessEvent( event );
+    GetEventHandler()->ProcessEvent( event );
 
     m_resizing = FALSE;
 }
@@ -317,6 +329,11 @@ void wxFrame::GetClientSize( int *width, int *height ) const
             m_frameToolBar->GetSize( (int *) NULL, &y );
             (*height) -= y;
         }
+        (*height) -= m_miniEdge*2 + m_miniTitle;
+    }
+    if (width)
+    {
+        (*width) -= m_miniEdge*2;
     }
 }
 
@@ -333,7 +350,7 @@ void wxFrame::SetClientSize( int const width, int const height )
         m_frameToolBar->GetSize( (int *) NULL, &y );
         h += y;
     }
-    wxWindow::SetClientSize( width, h );
+    wxWindow::SetClientSize( width + m_miniEdge*2, h  + m_miniEdge*2 + m_miniTitle );
 }
 
 void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
@@ -342,8 +359,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     // 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;
@@ -355,47 +373,75 @@ 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 );
-
-    // This emulates the new wxMSW behaviour
-
+    
+    // this emulates the new wxMSW behaviour of placing all
+    // frame-subwindows (menu, toolbar..) on one native window
+        // OK, this hurts in the eye, but I don't want to call SetSize()
+        // because I don't want to call any non-native functions here.
+    
     if (m_frameMenuBar)
     {
-        m_frameMenuBar->m_x = 1;  
-        m_frameMenuBar->m_y = 1;
-        m_frameMenuBar->m_width = m_width-2;
-        m_frameMenuBar->m_height = wxMENU_HEIGHT-2;
-        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, 1, 1 );
-        gtk_widget_set_usize( m_frameMenuBar->m_widget, m_width-2, wxMENU_HEIGHT-2 );
+        int xx = 1 + m_miniEdge;
+	int yy = 1 + m_miniEdge + m_miniTitle;
+	int ww = m_width - 2  - 2*m_miniEdge;
+	int hh = wxMENU_HEIGHT-2;
+        m_frameMenuBar->m_x = xx;
+        m_frameMenuBar->m_y = yy;
+        m_frameMenuBar->m_width = ww;
+        m_frameMenuBar->m_height = hh;
+	
+        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, xx, yy );
+        gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh );
     }
 
     if (m_frameToolBar)
     {
-        int y = 0;
-        if (m_frameMenuBar) y = wxMENU_HEIGHT;
-        int h = m_frameToolBar->m_height;
+        int xx = 1 + m_miniEdge;
+	int yy = m_miniEdge + m_miniTitle;
+        if (m_frameMenuBar) yy += wxMENU_HEIGHT;
+	int ww = m_width -2 - 2*m_miniEdge;
+        int hh = m_frameToolBar->m_height;
     
-        m_frameToolBar->m_x = 2;  
-        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, 2, y );
-        gtk_widget_set_usize( m_frameToolBar->m_widget, m_width-3, h );
+        m_frameToolBar->m_x = xx;  
+        m_frameToolBar->m_y = yy;
+        m_frameToolBar->m_height = hh;
+        m_frameToolBar->m_width = ww;
+	
+        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, xx, yy );
+        gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh );
     }
   
     if (m_frameStatusBar)
     {
-        // OK, this hurts in the eye, but I don't want to call SetSize()
-        // because I don't want to call any non-native functions here.
-        m_frameStatusBar->m_x = 0;  
-        m_frameStatusBar->m_y = m_height-wxSTATUS_HEIGHT;
-        m_frameStatusBar->m_width = m_width;
-        m_frameStatusBar->m_height = 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 );
+        int xx = 0 + m_miniEdge;
+	int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge;
+	int ww = m_width - 2*m_miniEdge;
+	int hh = wxSTATUS_HEIGHT;
+	
+        m_frameStatusBar->m_x = xx;
+        m_frameStatusBar->m_y = yy;
+        m_frameStatusBar->m_width = ww;
+        m_frameStatusBar->m_height = hh;
+	
+        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, xx, yy );
+        gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh );
     }
-
+    
     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) )
@@ -433,7 +479,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 );
-        child->SetSize( 1, 1, client_x-2, client_y);
+        child->SetSize( 1, 1, client_x-2, client_y-2 );
     }
 }
 
@@ -474,6 +520,8 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
                 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
@@ -490,6 +538,8 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam
     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;
 }
@@ -512,6 +562,8 @@ wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, co
 
     m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
   
+    if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
+  
     return m_frameStatusBar;
 }
 
@@ -581,3 +633,4 @@ void wxFrame::SetIcon( const wxIcon &icon )
   
     gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
 }
+