wxMDIFrames define DoGetClientSize() and not GetClientSize() to avoid hiding

the base class methods

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

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 2e4d00c55eada0a5a18ef68da666fda43f2f9eb5..46f5992d9fe71d02e373ddab2fd0724b8ad44f27 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -59,12 +59,14 @@ public:
         (void)Create(parent, id, title, pos, size, style, name);
     }
 
-    ~wxMDIParentFrame(void);
+    ~wxMDIParentFrame();
     bool Create( wxWindow *parent,
-       wxWindowID id, const wxString& title,
-       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-       long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-       const wxString& name = wxFrameNameStr );
+                 wxWindowID id,
+                 const wxString& title,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
+                 const wxString& name = wxFrameNameStr );
 
     wxMDIChildFrame *GetActiveChild() const;
 

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 2e4d00c55eada0a5a18ef68da666fda43f2f9eb5..46f5992d9fe71d02e373ddab2fd0724b8ad44f27 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -59,12 +59,14 @@ public:
         (void)Create(parent, id, title, pos, size, style, name);
     }
 
-    ~wxMDIParentFrame(void);
+    ~wxMDIParentFrame();
     bool Create( wxWindow *parent,
-       wxWindowID id, const wxString& title,
-       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-       long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-       const wxString& name = wxFrameNameStr );
+                 wxWindowID id,
+                 const wxString& title,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
+                 const wxString& name = wxFrameNameStr );
 
     wxMDIChildFrame *GetActiveChild() const;
 

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index b87d71f7539d086eba29ef7e36a832f175286a55..34c130d9d59f91c34535c2b51feba75d9a46c7ff 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -225,9 +225,9 @@ void wxMDIParentFrame::OnInternalIdle()
     }
 }
 
-void wxMDIParentFrame::GetClientSize(int *width, int *height ) const
+void wxMDIParentFrame::DoGetClientSize(int *width, int *height ) const
 {
-    wxFrame::GetClientSize( width, height );
+    wxFrame::DoGetClientSize( width, height );
 }
 
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
@@ -327,9 +327,9 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
     return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
 }
 
-void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
+void wxMDIChildFrame::DoGetClientSize( int *width, int *height ) const
 {
-    wxWindow::GetClientSize( width, height );
+    wxWindow::DoGetClientSize( width, height );
 }
 
 void wxMDIChildFrame::AddChild( wxWindowBase *child )

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index b87d71f7539d086eba29ef7e36a832f175286a55..34c130d9d59f91c34535c2b51feba75d9a46c7ff 100644 (file)
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -225,9 +225,9 @@ void wxMDIParentFrame::OnInternalIdle()
     }
 }
 
-void wxMDIParentFrame::GetClientSize(int *width, int *height ) const
+void wxMDIParentFrame::DoGetClientSize(int *width, int *height ) const
 {
-    wxFrame::GetClientSize( width, height );
+    wxFrame::DoGetClientSize( width, height );
 }
 
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
@@ -327,9 +327,9 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
     return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
 }
 
-void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
+void wxMDIChildFrame::DoGetClientSize( int *width, int *height ) const
 {
-    wxWindow::GetClientSize( width, height );
+    wxWindow::DoGetClientSize( width, height );
 }
 
 void wxMDIChildFrame::AddChild( wxWindowBase *child )