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

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

Revision: 485
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=485&view=rev
Author:   pstieber
Date:     2008-05-04 20:50:58 -0700 (Sun, 04 May 2008)

Log Message:
-----------
Wrapped literal title argument to wxDialog with wxString() to force construction
of this type.  I didn't have to do this in Windows or on Linux because I
compiled wxWidgets with std::string compatability.  I thought I did the same on
the Mac, but I may have made a mistake.

Modified Paths:
--------------
    trunk/jazz/src/Audio.cpp
    trunk/jazz/src/GuitarSettingsDialog.cpp
    trunk/jazz/src/Harmony.cpp

Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp	2008-05-04 04:57:33 UTC (rev 484)
+++ trunk/jazz/src/Audio.cpp	2008-05-05 03:50:58 UTC (rev 485)
@@ -956,7 +956,7 @@
 int    tSamplesDlg::current = 0;
 
 tSamplesDlg::tSamplesDlg(wxWindow* pParent, tSampleSet &s)
-  : wxDialog(pParent, wxID_ANY, "Sample Settings"),
+  : wxDialog(pParent, wxID_ANY, wxString("Sample Settings")),
     set(s)
 {
   if (path == 0)

Modified: trunk/jazz/src/GuitarSettingsDialog.cpp
===================================================================
--- trunk/jazz/src/GuitarSettingsDialog.cpp	2008-05-04 04:57:33 UTC (rev 484)
+++ trunk/jazz/src/GuitarSettingsDialog.cpp	2008-05-05 03:50:58 UTC (rev 485)
@@ -32,7 +32,7 @@
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 JZGuitarSettingsDialog::JZGuitarSettingsDialog(wxWindow* pParent)
-  : wxDialog(pParent, wxID_ANY, "Guitar Settings"),
+  : wxDialog(pParent, wxID_ANY, wxString("Guitar Settings")),
     mpChordModeCheckBox(0),
     mpBassGuitarCheckBox(0),
     mpShowOctavesCheckBox(0)//,

Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp	2008-05-04 04:57:33 UTC (rev 484)
+++ trunk/jazz/src/Harmony.cpp	2008-05-05 03:50:58 UTC (rev 485)
@@ -1638,7 +1638,7 @@
 
 
 HBContextDlg::HBContextDlg(HBCanvas *c, wxFrame *parent, HBContext *pct)
-  : wxDialog(parent, wxID_ANY, "Edit chord/scale" )
+  : wxDialog(parent, wxID_ANY, wxString("Edit chord/scale"))
 {
   int i;
 


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