Correct wxTimer bug in wxGTK.

Correct SetSize bug for certain Toplevel windows in wxMAC.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/window.cpp

@@ -349,7 +349,7 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const
  
     xx = m_x ;
     yy = m_y ;
-    if (GetParent())
+    if (!m_macWindowData && GetParent())
     {
         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);
+    
     int currentW,currentH;
     GetSize(&currentW, &currentH);