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

virtual function hiding problem

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-09-16 04:54:25 +00:00
parent c09245191c
commit 923b48fc63
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/generic/mdig.h
View File

@@ -63,7 +63,7 @@ public:
#if wxUSE_MENUS #if wxUSE_MENUS
wxMenu* GetWindowMenu() const { return m_pWindowMenu; }; wxMenu* GetWindowMenu() const { return m_pWindowMenu; };
void SetWindowMenu(wxMenu* pMenu); void SetWindowMenu(wxMenu* pMenu);
virtual void SetMenuBar(wxMenuBar *pMenuBar); virtual void SetMenuBar(wxMenuBar *pMenuBar);
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
@@ -134,13 +134,13 @@ public:
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr ); const wxString& name = wxFrameNameStr );
#if wxUSE_MENUS #if wxUSE_MENUS
virtual void SetMenuBar( wxMenuBar *menu_bar ); virtual void SetMenuBar( wxMenuBar *menu_bar );
virtual wxMenuBar *GetMenuBar() const; virtual wxMenuBar *GetMenuBar() const;
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
virtual void SetTitle(const wxString& title); virtual void SetTitle(const wxString& title);
virtual wxString GetTitle(); virtual wxString GetTitle() const;
virtual void Activate(); virtual void Activate();
@@ -187,8 +187,8 @@ public:
virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return FALSE; } virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return FALSE; }
virtual bool IsFullScreen() const { return FALSE; } virtual bool IsFullScreen() const { return FALSE; }
virtual bool IsTopLevel() const { return FALSE; } virtual bool IsTopLevel() const { return FALSE; }
void OnMenuHighlight(wxMenuEvent& event); void OnMenuHighlight(wxMenuEvent& event);
void OnActivate(wxActivateEvent& event); void OnActivate(wxActivateEvent& event);
@@ -206,7 +206,7 @@ protected:
#if wxUSE_MENUS #if wxUSE_MENUS
wxMenuBar *m_pMenuBar; wxMenuBar *m_pMenuBar;
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
protected: protected:
void Init(); void Init();
@@ -214,7 +214,7 @@ protected:
virtual void DoMoveWindow(int x, int y, int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height);
// This function needs to be called when a size change is confirmed, // This function needs to be called when a size change is confirmed,
// we needed this function to prevent any body from the outside // we needed this function to prevent any body from the outside
// changing the panel... it messes the UI layout when we would allow it. // changing the panel... it messes the UI layout when we would allow it.
void ApplyMDIChildFrameRect(); void ApplyMDIChildFrameRect();
@@ -256,7 +256,7 @@ private:
*/ */
#ifndef wxUSE_GENERIC_MDI_AS_NATIVE #ifndef wxUSE_GENERIC_MDI_AS_NATIVE
#if defined(__WXUNIVERSAL__) #if defined(__WXUNIVERSAL__) || defined(__WXPM__)
#define wxUSE_GENERIC_MDI_AS_NATIVE 1 #define wxUSE_GENERIC_MDI_AS_NATIVE 1
#else #else
#define wxUSE_GENERIC_MDI_AS_NATIVE 0 #define wxUSE_GENERIC_MDI_AS_NATIVE 0