1. fixed Maximise() mismatch between wxFrame and wxMDIFrame

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

diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h
index 375c0001957fd13023a4a6e7c651d1deece90218..48059b53187b51de6369946ce67785e9d25d2929 100644 (file)
--- a/include/wx/motif/statbox.h
+++ b/include/wx/motif/statbox.h
@@ -23,47 +23,52 @@ WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
 // Group box
 class WXDLLEXPORT wxStaticBox: public wxControl
 {
 // Group box
 class WXDLLEXPORT wxStaticBox: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxStaticBox)
+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);
-  }
+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);
+    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)) {};
+    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;
+    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; }
-
-DECLARE_EVENT_TABLE()
+    // 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:
 
 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
 };
 
 #endif