1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
diff -Nur stanford_wbc-stanford_wbc-1.1.orig/tutorials/tutsim.cpp stanford_wbc-stanford_wbc-1.1/tutorials/tutsim.cpp
--- stanford_wbc-stanford_wbc-1.1.orig/tutorials/tutsim.cpp 2011-04-30 02:20:22.000000000 +0200
+++ stanford_wbc-stanford_wbc-1.1/tutorials/tutsim.cpp 2014-09-21 22:57:31.278246771 +0200
@@ -87,9 +87,9 @@
};
- class Window : public Fl_Double_Window {
+ class WBCWindow : public Fl_Double_Window {
public:
- Window(int width, int height, const char * title);
+ WBCWindow(int width, int height, const char * title);
virtual void resize(int x, int y, int w, int h);
@@ -352,8 +352,8 @@
}
- Window::
- Window(int width, int height, const char * title)
+ WBCWindow::
+ WBCWindow(int width, int height, const char * title)
: Fl_Double_Window(width, height, title)
{
Fl::visual(FL_DOUBLE|FL_INDEX);
@@ -371,7 +371,7 @@
}
- void Window::
+ void WBCWindow::
resize(int x, int y, int w, int h)
{
Fl_Double_Window::resize(x, y, w, h);
@@ -382,14 +382,14 @@
}
- void Window::
+ void WBCWindow::
cb_toggle(Fl_Widget * widget, void * param)
{
++toggle_count;
}
- void Window::
+ void WBCWindow::
cb_pause(Fl_Widget * widget, void * param)
{
if (paused) {
@@ -401,10 +401,10 @@
}
- void Window::
+ void WBCWindow::
cb_quit(Fl_Widget * widget, void * param)
{
- reinterpret_cast<Window*>(param)->hide();
+ reinterpret_cast<WBCWindow*>(param)->hide();
}
}
@@ -541,6 +541,6 @@
state.init(ndof, ndof, ndof);
write_state_to_tree(*sim_tree);
- Window win(win_width, win_height, win_title);
+ WBCWindow win(win_width, win_height, win_title);
return Fl::run();
}
|