plotmm/gtkm24-fixes.patch

   1 diff -Naur ../plotmmNew/plotmm/curve.h plotmm-0.1.2/plotmm/curve.h
   2 --- ../plotmmNew/plotmm/curve.h 2007-11-22 17:20:25.000000000 +0100
   3 +++ plotmm-0.1.2/plotmm/curve.h 2005-11-09 17:47:21.000000000 +0100
   4 @@ -140,11 +140,7 @@
   5                           int from = 0, int to = -1);
   6
   7         //! Signals that this curve has changed in some way or the other
   8 -       #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 4)
   9 -       sigc::signal0<void> signal_curve_changed;
  10 -       #else
  11         SigC::Signal0<void> signal_curve_changed;
  12 -       #endif
  13
  14      protected:
  15         virtual void init(const Glib::ustring &title);
  16 diff -Naur ../plotmmNew/plotmm/plot.cc plotmm-0.1.2/plotmm/plot.cc
  17 --- ../plotmmNew/plotmm/plot.cc 2007-11-22 17:20:25.000000000 +0100
  18 +++ plotmm-0.1.2/plotmm/plot.cc 2005-11-09 17:59:48.000000000 +0100
  19 @@ -406,31 +406,19 @@
  20  }
  21
  22  //! Return the signal owned by plot canvas
  23 -#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 4)
  24 -sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
  25 -#else
  26  SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
  27 -#endif
  28  {
  29      return canvas_.signal_plot_mouse_press;
  30  }
  31
  32  //! Return the signal owned by plot canvas
  33 -#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 4)
  34 -sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
  35 -#else
  36  SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
  37 -#endif
  38  {
  39      return canvas_.signal_plot_mouse_release;
  40  }
  41
  42  //! Return the signal owned by plot canvas
  43 -#if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 4)
  44 -sigc::signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
  45 -#else
  46  SigC::Signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
  47 -#endif
  48  {
  49      return canvas_.signal_plot_mouse_move;
  50  }
  51 diff -Naur ../plotmmNew/plotmm/plot.h plotmm-0.1.2/plotmm/plot.h
  52 --- ../plotmmNew/plotmm/plot.h  2007-11-22 17:20:25.000000000 +0100
  53 +++ plotmm-0.1.2/plotmm/plot.h  2004-03-09 10:51:55.000000000 +0100
  54 @@ -78,16 +78,10 @@
  55         virtual bool begin_replot();
  56         virtual void clear();
  57         virtual void end_replot();
  58 -
  59 -       #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 4)
  60 -       sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
  61 -       sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
  62 -       sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
  63 -       #else
  64 +
  65         SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
  66         SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
  67         SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
  68 -       #endif
  69
  70      protected:
  71         virtual bool on_expose_event(GdkEventExpose* event);
  72 @@ -146,17 +140,11 @@
  73         PlotLabel *title() { return &title_; }
  74         Scale *scale(PlotAxisID id) { return tickMark_[id]; }
  75         PlotLabel *label(PlotAxisID id) { return axisLabel_[id]; }
  76 -
  77 -       #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 4)
  78 -       sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
  79 -       sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
  80 -       sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
  81 -       #else
  82 +
  83         SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
  84         SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
  85         SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
  86 -       #endif
  87 -
  88 +
  89         void set_selection(const Rectangle &r);
  90         Rectangle get_selection() { return select_; }
  91         void enable_selection();
  92 diff -Naur ../plotmmNew/plotmm/scale.h plotmm-0.1.2/plotmm/scale.h
  93 --- ../plotmmNew/plotmm/scale.h 2007-11-22 17:20:25.000000000 +0100
  94 +++ plotmm-0.1.2/plotmm/scale.h 2004-03-05 16:25:43.000000000 +0100
  95 @@ -133,11 +133,7 @@
  96         /*! This signal is thrown whenever the scale is enabled or disabled
  97          *  \sa set_enabled, enabled
  98          */
  99 -       #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION >= 4)
 100 -       sigc::signal1<void,bool> signal_enabled;
 101 -       #else
 102         SigC::Signal1<void,bool> signal_enabled;
 103 -       #endif
 104
 105      protected:
 106         virtual void on_realize();