Attachment #254595 for bug #336160

View | Details | Raw Unified | Return to bug 336160
Collapse All | Expand All

Lines 62-68 Link Here

(-)freqtweak-0.7.2/configure.ac (-1 / +1 lines)
62		62
63		63
64	dnl sigc++	64	dnl sigc++
65	PKG_CHECK_MODULES(SIGCPP, sigc++-1.2 >= 0.14, have_sigc12=yes, have_sigc12=no)	65	PKG_CHECK_MODULES(SIGCPP, sigc++-2.0 >= 2.0, have_sigc=yes, have_sigc=no)
66		66
67		67
68		68




	pixbutt = _inspecSpecTypeAllButton = new PixButton(_inspecPanel, FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
	_inspecSpecTypeAllButton->SetFont(_buttFont);
	_inspecSpecTypeAllButton->SetToolTip (wxT("Spectrogram Plot"));
	pixbutt->clicked.connect (sigc::bind (sigc::mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
	pixbutt->set_normal_bitmap (wxBitmap(specplot_normal_xpm));
	pixbutt->set_selected_bitmap (wxBitmap(specplot_selected_xpm));
	pixbutt->set_focus_bitmap (wxBitmap(specplot_focus_xpm));

	pixbutt = _inspecPlotSolidTypeAllButton = new PixButton(_inspecPanel, FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
	_inspecPlotSolidTypeAllButton->SetFont(_buttFont);
	_inspecPlotSolidTypeAllButton->SetToolTip (wxT("Filled Plot"));
	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
	pixbutt->set_normal_bitmap (wxBitmap(barplot_normal_xpm));
	pixbutt->set_selected_bitmap (wxBitmap(barplot_selected_xpm));
	pixbutt->set_focus_bitmap (wxBitmap(barplot_focus_xpm));

	pixbutt = _inspecPlotLineTypeAllButton = new PixButton(_inspecPanel, FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
	_inspecPlotLineTypeAllButton->SetFont(_buttFont);
	_inspecPlotLineTypeAllButton->SetToolTip (wxT("Line Plot"));
	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
	pixbutt->set_normal_bitmap (wxBitmap(lineplot_normal_xpm));
	pixbutt->set_selected_bitmap (wxBitmap(lineplot_selected_xpm));
	pixbutt->set_focus_bitmap (wxBitmap(lineplot_focus_xpm));

	pixbutt = _outspecSpecTypeAllButton = new PixButton(_outspecPanel, FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
	_outspecSpecTypeAllButton->SetFont(_buttFont);
	_outspecSpecTypeAllButton->SetToolTip (wxT("Spectrogram Plot"));
	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
	pixbutt->set_normal_bitmap (wxBitmap(specplot_normal_xpm));
	pixbutt->set_selected_bitmap (wxBitmap(specplot_selected_xpm));
	pixbutt->set_focus_bitmap (wxBitmap(specplot_focus_xpm));

	pixbutt = _outspecPlotSolidTypeAllButton = new PixButton(_outspecPanel, FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
	_outspecPlotSolidTypeAllButton->SetFont(_buttFont);
	_outspecPlotSolidTypeAllButton->SetToolTip (wxT("Filled Plot"));
	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
	pixbutt->set_normal_bitmap (wxBitmap(barplot_normal_xpm));
	pixbutt->set_selected_bitmap (wxBitmap(barplot_selected_xpm));
	pixbutt->set_focus_bitmap (wxBitmap(barplot_focus_xpm));

	pixbutt = _outspecPlotLineTypeAllButton = new PixButton(_outspecPanel, FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
	_outspecPlotLineTypeAllButton->SetFont(_buttFont);
	_outspecPlotLineTypeAllButton->SetToolTip (wxT("Line Plot"));
	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
	pixbutt->set_normal_bitmap (wxBitmap(lineplot_normal_xpm));
	pixbutt->set_selected_bitmap (wxBitmap(lineplot_selected_xpm));
	pixbutt->set_focus_bitmap (wxBitmap(lineplot_focus_xpm));

	PixButton * linkallbutt = pixbutt = new PixButton(rpanel, FT_LinkBase, false, wxDefaultPosition, wxSize(_bwidth,_bheight));
	linkallbutt->SetFont(_buttFont);
	linkallbutt->SetToolTip (wxT("Link All"));
	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::link_clicked_events), pixbutt));
	pixbutt->set_normal_bitmap (wxBitmap(link_normal_xpm));
	pixbutt->set_selected_bitmap (wxBitmap(link_selected_xpm));
	pixbutt->set_focus_bitmap (wxBitmap(link_focus_xpm));

	PixButton * bypallbutt = pixbutt = new PixButton(rpanel, FT_BypassBase, false, wxDefaultPosition, wxSize(_bwidth,_bheight));
	bypallbutt->SetFont(_buttFont);
	bypallbutt->SetToolTip (wxT("Bypass All"));
	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::bypass_clicked_events), pixbutt));
	pixbutt->set_normal_bitmap (wxBitmap(bypass_normal_xpm));
	pixbutt->set_selected_bitmap (wxBitmap(bypass_selected_xpm));
	pixbutt->set_focus_bitmap (wxBitmap(bypass_focus_xpm));

	PixButton * gridbutt = pixbutt = new PixButton (rpanel, FT_GridBase, false, wxDefaultPosition,  wxSize(_bwidth,_bheight));
	gridbutt->SetFont(_buttFont);
	gridbutt->SetToolTip (wxT("Toggle Grid\nRight-click to Adjust"));
	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::grid_clicked_events), pixbutt));
	pixbutt->pressed.connect (bind (mem_fun (*this, &FTmainwin::grid_pressed_events), pixbutt));
	pixbutt->set_normal_bitmap (wxBitmap(grid_normal_xpm));
	pixbutt->set_selected_bitmap (wxBitmap(grid_selected_xpm));
	pixbutt->set_focus_bitmap (wxBitmap(grid_focus_xpm));

	PixButton * gridsnbutt = pixbutt = new PixButton (rpanel, FT_GridSnapBase, false, wxDefaultPosition,  wxSize(_bwidth,_bheight));
	gridsnbutt->SetFont(_buttFont);
	gridsnbutt->SetToolTip (wxT("Toggle Grid Snap"));
	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::grid_clicked_events), pixbutt));
	pixbutt->set_normal_bitmap (wxBitmap(gridsnap_normal_xpm));
	pixbutt->set_selected_bitmap (wxBitmap(gridsnap_selected_xpm));
	pixbutt->set_focus_bitmap (wxBitmap(gridsnap_focus_xpm));

			_bypassButtons[rowcnt][i] = pixbutt;
			//buttsizer->Add ( _bypassButtons[rowcnt][i] = new wxButton(rowpanels[i], FT_BypassBase, wxT("B"),
			//							  wxDefaultPosition, wxSize(_bwidth,-1)), 1, 0,0);
			pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::bypass_clicked_events), pixbutt));
			
			buttsizer->Add (pixbutt, 0, 0, 0);


			_bypassButtons[rowcnt][i]->SetToolTip(wxT("Toggle Bypass"));		

			pixbutt = new PixButton(rowpanels[i], FT_LinkBase, false, wxDefaultPosition, wxSize(_bwidth, -1));
			pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::link_clicked_events), pixbutt));
			
			pixbutt->set_normal_bitmap (wxBitmap(link_normal_xpm));
			pixbutt->set_selected_bitmap (wxBitmap(link_selected_xpm));

		pixbutt = _inspecSpecTypeButton[i] = new PixButton(_inspecPanels[i], FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
		_inspecSpecTypeButton[i]->SetFont(_buttFont);
		_inspecSpecTypeButton[i]->SetToolTip(wxT("Spectrogram Plot"));
		pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
		pixbutt->set_normal_bitmap (wxBitmap(specplot_normal_xpm));
		pixbutt->set_selected_bitmap (wxBitmap(specplot_selected_xpm));
		pixbutt->set_focus_bitmap (wxBitmap(specplot_focus_xpm));

		pixbutt = _inspecPlotLineTypeButton[i] = new PixButton(_inspecPanels[i], FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
		_inspecPlotLineTypeButton[i]->SetFont(_buttFont);
		_inspecPlotLineTypeButton[i]->SetToolTip(wxT("Line Plot"));
		pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
		pixbutt->set_normal_bitmap (wxBitmap(lineplot_normal_xpm));
		pixbutt->set_selected_bitmap (wxBitmap(lineplot_selected_xpm));
		pixbutt->set_focus_bitmap (wxBitmap(lineplot_focus_xpm));

		pixbutt = _inspecPlotSolidTypeButton[i] = new PixButton(_inspecPanels[i], FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
		_inspecPlotSolidTypeButton[i]->SetFont(_buttFont);
		_inspecPlotSolidTypeButton[i]->SetToolTip(wxT("Filled Plot"));
		pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
		pixbutt->set_normal_bitmap (wxBitmap(barplot_normal_xpm));
		pixbutt->set_selected_bitmap (wxBitmap(barplot_selected_xpm));
		pixbutt->set_focus_bitmap (wxBitmap(barplot_focus_xpm));

		pixbutt = _outspecSpecTypeButton[i] = new PixButton(_outspecPanels[i], FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
		_outspecSpecTypeButton[i]->SetFont(_buttFont);
		_outspecSpecTypeButton[i]->SetToolTip(wxT("Spectrogram Plot"));
		pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
		pixbutt->set_normal_bitmap (wxBitmap(specplot_normal_xpm));
		pixbutt->set_selected_bitmap (wxBitmap(specplot_selected_xpm));
		pixbutt->set_focus_bitmap (wxBitmap(specplot_focus_xpm));

		pixbutt = _outspecPlotLineTypeButton[i] = new PixButton(_outspecPanels[i], FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
		_outspecPlotLineTypeButton[i]->SetFont(_buttFont);
		_outspecPlotLineTypeButton[i]->SetToolTip(wxT("Line Plot"));
		pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
		pixbutt->set_normal_bitmap (wxBitmap(lineplot_normal_xpm));
		pixbutt->set_selected_bitmap (wxBitmap(lineplot_selected_xpm));
		pixbutt->set_focus_bitmap (wxBitmap(lineplot_focus_xpm));

		pixbutt = _outspecPlotSolidTypeButton[i] = new PixButton(_outspecPanels[i], FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
		_outspecPlotSolidTypeButton[i]->SetFont(_buttFont);
		_outspecPlotSolidTypeButton[i]->SetToolTip(wxT("Filled Plot"));
		pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
		pixbutt->set_normal_bitmap (wxBitmap(barplot_normal_xpm));
		pixbutt->set_selected_bitmap (wxBitmap(barplot_selected_xpm));
		pixbutt->set_focus_bitmap (wxBitmap(barplot_focus_xpm));

					_bypassButtons[rowcnt][i] = pixbutt;
					//buttsizer->Add ( _bypassButtons[rowcnt][i] = new wxButton(rowpanels[i], FT_BypassBase, wxT("B"),
					//							  wxDefaultPosition, wxSize(_bwidth,-1)), 1, 0,0);
					pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::bypass_clicked_events), pixbutt));
					
					buttsizer->Add (pixbutt, 0, 0, 0);
					_bypassButtons[rowcnt][i]->SetFont(_buttFont);

Lines 114-120 Link Here

(-)freqtweak-0.7.2/src/FTmainwin.hpp (-1 / +1 lines)
114	*	114	*
115	*/	115	*/
116		116
117	class FTmainwin : public wxFrame, public SigC::Object	117	class FTmainwin : public wxFrame, public sigc::trackable
118	{	118	{
119	public:	119	public:
120	// ctor(s)	120	// ctor(s)




#include "FTmodulatorGui.hpp"

#include <sigc++/sigc++.h>
using namespace sigc;

enum {
	ID_AddButton=8000,

			
			FTspectralEngine *engine = procpath->getSpectralEngine();

			engine->ModulatorAdded.connect( bind (mem_fun (*this, &FTmodulatorDialog::onModulatorAdded), i));
			
 			vector<FTmodulatorI*> modlist;
			modlist.clear();


	FTmodulatorGui *modgui = new FTmodulatorGui(FTioSupport::instance(), mod, _channelScroller, -1);
	
	modgui->RemovalRequest.connect (bind (mem_fun (*this, &FTmodulatorDialog::onModulatorDeath), mod));
	mod->GoingAway.connect ( mem_fun (*this, &FTmodulatorDialog::onModulatorDeath));
	
	_modulatorGuis[mod] = modgui;
	

Lines 34-40 Link Here

(-)freqtweak-0.7.2/src/FTmodulatorDialog.hpp (-1 / +1 lines)
34	class FTmodulatorI;	34	class FTmodulatorI;
35	class FTmodulatorGui;	35	class FTmodulatorGui;
36		36
37	class FTmodulatorDialog : public wxFrame, public SigC::Object	37	class FTmodulatorDialog : public wxFrame, public sigc::trackable
38	{	38	{
39	public:	39	public:
40	// ctor(s)	40	// ctor(s)

Lines 26-32 Link Here

(-)freqtweak-0.7.2/src/FTmodulatorGui.cpp (-2 / +2 lines)
26	#include "FTprocessPath.hpp"	26	#include "FTprocessPath.hpp"
27	#include "FTprocI.hpp"	27	#include "FTprocI.hpp"
28		28
29	using namespace SigC;	29	using namespace sigc;
30		30
31	enum	31	enum
32	{	32	{
Lines 333-339 Link Here
333	// 1, wxEXPAND\|wxALL, 2);	333	// 1, wxEXPAND\|wxALL, 2);
334		334
335		335
336	_modulator->GoingAway.connect ( slot (*this, &FTmodulatorGui::onModulatorDeath));	336	_modulator->GoingAway.connect ( mem_fun (*this, &FTmodulatorGui::onModulatorDeath));
337		337
338	mainSizer->Add (controlSizer, 1, wxEXPAND\|wxALL, 2);	338	mainSizer->Add (controlSizer, 1, wxEXPAND\|wxALL, 2);
339		339

Lines 37-43 Link Here

(-)freqtweak-0.7.2/src/FTmodulatorGui.hpp (-2 / +2 lines)
37	class FTspectralEngine;	37	class FTspectralEngine;
38		38
39	class FTmodulatorGui	39	class FTmodulatorGui
40	: public wxPanel, public SigC::Object	40	: public wxPanel, public sigc::trackable
41	{	41	{
42	public:	42	public:
43	FTmodulatorGui(FTioSupport * iosup, FTmodulatorI * mod,	43	FTmodulatorGui(FTioSupport * iosup, FTmodulatorI * mod,
Lines 50-56 Link Here
50	virtual ~FTmodulatorGui();	50	virtual ~FTmodulatorGui();
51		51
52		52
53	SigC::Signal0<void> RemovalRequest;	53	sigc::signal0<void> RemovalRequest;
54		54
55	protected:	55	protected:
56		56

Lines 71-77 Link Here

(-)freqtweak-0.7.2/src/FTmodulatorI.hpp (-1 / +1 lines)
71	virtual bool getBypassed() { return _bypassed; }	71	virtual bool getBypassed() { return _bypassed; }
72	virtual void setBypassed(bool byp) { _bypassed = byp; }	72	virtual void setBypassed(bool byp) { _bypassed = byp; }
73		73
74	SigC::Signal1<void, FTmodulatorI *> GoingAway;	74	sigc::signal1<void, FTmodulatorI *> GoingAway;
75		75
76		76
77		77

Lines 102-108 Link Here

(-)freqtweak-0.7.2/src/FTpresetBlender.cpp (-1 / +1 lines)
102	// compare the proctype	102	// compare the proctype
103		103
104	if (pvec.size() <= n \|\| pm->getName() != pvec[n]->getName()) {	104	if (pvec.size() <= n \|\| pm->getName() != pvec[n]->getName()) {
105	fprintf (stderr, "mismatch at %d %d: %s %u\n", i, n, pm->getName().c_str(), pvec.size());	105	fprintf (stderr, "mismatch at %d %d: %s %u\n", i, n, pm->getName().c_str(), (unsigned int) pvec.size());
106	delete procvec;	106	delete procvec;
107	return false;	107	return false;
108	}	108	}




	for (; mod != mlist.end(); ++mod)
	{
		item.SetText (wxString::FromAscii ((*mod)->getName().c_str()));
		item.SetData ((*mod));
		item.SetId(pos++);
		
		_sourceList->InsertItem(item);

		for (unsigned int n=0; n < procmods.size(); ++n)
		{
			item.SetText (wxString::FromAscii (procmods[n]->getName().c_str()));
			item.SetData ( procmods[n]);
			item.SetId (n);
			
			_targetList->InsertItem(item);


		if (proc) {
			item.SetText (wxString::FromAscii (proc->getName().c_str()));
			item.SetData (proc);
			item.SetId (_targetList->GetItemCount());
			
			_targetList->InsertItem(item);

Lines 169-175 Link Here

(-)freqtweak-0.7.2/src/FTspectralEngine.hpp (-1 / +1 lines)
169	FTmodulatorI * getModulator ( unsigned int num);	169	FTmodulatorI * getModulator ( unsigned int num);
170	bool hasModulator (FTmodulatorI * procmod);	170	bool hasModulator (FTmodulatorI * procmod);
171		171
172	SigC::Signal1<void, FTmodulatorI *> ModulatorAdded;	172	sigc::signal1<void, FTmodulatorI *> ModulatorAdded;
173		173
174		174
175		175

Lines 23-28 Link Here

(-)freqtweak-0.7.2/src/FTutils.hpp (+1 lines)
23	#include <iostream>	23	#include <iostream>
24	#include <sstream>	24	#include <sstream>
25	#include <cmath>	25	#include <cmath>
		26	#include <stdint.h>
26		27
27	//#include <wx/string.h>	28	//#include <wx/string.h>
28		29

Lines 15-21 Link Here

(-)freqtweak-0.7.2/src/RingBuffer.hpp (-1 / +1 lines)
15	along with this program; if not, write to the Free Software	15	along with this program; if not, write to the Free Software
16	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	16	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
17		17
18	$Id: RingBuffer.hpp,v 1.1.1.1 2002/10/13 04:13:34 essej Exp $	18	$Id: RingBuffer.hpp,v 1.1 2002/10/13 04:13:34 essej Exp $
19	*/	19	*/
20		20
21	#ifndef __pbd_ringbuffer_h__	21	#ifndef __pbd_ringbuffer_h__

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/ftlogo.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * ftlogo_xpm[] = {	2	static const char * ftlogo_xpm[] = {
3	"70 40 752 2",	3	"70 40 752 2",
4	" c None",	4	" c None",
5	". c #D6D6D6",	5	". c #D6D6D6",




	};

	// int argument is mouse button as above
	sigc::signal1<void,int> pressed;
	sigc::signal1<void,int> released;
	sigc::signal1<void,int> clicked;
	
	sigc::signal0<void> enter;
	sigc::signal0<void> leave;

	sigc::signal0<void> bind_request;
	
  protected:


Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/barplot_active.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * barplot_active_xpm[] = {	2	static const char * barplot_active_xpm[] = {
3	"20 20 4 1",	3	"20 20 4 1",
4	" c None",	4	" c None",
5	". c #DDCD7C",	5	". c #DDCD7C",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/barplot_disabled.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * barplot_disabled_xpm[] = {	2	static const char * barplot_disabled_xpm[] = {
3	"20 20 4 1",	3	"20 20 4 1",
4	" c None",	4	" c None",
5	". c #2D3D4E",	5	". c #2D3D4E",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/barplot_focus.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * barplot_focus_xpm[] = {	2	static const char * barplot_focus_xpm[] = {
3	"20 20 4 1",	3	"20 20 4 1",
4	" c None",	4	" c None",
5	". c #5A80AA",	5	". c #5A80AA",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/barplot_normal.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * barplot_normal_xpm[] = {	2	static const char * barplot_normal_xpm[] = {
3	"20 20 4 1",	3	"20 20 4 1",
4	" c None",	4	" c None",
5	". c #3C5572",	5	". c #3C5572",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/barplot_selected.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * barplot_selected_xpm[] = {	2	static const char * barplot_selected_xpm[] = {
3	"20 20 4 1",	3	"20 20 4 1",
4	" c None",	4	" c None",
5	". c #7A9BBD",	5	". c #7A9BBD",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/bypass_active.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * bypass_active_xpm[] = {	2	static const char * bypass_active_xpm[] = {
3	"20 20 44 1",	3	"20 20 44 1",
4	" c None",	4	" c None",
5	". c #DDCD7C",	5	". c #DDCD7C",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/bypass_disabled.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * bypass_disabled_xpm[] = {	2	static const char * bypass_disabled_xpm[] = {
3	"20 20 39 1",	3	"20 20 39 1",
4	" c None",	4	" c None",
5	". c #485461",	5	". c #485461",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/bypass_focus.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * bypass_focus_xpm[] = {	2	static const char * bypass_focus_xpm[] = {
3	"20 20 46 1",	3	"20 20 46 1",
4	" c None",	4	" c None",
5	". c #5A80AA",	5	". c #5A80AA",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/bypass_normal.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * bypass_normal_xpm[] = {	2	static const char * bypass_normal_xpm[] = {
3	"20 20 42 1",	3	"20 20 42 1",
4	" c None",	4	" c None",
5	". c #3C5572",	5	". c #3C5572",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/bypass_selected.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * bypass_selected_xpm[] = {	2	static const char * bypass_selected_xpm[] = {
3	"20 20 46 1",	3	"20 20 46 1",
4	" c None",	4	" c None",
5	". c #7A9BBD",	5	". c #7A9BBD",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/grid_active.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * grid_active_xpm[] = {	2	static const char * grid_active_xpm[] = {
3	"20 20 3 1",	3	"20 20 3 1",
4	" c None",	4	" c None",
5	". c #DDCD7C",	5	". c #DDCD7C",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/grid_disabled.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * grid_disabled_xpm[] = {	2	static const char * grid_disabled_xpm[] = {
3	"20 20 3 1",	3	"20 20 3 1",
4	" c None",	4	" c None",
5	". c #3B4754",	5	". c #3B4754",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/grid_focus.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * grid_focus_xpm[] = {	2	static const char * grid_focus_xpm[] = {
3	"20 20 3 1",	3	"20 20 3 1",
4	" c None",	4	" c None",
5	". c #5A80AA",	5	". c #5A80AA",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/grid_normal.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * grid_normal_xpm[] = {	2	static const char * grid_normal_xpm[] = {
3	"20 20 3 1",	3	"20 20 3 1",
4	" c None",	4	" c None",
5	". c #3C5572",	5	". c #3C5572",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/grid_selected.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * grid_selected_xpm[] = {	2	static const char * grid_selected_xpm[] = {
3	"20 20 3 1",	3	"20 20 3 1",
4	" c None",	4	" c None",
5	". c #7A9BBD",	5	". c #7A9BBD",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/gridsnap_active.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * gridsnap_active_xpm[] = {	2	static const char * gridsnap_active_xpm[] = {
3	"20 20 4 1",	3	"20 20 4 1",
4	" c None",	4	" c None",
5	". c #DDCD7C",	5	". c #DDCD7C",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/gridsnap_disabled.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * gridsnap_disabled_xpm[] = {	2	static const char * gridsnap_disabled_xpm[] = {
3	"20 20 4 1",	3	"20 20 4 1",
4	" c None",	4	" c None",
5	". c #414C58",	5	". c #414C58",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/gridsnap_focus.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * gridsnap_focus_xpm[] = {	2	static const char * gridsnap_focus_xpm[] = {
3	"20 20 4 1",	3	"20 20 4 1",
4	" c None",	4	" c None",
5	". c #5A80AA",	5	". c #5A80AA",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/gridsnap_normal.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * gridsnap_normal_xpm[] = {	2	static const char * gridsnap_normal_xpm[] = {
3	"20 20 4 1",	3	"20 20 4 1",
4	" c None",	4	" c None",
5	". c #3C5572",	5	". c #3C5572",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/gridsnap_selected.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * gridsnap_selected_xpm[] = {	2	static const char * gridsnap_selected_xpm[] = {
3	"20 20 4 1",	3	"20 20 4 1",
4	" c None",	4	" c None",
5	". c #7A9BBD",	5	". c #7A9BBD",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/lineplot_active.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * lineplot_active_xpm[] = {	2	static const char * lineplot_active_xpm[] = {
3	"20 20 5 1",	3	"20 20 5 1",
4	" c None",	4	" c None",
5	". c #DDCD7C",	5	". c #DDCD7C",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/lineplot_disabled.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * lineplot_disabled_xpm[] = {	2	static const char * lineplot_disabled_xpm[] = {
3	"20 20 5 1",	3	"20 20 5 1",
4	" c None",	4	" c None",
5	". c #495664",	5	". c #495664",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/lineplot_focus.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * lineplot_focus_xpm[] = {	2	static const char * lineplot_focus_xpm[] = {
3	"20 20 5 1",	3	"20 20 5 1",
4	" c None",	4	" c None",
5	". c #5A80AA",	5	". c #5A80AA",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/lineplot_normal.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * lineplot_normal_xpm[] = {	2	static const char * lineplot_normal_xpm[] = {
3	"20 20 5 1",	3	"20 20 5 1",
4	" c None",	4	" c None",
5	". c #3C5572",	5	". c #3C5572",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/lineplot_selected.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * lineplot_selected_xpm[] = {	2	static const char * lineplot_selected_xpm[] = {
3	"20 20 5 1",	3	"20 20 5 1",
4	" c None",	4	" c None",
5	". c #7A9BBD",	5	". c #7A9BBD",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/link_active.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * link_active_xpm[] = {	2	static const char * link_active_xpm[] = {
3	"20 20 68 1",	3	"20 20 68 1",
4	" c None",	4	" c None",
5	". c #DDCD7C",	5	". c #DDCD7C",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/link_disabled.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * link_disabled_xpm[] = {	2	static const char * link_disabled_xpm[] = {
3	"20 20 58 1",	3	"20 20 58 1",
4	" c None",	4	" c None",
5	". c #444D57",	5	". c #444D57",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/link_focus.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * link_focus_xpm[] = {	2	static const char * link_focus_xpm[] = {
3	"20 20 70 1",	3	"20 20 70 1",
4	" c None",	4	" c None",
5	". c #5A80AA",	5	". c #5A80AA",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/link_normal.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * link_normal_xpm[] = {	2	static const char * link_normal_xpm[] = {
3	"20 20 69 1",	3	"20 20 69 1",
4	" c None",	4	" c None",
5	". c #3C5572",	5	". c #3C5572",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/link_selected.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * link_selected_xpm[] = {	2	static const char * link_selected_xpm[] = {
3	"20 20 68 1",	3	"20 20 68 1",
4	" c None",	4	" c None",
5	". c #7A9BBD",	5	". c #7A9BBD",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/specplot_active.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * specplot_active_xpm[] = {	2	static const char * specplot_active_xpm[] = {
3	"20 20 59 1",	3	"20 20 59 1",
4	" c None",	4	" c None",
5	". c #DDCD7C",	5	". c #DDCD7C",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/specplot_disabled.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * specplot_disabled_xpm[] = {	2	static const char * specplot_disabled_xpm[] = {
3	"20 20 59 1",	3	"20 20 59 1",
4	" c None",	4	" c None",
5	". c #495664",	5	". c #495664",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/specplot_focus.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * specplot_focus_xpm[] = {	2	static const char * specplot_focus_xpm[] = {
3	"20 20 59 1",	3	"20 20 59 1",
4	" c None",	4	" c None",
5	". c #5A80AA",	5	". c #5A80AA",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/specplot_normal.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * specplot_normal_xpm[] = {	2	static const char * specplot_normal_xpm[] = {
3	"20 20 59 1",	3	"20 20 59 1",
4	" c None",	4	" c None",
5	". c #3C5572",	5	". c #3C5572",

Lines 1-5 Link Here

(-)freqtweak-0.7.2/src/pixmaps/specplot_selected.xpm (-1 / +1 lines)
1	/* XPM */	1	/* XPM */
2	static char * specplot_selected_xpm[] = {	2	static const char * specplot_selected_xpm[] = {
3	"20 20 59 1",	3	"20 20 59 1",
4	" c None",	4	" c None",
5	". c #7A9BBD",	5	". c #7A9BBD",

Lines 120-129 Link Here

(-)freqtweak-0.7.2/src/slider_bar.hpp (-4 / +4 lines)
120	int get_decimal_digits () { return _decimal_digits; }	120	int get_decimal_digits () { return _decimal_digits; }
121		121
122		122
123	SigC::Signal0<void> pressed;	123	sigc::signal0<void> pressed;
124	SigC::Signal0<void> released;	124	sigc::signal0<void> released;
125	SigC::Signal1<void, float> value_changed;	125	sigc::signal1<void, float> value_changed;
126	SigC::Signal0<void> bind_request;	126	sigc::signal0<void> bind_request;
127		127
128	protected:	128	protected:
129		129

Lines 101-110 Link Here

(-)freqtweak-0.7.2/src/spin_box.hpp (-4 / +4 lines)
101	float get_increment () { return _increment; }	101	float get_increment () { return _increment; }
102	void set_increment (float val) { _increment = val; }	102	void set_increment (float val) { _increment = val; }
103		103
104	SigC::Signal0<void> pressed;	104	sigc::signal0<void> pressed;
105	SigC::Signal0<void> released;	105	sigc::signal0<void> released;
106	SigC::Signal1<void, float> value_changed;	106	sigc::signal1<void, float> value_changed;
107	SigC::Signal0<void> bind_request;	107	sigc::signal0<void> bind_request;
108		108
109	protected:	109	protected:
110		110

Return to bug 336160

Lines 210-216 Link Here

(-)freqtweak-0.7.2/src/FTprocOrderDialog.cpp (-3 / +3 lines)
210	for (; mod != mlist.end(); ++mod)	210	for (; mod != mlist.end(); ++mod)
211	{	211	{
212	item.SetText (wxString::FromAscii ((*mod)->getName().c_str()));	212	item.SetText (wxString::FromAscii ((*mod)->getName().c_str()));
213	item.SetData ((unsigned) (*mod));	213	item.SetData ((*mod));
214	item.SetId(pos++);	214	item.SetId(pos++);
215		215
216	_sourceList->InsertItem(item);	216	_sourceList->InsertItem(item);
Lines 230-236 Link Here
230	for (unsigned int n=0; n < procmods.size(); ++n)	230	for (unsigned int n=0; n < procmods.size(); ++n)
231	{	231	{
232	item.SetText (wxString::FromAscii (procmods[n]->getName().c_str()));	232	item.SetText (wxString::FromAscii (procmods[n]->getName().c_str()));
233	item.SetData ((unsigned) procmods[n]);	233	item.SetData ( procmods[n]);
234	item.SetId (n);	234	item.SetId (n);
235		235
236	_targetList->InsertItem(item);	236	_targetList->InsertItem(item);
Lines 441-447 Link Here
441		441
442	if (proc) {	442	if (proc) {
443	item.SetText (wxString::FromAscii (proc->getName().c_str()));	443	item.SetText (wxString::FromAscii (proc->getName().c_str()));
444	item.SetData ((unsigned)proc);	444	item.SetData (proc);
445	item.SetId (_targetList->GetItemCount());	445	item.SetId (_targetList->GetItemCount());
446		446
447	_targetList->InsertItem(item);	447	_targetList->InsertItem(item);

Lines 585-591 Link Here

(-)freqtweak-0.7.2/src/FTmainwin.cpp (-20 / +20 lines)
585	pixbutt = _inspecSpecTypeAllButton = new PixButton(_inspecPanel, FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));	585	pixbutt = _inspecSpecTypeAllButton = new PixButton(_inspecPanel, FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
586	_inspecSpecTypeAllButton->SetFont(_buttFont);	586	_inspecSpecTypeAllButton->SetFont(_buttFont);
587	_inspecSpecTypeAllButton->SetToolTip (wxT("Spectrogram Plot"));	587	_inspecSpecTypeAllButton->SetToolTip (wxT("Spectrogram Plot"));
588	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::plot_clicked_events), pixbutt));	588	pixbutt->clicked.connect (sigc::bind (sigc::mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
589	pixbutt->set_normal_bitmap (wxBitmap(specplot_normal_xpm));	589	pixbutt->set_normal_bitmap (wxBitmap(specplot_normal_xpm));
590	pixbutt->set_selected_bitmap (wxBitmap(specplot_selected_xpm));	590	pixbutt->set_selected_bitmap (wxBitmap(specplot_selected_xpm));
591	pixbutt->set_focus_bitmap (wxBitmap(specplot_focus_xpm));	591	pixbutt->set_focus_bitmap (wxBitmap(specplot_focus_xpm));
Lines 596-602 Link Here
596	pixbutt = _inspecPlotSolidTypeAllButton = new PixButton(_inspecPanel, FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));	596	pixbutt = _inspecPlotSolidTypeAllButton = new PixButton(_inspecPanel, FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
597	_inspecPlotSolidTypeAllButton->SetFont(_buttFont);	597	_inspecPlotSolidTypeAllButton->SetFont(_buttFont);
598	_inspecPlotSolidTypeAllButton->SetToolTip (wxT("Filled Plot"));	598	_inspecPlotSolidTypeAllButton->SetToolTip (wxT("Filled Plot"));
599	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::plot_clicked_events), pixbutt));	599	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
600	pixbutt->set_normal_bitmap (wxBitmap(barplot_normal_xpm));	600	pixbutt->set_normal_bitmap (wxBitmap(barplot_normal_xpm));
601	pixbutt->set_selected_bitmap (wxBitmap(barplot_selected_xpm));	601	pixbutt->set_selected_bitmap (wxBitmap(barplot_selected_xpm));
602	pixbutt->set_focus_bitmap (wxBitmap(barplot_focus_xpm));	602	pixbutt->set_focus_bitmap (wxBitmap(barplot_focus_xpm));
Lines 606-612 Link Here
606	pixbutt = _inspecPlotLineTypeAllButton = new PixButton(_inspecPanel, FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));	606	pixbutt = _inspecPlotLineTypeAllButton = new PixButton(_inspecPanel, FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
607	_inspecPlotLineTypeAllButton->SetFont(_buttFont);	607	_inspecPlotLineTypeAllButton->SetFont(_buttFont);
608	_inspecPlotLineTypeAllButton->SetToolTip (wxT("Line Plot"));	608	_inspecPlotLineTypeAllButton->SetToolTip (wxT("Line Plot"));
609	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::plot_clicked_events), pixbutt));	609	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
610	pixbutt->set_normal_bitmap (wxBitmap(lineplot_normal_xpm));	610	pixbutt->set_normal_bitmap (wxBitmap(lineplot_normal_xpm));
611	pixbutt->set_selected_bitmap (wxBitmap(lineplot_selected_xpm));	611	pixbutt->set_selected_bitmap (wxBitmap(lineplot_selected_xpm));
612	pixbutt->set_focus_bitmap (wxBitmap(lineplot_focus_xpm));	612	pixbutt->set_focus_bitmap (wxBitmap(lineplot_focus_xpm));
Lines 732-738 Link Here
732	pixbutt = _outspecSpecTypeAllButton = new PixButton(_outspecPanel, FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));	732	pixbutt = _outspecSpecTypeAllButton = new PixButton(_outspecPanel, FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
733	_outspecSpecTypeAllButton->SetFont(_buttFont);	733	_outspecSpecTypeAllButton->SetFont(_buttFont);
734	_outspecSpecTypeAllButton->SetToolTip (wxT("Spectrogram Plot"));	734	_outspecSpecTypeAllButton->SetToolTip (wxT("Spectrogram Plot"));
735	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::plot_clicked_events), pixbutt));	735	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
736	pixbutt->set_normal_bitmap (wxBitmap(specplot_normal_xpm));	736	pixbutt->set_normal_bitmap (wxBitmap(specplot_normal_xpm));
737	pixbutt->set_selected_bitmap (wxBitmap(specplot_selected_xpm));	737	pixbutt->set_selected_bitmap (wxBitmap(specplot_selected_xpm));
738	pixbutt->set_focus_bitmap (wxBitmap(specplot_focus_xpm));	738	pixbutt->set_focus_bitmap (wxBitmap(specplot_focus_xpm));
Lines 742-748 Link Here
742	pixbutt = _outspecPlotSolidTypeAllButton = new PixButton(_outspecPanel, FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));	742	pixbutt = _outspecPlotSolidTypeAllButton = new PixButton(_outspecPanel, FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
743	_outspecPlotSolidTypeAllButton->SetFont(_buttFont);	743	_outspecPlotSolidTypeAllButton->SetFont(_buttFont);
744	_outspecPlotSolidTypeAllButton->SetToolTip (wxT("Filled Plot"));	744	_outspecPlotSolidTypeAllButton->SetToolTip (wxT("Filled Plot"));
745	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::plot_clicked_events), pixbutt));	745	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
746	pixbutt->set_normal_bitmap (wxBitmap(barplot_normal_xpm));	746	pixbutt->set_normal_bitmap (wxBitmap(barplot_normal_xpm));
747	pixbutt->set_selected_bitmap (wxBitmap(barplot_selected_xpm));	747	pixbutt->set_selected_bitmap (wxBitmap(barplot_selected_xpm));
748	pixbutt->set_focus_bitmap (wxBitmap(barplot_focus_xpm));	748	pixbutt->set_focus_bitmap (wxBitmap(barplot_focus_xpm));
Lines 752-758 Link Here
752	pixbutt = _outspecPlotLineTypeAllButton = new PixButton(_outspecPanel, FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));	752	pixbutt = _outspecPlotLineTypeAllButton = new PixButton(_outspecPanel, FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
753	_outspecPlotLineTypeAllButton->SetFont(_buttFont);	753	_outspecPlotLineTypeAllButton->SetFont(_buttFont);
754	_outspecPlotLineTypeAllButton->SetToolTip (wxT("Line Plot"));	754	_outspecPlotLineTypeAllButton->SetToolTip (wxT("Line Plot"));
755	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::plot_clicked_events), pixbutt));	755	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
756	pixbutt->set_normal_bitmap (wxBitmap(lineplot_normal_xpm));	756	pixbutt->set_normal_bitmap (wxBitmap(lineplot_normal_xpm));
757	pixbutt->set_selected_bitmap (wxBitmap(lineplot_selected_xpm));	757	pixbutt->set_selected_bitmap (wxBitmap(lineplot_selected_xpm));
758	pixbutt->set_focus_bitmap (wxBitmap(lineplot_focus_xpm));	758	pixbutt->set_focus_bitmap (wxBitmap(lineplot_focus_xpm));
Lines 931-937 Link Here
931	PixButton * linkallbutt = pixbutt = new PixButton(rpanel, FT_LinkBase, false, wxDefaultPosition, wxSize(_bwidth,_bheight));	931	PixButton * linkallbutt = pixbutt = new PixButton(rpanel, FT_LinkBase, false, wxDefaultPosition, wxSize(_bwidth,_bheight));
932	linkallbutt->SetFont(_buttFont);	932	linkallbutt->SetFont(_buttFont);
933	linkallbutt->SetToolTip (wxT("Link All"));	933	linkallbutt->SetToolTip (wxT("Link All"));
934	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::link_clicked_events), pixbutt));	934	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::link_clicked_events), pixbutt));
935	pixbutt->set_normal_bitmap (wxBitmap(link_normal_xpm));	935	pixbutt->set_normal_bitmap (wxBitmap(link_normal_xpm));
936	pixbutt->set_selected_bitmap (wxBitmap(link_selected_xpm));	936	pixbutt->set_selected_bitmap (wxBitmap(link_selected_xpm));
937	pixbutt->set_focus_bitmap (wxBitmap(link_focus_xpm));	937	pixbutt->set_focus_bitmap (wxBitmap(link_focus_xpm));
Lines 943-949 Link Here
943	PixButton * bypallbutt = pixbutt = new PixButton(rpanel, FT_BypassBase, false, wxDefaultPosition, wxSize(_bwidth,_bheight));	943	PixButton * bypallbutt = pixbutt = new PixButton(rpanel, FT_BypassBase, false, wxDefaultPosition, wxSize(_bwidth,_bheight));
944	bypallbutt->SetFont(_buttFont);	944	bypallbutt->SetFont(_buttFont);
945	bypallbutt->SetToolTip (wxT("Bypass All"));	945	bypallbutt->SetToolTip (wxT("Bypass All"));
946	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::bypass_clicked_events), pixbutt));	946	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::bypass_clicked_events), pixbutt));
947	pixbutt->set_normal_bitmap (wxBitmap(bypass_normal_xpm));	947	pixbutt->set_normal_bitmap (wxBitmap(bypass_normal_xpm));
948	pixbutt->set_selected_bitmap (wxBitmap(bypass_selected_xpm));	948	pixbutt->set_selected_bitmap (wxBitmap(bypass_selected_xpm));
949	pixbutt->set_focus_bitmap (wxBitmap(bypass_focus_xpm));	949	pixbutt->set_focus_bitmap (wxBitmap(bypass_focus_xpm));
Lines 956-963 Link Here
956	PixButton * gridbutt = pixbutt = new PixButton (rpanel, FT_GridBase, false, wxDefaultPosition, wxSize(_bwidth,_bheight));	956	PixButton * gridbutt = pixbutt = new PixButton (rpanel, FT_GridBase, false, wxDefaultPosition, wxSize(_bwidth,_bheight));
957	gridbutt->SetFont(_buttFont);	957	gridbutt->SetFont(_buttFont);
958	gridbutt->SetToolTip (wxT("Toggle Grid\nRight-click to Adjust"));	958	gridbutt->SetToolTip (wxT("Toggle Grid\nRight-click to Adjust"));
959	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::grid_clicked_events), pixbutt));	959	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::grid_clicked_events), pixbutt));
960	pixbutt->pressed.connect (bind (slot (*this, &FTmainwin::grid_pressed_events), pixbutt));	960	pixbutt->pressed.connect (bind (mem_fun (*this, &FTmainwin::grid_pressed_events), pixbutt));
961	pixbutt->set_normal_bitmap (wxBitmap(grid_normal_xpm));	961	pixbutt->set_normal_bitmap (wxBitmap(grid_normal_xpm));
962	pixbutt->set_selected_bitmap (wxBitmap(grid_selected_xpm));	962	pixbutt->set_selected_bitmap (wxBitmap(grid_selected_xpm));
963	pixbutt->set_focus_bitmap (wxBitmap(grid_focus_xpm));	963	pixbutt->set_focus_bitmap (wxBitmap(grid_focus_xpm));
Lines 970-976 Link Here
970	PixButton * gridsnbutt = pixbutt = new PixButton (rpanel, FT_GridSnapBase, false, wxDefaultPosition, wxSize(_bwidth,_bheight));	970	PixButton * gridsnbutt = pixbutt = new PixButton (rpanel, FT_GridSnapBase, false, wxDefaultPosition, wxSize(_bwidth,_bheight));
971	gridsnbutt->SetFont(_buttFont);	971	gridsnbutt->SetFont(_buttFont);
972	gridsnbutt->SetToolTip (wxT("Toggle Grid Snap"));	972	gridsnbutt->SetToolTip (wxT("Toggle Grid Snap"));
973	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::grid_clicked_events), pixbutt));	973	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::grid_clicked_events), pixbutt));
974	pixbutt->set_normal_bitmap (wxBitmap(gridsnap_normal_xpm));	974	pixbutt->set_normal_bitmap (wxBitmap(gridsnap_normal_xpm));
975	pixbutt->set_selected_bitmap (wxBitmap(gridsnap_selected_xpm));	975	pixbutt->set_selected_bitmap (wxBitmap(gridsnap_selected_xpm));
976	pixbutt->set_focus_bitmap (wxBitmap(gridsnap_focus_xpm));	976	pixbutt->set_focus_bitmap (wxBitmap(gridsnap_focus_xpm));
Lines 1249-1255 Link Here
1249	_bypassButtons[rowcnt][i] = pixbutt;	1249	_bypassButtons[rowcnt][i] = pixbutt;
1250	//buttsizer->Add ( _bypassButtons[rowcnt][i] = new wxButton(rowpanels[i], FT_BypassBase, wxT("B"),	1250	//buttsizer->Add ( _bypassButtons[rowcnt][i] = new wxButton(rowpanels[i], FT_BypassBase, wxT("B"),
1251	// wxDefaultPosition, wxSize(_bwidth,-1)), 1, 0,0);	1251	// wxDefaultPosition, wxSize(_bwidth,-1)), 1, 0,0);
1252	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::bypass_clicked_events), pixbutt));	1252	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::bypass_clicked_events), pixbutt));
1253		1253
1254	buttsizer->Add (pixbutt, 0, 0, 0);	1254	buttsizer->Add (pixbutt, 0, 0, 0);
1255		1255
Lines 1259-1265 Link Here
1259	_bypassButtons[rowcnt][i]->SetToolTip(wxT("Toggle Bypass"));	1259	_bypassButtons[rowcnt][i]->SetToolTip(wxT("Toggle Bypass"));
1260		1260
1261	pixbutt = new PixButton(rowpanels[i], FT_LinkBase, false, wxDefaultPosition, wxSize(_bwidth, -1));	1261	pixbutt = new PixButton(rowpanels[i], FT_LinkBase, false, wxDefaultPosition, wxSize(_bwidth, -1));
1262	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::link_clicked_events), pixbutt));	1262	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::link_clicked_events), pixbutt));
1263		1263
1264	pixbutt->set_normal_bitmap (wxBitmap(link_normal_xpm));	1264	pixbutt->set_normal_bitmap (wxBitmap(link_normal_xpm));
1265	pixbutt->set_selected_bitmap (wxBitmap(link_selected_xpm));	1265	pixbutt->set_selected_bitmap (wxBitmap(link_selected_xpm));
Lines 1350-1356 Link Here
1350	pixbutt = _inspecSpecTypeButton[i] = new PixButton(_inspecPanels[i], FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));	1350	pixbutt = _inspecSpecTypeButton[i] = new PixButton(_inspecPanels[i], FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
1351	_inspecSpecTypeButton[i]->SetFont(_buttFont);	1351	_inspecSpecTypeButton[i]->SetFont(_buttFont);
1352	_inspecSpecTypeButton[i]->SetToolTip(wxT("Spectrogram Plot"));	1352	_inspecSpecTypeButton[i]->SetToolTip(wxT("Spectrogram Plot"));
1353	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::plot_clicked_events), pixbutt));	1353	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
1354	pixbutt->set_normal_bitmap (wxBitmap(specplot_normal_xpm));	1354	pixbutt->set_normal_bitmap (wxBitmap(specplot_normal_xpm));
1355	pixbutt->set_selected_bitmap (wxBitmap(specplot_selected_xpm));	1355	pixbutt->set_selected_bitmap (wxBitmap(specplot_selected_xpm));
1356	pixbutt->set_focus_bitmap (wxBitmap(specplot_focus_xpm));	1356	pixbutt->set_focus_bitmap (wxBitmap(specplot_focus_xpm));
Lines 1361-1367 Link Here
1361	pixbutt = _inspecPlotLineTypeButton[i] = new PixButton(_inspecPanels[i], FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));	1361	pixbutt = _inspecPlotLineTypeButton[i] = new PixButton(_inspecPanels[i], FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
1362	_inspecPlotLineTypeButton[i]->SetFont(_buttFont);	1362	_inspecPlotLineTypeButton[i]->SetFont(_buttFont);
1363	_inspecPlotLineTypeButton[i]->SetToolTip(wxT("Line Plot"));	1363	_inspecPlotLineTypeButton[i]->SetToolTip(wxT("Line Plot"));
1364	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::plot_clicked_events), pixbutt));	1364	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
1365	pixbutt->set_normal_bitmap (wxBitmap(lineplot_normal_xpm));	1365	pixbutt->set_normal_bitmap (wxBitmap(lineplot_normal_xpm));
1366	pixbutt->set_selected_bitmap (wxBitmap(lineplot_selected_xpm));	1366	pixbutt->set_selected_bitmap (wxBitmap(lineplot_selected_xpm));
1367	pixbutt->set_focus_bitmap (wxBitmap(lineplot_focus_xpm));	1367	pixbutt->set_focus_bitmap (wxBitmap(lineplot_focus_xpm));
Lines 1372-1378 Link Here
1372	pixbutt = _inspecPlotSolidTypeButton[i] = new PixButton(_inspecPanels[i], FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));	1372	pixbutt = _inspecPlotSolidTypeButton[i] = new PixButton(_inspecPanels[i], FT_InSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
1373	_inspecPlotSolidTypeButton[i]->SetFont(_buttFont);	1373	_inspecPlotSolidTypeButton[i]->SetFont(_buttFont);
1374	_inspecPlotSolidTypeButton[i]->SetToolTip(wxT("Filled Plot"));	1374	_inspecPlotSolidTypeButton[i]->SetToolTip(wxT("Filled Plot"));
1375	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::plot_clicked_events), pixbutt));	1375	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
1376	pixbutt->set_normal_bitmap (wxBitmap(barplot_normal_xpm));	1376	pixbutt->set_normal_bitmap (wxBitmap(barplot_normal_xpm));
1377	pixbutt->set_selected_bitmap (wxBitmap(barplot_selected_xpm));	1377	pixbutt->set_selected_bitmap (wxBitmap(barplot_selected_xpm));
1378	pixbutt->set_focus_bitmap (wxBitmap(barplot_focus_xpm));	1378	pixbutt->set_focus_bitmap (wxBitmap(barplot_focus_xpm));
Lines 1401-1407 Link Here
1401	pixbutt = _outspecSpecTypeButton[i] = new PixButton(_outspecPanels[i], FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));	1401	pixbutt = _outspecSpecTypeButton[i] = new PixButton(_outspecPanels[i], FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
1402	_outspecSpecTypeButton[i]->SetFont(_buttFont);	1402	_outspecSpecTypeButton[i]->SetFont(_buttFont);
1403	_outspecSpecTypeButton[i]->SetToolTip(wxT("Spectrogram Plot"));	1403	_outspecSpecTypeButton[i]->SetToolTip(wxT("Spectrogram Plot"));
1404	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::plot_clicked_events), pixbutt));	1404	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
1405	pixbutt->set_normal_bitmap (wxBitmap(specplot_normal_xpm));	1405	pixbutt->set_normal_bitmap (wxBitmap(specplot_normal_xpm));
1406	pixbutt->set_selected_bitmap (wxBitmap(specplot_selected_xpm));	1406	pixbutt->set_selected_bitmap (wxBitmap(specplot_selected_xpm));
1407	pixbutt->set_focus_bitmap (wxBitmap(specplot_focus_xpm));	1407	pixbutt->set_focus_bitmap (wxBitmap(specplot_focus_xpm));
Lines 1412-1418 Link Here
1412	pixbutt = _outspecPlotLineTypeButton[i] = new PixButton(_outspecPanels[i], FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));	1412	pixbutt = _outspecPlotLineTypeButton[i] = new PixButton(_outspecPanels[i], FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
1413	_outspecPlotLineTypeButton[i]->SetFont(_buttFont);	1413	_outspecPlotLineTypeButton[i]->SetFont(_buttFont);
1414	_outspecPlotLineTypeButton[i]->SetToolTip(wxT("Line Plot"));	1414	_outspecPlotLineTypeButton[i]->SetToolTip(wxT("Line Plot"));
1415	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::plot_clicked_events), pixbutt));	1415	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
1416	pixbutt->set_normal_bitmap (wxBitmap(lineplot_normal_xpm));	1416	pixbutt->set_normal_bitmap (wxBitmap(lineplot_normal_xpm));
1417	pixbutt->set_selected_bitmap (wxBitmap(lineplot_selected_xpm));	1417	pixbutt->set_selected_bitmap (wxBitmap(lineplot_selected_xpm));
1418	pixbutt->set_focus_bitmap (wxBitmap(lineplot_focus_xpm));	1418	pixbutt->set_focus_bitmap (wxBitmap(lineplot_focus_xpm));
Lines 1423-1429 Link Here
1423	pixbutt = _outspecPlotSolidTypeButton[i] = new PixButton(_outspecPanels[i], FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));	1423	pixbutt = _outspecPlotSolidTypeButton[i] = new PixButton(_outspecPanels[i], FT_OutSpecTypeId, false, wxDefaultPosition, wxSize(_bwidth, _bheight));
1424	_outspecPlotSolidTypeButton[i]->SetFont(_buttFont);	1424	_outspecPlotSolidTypeButton[i]->SetFont(_buttFont);
1425	_outspecPlotSolidTypeButton[i]->SetToolTip(wxT("Filled Plot"));	1425	_outspecPlotSolidTypeButton[i]->SetToolTip(wxT("Filled Plot"));
1426	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::plot_clicked_events), pixbutt));	1426	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::plot_clicked_events), pixbutt));
1427	pixbutt->set_normal_bitmap (wxBitmap(barplot_normal_xpm));	1427	pixbutt->set_normal_bitmap (wxBitmap(barplot_normal_xpm));
1428	pixbutt->set_selected_bitmap (wxBitmap(barplot_selected_xpm));	1428	pixbutt->set_selected_bitmap (wxBitmap(barplot_selected_xpm));
1429	pixbutt->set_focus_bitmap (wxBitmap(barplot_focus_xpm));	1429	pixbutt->set_focus_bitmap (wxBitmap(barplot_focus_xpm));
Lines 2963-2969 Link Here
2963	_bypassButtons[rowcnt][i] = pixbutt;	2963	_bypassButtons[rowcnt][i] = pixbutt;
2964	//buttsizer->Add ( _bypassButtons[rowcnt][i] = new wxButton(rowpanels[i], FT_BypassBase, wxT("B"),	2964	//buttsizer->Add ( _bypassButtons[rowcnt][i] = new wxButton(rowpanels[i], FT_BypassBase, wxT("B"),
2965	// wxDefaultPosition, wxSize(_bwidth,-1)), 1, 0,0);	2965	// wxDefaultPosition, wxSize(_bwidth,-1)), 1, 0,0);
2966	pixbutt->clicked.connect (bind (slot (*this, &FTmainwin::bypass_clicked_events), pixbutt));	2966	pixbutt->clicked.connect (bind (mem_fun (*this, &FTmainwin::bypass_clicked_events), pixbutt));
2967		2967
2968	buttsizer->Add (pixbutt, 0, 0, 0);	2968	buttsizer->Add (pixbutt, 0, 0, 0);
2969	_bypassButtons[rowcnt][i]->SetFont(_buttFont);	2969	_bypassButtons[rowcnt][i]->SetFont(_buttFont);

Lines 39-45 Link Here

(-)freqtweak-0.7.2/src/FTmodulatorDialog.cpp (-4 / +4 lines)
39	#include "FTmodulatorGui.hpp"	39	#include "FTmodulatorGui.hpp"
40		40
41	#include <sigc++/sigc++.h>	41	#include <sigc++/sigc++.h>
42	using namespace SigC;	42	using namespace sigc;
43		43
44	enum {	44	enum {
45	ID_AddButton=8000,	45	ID_AddButton=8000,
Lines 206-212 Link Here
206		206
207	FTspectralEngine *engine = procpath->getSpectralEngine();	207	FTspectralEngine *engine = procpath->getSpectralEngine();
208		208
209	engine->ModulatorAdded.connect( bind (slot (*this, &FTmodulatorDialog::onModulatorAdded), i));	209	engine->ModulatorAdded.connect( bind (mem_fun (*this, &FTmodulatorDialog::onModulatorAdded), i));
210		210
211	vector<FTmodulatorI*> modlist;	211	vector<FTmodulatorI*> modlist;
212	modlist.clear();	212	modlist.clear();
Lines 238-245 Link Here
238		238
239	FTmodulatorGui *modgui = new FTmodulatorGui(FTioSupport::instance(), mod, _channelScroller, -1);	239	FTmodulatorGui *modgui = new FTmodulatorGui(FTioSupport::instance(), mod, _channelScroller, -1);
240		240
241	modgui->RemovalRequest.connect (bind (slot (*this, &FTmodulatorDialog::onModulatorDeath), mod));	241	modgui->RemovalRequest.connect (bind (mem_fun (*this, &FTmodulatorDialog::onModulatorDeath), mod));
242	mod->GoingAway.connect ( slot (*this, &FTmodulatorDialog::onModulatorDeath));	242	mod->GoingAway.connect ( mem_fun (*this, &FTmodulatorDialog::onModulatorDeath));
243		243
244	_modulatorGuis[mod] = modgui;	244	_modulatorGuis[mod] = modgui;
245		245

Lines 66-79 Link Here

(-)freqtweak-0.7.2/src/pix_button.hpp (-6 / +6 lines)
66	};	66	};
67		67
68	// int argument is mouse button as above	68	// int argument is mouse button as above
69	SigC::Signal1<void,int> pressed;	69	sigc::signal1<void,int> pressed;
70	SigC::Signal1<void,int> released;	70	sigc::signal1<void,int> released;
71	SigC::Signal1<void,int> clicked;	71	sigc::signal1<void,int> clicked;
72		72
73	SigC::Signal0<void> enter;	73	sigc::signal0<void> enter;
74	SigC::Signal0<void> leave;	74	sigc::signal0<void> leave;
75		75
76	SigC::Signal0<void> bind_request;	76	sigc::signal0<void> bind_request;
77		77
78	protected:	78	protected:
79		79