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

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

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

Log Message:
-----------
Converted std::string to wxString.

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

Modified: trunk/jazz/src/MidiDeviceDialog.cpp
===================================================================
--- trunk/jazz/src/MidiDeviceDialog.cpp	2011-08-05 20:42:36 UTC (rev 889)
+++ trunk/jazz/src/MidiDeviceDialog.cpp	2011-08-05 20:44:39 UTC (rev 890)
@@ -41,7 +41,7 @@
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 JZMidiDeviceDialog::JZMidiDeviceDialog(
-  const vector<pair<string, int> >& MidiDevices,
+  const vector<pair<wxString, int> >& MidiDevices,
   int& DeviceIndex,
   wxWindow* pParent,
   const wxString& Title)
@@ -52,13 +52,13 @@
   mpMidiDeviceListBox = new wxListBox(this, wxID_ANY);
 
   for (
-    vector<pair<string, int> >::const_iterator iMidiDevice =
+    vector<pair<wxString, int> >::const_iterator iMidiDevice =
       MidiDevices.begin();
     iMidiDevice != MidiDevices.end();
     ++iMidiDevice)
   {
-    const string& MidiDeviceName = iMidiDevice->first;
-    mpMidiDeviceListBox->Append(MidiDeviceName.c_str());
+    const wxString& MidiDeviceName = iMidiDevice->first;
+    mpMidiDeviceListBox->Append(MidiDeviceName);
   }
 
   if (mDeviceIndex < static_cast<int>(mpMidiDeviceListBox->GetCount()))

Modified: trunk/jazz/src/MidiDeviceDialog.h
===================================================================
--- trunk/jazz/src/MidiDeviceDialog.h	2011-08-05 20:42:36 UTC (rev 889)
+++ trunk/jazz/src/MidiDeviceDialog.h	2011-08-05 20:44:39 UTC (rev 890)
@@ -26,7 +26,6 @@
 #include <wx/dialog.h>
 
 #include <vector>
-#include <string>
 
 class wxListBox;
 
@@ -39,7 +38,7 @@
   public:
 
     JZMidiDeviceDialog(
-      const std::vector<std::pair<std::string, int> >& MidiDevices,
+      const std::vector<std::pair<wxString, int> >& MidiDevices,
       int& DeviceIndex,
       wxWindow* pParent = 0,
       const wxString& Title = wxEmptyString);


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