Репозитории ALT
S: | 0.1.2-alt3 |
5.1: | 0.1.2-alt1 |
4.1: | 0.1.2-alt0.2 |
4.0: | 0.1.2-alt0.2 |
Группа :: Система/Библиотеки
Пакет: libplotmm
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: libplotmm-sigc.patch
Скачать
Скачать
new libsigc++ patch
diff -ur plotmm-0.1.2.orig/examples/simple/simple.cc plotmm-0.1.2/examples/simple/simple.cc
--- plotmm-0.1.2.orig/examples/simple/simple.cc 2005-11-10 15:36:44 +0300
+++ plotmm-0.1.2/examples/simple/simple.cc 2008-07-01 02:36:43 +0400
@@ -207,7 +207,7 @@
#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 4)
m_button2.signal_clicked().connect(sigc::mem_fun(*this, &Gtk::Widget::hide));
#else
- m_button2.signal_clicked().connect(SigC::slot(*this, &Gtk::Widget::hide));
+ m_button2.signal_clicked().connect(sigc::slot(*this, &Gtk::Widget::hide));
#endif
m_box3.pack_start(m_chk_t, Gtk::PACK_SHRINK,5);
m_box3.pack_start(m_chk_l, Gtk::PACK_SHRINK,5);
@@ -242,12 +242,12 @@
m_button2.signal_clicked().connect(sigc::mem_fun(*this, &Gtk::Widget::hide));
#else
m_plot.signal_plot_mouse_press().
- connect(SigC::slot(*this,&PlotTest::on_plot_mouse_press));
+ connect(sigc::slot(*this,&PlotTest::on_plot_mouse_press));
m_plot.signal_plot_mouse_release().
- connect(SigC::slot(*this,&PlotTest::on_plot_mouse_release));
+ connect(sigc::slot(*this,&PlotTest::on_plot_mouse_release));
m_plot.signal_plot_mouse_move().
- connect(SigC::slot(*this,&PlotTest::on_plot_mouse_move));
- m_button2.signal_clicked().connect(SigC::slot(*this, &Gtk::Widget::hide));
+ connect(sigc::slot(*this,&PlotTest::on_plot_mouse_move));
+ m_button2.signal_clicked().connect(sigc::slot(*this, &Gtk::Widget::hide));
#endif
#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 4)
@@ -257,8 +257,8 @@
m_plot.scale(AXIS)->set_enabled(true)
#else
#define CHECKBOX_SCALE_HELPER(AXIS,CHECKBOX) \
- m_plot.scale(AXIS)->signal_enabled.connect(SigC::slot(CHECKBOX,&Gtk::CheckButton::set_active));\
- CHECKBOX.signal_toggled().connect(SigC::bind(SigC::slot(*this,&PlotTest::on_scale_toggled),AXIS,&CHECKBOX));\
+ m_plot.scale(AXIS)->signal_enabled.connect(sigc::slot(CHECKBOX,&Gtk::CheckButton::set_active));\
+ CHECKBOX.signal_toggled().connect(sigc::bind(sigc::slot(*this,&PlotTest::on_scale_toggled),AXIS,&CHECKBOX));\
m_plot.scale(AXIS)->set_enabled(true)
#endif
@@ -318,7 +318,7 @@
Glib::signal_timeout().connect(sigc::mem_fun(*this, &PlotTest::timer_callback),
10,Glib::PRIORITY_DEFAULT_IDLE);
#else
- Glib::signal_timeout().connect(SigC::slot(*this, &PlotTest::timer_callback),
+ Glib::signal_timeout().connect(sigc::slot(*this, &PlotTest::timer_callback),
10,Glib::PRIORITY_DEFAULT_IDLE);
#endif
}
diff -ur plotmm-0.1.2.orig/plotmm/compat.h plotmm-0.1.2/plotmm/compat.h
--- plotmm-0.1.2.orig/plotmm/compat.h 2005-11-09 19:36:02 +0300
+++ plotmm-0.1.2/plotmm/compat.h 2008-07-01 02:36:44 +0400
@@ -58,7 +58,7 @@
#else
namespace PlotMM {
- typedef SigC::ObjectBase ObjectBase;
+ typedef sigc::ObjectBase ObjectBase;
}
#endif
diff -ur plotmm-0.1.2.orig/plotmm/curve.h plotmm-0.1.2/plotmm/curve.h
--- plotmm-0.1.2.orig/plotmm/curve.h 2005-11-09 19:47:21 +0300
+++ plotmm-0.1.2/plotmm/curve.h 2008-07-01 02:36:44 +0400
@@ -140,7 +140,7 @@
int from = 0, int to = -1);
//! Signals that this curve has changed in some way or the other
- SigC::Signal0<void> signal_curve_changed;
+ sigc::signal0<void> signal_curve_changed;
protected:
virtual void init(const Glib::ustring &title);
diff -ur plotmm-0.1.2.orig/plotmm/plot.cc plotmm-0.1.2/plotmm/plot.cc
--- plotmm-0.1.2.orig/plotmm/plot.cc 2005-11-09 19:59:48 +0300
+++ plotmm-0.1.2/plotmm/plot.cc 2008-07-01 02:36:44 +0400
@@ -322,7 +322,7 @@
connect(sigc::mem_fun(*this,&Plot::on_canvas_expose_event));
#else
canvas_.signal_expose_event().
- connect(SigC::slot(*this,&Plot::on_canvas_expose_event));
+ connect(sigc::slot(*this,&Plot::on_canvas_expose_event));
#endif
show_all();
@@ -406,19 +406,19 @@
}
//! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
+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()
+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()
+sigc::signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
{
return canvas_.signal_plot_mouse_move;
}
diff -ur plotmm-0.1.2.orig/plotmm/plot.h plotmm-0.1.2/plotmm/plot.h
--- plotmm-0.1.2.orig/plotmm/plot.h 2004-03-09 12:51:55 +0300
+++ plotmm-0.1.2/plotmm/plot.h 2008-07-01 02:36:44 +0400
@@ -79,9 +79,9 @@
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;
+ 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);
@@ -141,9 +141,9 @@
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();
+ 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_; }
diff -ur plotmm-0.1.2.orig/plotmm/scale.h plotmm-0.1.2/plotmm/scale.h
--- plotmm-0.1.2.orig/plotmm/scale.h 2004-03-05 18:25:43 +0300
+++ plotmm-0.1.2/plotmm/scale.h 2008-07-01 02:36:44 +0400
@@ -133,7 +133,7 @@
/*! This signal is thrown whenever the scale is enabled or disabled
* \sa set_enabled, enabled
*/
- SigC::Signal1<void,bool> signal_enabled;
+ sigc::signal1<void,bool> signal_enabled;
protected:
virtual void on_realize();