// Modified by:
// Created: 26.07.99
// RCS-ID: $Id$
-// Copyright: (c) wxWindows team
-// Licence: wxWindows license
+// Copyright: (c) wxWidgets team
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "choiccmn.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+ #pragma implementation "choicebase.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#pragma hdrstop
#endif
+#if wxUSE_CHOICE
+
#ifndef WX_PRECOMP
#include "wx/choice.h"
- #include "wx/log.h"
#endif
// ============================================================================
// implementation
// ============================================================================
-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-void wxChoiceBase::Command(wxCommandEvent &event)
+wxChoiceBase::~wxChoiceBase()
{
- SetSelection(event.GetInt());
- (void)ProcessEvent(event);
+ // this destructor is required for Darwin
}
// ----------------------------------------------------------------------------
-// string selection management
+// selection
// ----------------------------------------------------------------------------
-wxString wxChoiceBase::GetStringSelection() const
-{
- int sel = GetSelection();
- wxString str;
- wxCHECK_MSG( sel != wxNOT_FOUND, str, wxT("no selection, hence no string") );
-
- str = GetString(sel);
- return str;
-}
-
-bool wxChoiceBase::SetStringSelection(const wxString& sel)
+bool wxChoiceBase::SetStringSelection(const wxString& s)
{
- int selIndex = FindString(sel);
- wxCHECK_MSG( selIndex != wxNOT_FOUND, FALSE,
- wxT("can't set selection to string not in the control") );
+ int sel = FindString(s);
+ wxCHECK_MSG( sel != -1, FALSE,
+ wxT("invalid string in wxChoice::SetStringSelection") );
- SetSelection(selIndex);
+ Select(sel);
return TRUE;
}
// ----------------------------------------------------------------------------
-// client data
+// misc
// ----------------------------------------------------------------------------
-void wxChoiceBase::SetClientObject(int n, wxClientData *data)
-{
- wxASSERT_MSG( m_clientDataItemsType != ClientData_Void,
- wxT("can't have both object and void client data") );
-
- wxClientData *clientDataOld = DoGetClientObject(n);
- if ( clientDataOld )
- delete clientDataOld;
-
- DoSetClientObject(n, data);
- m_clientDataItemsType = ClientData_Object;
-}
-
-wxClientData *wxChoiceBase::GetClientObject(int n) const
-{
- wxASSERT_MSG( m_clientDataItemsType == ClientData_Object,
- wxT("this window doesn't have object client data") );
-
- return DoGetClientObject(n);
-}
-
-void wxChoiceBase::SetClientData(int n, void *data)
+void wxChoiceBase::Command(wxCommandEvent& event)
{
- wxASSERT_MSG( m_clientDataItemsType != ClientData_Object,
- wxT("can't have both object and void client data") );
-
- DoSetClientData(n, data);
- m_clientDataItemsType = ClientData_Void;
-}
-
-void *wxChoiceBase::GetClientData(int n) const
-{
- wxASSERT_MSG( m_clientDataItemsType == ClientData_Void,
- wxT("this window doesn't have void client data") );
-
- return DoGetClientData(n);
+ SetSelection(event.m_commandInt);
+ (void)ProcessEvent(event);
}
+#endif // wxUSE_CHOICE