Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/cocoa/statbox.h b/include/wx/cocoa/statbox.h
index 2ebb3c79d63d83ff0fd0c308ffad7ca21e236c70..2502c03def0cbe2673b88985628c13bbaf63de2d 100644 (file)
--- a/include/wx/cocoa/statbox.h
+++ b/include/wx/cocoa/statbox.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_STATBOX_H__
@@ -17,7 +17,7 @@
 // ========================================================================
 // wxStaticBox
 // ========================================================================
-class WXDLLEXPORT wxStaticBox: public wxStaticBoxBase, protected wxCocoaNSBox
+class WXDLLIMPEXP_CORE wxStaticBox: public wxStaticBoxBase, protected wxCocoaNSBox
 {
     DECLARE_DYNAMIC_CLASS(wxStaticBox)
     DECLARE_EVENT_TABLE()
@@ -27,34 +27,34 @@ class WXDLLEXPORT wxStaticBox: public wxStaticBoxBase, protected wxCocoaNSBox
 // ------------------------------------------------------------------------
 public:
     wxStaticBox() { }
-    wxStaticBox(wxWindow *parent, wxWindowID winid,
-            const wxString& title,
+    wxStaticBox(wxWindow *parent, wxWindowID winid, const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
-            long style = 0, const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxStaticBoxNameStr)
+            long style = 0, const wxString& name = wxStaticBoxNameStr)
     {
-        Create(parent, winid, title, pos, size, style, validator, name);
+        Create(parent, winid, title, pos, size, style, name);
     }
 
-    bool Create(wxWindow *parent, wxWindowID winid,
-            const wxString& title,
+    bool Create(wxWindow *parent, wxWindowID winid, const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxStaticBoxNameStr);
+            long style = 0, const wxString& name = wxStaticBoxNameStr);
     virtual ~wxStaticBox();
 
+    virtual void SetLabel(const wxString& label);
+    virtual wxString GetLabel() const;
+
 // ------------------------------------------------------------------------
 // Cocoa callbacks
 // ------------------------------------------------------------------------
 protected:
+    // Static boxes cannot be enabled/disabled
+    virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { }
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 public:
-    void GetBordersForSizer(int *borderTop, int *borderOther) const;
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
 protected:
 };