X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe3d9123c6968b452a95133c635069d6f7ae8ea5..b5d43d1d73da3d4c690af39466fd1d73889df2db:/include/wx/msw/button.h diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h index 5caf45782a..8e5a62461e 100644 --- a/include/wx/msw/button.h +++ b/include/wx/msw/button.h @@ -12,7 +12,7 @@ #ifndef _WX_BUTTON_H_ #define _WX_BUTTON_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "button.h" #endif @@ -51,7 +51,7 @@ public: // implementation from now on virtual void Command(wxCommandEvent& event); - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual bool MSWCommand(WXUINT param, WXWORD id); #ifdef __WIN32__ @@ -81,7 +81,7 @@ protected: virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const ; private: - DECLARE_DYNAMIC_CLASS(wxButton) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton) }; #endif