fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/motif/stattext.h b/include/wx/motif/stattext.h
index e64de49452fe6217960f5951d6f05a288be44d7f..c60f3ac9f840852508d66467c4e26e6c753bca1c 100644 (file)
--- a/include/wx/motif/stattext.h
+++ b/include/wx/motif/stattext.h
@@ -12,15 +12,7 @@
 #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 WXDLLEXPORT wxStaticText: public wxStaticTextBase
 {
     DECLARE_DYNAMIC_CLASS(wxStaticText)
         
@@ -50,14 +42,13 @@ 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.)
+    // Get the widget that corresponds to the label
+    // (for font setting, label setting etc.)
     virtual WXWidget GetLabelWidget() const
         { return m_labelWidget; }