diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index be4535ea94..cc1caf7c10 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -1695,8 +1695,8 @@ void wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to hiPoint.x = pt->x ; hiPoint.y = pt->y ; HIViewConvertPoint( &hiPoint , from->m_controlRef , to->m_controlRef ) ; - pt->x = hiPoint.x ; - pt->y = hiPoint.y ; + pt->x = (int)hiPoint.x ; + pt->y = (int)hiPoint.y ; #endif } @@ -1723,7 +1723,6 @@ void wxMacControl::GetRectInWindowCoords( Rect *r ) void wxMacControl::GetBestRect( Rect *r ) { - Rect bestsize = { 0 , 0 , 0 , 0 } ; short baselineoffset ; GetBestControlRect( m_controlRef , r , &baselineoffset ) ; } diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index e13bc1ca5e..a6bb697f8f 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -2125,9 +2125,6 @@ void wxWindowMac::MacPaintBorders( int left , int top ) int major,minor; wxGetOsVersion( &major, &minor ); - RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ; - RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ; - RGBColor darkShadow = { 0x0000, 0x0000 , 0x0000 } ; RGBColor lightShadow = { 0x4444, 0x4444 , 0x4444 } ; // OS X has lighter border edges than classic: @@ -2154,6 +2151,9 @@ void wxWindowMac::MacPaintBorders( int left , int top ) InsetRect( &rect , border , border ); DrawThemeEditTextFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; #else + RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ; + RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ; + bool sunken = HasFlag( wxSUNKEN_BORDER ) ; RGBForeColor( &face ); MoveTo( left + 0 , top + h - 2 );