Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxStaticBox constructor is not supposed to take a wxValidator

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-09-29 05:18:38 +00:00
parent 9795bd2ee4
commit a1f4186efa
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/wx/cocoa/statbox.h
View File

@@ -27,23 +27,18 @@ class WXDLLEXPORT wxStaticBox: public wxStaticBoxBase, protected wxCocoaNSBox
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
public: public:
wxStaticBox() { } wxStaticBox() { }
wxStaticBox(wxWindow *parent, wxWindowID winid, wxStaticBox(wxWindow *parent, wxWindowID winid, const wxString& title,
const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, const wxValidator& validator = wxDefaultValidator, long style = 0, const wxString& name = wxStaticBoxNameStr)
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, bool Create(wxWindow *parent, wxWindowID winid, const wxString& title,
const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0, const wxString& name = wxStaticBoxNameStr);
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxStaticBoxNameStr);
virtual ~wxStaticBox(); virtual ~wxStaticBox();
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------

9
src/cocoa/statbox.mm
View File

@@ -27,14 +27,11 @@ END_EVENT_TABLE()
WX_IMPLEMENT_COCOA_OWNER(wxStaticBox,NSBox,NSView,NSView) WX_IMPLEMENT_COCOA_OWNER(wxStaticBox,NSBox,NSView,NSView)
bool wxStaticBox::Create(wxWindow *parent, wxWindowID winid, bool wxStaticBox::Create(wxWindow *parent, wxWindowID winid,
const wxString& title, const wxString& title, const wxPoint& pos, const wxSize& size,
const wxPoint& pos, long style, const wxString& name)
const wxSize& size,
long style, const wxValidator& validator,
const wxString& name)
{ {
wxAutoNSAutoreleasePool pool; wxAutoNSAutoreleasePool pool;
if(!CreateControl(parent,winid,pos,size,style,validator,name)) if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
return false; return false;
m_cocoaNSView = NULL; m_cocoaNSView = NULL;
SetNSBox([[NSBox alloc] initWithFrame:MakeDefaultNSRect(size)]); SetNSBox([[NSBox alloc] initWithFrame:MakeDefaultNSRect(size)]);