Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
the base class methods


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-08-10 11:00:06 +00:00
parent 885df446a3
commit 40d432c482
4 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/gtk/mdi.h
View File

@@ -59,12 +59,14 @@ public:
(void)Create(parent, id, title, pos, size, style, name); (void)Create(parent, id, title, pos, size, style, name);
} }
~wxMDIParentFrame(void); ~wxMDIParentFrame();
bool Create( wxWindow *parent, bool Create( wxWindow *parent,
wxWindowID id, const wxString& title, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxString& title,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, const wxPoint& pos = wxDefaultPosition,
const wxString& name = wxFrameNameStr ); const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr );
wxMDIChildFrame *GetActiveChild() const; wxMDIChildFrame *GetActiveChild() const;

12
include/wx/gtk1/mdi.h
View File

@@ -59,12 +59,14 @@ public:
(void)Create(parent, id, title, pos, size, style, name); (void)Create(parent, id, title, pos, size, style, name);
} }
~wxMDIParentFrame(void); ~wxMDIParentFrame();
bool Create( wxWindow *parent, bool Create( wxWindow *parent,
wxWindowID id, const wxString& title, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxString& title,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, const wxPoint& pos = wxDefaultPosition,
const wxString& name = wxFrameNameStr ); const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr );
wxMDIChildFrame *GetActiveChild() const; wxMDIChildFrame *GetActiveChild() const;

8
src/gtk/mdi.cpp
View File

@@ -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 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
@@ -327,9 +327,9 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name ); 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 ) void wxMDIChildFrame::AddChild( wxWindowBase *child )

8
src/gtk1/mdi.cpp
View File

@@ -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 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
@@ -327,9 +327,9 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name ); 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 ) void wxMDIChildFrame::AddChild( wxWindowBase *child )