added wxTE_BESTWRAP style (which is the default now); renamed wxTE_LINEWRAP to wxTE_C...

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

diff --git a/include/wx/motif/stattext.h b/include/wx/motif/stattext.h
index c58bcaa7cc8df4975ae16c3927beb1cc2fdd85e3..a322eb87eb0a566299e4f690590d95b8fee30531 100644 (file)
--- a/include/wx/motif/stattext.h
+++ b/include/wx/motif/stattext.h
@@ -12,15 +12,11 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "stattext.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
-
-class WXDLLEXPORT wxStaticText: public wxControl
+class WXDLLEXPORT wxStaticText: public wxStaticTextBase
 {
     DECLARE_DYNAMIC_CLASS(wxStaticText)
         
@@ -50,12 +46,18 @@ public:
     // 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.)
+    virtual WXWidget GetLabelWidget() const
+        { return m_labelWidget; }
+    
+protected:
+    WXWidget              m_labelWidget;
 };
 
 #endif