File freqtweak-0.6.0-fix.dif of Package freqtweak

Index: src/FTactiveBarGraph.cpp
================================================================================
--- configure.ac
+++ configure.ac
@@ -311,7 +311,7 @@
 
 #UNAME_MACHINE=`uname -m`
 #CXXFLAGS="$JACK_CFLAGS  -g -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -fmove-all-movables -ffast-math -mcpu=${UNAME_MACHINE} -march=${UNAME_MACHINE}"
-
+XML_CFLAGS="`$XML2_CONFIG --cflags`"
 AC_ARG_ENABLE(debug,
       [  --enable-debug    not optimized and includes debug symbols],
       [ if test "x$enable_debug" != "xno" ; then
@@ -355,4 +355,4 @@
 
 echo Now type \'make\' to build FreqTweak.
 
-echo
\ No newline at end of file
+echo
--- src/FTactiveBarGraph.cpp
+++ src/FTactiveBarGraph.cpp
@@ -1342,8 +1342,13 @@
 	_backingMap = new wxBitmap(_width, _height);
 	
 	SetBackgroundColour(*wxBLACK);
-	Clear();
 
+#if wxCHECK_VERSION(2,5,0)
+	ClearBackground();
+#else
+	Clear();
+#endif
+	
 	recalculate();
 
 	event.Skip();
@@ -2107,7 +2112,7 @@
 }
 
 
-void FTactiveBarGraph::OnXscaleMenu (wxMenuEvent &event)
+void FTactiveBarGraph::OnXscaleMenu (wxCommandEvent &event)
 {
 	//wxMenuItem *item = (wxMenuItem *) event.GetEventObject();
 
--- src/FTactiveBarGraph.hpp
+++ src/FTactiveBarGraph.hpp
@@ -72,7 +72,7 @@
 	void OnPaint ( wxPaintEvent &event);
 	void OnSize ( wxSizeEvent &event);
 	void OnMouseActivity ( wxMouseEvent &event );
-	void OnXscaleMenu (wxMenuEvent &event);
+	void OnXscaleMenu (wxCommandEvent &event);
 
 	void setBypassed (bool flag) { _bypassed = flag; Refresh(FALSE);}
 	bool getBypassed () { return _bypassed; }
--- src/FTapp.cpp-dist	2004-07-08 03:26:23.000000000 +0200
+++ src/FTapp.cpp	2004-08-17 17:39:19.095156173 +0200
@@ -253,12 +253,12 @@
 	}
 
 	if (parser.Found (wxT("D"), &jackdir)) {
-	       FTioSupport::setDefaultDir ((const char *) jackdir.c_str());
+	       FTioSupport::setDefaultDir ((const char *) jackdir.ToAscii());
 	}
 	
 	if (parser.Found (wxT("n"), &jackname)) {
 		// FIXME: needs wchar_t->char conversion
-       	       FTioSupport::setDefaultName (jackname.mb_str ());
+       	       FTioSupport::setDefaultName ((const char *) jackname.ToAscii());
 	}
 
 	parser.Found (wxT("r"), &rcdir);
--- src/FTmainwin.cpp
+++ src/FTmainwin.cpp
@@ -199,7 +199,7 @@
 
 	EVT_BUTTON(FT_GridSnapBase, FTmainwin::handleGridButtons)
 
-	EVT_SPINCTRL(FT_TempoSpinId, FTmainwin::handleChoices)
+	EVT_SPINCTRL(FT_TempoSpinId, FTmainwin::handleSpinChoices)
 
 	EVT_TITLEMENU_COMMAND (0, FTmainwin::handleTitleMenuCmd)
 END_EVENT_TABLE()
@@ -2181,6 +2181,11 @@
 	
 }
 
+void FTmainwin::handleSpinChoices (wxSpinEvent &event)
+{
+    handleChoices (event);
+}
+
 void FTmainwin::handleGridButtons (wxCommandEvent &event)
 {
    wxObject *source = event.GetEventObject();
@@ -2325,7 +2330,7 @@
 			wxThread::Sleep(200);
 			iosup->close();
 			
-			iosup->setName (_ioNameText->GetValue().mb_str());
+			iosup->setName (string(_ioNameText->GetValue().ToAscii()));
 			if (iosup->init()) {
 				if (iosup->startProcessing()) {
 					iosup->reinit();
@@ -2717,7 +2722,7 @@
 }
 
 
-void FTmainwin::handleGain (wxCommandEvent &event)
+void FTmainwin::handleGain (wxSpinEvent &event)
 {
 	wxObject *source = event.GetEventObject();
 
@@ -2735,7 +2740,7 @@
 	}
 }
 
-void FTmainwin::handleMixSlider (wxCommandEvent &event)
+void FTmainwin::handleMixSlider (wxScrollEvent &event)
 {
 	wxObject *source = event.GetEventObject();
 
--- src/FTmainwin.hpp
+++ src/FTmainwin.hpp
@@ -35,7 +35,8 @@
 #include "FTspectrumModifier.hpp"
 
 
-class wxSpinCtrl;
+//class wxSpinCtrl;
+#include <wx/spinctrl.h>
 
 class FTprocessPath;
 class FTactiveBarGraph;
@@ -168,10 +169,11 @@
 	void handleGridButtons (wxCommandEvent &event);
 	
 	void handleChoices (wxCommandEvent &event);
+	void handleSpinChoices (wxSpinEvent &event);
 	void handleSashDragged (wxSashEvent &event);
 
-	void handleMixSlider (wxCommandEvent &event);
-	void handleGain (wxCommandEvent &event);
+	void handleMixSlider (wxScrollEvent &event);
+	void handleGain (wxSpinEvent &event);
 	void handlePathCount (wxCommandEvent &event);
 	void changePathCount (int newcnt, bool rebuild=false, bool ignorelink=false);
 	
--- src/FTmodulatorGui.cpp
+++ src/FTmodulatorGui.cpp
@@ -129,7 +129,7 @@
 
 	stattext = new wxStaticText(this, -1, wxString::FromAscii(_modulator->getName().c_str()),
 				    wxDefaultPosition, wxSize(-1, -1));
-	stattext->SetFont(wxFont(stattext->GetFont().GetPointSize(), wxDEFAULT, wxNORMAL, wxBOLD, false, "arial"));
+	stattext->SetFont(wxFont(stattext->GetFont().GetPointSize(), wxDEFAULT, wxNORMAL, wxBOLD, false, wxT("arial")));
 	topSizer->Add (stattext, 0, wxALL|wxALIGN_CENTRE_VERTICAL, 2);
 
 
@@ -544,7 +544,7 @@
 	if (obj && (ctrl = obj->control)) {
 
 		
-		ctrl->setValue (string((choice->GetStringSelection().c_str())));
+		ctrl->setValue (string((choice->GetStringSelection().ToAscii())));
 
 		//cerr << " choice changed for " << ctrl->getName() <<  ": new val = " << choice->GetStringSelection().c_str() << endl;
 		
--- src/FTpresetBlendDialog.cpp
+++ src/FTpresetBlendDialog.cpp
@@ -372,7 +372,7 @@
 }
 
 
-void FTpresetBlendDialog::onSliders(wxCommandEvent &ev)
+void FTpresetBlendDialog::onSliders(wxScrollEvent &ev)
 {
 
 	wxSlider * source = (wxSlider *) ev.GetEventObject();
--- src/FTpresetBlendDialog.hpp
+++ src/FTpresetBlendDialog.hpp
@@ -63,7 +63,7 @@
 	void onSize(wxSizeEvent &ev);
 	void onPaint(wxPaintEvent &ev);
 
-	void onSliders(wxCommandEvent &ev);
+	void onSliders(wxScrollEvent &ev);
 	void onCombo(wxCommandEvent &ev);
 	
 	wxBoxSizer * _procSizer;
--- src/FTspectragram.cpp
+++ src/FTspectragram.cpp
@@ -1020,7 +1020,7 @@
 
 
 
-void FTspectragram::OnXscaleMenu (wxMenuEvent &event)
+void FTspectragram::OnXscaleMenu (wxCommandEvent &event)
 {
 	//wxMenuItem *item = (wxMenuItem *) event.GetEventObject();
 
--- src/FTspectragram.hpp
+++ src/FTspectragram.hpp
@@ -75,7 +75,7 @@
 	void OnSize ( wxSizeEvent &event);
 	void OnMouseActivity ( wxMouseEvent &event );
 
-	void OnXscaleMenu (wxMenuEvent &event);
+	void OnXscaleMenu (wxCommandEvent &event);
 	
 	float powerLogScale(float yval);