diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2005-09-25 20:33:00 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2005-09-25 20:33:00 +0000 |
| commit | e493b2b7c4fbbbfc457f02babf9546289b430177 (patch) | |
| tree | 598b5fa6dc9340c96961e3131cc994480d80ff6a /gtk2_ardour/editor_markers.cc | |
| parent | f872433e8e81ba5a3a9ebffa32c6ddd9e3358f07 (diff) | |
Fly my pretties!
git-svn-id: svn://localhost/trunk/ardour2@28 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 54612000d1..d32ccadadb 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -23,7 +23,7 @@ #include <cmath> #include <gtk-canvas.h> -#include <gtkmmext/gtk_ui.h> +#include <gtkmm2ext/gtk_ui.h> #include <ardour/location.h> @@ -36,7 +36,7 @@ #include "i18n.h" using namespace std; -using namespace SigC; +using namespace sigc; using namespace ARDOUR; using namespace Gtk; @@ -739,8 +739,8 @@ Editor::marker_menu_rename () } dialog.set_name ("MarkRenameWindow"); - dialog.set_usize (300, -1); - dialog.set_position (GTK_WIN_POS_MOUSE); + dialog.set_size_request (300, -1); + dialog.set_position (Gtk::WIN_POS_MOUSE); dialog.set_modal (true); dialog.get_vbox()->set_border_width (10); @@ -754,8 +754,8 @@ Editor::marker_menu_rename () cancel_button.set_name ("EditorGTKButton"); entry.activate.connect (bind (slot (*this, &Editor::finish_sub_event_loop), 1)); - cancel_button.clicked.connect (bind (slot (*this, &Editor::finish_sub_event_loop), -1)); - ok_button.clicked.connect (bind (slot (*this, &Editor::finish_sub_event_loop), 1)); + cancel_button.signal_clicked().connect (bind (slot (*this, &Editor::finish_sub_event_loop), -1)); + ok_button.signal_clicked().connect (bind (slot (*this, &Editor::finish_sub_event_loop), 1)); dialog.delete_event.connect (bind (slot (*this, &Editor::finish_sub_event_loop_on_delete), -1)); dialog.show_all (); |