No real changes, just make wxWindow::CanScroll() virtual.

[wxWidgets.git] / include / wx / gtk / stattext.h

diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h
index 42193ac8d10ad0c9e0492f13ba0dd711c5e5eee3..f6d88cb83acb23b3445d432505efc3e920e0f5f1 100644 (file)
--- a/include/wx/gtk/stattext.h
+++ b/include/wx/gtk/stattext.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk/stattext.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        wx/gtk/stattext.h
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,7 +13,7 @@
 // wxStaticText
 //-----------------------------------------------------------------------------
 
 // wxStaticText
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxStaticText : public wxControl
+class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase

 {
 public:
     wxStaticText();
 {
 public:
     wxStaticText();


@@ -34,18 +33,13 @@ public:
                 long style = 0,
                 const wxString &name = wxStaticTextNameStr );
 
                 long style = 0,
                 const wxString &name = wxStaticTextNameStr );
 

-    wxString GetLabel() const;

     void SetLabel( const wxString &label );
 
     bool SetFont( const wxFont &font );
     void SetLabel( const wxString &label );
 
     bool SetFont( const wxFont &font );

-    bool SetForegroundColour( const wxColour& colour );

 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 

-    // see wx/stattext.h
-    void Wrap(int width);
-

     // implementation
     // --------------
 
     // implementation
     // --------------
 


@@ -53,12 +47,21 @@ protected:
     virtual bool GTKWidgetNeedsMnemonic() const;
     virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
 
     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 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)
 };
 
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 };