diff options
| author | Robin Gareus <robin@gareus.org> | 2014-04-18 01:54:59 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-04-18 01:54:59 +0200 |
| commit | 06b700abf28ba92c1356113536e174b3d64e5de5 (patch) | |
| tree | 8c1b0395630da9e1e82f96573df8c2f67fc76911 /gtk2_ardour | |
| parent | 2e63b84a103213e7368184a697b51f0151d465b3 (diff) | |
fix VST GUI swallowing for windows
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/plugin_ui.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/windows_vst_plugin_ui.cc | 16 | ||||
| -rw-r--r-- | gtk2_ardour/windows_vst_plugin_ui.h | 2 |
3 files changed, 8 insertions, 12 deletions
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index ac5f7fd9a6..190fd2ad96 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -227,7 +227,7 @@ PluginUIWindow::create_windows_vst_editor(boost::shared_ptr<PluginInsert>) << endmsg; throw failed_constructor (); } else { - WindowsVSTPluginUI* vpu = new WindowsVSTPluginUI (insert, vp); + WindowsVSTPluginUI* vpu = new WindowsVSTPluginUI (insert, vp, GTK_WIDGET(this->gobj())); _pluginui = vpu; _pluginui->KeyboardFocused.connect (sigc::mem_fun (*this, &PluginUIWindow::keyboard_focused)); diff --git a/gtk2_ardour/windows_vst_plugin_ui.cc b/gtk2_ardour/windows_vst_plugin_ui.cc index 1ce83f8992..45111f840d 100644 --- a/gtk2_ardour/windows_vst_plugin_ui.cc +++ b/gtk2_ardour/windows_vst_plugin_ui.cc @@ -38,22 +38,18 @@ using namespace Gtk; using namespace ARDOUR; using namespace PBD; -WindowsVSTPluginUI::WindowsVSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<VSTPlugin> vp) +WindowsVSTPluginUI::WindowsVSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<VSTPlugin> vp, GtkWidget *parent) : VSTPluginUI (pi, vp) { #ifdef GDK_WINDOWING_WIN32 - -#if 0 // TODO verify window vs vbox-widget WRT to plugin_analysis_expander - GtkWindow* wobj = GTK_WINDOW(gtk_widget_get_toplevel(this->gobj())); -#else - GtkVBox* wobj = this->gobj(); -#endif - - gtk_widget_realize(GTK_WIDGET(wobj)); - void* hWndHost = gdk_win32_drawable_get_handle(GTK_WIDGET(wobj)->window); + gtk_widget_realize(parent); + void* hWndHost = gdk_win32_drawable_get_handle(parent->window); fst_run_editor (_vst->state(), hWndHost); + // TODO pack a placeholder (compare to VSTPluginUI::VSTPluginUI X11 socket) + // have placeholder use VSTPluginUI::get_preferred_height(), width() + // TODO pack plugin_analysis_expander at the bottom. #else fst_run_editor (_vst->state(), NULL); pack_start (plugin_analysis_expander, true, true); diff --git a/gtk2_ardour/windows_vst_plugin_ui.h b/gtk2_ardour/windows_vst_plugin_ui.h index 7b23f2cb33..2fa0bbc705 100644 --- a/gtk2_ardour/windows_vst_plugin_ui.h +++ b/gtk2_ardour/windows_vst_plugin_ui.h @@ -22,7 +22,7 @@ class WindowsVSTPluginUI : public VSTPluginUI { public: - WindowsVSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::VSTPlugin>); + WindowsVSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::VSTPlugin>, GtkWidget *parent); ~WindowsVSTPluginUI (); bool start_updating (GdkEventAny*) { return false; } |