X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/396bdd5ab1b1a66748642c67d8f81315a10557ad..6c00e46fa83e3a9c0e76a76f15522a10b3a5c67f:/include/wx/msw/stattext.h?ds=inline diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h index 81595e9939..e59beeab30 100644 --- a/include/wx/msw/stattext.h +++ b/include/wx/msw/stattext.h @@ -18,7 +18,7 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr; class WXDLLEXPORT wxStaticText : public wxControl { @@ -45,24 +45,20 @@ public: const wxString& name = wxStaticTextNameStr); // accessors - void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO) - { wxWindow::SetSize(rect, sizeFlags); } - void SetSize(const wxSize& size) - { wxWindow::SetSize(size); } void SetLabel(const wxString& label); - // operations - virtual void Command(wxCommandEvent& WXUNUSED(event)) { } - virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { } - // overriden base class virtuals virtual bool AcceptsFocus() const { return FALSE; } // callbacks virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + WXUINT message, WXWPARAM wParam, WXLPARAM lParam); virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + +protected: + virtual void DoSetSize(int x, int y, + int width, int height, + int sizeFlags = wxSIZE_AUTO); }; #endif