X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c626a8b797d2819e1e14110d77c04a530fd3b6b4..9d2f3c71d83c52fc4db6c8041de533562816b1d6:/src/gtk/frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index edd72807fe..6c94bcb55f 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -36,7 +36,6 @@ const int wxSTATUS_HEIGHT  = 25;
 // data
 //-----------------------------------------------------------------------------
 
-extern wxList wxTopLevelWindows;
 extern wxList wxPendingDelete;
 
 //-----------------------------------------------------------------------------
@@ -98,6 +97,50 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC
     return FALSE;
 }
 
+//-----------------------------------------------------------------------------
+// InsertChild for wxFrame
+//-----------------------------------------------------------------------------
+
+/* Callback for wxFrame. This very strange beast has to be used because
+ * C++ has no virtual methods in a constructor. We have to emulate a
+ * virtual function here as wxWindows requires different ways to insert
+ * a child in container classes. */
+
+static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
+{
+    if (wxIS_KIND_OF(child,wxToolBar) || wxIS_KIND_OF(child,wxMenuBar))
+    {
+        /* these are outside the client area */
+	wxFrame* frame = (wxFrame*) parent;
+        gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget),
+                         GTK_WIDGET(child->m_widget),
+                         child->m_x,
+                         child->m_y );
+    }
+    else
+    {
+        /* these are inside the client area */
+        gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
+                         GTK_WIDGET(child->m_widget),
+                         child->m_x,
+                         child->m_y );
+    }
+
+    gtk_widget_set_usize( GTK_WIDGET(child->m_widget),
+                          child->m_width,
+                          child->m_height );
+
+    /* resize on OnInternalIdle */
+    parent->m_sizeSet = FALSE;
+
+    if (parent->m_windowStyle & wxTAB_TRAVERSAL)
+    {
+        /* we now allow a window to get the focus as long as it
+           doesn't have any children. */
+        GTK_WIDGET_UNSET_FLAGS( parent->m_wxwindow, GTK_CAN_FOCUS );
+    }
+}
+
 //-----------------------------------------------------------------------------
 // wxFrame
 //-----------------------------------------------------------------------------
@@ -119,6 +162,7 @@ wxFrame::wxFrame()
     m_sizeSet = FALSE;
     m_miniEdge = 0;
     m_miniTitle = 0;
+    m_mainWidget = (GtkWidget*) NULL;
 }
 
 wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
@@ -132,6 +176,7 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
     m_sizeSet = FALSE;
     m_miniEdge = 0;
     m_miniTitle = 0;
+    m_mainWidget = (GtkWidget*) NULL;
     Create( parent, id, title, pos, size, style, name );
 }
 
@@ -146,6 +191,8 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
     PreCreation( parent, id, pos, size, style, name );
 
     m_title = title;
+    
+    m_insertCallback = wxInsertChildInFrame;
 
     GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
     if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP;
@@ -155,16 +202,24 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
     gtk_window_set_title( GTK_WINDOW(m_widget), title );
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 
+    /* needed ? */
     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 );
 
+    /* m_mainWidget holds the toolbar, the menubar and the client area */
+    m_mainWidget = gtk_myfixed_new();
+    gtk_widget_show( m_mainWidget );
+    GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
+    gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
+    gtk_widget_realize( m_mainWidget );
+    
+    /* m_wxwindow only represents the client area without toolbar and menubar */
     m_wxwindow = gtk_myfixed_new();
     gtk_widget_show( m_wxwindow );
     GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
-
-    gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
+    gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
 
     if (m_parent) m_parent->AddChild( this );
 
@@ -172,9 +227,34 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 
     gtk_widget_realize( m_widget );
     
+    /* all this is for Motif Window Manager "hints" and is supposed to be
+       recognized by other WM as well. not tested. */
+    long decor = (long) GDK_DECOR_ALL;
+    long func = (long) GDK_FUNC_ALL;
+    if ((m_windowStyle & wxCAPTION) == 0)
+	decor |= GDK_DECOR_TITLE;
+/*
+    if ((m_windowStyle & wxMINIMIZE) == 0)
+	func |= GDK_FUNC_MINIMIZE;
+    if ((m_windowStyle & wxMAXIMIZE) == 0)
+	func |= GDK_FUNC_MAXIMIZE;
+*/
+    if ((m_windowStyle & wxSYSTEM_MENU) == 0)
+	decor |= GDK_DECOR_MENU;
+    if ((m_windowStyle & wxMINIMIZE_BOX) == 0)
+	decor |= GDK_DECOR_MINIMIZE;
+    if ((m_windowStyle & wxMAXIMIZE_BOX) == 0)
+	decor |= GDK_DECOR_MAXIMIZE;
+    if ((m_windowStyle & wxRESIZE_BORDER) == 0)
+	func |= GDK_FUNC_RESIZE;
+    gdk_window_set_decorations(m_widget->window, (GdkWMDecoration)decor);
+    gdk_window_set_functions(m_widget->window, (GdkWMFunction)func);
+      
+    /* the user resized the frame by dragging etc. */
     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
         GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
 
+    /* the only way to get the window size is to connect to this event */
     gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
         GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this );
 
@@ -213,7 +293,7 @@ bool wxFrame::Show( bool show )
     {
         /* 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
+           much ugly flicker or from within the size_allocate
            handler, because GTK 1.1.X forbids that. */
 
         GtkOnSize( m_x, m_y, m_width, m_height );
@@ -231,32 +311,15 @@ bool wxFrame::Destroy()
     return TRUE;
 }
 
-wxPoint wxFrame::GetClientAreaOrigin() const
-{
-    wxPoint pt( m_miniEdge, m_miniEdge + m_miniTitle );
-    if (m_frameMenuBar)
-    {
-        int h = 0;
-        m_frameMenuBar->GetSize( (int*)NULL, &h );
-        pt.y += h;
-    }
-    if (m_frameToolBar)
-    {
-        int h = 0;
-        m_frameToolBar->GetSize( (int*)NULL, &h );
-        pt.y += h;
-    }
-    return pt;
-}
-
 void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
 
-    /* don't do anything for children of wxMDIChildFrame */
-    if (!m_wxwindow) return;
-
-    if (m_resizing) return; // I don't like recursions
+    /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
+    wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
+    
+    /* avoid recursions */
+    if (m_resizing) return; 
     m_resizing = TRUE;
 
     int old_x = m_x;
@@ -305,7 +368,9 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 
     if ((m_width != old_width) || (m_height != old_height))
     {
-        /* we set the size in GtkOnSize */
+        /* we set the size in GtkOnSize, i.e. mostly the actual resizing is
+	   done either directly before the frame is shown or in idle time
+	   so that different calls to SetSize() don't lead to flicker. */
         m_sizeSet = FALSE;
     }
 
@@ -370,61 +435,85 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     // m_x = x;
     // m_y = y;
 
+    /* avoid recursions */
     if (m_resizing) return;
     m_resizing = TRUE;
 
-    if (!m_wxwindow) return;
-
+    /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
+    wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
+    
     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;
-
-    /* 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)
+    /* space occupied by m_frameToolBar and m_frameMenuBar */
+    int client_area_y_offset = 0; 
+
+    /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses
+       wxWindow::Create to create it's GTK equivalent. m_mainWidget is only
+       set in wxFrame::Create so it is used to check what kind of frame we
+       have here. if m_mainWidget is NULL it is a wxMDIChildFrame and so we
+       skip the part which handles m_frameMenuBar, m_frameToolBar and (most
+       importantly) m_mainWidget */
+       
+    if (m_mainWidget)
     {
-        int xx = m_miniEdge;
-        int yy = m_miniEdge + m_miniTitle;
-        int ww = m_width  - 2*m_miniEdge;
-        int hh = wxMENU_HEIGHT;
-        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 );
-    }
+        /* 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;
+
+        /* 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 (m_frameMenuBar)
+        {
+            int xx = m_miniEdge;
+            int yy = m_miniEdge + m_miniTitle;
+            int ww = m_width  - 2*m_miniEdge;
+            int hh = wxMENU_HEIGHT;
+            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_mainWidget), m_frameMenuBar->m_widget, xx, yy );
+            gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh );
+	
+	    client_area_y_offset += hh;
+        }
     
-    if (m_frameToolBar)
-    {
-        int xx = m_miniEdge;
-        int yy = m_miniEdge + m_miniTitle;
-        if ((m_frameMenuBar) || (m_mdiMenuBar)) yy += wxMENU_HEIGHT;
-        int ww = m_width - 2*m_miniEdge;
-        int hh = m_frameToolBar->m_height;
-
-        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_frameToolBar)
+        {
+            int xx = m_miniEdge;
+            int yy = m_miniEdge + m_miniTitle;
+            if ((m_frameMenuBar) || (m_mdiMenuBar)) yy += wxMENU_HEIGHT;
+            int ww = m_width - 2*m_miniEdge;
+            int hh = m_frameToolBar->m_height;
+
+            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_mainWidget), m_frameToolBar->m_widget, xx, yy );
+            gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh );
+	
+	    client_area_y_offset += hh;
+        }
+    
+        gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_wxwindow, 0, client_area_y_offset );
     }
+    
+    gtk_widget_set_usize( m_wxwindow, m_width, m_height-client_area_y_offset );
 
     if (m_frameStatusBar)
     {
         int xx = 0 + m_miniEdge;
-        int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge;
+        int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;
         int ww = m_width - 2*m_miniEdge;
         int hh = wxSTATUS_HEIGHT;
 
@@ -468,8 +557,6 @@ void wxFrame::OnInternalIdle()
 
 void wxFrame::OnCloseWindow( wxCloseEvent& event )
 {
-    // close the window if it wasn't vetoed by the application
-//    if ( !event.GetVeto() ) // No, this isn't the interpretation of GetVeto.
     Destroy();
 }
 
@@ -544,7 +631,7 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
         if (m_frameMenuBar->m_parent != this)
         {
             m_frameMenuBar->m_parent = this;
-            gtk_myfixed_put( GTK_MYFIXED(m_wxwindow),
+            gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
                 m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
 
             /* an mdi child menu bar might be underneath */
@@ -641,6 +728,26 @@ wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id,
     return statusBar;
 }
 
+void wxFrame::Command( int id )
+{
+    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+    commandEvent.SetInt( id );
+    commandEvent.SetEventObject( this );
+
+    wxMenuBar *bar = GetMenuBar();
+    if (!bar) return;
+
+    wxMenuItem *item = bar->FindItemForId(id) ;
+    if (item && item->IsCheckable())
+    {
+        bar->Check(id,!bar->Checked(id)) ;
+    }
+
+    wxEvtHandler* evtHandler = GetEventHandler();
+
+    evtHandler->ProcessEvent(commandEvent);
+}
+
 void wxFrame::SetStatusText(const wxString& text, int number)
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );