X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b78ffab03098558f47230612015a32a21b338e2e..6607ee151a9907cf78f0584dc1090a1a5445ce88:/src/osx/spinctrl_osx.cpp diff --git a/src/osx/spinctrl_osx.cpp b/src/osx/spinctrl_osx.cpp index 8e7042d10e..7d207e68eb 100644 --- a/src/osx/spinctrl_osx.cpp +++ b/src/osx/spinctrl_osx.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/osx/carbon/spinbutt.cpp +// Name: src/osx/spinctrl_osx.cpp // Purpose: wxSpinCtrl // Author: Robert // Modified by: Mark Newsam (Based on GTK file) @@ -196,8 +196,6 @@ BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton) EVT_SPIN(wxID_ANY, wxSpinCtrlButton::OnSpinButton) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl) - BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl) WX_EVENT_TABLE_CONTROL_CONTAINER(wxSpinCtrl) END_EVENT_TABLE() @@ -231,7 +229,6 @@ bool wxSpinCtrl::Create(wxWindow *parent, int initial, const wxString& name) { - m_macIsUserPane = true; if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) ) { @@ -281,10 +278,8 @@ wxSpinCtrl::~wxSpinCtrl() // delete the controls now, don't leave them alive even though they would // still be eventually deleted by our parent - but it will be too late, the // user code expects them to be gone now - delete m_text; - m_text = NULL ; - delete m_btn; - m_btn = NULL ; + wxDELETE(m_text); + wxDELETE(m_btn); } // ----------------------------------------------------------------------------