X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c7afb7435d11d7b67d16c51e1302cad5572491e..ce195ee63259e9a70136adef1ddcec4132647f96:/include/wx/msw/frame.h diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index b858afcd54..c7fb8ed76c 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/frame.h @@ -57,7 +57,7 @@ public: // Toolbar #if wxUSE_TOOLBAR virtual wxToolBar* CreateToolBar(long style = -1, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxString& name = wxToolBarNameStr); virtual void PositionToolBar(); @@ -83,7 +83,9 @@ public: { return m_useNativeStatusBar; }; #endif // wxUSE_STATUSBAR +#if wxUSE_MENUS WXHMENU GetWinMenu() const { return m_hMenu; } +#endif // wxUSE_MENUS // event handlers bool HandlePaint(); @@ -103,7 +105,7 @@ public: virtual void SendSizeEvent(); virtual wxPoint GetClientAreaOrigin() const; - + protected: // common part of all ctors void Init(); @@ -133,7 +135,7 @@ protected: // handle WM_INITMENUPOPUP message bool HandleInitMenuPopup(WXHMENU hMenu); - virtual bool IsMDIChild() const { return FALSE; } + virtual bool IsMDIChild() const { return false; } // get default (wxWidgets) icon for the frame virtual WXHICON GetDefaultIcon() const; @@ -142,10 +144,10 @@ protected: static bool m_useNativeStatusBar; #endif // wxUSE_STATUSBAR - // Data to save/restore when calling ShowFullScreen - int m_fsStatusBarFields; // 0 for no status bar - int m_fsStatusBarHeight; - int m_fsToolBarHeight; +#if wxUSE_MENUS + // frame menu, NULL if none + WXHMENU m_hMenu; +#endif // wxUSE_MENUS private: #if wxUSE_TOOLTIPS