oops, removed duplicate SetIcons[s]() added in last commit

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

diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h
index e16cd330d204aad6b7deaa735aeaafcd0d2e68ac..c26d7ba69dc3010c4d76057b2973299d85c1d4fa 100644 (file)
--- a/include/wx/motif/statbox.h
+++ b/include/wx/motif/statbox.h
@@ -6,52 +6,57 @@
 // 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_STATBOX_H_
 #define _WX_STATBOX_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBOX_H_
 #define _WX_STATBOX_H_
 

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

 #pragma interface "statbox.h"
 #endif
 
 #pragma interface "statbox.h"
 #endif
 

-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
-

 // Group box
 // Group box

-class WXDLLEXPORT wxStaticBox: public wxControl
+class WXDLLEXPORT wxStaticBox: public wxStaticBoxBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxStaticBox)
-
- public:
-  inline wxStaticBox() {}
-  inline wxStaticBox(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxStaticBoxNameStr)
-  {
-    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 = wxStaticBoxNameStr);
-
-  virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
-  virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
-
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  void SetLabel(const wxString& label);
-
-DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxStaticBox)
+        
+public:
+    wxStaticBox();
+    wxStaticBox(wxWindow *parent, wxWindowID id,
+        const wxString& label,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
+        const wxString& name = wxStaticBoxNameStr)
+    {
+        Create(parent, id, label, pos, size, style, name);
+    }
+
+    ~wxStaticBox();
+    
+    bool Create(wxWindow *parent, wxWindowID id,
+        const wxString& label,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
+        const wxString& name = wxStaticBoxNameStr);
+    
+    virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
+    {
+        return false;
+    }
+
+    virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
+
+    virtual void SetLabel(const wxString& label);
+
+private:
+    WXWidget  m_labelWidget;
+   
+private:
+    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif

-    // _WX_STATBOX_H_
+// _WX_STATBOX_H_