| |
@@ -0,0 +1,166 @@
|
| |
+ Description: Fix to work with wxwidgets3.0
|
| |
+ Author: Olly Betts <olly@survex.com>
|
| |
+ Bug-Debian: https://bugs.debian.org/750914
|
| |
+ Forwarded: no
|
| |
+ Last-Update: 2014-08-15
|
| |
+
|
| |
+ --- a/src/FTapp.cpp
|
| |
+ +++ b/src/FTapp.cpp
|
| |
+ @@ -67,18 +67,18 @@
|
| |
+
|
| |
+ static const wxCmdLineEntryDesc cmdLineDesc[] =
|
| |
+ {
|
| |
+ - { wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), wxT("show this help"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
|
| |
+ - { wxCMD_LINE_OPTION, wxT("c"), wxT("channels"), wxT("# processing channels (1-4) default is 2"), wxCMD_LINE_VAL_NUMBER },
|
| |
+ - { wxCMD_LINE_OPTION, wxT("i"), wxT("inputs"),
|
| |
+ - wxT("connect inputs from these jack ports (separate each channel with commas).\n")
|
| |
+ + { wxCMD_LINE_SWITCH, wxT_2("h"), wxT_2("help"), wxT_2("show this help"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
|
| |
+ + { wxCMD_LINE_OPTION, wxT_2("c"), wxT_2("channels"), wxT_2("# processing channels (1-4) default is 2"), wxCMD_LINE_VAL_NUMBER },
|
| |
+ + { wxCMD_LINE_OPTION, wxT_2("i"), wxT_2("inputs"),
|
| |
+ + wxT_2("connect inputs from these jack ports (separate each channel with commas).\n")
|
| |
+ "\t\t\tDefaults to 'alsa_pcm:capture_1,..." },
|
| |
+ - { wxCMD_LINE_OPTION, wxT("o"), wxT("outputs"),
|
| |
+ - wxT("connect outputs to these jack ports (separate each channel with commas).\n")
|
| |
+ + { wxCMD_LINE_OPTION, wxT_2("o"), wxT_2("outputs"),
|
| |
+ + wxT_2("connect outputs to these jack ports (separate each channel with commas).\n")
|
| |
+ "\t\t\tDefaults to 'alsa_pcm:playback_1,...'" },
|
| |
+ - { wxCMD_LINE_OPTION, wxT("n"), wxT("jack-name"), wxT("jack name. default is freqtweak_1")},
|
| |
+ - { wxCMD_LINE_OPTION, wxT("S"), wxT("jack-server"), wxT("jack server name")},
|
| |
+ - { wxCMD_LINE_OPTION, wxT("p"), wxT("preset"), wxT("load given preset initially")},
|
| |
+ - { wxCMD_LINE_OPTION, wxT("r"), wxT("rc-dir"), wxT("what directory to use for run-control state. default is ~/.freqtweak")},
|
| |
+ + { wxCMD_LINE_OPTION, wxT_2("n"), wxT_2("jack-name"), wxT_2("jack name. default is freqtweak_1")},
|
| |
+ + { wxCMD_LINE_OPTION, wxT_2("S"), wxT_2("jack-server"), wxT_2("jack server name")},
|
| |
+ + { wxCMD_LINE_OPTION, wxT_2("p"), wxT_2("preset"), wxT_2("load given preset initially")},
|
| |
+ + { wxCMD_LINE_OPTION, wxT_2("r"), wxT_2("rc-dir"), wxT_2("what directory to use for run-control state. default is ~/.freqtweak")},
|
| |
+ { wxCMD_LINE_NONE }
|
| |
+ };
|
| |
+
|
| |
+ @@ -221,7 +221,7 @@
|
| |
+
|
| |
+ // use stderr as log
|
| |
+ wxLog *logger=new wxLogStderr();
|
| |
+ - logger->SetTimestamp(NULL);
|
| |
+ + logger->SetTimestamp(wxEmptyString);
|
| |
+ wxLog::SetActiveTarget(logger);
|
| |
+
|
| |
+ wxCmdLineParser parser(argc, argv);
|
| |
+ --- a/src/FTmainwin.cpp
|
| |
+ +++ b/src/FTmainwin.cpp
|
| |
+ @@ -524,7 +524,6 @@
|
| |
+ _inspecPanel = new wxPanel(_inspecSash, -1);
|
| |
+ _inspecPanel->SetBackgroundColour(*wxBLACK);
|
| |
+ _inspecPanel->SetThemeEnabled(false);
|
| |
+ - _inspecSash->SetSashBorder(wxSASH_BOTTOM, true);
|
| |
+ _inspecSash->SetSashVisible(wxSASH_BOTTOM, true);
|
| |
+ _rowItems.push_back( _inspecSash);
|
| |
+
|
| |
+ @@ -656,7 +655,6 @@
|
| |
+ _outspecPanel = new wxPanel(_outspecSash, -1);
|
| |
+ _outspecPanel->SetBackgroundColour(*wxBLACK);
|
| |
+ _outspecPanel->SetThemeEnabled(false);
|
| |
+ - _outspecSash->SetSashBorder(wxSASH_BOTTOM, true);
|
| |
+ _outspecSash->SetSashVisible(wxSASH_BOTTOM, true);
|
| |
+ _rowItems.push_back (_outspecSash);
|
| |
+
|
| |
+ @@ -891,7 +889,6 @@
|
| |
+ rpanel->SetThemeEnabled(false);
|
| |
+ _rowPanels.push_back (rpanel);
|
| |
+
|
| |
+ - sash->SetSashBorder(wxSASH_BOTTOM, true);
|
| |
+ sash->SetSashVisible(wxSASH_BOTTOM, true);
|
| |
+ // need to insert this as second to last
|
| |
+ wxWindow * lastrow = _rowItems.back();
|
| |
+ @@ -2713,7 +2710,7 @@
|
| |
+ evt != _pendingTitleEvents.end() ; ++evt)
|
| |
+ {
|
| |
+ (*evt)->ready = true;
|
| |
+ - AddPendingEvent (*(*evt));
|
| |
+ + GetEventHandler ()->AddPendingEvent (*(*evt));
|
| |
+ delete (*evt);
|
| |
+ }
|
| |
+ _pendingTitleEvents.clear();
|
| |
+ @@ -3734,20 +3731,20 @@
|
| |
+ if (id == ID_TitleRemove)
|
| |
+ {
|
| |
+ FTtitleMenuEvent tev (0, FTtitleMenuEvent::RemoveEvt, _parent);
|
| |
+ - _mwin->AddPendingEvent (tev);
|
| |
+ + _mwin->GetEventHandler ()->AddPendingEvent (tev);
|
| |
+ //_mwin->doRemoveRow(_parent);
|
| |
+ }
|
| |
+ else if (id == ID_TitleMinimize)
|
| |
+ {
|
| |
+ FTtitleMenuEvent tev (0, FTtitleMenuEvent::MinimizeEvt, _parent);
|
| |
+ - _mwin->AddPendingEvent (tev);
|
| |
+ + _mwin->GetEventHandler ()->AddPendingEvent (tev);
|
| |
+
|
| |
+ //_mwin->doMinimizeExpand(_parent);
|
| |
+ }
|
| |
+ else if (id == ID_TitleExpand)
|
| |
+ {
|
| |
+ FTtitleMenuEvent tev (0, FTtitleMenuEvent::ExpandEvt, _parent);
|
| |
+ - _mwin->AddPendingEvent (tev);
|
| |
+ + _mwin->GetEventHandler ()->AddPendingEvent (tev);
|
| |
+
|
| |
+ //_mwin->doMinimizeExpand(_parent);
|
| |
+ }
|
| |
+ --- a/src/FTactiveBarGraph.cpp
|
| |
+ +++ b/src/FTactiveBarGraph.cpp
|
| |
+ @@ -1061,8 +1061,6 @@
|
| |
+ return;
|
| |
+ }
|
| |
+
|
| |
+ - backdc.BeginDrawing();
|
| |
+ -
|
| |
+ backdc.SetBackground(_bgBrush);
|
| |
+ backdc.Clear();
|
| |
+
|
| |
+ @@ -1164,8 +1162,6 @@
|
| |
+
|
| |
+ }
|
| |
+
|
| |
+ - backdc.EndDrawing();
|
| |
+ -
|
| |
+ // blit to screen
|
| |
+ dc.Blit(0,0, _width, _height, &backdc, 0,0);
|
| |
+
|
| |
+ @@ -1175,7 +1171,7 @@
|
| |
+
|
| |
+ void FTactiveBarGraph::paintGridlines(wxDC & dc)
|
| |
+ {
|
| |
+ - int origfunc = dc.GetLogicalFunction();
|
| |
+ + wxRasterOperationMode origfunc = dc.GetLogicalFunction();
|
| |
+ wxPen origPen = dc.GetPen();
|
| |
+
|
| |
+ dc.SetPen(_gridPen);
|
| |
+ --- a/src/FTutils.hpp
|
| |
+ +++ b/src/FTutils.hpp
|
| |
+ @@ -23,6 +23,7 @@
|
| |
+ #include <iostream>
|
| |
+ #include <sstream>
|
| |
+ #include <cmath>
|
| |
+ +#include <stdint.h>
|
| |
+
|
| |
+ //#include <wx/string.h>
|
| |
+
|
| |
+ --- a/src/FTmodulatorDialog.cpp
|
| |
+ +++ b/src/FTmodulatorDialog.cpp
|
| |
+ @@ -346,7 +346,7 @@
|
| |
+ {
|
| |
+ //cerr << "deleting modgui" << endl;
|
| |
+ FTmodulatorGui * modgui = _modulatorGuis[mod];
|
| |
+ - _channelSizer->Remove (modgui);
|
| |
+ + _channelSizer->Detach (modgui);
|
| |
+ modgui->Show(false);
|
| |
+ _channelScroller->SetClientSize(_channelScroller->GetClientSize());
|
| |
+ _channelScroller->Layout();
|
| |
+ --- a/src/pix_button.cpp
|
| |
+ +++ b/src/pix_button.cpp
|
| |
+ @@ -249,7 +249,7 @@
|
| |
+ pt.x += bounds.x;
|
| |
+ pt.y += bounds.y;
|
| |
+
|
| |
+ - if (bounds.Inside(pt)) {
|
| |
+ + if (bounds.Contains(pt)) {
|
| |
+ clicked (get_mouse_button(ev)); // emit
|
| |
+
|
| |
+ if (ev.MiddleUp() && ev.ControlDown()) {
|
| |
