X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39d2f9a7c866338762ca974209219f40d4420af6..824a614c4e5c2aeada7b065ce5fb0b3b760bb218:/include/wx/msw/frame.h diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index cc8bd90b35..0680ada270 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 @@ -126,7 +126,7 @@ protected: bool MSWTranslateMessage(WXMSG* pMsg); // window proc for the frames - long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); // handle WM_INITMENUPOPUP message bool HandleInitMenuPopup(WXHMENU hMenu); @@ -154,7 +154,7 @@ private: bool m_wasMinimized; DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxFrame) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxFrame) }; #endif