SF.net SVN: jazzplusplus:[878] trunk/jazz/src

[<pst...@us...>]

Revision: 878
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=878&view=rev
Author:   pstieber
Date:     2011-08-05 01:44:29 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
Changed to use wxStrings.

Modified Paths:
--------------
    trunk/jazz/src/NamedChoice.cpp
    trunk/jazz/src/NamedChoice.h

Modified: trunk/jazz/src/NamedChoice.cpp
===================================================================
--- trunk/jazz/src/NamedChoice.cpp	2011-08-05 01:42:09 UTC (rev 877)
+++ trunk/jazz/src/NamedChoice.cpp	2011-08-05 01:44:29 UTC (rev 878)
@@ -29,7 +29,7 @@
 
 JZNamedChoice::JZNamedChoice(
   const char* pTitle,
-  const std::vector<std::pair<std::string, int> >& Pairs,
+  const std::vector<std::pair<wxString, int> >& Pairs,
   int* pResult)
   : //mpTitle(pTitle),
     mPairs(Pairs),
@@ -74,16 +74,16 @@
 // Return a string list validator to use in the wxproplist dialogs.
 wxStringListValidator* JZNamedChoice::GetStringListValidator()
 {
-  wxStringList* StringList = new wxStringList();
+  wxArrayString* StringList = new wxArrayString();
   for (
-    vector<pair<string, int> >::const_iterator iPair = mPairs.begin();
+    vector<pair<wxString, int> >::const_iterator iPair = mPairs.begin();
     iPair != mPairs.end();
     ++iPair)
   {
     // Omit empty entries.
     if (!iPair->first.empty())
     {
-      StringList->Add(wxString(iPair->first.c_str()));
+      StringList->Add(iPair->first);
     }
   }
   return new wxStringListValidator(StringList);
@@ -92,7 +92,7 @@
 void JZNamedChoice::GetValue()
 {
   for (
-    vector<pair<string, int> >::const_iterator iPair = mPairs.begin();
+    vector<pair<wxString, int> >::const_iterator iPair = mPairs.begin();
     iPair != mPairs.end();
     ++iPair)
   {
@@ -107,7 +107,7 @@
 void JZNamedChoice::SetValue()
 {
   for (
-    vector<pair<string, int> >::const_iterator iPair = mPairs.begin();
+    vector<pair<wxString, int> >::const_iterator iPair = mPairs.begin();
     iPair != mPairs.end();
     ++iPair)
   {

Modified: trunk/jazz/src/NamedChoice.h
===================================================================
--- trunk/jazz/src/NamedChoice.h	2011-08-05 01:42:09 UTC (rev 877)
+++ trunk/jazz/src/NamedChoice.h	2011-08-05 01:44:29 UTC (rev 878)
@@ -40,7 +40,7 @@
 
     JZNamedChoice(
       const char* pTitle,
-      const std::vector<std::pair<std::string, int> >& Pairs,
+      const std::vector<std::pair<wxString, int> >& Pairs,
       int* pResult);
 
     virtual ~JZNamedChoice();
@@ -57,7 +57,7 @@
 
 //    char* mpTitle;
 
-    const std::vector<std::pair<std::string, int> >& mPairs;
+    const std::vector<std::pair<wxString, int> >& mPairs;
 
     std::string mSelection;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.