#include "wx/osx/private.h"
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox, wxControl)
-
-BEGIN_EVENT_TABLE(wxComboBox, wxControl)
- WX_EVENT_TABLE_CONTROL_CONTAINER(wxComboBox)
-END_EVENT_TABLE()
-
-
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// 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);
}
// ----------------------------------------------------------------------------
SetStringSelection( value );
}
-void wxComboBox::Init()
-{
- WX_INIT_CONTROL_CONTAINER();
-}
-
bool wxComboBox::Create(wxWindow *parent,
wxWindowID id,
const wxString& value,
{
m_text = new wxComboBoxText( this );
}
- else if ( ( m_text != NULL ) && !editable )
+ else if ( !editable )
{
- delete m_text;
- m_text = NULL;
+ wxDELETE(m_text);
}
int currentX, currentY;
{
if (m_text)
return m_text->GetTextPeer();
-
+
return NULL;
}