X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..8606ee50771053a38554c7d38b765a8142a1a96c:/include/wx/gtk1/stattext.h?ds=sidebyside diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h index c17c410591..6fdfaea16d 100644 --- a/include/wx/gtk1/stattext.h +++ b/include/wx/gtk1/stattext.h @@ -1,35 +1,20 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: stattext.h +// Name: wx/gtk1/stattext.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __GTKSTATICTEXTH__ #define __GTKSTATICTEXTH__ -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/list.h" -#include "wx/control.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticText; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - //----------------------------------------------------------------------------- // wxStaticText //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxStaticText : public wxControl +class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase { public: wxStaticText(); @@ -37,7 +22,7 @@ public: wxWindowID id, const wxString &label, const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, + const wxSize &size = wxDefaultSize, long style = 0, const wxString &name = wxStaticTextNameStr ); @@ -45,30 +30,24 @@ public: wxWindowID id, const wxString &label, const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, + const wxSize &size = wxDefaultSize, long style = 0, const wxString &name = wxStaticTextNameStr ); - wxString GetLabel() const; - void SetLabel( const wxString &label ); + virtual wxString GetLabel() const; + virtual void SetLabel( const wxString &label ); - bool SetFont( const wxFont &font ); - bool SetForegroundColour( const wxColour& colour ); + virtual bool SetFont( const wxFont &font ); + virtual bool SetForegroundColour( const wxColour& colour ); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // see wx/stattext.h - void Wrap(int width); - - // implementation - // -------------- protected: virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - + virtual wxSize DoGetBestSize() const; DECLARE_DYNAMIC_CLASS(wxStaticText)