X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe5de1ea1041bc97e3e2735e6866ad3485eea78c..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/motif/stattext.h?ds=inline

diff --git a/include/wx/motif/stattext.h b/include/wx/motif/stattext.h
index 336ff7ae76..cd9893ebfa 100644
--- a/include/wx/motif/stattext.h
+++ b/include/wx/motif/stattext.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.h
+// Name:        wx/motif/stattext.h
 // Purpose:     wxStaticText class
 // Author:      Julian Smart
 // Modified by:
@@ -12,21 +12,13 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
-#ifdef __GNUG__
-#pragma interface "stattext.h"
-#endif
-
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
-
-class WXDLLEXPORT wxStaticText: public wxControl
+class WXDLLIMPEXP_CORE wxStaticText: public wxStaticTextBase
 {
     DECLARE_DYNAMIC_CLASS(wxStaticText)
-        
+
 public:
     wxStaticText() { }
-    
+
     wxStaticText(wxWindow *parent, wxWindowID id,
         const wxString& label,
         const wxPoint& pos = wxDefaultPosition,
@@ -36,32 +28,34 @@ public:
     {
         Create(parent, id, label, pos, size, style, name);
     }
-    
+
     bool Create(wxWindow *parent, wxWindowID id,
         const wxString& label,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
         const wxString& name = wxStaticTextNameStr);
-    
+
     // implementation
     // --------------
-    
+
     // operations
     virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
     {
-        return FALSE;
+        return false;
     }
-    
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
+
     virtual void SetLabel(const wxString& label);
-    
-    // Get the widget that corresponds to the label (for font setting, label setting etc.)
+
+    // Get the widget that corresponds to the label
+    // (for font setting, label setting etc.)
     virtual WXWidget GetLabelWidget() const
         { return m_labelWidget; }
-    
+
+    virtual void DoSetLabel(const wxString& str);
+    virtual wxString DoGetLabel() const;
+
+    virtual wxSize DoGetBestSize() const;
 protected:
     WXWidget              m_labelWidget;
 };