make access specifiers for the virtual functions match their access in the base class (patch 1400131)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-02-08 21:47:09 +00:00
parent e4ccedf7b2
commit 6f02a879ed
133 changed files with 611 additions and 533 deletions

View File

@@ -72,7 +72,6 @@ public:
wxWindowID id = -1,
const wxString& name = wxToolBarNameStr);
virtual void PositionToolBar();
virtual void SetToolBar(wxToolBar *toolbar);
#endif // wxUSE_TOOLBAR
@@ -82,8 +81,6 @@ public:
long style = wxST_SIZEGRIP,
wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr);
virtual void PositionStatusBar();
#endif // wxUSE_STATUSBAR
// tooltip management
@@ -97,10 +94,19 @@ public:
void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
wxWindow *GetLastFocus() const { return m_winLastFocused; }
void PositionBars();
protected:
// common part of all ctors
void Init();
#if wxUSE_TOOLBAR
virtual void PositionToolBar();
#endif
#if wxUSE_STATUSBAR
virtual void PositionStatusBar();
#endif
// override base class virtuals
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoSetClientSize(int width, int height);