Add comment about wxBitmap::SetPalette() not being implemented

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

diff --git a/include/wx/motif/stattext.h b/include/wx/motif/stattext.h
index e9f3ca82254f16ae66dd9c3ed535197efbf04245..1bff85cc9559f7a778d4249a9f7d5f3697e35f8e 100644 (file)
--- a/include/wx/motif/stattext.h
+++ b/include/wx/motif/stattext.h
@@ -12,51 +12,53 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 

-#ifdef __GNUG__
+#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)

-
+        

 public:
     wxStaticText() { }
 public:
     wxStaticText() { }

-
+    

     wxStaticText(wxWindow *parent, wxWindowID id,
     wxStaticText(wxWindow *parent, wxWindowID id,

-            const wxString& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0,
-            const wxString& name = wxStaticTextNameStr)
+        const wxString& label,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
+        const wxString& name = wxStaticTextNameStr)

     {
         Create(parent, id, label, pos, size, style, name);
     }
     {
         Create(parent, id, label, pos, size, style, name);
     }

-
+    

     bool Create(wxWindow *parent, wxWindowID id,
     bool Create(wxWindow *parent, wxWindowID id,

-            const wxString& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0,
-            const wxString& name = wxStaticTextNameStr);
-
+        const wxString& label,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
+        const wxString& name = wxStaticTextNameStr);
+    

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

-
+    

     // operations
     virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
     {
         return FALSE;
     }
     // operations
     virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
     {
         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
 };
 
 #endif

-    // _WX_STATTEXT_H_
+// _WX_STATTEXT_H_