avoid negative widths, moved deeper down

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index f5de5375af95ce96e55faa94f7c98834d98a2a8d..e4681d15d342f39af56a29d30d5592202fe5d233 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1180,8 +1180,8 @@ bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
     x = (int)pos.x;
     y = (int)pos.y;
     // todo the default calls may be used as soon as PostCreateControl Is moved here
     x = (int)pos.x;
     y = (int)pos.y;
     // todo the default calls may be used as soon as PostCreateControl Is moved here

-    w = size.x ; // WidthDefault( size.x );
-    h = size.y ; // HeightDefault( size.y ) ;
+    w = wxMax(size.x,0) ; // WidthDefault( size.x );
+    h = wxMax(size.y,0) ; // HeightDefault( size.y ) ;

 #if !TARGET_API_MAC_OSX
     GetParent()->MacWindowToRootWindow( &x , &y ) ;
 #endif
 #if !TARGET_API_MAC_OSX
     GetParent()->MacWindowToRootWindow( &x , &y ) ;
 #endif


@@ -1769,8 +1769,8 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
         former_y += pt.y ;
     }
 
         former_y += pt.y ;
     }
 

-    int actualWidth = wxMax( width , 0 ) ;
-    int actualHeight = wxMax( height , 0 ) ;
+    int actualWidth = width ;
+    int actualHeight = height ;

     int actualX = x;
     int actualY = y;
 
     int actualX = x;
     int actualY = y;