Don't infinitely recurse when setting the child focus. Without

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

diff --git a/include/wx/motif/stattext.h b/include/wx/motif/stattext.h
index a1268cf7e1b904976175fee3e6d6c6b66a1c2dc2..1bff85cc9559f7a778d4249a9f7d5f3697e35f8e 100644 (file)
--- a/include/wx/motif/stattext.h
+++ b/include/wx/motif/stattext.h
@@ -6,47 +6,59 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #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)
- public:
-  inline wxStaticText() { }
-
-  inline wxStaticText(wxWindow *parent, wxWindowID id,
-           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,
-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxStaticTextNameStr);
-
-  // operations
-  virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
-  virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
+    DECLARE_DYNAMIC_CLASS(wxStaticText)
+        
+public:
+    wxStaticText() { }
+    
+    wxStaticText(wxWindow *parent, wxWindowID id,
+        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,
+        const wxString& label,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
+        const wxString& name = wxStaticTextNameStr);
+    
+    // implementation
+    // --------------
+    
+    // operations
+    virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
+    {
+        return FALSE;
+    }
+    
+    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_