add wxDataViewIconText

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

diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index a8adee15fd460537c3d6e691c597fd796aac67e0..db5fea5e20adcd11e8c5a4c1a3ce2876297d4aab 100644 (file)
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/choiccmn.cpp
+// Name:        src/common/choiccmn.cpp

 // Purpose:     common (to all ports) wxChoice functions
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$
 // Purpose:     common (to all ports) wxChoice functions
 // Author:      Vadim Zeitlin
 // 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
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #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"
 


@@ -30,10 +26,13 @@
 
 #if wxUSE_CHOICE
 
 
 #if wxUSE_CHOICE
 

+#include "wx/choice.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/choice.h"

 #endif
 
 #endif
 

+const wxChar wxChoiceNameStr[] = wxT("choice");
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -43,30 +42,14 @@ 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);
 }
 
 #endif // wxUSE_CHOICE
     (void)ProcessEvent(event);
 }
 
 #endif // wxUSE_CHOICE

-