applied wxNativeFontInfo patch from Derry Bryson (with minor changes)

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

diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h
index 0cd45846a416e65b2d256c2f803c4033856ad86a..99a9b2944537699904231f46b5fe31fc9880e637 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,47 +23,54 @@ WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
 // 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 bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
+    {
+        return FALSE;
+    }
 
-  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();
-  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:
-  // 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