avoid negative widths, moved deeper down
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
c0624ca254
commit
29ee02dfe1
@ -1180,8 +1180,8 @@ bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
|
|||||||
x = (int)pos.x;
|
x = (int)pos.x;
|
||||||
y = (int)pos.y;
|
y = (int)pos.y;
|
||||||
// todo the default calls may be used as soon as PostCreateControl Is moved here
|
// todo the default calls may be used as soon as PostCreateControl Is moved here
|
||||||
w = size.x ; // WidthDefault( size.x );
|
w = wxMax(size.x,0) ; // WidthDefault( size.x );
|
||||||
h = size.y ; // HeightDefault( size.y ) ;
|
h = wxMax(size.y,0) ; // HeightDefault( size.y ) ;
|
||||||
#if !TARGET_API_MAC_OSX
|
#if !TARGET_API_MAC_OSX
|
||||||
GetParent()->MacWindowToRootWindow( &x , &y ) ;
|
GetParent()->MacWindowToRootWindow( &x , &y ) ;
|
||||||
#endif
|
#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 actualWidth = width ;
|
||||||
int actualHeight = wxMax( height , 0 ) ;
|
int actualHeight = height ;
|
||||||
int actualX = x;
|
int actualX = x;
|
||||||
int actualY = y;
|
int actualY = y;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user