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:
@@ -183,6 +183,7 @@ protected:
|
||||
virtual void DoSetClientSize(int width, int height);
|
||||
virtual void InternalSetMenuBar();
|
||||
virtual bool IsMDIChild() const { return true; }
|
||||
virtual void DetachMenuBar();
|
||||
|
||||
virtual WXHICON GetDefaultIcon() const;
|
||||
|
||||
@@ -192,7 +193,6 @@ protected:
|
||||
private:
|
||||
bool m_needsInitialShow; // Show must be called in idle time after Creation
|
||||
bool m_needsResize; // flag which tells us to artificially resize the frame
|
||||
virtual void DetachMenuBar() ;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame)
|
||||
@@ -220,10 +220,11 @@ public:
|
||||
// Explicitly call default scroll behaviour
|
||||
void OnScroll(wxScrollEvent& event);
|
||||
|
||||
protected:
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
protected:
|
||||
|
||||
void Init() { m_scrollX = m_scrollY = 0; }
|
||||
|
||||
int m_scrollX, m_scrollY;
|
||||
|
Reference in New Issue
Block a user