wxStaticBox constructor is not supposed to take a wxValidator

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/statbox.h b/include/wx/cocoa/statbox.h
index 64882dc2dda8d984c4ea5a0260314656e4ad809e..92e2985d42b2676e0a67b827dbc5c9a0eb38bf6b 100644 (file)
--- a/include/wx/cocoa/statbox.h
+++ b/include/wx/cocoa/statbox.h
@@ -27,23 +27,18 @@ 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();
 
 // ------------------------------------------------------------------------

diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm
index f63ff5f9c0e31c8ab3b12ef6cf49a874c7002838..f60c482e30400994ec9186ea874641d80869e39a 100644 (file)
--- a/src/cocoa/statbox.mm
+++ b/src/cocoa/statbox.mm
@@ -27,14 +27,11 @@ END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxStaticBox,NSBox,NSView,NSView)
 
 bool wxStaticBox::Create(wxWindow *parent, wxWindowID winid,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style, const wxValidator& validator,
-           const wxString& name)
+           const wxString& title, const wxPoint& pos, const wxSize& size,
+           long style, const wxString& name)
 {
     wxAutoNSAutoreleasePool pool;
-    if(!CreateControl(parent,winid,pos,size,style,validator,name))
+    if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
         return false;
     m_cocoaNSView = NULL;
     SetNSBox([[NSBox alloc] initWithFrame:MakeDefaultNSRect(size)]);