virtual functionsignature corrected

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index f2a3f7367acbae73e7d3d9fc3564d0df68444675..0613d4c81e2281a456386aa7845ea4f9cc24e60c 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -115,7 +115,7 @@ class wxMDIChildFrame: public wxFrame
   virtual wxMenuBar *GetMenuBar() const;
 
   virtual void GetClientSize( int *width, int *height ) const;
   virtual wxMenuBar *GetMenuBar() const;
 
   virtual void GetClientSize( int *width, int *height ) const;

-  virtual void AddChild( wxWindow *child );
+  virtual void AddChild( wxWindowBase *child );

 
   virtual void Activate();
     
 
   virtual void Activate();
     

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index f2a3f7367acbae73e7d3d9fc3564d0df68444675..0613d4c81e2281a456386aa7845ea4f9cc24e60c 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -115,7 +115,7 @@ class wxMDIChildFrame: public wxFrame
   virtual wxMenuBar *GetMenuBar() const;
 
   virtual void GetClientSize( int *width, int *height ) const;
   virtual wxMenuBar *GetMenuBar() const;
 
   virtual void GetClientSize( int *width, int *height ) const;

-  virtual void AddChild( wxWindow *child );
+  virtual void AddChild( wxWindowBase *child );

 
   virtual void Activate();
     
 
   virtual void Activate();
     

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index ab91caff859f8bd1dcbfc31000c1cd367dd817df..1be26bfcd70d7ba8fae5c494070bdbe420882fb7 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -312,9 +312,9 @@ void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
     wxWindow::GetClientSize( width, height );
 }
 
     wxWindow::GetClientSize( width, height );
 }
 

-void wxMDIChildFrame::AddChild( wxWindow *child )
+void wxMDIChildFrame::AddChild( wxWindowBase *child )

 {
 {

-    wxWindow::AddChild( child );
+    wxWindow::AddChild(child);

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

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index ab91caff859f8bd1dcbfc31000c1cd367dd817df..1be26bfcd70d7ba8fae5c494070bdbe420882fb7 100644 (file)
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -312,9 +312,9 @@ void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
     wxWindow::GetClientSize( width, height );
 }
 
     wxWindow::GetClientSize( width, height );
 }
 

-void wxMDIChildFrame::AddChild( wxWindow *child )
+void wxMDIChildFrame::AddChild( wxWindowBase *child )

 {
 {

-    wxWindow::AddChild( child );
+    wxWindow::AddChild(child);

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