X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e691f46b2ec1b5dbbff2e51131e3c532e688a89..7b28e0ede49ca78e05df6bc6af2d2d8c508f8455:/src/gtk/frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 7f7e0ba84e..4bdfe079d3 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -15,10 +15,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "frame.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/defs.h"
 
 #include "wx/dialog.h"
@@ -45,7 +48,6 @@
 // constants
 // ----------------------------------------------------------------------------
 
-const int wxMENU_HEIGHT    = 27;
 const int wxSTATUS_HEIGHT  = 25;
 const int wxPLACE_HOLDER   = 0;
 
@@ -91,8 +93,14 @@ static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
 
 static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
     if (!win->m_hasVMT) return;
 
+    // Raise the client area area
+    gdk_window_raise( win->m_wxwindow->window );
+
     win->m_menuBarDetached = TRUE;
     win->GtkUpdateSize();
 }
@@ -109,7 +117,6 @@ static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
     if (!win->m_hasVMT) return;
 
     win->m_toolBarDetached = FALSE;
-
     win->GtkUpdateSize();
 }
 
@@ -124,6 +131,9 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
 
     if (!win->m_hasVMT) return;
 
+    // Raise the client area area
+    gdk_window_raise( win->m_wxwindow->window );
+
     win->m_toolBarDetached = TRUE;
     win->GtkUpdateSize();
 }
@@ -149,7 +159,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
 
     if (!parent->m_insertInClientArea)
     {
-        /* these are outside the client area */
+        // These are outside the client area
         wxFrame* frame = (wxFrame*) parent;
         gtk_pizza_put( GTK_PIZZA(frame->m_mainWidget),
                          GTK_WIDGET(child->m_widget),
@@ -157,10 +167,10 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
                          child->m_y,
                          child->m_width,
                          child->m_height );
-
+                         
 #if wxUSE_TOOLBAR_NATIVE
-        /* we connect to these events for recalculating the client area
-           space when the toolbar is floating */
+        // We connect to these events for recalculating the client area
+        // space when the toolbar is floating
         if (wxIS_KIND_OF(child,wxToolBar))
         {
             wxToolBar *toolBar = (wxToolBar*) child;
@@ -177,7 +187,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
     }
     else
     {
-        /* these are inside the client area */
+        // These are inside the client area
         gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
@@ -185,8 +195,8 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
                          child->m_width,
                          child->m_height );
     }
-
-    /* resize on OnInternalIdle */
+    
+    // Resize on OnInternalIdle
     parent->GtkUpdateSize();
 }
 
@@ -198,6 +208,7 @@ void wxFrame::Init()
 {
     m_menuBarDetached = FALSE;
     m_toolBarDetached = FALSE;
+    m_menuBarHeight = 2;
 }
 
 bool wxFrame::Create( wxWindow *parent,
@@ -208,9 +219,10 @@ bool wxFrame::Create( wxWindow *parent,
                       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;
 }
 
@@ -227,30 +239,30 @@ wxFrame::~wxFrame()
 void wxFrame::DoGetClientSize( int *width, int *height ) const
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
-    
+
     wxTopLevelWindow::DoGetClientSize( width, height );
 
     if (height)
     {
 #if wxUSE_MENUS_NATIVE
-        /* menu bar */
+        // menu bar
         if (m_frameMenuBar)
         {
             if (!m_menuBarDetached)
-                (*height) -= wxMENU_HEIGHT;
+                (*height) -= m_menuBarHeight;
             else
                 (*height) -= wxPLACE_HOLDER;
         }
 #endif // wxUSE_MENUS_NATIVE
 
 #if wxUSE_STATUSBAR
-        /* status bar */
-        if (m_frameStatusBar && m_frameStatusBar->IsShown()) 
+        // status bar
+        if (m_frameStatusBar && m_frameStatusBar->IsShown())
             (*height) -= wxSTATUS_HEIGHT;
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR
-        /* tool bar */
+        // tool bar
         if (m_frameToolBar && m_frameToolBar->IsShown())
         {
             if (m_toolBarDetached)
@@ -280,23 +292,23 @@ void wxFrame::DoSetClientSize( int width, int height )
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
 #if wxUSE_MENUS_NATIVE
-        /* menu bar */
+        // menu bar
         if (m_frameMenuBar)
         {
             if (!m_menuBarDetached)
-                height += wxMENU_HEIGHT;
+                height += m_menuBarHeight;
             else
                 height += wxPLACE_HOLDER;
         }
 #endif // wxUSE_MENUS_NATIVE
 
 #if wxUSE_STATUSBAR
-        /* status bar */
+        // status bar
         if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT;
 #endif
 
 #if wxUSE_TOOLBAR
-        /* tool bar */
+        // tool bar
         if (m_frameToolBar && m_frameToolBar->IsShown())
         {
             if (m_toolBarDetached)
@@ -329,17 +341,17 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
     // m_x = x;
     // m_y = y;
 
-    /* avoid recursions */
+    // avoid recursions
     if (m_resizing) return;
     m_resizing = TRUE;
 
-    /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
+    // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 
     m_width = width;
     m_height = height;
 
-    /* space occupied by m_frameToolBar and m_frameMenuBar */
+    // space occupied by m_frameToolBar and m_frameMenuBar
     int client_area_x_offset = 0,
         client_area_y_offset = 0;
 
@@ -362,7 +374,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
 
     if (m_mainWidget)
     {
-        /* set size hints */
+        // set size hints
         gint flag = 0; // GDK_HINT_POS;
         if ((minWidth != -1) || (minHeight != -1)) flag |= GDK_HINT_MIN_SIZE;
         if ((maxWidth != -1) || (maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE;
@@ -376,11 +388,11 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
                                        &geom,
                                        (GdkWindowHints) flag );
 
-        /* I revert back to wxGTK's original behaviour. m_mainWidget holds the
-         * menubar, the toolbar and the client area, which is represented by
-         * m_wxwindow.
-         * 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. */
+        // I revert back to wxGTK's original behaviour. m_mainWidget holds
+        // the menubar, the toolbar and the client area, which is represented
+        // by m_wxwindow.
+        // 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 wxUSE_MENUS_NATIVE
         if (m_frameMenuBar)
@@ -388,7 +400,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
             int ww = m_width  - 2*m_miniEdge;
-            int hh = wxMENU_HEIGHT;
+            int hh = m_menuBarHeight;
             if (m_menuBarDetached) hh = wxPLACE_HOLDER;
             m_frameMenuBar->m_x = xx;
             m_frameMenuBar->m_y = yy;
@@ -411,7 +423,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
             if (m_frameMenuBar)
             {
                 if (!m_menuBarDetached)
-                    yy += wxMENU_HEIGHT;
+                    yy += m_menuBarHeight;
                 else
                     yy += wxPLACE_HOLDER;
             }
@@ -420,7 +432,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
             m_frameToolBar->m_x = xx;
             m_frameToolBar->m_y = yy;
 
-            /* don't change the toolbar's reported height/width */
+            // don't change the toolbar's reported height/width
             int ww, hh;
             if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
             {
@@ -455,8 +467,8 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
     }
     else
     {
-        /* if there is no m_mainWidget between m_widget and m_wxwindow there
-           is no need to set the size or position of m_wxwindow. */
+        // If there is no m_mainWidget between m_widget and m_wxwindow there
+        // is no need to set the size or position of m_wxwindow.
     }
 
 #if wxUSE_STATUSBAR
@@ -499,7 +511,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
 
 void wxFrame::OnInternalIdle()
 {
-    wxTopLevelWindow::OnInternalIdle();
+    wxFrameBase::OnInternalIdle();
 
 #if wxUSE_MENUS_NATIVE
     if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();
@@ -568,12 +580,35 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
             gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
                 GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
         }
-
+        
         m_frameMenuBar->Show( TRUE );
+
+        UpdateMenuBarSize();
+    }
+    else
+    {
+        m_menuBarHeight = 2;
+        GtkUpdateSize();        // resize window in OnInternalIdle
     }
+}
+
+void wxFrame::UpdateMenuBarSize()
+{
+    wxASSERT_MSG( m_frameMenuBar, _T("Updating non existant menubar?") );
+
+    GtkRequisition  req;
+
+    req.width = 2;
+    req.height = 2;
+
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request )
+        (m_frameMenuBar->m_widget, &req );
 
-    // resize window in OnInternalIdle
-    m_sizeSet = FALSE;
+    m_menuBarHeight = req.height;
+
+        // resize window in OnInternalIdle
+
+    GtkUpdateSize();
 }
 
 #endif // wxUSE_MENUS_NATIVE
@@ -590,16 +625,18 @@ wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& na
 
     m_insertInClientArea = TRUE;
 
-    m_sizeSet = FALSE;
+    GtkUpdateSize();
 
     return m_frameToolBar;
 }
 
 void wxFrame::SetToolBar(wxToolBar *toolbar)
 {
+    bool hadTbar = m_frameToolBar != NULL;
+
     wxFrameBase::SetToolBar(toolbar);
 
-    if (m_frameToolBar)
+    if ( m_frameToolBar )
     {
         // insert into toolbar area if not already there
         if ((m_frameToolBar->m_widget->parent) &&
@@ -611,6 +648,14 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
             GtkUpdateSize();
         }
     }
+    else // toolbar unset
+    {
+        // still need to update size if it had been there before
+        if ( hadTbar )
+        {
+            GtkUpdateSize();
+        }
+    }
 }
 
 #endif // wxUSE_TOOLBAR
@@ -625,7 +670,7 @@ wxStatusBar* wxFrame::CreateStatusBar(int number,
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
     // because it will change when toolbar is added
-    m_sizeSet = FALSE;
+    GtkUpdateSize();
 
     return wxFrameBase::CreateStatusBar( number, style, id, name );
 }
@@ -635,7 +680,7 @@ void wxFrame::PositionStatusBar()
     if ( !m_frameStatusBar )
         return;
 
-    m_sizeSet = FALSE;
+    GtkUpdateSize();
 }
 #endif // wxUSE_STATUSBAR