fix for using wxDataObjectComposite with the clipboard

[wxWidgets.git] / src / mac / carbon / window.cpp

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 11948e733da9c79850b7d48c53f217748e5cd842..b3100bf14edf9532202c841a52add590935d36d8 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -349,7 +349,7 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const
  
     xx = m_x ;
     yy = m_y ;
  
     xx = m_x ;
     yy = m_y ;

-    if (GetParent())
+    if (!m_macWindowData && GetParent())

     {
         wxPoint pt(GetParent()->GetClientAreaOrigin());
         xx -= pt.x;
     {
         wxPoint pt(GetParent()->GetClientAreaOrigin());
         xx -= pt.x;


@@ -670,6 +670,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     // get the current size and position...
     int currentX, currentY;
     GetPosition(&currentX, &currentY);
     // get the current size and position...
     int currentX, currentY;
     GetPosition(&currentX, &currentY);

+    

     int currentW,currentH;
     GetSize(&currentW, &currentH);
 
     int currentW,currentH;
     GetSize(&currentW, &currentH);