X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/086b3a5b02f91b0553970b7c68c3bbde7c047ecc..23fbd31a9bfdb14fc7c3406b59fa8141ec68e370:/include/wx/msw/frame.h diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index 4b27759ebf..21b6badf86 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/frame.h @@ -12,7 +12,7 @@ #ifndef _WX_FRAME_H_ #define _WX_FRAME_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "frame.h" #endif @@ -128,8 +128,8 @@ protected: // window proc for the frames long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - // handle WM_INITMENU message - bool HandleInitMenu(); + // handle WM_INITMENUPOPUP message + bool HandleInitMenuPopup(WXHMENU hMenu); virtual bool IsMDIChild() const { return FALSE; } @@ -149,15 +149,12 @@ private: #if wxUSE_TOOLTIPS WXHWND m_hwndToolTip; #endif // tooltips -#ifdef __WXWINCE__ - WXHWND m_commandBar; -#endif // used by IconizeChildFrames(), see comments there bool m_wasMinimized; DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxFrame) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxFrame) }; #endif