X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..d501d4ef2a58771a495b480ea45fda5e5016211e:/include/wx/motif/statbox.h

diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h
index a2a31bdcb7..62c3d2ad8e 100644
--- a/include/wx/motif/statbox.h
+++ b/include/wx/motif/statbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbox.h
+// Name:        wx/motif/statbox.h
 // Purpose:     wxStaticBox class
 // Author:      Julian Smart
 // Modified by:
@@ -12,19 +12,11 @@
 #ifndef _WX_STATBOX_H_
 #define _WX_STATBOX_H_
 
-#ifdef __GNUG__
-#pragma interface "statbox.h"
-#endif
-
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
-
 // Group box
-class WXDLLEXPORT wxStaticBox: public wxControl
+class WXDLLEXPORT wxStaticBox: public wxStaticBoxBase
 {
     DECLARE_DYNAMIC_CLASS(wxStaticBox)
-        
+
 public:
     wxStaticBox();
     wxStaticBox(wxWindow *parent, wxWindowID id,
@@ -36,39 +28,29 @@ public:
     {
         Create(parent, id, label, pos, size, style, name);
     }
-    ~wxStaticBox();
-    
+
+    virtual ~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;
+        return false;
     }
-    
-    void SetLabel(const wxString& label);
-    wxString GetLabel() const;
-    
-    // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-    WXWidget GetTopWidget() const { return m_formWidget; }
-    WXWidget GetLabelWidget() const { return m_labelWidget; }
-    
-protected:
-    // Motif-specific
-    WXWidget  m_formWidget;
+
+    virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
+
+    virtual void SetLabel(const wxString& label);
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
+
+private:
     WXWidget  m_labelWidget;
-    
-    virtual void DoSetSize(int x, int y,
-        int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
-    
+
 private:
     DECLARE_EVENT_TABLE()
 };