X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9d171bd008f9512f14693438af33c89ccf166a9..d61f7200331a1cd1a3b2353292e6801511ccbc5d:/include/wx/msw/stattext.h diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h index 29561640a9..0ceef4c977 100644 --- a/include/wx/msw/stattext.h +++ b/include/wx/msw/stattext.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: stattext.h +// Name: wx/msw/stattext.h // Purpose: wxStaticText class // Author: Julian Smart // Modified by: @@ -12,7 +12,7 @@ #ifndef _WX_STATTEXT_H_ #define _WX_STATTEXT_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "stattext.h" #endif @@ -45,12 +45,14 @@ public: virtual bool SetFont( const wxFont &font ); protected: + // implement/override some base class virtuals + virtual wxBorder GetDefaultBorder() const; virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags = wxSIZE_AUTO); virtual wxSize DoGetBestSize() const; - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; - DECLARE_DYNAMIC_CLASS(wxStaticText) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText) }; #endif