projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed gtkmm.h usage.
[ardour.git]
/
gtk2_ardour
/
panner2d.cc
diff --git
a/gtk2_ardour/panner2d.cc
b/gtk2_ardour/panner2d.cc
index 0c04337b871f1da827dd33df6cfecf86af321d51..74da97cdec6942b1e0df7b4daf1792fb953ce108 100644
(file)
--- a/
gtk2_ardour/panner2d.cc
+++ b/
gtk2_ardour/panner2d.cc
@@
-124,12
+124,12
@@
Panner2d::reset (uint32_t n_inputs)
}
void
}
void
-Panner2d::
size_allocate_impl (GtkAllocation *
alloc)
+Panner2d::
on_size_allocate (Gtk::Allocation
alloc)
{
{
- width = alloc
->width
;
- height = alloc
->height
;
+ width = alloc
.get_width()
;
+ height = alloc
.get_height()
;
- DrawingArea::
size_allocate_impl
(alloc);
+ DrawingArea::
on_size_allocate
(alloc);
}
int
}
int
@@
-352,8
+352,8
@@
Panner2d::find_closest_object (gdouble x, gdouble y, int& which, bool& is_puck)
return closest;
}
return closest;
}
-gint
-Panner2d::
motion_notify_event_impl
(GdkEventMotion *ev)
+bool
+Panner2d::
on_motion_notify_event
(GdkEventMotion *ev)
{
gint x, y;
GdkModifierType state;
{
gint x, y;
GdkModifierType state;
@@
-419,15
+419,15
@@
Panner2d::handle_motion (gint evx, gint evy, GdkModifierType state)
return TRUE;
}
return TRUE;
}
-gint
-Panner2d::
expose_event_impl
(GdkEventExpose *event)
+bool
+Panner2d::
on_expose_event
(GdkEventExpose *event)
{
gint x, y;
float fx, fy;
/* redraw the background */
{
gint x, y;
float fx, fy;
/* redraw the background */
- get_window()
.
draw_rectangle (get_style()->get_bg_gc(get_state()),
+ get_window()
->
draw_rectangle (get_style()->get_bg_gc(get_state()),
true,
event->area.x, event->area.y,
event->area.width, event->area.height);
true,
event->area.x, event->area.y,
event->area.width, event->area.height);
@@
-450,7
+450,7
@@
Panner2d::expose_event_impl (GdkEventExpose *event)
fy = max (fy, -1.0f);
y = (gint) floor (height * fy - 4);
fy = max (fy, -1.0f);
y = (gint) floor (height * fy - 4);
- get_window()
.
draw_arc (get_style()->get_fg_gc(Gtk::STATE_NORMAL),
+ get_window()
->
draw_arc (get_style()->get_fg_gc(Gtk::STATE_NORMAL),
true,
x, y,
8, 8,
true,
x, y,
8, 8,
@@
-480,7
+480,7
@@
Panner2d::expose_event_impl (GdkEventExpose *event)
fy = max (fy, -1.0f);
y = (gint) floor ((height - 8) * fy);
fy = max (fy, -1.0f);
y = (gint) floor ((height - 8) * fy);
- get_window()
.draw_rectangle (get_style()->get_fg_gc(GTK_
STATE_ACTIVE),
+ get_window()
->draw_rectangle (get_style()->get_fg_gc(Gtk::
STATE_ACTIVE),
true,
x, y,
4, 4);
true,
x, y,
4, 4);
@@
-491,8
+491,8
@@
Panner2d::expose_event_impl (GdkEventExpose *event)
return TRUE;
}
return TRUE;
}
-gint
-Panner2d::
button_press_event_impl
(GdkEventButton *ev)
+bool
+Panner2d::
on_button_press_event
(GdkEventButton *ev)
{
switch (ev->button) {
case 1:
{
switch (ev->button) {
case 1:
@@
-514,8
+514,8
@@
Panner2d::button_press_event_impl (GdkEventButton *ev)
return FALSE;
}
return FALSE;
}
-gint
-Panner2d::
button_release_event_impl
(GdkEventButton *ev)
+bool
+Panner2d::
on_button_release_event
(GdkEventButton *ev)
{
switch (ev->button) {
case 1:
{
switch (ev->button) {
case 1:
@@
-579,8
+579,8
@@
Panner2d::show_context_menu ()
MenuList& items = context_menu->items();
items.push_back (CheckMenuElem (_("Bypass")));
MenuList& items = context_menu->items();
items.push_back (CheckMenuElem (_("Bypass")));
- bypass_menu_item = static_cast<CheckMenuItem*> (items.back());
- bypass_menu_item->
toggled
.connect (mem_fun(*this, &Panner2d::toggle_bypass));
+ bypass_menu_item = static_cast<CheckMenuItem*> (
&
items.back());
+ bypass_menu_item->
signal_toggled()
.connect (mem_fun(*this, &Panner2d::toggle_bypass));
}
}