X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07cdd027648238ac3ec1e1ad62d960698f07ed56..37e2cb08cd1910ec5a14b38f0addfc6e2e8e172e:/src/mac/control.cpp diff --git a/src/mac/control.cpp b/src/mac/control.cpp index 5065b239e9..122f58de8f 100644 --- a/src/mac/control.cpp +++ b/src/mac/control.cpp @@ -18,9 +18,9 @@ #include "wx/tabctrl.h" #include "wx/spinbutt.h" -IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) +IMPLEMENT_ABSTRACT_CLASS(wxControl, wxControlBase) -BEGIN_EVENT_TABLE(wxControl, wxWindow) +BEGIN_EVENT_TABLE(wxControl, wxControlBase) EVT_MOUSE_EVENTS( wxControl::OnMouseEvent ) EVT_CHAR( wxControl::OnKeyDown ) EVT_PAINT( wxControl::OnPaint ) @@ -79,6 +79,21 @@ wxControl::~wxControl() } } +bool wxControl::Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, long style, + const wxValidator& validator, + const wxString& name) +{ + bool rval = wxWindow::Create(parent, id, pos, size, style, name); + if (rval) { +#if wxUSE_VALIDATORS + SetValidator(validator); +#endif + } + return rval; +} + void wxControl::SetLabel(const wxString& title) { m_label = title ; @@ -100,7 +115,7 @@ void wxControl::SetLabel(const wxString& title) } } -wxSize wxControl::DoGetBestSize() +wxSize wxControl::DoGetBestSize() const { return wxSize(20, 20); }