X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4438caf41af49f00f3c8137ac801871f59cce386..0ecd03525b34edba886ca83ff724265cd912dbbd:/include/wx/msw/stattext.h?ds=sidebyside diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h index f21a4bd3b0..2bae454889 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,51 +12,46 @@ #ifndef _WX_STATTEXT_H_ #define _WX_STATTEXT_H_ -#ifdef __GNUG__ - #pragma interface "stattext.h" -#endif - -#include "wx/control.h" - -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr; - -class WXDLLEXPORT wxStaticText : public wxControl +class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase { -DECLARE_DYNAMIC_CLASS(wxStaticText) - public: wxStaticText() { } - wxStaticText(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticTextNameStr) + wxStaticText(wxWindow *parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxStaticTextNameStr) { Create(parent, id, label, pos, size, style, name); } - bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticTextNameStr); - - // accessors - void SetLabel(const wxString& label); + bool Create(wxWindow *parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxStaticTextNameStr); - // overriden base class virtuals - virtual bool AcceptsFocus() const { return FALSE; } + // override some methods to resize the window properly + virtual void SetLabel(const wxString& label); + virtual bool SetFont( const wxFont &font ); - // callbacks - virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; protected: - virtual wxSize DoGetBestSize(); + // implement/override some base class virtuals + virtual void DoSetSize(int x, int y, int w, int h, + int sizeFlags = wxSIZE_AUTO); + virtual wxSize DoGetBestClientSize() const; + + virtual wxString DoGetLabel() const; + virtual void DoSetLabel(const wxString& str); + + DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText) }; #endif