X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..14b44999eb335f3fc84b4362980b1730b8887588:/include/wx/gtk/stattext.h?ds=sidebyside diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h index c17c410591..78241efe29 100644 --- a/include/wx/gtk/stattext.h +++ b/include/wx/gtk/stattext.h @@ -1,35 +1,20 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: stattext.h +// Name: wx/gtk/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 -//----------------------------------------------------------------------------- +#ifndef _WX_GTK_STATTEXT_H_ +#define _WX_GTK_STATTEXT_H_ //----------------------------------------------------------------------------- // 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,33 +30,45 @@ 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 ); bool SetFont( const wxFont &font ); - bool SetForegroundColour( const wxColour& colour ); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // see wx/stattext.h - void Wrap(int width); // implementation // -------------- protected: + virtual bool GTKWidgetNeedsMnemonic() const; + virtual void GTKWidgetDoSetMnemonic(GtkWidget* w); + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - + virtual wxSize DoGetBestSize() const; + virtual wxString DoGetLabel() const; + virtual void DoSetLabel(const wxString& str); +#if wxUSE_MARKUP + virtual bool DoSetLabelMarkup(const wxString& markup); +#endif // wxUSE_MARKUP + +private: + // Common part of SetLabel() and DoSetLabelMarkup(). + typedef void (wxStaticText::*GTKLabelSetter)(GtkLabel *, const wxString&); + + void GTKDoSetLabel(GTKLabelSetter setter, const wxString& label); + + DECLARE_DYNAMIC_CLASS(wxStaticText) }; -#endif // __GTKSTATICTEXTH__ +#endif + // _WX_GTK_STATTEXT_H_