provide backward-compat wxCursor(int) ctor; remove empty stubs of XBM ctor from all...

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

diff --git a/include/wx/motif/stattext.h b/include/wx/motif/stattext.h
index e9f3ca82254f16ae66dd9c3ed535197efbf04245..cd9893ebfa2b2fe0103b106728bf830448dc2620 100644 (file)
--- 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:
 // Purpose:     wxStaticText class
 // Author:      Julian Smart
 // Modified by:


@@ -12,15 +12,7 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
 #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)
 
 {
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 


@@ -28,21 +20,21 @@ public:
     wxStaticText() { }
 
     wxStaticText(wxWindow *parent, wxWindowID id,
     wxStaticText() { }
 
     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);
     }
 
     bool Create(wxWindow *parent, wxWindowID id,
     {
         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);
+        const wxString& label,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
+        const wxString& name = wxStaticTextNameStr);

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


@@ -50,13 +42,23 @@ public:
     // operations
     virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
     {
     // 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; }
+
+    virtual void DoSetLabel(const wxString& str);
+    virtual wxString DoGetLabel() const;
+
+    virtual wxSize DoGetBestSize() const;
+protected:
+    WXWidget              m_labelWidget;

 };
 
 #endif
 };
 
 #endif

-    // _WX_STATTEXT_H_
+// _WX_STATTEXT_H_