A few tweaks and cleanups

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

diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h
index 288b1857483de2e517e6866eeb07d0bf92589f88..a2a31bdcb7f8e10df3fc57bbd6d0e30fb3b71444 100644 (file)
--- a/include/wx/motif/statbox.h
+++ b/include/wx/motif/statbox.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBOX_H_
@@ -23,45 +23,55 @@ WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
 // Group box
 class WXDLLEXPORT wxStaticBox: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxStaticBox)
-
- public:
-  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);
-  wxString GetLabel() const;
-
-  // Motif-specific
-  WXWidget GetTopWidget() const { return m_formWidget; }
-  WXWidget GetLabelWidget() const { return m_labelWidget; }
-
-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;
+    }
+    
+    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;
-  WXWidget  m_labelWidget;
+    // Motif-specific
+    WXWidget  m_formWidget;
+    WXWidget  m_labelWidget;
+    
+    virtual void DoSetSize(int x, int y,
+        int width, int height,
+        int sizeFlags = wxSIZE_AUTO);
+    
+private:
+    DECLARE_EVENT_TABLE()
 };
 
 #endif
-    // _WX_STATBOX_H_
+// _WX_STATBOX_H_