X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcdf8bc7ca806d8278c7cb6d09d5590378b67d8..8cb9f0d0f82650b707adc39823a73531d080ffec:/include/wx/msw/stattext.h?ds=inline diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h index dbb3646a0a..fd0f63d801 100644 --- a/include/wx/msw/stattext.h +++ b/include/wx/msw/stattext.h @@ -6,58 +6,55 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_STATTEXT_H_ #define _WX_STATTEXT_H_ #ifdef __GNUG__ -#pragma interface "stattext.h" + #pragma interface "stattext.h" #endif #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr; -class WXDLLEXPORT wxStaticText: public wxControl +class WXDLLEXPORT wxStaticText : public wxControl { - DECLARE_DYNAMIC_CLASS(wxStaticText) - public: - inline wxStaticText(void) { } - - inline 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 SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - void SetLabel(const wxString&); - - // 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); - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); +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) + { + 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); + + // overriden base class virtuals + virtual bool AcceptsFocus() const { return FALSE; } + + // callbacks + virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + +protected: + virtual wxSize DoGetBestSize() const; }; #endif