Warning fix.

[wxWidgets.git] / src / common / choiccmn.cpp

diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index 9fc8861528cfc41c81608adeafdb705bf4cf29ef..6a1d9e7cd4f9f44ff18349d7b41bd8e3e0a3e210 100644 (file)
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -43,28 +39,13 @@ wxChoiceBase::~wxChoiceBase()
     // this destructor is required for Darwin
 }
 
     // 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)
 {
 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 
 void wxChoiceBase::Command(wxCommandEvent& event)
 {

-    SetSelection(event.m_commandInt);
+    SetSelection(event.GetInt());

     (void)ProcessEvent(event);
 }
 
     (void)ProcessEvent(event);
 }