applied patch 430835 (missing wxSTD breaking compilation for VC++ 5)

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

diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index e37017f0ee2c29674de4a9e78ed8026e524e4e3e..2e0e59eb669702071af260ac9ff1c83edc1e195f 100644 (file)
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma implementation "choiccmn.h"
+    #pragma implementation "choicebase.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -30,7 +30,6 @@
 
 #ifndef WX_PRECOMP
     #include "wx/choice.h"
 
 #ifndef WX_PRECOMP
     #include "wx/choice.h"

-    #include "wx/log.h"

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -38,80 +37,26 @@
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// events
+// selection

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxChoiceBase::Command(wxCommandEvent &event)
+bool wxChoiceBase::SetStringSelection(const wxString& s)

 {
 {

-    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") );
+    int sel = FindString(s);
+    wxCHECK_MSG( sel != -1, FALSE,
+                 wxT("invalid string in wxChoice::SetStringSelection") );

 
 

-    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);
+    Select(sel);

 
     return TRUE;
 }
 
 // ----------------------------------------------------------------------------
 
     return TRUE;
 }
 
 // ----------------------------------------------------------------------------

-// client data
+// misc

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxChoiceBase::SetClientObject(int n, wxClientData *data)
-{
-    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
+void wxChoiceBase::Command(wxCommandEvent& event)

 {
 {

-    wxASSERT_MSG( m_clientDataItemsType == ClientData_Void,
-                  T("this window doesn't have void client data") );
-
-    return DoGetClientData(n);
+    SetSelection(event.m_commandInt);
+    (void)ProcessEvent(event);

 }
 }

-
-