fix some unused argument warnings

[ardour.git] / gtk2_ardour / au_pluginui.mm

diff --git a/gtk2_ardour/au_pluginui.mm b/gtk2_ardour/au_pluginui.mm
index 21e471fa186318359109820e261dbe125b827565..f394e305c89bf36507ae615e623b41993e096185 100644 (file)
--- a/gtk2_ardour/au_pluginui.mm
+++ b/gtk2_ardour/au_pluginui.mm
@@ -195,11 +195,13 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert)
 
 AUPluginUI::~AUPluginUI ()
 {
+        if (_notify) {
+                [[NSNotificationCenter defaultCenter] removeObserver:_notify];
+        }
+
        if (cocoa_parent) {
                NSWindow* win = get_nswindow();
-               [[NSNotificationCenter defaultCenter] removeObserver:_notify];
                [win removeChildWindow:cocoa_parent];
-
        } 
 
 #ifdef WITH_CARBON
@@ -540,7 +542,7 @@ AUPluginUI::parent_carbon_window ()
 {
 #ifdef WITH_CARBON
        NSWindow* win = get_nswindow ();
-       int x, y;
+       Rect windowStructureBoundsRect;
 
        if (!win) {
                return -1;
@@ -553,7 +555,11 @@ AUPluginUI::parent_carbon_window ()
                return -1;
        }
        
-       toplevel->get_window()->get_root_origin (x, y);
+       /* figure out where the cocoa parent window is in carbon-coordinate space, which
+          differs from both cocoa-coordinate space and GTK-coordinate space
+       */
+
+       GetWindowBounds((WindowRef) [win windowRef], kWindowStructureRgn, &windowStructureBoundsRect);
 
        /* compute how tall the title bar is, because we have to offset the position of the carbon window
           by that much.
@@ -566,7 +572,11 @@ AUPluginUI::parent_carbon_window ()
 
        int packing_extra = 6; // this is the total vertical packing in our top level window
 
-       MoveWindow (carbon_window, x, y + titlebar_height + top_box.get_height() + packing_extra, false);
+       /* move into position, based on parent window position */
+       MoveWindow (carbon_window, 
+                   windowStructureBoundsRect.left, 
+                   windowStructureBoundsRect.top + titlebar_height + top_box.get_height() + packing_extra, 
+                   false);
        ShowWindow (carbon_window);
 
        // create the cocoa window for the carbon one and make it visible