Menu
▾
▴
jazzplusplus-updates — SVN commit message list
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
(58) |
Apr
(100) |
May
(92) |
Jun
(12) |
Jul
|
Aug
|
Sep
(5) |
Oct
(1) |
Nov
(26) |
Dec
(29) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(31) |
Feb
(20) |
Mar
(1) |
Apr
|
May
(5) |
Jun
(10) |
Jul
|
Aug
(2) |
Sep
|
Oct
(2) |
Nov
|
Dec
(1) |
| 2010 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
(36) |
May
(10) |
Jun
|
Jul
(38) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
(6) |
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(56) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(13) |
Dec
(2) |
| 2013 |
Jan
(30) |
Feb
|
Mar
(43) |
Apr
(28) |
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(10) |
Nov
(2) |
Dec
|
| 2014 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <pst...@us...> - 2011-08-06 15:04:12
|
Revision: 893
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=893&view=rev
Author: pstieber
Date: 2011-08-06 15:04:06 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Updated to deal with Unicode.
Modified Paths:
--------------
trunk/jazz/src/mswin/WindowsMidiInterface.cpp
trunk/jazz/src/mswin/WindowsMidiInterface.h
trunk/jazz/src/mswin/WindowsPlayer.cpp
Modified: trunk/jazz/src/mswin/WindowsMidiInterface.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsMidiInterface.cpp 2011-08-05 23:15:13 UTC (rev 892)
+++ trunk/jazz/src/mswin/WindowsMidiInterface.cpp 2011-08-06 15:04:06 UTC (rev 893)
@@ -624,11 +624,10 @@
if (buf != 0)
{ // ignore OutNow() buffers
buf->Release();
- OutputDebugString("release\n");
+ OutputDebugString(L"release\n");
}
}
}
} // extern "C"
-
Modified: trunk/jazz/src/mswin/WindowsMidiInterface.h
===================================================================
--- trunk/jazz/src/mswin/WindowsMidiInterface.h 2011-08-05 23:15:13 UTC (rev 892)
+++ trunk/jazz/src/mswin/WindowsMidiInterface.h 2011-08-06 15:04:06 UTC (rev 893)
@@ -107,7 +107,7 @@
hdr.dwUser = (DWORD)this;
hdr.lpData = (char *)data;
hdr.dwBufferLength = size;
- OutputDebugString("prepare\n");
+ OutputDebugString(L"prepare\n");
midiOutPrepareHeader(hmo, &hdr, sizeof(hdr));
prepared = 1;
}
@@ -116,7 +116,7 @@
{
if (prepared)
{
- OutputDebugString("unprepare\n");
+ OutputDebugString(L"unprepare\n");
midiOutUnprepareHeader(hmo, &hdr, sizeof(hdr));
size = 0;
prepared = 0;
Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp 2011-08-05 23:15:13 UTC (rev 892)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp 2011-08-06 15:04:06 UTC (rev 893)
@@ -114,8 +114,8 @@
}
if (rc)
{
- char ErrorMessage[MAXERRORLENGTH];
- midiInGetErrorText(rc, (LPSTR)ErrorMessage, sizeof(ErrorMessage));
+ wchar_t ErrorMessage[MAXERRORLENGTH];
+ midiInGetErrorText(rc, ErrorMessage, sizeof(ErrorMessage));
::wxMessageBox(ErrorMessage, "Open MIDI Input", wxOK);
}
}
@@ -136,8 +136,8 @@
CALLBACK_FUNCTION);
if (rc)
{
- char ErrorMessage[MAXERRORLENGTH];
- midiOutGetErrorText(rc, (LPSTR)ErrorMessage, sizeof(ErrorMessage));
+ wchar_t ErrorMessage[MAXERRORLENGTH];
+ midiOutGetErrorText(rc, ErrorMessage, sizeof(ErrorMessage));
::wxMessageBox(ErrorMessage, "Open MIDI Output", wxOK);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 23:15:19
|
Revision: 892
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=892&view=rev
Author: pstieber
Date: 2011-08-05 23:15:13 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Updated to wxWidgets 2.9.2.
Modified Paths:
--------------
web/htdocs/buildingwx/index.php
web/htdocs/download/index.php
web/htdocs/index.php
Modified: web/htdocs/buildingwx/index.php
===================================================================
--- web/htdocs/buildingwx/index.php 2011-08-05 20:49:14 UTC (rev 891)
+++ web/htdocs/buildingwx/index.php 2011-08-05 23:15:13 UTC (rev 892)
@@ -21,51 +21,39 @@
wxWidgets lets developers create applications for Win32, Mac OS X, GTK+, X11,
Motif, WinCE, and more using one codebase. This page describes how the Jazz++
version of wxWidgets was compiled for Windows, Linux, and the Mac. The Windows
-build was generated using Visual Studio. Either Visual Studio .NET 2005 or
-Visual Studio .NET 2008 can be used on Windows. The Linux install was tested
-using Fedora 9 using GCC 4.3.0, Mandriva 2008.0 using GCC 4.2.2, and Debian 4.0
+build was generated using Visual Studio. Either Visual Studio .NET 2008 or
+Visual Studio .NET 2010 can be used on Windows. The Linux install was tested
+using Fedora 14 using GCC 4.5.1, Mandriva 2008.0 using GCC 4.2.2, and Debian 4.0
(i386 & amd64) using gcc-4.1.2. The Mac build was tested using Mac OS X 10.5.2
and GCC 4.0.1.
</P>
<H3>Building wxWidgets for Windows</H3>
<P>
-I have used these instructions with Visual Studio .NET 2005 (VC8) and Visual
-Studio .NET 2008 (VC9). I used VC9 in the following text, but simply
-substitute the appropriate VC8 veriage to create a Visual Studio .NET 2005
+I have used these instructions with Visual Studio .NET 2008 (VC9) and Visual
+Studio .NET 2010 (VC10). I used VC10 in the following text, but simply
+substitute the appropriate VC9 verbiage to create a Visual Studio .NET 2008
build. I have both builds living side-by-side on my hard drive.
</P>
<OL>
<LI>
Download
-<A NAME="wxMSW-2.8.11.zip-Download"
-HREF="http://prdownloads.sourceforge.net/wxwindows/wxMSW-2.8.11.zip">
-<TT>wxMSW-2.8.11.zip</TT></A> from the wxWidgets web site.
+<A NAME="wxWidgets-2.9.2.zip-Download"
+HREF="http://prdownloads.sourceforge.net/wxwindows/wxWidgets-2.9.2.zip">
+<TT>wxWidgets-2.9.2.zip</TT></A> from the wxWidgets web site.
</LI>
<LI>
Extract the zip file to <TT>C:\ExternalPackages</TT>. Extracting creates a
-<TT>wxMSW-2.8.11</TT> directory directly under <TT>C:\ExternalPackages</TT>.
+<TT>wxWidgets-2.9.2</TT> directory directly under <TT>C:\ExternalPackages</TT>.
</LI>
<LI>
Change the name of the top-level wxWidgets directory to
-<TT>wxMSW-2.8.11-VC9</TT> so other versions of wxWidgets can be built with
+<TT>wxMSW-2.9.2-VC10</TT> so other versions of wxWidgets can be built with
other compilers in parallel with this directory.
</LI>
<LI>
-If you would like wxWidgets help files in compiled HTML format (*.chm),
-download <TT>wxWidgets-2.8.11-CHM.zip</TT> from the wxWidgets web site, and
-extract the zip file to <TT>C:\ExternalPackages\wxMSW-2.8.11-VC9</TT>. This
-installs the compiled HTML help files for wxWidgets and tex2rtf.
-</LI>
-<LI>
-If you would like wxWidgets help files in HTML format, download
-<TT>wxWidgets-2.8.11-HTML.zip</TT> from the wxWidgets web site, and extract the
-zip file to <TT>C:\ExternalPackages\wxMSW-2.8.11-VC9</TT>. This installs the
-HTML help files for wxWidgets and tex2rtf.
-</LI>
-<LI>
Make the following changes to
-<TT>C:\ExternalPackages\wxMSW-2.8.11-VC9\include\wx\msw\setup.h</TT>:
+<TT>C:\ExternalPackages\wxMSW-2.9.2-VC10\include\wx\msw\setup.h</TT>:
<P>
@@ -80,66 +68,31 @@
</TR>
<TR>
-<TD ALIGN="LEFT"><TT>WXWIN_COMPATIBILITY_2_6</TT></TD>
-<TD ALIGN="CENTER">1</TD>
-<TD ALIGN="CENTER">0</TD>
-</TR>
-
-<TR>
<TD ALIGN="LEFT"><TT>wxUSE_STL</TT></TD>
<TD ALIGN="CENTER">0</TD>
<TD ALIGN="CENTER">1</TD>
</TR>
-<TR>
-<TD ALIGN="LEFT"><TT>wxUSE_STD_IOSTREAM</TT></TD>
-<TD ALIGN="CENTER">0</TD>
-<TD ALIGN="CENTER">1</TD>
-</TR>
-
-<TR>
-<TD ALIGN="LEFT"><TT>wxUSE_GLCANVAS</TT></TD>
-<TD ALIGN="CENTER">0</TD>
-<TD ALIGN="CENTER">1</TD>
-</TR>
-
-<TR>
-<TD ALIGN="LEFT"><TT>wxUSE_IOSTREAMH</TT></TD>
-<TD ALIGN="CENTER">1</TD>
-<TD ALIGN="CENTER">0</TD>
-</TR>
-
</TABLE>
</DIV>
</P>
-<BR>
-Jazz++ doesn't use OpenGL code at this point, but I use this wxWidgets build
-for other projects.
</LI>
<LI>
-Edit <TT>C:\ExternalPackages\wxMSW-2.8.11-VC9\include\wx\msw\wx.rc</TT> and
-comment out the following line.
-
-<PRE>
-#include "wx/msw/wince/wince.rc"
-</PRE>
+Use <TT>Start | All Programs | Microsoft Visual Studio 2010 |
+Visual Studio Tools | Visual Studio Command Prompt (2010)</TT> to
+start a console session to compile a 32-bit version of the library.
</LI>
<LI>
-Use <TT>Start | All Programs | Microsoft Visual Studio .NET 2008 |
-Visual Studio .NET Tools | Visual Studio .NET 2008 Command Prompt</TT> to
-start a console session.
-</LI>
-<LI>
Ensure that the command-line compiler and tools (including nmake)
are installed and ready to run.
</LI>
<LI>
-Change directory to <TT>C:\ExternalPackages\wxMSW-2.8.11-VC9\build\msw</TT>.
+Change directory to <TT>C:\ExternalPackages\wxMSW-2.9.2-VC10\build\msw</TT>.
</LI>
<LI>
-Build the debug static version of the wxWidgets libraries by typing:
+Build the 32-bit, debug, static version of the wxWidgets libraries by typing:
<PRE>
nmake BUILD=debug SHARED=0 USE_OPENGL=1 -f makefile.vc
@@ -147,40 +100,17 @@
</LI>
<LI>
-Build the release static version of the wxWidgets libraries by typing:
+Build the 32-bit, release static version of the wxWidgets libraries by typing:
<PRE>
nmake BUILD=release SHARED=0 USE_OPENGL=1 -f makefile.vc
</PRE>
</LI>
-<LI>To conserve disk space, remove the build directories (<TT>vc_msw</TT> and
-<TT>vc_mswd</TT>) under <TT>c:\ExternalPackages\wxMSW-2.8.11-VC9\build\msw</TT>.
+<LI>To conserve disk space, remove the build directories (<TT>vc_mswu</TT> and
+<TT>vc_mswud</TT>) under
+<TT>c:\ExternalPackages\wxMSW-2.9.2-VC10\build\msw</TT>.
</LI>
-<LI>
-Change directory to
-<TT>C:\ExternalPackages\wxMSW-2.8.11-VC9\utils\tex2rtf\src</TT>.
-</LI>
-<LI>
-Build the release static version of tex2rtf by typing:
-
-<PRE>
-nmake BUILD=release SHARED=0 -f makefile.vc
-</PRE>
-</LI>
-<LI>
-Create a directory for the tex2rtf binaries under the wxWidgets
-distribution (<TT>c:\ExternalPackages\wxMSW-2.8.11-VC9\bin</TT>).
-</LI>
-<LI>
-Move the tex2rtf binaries from
-<TT>c:\ExternalPackages\wxMSW-2.8.11-VC9\utils\tex2rtf\src\vc_msw</TT> to
-<TT>c:\ExternalPackages\wxMSW-2.8.11-VC9\bin</TT>.
-</LI>
-<LI>
-To conserve disk space, remove the build directory (vc_msw) under
-<TT>c:\ExternalPackages\wxMSW-2.8.11-VC9\utils\tex2rtf\src</TT>.
-</LI>
</OL>
<h3>Building wxWidgets for Linux</h3>
@@ -194,8 +124,8 @@
trick.
<PRE>
-export PATH=/usr/local/wx-2.8.11/bin:$PATH
-export LD_LIBRARY_PATH=/usr/local/wx-2.8.11/lib:$LD_LIBRARY_PATH
+export PATH=/usr/local/wx-2.9.2/bin:$PATH
+export LD_LIBRARY_PATH=/usr/local/wx-2.9.2/lib:$LD_LIBRARY_PATH
</PRE>
After adding the above lines to your <TT>.bash_profile</TT>
@@ -217,16 +147,16 @@
</PRE>
</LI>
-<LI> Checkout the 2.8 branch of wxWidgets using the following command.
+<LI> Checkout the trunk of wxWidgets using the following command.
You must have a Subversion client loaded on your machine.
<PRE>
-svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH wxWidgets-2.8
+svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets
</PRE>
</LI>
<LI> Create two directories called <TT>WxBuildRelease</TT> and
-<TT>WxBuildDebug</TT> in parallel with the <TT>wxWidgets-2.8</TT> directory
+<TT>WxBuildDebug</TT> in parallel with the <TT>wxWidgets</TT> directory
and change directory to the <TT>WxBuildDebug</TT> directory.
<PRE>
@@ -239,17 +169,16 @@
configure options.
<PRE>
-../wxWidgets-2.8/configure \
- --prefix=/usr/local/wx-2.8.11 \
- --disable-no_exceptions \
- --disable-no_rtti \
+../wxWidgets/configure \
+ --prefix=/usr/local/wx-2.9.2d \
+ --with-gtk \
+ --enable-exceptions \
--disable-compat26 \
- --disable-unicode \
- --with-regex=builtin \
+ --disable-visibility \
+ --with-regex \
--enable-std_iostreams \
--enable-std_string \
--enable-stl \
- --with-gtk \
--enable-debug \
--enable-debug_gdb
</PRE>
@@ -281,17 +210,16 @@
<PRE>
cd ../WxBuildRelease
-../wxWidgets-2.8/configure \
- --prefix=/usr/local/wx-2.8.11 \
- --disable-no_exceptions \
- --disable-no_rtti \
+../wxWidgets/configure \
+ --prefix=/usr/local/wx-2.9.2 \
+ --with-gtk \
+ --enable-exceptions \
--disable-compat26 \
- --disable-unicode \
- --with-regex=builtin \
+ --disable-visibility \
+ --with-regex \
--enable-std_iostreams \
--enable-std_string \
- --enable-stl \
- --with-gtk
+ --enable-stl
make 2>&1 | tee BuildLog
su
make install
@@ -300,10 +228,7 @@
</LI>
<LI>
-Install the release version of the wxWidgets build last to ensure this version
-is the default configuration. If you installed the debug version last, simply
-re-install the release version. You can run the following command to
-determine the default configuration.
+You can run the following command to determine the default configuration.
<PRE>
wx-config --list
@@ -326,18 +251,18 @@
<LI>
Download
-<A NAME="wxMac-2.8.11.tar.gz"
-HREF="http://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.11.tar.gz">
-<TT>wxMac-2.8.11.tar.gz</TT></A> from the wxWidgets web site and extract this
+<A NAME="wxWidgets-2.9.2.tar.bz2"
+HREF="http://sourceforge.net/projects/wxwindows/files/wxWidgets-2.9.2.tar.bz2">
+<TT>wxWidgets-2.9.2.tar.bz2</TT></A> from the wxWidgets web site and extract this
file under your <TT>OutsideSource</TT> directory.
</LI>
-<LI> Create a directory called <TT>WxBuild-2.8.11</TT> in parallel with the
-<TT>wxMac-2.8.11</TT> directory and change directory to that location.
+<LI> Create a directory called <TT>WxBuild-2.9.2</TT> in parallel with the
+<TT>wxWidgets-2.9.2</TT> directory and change directory to that location.
<PRE>
-mkdir WxBuild-2.8.11
-cd WxBuild-2.8.11
+mkdir WxBuild-2.9.2
+cd WxBuild-2.9.2
</PRE>
</LI>
@@ -345,13 +270,11 @@
configure options.
<PRE>
-../wxMac-2.8.11/configure \
- --prefix=$HOME/wx-2.8.11 \
- --disable-no_exceptions \
- --disable-no_rtti \
+../wxWidgets-2.9.2/configure \
+ --prefix=$HOME/wx-2.9.2 \
+ --enable-exceptions \
--disable-compat26 \
- --disable-unicode \
- --with-regex=builtin \
+ --with-regex \
--enable-std_iostreams \
--enable-std_string \
--enable-stl \
@@ -387,8 +310,8 @@
<TT>.bash_profile</TT> will do the trick.
<PRE>
-export PATH=/usr/local/wx-2.8.11/bin:$PATH
-export LD_LIBRARY_PATH=/usr/local/wx-2.8.11/lib:$LD_LIBRARY_PATH
+export PATH=/usr/local/wx-2.9.2/bin:$PATH
+export LD_LIBRARY_PATH=/usr/local/wx-2.9.2/lib:$LD_LIBRARY_PATH
</PRE>
After adding the above lines to your <TT>.bash_profile</TT>
Modified: web/htdocs/download/index.php
===================================================================
--- web/htdocs/download/index.php 2011-08-05 20:49:14 UTC (rev 891)
+++ web/htdocs/download/index.php 2011-08-05 23:15:13 UTC (rev 892)
@@ -38,7 +38,7 @@
<P>
If you still want to just give the currently available 'minimal functionality'
source tarball a try, you will first need to compile and install a non-stock
-build of wxWidgets 2.8.10 to build Jazz++ itself, and the tex2rtf utility which
+build of wxWidgets 2.9.2 to build Jazz++ itself, and the tex2rtf utility which
Jazz++ depends on. View the <a href="/buildingwx/">Building wxWidgets</a> page
and <a href="/buildingtex2rtf/">Building Tex2rtf</a> for details.
</P>
Modified: web/htdocs/index.php
===================================================================
--- web/htdocs/index.php 2011-08-05 20:49:14 UTC (rev 891)
+++ web/htdocs/index.php 2011-08-05 23:15:13 UTC (rev 892)
@@ -35,7 +35,7 @@
only stable MIDI sequencer that runs under both Windows and Linux, we have gone
ahead and forked the source code that was available at http://www.jazzware.com/
(the old Jazzware site) and are in the process of porting it to wxWidgets
-2.8.10. In the process, we'll also be fixing numerous other problems that exist
+2.9.2. In the process, we'll also be fixing numerous other problems that exist
in the code and hopefully find a way to get it to run for Mac OS X as well.
</p>
<p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 20:49:20
|
Revision: 891
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=891&view=rev
Author: pstieber
Date: 2011-08-05 20:49:14 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Changed std::string to wxString.
Modified Paths:
--------------
trunk/jazz/src/mswin/WindowsPlayer.cpp
Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp 2011-08-05 20:44:39 UTC (rev 890)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp 2011-08-05 20:49:14 UTC (rev 891)
@@ -1023,7 +1023,7 @@
//-----------------------------------------------------------------------------
void JZWindowsPlayer::SettingsDlg(int& InputDevice, int& OutputDevice)
{
- vector<pair<string, int> > MidiDevices;
+ vector<pair<wxString, int> > MidiDevices;
//=========================
// Select the input device.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 20:44:45
|
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.
|
|
From: <pst...@us...> - 2011-08-05 20:42:42
|
Revision: 889
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=889&view=rev
Author: pstieber
Date: 2011-08-05 20:42:36 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Converted std::string to wxString.
Modified Paths:
--------------
trunk/jazz/src/PortMidiPlayer.cpp
Modified: trunk/jazz/src/PortMidiPlayer.cpp
===================================================================
--- trunk/jazz/src/PortMidiPlayer.cpp 2011-08-05 20:39:53 UTC (rev 888)
+++ trunk/jazz/src/PortMidiPlayer.cpp 2011-08-05 20:42:36 UTC (rev 889)
@@ -451,7 +451,7 @@
bool NeedToTerminate = InitPM();
int Count = Pm_CountDevices();
- vector<pair<string, int> > MidiDevices;
+ vector<pair<wxString, int> > MidiDevices;
// Create a container of input devices.
for (int i = 0; i < Count; ++i)
@@ -465,7 +465,7 @@
wxT(", ") +
wxString(pPmDeviceInfo->name, wxConvISO8859_1);
- MidiDevices.push_back(make_pair(Name.c_str(), i));
+ MidiDevices.push_back(make_pair(Name, i));
}
}
@@ -482,14 +482,14 @@
// Set the input device based on the selected integer.
for (
- vector<pair<string, int> >::const_iterator iDevice =
+ vector<pair<wxString, int> >::const_iterator iDevice =
MidiDevices.begin();
iDevice != MidiDevices.end();
++iDevice)
{
if (iDevice->second == InputDevice)
{
- SetOutputDevice(iDevice->first.c_str());
+ SetOutputDevice(iDevice->first);
break;
}
}
@@ -509,7 +509,7 @@
wxT(", ") +
wxString(pPmDeviceInfo->name, wxConvISO8859_1);
- MidiDevices.push_back(make_pair(Name.c_str(), i));
+ MidiDevices.push_back(make_pair(Name, i));
}
}
@@ -526,14 +526,14 @@
// Set the output device based on the selected integer.
for (
- vector<pair<string, int> >::const_iterator iDevice =
+ vector<pair<wxString, int> >::const_iterator iDevice =
MidiDevices.begin();
iDevice != MidiDevices.end();
++iDevice)
{
if (iDevice->second == OutputDevice)
{
- SetOutputDevice(iDevice->first.c_str());
+ SetOutputDevice(iDevice->first);
break;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 20:39:59
|
Revision: 888
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=888&view=rev
Author: pstieber
Date: 2011-08-05 20:39:53 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Changed c_str() to wx_str() due to Microsoft template specializations.
Modified Paths:
--------------
trunk/jazz/src/Harmony.cpp
Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp 2011-08-05 20:37:32 UTC (rev 887)
+++ trunk/jazz/src/Harmony.cpp 2011-08-05 20:39:53 UTC (rev 888)
@@ -1449,7 +1449,7 @@
if (!FileName.empty())
{
- ifstream Is(FileName.c_str());
+ ifstream Is(FileName.wx_str());
Is >> *this;
}
}
@@ -1467,7 +1467,7 @@
if (!FileName.empty())
{
- ofstream os(FileName.c_str());
+ ofstream os(FileName.wx_str());
os << *this;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 20:37:38
|
Revision: 887
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=887&view=rev
Author: pstieber
Date: 2011-08-05 20:37:32 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Changed c_str() to wx_str() due to Microsoft template specializations.
Modified Paths:
--------------
trunk/jazz/src/Configuration.cpp
Modified: trunk/jazz/src/Configuration.cpp
===================================================================
--- trunk/jazz/src/Configuration.cpp 2011-08-05 20:33:45 UTC (rev 886)
+++ trunk/jazz/src/Configuration.cpp 2011-08-05 20:37:32 UTC (rev 887)
@@ -553,7 +553,7 @@
return false;
}
- ifstream Ifs(FileName.c_str());
+ ifstream Ifs(FileName.wx_str());
if (!Ifs)
{
return false;
@@ -642,7 +642,7 @@
return false;
}
- ifstream Ifs(FileName.c_str());
+ ifstream Ifs(FileName.wx_str());
if (!Ifs)
{
return false;
@@ -734,7 +734,7 @@
<< " \"" << mFileName << '"'
<< endl;
- ifstream* pIs = new ifstream(mFileName.c_str());
+ ifstream* pIs = new ifstream(mFileName.wx_str());
InputFileStreams.push(pIs);
if (!*InputFileStreams.top())
@@ -848,7 +848,7 @@
}
else
{
- pIs = new ifstream(IncludeFileName.c_str());
+ pIs = new ifstream(IncludeFileName.wx_str());
InputFileStreams.push(pIs);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 20:33:51
|
Revision: 886
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=886&view=rev
Author: pstieber
Date: 2011-08-05 20:33:45 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Changed c_str() to wx_str() due to Microsoft template specializations.
Modified Paths:
--------------
trunk/jazz/src/Audio.cpp
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2011-08-05 20:30:37 UTC (rev 885)
+++ trunk/jazz/src/Audio.cpp 2011-08-05 20:33:45 UTC (rev 886)
@@ -289,7 +289,7 @@
// Get the path of the sample file.
wxString SplFilePath = ::wxPathOnly(FileName);
- ifstream Is(FileName.c_str());
+ ifstream Is(FileName.wx_str());
int Version;
Is >> Version >> mSamplingRate >> mChannelCount >> mSoftwareSynchonization;
while (Is && !Is.eof())
@@ -364,7 +364,7 @@
//-----------------------------------------------------------------------------
int JZSampleSet::Save(const wxString& FileName)
{
- ofstream Ofs(FileName.c_str());
+ ofstream Ofs(FileName.wx_str());
Ofs
<< 1
<< ' ' << mSamplingRate
@@ -1060,7 +1060,7 @@
wh.data_length = (end_index - start_index) * sizeof(short);
wh.length = wh.data_length + sizeof(WaveHeader);
- ofstream os(FileName.c_str(), ios::out | ios::binary | ios::trunc);
+ ofstream os(FileName.wx_str(), ios::out | ios::binary | ios::trunc);
os.write((char*)&wh, sizeof(wh));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 20:30:43
|
Revision: 885
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=885&view=rev
Author: pstieber
Date: 2011-08-05 20:30:37 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Change c_str() to wx_str() due to Microsoft template specializations.
Modified Paths:
--------------
trunk/jazz/src/JazzPlusPlusApplication.cpp
Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.cpp 2011-08-05 20:26:59 UTC (rev 884)
+++ trunk/jazz/src/JazzPlusPlusApplication.cpp 2011-08-05 20:30:37 UTC (rev 885)
@@ -196,7 +196,7 @@
// Test for the existence of the help file.
bool HelpFileFound = false;
ifstream Is;
- Is.open(HelpFileNameAndPath.c_str());
+ Is.open(HelpFileNameAndPath.wx_str());
if (!Is)
{
// Ask the user to find the help file.
@@ -207,7 +207,7 @@
// Try one more time.
Is.close();
Is.clear();
- Is.open(HelpFileNameAndPath.c_str());
+ Is.open(HelpFileNameAndPath.wx_str());
if (!Is)
{
wxString Message = "Failed to add the Jazz++ book " + mHelpFileName;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 20:27:05
|
Revision: 884
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=884&view=rev
Author: pstieber
Date: 2011-08-05 20:26:59 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Changed the argument to Add from const char* to const wxString&.
Modified Paths:
--------------
trunk/jazz/src/Player.h
Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h 2011-08-05 20:20:39 UTC (rev 883)
+++ trunk/jazz/src/Player.h 2011-08-05 20:26:59 UTC (rev 884)
@@ -72,9 +72,9 @@
return Unknown;
}
- unsigned Add(const char* pName)
+ unsigned Add(const wxString& Name)
{
- mDeviceNames.push_back(pName);
+ mDeviceNames.push_back(Name);
return mDeviceNames.size();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 20:20:45
|
Revision: 883
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=883&view=rev
Author: pstieber
Date: 2011-08-05 20:20:39 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
1. Reordered include files.
2. Changed std::string to wxString.
3. Updated a comment.
Modified Paths:
--------------
trunk/jazz/src/Player.h
Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h 2011-08-05 19:53:28 UTC (rev 882)
+++ trunk/jazz/src/Player.h 2011-08-05 20:20:39 UTC (rev 883)
@@ -23,8 +23,6 @@
#ifndef JZ_PLAYER_H
#define JZ_PLAYER_H
-#include <wx/timer.h>
-
#include "config.h"
#include "Events.h"
#include "Track.h"
@@ -32,6 +30,8 @@
//#include "midinet.h"
#include "Audio.h"
+#include <wx/timer.h>
+
#include <sys/types.h>
#include <time.h>
@@ -62,13 +62,13 @@
return mDeviceNames.size();
}
- const std::string& GetName(unsigned i) const
+ const wxString& GetName(unsigned i) const
{
if (i < mDeviceNames.size())
{
return mDeviceNames[i];
}
- static std::string Unknown("Unknown");
+ static wxString Unknown("Unknown");
return Unknown;
}
@@ -85,11 +85,11 @@
protected:
- std::vector<std::string> mDeviceNames;
+ std::vector<wxString> mDeviceNames;
private:
- // Prevent accidental copy or assignment.
+ // Hidden and unimplemented to prevent accidental copy or assignment.
JZDeviceList(const JZDeviceList &);
JZDeviceList& operator = (const JZDeviceList &);
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 19:53:34
|
Revision: 882
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=882&view=rev
Author: pstieber
Date: 2011-08-05 19:53:28 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
1. Changed fname to FileName.
2. Updated string processing.
Modified Paths:
--------------
trunk/jazz/src/SampleDialog.cpp
Modified: trunk/jazz/src/SampleDialog.cpp
===================================================================
--- trunk/jazz/src/SampleDialog.cpp 2011-08-05 19:48:23 UTC (rev 881)
+++ trunk/jazz/src/SampleDialog.cpp 2011-08-05 19:53:28 UTC (rev 882)
@@ -618,15 +618,15 @@
{
case SYN_LOAD:
{
- wxString fname = file_selector(
+ wxString FileName = file_selector(
mDefaultFileName,
"Load Synth",
0,
0,
"*.syn");
- if (fname)
+ if (!FileName.empty())
{
- ifstream is(fname);
+ ifstream is(FileName.wx_str());
is >> *this;
SetupEdits();
int cw, ch;
@@ -640,15 +640,15 @@
case SYN_SAVE:
{
- wxString fname = file_selector(
+ wxString FileName = file_selector(
mDefaultFileName,
"Save Synth",
1,
0,
"*.syn");
- if (fname)
+ if (!FileName.empty())
{
- ofstream os(fname);
+ ofstream os(FileName.wx_str());
os << *this;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 19:48:29
|
Revision: 881
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=881&view=rev
Author: pstieber
Date: 2011-08-05 19:48:23 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
1. Changed fname to FileName.
2. Updated string processing.
Modified Paths:
--------------
trunk/jazz/src/Rhythm.cpp
Modified: trunk/jazz/src/Rhythm.cpp
===================================================================
--- trunk/jazz/src/Rhythm.cpp 2011-08-05 02:16:13 UTC (rev 880)
+++ trunk/jazz/src/Rhythm.cpp 2011-08-05 19:48:23 UTC (rev 881)
@@ -761,15 +761,15 @@
case wxID_OPEN:
{
- wxString fname = file_selector(
+ wxString FileName = file_selector(
mDefaultFileName,
"Load Rhythm",
false,
has_changed,
"*.rhy");
- if (fname)
+ if (!FileName.empty())
{
- ifstream Is(fname);
+ ifstream Is(FileName.wx_str());
Is >> *this;
OnPaint();
}
@@ -779,15 +779,15 @@
case wxID_SAVE:
{
Win2Instrument();
- wxString fname = file_selector(
+ wxString FileName = file_selector(
mDefaultFileName,
"Save Rhythm",
true,
has_changed,
"*.rhy");
- if (fname)
+ if (!FileName.empty())
{
- ofstream Os(fname);
+ ofstream Os(FileName.wx_str());
Os << *this;
}
}
@@ -907,7 +907,7 @@
pRhythm->n_keys = 1;
pRhythm->keys[0] = keys[i];
pRhythm->mode = MODE_ALL_OF;
- pRhythm->SetLabel(names[i].c_str());
+ pRhythm->SetLabel(names[i]);
}
// choose controller?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 02:16:19
|
Revision: 880
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=880&view=rev
Author: pstieber
Date: 2011-08-05 02:16:13 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
1. Made a cosmetic change.
2. Changed event to Event.
3. Used Event.Skip instead of calling the base class OnSize.
Modified Paths:
--------------
trunk/jazz/src/Random.cpp
Modified: trunk/jazz/src/Random.cpp
===================================================================
--- trunk/jazz/src/Random.cpp 2011-08-05 02:03:36 UTC (rev 879)
+++ trunk/jazz/src/Random.cpp 2011-08-05 02:16:13 UTC (rev 880)
@@ -305,17 +305,17 @@
}
BEGIN_EVENT_TABLE(JZArrayEdit, wxScrolledWindow)
- EVT_SIZE ( JZArrayEdit::OnSize)
+ EVT_SIZE(JZArrayEdit::OnSize)
EVT_MOUSE_EVENTS(JZArrayEdit::OnMouseEvent)
END_EVENT_TABLE()
-void JZArrayEdit::OnSize(wxSizeEvent& event)
+void JZArrayEdit::OnSize(wxSizeEvent& Event)
{
- w = event.GetSize().GetWidth();
- h = event.GetSize().GetHeight();
+ w = Event.GetSize().GetWidth();
+ h = Event.GetSize().GetHeight();
- wxScrolledWindow::OnSize(event);
+ Event.Skip();
int tw, th;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 02:03:42
|
Revision: 879
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=879&view=rev
Author: pstieber
Date: 2011-08-05 02:03:36 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Updated some string code.
Modified Paths:
--------------
trunk/jazz/src/Project.cpp
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2011-08-05 01:44:29 UTC (rev 878)
+++ trunk/jazz/src/Project.cpp 2011-08-05 02:03:36 UTC (rev 879)
@@ -503,8 +503,8 @@
{
JZStandardRead Io;
Clear();
- Read(Io, SongFileName);
- mpConfig->Put(C_StartUpSong, SongFileName.c_str());
+ Read(Io, SongFileName.c_str());
+ mpConfig->Put(C_StartUpSong, SongFileName);
}
//-----------------------------------------------------------------------------
@@ -519,8 +519,8 @@
void JZProject::ExportMidiFile(const wxString& MidiFileName)
{
JZStandardWrite Io;
- Write(Io, MidiFileName);
- mpConfig->Put(C_StartUpSong, MidiFileName.c_str());
+ Write(Io, MidiFileName.c_str());
+ mpConfig->Put(C_StartUpSong, MidiFileName);
}
//-----------------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 01:44:35
|
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.
|
|
From: <pst...@us...> - 2011-08-05 01:42:15
|
Revision: 877
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=877&view=rev
Author: pstieber
Date: 2011-08-05 01:42:09 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Removed an unneeded cast.
Modified Paths:
--------------
trunk/jazz/src/FindFile.cpp
Modified: trunk/jazz/src/FindFile.cpp
===================================================================
--- trunk/jazz/src/FindFile.cpp 2011-08-05 01:35:22 UTC (rev 876)
+++ trunk/jazz/src/FindFile.cpp 2011-08-05 01:42:09 UTC (rev 877)
@@ -80,7 +80,7 @@
// Look where the executable was started.
FoundFileName = "";
- Home = wxPathOnly((const char *)wxTheApp->argv[0]);
+ Home = wxPathOnly(wxTheApp->argv[0]);
FoundFileName << Home << wxFileName::GetPathSeparator() << FileName;
if (wxFileExists(FoundFileName))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 01:35:28
|
Revision: 876
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=876&view=rev
Author: pstieber
Date: 2011-08-05 01:35:22 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Updated empty string tests and made a cosmetic indentation change.
Modified Paths:
--------------
trunk/jazz/src/FileSelector.cpp
Modified: trunk/jazz/src/FileSelector.cpp
===================================================================
--- trunk/jazz/src/FileSelector.cpp 2011-08-05 01:33:53 UTC (rev 875)
+++ trunk/jazz/src/FileSelector.cpp 2011-08-05 01:35:22 UTC (rev 876)
@@ -95,7 +95,6 @@
buf << "overwrite "<<s<<"?";
if (wxMessageBox(buf, "Save ?", wxYES_NO) == wxNO)
{
-
s = wxEmptyString;
}
}
@@ -112,7 +111,7 @@
}
}
- if (s!=wxEmptyString && !save)
+ if (!s.empty() && !save)
{
if (!wxFileExists(s))
{
@@ -124,7 +123,7 @@
}
}
- if (s != wxEmptyString)
+ if (!s.empty())
{
//DefaultFileName = s;
//return DefaultFileName;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 01:33:59
|
Revision: 875
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=875&view=rev
Author: pstieber
Date: 2011-08-05 01:33:53 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Updated string code.
Modified Paths:
--------------
trunk/jazz/src/FileSelector.cpp
Modified: trunk/jazz/src/FileSelector.cpp
===================================================================
--- trunk/jazz/src/FileSelector.cpp 2011-08-05 01:25:01 UTC (rev 874)
+++ trunk/jazz/src/FileSelector.cpp 2011-08-05 01:33:53 UTC (rev 875)
@@ -77,16 +77,16 @@
path = wxPathOnly(DefaultFileName);
int flags = save ? wxFD_SAVE : wxFD_OPEN;
- wxString s = wxFileSelector(title, path, file, 0, Extension, flags);
+ wxString s = wxFileSelector(title, path, file, wxEmptyString, Extension, flags);
// add extension if missing
- if (!s.empty() && Extension)
+ if (!s.empty() && !Extension.empty())
{
s = add_default_ext(s, Extension);
}
// warn if overwriting existent file
- if (s && save)
+ if (!s.empty() && save)
{
if (wxFileExists(s))
{
@@ -101,7 +101,7 @@
}
}
- if (s && !save && changed)
+ if (!s.empty() && !save && changed)
{
wxString buf;
buf << DefaultFileName;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 01:25:07
|
Revision: 874
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=874&view=rev
Author: pstieber
Date: 2011-08-05 01:25:01 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Simplified some string code.
Modified Paths:
--------------
trunk/jazz/src/Dialogs/SnapDialog.cpp
Modified: trunk/jazz/src/Dialogs/SnapDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SnapDialog.cpp 2011-08-05 01:22:58 UTC (rev 873)
+++ trunk/jazz/src/Dialogs/SnapDialog.cpp 2011-08-05 01:25:01 UTC (rev 874)
@@ -110,15 +110,14 @@
//-----------------------------------------------------------------------------
bool JZSnapDialog::TransferDataFromWindow()
{
- wxString SelectedValue = mpSnapValueChoice->GetStringSelection();
- string SelectedString = SelectedValue.c_str();
+ string SelectedValue = mpSnapValueChoice->GetStringSelection();
for (
map<int, string>::const_iterator iLimitSteps = gLimitSteps.begin();
iLimitSteps != gLimitSteps.end();
++iLimitSteps)
{
const string& String = iLimitSteps->second;
- if (SelectedString == String)
+ if (SelectedValue == String)
{
mSnapDenominator = iLimitSteps->first;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 01:23:04
|
Revision: 873
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=873&view=rev
Author: pstieber
Date: 2011-08-05 01:22:58 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Simplified some string code.
Modified Paths:
--------------
trunk/jazz/src/Dialogs/QuantizeDialog.cpp
Modified: trunk/jazz/src/Dialogs/QuantizeDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/QuantizeDialog.cpp 2011-08-05 01:20:59 UTC (rev 872)
+++ trunk/jazz/src/Dialogs/QuantizeDialog.cpp 2011-08-05 01:22:58 UTC (rev 873)
@@ -184,15 +184,14 @@
//-----------------------------------------------------------------------------
bool JZQuantizeDialog::TransferDataFromWindow()
{
- wxString SelectedValue = mpStepSizeComboBox->GetValue();
- string SelectedString = SelectedValue.c_str();
+ string SelectedValue = mpStepSizeComboBox->GetValue();
for (
map<int, string>::const_iterator iPair = gQuantizationSteps.begin();
iPair != gQuantizationSteps.end();
++iPair)
{
const string& String = iPair->second;
- if (SelectedString == String)
+ if (SelectedValue == String)
{
mQuantizationStep = iPair->first;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 01:21:05
|
Revision: 872
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=872&view=rev
Author: pstieber
Date: 2011-08-05 01:20:59 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Simplified some string code.
Modified Paths:
--------------
trunk/jazz/src/Dialogs/CleanupDialog.cpp
Modified: trunk/jazz/src/Dialogs/CleanupDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/CleanupDialog.cpp 2011-08-05 01:02:08 UTC (rev 871)
+++ trunk/jazz/src/Dialogs/CleanupDialog.cpp 2011-08-05 01:20:59 UTC (rev 872)
@@ -129,15 +129,14 @@
//-----------------------------------------------------------------------------
bool JZCleanupDialog::TransferDataFromWindow()
{
- wxString SelectedValue = mpShortestNoteChoice->GetStringSelection();
- string SelectedString = SelectedValue.c_str();
+ string SelectedValue = mpShortestNoteChoice->GetStringSelection();
for (
map<int, string>::const_iterator iLimitSteps = gLimitSteps.begin();
iLimitSteps != gLimitSteps.end();
++iLimitSteps)
{
const string& String = iLimitSteps->second;
- if (SelectedString == String)
+ if (SelectedValue == String)
{
mShortestNote = iLimitSteps->first;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 01:02:14
|
Revision: 871
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=871&view=rev
Author: pstieber
Date: 2011-08-05 01:02:08 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Updated some string processing code.
Modified Paths:
--------------
trunk/jazz/src/DeprecatedWx/proplist.cpp
Modified: trunk/jazz/src/DeprecatedWx/proplist.cpp
===================================================================
--- trunk/jazz/src/DeprecatedWx/proplist.cpp 2011-08-05 00:48:35 UTC (rev 870)
+++ trunk/jazz/src/DeprecatedWx/proplist.cpp 2011-08-05 01:02:08 UTC (rev 871)
@@ -1822,8 +1822,6 @@
}
m_listBox->Delete(sel);
- delete[] (const wxChar *)(*node)->GetData();
- delete node;
m_currentSelection = -1;
m_stringText->SetValue(wxEmptyString);
}
@@ -1899,11 +1897,10 @@
m_stringText->SetValue(wxEmptyString);
return;
}
- wxStringList::compatibility_iterator* node =
- (wxStringList::compatibility_iterator*)
+ list<wxString>::iterator* piString =
+ (list<wxString>::iterator*)
m_listBox->wxListBox::GetClientData(m_currentSelection);
- const wxChar* txt = (const wxChar *)(*node)->GetData();
- m_stringText->SetValue(txt);
+ m_stringText->SetValue(**piString);
m_stringText->Enable();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 00:48:41
|
Revision: 870
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=870&view=rev
Author: pstieber
Date: 2011-08-05 00:48:35 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
1. Used 0 instead of NULL.
2. Updated some string code.
Modified Paths:
--------------
trunk/jazz/src/DeprecatedWx/proplist.cpp
trunk/jazz/src/DeprecatedWx/proplist.h
Modified: trunk/jazz/src/DeprecatedWx/proplist.cpp
===================================================================
--- trunk/jazz/src/DeprecatedWx/proplist.cpp 2011-08-05 00:44:20 UTC (rev 869)
+++ trunk/jazz/src/DeprecatedWx/proplist.cpp 2011-08-05 00:48:35 UTC (rev 870)
@@ -1268,7 +1268,7 @@
const wxString& s = *iString;
if (wxStrcmp(s, currentString) == 0)
{
- const wxChar *nextString;
+ wxString nextString;
++iString;
if (iString != m_strings->end())
{
Modified: trunk/jazz/src/DeprecatedWx/proplist.h
===================================================================
--- trunk/jazz/src/DeprecatedWx/proplist.h 2011-08-05 00:44:20 UTC (rev 869)
+++ trunk/jazz/src/DeprecatedWx/proplist.h 2011-08-05 00:48:35 UTC (rev 870)
@@ -539,7 +539,7 @@
class WXDLLIMPEXP_DEPRECATED wxStringListValidator: public wxPropertyListValidator
{
public:
- wxStringListValidator(wxArrayString *list = NULL, long flags = 0);
+ wxStringListValidator(wxArrayString* list = 0, long flags = 0);
~wxStringListValidator()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2011-08-05 00:44:26
|
Revision: 869
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=869&view=rev
Author: pstieber
Date: 2011-08-05 00:44:20 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
1. Upgraded from wxStringList to wxArrayString.
2. Removed unneeded casts.
Modified Paths:
--------------
trunk/jazz/src/DeprecatedWx/proplist.cpp
trunk/jazz/src/DeprecatedWx/proplist.h
Modified: trunk/jazz/src/DeprecatedWx/proplist.cpp
===================================================================
--- trunk/jazz/src/DeprecatedWx/proplist.cpp 2011-08-05 00:07:36 UTC (rev 868)
+++ trunk/jazz/src/DeprecatedWx/proplist.cpp 2011-08-05 00:44:20 UTC (rev 869)
@@ -57,11 +57,6 @@
using namespace std;
-#if !WXWIN_COMPATIBILITY_2_4
-static inline wxChar* copystring(const wxChar* s)
- { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
-#endif
-
// ----------------------------------------------------------------------------
// Property text edit control
// ----------------------------------------------------------------------------
@@ -911,7 +906,7 @@
wxString value(view->GetValueText()->GetValue());
float val = 0.0;
- if (!StringToFloat(WXSTRINGCAST value, &val))
+ if (!StringToFloat(value, &val))
{
wxChar buf[200];
wxSprintf(buf, wxT("Value %s is not a valid real number!"), value.GetData());
@@ -974,7 +969,7 @@
wxString value(view->GetValueText()->GetValue());
long val = 0;
- if (!StringToLong(WXSTRINGCAST value, &val))
+ if (!StringToLong(value, &val))
{
wxChar buf[200];
wxSprintf(buf, wxT("Value %s is not a valid integer!"), value.GetData());
@@ -1093,9 +1088,7 @@
view->GetValueList()->Append(wxT("True"));
view->GetValueList()->Append(wxT("False"));
- wxChar *currentString = copystring(view->GetValueText()->GetValue());
- view->GetValueList()->SetStringSelection(currentString);
- delete[] currentString;
+ view->GetValueList()->SetStringSelection(view->GetValueText()->GetValue());
}
return true;
}
@@ -1132,7 +1125,7 @@
///
IMPLEMENT_DYNAMIC_CLASS(wxStringListValidator, wxPropertyListValidator)
-wxStringListValidator::wxStringListValidator(wxStringList *list, long flags):
+wxStringListValidator::wxStringListValidator(wxArrayString *list, long flags):
wxPropertyListValidator(flags)
{
m_strings = list;
@@ -1150,7 +1143,7 @@
return false;
wxString value(view->GetValueText()->GetValue());
- if (!m_strings->Member(value.GetData()))
+ if (m_strings->Index(value.GetData()) == wxNOT_FOUND)
{
wxString str( wxT("Value ") );
str += value.GetData();
@@ -1227,12 +1220,13 @@
{
view->ShowListBoxControl(true);
view->GetValueList()->Enable();
- wxStringList::compatibility_iterator node = m_strings->GetFirst();
- while (node)
+ for (
+ wxArrayString::iterator iString = m_strings->begin();
+ iString != m_strings->end();
+ ++iString)
{
- const wxChar* s = node->GetData();
+ const wxString& s = *iString;
view->GetValueList()->Append(s);
- node = node->GetNext();
}
wxChar *currentString = property->GetValue().StringValue();
view->GetValueList()->SetStringSelection(currentString);
@@ -1267,25 +1261,33 @@
if (!m_strings)
return false;
- wxStringList::compatibility_iterator node = m_strings->GetFirst();
+ wxArrayString::iterator iString = m_strings->begin();
wxChar* currentString = property->GetValue().StringValue();
- while (node)
+ while (iString != m_strings->end())
{
- const wxChar* s = node->GetData();
+ const wxString& s = *iString;
if (wxStrcmp(s, currentString) == 0)
{
const wxChar *nextString;
- if (node->GetNext())
- nextString = node->GetNext()->GetData();
+ ++iString;
+ if (iString != m_strings->end())
+ {
+ nextString = *iString;
+ }
else
- nextString = m_strings->GetFirst()->GetData();
+ {
+ nextString = *m_strings->begin();
+ }
property->GetValue() = wxString(nextString);
view->DisplayProperty(property);
view->UpdatePropertyDisplayInList(property);
view->OnPropertyChanged(property);
return true;
}
- else node = node->GetNext();
+ else
+ {
+ ++iString;
+ }
}
return true;
}
@@ -1366,7 +1368,7 @@
m_filenameMessage.GetData(),
wxPathOnly(property->GetValue().StringValue()),
wxFileNameFromPath(property->GetValue().StringValue()),
- NULL,
+ wxEmptyString,
m_filenameWildCard.GetData(),
0,
parentWindow);
@@ -1811,11 +1813,13 @@
if (sel == wxNOT_FOUND)
return;
- wxStringList::compatibility_iterator* node =
- (wxStringList::compatibility_iterator*)
+ wxStringList::compatibility_iterator* node =
+ (wxStringList::compatibility_iterator*)
m_listBox->wxListBox::GetClientData(sel);
if (!node)
+ {
return;
+ }
m_listBox->Delete(sel);
delete[] (const wxChar *)(*node)->GetData();
@@ -1875,18 +1879,17 @@
if (m_currentSelection == -1)
return;
- wxStringList::compatibility_iterator* node =
- (wxStringList::compatibility_iterator*)
- m_listBox->wxListBox::GetClientData(m_currentSelection);
- if (!node)
+ list<wxString>::iterator* piString =
+ (list<wxString>::iterator*)
+ m_listBox->wxListBox::GetClientData(m_currentSelection);
+ if (!piString)
+ {
return;
+ }
- wxString txt(m_stringText->GetValue());
- if ((*node)->GetData())
- delete[] (const wxChar *)(*node)->GetData();
- (*node)->SetData(wxStrdup(txt));
+ **piString = m_stringText->GetValue();
- m_listBox->SetString(m_currentSelection, (const wxChar *)(*node)->GetData());
+ m_listBox->SetString(m_currentSelection, **piString);
}
void wxPropertyStringListEditorDialog::ShowCurrentSelection()
Modified: trunk/jazz/src/DeprecatedWx/proplist.h
===================================================================
--- trunk/jazz/src/DeprecatedWx/proplist.h 2011-08-05 00:07:36 UTC (rev 868)
+++ trunk/jazz/src/DeprecatedWx/proplist.h 2011-08-05 00:44:20 UTC (rev 869)
@@ -539,7 +539,7 @@
class WXDLLIMPEXP_DEPRECATED wxStringListValidator: public wxPropertyListValidator
{
public:
- wxStringListValidator(wxStringList *list = NULL, long flags = 0);
+ wxStringListValidator(wxArrayString *list = NULL, long flags = 0);
~wxStringListValidator()
{
@@ -566,7 +566,7 @@
bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
protected:
- wxStringList* m_strings;
+ wxArrayString* m_strings;
private:
DECLARE_DYNAMIC_CLASS(wxStringListValidator)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
