2333
|
1 This file is part of MXE. |
2353
|
2 See index.html for further information. |
1239
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
3 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
4 Contains ad hoc patches for cross building. |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
5 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
6 From cd2b1b4a0ae81dddd3fa70c06528a7024ada7a5f Mon Sep 17 00:00:00 2001 |
2333
|
7 From: MXE |
1239
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
8 Date: Fri, 1 Oct 2010 12:54:06 +0200 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
9 Subject: [PATCH] SigC changed to sigc |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
10 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
11 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
12 diff --git a/plotmm/curve.h b/plotmm/curve.h |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
13 index 8d22e19..05065fc 100644 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
14 --- a/plotmm/curve.h |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
15 +++ b/plotmm/curve.h |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
16 @@ -140,7 +140,7 @@ namespace PlotMM { |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
17 int from = 0, int to = -1); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
18 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
19 //! Signals that this curve has changed in some way or the other |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
20 - SigC::Signal0<void> signal_curve_changed; |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
21 + sigc::signal0<void> signal_curve_changed; |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
22 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
23 protected: |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
24 virtual void init(const Glib::ustring &title); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
25 diff --git a/plotmm/plot.cc b/plotmm/plot.cc |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
26 index 90aa5f8..6696171 100644 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
27 --- a/plotmm/plot.cc |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
28 +++ b/plotmm/plot.cc |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
29 @@ -322,7 +322,7 @@ Plot::Plot() : |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
30 connect(sigc::mem_fun(*this,&Plot::on_canvas_expose_event)); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
31 #else |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
32 canvas_.signal_expose_event(). |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
33 - connect(SigC::slot(*this,&Plot::on_canvas_expose_event)); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
34 + connect(sigc::slot(*this,&Plot::on_canvas_expose_event)); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
35 #endif |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
36 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
37 show_all(); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
38 @@ -406,19 +406,19 @@ void Plot::replot() |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
39 } |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
40 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
41 //! Return the signal owned by plot canvas |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
42 -SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press() |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
43 +sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press() |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
44 { |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
45 return canvas_.signal_plot_mouse_press; |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
46 } |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
47 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
48 //! Return the signal owned by plot canvas |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
49 -SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release() |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
50 +sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release() |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
51 { |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
52 return canvas_.signal_plot_mouse_release; |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
53 } |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
54 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
55 //! Return the signal owned by plot canvas |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
56 -SigC::Signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move() |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
57 +sigc::signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move() |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
58 { |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
59 return canvas_.signal_plot_mouse_move; |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
60 } |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
61 diff --git a/plotmm/plot.h b/plotmm/plot.h |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
62 index 79533a8..f522b40 100644 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
63 --- a/plotmm/plot.h |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
64 +++ b/plotmm/plot.h |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
65 @@ -79,9 +79,9 @@ namespace PlotMM |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
66 virtual void clear(); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
67 virtual void end_replot(); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
68 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
69 - SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press; |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
70 - SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release; |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
71 - SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move; |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
72 + sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press; |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
73 + sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release; |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
74 + sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move; |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
75 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
76 protected: |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
77 virtual bool on_expose_event(GdkEventExpose* event); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
78 @@ -141,9 +141,9 @@ namespace PlotMM |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
79 Scale *scale(PlotAxisID id) { return tickMark_[id]; } |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
80 PlotLabel *label(PlotAxisID id) { return axisLabel_[id]; } |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
81 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
82 - SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press(); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
83 - SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release(); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
84 - SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move(); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
85 + sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press(); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
86 + sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release(); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
87 + sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move(); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
88 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
89 void set_selection(const Rectangle &r); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
90 Rectangle get_selection() { return select_; } |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
91 diff --git a/plotmm/scale.h b/plotmm/scale.h |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
92 index 333f456..cf8e355 100644 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
93 --- a/plotmm/scale.h |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
94 +++ b/plotmm/scale.h |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
95 @@ -133,7 +133,7 @@ namespace PlotMM |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
96 /*! This signal is thrown whenever the scale is enabled or disabled |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
97 * \sa set_enabled, enabled |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
98 */ |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
99 - SigC::Signal1<void,bool> signal_enabled; |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
100 + sigc::signal1<void,bool> signal_enabled; |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
101 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
102 protected: |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
103 virtual void on_realize(); |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
104 -- |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
105 1.7.1 |
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
106 |