X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f0c8f31f407ecfce909060464c0ea655221cdab..9113ffaf5602317f5f9bb212969d2dcaa18a484e:/src/osx/carbon/combobxc.cpp diff --git a/src/osx/carbon/combobxc.cpp b/src/osx/carbon/combobxc.cpp index 8a67fd323f..16ac22ad1d 100644 --- a/src/osx/carbon/combobxc.cpp +++ b/src/osx/carbon/combobxc.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/mac/carbon/combobxc.cpp +// Name: src/osx/carbon/combobxc.cpp // Purpose: wxComboBox class using HIView ComboBox // Author: Stefan Csomor // Modified by: @@ -219,14 +219,8 @@ wxComboBox::~wxComboBox() // 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 - if (m_text != NULL) { - delete m_text; - m_text = NULL; - } - if (m_choice != NULL) { - delete m_choice; - m_choice = NULL; - } + wxDELETE( m_text ); + wxDELETE( m_choice ); } @@ -782,12 +776,12 @@ bool wxComboBox::CanRedo() const #endif } -wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) +bool wxComboBox::OSXHandleClicked( double timestampsec ) { wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId ); event.SetInt(GetSelection()); event.SetEventObject(this); event.SetString(GetStringSelection()); ProcessCommand(event); - return noErr; + return true; }