Version 0.4 of wxPython for MSW.

[wxWidgets.git] / src / gtk1 / mdi.cpp

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index 25dc7ba34b9ff5eea459078607a027545c5a60ec..f902779e8437ae80ede0c2e079d64b3982b30376 100644 (file)
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -34,10 +34,10 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
       (win->m_height == alloc->height))
   {
     return;
       (win->m_height == alloc->height))
   {
     return;

-  };
+  }

 
   win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 
   win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );

-};
+}

 
 // page change callback
 static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget),
 
 // page change callback
 static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget),


@@ -55,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;
       mdi_frame->m_currentChild = child_frame;
       mdi_frame->SetMDIMenuBar( child_frame->m_menuBar );
       return;

-    };
+    }

     node = node->Next();
   }
 }
     node = node->Next();
   }
 }


@@ -69,25 +69,25 @@ END_EVENT_TABLE()
 
 wxMDIParentFrame::wxMDIParentFrame(void)
 {
 
 wxMDIParentFrame::wxMDIParentFrame(void)
 {

-  m_clientWindow = NULL;
-  m_currentChild = NULL;
+  m_clientWindow = (wxMDIClientWindow *) NULL;
+  m_currentChild = (wxMDIChildFrame *) NULL;

   m_parentFrameActive = TRUE;
   m_parentFrameActive = TRUE;

-};
+}

 
 wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& pos, const wxSize& size,
       long style, const wxString& name )
 {
 
 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;
   Create( parent, id, title, pos, size, style, name );
   m_parentFrameActive = TRUE;
   Create( parent, id, title, pos, size, style, name );

-};
+}

 
 wxMDIParentFrame::~wxMDIParentFrame(void)
 {
 
 wxMDIParentFrame::~wxMDIParentFrame(void)
 {

-};
+}

 
 bool wxMDIParentFrame::Create( wxWindow *parent,
       wxWindowID id, const wxString& title,
 
 bool wxMDIParentFrame::Create( wxWindow *parent,
       wxWindowID id, const wxString& title,


@@ -99,7 +99,7 @@ bool wxMDIParentFrame::Create( wxWindow *parent,
   OnCreateClient();
 
   return TRUE;
   OnCreateClient();
 
   return TRUE;

-};
+}

 
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 {
 
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 {


@@ -112,7 +112,7 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
     GetClientSize( &x, &y );
     m_mdiMenuBar->SetSize( 1, 1, x-2, 26 );
   }
     GetClientSize( &x, &y );
     m_mdiMenuBar->SetSize( 1, 1, x-2, 26 );
   }

-};
+}

 
 void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
 {
 
 void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
 {


@@ -126,48 +126,48 @@ void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
     m_mdiMenuBar->SetSize( 1, 1, x-2, 26 );
     m_mdiMenuBar->Show( TRUE );
   }
     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::GetClientSize(int *width, int *height ) const
 {
   wxFrame::GetClientSize( width, height );

-};
+}

 
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const
 {
   return m_currentChild;
 
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const
 {
   return m_currentChild;

-};
+}

 
 wxMDIClientWindow *wxMDIParentFrame::GetClientWindow(void) const
 {
   return m_clientWindow;
 
 wxMDIClientWindow *wxMDIParentFrame::GetClientWindow(void) const
 {
   return m_clientWindow;

-};
+}

 
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient(void)
 {
   m_clientWindow = new wxMDIClientWindow( this );
   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::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::ActivatePrevious(void)
 {
   if (m_clientWindow)
     gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );

-};
+}

 
 void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )
 {
 
 void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )
 {

-};
+}

 
 void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(event) )
 {
 
 void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(event) )
 {

-};
+}

 
 //-----------------------------------------------------------------------------
 // wxMDIChildFrame
 
 //-----------------------------------------------------------------------------
 // wxMDIChildFrame


@@ -181,19 +181,19 @@ END_EVENT_TABLE()
 
 wxMDIChildFrame::wxMDIChildFrame(void)
 {
 
 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 )
 {
 
 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 );
   Create( parent, id, title, wxDefaultPosition, size, style, name );

-};
+}

 
 wxMDIChildFrame::~wxMDIChildFrame(void)
 {
 
 wxMDIChildFrame::~wxMDIChildFrame(void)
 {


@@ -202,12 +202,12 @@ wxMDIChildFrame::~wxMDIChildFrame(void)
     wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;
     if (mdi_frame->m_currentChild == this)
     {
     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;
   }
     delete m_menuBar;
   }

-};
+}

 
 bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,
 
 bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,


@@ -216,7 +216,7 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
 {
   m_title = title;
   return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
 {
   m_title = title;
   return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );

-};
+}

 
 void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
 {
 
 void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
 {


@@ -238,8 +238,8 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
     if (menuitem->IsSubMenu())
       SetInvokingWindow( menuitem->GetSubMenu(), win );
     node = node->Next();
     if (menuitem->IsSubMenu())
       SetInvokingWindow( menuitem->GetSubMenu(), win );
     node = node->Next();

-  };
-};
+  }
+}

 
 void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
 {
 
 void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
 {


@@ -257,7 +257,7 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
         wxMenu *menu = (wxMenu*)node->Data();
         SetInvokingWindow( menu, this );
         node = node->Next();
         wxMenu *menu = (wxMenu*)node->Data();
         SetInvokingWindow( menu, this );
         node = node->Next();

-      };
+      }

 
       m_menuBar->m_parent = mdi_frame;
     }
 
       m_menuBar->m_parent = mdi_frame;
     }


@@ -266,20 +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 );
   }
     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;
 
 wxMenuBar *wxMDIChildFrame::GetMenuBar()
 {
   return m_menuBar;

-};
+}

 
 void wxMDIChildFrame::Activate(void)
 {
 
 void wxMDIChildFrame::Activate(void)
 {

-};
+}

 
 void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) )
 {
 
 void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) )
 {

-};
+}

 
 //-----------------------------------------------------------------------------
 // wxMDIClientWindow
 
 //-----------------------------------------------------------------------------
 // wxMDIClientWindow


@@ -289,16 +289,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow,wxWindow)
 
 wxMDIClientWindow::wxMDIClientWindow(void)
 {
 
 wxMDIClientWindow::wxMDIClientWindow(void)
 {

-};
+}

 
 wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
 {
   CreateClient( parent, style );
 
 wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
 {
   CreateClient( parent, style );

-};
+}

 
 wxMDIClientWindow::~wxMDIClientWindow(void)
 {
 
 wxMDIClientWindow::~wxMDIClientWindow(void)
 {

-};
+}

 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {
 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {


@@ -318,15 +318,15 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
   Show( TRUE );
 
   return TRUE;
   Show( TRUE );
 
   return TRUE;

-};
+}

 
 void wxMDIClientWindow::AddChild( wxWindow *child )
 {
   if (!child->IsKindOf(CLASSINFO(wxMDIChildFrame)))
   {
 
 void wxMDIClientWindow::AddChild( wxWindow *child )
 {
   if (!child->IsKindOf(CLASSINFO(wxMDIChildFrame)))
   {

-     wxFAIL_MSG(_("wxNotebook::AddChild: Child has to be wxMDIChildFrame"));
+     wxFAIL_MSG("wxNotebook::AddChild: Child has to be wxMDIChildFrame");

      return;
      return;

-  };
+  }

 
   m_children.Append( child );
 
 
   m_children.Append( child );
 


@@ -348,7 +348,7 @@ void wxMDIClientWindow::AddChild( wxWindow *child )
 
   gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), m_children.Number()-1 );
   
 
   gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), m_children.Number()-1 );
   

-  gtk_page_change_callback( NULL, mdi_child->m_page, 0, this );
-};
+  gtk_page_change_callback( (GtkNotebook *) NULL, mdi_child->m_page, 0, this );
+}