X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe4e9e6c14f3df8be4191804258c7795bd829a10..7c39369e5a9b2298eed8adc64a229482d5d90dd1:/src/gtk1/frame.cpp?ds=sidebyside

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 25e187d39b..ab4522cb56 100644
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -113,6 +113,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
 wxFrame::wxFrame()
 {
     m_frameMenuBar = (wxMenuBar *) NULL;
+    m_mdiMenuBar = (wxMenuBar *) NULL;
     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;
@@ -125,6 +126,7 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
       long style, const wxString &name )
 {
     m_frameMenuBar = (wxMenuBar *) NULL;
+    m_mdiMenuBar = (wxMenuBar *) NULL;
     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;
@@ -150,19 +152,10 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 
     m_widget = gtk_window_new( win_type );
 
-#ifdef __WXDEBUG__
-        debug_focus_in( m_widget, "wxFrame::m_widget", name );
-#endif
-
-    if ((size.x != -1) && (size.y != -1))
-        gtk_widget_set_usize( m_widget, m_width, m_height );
-    if ((pos.x != -1) && (pos.y != -1))
-        gtk_widget_set_uposition( m_widget, m_x, m_y );
-
     gtk_window_set_title( GTK_WINDOW(m_widget), title );
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 
-    gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL );
+    gtk_window_set_policy( GTK_WINDOW(m_widget), 1, 1, 0 );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
@@ -171,30 +164,33 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
     gtk_widget_show( m_wxwindow );
     GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
 
-#ifdef __WXDEBUG__
-        debug_focus_in( m_wxwindow, "wxFrame::m_wxwindow", name );
-#endif
-
     gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
 
+    if (m_parent) m_parent->AddChild( this );
+
+    PostCreation();
+
+    gtk_widget_realize( m_widget );
+    
     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
         GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
         GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this );
 
-    if (m_parent) m_parent->AddChild( this );
-
-    PostCreation();
-
     return TRUE;
 }
 
 wxFrame::~wxFrame()
 {
     if (m_frameMenuBar) delete m_frameMenuBar;
+    m_frameMenuBar = (wxMenuBar *) NULL;
+    
     if (m_frameStatusBar) delete m_frameStatusBar;
+    m_frameStatusBar = (wxStatusBar *) NULL;
+    
     if (m_frameToolBar) delete m_frameToolBar;
+    m_frameToolBar = (wxToolBar *) NULL;
 
     wxTopLevelWindows.DeleteObject( this );
 
@@ -215,10 +211,10 @@ bool wxFrame::Show( bool show )
 
     if (show && !m_sizeSet)
     {
-  // 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.
+        /* 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 );
     }
@@ -253,11 +249,11 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
-void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
+void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
 
-    // Don't do anything for children of wxMDIChildFrame
+    /* don't do anything for children of wxMDIChildFrame */
     if (!m_wxwindow) return;
 
     if (m_resizing) return; // I don't like recursions
@@ -301,26 +297,21 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
     if ((m_x != -1) || (m_y != -1))
     {
         if ((m_x != old_x) || (m_y != old_y))
-            gtk_widget_set_uposition( m_widget, m_x, m_y );
+	{
+            /* m_sizeSet = FALSE; */
+	    gtk_widget_set_uposition( m_widget, m_x, m_y );
+	}
     }
 
     if ((m_width != old_width) || (m_height != old_height))
     {
-       gtk_widget_set_usize( m_widget, m_width, m_height );
+        /* we set the size in GtkOnSize */
+        m_sizeSet = FALSE;
     }
 
-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
-
     m_resizing = FALSE;
 }
 
-void wxFrame::SetSize( int width, int height )
-{
-    SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
-}
-
 void wxFrame::Centre( int direction )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
@@ -328,8 +319,8 @@ void wxFrame::Centre( int direction )
     int x = 0;
     int y = 0;
 
-    if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
-    if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
+    if ((direction & wxHORIZONTAL) == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
+    if ((direction & wxVERTICAL) == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
 
     Move( x, y );
 }
@@ -357,7 +348,7 @@ void wxFrame::GetClientSize( int *width, int *height ) const
     }
 }
 
-void wxFrame::SetClientSize( int const width, int const height )
+void wxFrame::DoSetClientSize( int width, int height )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
 
@@ -370,7 +361,7 @@ void wxFrame::SetClientSize( int const width, int const height )
         m_frameToolBar->GetSize( (int *) NULL, &y );
         h += y;
     }
-    wxWindow::SetClientSize( width + m_miniEdge*2, h  + m_miniEdge*2 + m_miniTitle );
+    wxWindow::DoSetClientSize( width + m_miniEdge*2, h  + m_miniEdge*2 + m_miniTitle );
 }
 
 void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
@@ -387,17 +378,16 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     m_width = width;
     m_height = height;
 
+    /* check if size is in legal range */
     if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
     if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
     if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
     if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
 
-    gtk_widget_set_usize( m_widget, m_width, m_height );
-
-    // 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.
+    /* this emulates the new wxMSW behaviour of placing all
+     * frame-subwindows (menu, toolbar..) on one native window
+     * 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)
     {
@@ -413,12 +403,12 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         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 xx = m_miniEdge;
         int yy = m_miniEdge + m_miniTitle;
-        if (m_frameMenuBar) yy += wxMENU_HEIGHT;
+        if ((m_frameMenuBar) || (m_mdiMenuBar)) yy += wxMENU_HEIGHT;
         int ww = m_width - 2*m_miniEdge;
         int hh = m_frameToolBar->m_height;
 
@@ -447,16 +437,17 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh );
     }
 
+    /* we actually set the size of a frame here and no-where else */
+    gtk_widget_set_usize( m_widget, m_width, m_height );
+
     m_sizeSet = TRUE;
 
     /* send size event to frame */
-
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
 
     /* send size event to status bar */
-
     if (m_frameStatusBar)
     {
         wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() );
@@ -478,8 +469,8 @@ void wxFrame::OnInternalIdle()
 void wxFrame::OnCloseWindow( wxCloseEvent& event )
 {
     // close the window if it wasn't vetoed by the application
-    if ( !event.GetVeto() )
-        Destroy();
+//    if ( !event.GetVeto() ) // No, this isn't the interpretation of GetVeto.
+    Destroy();
 }
 
 void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
@@ -492,10 +483,10 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
     }
     else
     {
-        // no child: go out !
+        /* no child: go out ! */
         if (!GetChildren().First()) return;
 
-        // do we have exactly one child?
+        /* do we have exactly one child? */
         wxWindow *child = (wxWindow *) NULL;
         for(wxNode *node = GetChildren().First(); node; node = node->Next())
         {
@@ -508,13 +499,13 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 #endif
             )
             {
-          // it's the second one: do nothing
+                /* it's the second one: do nothing */
                 if (child) return;
                 child = win;
             }
         }
 
-        // yes: set it's size to fill all the frame
+        /* 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-2 );
@@ -556,6 +547,9 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
             m_frameMenuBar->m_parent = this;
             gtk_myfixed_put( GTK_MYFIXED(m_wxwindow),
                 m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
+
+	    /* an mdi child menu bar might be underneath */
+	    if (m_mdiMenuBar) m_frameMenuBar->Show( FALSE );
         }
     }