avoid setting initial position if it was not specified, broken in r70734

[wxWidgets.git] / src / osx / carbon / overlay.cpp

diff --git a/src/osx/carbon/overlay.cpp b/src/osx/carbon/overlay.cpp
index 3ae300276a61320deb9512f375785042212fdd86..9273fa81dc4feaa9b620445c71c92540686a0327 100644 (file)
--- a/src/osx/carbon/overlay.cpp
+++ b/src/osx/carbon/overlay.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/mac/carbon/overlay.cpp
+// Name:        src/osx/carbon/overlay.cpp
 // Purpose:     common wxOverlay code
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-10-20
-// RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -60,15 +59,13 @@ void wxOverlayImpl::MacGetBounds( Rect *bounds )
     int x, y;
     x=y=0;
     m_window->MacWindowToRootWindow( &x , &y ) ;
-    WindowRef window = (WindowRef) m_window->MacGetTopLevelWindowRef() ;
+    wxNonOwnedWindow* tlw = m_window->MacGetTopLevelWindow();
+    tlw->GetNonOwnedPeer()->WindowToScreen( &x, &y );
 
-    Point localwhere = { y, x };
-    wxMacLocalToGlobal( window, &localwhere ) ;
-
-    bounds->top = localwhere.v+m_y;
-    bounds->left = localwhere.h+m_x;
-    bounds->bottom = localwhere.v+m_y+m_height;
-    bounds->right = localwhere.h+m_x+m_width;
+    bounds->top = y+m_y;
+    bounds->left = x+m_x;
+    bounds->bottom = y+m_y+m_height;
+    bounds->right = x+m_x+m_width;
 }
 
 OSStatus wxOverlayImpl::CreateOverlayWindow()