From bc89fe0147c04b67141936d109c00dfd4d69cc4b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 12 Dec 2008 14:43:24 +0000 Subject: most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/au_pluginui.mm | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) (limited to 'gtk2_ardour/au_pluginui.mm') diff --git a/gtk2_ardour/au_pluginui.mm b/gtk2_ardour/au_pluginui.mm index 977e5762a7..a46021f66f 100644 --- a/gtk2_ardour/au_pluginui.mm +++ b/gtk2_ardour/au_pluginui.mm @@ -1,3 +1,6 @@ +#undef Marker +#define Marker FuckYouAppleAndYourLackOfNameSpaces + #include #include #include @@ -18,6 +21,11 @@ #import #import +#undef Marker + +#include "keyboard.h" +#include "utils.h" +#include "public_editor.h" #include "i18n.h" using namespace ARDOUR; @@ -57,15 +65,27 @@ AUPluginUI::AUPluginUI (boost::shared_ptr insert) /* stuff some stuff into the top of the window */ + HBox* smaller_hbox = manage (new HBox); + + smaller_hbox->pack_start (preset_label, false, false, 10); + smaller_hbox->pack_start (preset_combo, false, false); + smaller_hbox->pack_start (save_button, false, false); + smaller_hbox->pack_start (automation_mode_label, false, false); + smaller_hbox->pack_start (automation_mode_selector, false, false); + smaller_hbox->pack_start (bypass_button, false, true); + + VBox* v1_box = manage (new VBox); + VBox* v2_box = manage (new VBox); + + v1_box->pack_start (*smaller_hbox, false, true); + v2_box->pack_start (focus_button, false, true); + + top_box.set_homogeneous (false); top_box.set_spacing (6); top_box.set_border_width (6); - top_box.pack_end (bypass_button, false, true); - top_box.pack_end (automation_mode_selector, false, false); - top_box.pack_end (automation_mode_label, false, false); - top_box.pack_end (save_button, false, false); - top_box.pack_end (preset_combo, false, false); - top_box.pack_end (preset_label, false, false); + top_box.pack_end (*v2_box, false, false); + top_box.pack_end (*v1_box, false, false); set_spacing (6); pack_start (top_box, false, false); @@ -617,14 +637,16 @@ create_au_gui (boost::shared_ptr plugin_insert, VBox** box) bool AUPluginUI::on_focus_in_event (GdkEventFocus* ev) { - cerr << "au plugin focus in\n"; + //cerr << "au plugin focus in\n"; + //Keyboard::magic_widget_grab_focus (); return false; } bool AUPluginUI::on_focus_out_event (GdkEventFocus* ev) { - cerr << "au plugin focus out\n"; + //cerr << "au plugin focus out\n"; + //Keyboard::magic_widget_drop_focus (); return false; } -- cgit v1.2.3