Menu
▾
▴
SF.net SVN: jazzplusplus:[656] trunk/jazz
|
From: <pst...@us...> - 2008-12-27 02:14:12
|
Revision: 656
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=656&view=rev
Author: pstieber
Date: 2008-12-27 02:14:07 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Removed the use of WxWidgets.h and the file itself. This will break the Linux
build for a short time, but I'm going to start working on it soon. Now I'm only
using the minimal amount of wxWidgets includes necessary in each file and trying
to make sure the header files are self contained.
Modified Paths:
--------------
trunk/jazz/src/AboutDialog.cpp
trunk/jazz/src/AboutDialog.h
trunk/jazz/src/AlsaDriver.cpp
trunk/jazz/src/AlsaPlayer.cpp
trunk/jazz/src/AlsaThru.cpp
trunk/jazz/src/AsciiMidiFile.cpp
trunk/jazz/src/Audio.cpp
trunk/jazz/src/Audio.h
trunk/jazz/src/AudioDriver.cpp
trunk/jazz/src/ClockDialog.cpp
trunk/jazz/src/Command.cpp
trunk/jazz/src/Configuration.cpp
trunk/jazz/src/Configuration.h
trunk/jazz/src/ControlEdit.cpp
trunk/jazz/src/ControlEdit.h
trunk/jazz/src/Dialogs/KeyOnDialog.cpp
trunk/jazz/src/Dialogs/KeyOnDialog.h
trunk/jazz/src/Dialogs/MetronomeSettingsDialog.cpp
trunk/jazz/src/Dialogs/MetronomeSettingsDialog.h
trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.cpp
trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.h
trunk/jazz/src/Dialogs/TrackDialog.cpp
trunk/jazz/src/Dialogs/TrackDialog.h
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/ErrorMessage.cpp
trunk/jazz/src/EventWindow.cpp
trunk/jazz/src/EventWindow.h
trunk/jazz/src/Events.cpp
trunk/jazz/src/Events.h
trunk/jazz/src/FileSelector.cpp
trunk/jazz/src/Filter.cpp
trunk/jazz/src/Filter.h
trunk/jazz/src/FindFile.cpp
trunk/jazz/src/GetOptionIndex.cpp
trunk/jazz/src/Globals.cpp
trunk/jazz/src/GuitarFrame.cpp
trunk/jazz/src/GuitarFrame.h
trunk/jazz/src/GuitarSettingsDialog.cpp
trunk/jazz/src/GuitarSettingsDialog.h
trunk/jazz/src/GuitarWindow.cpp
trunk/jazz/src/GuitarWindow.h
trunk/jazz/src/Harmony.cpp
trunk/jazz/src/Harmony.h
trunk/jazz/src/HarmonyBrowserAnalyzer.cpp
trunk/jazz/src/Help.cpp
trunk/jazz/src/Help.h
trunk/jazz/src/JazzPlusPlusApplication.cpp
trunk/jazz/src/JazzPlusPlusApplication.h
trunk/jazz/src/KeyDialog.cpp
trunk/jazz/src/Knob.cpp
trunk/jazz/src/Knob.h
trunk/jazz/src/MeasureChoice.cpp
trunk/jazz/src/Metronome.cpp
trunk/jazz/src/MidiDeviceDialog.cpp
trunk/jazz/src/MidiDeviceDialog.h
trunk/jazz/src/MouseAction.cpp
trunk/jazz/src/NamedChoice.cpp
trunk/jazz/src/NamedChoice.h
trunk/jazz/src/NamedValue.cpp
trunk/jazz/src/NamedValueChoice.cpp
trunk/jazz/src/NamedValueChoice.h
trunk/jazz/src/PianoFrame.cpp
trunk/jazz/src/PianoFrame.h
trunk/jazz/src/PianoWindow.cpp
trunk/jazz/src/PianoWindow.h
trunk/jazz/src/Player.cpp
trunk/jazz/src/PortMidiPlayer.cpp
trunk/jazz/src/Project.cpp
trunk/jazz/src/ProjectManager.cpp
trunk/jazz/src/PropertyListDialog.cpp
trunk/jazz/src/Random.cpp
trunk/jazz/src/Random.h
trunk/jazz/src/Rectangle.cpp
trunk/jazz/src/Rectangle.h
trunk/jazz/src/ResourceDialog.cpp
trunk/jazz/src/ResourceDialog.h
trunk/jazz/src/Rhythm.cpp
trunk/jazz/src/Rhythm.h
trunk/jazz/src/Sample.cpp
trunk/jazz/src/SampleCommand.cpp
trunk/jazz/src/SampleDialog.cpp
trunk/jazz/src/SampleDialog.h
trunk/jazz/src/SampleWindow.cpp
trunk/jazz/src/SampleWindow.h
trunk/jazz/src/SelectControllerDialog.cpp
trunk/jazz/src/Signal2.cpp
trunk/jazz/src/SliderWindow.cpp
trunk/jazz/src/SliderWindow.h
trunk/jazz/src/Song.cpp
trunk/jazz/src/StandardFile.cpp
trunk/jazz/src/Synth.cpp
trunk/jazz/src/ToolBar.cpp
trunk/jazz/src/ToolBar.h
trunk/jazz/src/Track.cpp
trunk/jazz/src/Track.h
trunk/jazz/src/TrackFrame.cpp
trunk/jazz/src/TrackFrame.h
trunk/jazz/src/TrackWindow.cpp
trunk/jazz/src/commands/copyCommand.cpp
trunk/jazz/src/mswin/WindowsAudioInterface.cpp
trunk/jazz/src/mswin/WindowsMidiInterface.cpp
trunk/jazz/src/mswin/WindowsPlayer.cpp
trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
trunk/jazz/vc9/JazzPlusPlus-VC9.sln
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Removed Paths:
-------------
trunk/jazz/src/WxWidgets.h
Modified: trunk/jazz/src/AboutDialog.cpp
===================================================================
--- trunk/jazz/src/AboutDialog.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/AboutDialog.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,22 +20,23 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "AboutDialog.h"
-#include <wx/version.h>
-#include <wx/html/htmlwin.h>
-
+#include "JazzPlusPlusApplication.h"
#include "Resources.h"
-#include "AboutDialog.h"
-#include "JazzPlusPlusApplication.h"
+#include <wx/button.h>
+#include <wx/html/htmlwin.h>
+#include <wx/sizer.h>
+#include <wx/statbmp.h>
+#include <wx/version.h>
-#include "Bitmaps/JazzLogo.xpm"
-
#include <sstream>
using namespace std;
+#include "Bitmaps/JazzLogo.xpm"
+
//*****************************************************************************
// Description:
// This is the Jazz++ application about dialog box definion.
Modified: trunk/jazz/src/AboutDialog.h
===================================================================
--- trunk/jazz/src/AboutDialog.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/AboutDialog.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -23,6 +23,11 @@
#ifndef JZ_ABOUTDIALOG_H
#define JZ_ABOUTDIALOG_H
+#include <wx/dialog.h>
+
+class wxBitmap;
+class wxStaticBitmap;
+
//*****************************************************************************
// Description:
// This is the JAZZ++ about dialog declaration.
Modified: trunk/jazz/src/AlsaDriver.cpp
===================================================================
--- trunk/jazz/src/AlsaDriver.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/AlsaDriver.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -29,8 +29,6 @@
// Initial version: only playback is tested.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "AlsaDriver.h"
#include "TrackFrame.h"
Modified: trunk/jazz/src/AlsaPlayer.cpp
===================================================================
--- trunk/jazz/src/AlsaPlayer.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/AlsaPlayer.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -29,15 +29,14 @@
// like OSS driver mode.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "AlsaPlayer.h"
+
+#include "Configuration.h"
+#include "Dialogs.h"
+#include "Globals.h"
#include "ProjectManager.h"
#include "TrackFrame.h"
#include "TrackWindow.h"
-#include "Dialogs.h"
-#include "Configuration.h"
-#include "Globals.h"
#include <stdlib.h>
#include <errno.h>
Modified: trunk/jazz/src/AlsaThru.cpp
===================================================================
--- trunk/jazz/src/AlsaThru.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/AlsaThru.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -35,20 +35,18 @@
// or a thread.
//*****************************************************************************
+#include "AlsaThru.h"
-#include "WxWidgets.h"
+#include "AlsaPlayer.h"
-#include <stdlib.h>
+#include <cstdlib>
#include <errno.h>
-#include <stdio.h>
+#include <cstdio>
#include <sys/wait.h>
#include <unistd.h>
#include <string.h>
#include <signal.h>
-#include "AlsaThru.h"
-#include "AlsaPlayer.h"
-
/*
** midi thru for alsa. it creates a new process (because threads dont work
** with wxwin) that copies from input to output.
Modified: trunk/jazz/src/AsciiMidiFile.cpp
===================================================================
--- trunk/jazz/src/AsciiMidiFile.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/AsciiMidiFile.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -19,8 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "AsciiMidiFile.h"
//*****************************************************************************
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Audio.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,10 +20,9 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "Audio.h"
#include "Sample.h"
-#include "Audio.h"
#include "Events.h"
#include "RecordingInfo.h"
#include "Track.h"
@@ -39,12 +38,16 @@
#include "Help.h"
#include "Resources.h"
-#include <iostream>
-#include <fstream>
+#include <wx/listbox.h>
+#include <wx/msgdlg.h>
+#include <wx/slider.h>
+
+#include <cassert>
#include <cmath>
#include <cstdlib>
+#include <fstream>
+#include <iostream>
-#include <assert.h>
#include <sys/stat.h>
#include <string.h>
Modified: trunk/jazz/src/Audio.h
===================================================================
--- trunk/jazz/src/Audio.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Audio.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -26,6 +26,9 @@
#include "DynamicArray.h"
#include "Project.h"
+#include <wx/app.h>
+#include <wx/string.h>
+
class tEventArray;
class JZTrack;
struct tAudioBuffer;
Modified: trunk/jazz/src/AudioDriver.cpp
===================================================================
--- trunk/jazz/src/AudioDriver.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/AudioDriver.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,9 +20,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "AudioDriver.h"
+
#include "RecordingInfo.h"
#include "Configuration.h"
#include "Globals.h"
Modified: trunk/jazz/src/ClockDialog.cpp
===================================================================
--- trunk/jazz/src/ClockDialog.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/ClockDialog.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,8 +20,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "ClockDialog.h"
#include "Song.h"
Modified: trunk/jazz/src/Command.cpp
===================================================================
--- trunk/jazz/src/Command.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Command.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,14 +20,13 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "Command.h"
+
+#include "Filter.h"
+#include "Globals.h"
#include "Song.h"
#include "Track.h"
-#include "Filter.h"
#include "Random.h"
-#include "Globals.h"
#include <cstdlib>
#include <limits>
Modified: trunk/jazz/src/Configuration.cpp
===================================================================
--- trunk/jazz/src/Configuration.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Configuration.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,22 +20,21 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
-#include <wx/stdpaths.h>
-#include <wx/filename.h>
-
#include "Configuration.h"
-#include "Synth.h"
#include "FindFile.h"
#include "Globals.h"
#include "StringUtilities.h"
+#include "Synth.h"
-#include <stack>
+#include <wx/filename.h>
+#include <wx/msgdlg.h>
+#include <wx/stdpaths.h>
+
+#include <fstream>
#include <iostream>
#include <sstream>
-#include <fstream>
+#include <stack>
using namespace std;
Modified: trunk/jazz/src/Configuration.h
===================================================================
--- trunk/jazz/src/Configuration.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Configuration.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -26,6 +26,8 @@
#include <string>
#include <vector>
+#include <wx/string.h>
+
//*****************************************************************************
//*****************************************************************************
class JZDoubleCommand
Modified: trunk/jazz/src/ControlEdit.cpp
===================================================================
--- trunk/jazz/src/ControlEdit.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/ControlEdit.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,14 +20,16 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "ControlEdit.h"
-#include "ControlEdit.h"
+#include "EventWindow.h"
#include "PianoWindow.h"
-#include "EventWindow.h"
#include "Song.h"
#include "Track.h"
+#include <wx/button.h>
+#include <wx/sizer.h>
+
static const long wbar = 2;
static int bars_state = 2; // from ArrayEdit
Modified: trunk/jazz/src/ControlEdit.h
===================================================================
--- trunk/jazz/src/ControlEdit.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/ControlEdit.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -25,10 +25,13 @@
#include "Random.h"
+#include <wx/panel.h>
+
class JZPianoWindow;
class JZTrack;
class JZEvent;
class tCtrlEditBase;
+class wxButton;
// to access tCtrlEditBase from Buttons etc
@@ -125,8 +128,8 @@
void Create(JZPianoWindow* p, char const *label, int dx, int x, int y, int w, int h);
- static void Apply(wxButton &but, wxCommandEvent& event);
- static void Revert(wxButton &but, wxCommandEvent& event);
+ static void Apply(wxButton& but, wxCommandEvent& event);
+ static void Revert(wxButton& but, wxCommandEvent& event);
// SN++
static void Edit(wxButton &but, wxCommandEvent& event);
static void Bars(wxButton &but, wxCommandEvent& event);
Modified: trunk/jazz/src/Dialogs/KeyOnDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/KeyOnDialog.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Dialogs/KeyOnDialog.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -18,17 +18,20 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "KeyOnDialog.h"
+#include "../Events.h"
#include "../Globals.h"
+#include "../KeyStringConverters.h"
+#include "../Knob.h"
#include "../Project.h"
-#include "../Events.h"
-#include "../Knob.h"
-#include "../KeyStringConverters.h"
#include "../Resources.h"
+#include <wx/button.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
#include <sstream>
using namespace std;
Modified: trunk/jazz/src/Dialogs/KeyOnDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/KeyOnDialog.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Dialogs/KeyOnDialog.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -21,9 +21,13 @@
#ifndef JZ_KEYONDIALOG_H
#define JZ_KEYONDIALOG_H
+#include <wx/dialog.h>
+
+class JZKnob;
+class JZKnobEvent;
class tKeyOn;
-class JZKnobEvent;
-class JZKnob;
+class wxStaticText;
+class wxTextCtrl;
//*****************************************************************************
//*****************************************************************************
Modified: trunk/jazz/src/Dialogs/MetronomeSettingsDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/MetronomeSettingsDialog.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Dialogs/MetronomeSettingsDialog.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -18,16 +18,20 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "MetronomeSettingsDialog.h"
-#include "../Metronome.h"
#include "../Configuration.h"
#include "../Globals.h"
#include "../Knob.h"
+#include "../Metronome.h"
#include "../Resources.h"
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/listbox.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
#include <iostream>
#include <sstream>
Modified: trunk/jazz/src/Dialogs/MetronomeSettingsDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/MetronomeSettingsDialog.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Dialogs/MetronomeSettingsDialog.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -21,14 +21,19 @@
#ifndef JZ_METRONOMESETTINGDIALOG_H
#define JZ_METRONOMESETTINGDIALOG_H
-class JZMetronomeInfo;
+#include <wx/dialog.h>
+
+#include <map>
+#include <string>
+#include <vector>
+
class JZKnob;
class JZKnobEvent;
+class JZMetronomeInfo;
+class wxCheckBox;
+class wxListBox;
+class wxStaticText;
-#include <vector>
-#include <string>
-#include <map>
-
//*****************************************************************************
//*****************************************************************************
class JZMetronomeSettingsDialog : public wxDialog
Modified: trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -18,12 +18,17 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "SynthesizerSettingsDialog.h"
-#include "SynthesizerSettingsDialog.h"
#include "../Configuration.h"
#include "../Globals.h"
+#include <wx/button.h>
+#include <wx/listbox.h>
+#include <wx/msgdlg.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
using namespace std;
//*****************************************************************************
Modified: trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -21,8 +21,12 @@
#ifndef JZ_SYNTHESIZERSETTINGDIALOG_H
#define JZ_SYNTHESIZERSETTINGDIALOG_H
+#include <wx/dialog.h>
+
#include <string>
+class wxListBox;
+
//*****************************************************************************
//*****************************************************************************
class JZSynthesizerDialog : public wxDialog
Modified: trunk/jazz/src/Dialogs/TrackDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/TrackDialog.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Dialogs/TrackDialog.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -18,15 +18,20 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "TrackDialog.h"
-#include "TrackDialog.h"
-#include "../Knob.h"
-#include "../Track.h"
#include "../Configuration.h"
#include "../Globals.h"
+#include "../Knob.h"
#include "../Resources.h"
+#include "../Track.h"
+#include <wx/button.h>
+#include <wx/listbox.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+
#include <sstream>
using namespace std;
Modified: trunk/jazz/src/Dialogs/TrackDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/TrackDialog.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Dialogs/TrackDialog.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -21,11 +21,14 @@
#ifndef JZ_TRACKDIALOG_H
#define JZ_TRACKDIALOG_H
+#include <wx/dialog.h>
+
+class JZKnob;
+class JZKnobEvent;
class JZTrack;
+class wxListBox;
+class wxStaticText;
class wxTextCtrl;
-class wxStaticText;
-class JZKnobEvent;
-class JZKnob;
//*****************************************************************************
//*****************************************************************************
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Dialogs.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,31 +20,31 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "Dialogs.h"
-#include "Dialogs.h"
-#include "Song.h"
-#include "Synth.h"
+#include "ClockDialog.h"
#include "Command.h"
+#include "DeprecatedWx/proplist.h"
+#include "Dialogs/KeyOnDialog.h"
+#include "Events.h"
#include "EventWindow.h"
-#include "ProjectManager.h"
-#include "Track.h"
-#include "Events.h"
-#include "Player.h"
+#include "Globals.h"
+#include "Help.h"
+#include "KeyDialog.h"
+#include "NamedChoice.h"
#include "PianoFrame.h"
#include "PianoWindow.h"
-#include "ClockDialog.h"
-#include "KeyDialog.h"
+#include "Player.h"
+#include "ProjectManager.h"
#include "PropertyListDialog.h"
-#include "Globals.h"
-#include "NamedChoice.h"
-#include "Help.h"
-#include "DeprecatedWx/proplist.h"
+#include "Song.h"
+#include "Synth.h"
+#include "Track.h"
-#include "Dialogs/KeyOnDialog.h"
+#include <wx/choicdlg.h>
+#include <iomanip>
#include <sstream>
-#include <iomanip>
using namespace std;
Modified: trunk/jazz/src/ErrorMessage.cpp
===================================================================
--- trunk/jazz/src/ErrorMessage.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/ErrorMessage.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,7 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include <wx/msgdlg.h>
#include <string>
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/EventWindow.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,9 +20,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "EventWindow.h"
-#include "EventWindow.h"
#include "PianoFrame.h"
#include "Song.h"
#include "Command.h"
@@ -31,6 +30,10 @@
#include "ToolBar.h"
#include "PropertyListDialog.h"
+#include <wx/brush.h>
+#include <wx/dc.h>
+#include <wx/msgdlg.h>
+
using namespace std;
//*****************************************************************************
Modified: trunk/jazz/src/EventWindow.h
===================================================================
--- trunk/jazz/src/EventWindow.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/EventWindow.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -26,6 +26,8 @@
#include "Filter.h"
#include "MouseAction.h"
+#include <wx/frame.h>
+
class JZEventFrame;
class JZSong;
class JZToolBar;
Modified: trunk/jazz/src/Events.cpp
===================================================================
--- trunk/jazz/src/Events.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Events.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,19 +20,17 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "Events.h"
-#include "Synth.h"
+
+#include "ErrorMessage.h"
#include "Globals.h"
#include "JazzPlusPlusApplication.h"
-#include "ErrorMessage.h"
+#include "Synth.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <stdarg.h>
-
+#include <cassert>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
#include <sstream>
using namespace std;
Modified: trunk/jazz/src/Events.h
===================================================================
--- trunk/jazz/src/Events.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Events.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -23,10 +23,12 @@
#ifndef JZ_EVENTS_H
#define JZ_EVENTS_H
+#include <cstdio>
+
+#include <wx/pen.h>
+
class JZEvent;
-#include <cstdio>
-
//*****************************************************************************
// Output device, can be
// - Midi-Standard-File
Modified: trunk/jazz/src/FileSelector.cpp
===================================================================
--- trunk/jazz/src/FileSelector.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/FileSelector.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,7 +20,9 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include <wx/filedlg.h>
+#include <wx/msgdlg.h>
+#include <wx/string.h>
//*****************************************************************************
// Description:
Modified: trunk/jazz/src/Filter.cpp
===================================================================
--- trunk/jazz/src/Filter.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Filter.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,15 +20,13 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
-#include "PropertyListDialog.h"
-
#include "Filter.h"
-#include "Events.h"
+
#include "ClockDialog.h"
-#include "Song.h"
+#include "Events.h"
#include "Help.h"
+#include "PropertyListDialog.h"
+#include "Song.h"
#include <cstdlib>
@@ -191,12 +189,12 @@
void JZFilter::Dialog(wxFrame *parent, int ShowEventStats)
{
tFilterDlg *dlg;
- // DialogBox = new wxDialogBox(parent, "Event Filter", FALSE );
+ // mpDialogBox = new wxDialogBox(parent, "Event Filter", FALSE );
dlg = new tFilterDlg(this, mpSong, ShowEventStats);
dlg->Create();
-// dlg->EditForm(DialogBox, ShowEventStats);
-// DialogBox->Fit();
-// DialogBox->Show(TRUE);
+// dlg->EditForm(mpDialogBox, ShowEventStats);
+// mpDialogBox->Fit();
+// mpDialogBox->Show(TRUE);
}
Modified: trunk/jazz/src/Filter.h
===================================================================
--- trunk/jazz/src/Filter.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Filter.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -27,8 +27,9 @@
class JZSong;
class JZTrack;
+class wxDialog;
+class wxFrame;
-
#define FltKeyOn 0
#define FltKeyPressure 1 // SN++ PolyAftertouch gehoert to KeyOn Events!
#define FltControl 2
@@ -57,7 +58,7 @@
class JZFilter : public wxObject
{
friend class tFilterDlg;
- wxDialog* DialogBox;
+ wxDialog* mpDialogBox;
void copy(const JZFilter& Other);
public:
@@ -71,7 +72,7 @@
int FromTrack, ToTrack; // 1..n einschl .. einschl
- void Dialog(wxFrame *parent, int ShowEventStats = 1);
+ void Dialog(wxFrame* parent, int ShowEventStats = 1);
JZFilter(JZSong* pSong);
JZFilter(JZFilter* pOtherFilter);
Modified: trunk/jazz/src/FindFile.cpp
===================================================================
--- trunk/jazz/src/FindFile.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/FindFile.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,7 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include <wx/app.h>
#include <wx/filename.h>
#include <iostream>
Modified: trunk/jazz/src/GetOptionIndex.cpp
===================================================================
--- trunk/jazz/src/GetOptionIndex.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/GetOptionIndex.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -1,5 +1,3 @@
-#include "WxWidgets.h"
-
#include "JazzPlusPlusApplication.h"
int GetOptionIndex(const wxString& Option)
Modified: trunk/jazz/src/Globals.cpp
===================================================================
--- trunk/jazz/src/Globals.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Globals.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,14 +20,14 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
#include "Globals.h"
-#include "Song.h"
-#include "Synth.h"
-#include "Player.h"
+
#include "Help.h"
#include "NamedValue.h"
+#include "Player.h"
#include "Project.h"
+#include "Song.h"
+#include "Synth.h"
using namespace std;
Modified: trunk/jazz/src/GuitarFrame.cpp
===================================================================
--- trunk/jazz/src/GuitarFrame.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/GuitarFrame.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,15 +20,15 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "GuitarFrame.h"
-#include "Resources.h"
-
-#include "GuitarFrame.h"
#include "GuitarWindow.h"
#include "GuitarSettingsDialog.h"
#include "ProjectManager.h"
+#include "Resources.h"
+#include <wx/menu.h>
+
//*****************************************************************************
// Description:
// This is the guitar frame class definition.
Modified: trunk/jazz/src/GuitarFrame.h
===================================================================
--- trunk/jazz/src/GuitarFrame.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/GuitarFrame.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -23,6 +23,8 @@
#ifndef JZ_GUITARFRAME_H
#define JZ_GUITARFRAME_H
+#include <wx/frame.h>
+
class JZGuitarWindow;
//*****************************************************************************
Modified: trunk/jazz/src/GuitarSettingsDialog.cpp
===================================================================
--- trunk/jazz/src/GuitarSettingsDialog.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/GuitarSettingsDialog.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,10 +20,12 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "GuitarSettingsDialog.h"
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/sizer.h>
+
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(JZGuitarSettingsDialog, wxDialog)
Modified: trunk/jazz/src/GuitarSettingsDialog.h
===================================================================
--- trunk/jazz/src/GuitarSettingsDialog.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/GuitarSettingsDialog.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -23,6 +23,10 @@
#ifndef JZ_GUITARSETTINGSDIALOG_H
#define JZ_GUITARSETTINGSDIALOG_H
+#include <wx/dialog.h>
+
+class wxCheckBox;
+
class JZGuitarSettingsDialog : public wxDialog
{
public:
Modified: trunk/jazz/src/GuitarWindow.cpp
===================================================================
--- trunk/jazz/src/GuitarWindow.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/GuitarWindow.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,11 +20,12 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "GuitarWindow.h"
-#include "GuitarWindow.h"
#include "GuitarFrame.h"
+#include <wx/dcclient.h>
+
#include <string>
using namespace std;
Modified: trunk/jazz/src/GuitarWindow.h
===================================================================
--- trunk/jazz/src/GuitarWindow.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/GuitarWindow.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -23,6 +23,8 @@
#ifndef JZ_GUITARWINDOW_H
#define JZ_GUITARWINDOW_H
+#include <wx/scrolwin.h>
+
class JZGuitarFrame;
//*****************************************************************************
Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Harmony.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,9 +20,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "Harmony.h"
-#include "Harmony.h"
#include "HarmonyP.h"
#include "ProjectManager.h"
#include "Player.h"
@@ -40,6 +39,16 @@
#include "Globals.h"
#include "Help.h"
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/dcclient.h>
+#include <wx/listbox.h>
+#include <wx/menu.h>
+#include <wx/msgdlg.h>
+#include <wx/scrolwin.h>
+#include <wx/stattext.h>
+#include <wx/toolbar.h>
+
#include <iostream>
#include <fstream>
@@ -1612,12 +1621,12 @@
private:
- HBCanvas* mpHbWindow;
- wxCheckBox *chord_chk[12];
- wxCheckBox *scale_chk[12];
- wxListBox *chord_lst;
- wxListBox *scale_lst;
- wxStaticText *chord_msg;
+ HBCanvas* mpHbWindow;
+ wxCheckBox* chord_chk[12];
+ wxCheckBox* scale_chk[12];
+ wxListBox* chord_lst;
+ wxListBox* scale_lst;
+ wxStaticText* chord_msg;
wxButton *ok_but;
wxButton *cancel_but;
Modified: trunk/jazz/src/Harmony.h
===================================================================
--- trunk/jazz/src/Harmony.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Harmony.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -25,6 +25,8 @@
#include "ToolBar.h"
+#include <wx/frame.h>
+
class wxObject;
class HBAnalyzer;
class HBCanvas;
Modified: trunk/jazz/src/HarmonyBrowserAnalyzer.cpp
===================================================================
--- trunk/jazz/src/HarmonyBrowserAnalyzer.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/HarmonyBrowserAnalyzer.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,9 +20,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "HarmonyBrowserAnalyzer.h"
+
#include "EventWindow.h"
#include "Command.h"
#include "HarmonyP.h"
Modified: trunk/jazz/src/Help.cpp
===================================================================
--- trunk/jazz/src/Help.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Help.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,13 +20,10 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
-#include "wx/html/helpctrl.h"
-
#include "Help.h"
-#include "Globals.h"
+#include <wx/html/helpctrl.h>
+
#include <iostream>
using namespace std;
Modified: trunk/jazz/src/Help.h
===================================================================
--- trunk/jazz/src/Help.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Help.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -23,6 +23,8 @@
#ifndef JZ_HELP_H
#define JZ_HELP_H
+#include <wx/string.h>
+
class wxHtmlHelpController;
//*****************************************************************************
Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/JazzPlusPlusApplication.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,16 +20,12 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "JazzPlusPlusApplication.h"
-#include <wx/stdpaths.h>
-#include <wx/fileconf.h>
-
-#include "JazzPlusPlusApplication.h"
-#include "TrackFrame.h"
+#include "Globals.h"
#include "Project.h"
#include "ProjectManager.h"
-#include "Globals.h"
+#include "TrackFrame.h"
#ifdef _MSC_VER
@@ -51,6 +47,12 @@
#endif
+#include <wx/stdpaths.h>
+#include <wx/fileconf.h>
+#include <wx/filedlg.h>
+#include <wx/image.h>
+#include <wx/msgdlg.h>
+
#include <fstream>
#include <vector>
Modified: trunk/jazz/src/JazzPlusPlusApplication.h
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/JazzPlusPlusApplication.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -23,6 +23,7 @@
#ifndef JZ_JAZZPLUSPLUSAPPLICATION_H
#define JZ_JAZZPLUSPLUSAPPLICATION_H
+#include <wx/app.h>
#include <wx/html/helpctrl.h>
class JZProject;
Modified: trunk/jazz/src/KeyDialog.cpp
===================================================================
--- trunk/jazz/src/KeyDialog.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/KeyDialog.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,9 +20,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "KeyDialog.h"
+
#include "KeyStringConverters.h"
#include "DeprecatedStringUtils.h"
#include "DeprecatedWx/proplist.h"
Modified: trunk/jazz/src/Knob.cpp
===================================================================
--- trunk/jazz/src/Knob.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Knob.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -18,13 +18,13 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "Knob.h"
+#include "Globals.h"
+
#include <wx/dcbuffer.h>
+#include <wx/settings.h>
-#include "Knob.h"
-#include "Globals.h"
-
#include <cmath>
//*****************************************************************************
Modified: trunk/jazz/src/Knob.h
===================================================================
--- trunk/jazz/src/Knob.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Knob.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -21,6 +21,9 @@
#ifndef JZ_KNOB_H
#define JZ_KNOB_H
+#include <wx/bitmap.h>
+#include <wx/control.h>
+
class JZKnobEvent;
class JZKnob;
Modified: trunk/jazz/src/MeasureChoice.cpp
===================================================================
--- trunk/jazz/src/MeasureChoice.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/MeasureChoice.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,9 +20,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "MeasureChoice.h"
+
#include "Song.h"
#include "Globals.h"
Modified: trunk/jazz/src/Metronome.cpp
===================================================================
--- trunk/jazz/src/Metronome.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Metronome.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,9 +20,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "Metronome.h"
+
#include "Configuration.h"
#include "Globals.h"
#include "Events.h"
Modified: trunk/jazz/src/MidiDeviceDialog.cpp
===================================================================
--- trunk/jazz/src/MidiDeviceDialog.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/MidiDeviceDialog.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,10 +20,12 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "MidiDeviceDialog.h"
+#include <wx/button.h>
+#include <wx/listbox.h>
+#include <wx/sizer.h>
+
using namespace std;
//*****************************************************************************
Modified: trunk/jazz/src/MidiDeviceDialog.h
===================================================================
--- trunk/jazz/src/MidiDeviceDialog.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/MidiDeviceDialog.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -23,9 +23,13 @@
#ifndef JZ_MIDIDEVICEDIALOG_H
#define JZ_MIDIDEVICEDIALOG_H
+#include <wx/dialog.h>
+
#include <vector>
#include <string>
+class wxListBox;
+
//*****************************************************************************
// Description:
// This is the MIDI device selection dialog class declaration.
Modified: trunk/jazz/src/MouseAction.cpp
===================================================================
--- trunk/jazz/src/MouseAction.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/MouseAction.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,11 +20,13 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "MouseAction.h"
-#include "MouseAction.h"
#include "EventWindow.h"
+#include <wx/dcclient.h>
+#include <wx/brush.h>
+
using namespace std;
// -----------------------------------------------------------------
Modified: trunk/jazz/src/NamedChoice.cpp
===================================================================
--- trunk/jazz/src/NamedChoice.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/NamedChoice.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,9 +20,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "NamedChoice.h"
+
#include "NamedValue.h"
#include "DeprecatedStringUtils.h"
#include "DeprecatedWx/proplist.h"
Modified: trunk/jazz/src/NamedChoice.h
===================================================================
--- trunk/jazz/src/NamedChoice.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/NamedChoice.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -23,6 +23,8 @@
#ifndef JZ_NAMEDCHOICE_H
#define JZ_NAMEDCHOICE_H
+#include <wx/object.h>
+
#include <vector>
#include <string>
Modified: trunk/jazz/src/NamedValue.cpp
===================================================================
--- trunk/jazz/src/NamedValue.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/NamedValue.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,8 +20,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "NamedValue.h"
using namespace std;
Modified: trunk/jazz/src/NamedValueChoice.cpp
===================================================================
--- trunk/jazz/src/NamedValueChoice.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/NamedValueChoice.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,8 +20,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "NamedValueChoice.h"
using namespace std;
Modified: trunk/jazz/src/NamedValueChoice.h
===================================================================
--- trunk/jazz/src/NamedValueChoice.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/NamedValueChoice.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -23,6 +23,8 @@
#ifndef JZ_NAMEDVALUECHOICE_H
#define JZ_NAMEDVALUECHOICE_H
+#include <wx/choice.h>
+
#include <vector>
#include <string>
Modified: trunk/jazz/src/PianoFrame.cpp
===================================================================
--- trunk/jazz/src/PianoFrame.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/PianoFrame.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,29 +20,30 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "PianoFrame.h"
-#include "Resources.h"
-
-#include "PianoFrame.h"
+#include "Command.h"
+#include "ControlEdit.h"
+#include "Dialogs.h"
+#include "Globals.h"
+#include "Harmony.h"
#include "PianoWindow.h"
#include "ProjectManager.h"
+#include "Resources.h"
#include "Song.h"
#include "Track.h"
#include "Synth.h"
#include "StandardFile.h"
-#include "Dialogs.h"
-#include "Harmony.h"
-#include "Command.h"
-#include "Globals.h"
#include "Player.h"
-#include "ControlEdit.h"
#include "GuitarFrame.h"
#include "ToolBar.h"
#include "ResourceDialog.h"
#include "Help.h"
#include "Rectangle.h"
+#include <wx/menu.h>
+#include <wx/msgdlg.h>
+
#include <sstream>
using namespace std;
@@ -243,7 +244,7 @@
// CreateMenu();
- DialogBox = 0;
+ mpDialogBox = 0;
MixerForm = 0;
CreateMenu();
Modified: trunk/jazz/src/PianoFrame.h
===================================================================
--- trunk/jazz/src/PianoFrame.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/PianoFrame.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -26,6 +26,8 @@
#include "MouseAction.h"
#include "Song.h"
+#include <wx/frame.h>
+
class JZGuitarFrame;
class JZSong;
class JZToolBar;
@@ -132,7 +134,7 @@
int mClockTicsPerPixel;
JZSong* mpSong;
- wxDialog* DialogBox;
+ wxDialog* mpDialogBox;
wxDialog* MixerForm;
private:
Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/PianoWindow.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,28 +20,30 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "PianoWindow.h"
-#include "Resources.h"
-
-#include "PianoWindow.h"
-#include "PianoFrame.h"
-#include "ProjectManager.h"
+#include "Command.h"
#include "ControlEdit.h"
-#include "Song.h"
+#include "Dialogs.h"
#include "Filter.h"
+#include "GuitarFrame.h"
+#include "Harmony.h"
+#include "HarmonyBrowserAnalyzer.h"
#include "HarmonyP.h"
-#include "HarmonyBrowserAnalyzer.h"
-#include "Harmony.h"
+#include "Help.h"
+#include "PianoFrame.h"
#include "Player.h"
+#include "ProjectManager.h"
+#include "ResourceDialog.h"
+#include "Resources.h"
+#include "SelectControllerDialog.h"
+#include "Song.h"
#include "Synth.h"
-#include "Command.h"
-#include "GuitarFrame.h"
-#include "Dialogs.h"
-#include "SelectControllerDialog.h"
-#include "ResourceDialog.h"
-#include "Help.h"
+#include <wx/dcclient.h>
+#include <wx/dcmemory.h>
+#include <wx/msgdlg.h>
+
#include <sstream>
using namespace std;
Modified: trunk/jazz/src/PianoWindow.h
===================================================================
--- trunk/jazz/src/PianoWindow.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/PianoWindow.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -28,6 +28,8 @@
#include "Track.h"
#include "Globals.h"
+#include <wx/brush.h>
+
class JZPianoFrame;
class JZSong;
class JZTrack;
Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Player.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,9 +20,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "Player.h"
-#include "Player.h"
#include "ProjectManager.h"
#include "Synth.h"
#include "TrackFrame.h"
@@ -32,10 +31,12 @@
#include "Audio.h"
#include "Globals.h"
+#include <wx/msgdlg.h>
+
//#include <unistd.h>
+#include <cassert>
#include <cstdlib>
-#include <assert.h>
#include <string.h>
#include <errno.h>
Modified: trunk/jazz/src/PortMidiPlayer.cpp
===================================================================
--- trunk/jazz/src/PortMidiPlayer.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/PortMidiPlayer.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -1,6 +1,5 @@
-#include "WxWidgets.h"
-
#include "PortMidiPlayer.h"
+
#include "JazzPlusPlusApplication.h"
#include "TrackFrame.h"
#include "TrackWindow.h"
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Project.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,22 +20,16 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "Project.h"
-#include <wx/stdpaths.h>
-#include <wx/config.h>
-#include <wx/filename.h>
-#include <wx/file.h>
-
-#include "Project.h"
+#include "Filter.h"
+#include "GetOptionIndex.h"
+#include "Globals.h"
+#include "Player.h"
#include "RecordingInfo.h"
#include "Synth.h"
#include "Song.h"
-#include "Globals.h"
-#include "Filter.h"
-#include "Player.h"
#include "StandardFile.h"
-#include "GetOptionIndex.h"
#ifdef __WXMSW__
#include "WindowsPlayer.h"
@@ -51,6 +45,12 @@
#include "AlsaDriver.h"
#endif
+#include <wx/stdpaths.h>
+#include <wx/config.h>
+#include <wx/file.h>
+#include <wx/filedlg.h>
+#include <wx/filename.h>
+
#include <fstream>
#include <iostream>
Modified: trunk/jazz/src/ProjectManager.cpp
===================================================================
--- trunk/jazz/src/ProjectManager.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/ProjectManager.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -1,5 +1,3 @@
-#include "WxWidgets.h"
-
#include "ProjectManager.h"
#include "PianoFrame.h"
Modified: trunk/jazz/src/PropertyListDialog.cpp
===================================================================
--- trunk/jazz/src/PropertyListDialog.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/PropertyListDialog.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,8 +20,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "PropertyListDialog.h"
#include <cstdlib>
Modified: trunk/jazz/src/Random.cpp
===================================================================
--- trunk/jazz/src/Random.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Random.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,15 +20,15 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
-//#include "config.h"
-
#include "Random.h"
#include "Mapper.h"
-#include <assert.h>
+#include <wx/dcclient.h>
+#include <wx/frame.h>
+#include <wx/scrolwin.h>
+
+#include <cassert>
#include <cstdlib>
using namespace std;
@@ -261,7 +261,7 @@
#define TICK_LINE 0
tArrayEdit::tArrayEdit(wxFrame *frame, JZRndArray &ar, int xx, int yy, int ww, int hh, int sty)
- : wxScrolledWindow(frame,-1, wxPoint(xx, yy), wxSize(ww, hh)),
+ : wxScrolledWindow(frame, wxID_ANY, wxPoint(xx, yy), wxSize(ww, hh)),
mArray(ar),
n(ar.n),
min(ar.min),
Modified: trunk/jazz/src/Random.h
===================================================================
--- trunk/jazz/src/Random.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Random.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -23,6 +23,8 @@
#ifndef JZ_RANDOM_H
#define JZ_RANDOM_H
+#include <wx/scrolwin.h>
+
#include <iostream>
#include "DynamicArray.h"
Modified: trunk/jazz/src/Rectangle.cpp
===================================================================
--- trunk/jazz/src/Rectangle.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Rectangle.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,8 +20,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "Rectangle.h"
//*****************************************************************************
Modified: trunk/jazz/src/Rectangle.h
===================================================================
--- trunk/jazz/src/Rectangle.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Rectangle.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -23,6 +23,8 @@
#ifndef JZ_RECTANGLE_H
#define JZ_RECTANGLE_H
+#include <wx/gdicmn.h>
+
//*****************************************************************************
// Description:
// This is the Jazz++ rectangle class delcaration.
Modified: trunk/jazz/src/ResourceDialog.cpp
===================================================================
--- trunk/jazz/src/ResourceDialog.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/ResourceDialog.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -16,14 +16,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "WxWidgets.h"
+#include "ResourceDialog.h"
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/dialog.h>
#include <wx/fs_zip.h>
+#include <wx/msgdlg.h>
+#include <wx/slider.h>
+#include <wx/textctrl.h>
#include <wx/xrc/xmlres.h>
-#include "ResourceDialog.h"
-
-#include <wx/listimpl.cpp>
//WX_DEFINE_LIST(jppResourceElementList);
using namespace std;
Modified: trunk/jazz/src/ResourceDialog.h
===================================================================
--- trunk/jazz/src/ResourceDialog.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/ResourceDialog.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -25,6 +25,12 @@
#include <list>
+#include <wx/dynarray.h>
+#include <wx/string.h>
+
+class wxDialog;
+class wxWindow;
+
/// Used by jppResourceDialog to store "Attach" entries.
/** This class links together a named resource and a pointer to a data item.
@@ -225,7 +231,7 @@
std::list<jppResourceElement*> links;
/// Reference to the dialog created from the XRC resource.
- wxDialog *dialog;
+ wxDialog* dialog;
/// The name of the dialog resource. Used in error reporting.
wxString dialogName;
Modified: trunk/jazz/src/Rhythm.cpp
===================================================================
--- trunk/jazz/src/Rhythm.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Rhythm.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,9 +20,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "Rhythm.h"
-#include "Rhythm.h"
#include "EventWindow.h"
#include "Song.h"
#include "Command.h"
@@ -38,6 +37,14 @@
#include "SelectControllerDialog.h"
#include "Help.h"
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/choicdlg.h>
+#include <wx/listbox.h>
+#include <wx/msgdlg.h>
+#include <wx/slider.h>
+#include <wx/toolbar.h>
+
#include <fstream>
#include <sstream>
Modified: trunk/jazz/src/Rhythm.h
===================================================================
--- trunk/jazz/src/Rhythm.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Rhythm.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -27,12 +27,18 @@
#include "ToolBar.h"
+#include <wx/frame.h>
+
#include <iostream>
class JZTrack;
class JZEventWindow;
class JZSong;
class JZBarInfo;
+class wxButton;
+class wxCheckBox;
+class wxListBox;
+class wxPanel;
#define MAX_GROUPS 5
#define MAX_KEYS 20
Modified: trunk/jazz/src/Sample.cpp
===================================================================
--- trunk/jazz/src/Sample.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/Sample.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,9 +20,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
#include "Sample.h"
+
#include "Audio.h"
#include "Random.h"
#include "SampleCommand.h"
Modified: trunk/jazz/src/SampleCommand.cpp
===================================================================
--- trunk/jazz/src/SampleCommand.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/SampleCommand.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,13 +20,12 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
-
-#include "Sample.h"
#include "SampleCommand.h"
+
#include "Audio.h"
-#include "SignalInterface.h"
#include "Mapper.h"
+#include "Sample.h"
+#include "SignalInterface.h"
//#include "util.h"
#include <cmath>
Modified: trunk/jazz/src/SampleDialog.cpp
===================================================================
--- trunk/jazz/src/SampleDialog.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/SampleDialog.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,13 +20,10 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "SampleDialog.h"
-//#include "config.h"
-#include "SampleDialog.h"
#include "Sample.h"
#include "SampleWindow.h"
-//#include "jazz.h"
#include "Mapper.h"
#include "Audio.h"
#include "SignalInterface.h"
@@ -36,6 +33,12 @@
#include "DeprecatedStringUtils.h"
#include "Help.h"
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/msgdlg.h>
+#include <wx/slider.h>
+#include <wx/statbox.h>
+
#include <fstream>
#include <cmath>
Modified: trunk/jazz/src/SampleDialog.h
===================================================================
--- trunk/jazz/src/SampleDialog.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/SampleDialog.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -28,9 +28,13 @@
#include "SampleCommand.h"
#include "PropertyListDialog.h"
+class tPaintableCommand;
class tSampleWin;
class tSigEqualizer;
-class tPaintableCommand;
+class wxButton;
+class wxCheckBox;
+class wxChoice;
+class wxSlider;
/**
* controls a tPaintableCommand, that is shows the parameter arrays
Modified: trunk/jazz/src/SampleWindow.cpp
===================================================================
--- trunk/jazz/src/SampleWindow.cpp 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/SampleWindow.cpp 2008-12-27 02:14:07 UTC (rev 656)
@@ -20,24 +20,28 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#include "WxWidgets.h"
+#include "SampleWindow.h"
-#include "SampleWindow.h"
-#include "SampleCommand.h"
-#include "SampleDialog.h"
-#include "ToolBar.h"
-#include "Sample.h"
#include "Audio.h"
+#include "FileSelector.h"
+#include "Globals.h"
+#include "Help.h"
+#include "Mapper.h"
#include "MouseAction.h"
-#include "Song.h"
#include "Player.h"
#include "Rhythm.h"
+#include "Sample.h"
+#include "SampleCommand.h"
+#include "SampleDialog.h"
+#include "Song.h"
#include "SliderWindow.h"
-#include "Mapper.h"
-#include "FileSelector.h"
-#include "Globals.h"
-#include "Help.h"
+#include "ToolBar.h"
+#include <wx/dcclient.h>
+#include <wx/menu.h>
+#include <wx/msgdlg.h>
+#include <wx/scrolbar.h>
+
#include <iostream>
#define MEN_LOAD 1
Modified: trunk/jazz/src/SampleWindow.h
===================================================================
--- trunk/jazz/src/SampleWindow.h 2008-12-27 02:03:27 UTC (rev 655)
+++ trunk/jazz/src/SampleWindow.h 2008-12-27 02:14:07 UTC (rev 656)
@@ -23,19 +23,22 @@
#ifndef samplwin_h
#define samplwin_h
-class tSample;
-class tSampleCnvs;
+#include "SampleCommand.h"
+
+#in...
[truncated message content] |