projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
convert property_foo().set_value(bar) to property_foo() = bar
[ardour.git]
/
gtk2_ardour
/
meter_bridge.cc
diff --git
a/gtk2_ardour/meter_bridge.cc
b/gtk2_ardour/meter_bridge.cc
index f71796cae2dbfe60d8a4a2a7cfdea2656d03ded6..6b83a343226e88d944542a71f07a253bce918fae 100644
(file)
--- a/
gtk2_ardour/meter_bridge.cc
+++ b/
gtk2_ardour/meter_bridge.cc
@@
-39,7
+39,10
@@
using namespace sigc;
#define FRAME_NAME "BaseFrame"
MeterBridge::MeterBridge ()
#define FRAME_NAME "BaseFrame"
MeterBridge::MeterBridge ()
- : ArdourDialog ("meter bridge")
+ : ArdourDialog ("meter bridge"),
+ hadjustment (0.0, 0.0, 0.0),
+ vadjustment (0.0, 0.0, 0.0),
+ meter_viewport (hadjustment, vadjustment)
{
meter_base.set_name ("MeterBase");
meter_frame.set_shadow_type (FRAME_SHADOW_STYLE);
{
meter_base.set_name ("MeterBase");
meter_frame.set_shadow_type (FRAME_SHADOW_STYLE);
@@
-61,7
+64,7
@@
MeterBridge::MeterBridge ()
meter_scroll_base.add (metering_hbox);
meter_viewport.add (meter_scroll_base);
meter_scroll_base.add (metering_hbox);
meter_viewport.add (meter_scroll_base);
- meter_viewport.set_shadow_type (G
TK_
SHADOW_NONE);
+ meter_viewport.set_shadow_type (G
tk::
SHADOW_NONE);
meter_scroller.add (meter_viewport);
meter_scroller.set_name ("MeterBridgeWindow");
meter_scroller.add (meter_viewport);
meter_scroller.set_name ("MeterBridgeWindow");
@@
-75,7
+78,7
@@
MeterBridge::MeterBridge ()
set_wmclass (_("ardour_meter_bridge"), "Ardour");
// set_policy (false, false, false); // no user resizing of any kind
set_wmclass (_("ardour_meter_bridge"), "Ardour");
// set_policy (false, false, false); // no user resizing of any kind
-
delete_event.connect (bind (
ptr_fun (just_hide_it), static_cast<Gtk::Window*>(this)));
+
signal_delete_event().connect (bind (sigc::
ptr_fun (just_hide_it), static_cast<Gtk::Window*>(this)));
metering = false;
metering = false;
@@
-240,17
+243,17
@@
MeterBridge::toggle_metering ()
}
}
}
}
-gint
-MeterBridge::on_map (
GdkEventAny *ev
)
+void
+MeterBridge::on_map ()
{
start_metering ();
{
start_metering ();
- return Window::on_map (
ev
);
+ return Window::on_map ();
}
}
-gint
-MeterBridge::on_unmap (
GdkEventAny *ev
)
+void
+MeterBridge::on_unmap ()
{
stop_metering ();
{
stop_metering ();
- return Window::on_unmap (
ev
);
+ return Window::on_unmap ();
}
}