X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6134811179988d701a8a1a2e715f3c05b4e0112b..d9692df7a3edf3f4deb2b0f1132f1f776c1c755f:/src/gtk1/mdi.cpp?ds=sidebyside

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index 69a709e439..f902779e84 100644
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -13,7 +13,10 @@
 #endif
 
 #include "wx/mdi.h"
+#include "wx/dialog.h"
+#include "wx/menu.h"
 #include "wx/gtk/win_gtk.h"
+#include <wx/intl.h>
 
 //-----------------------------------------------------------------------------
 
@@ -24,17 +27,17 @@ extern wxList wxPendingDelete;
 //-----------------------------------------------------------------------------
 
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
-{ 
+{
   if ((win->m_x == alloc->x) &&
       (win->m_y == alloc->y) &&
       (win->m_width == alloc->width) &&
       (win->m_height == alloc->height))
   {
     return;
-  };
-  
+  }
+
   win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
-};
+}
 
 // page change callback
 static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget),
@@ -52,7 +55,7 @@ static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget),
       mdi_frame->m_currentChild = child_frame;
       mdi_frame->SetMDIMenuBar( child_frame->m_menuBar );
       return;
-    };
+    }
     node = node->Next();
   }
 }
@@ -66,27 +69,25 @@ END_EVENT_TABLE()
 
 wxMDIParentFrame::wxMDIParentFrame(void)
 {
-  m_clientWindow = NULL;
-  m_currentChild = NULL;
+  m_clientWindow = (wxMDIClientWindow *) NULL;
+  m_currentChild = (wxMDIChildFrame *) NULL;
   m_parentFrameActive = TRUE;
-  m_toolBar = NULL;
-};
+}
 
 wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& pos, const wxSize& size,
       long style, const wxString& name )
 {
-  m_clientWindow = NULL;
-  m_currentChild = NULL;
+  m_clientWindow = (wxMDIClientWindow *) NULL;
+  m_currentChild = (wxMDIChildFrame *) NULL;
   m_parentFrameActive = TRUE;
-  m_toolBar = NULL;
   Create( parent, id, title, pos, size, style, name );
-};
+}
 
 wxMDIParentFrame::~wxMDIParentFrame(void)
 {
-};
+}
 
 bool wxMDIParentFrame::Create( wxWindow *parent,
       wxWindowID id, const wxString& title,
@@ -94,24 +95,24 @@ bool wxMDIParentFrame::Create( wxWindow *parent,
       long style, const wxString& name )
 {
   wxFrame::Create( parent, id, title, pos, size, style, name );
-  
+
   OnCreateClient();
-  
+
   return TRUE;
-};
+}
 
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 {
   wxFrame::GtkOnSize( x, y, width, height );
-  
+
   if (m_mdiMenuBar)
   {
     int x = 0;
     int y = 0;
     GetClientSize( &x, &y );
-    m_mdiMenuBar->SetSize( 1, 1, x-2, 26 ); 
+    m_mdiMenuBar->SetSize( 1, 1, x-2, 26 );
   }
-};
+}
 
 void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
 {
@@ -122,87 +123,77 @@ void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
     int x = 0;
     int y = 0;
     GetClientSize( &x, &y );
-    m_mdiMenuBar->SetSize( 1, 1, x-2, 26 ); 
+    m_mdiMenuBar->SetSize( 1, 1, x-2, 26 );
     m_mdiMenuBar->Show( TRUE );
   }
-};
+}
 
 void wxMDIParentFrame::GetClientSize(int *width, int *height ) const
 {
   wxFrame::GetClientSize( width, height );
-};
-
-void wxMDIParentFrame::SetToolBar( wxToolBar *toolbar )
-{
-  m_toolBar = toolbar;
-};
-
-wxWindow *wxMDIParentFrame::GetToolBar(void) const
-{
-  return m_toolBar;
-};
+}
 
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const
 {
   return m_currentChild;
-};
+}
 
 wxMDIClientWindow *wxMDIParentFrame::GetClientWindow(void) const
 {
   return m_clientWindow;
-};
+}
 
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient(void)
 {
   m_clientWindow = new wxMDIClientWindow( this );
   return m_clientWindow;
-};
+}
 
 void wxMDIParentFrame::ActivateNext(void)
 {
   if (m_clientWindow)
     gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
-};
+}
 
 void wxMDIParentFrame::ActivatePrevious(void)
 {
   if (m_clientWindow)
     gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
-};
+}
 
 void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )
 {
-};
+}
 
 void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(event) )
 {
-};
+}
 
 //-----------------------------------------------------------------------------
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxPanel)
+IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame)
   
-BEGIN_EVENT_TABLE(wxMDIChildFrame, wxPanel)
-  EVT_CLOSE(wxMDIChildFrame::OnCloseWindow)
+BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
+  EVT_ACTIVATE(wxMDIChildFrame::OnActivate)
 END_EVENT_TABLE()
 
 wxMDIChildFrame::wxMDIChildFrame(void)
 {
-  m_menuBar = NULL;
-  m_page = NULL;
-};
+  m_menuBar = (wxMenuBar *) NULL;
+  m_page = (GtkNotebookPage *) NULL;
+}
 
 wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& WXUNUSED(pos), const wxSize& size,
       long style, const wxString& name )
 {
-  m_menuBar = NULL;
-  m_page = NULL;
+  m_menuBar = (wxMenuBar *) NULL;
+  m_page = (GtkNotebookPage *) NULL;
   Create( parent, id, title, wxDefaultPosition, size, style, name );
-};
+}
 
 wxMDIChildFrame::~wxMDIChildFrame(void)
 {
@@ -211,12 +202,12 @@ wxMDIChildFrame::~wxMDIChildFrame(void)
     wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;
     if (mdi_frame->m_currentChild == this)
     {
-      mdi_frame->SetMDIMenuBar( NULL );
-      mdi_frame->m_currentChild = NULL;
-    };
+      mdi_frame->SetMDIMenuBar( (wxMenuBar *) NULL );
+      mdi_frame->m_currentChild = (wxMDIChildFrame *) NULL;
+    }
     delete m_menuBar;
   }
-};
+}
 
 bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,
@@ -224,25 +215,19 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
       long style, const wxString& name )
 {
   m_title = title;
-  return wxPanel::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
-};
+  return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
+}
 
-void wxMDIChildFrame::OnCloseWindow( wxCloseEvent &event )
+void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
 {
-    if ( GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }
-};
+  wxWindow::GetClientSize( width, height );
+}
 
-bool wxMDIChildFrame::Destroy(void)
+void wxMDIChildFrame::AddChild( wxWindow *child )
 {
-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-
-  return TRUE;
+  wxWindow::AddChild( child );
 }
-
+  
 static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
 {
   menu->SetInvokingWindow( win );
@@ -250,19 +235,20 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
   while (node)
   {
     wxMenuItem *menuitem = (wxMenuItem*)node->Data();
-    if (menuitem->GetSubMenu()) SetInvokingWindow( menuitem->GetSubMenu(), win );
+    if (menuitem->IsSubMenu())
+      SetInvokingWindow( menuitem->GetSubMenu(), win );
     node = node->Next();
-  };
-};
+  }
+}
 
 void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
 {
   m_menuBar = menu_bar;
-  
+
   if (m_menuBar)
   {
     wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;
-    
+
     if (m_menuBar->m_parent != this)
     {
       wxNode *node = m_menuBar->m_menus.First();
@@ -271,8 +257,8 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
         wxMenu *menu = (wxMenu*)node->Data();
         SetInvokingWindow( menu, this );
         node = node->Next();
-      };
-      
+      }
+
       m_menuBar->m_parent = mdi_frame;
     }
     mdi_frame->SetMDIMenuBar( m_menuBar );
@@ -280,11 +266,20 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
     gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_mainWindow),
       m_menuBar->m_widget, m_menuBar->m_x, m_menuBar->m_y );
   }
-};
+}
+
+wxMenuBar *wxMDIChildFrame::GetMenuBar()
+{
+  return m_menuBar;
+}
 
 void wxMDIChildFrame::Activate(void)
 {
-};
+}
+
+void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) )
+{
+}
 
 //-----------------------------------------------------------------------------
 // wxMDIClientWindow
@@ -294,36 +289,36 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow,wxWindow)
 
 wxMDIClientWindow::wxMDIClientWindow(void)
 {
-};
+}
 
 wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
 {
   CreateClient( parent, style );
-};
+}
 
 wxMDIClientWindow::~wxMDIClientWindow(void)
 {
-};
+}
 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {
   m_needParent = TRUE;
-  
+
   PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" );
 
   m_widget = gtk_notebook_new();
-  
+
   gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
                       GTK_SIGNAL_FUNC(gtk_page_change_callback), (gpointer)this );
-		  
+
   gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
-  
+
   PostCreation();
-  
+
   Show( TRUE );
-  
+
   return TRUE;
-};
+}
 
 void wxMDIClientWindow::AddChild( wxWindow *child )
 {
@@ -331,27 +326,29 @@ void wxMDIClientWindow::AddChild( wxWindow *child )
   {
      wxFAIL_MSG("wxNotebook::AddChild: Child has to be wxMDIChildFrame");
      return;
-  };
-  
+  }
+
   m_children.Append( child );
-  
+
   wxString s;
   wxMDIChildFrame* mdi_child = (wxMDIChildFrame*) child;
   s = mdi_child->m_title;
-  if (s.IsNull()) s = "MDI child";
-  
+  if (s.IsNull()) s = _("MDI child");
+
   GtkWidget *label_widget;
   label_widget = gtk_label_new( s );
   gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
-  
+
   gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
     GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
-
+    
   gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), child->m_widget, label_widget );
-  
+
   mdi_child->m_page = (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);
-    
+
   gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), m_children.Number()-1 );
-};
+  
+  gtk_page_change_callback( (GtkNotebook *) NULL, mdi_child->m_page, 0, this );
+}