X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b01a88e05073b9a86c406d368be8ebb340ba9215..da9e956384a0619a0ecaa0bd1e4ba26b133b60a9:/include/wx/msw/frame.h diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index 7decd43e5c..10c17972d5 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/frame.h @@ -12,22 +12,18 @@ #ifndef _WX_FRAME_H_ #define _WX_FRAME_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "frame.h" -#endif - class WXDLLEXPORT wxFrame : public wxFrameBase { public: // construction wxFrame() { Init(); } wxFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr) { Init(); @@ -83,7 +79,9 @@ public: { return m_useNativeStatusBar; }; #endif // wxUSE_STATUSBAR +#if wxUSE_MENUS WXHMENU GetWinMenu() const { return m_hMenu; } +#endif // wxUSE_MENUS // event handlers bool HandlePaint(); @@ -142,6 +140,11 @@ protected: static bool m_useNativeStatusBar; #endif // wxUSE_STATUSBAR +#if wxUSE_MENUS + // frame menu, NULL if none + WXHMENU m_hMenu; +#endif // wxUSE_MENUS + private: #if wxUSE_TOOLTIPS WXHWND m_hwndToolTip;