X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/799ea01170e831c212320b0cb3038a91785e4789..768a499594fd9c9fd0155d0513c7f5b785ce4439:/src/common/choiccmn.cpp diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp index de1d8431a9..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,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "choicebase.h" #endif @@ -43,28 +43,13 @@ wxChoiceBase::~wxChoiceBase() // this destructor is required for Darwin } -// ---------------------------------------------------------------------------- -// selection -// ---------------------------------------------------------------------------- - -bool wxChoiceBase::SetStringSelection(const wxString& s) -{ - int sel = FindString(s); - wxCHECK_MSG( sel != -1, FALSE, - wxT("invalid string in wxChoice::SetStringSelection") ); - - Select(sel); - - return TRUE; -} - // ---------------------------------------------------------------------------- // misc // ---------------------------------------------------------------------------- void wxChoiceBase::Command(wxCommandEvent& event) { - SetSelection(event.m_commandInt); + SetSelection(event.GetInt()); (void)ProcessEvent(event); }