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

correct access for virtuals

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-05-07 01:14:50 +00:00
parent 6121a198d3
commit b45c2fe579
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/wx/msw/frame.h
View File

@@ -55,8 +55,6 @@ public:
virtual wxToolBar* CreateToolBar(long style = -1, virtual wxToolBar* CreateToolBar(long style = -1,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
const wxString& name = wxToolBarNameStr); const wxString& name = wxToolBarNameStr);
virtual void PositionToolBar();
#endif // wxUSE_TOOLBAR #endif // wxUSE_TOOLBAR
// Status bar // Status bar
@@ -66,8 +64,6 @@ public:
wxWindowID id = 0, wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr); const wxString& name = wxStatusLineNameStr);
virtual void PositionStatusBar();
// Hint to tell framework which status bar to use: the default is to use // Hint to tell framework which status bar to use: the default is to use
// native one for the platforms which support it (Win32), the generic one // native one for the platforms which support it (Win32), the generic one
// otherwise // otherwise
@@ -102,6 +98,17 @@ public:
virtual wxPoint GetClientAreaOrigin() const; virtual wxPoint GetClientAreaOrigin() const;
// override base class version to add menu bar accel processing
virtual bool MSWTranslateMessage(WXMSG *msg)
{
return MSWDoTranslateMessage(this, msg);
}
// window proc for the frames
virtual WXLRESULT MSWWindowProc(WXUINT message,
WXWPARAM wParam,
WXLPARAM lParam);
protected: protected:
// common part of all ctors // common part of all ctors
void Init(); void Init();
@@ -122,21 +129,10 @@ protected:
// propagate our state change to all child frames // propagate our state change to all child frames
void IconizeChildFrames(bool bIconize); void IconizeChildFrames(bool bIconize);
// override base class version to add menu bar accel processing
virtual bool MSWTranslateMessage(WXMSG *msg)
{
return MSWDoTranslateMessage(this, msg);
}
// the real implementation of MSWTranslateMessage(), also used by // the real implementation of MSWTranslateMessage(), also used by
// wxMDIChildFrame // wxMDIChildFrame
bool MSWDoTranslateMessage(wxFrame *frame, WXMSG *msg); bool MSWDoTranslateMessage(wxFrame *frame, WXMSG *msg);
// window proc for the frames
virtual WXLRESULT MSWWindowProc(WXUINT message,
WXWPARAM wParam,
WXLPARAM lParam);
// handle WM_INITMENUPOPUP message to generate wxEVT_MENU_OPEN // handle WM_INITMENUPOPUP message to generate wxEVT_MENU_OPEN
bool HandleInitMenuPopup(WXHMENU hMenu); bool HandleInitMenuPopup(WXHMENU hMenu);
@@ -145,7 +141,13 @@ protected:
// get default (wxWidgets) icon for the frame // get default (wxWidgets) icon for the frame
virtual WXHICON GetDefaultIcon() const; virtual WXHICON GetDefaultIcon() const;
#if wxUSE_TOOLBAR
virtual void PositionToolBar();
#endif // wxUSE_TOOLBAR
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
virtual void PositionStatusBar();
static bool m_useNativeStatusBar; static bool m_useNativeStatusBar;
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR