X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b88201ff5f0f9ed18db555b70eb7123c8a7c9c6..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/gtk1/stattext.h diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h index d114e7b09e..fd70468c9a 100644 --- a/include/wx/gtk1/stattext.h +++ b/include/wx/gtk1/stattext.h @@ -2,7 +2,6 @@ // Name: wx/gtk1/stattext.h // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -10,26 +9,11 @@ #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(); @@ -49,21 +33,15 @@ public: 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, @@ -74,5 +52,4 @@ protected: DECLARE_DYNAMIC_CLASS(wxStaticText) }; -#endif - // __GTKSTATICTEXTH__ +#endif // __GTKSTATICTEXTH__