// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
-// RCS-ID: $Id: combobox_osx.cpp 58318 2009-01-23 08:36:16Z RR $
+// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// work in progress
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-
wxComboBox::~wxComboBox()
{
}
-void wxComboBox::Init()
-{
-}
-
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
const wxString& value,
const wxPoint& pos,
const wxValidator& validator,
const wxString& name)
{
+ DontCreatePeer();
+
m_text = NULL;
m_choice = NULL;
-
- m_macIsUserPane = false;
-
+
if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
return false;
wxASSERT_MSG( !(style & wxCB_SORT),
"wxCB_SORT not currently supported by wxOSX/Cocoa");
- m_peer = wxWidgetImpl::CreateComboBox( this, parent, id, NULL, pos, size, style, GetExtraStyle() );
+ SetPeer(wxWidgetImpl::CreateComboBox( this, parent, id, NULL, pos, size, style, GetExtraStyle() ));
MacPostControlCreate( pos, size );
AssignNewItemClientData(idx, clientData, i, type);
}
- m_peer->SetMaximum( GetCount() );
+ GetPeer()->SetMaximum( GetCount() );
return pos - 1;
}
// ----------------------------------------------------------------------------
void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
{
- wxCHECK_RET( IsValid(n), "invalid index" );
-
m_datas[n] = (char*)clientData ;
}
void * wxComboBox::DoGetItemClientData(unsigned int n) const
{
- wxCHECK_MSG( IsValid(n), NULL, "invalid index" );
-
return (void *)m_datas[n];
}
void wxComboBox::DoDeleteOneItem(unsigned int n)
{
+ m_datas.RemoveAt(n);
GetComboPeer()->RemoveItem(n);
}
void wxComboBox::DoClear()
{
+ m_datas.Clear();
GetComboPeer()->Clear();
}
wxString wxComboBox::GetString(unsigned int n) const
{
+ wxCHECK_MSG( n < GetCount(), wxString(), "Invalid combobox index" );
+
return GetComboPeer()->GetStringAtIndex(n);
}
wxString wxComboBox::GetStringSelection() const
{
- return GetString(GetSelection());
+ const int sel = GetSelection();
+ return sel == wxNOT_FOUND ? wxString() : GetString(sel);
}
void wxComboBox::SetString(unsigned int n, const wxString& s)
{
- Delete(n);
- Insert(s, n);
+ // Notice that we shouldn't delete and insert the item in this control
+ // itself as this would also affect the client data which we need to
+ // preserve here.
+ GetComboPeer()->RemoveItem(n);
+ GetComboPeer()->InsertItem(n, s);
SetValue(s); // changing the item in the list won't update the display item
}
wxComboWidgetImpl* wxComboBox::GetComboPeer() const
{
- return dynamic_cast<wxComboWidgetImpl*> (m_peer);
+ return dynamic_cast<wxComboWidgetImpl*> (GetPeer());
+}
+
+void wxComboBox::Popup()
+{
+ GetComboPeer()->Popup();
+}
+
+void wxComboBox::Dismiss()
+{
+ GetComboPeer()->Dismiss();
}
#endif // wxUSE_COMBOBOX && wxOSX_USE_COCOA