blind fix for compilation error in EVT macros

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

diff --git a/include/wx/motif/stattext.h b/include/wx/motif/stattext.h
index 495558dc7626b5865acf15f276077449bfb37ed6..1bff85cc9559f7a778d4249a9f7d5f3697e35f8e 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_
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "stattext.h"
 #endif
 
 #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)
         
 {
     DECLARE_DYNAMIC_CLASS(wxStaticText)
         


@@ -53,12 +49,10 @@ public:
         return FALSE;
     }
     
         return FALSE;
     }
     

-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();

     virtual void SetLabel(const wxString& label);
     
     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 WXWidget GetLabelWidget() const
         { return m_labelWidget; }