Attachment #147262 for bug #214491

Lines 59-65 Link Here

(-)btg-0.9.7.orig/external/plotmm/compat.h (-1 / +1 lines)
59	#else	59	#else
60		60
61	namespace PlotMM {	61	namespace PlotMM {
62	typedef SigC::ObjectBase ObjectBase;	62	typedef sigc::ObjectBase ObjectBase;
63	}	63	}
64		64
65	#endif	65	#endif

Lines 140-146 Link Here

(-)btg-0.9.7.orig/external/plotmm/curve.h (-1 / +1 lines)
140	int from = 0, int to = -1);	140	int from = 0, int to = -1);
141		141
142	//! Signals that this curve has changed in some way or the other	142	//! Signals that this curve has changed in some way or the other
143	SigC::Signal0<void> signal_curve_changed;	143	sigc::signal0<void> signal_curve_changed;
144		144
145	protected:	145	protected:
146	virtual void init(const Glib::ustring &title);	146	virtual void init(const Glib::ustring &title);




      connect(sigc::mem_fun(*this,&Plot::on_canvas_expose_event));
#else
    canvas_.signal_expose_event().
      connect(sigc::slot(*this,&Plot::on_canvas_expose_event));
#endif

    show_all();

}

//! Return the signal owned by plot canvas
sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
{
    return canvas_.signal_plot_mouse_press;
}

//! Return the signal owned by plot canvas
sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
{
    return canvas_.signal_plot_mouse_release;
}

//! Return the signal owned by plot canvas
sigc::signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
{
    return canvas_.signal_plot_mouse_move;
}




	virtual void clear();
	virtual void end_replot();

	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
	sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;

    protected:
	virtual bool on_expose_event(GdkEventExpose* event);

	Scale *scale(PlotAxisID id) { return tickMark_[id]; }
	PlotLabel *label(PlotAxisID id) { return axisLabel_[id]; }

	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
	sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();

	void set_selection(const Rectangle &r);
	Rectangle get_selection() { return select_; }

Lines 133-139 Link Here

(-)btg-0.9.7.orig/external/plotmm/scale.h (-1 / +1 lines)
133	/*! This signal is thrown whenever the scale is enabled or disabled	133	/*! This signal is thrown whenever the scale is enabled or disabled
134	* \sa set_enabled, enabled	134	* \sa set_enabled, enabled
135	*/	135	*/
136	SigC::Signal1<void,bool> signal_enabled;	136	sigc::signal1<void,bool> signal_enabled;
137		137
138	protected:	138	protected:
139	virtual void on_realize();	139	virtual void on_realize();

Return to bug 214491

Lines 322-328 Link Here

(-)btg-0.9.7.orig/external/plotmm/plot.cc (-4 / +4 lines)
322	connect(sigc::mem_fun(*this,&Plot::on_canvas_expose_event));	322	connect(sigc::mem_fun(*this,&Plot::on_canvas_expose_event));
323	#else	323	#else
324	canvas_.signal_expose_event().	324	canvas_.signal_expose_event().
325	connect(SigC::slot(*this,&Plot::on_canvas_expose_event));	325	connect(sigc::slot(*this,&Plot::on_canvas_expose_event));
326	#endif	326	#endif
327		327
328	show_all();	328	show_all();
Lines 406-424 Link Here
406	}	406	}
407		407
408	//! Return the signal owned by plot canvas	408	//! Return the signal owned by plot canvas
409	SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()	409	sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
410	{	410	{
411	return canvas_.signal_plot_mouse_press;	411	return canvas_.signal_plot_mouse_press;
412	}	412	}
413		413
414	//! Return the signal owned by plot canvas	414	//! Return the signal owned by plot canvas
415	SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()	415	sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
416	{	416	{
417	return canvas_.signal_plot_mouse_release;	417	return canvas_.signal_plot_mouse_release;
418	}	418	}
419		419
420	//! Return the signal owned by plot canvas	420	//! Return the signal owned by plot canvas
421	SigC::Signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()	421	sigc::signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
422	{	422	{
423	return canvas_.signal_plot_mouse_move;	423	return canvas_.signal_plot_mouse_move;
424	}	424	}

Lines 79-87 Link Here

(-)btg-0.9.7.orig/external/plotmm/plot.h (-6 / +6 lines)
79	virtual void clear();	79	virtual void clear();
80	virtual void end_replot();	80	virtual void end_replot();
81		81
82	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;	82	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
83	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;	83	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
84	SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;	84	sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
85		85
86	protected:	86	protected:
87	virtual bool on_expose_event(GdkEventExpose* event);	87	virtual bool on_expose_event(GdkEventExpose* event);
Lines 141-149 Link Here
141	Scale *scale(PlotAxisID id) { return tickMark_[id]; }	141	Scale *scale(PlotAxisID id) { return tickMark_[id]; }
142	PlotLabel *label(PlotAxisID id) { return axisLabel_[id]; }	142	PlotLabel *label(PlotAxisID id) { return axisLabel_[id]; }
143		143
144	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();	144	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
145	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();	145	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
146	SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();	146	sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
147		147
148	void set_selection(const Rectangle &r);	148	void set_selection(const Rectangle &r);
149	Rectangle get_selection() { return select_; }	149	Rectangle get_selection() { return select_; }