rpms/plotmm/F-9 libsigc++-2.0.patch,NONE,1.1

[Haïkel Guémar (hguemar)]

Author: hguemar

Update of /cvs/extras/rpms/plotmm/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv792

Added Files:
	libsigc++-2.0.patch 
Log Message:


libsigc++-2.0.patch:

--- NEW FILE libsigc++-2.0.patch ---
diff -u -r --exclude=.deps --exclude=.libs plotmm-0.1.2/examples/simple/simple.cc plotmm-0.1.2.good/examples/simple/simple.cc
--- plotmm-0.1.2/examples/simple/simple.cc2005-11-10 13:36:44.000000000 +0100
+++ plotmm-0.1.2.good/examples/simple/simple.cc2008-04-06 11:02:11.000000000 +0200
@@ -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::mem_fun(*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::mem_fun(*this,&PlotTest::on_plot_mouse_press));
   m_plot.signal_plot_mouse_release().
-    connect(SigC::slot(*this,&PlotTest::on_plot_mouse_release));
+    connect(sigc::mem_fun(*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::mem_fun(*this,&PlotTest::on_plot_mouse_move));
+  m_button2.signal_clicked().connect(sigc::mem_fun(*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::mem_fun(CHECKBOX,&Gtk::CheckButton::set_active));+  CHECKBOX.signal_toggled().connect(sigc::bind(sigc::mem_fun(*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::mem_fun(*this, &PlotTest::timer_callback),
  10,Glib::PRIORITY_DEFAULT_IDLE);
 #endif
 }
diff -u -r --exclude=.deps --exclude=.libs plotmm-0.1.2/plotmm/curve.h plotmm-0.1.2.good/plotmm/curve.h
--- plotmm-0.1.2/plotmm/curve.h2005-11-09 17:47:21.000000000 +0100
+++ plotmm-0.1.2.good/plotmm/curve.h2008-04-06 11:04:36.000000000 +0200
@@ -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 -u -r --exclude=.deps --exclude=.libs plotmm-0.1.2/plotmm/plot.cc plotmm-0.1.2.good/plotmm/plot.cc
--- plotmm-0.1.2/plotmm/plot.cc2005-11-09 17:59:48.000000000 +0100
+++ plotmm-0.1.2.good/plotmm/plot.cc2008-04-06 11:04:36.000000000 +0200
@@ -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::mem_fun(*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 -u -r --exclude=.deps --exclude=.libs plotmm-0.1.2/plotmm/plot.h plotmm-0.1.2.good/plotmm/plot.h
--- plotmm-0.1.2/plotmm/plot.h2004-03-09 10:51:55.000000000 +0100
+++ plotmm
@@ -79,9 +79,9 @@
 virtual void clear();
 virtual void end_replot();
 
-SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
-SigC::Signal3<void,i
-SigC::Signal3<void,int,int,GdkEventMotion*> sign
+sigc::signal3<void,int,int,GdkEventButton*> sign
+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_mo
 
 void set_selection(const Rectangle &r);
 Rectangle get_selection() { return 
diff -u -r --exclude=.deps --exclude=.li
--- pl
+++ plotmm-0.1.2.good/plotmm/scale.h2008-04-06
@@ -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();