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:
@@ -106,8 +106,6 @@ public:
|
||||
// NB: all menu related functions are implemented in menu.cpp
|
||||
|
||||
#if wxUSE_MENUS
|
||||
virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
|
||||
|
||||
// this is wxUniv-specific private method to be used only by wxMenu
|
||||
void DismissPopupMenu();
|
||||
#endif // wxUSE_MENUS
|
||||
@@ -187,7 +185,9 @@ protected:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
// overridden base class virtuals
|
||||
#if wxUSE_MENUS
|
||||
virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
|
||||
#endif // wxUSE_MENUS
|
||||
|
||||
// we deal with the scrollbars in these functions
|
||||
virtual void DoSetClientSize(int width, int height);
|
||||
|
Reference in New Issue
Block a user