X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/687706f5e722ac8a39172024f794ae0ffbd190e2..36abe9d421ebb33873f012a63fbdb210ff771682:/src/common/choiccmn.cpp diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp index d090aafd74..6685fda3cf 100644 --- a/src/common/choiccmn.cpp +++ b/src/common/choiccmn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: common/choiccmn.cpp +// Name: src/common/choiccmn.cpp // Purpose: common (to all ports) wxChoice functions // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "choicebase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,10 +26,13 @@ #if wxUSE_CHOICE +#include "wx/choice.h" + #ifndef WX_PRECOMP - #include "wx/choice.h" #endif +const char wxChoiceNameStr[] = "choice"; + // ============================================================================ // implementation // ============================================================================ @@ -43,21 +42,6 @@ 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 // ---------------------------------------------------------------------------- @@ -69,4 +53,3 @@ void wxChoiceBase::Command(wxCommandEvent& event) } #endif // wxUSE_CHOICE -