X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0416c41834f36316a03720c4ed05cdf36964a2f3..3d777efedc1e05bd6c2a7c34a00a65895b62bb13:/include/wx/gtk/stattext.h?ds=sidebyside diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h index 2510336918..f6d88cb83a 100644 --- a/include/wx/gtk/stattext.h +++ b/include/wx/gtk/stattext.h @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 _WX_GTK_STATTEXT_H_ @@ -14,7 +13,7 @@ // wxStaticText //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxStaticText : public wxControl +class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase { public: wxStaticText(); @@ -22,7 +21,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 ); @@ -30,21 +29,16 @@ 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 // -------------- @@ -53,13 +47,23 @@ 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 // _WX_GTK_STATTEXT_H_ +#endif + // _WX_GTK_STATTEXT_H_