X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3015c547a6a602d81878d3d1d717bc79955b44c..768a499594fd9c9fd0155d0513c7f5b785ce4439:/src/common/choiccmn.cpp?ds=sidebyside diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp index ceeb467b8e..50c633894e 100644 --- a/src/common/choiccmn.cpp +++ b/src/common/choiccmn.cpp @@ -5,8 +5,8 @@ // Modified by: // Created: 26.07.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team -// Licence: wxWindows license +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,8 +17,8 @@ // 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". @@ -28,90 +28,30 @@ #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); -} - -// ---------------------------------------------------------------------------- -// string selection management -// ---------------------------------------------------------------------------- - -wxString wxChoiceBase::GetStringSelection() const -{ - int sel = GetSelection(); - wxString str; - wxCHECK_MSG( sel != wxNOT_FOUND, str, _T("no selection, hence no string") ); - - str = GetString(sel); - return str; -} - -bool wxChoiceBase::SetStringSelection(const wxString& sel) -{ - int selIndex = FindString(sel); - wxCHECK_MSG( selIndex != wxNOT_FOUND, FALSE, - _T("can't set selection to string not in the control") ); - - SetSelection(selIndex); - - return TRUE; + // this destructor is required for Darwin } // ---------------------------------------------------------------------------- -// client data +// misc // ---------------------------------------------------------------------------- -void wxChoiceBase::SetClientObject(int n, wxClientData *data) +void wxChoiceBase::Command(wxCommandEvent& event) { - wxASSERT_MSG( m_clientDataItemsType != ClientData_Void, - _T("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, - _T("this window doesn't have object client data") ); - - return DoGetClientObject(n); -} - -void wxChoiceBase::SetClientData(int n, void *data) -{ - wxASSERT_MSG( m_clientDataItemsType != ClientData_Object, - _T("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, - _T("this window doesn't have void client data") ); - - return DoGetClientData(n); + SetSelection(event.GetInt()); + (void)ProcessEvent(event); } +#endif // wxUSE_CHOICE