X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46a5e01e86793839f256c978bd7d30ab2192b2c9..fb8a56b77ce195d0bd9ac6984e3e5cbb7136faca:/include/wx/msw/statbmp.h diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index 85f801a163..e778d2e373 100644 --- a/include/wx/msw/statbmp.h +++ b/include/wx/msw/statbmp.h @@ -12,7 +12,7 @@ #ifndef _WX_STATBMP_H_ #define _WX_STATBMP_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "statbmp.h" #endif @@ -74,12 +74,10 @@ public: // ------------------------------- // implement base class virtuals -#ifdef __WIN16__ - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); -#endif // __WIN16__ - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); protected: + virtual wxBorder GetDefaultBorder() const; virtual wxSize DoGetBestSize() const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; @@ -99,6 +97,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxStaticBitmap) + DECLARE_NO_COPY_CLASS(wxStaticBitmap) }; #endif