X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fc641aff97d5f100b94cabb0288d3c4261e5328..c576a25a1959041d9682f825bf9cdf0baf0d8d56:/src/mac/carbon/utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 8db3bdc87f..042fc6832c 100644
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -220,7 +220,7 @@ int wxDisplayDepth()
 
     return theDepth;
 #else
-    return 32; // TODO 
+    return 32; // TODO
 #endif
 }
 
@@ -266,7 +266,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
         *height = bounds.size.height;
 #else
     int w, h;
-    wxDisplaySize(&w,&h); 
+    wxDisplaySize(&w,&h);
     if ( x )
         *x = 0;
     if ( y )
@@ -469,7 +469,7 @@ OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType in
 
 IMPLEMENT_DYNAMIC_CLASS( wxMacControl , wxObject )
 
-wxMacControl::wxMacControl() 
+wxMacControl::wxMacControl()
 {
     Init();
 }
@@ -643,7 +643,29 @@ void wxMacControl::SuperChangedPosition()
 void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle )
 {
     m_font = font;
-#ifndef __LP64__
+#if wxMAC_USE_CORE_TEXT
+    if ( UMAGetSystemVersion() >= 0x1050 )
+    {
+        HIViewPartCode part = 0;
+        HIThemeTextHorizontalFlush flush = kHIThemeTextHorizontalFlushDefault;
+        if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
+            flush = kHIThemeTextHorizontalFlushCenter;
+        else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
+            flush = kHIThemeTextHorizontalFlushRight;
+        HIViewSetTextFont( m_controlRef , part , (CTFontRef) font.MacGetCTFont() );
+        HIViewSetTextHorizontalFlush( m_controlRef, part, flush );
+
+        if ( foreground != *wxBLACK )
+        {
+            ControlFontStyleRec fontStyle;
+            foreground.GetRGBColor( &fontStyle.foreColor );
+            fontStyle.flags = kControlUseForeColorMask;
+            ::SetControlFontStyle( m_controlRef , &fontStyle );
+        }
+
+    }
+#endif
+#if wxMAC_USE_ATSU_TEXT
     ControlFontStyleRec fontStyle;
     if ( font.MacGetThemeFontID() != kThemeCurrentPortFont )
     {
@@ -699,8 +721,7 @@ void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , l
 
 void wxMacControl::SetBackgroundColour( const wxColour &WXUNUSED(col) )
 {
-    // TODO
-    // setting up a color proc is not recommended anymore
+//    HITextViewSetBackgroundColor( m_textView , color );
 }
 
 void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum )
@@ -823,7 +844,18 @@ void wxMacControl::GetRect( Rect *r )
 
 void wxMacControl::GetRectInWindowCoords( Rect *r )
 {
-    UMAGetControlBoundsInWindowCoords( m_controlRef , r );
+    GetControlBounds( m_controlRef , r ) ;
+
+    WindowRef tlwref = GetControlOwner( m_controlRef ) ;
+
+    wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
+    if ( tlwwx != NULL )
+    {
+        ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
+        HIPoint hiPoint = CGPointMake( 0 , 0 ) ;
+        HIViewConvertPoint( &hiPoint , HIViewGetSuperview(m_controlRef) , rootControl ) ;
+        OffsetRect( r , (short) hiPoint.x , (short) hiPoint.y ) ;
+    }
 }
 
 void wxMacControl::GetBestRect( Rect *r )
@@ -1867,9 +1899,18 @@ void wxMacDataItemBrowserControl::MacScrollTo( unsigned int n )
     GetScrollPosition( &top , &left ) ;
     wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );
 
+    // there is a bug in RevealItem that leads to situations
+    // in large lists, where the item does not get scrolled
+    // into sight, so we do a pre-scroll if necessary
     UInt16 height ;
     GetRowHeight( (DataBrowserItemID) item , &height ) ;
-    SetScrollPosition( n * ((UInt32)height) , left ) ;
+    UInt32 linetop = n * ((UInt32) height );
+    UInt32 linebottom = linetop + height;
+    Rect rect ;
+    GetRect( &rect );
+
+    if ( linetop < top || linebottom > (top + rect.bottom - rect.top ) )
+        SetScrollPosition( wxMax( n-2, 0 ) * ((UInt32)height) , left ) ;
 
     RevealItem( item , kDataBrowserRevealWithoutSelecting );
 }
@@ -1913,29 +1954,21 @@ CGColorSpaceRef wxMacGetGenericRGBColorSpace()
     return genericRGBColorSpace;
 }
 
-CGColorRef wxMacCreateCGColorFromHITheme( ThemeBrush brush ) 
+CGColorRef wxMacCreateCGColorFromHITheme( ThemeBrush brush )
 {
     CGColorRef color ;
     HIThemeBrushCreateCGColor( brush, &color );
     return color;
 }
 
-#ifndef __LP64__
+#if wxMAC_USE_QUICKDRAW
 
-wxMacPortSaver::wxMacPortSaver( GrafPtr port )
+static inline void PointFromHIPoint(const HIPoint& p, Point *pt)
 {
-    ::GetPort( &m_port );
-    ::SetPort( port );
+    pt->h = wx_static_cast(short, p.x);
+    pt->v = wx_static_cast(short, p.y);
 }
 
-wxMacPortSaver::~wxMacPortSaver()
-{
-    ::SetPort( m_port );
-}
-#endif
-
-#if wxMAC_USE_QUICKDRAW
-
 void wxMacGlobalToLocal( WindowRef window , Point*pt )
 {
     HIPoint p = CGPointMake( pt->h, pt->v );
@@ -1943,8 +1976,7 @@ void wxMacGlobalToLocal( WindowRef window , Point*pt )
     // TODO check toolbar offset
     HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ;
     HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceView, contentView );
-    pt->h = p.x;
-    pt->v = p.y;
+    PointFromHIPoint(p, pt);
 }
 
 void wxMacLocalToGlobal( WindowRef window , Point*pt )
@@ -1954,10 +1986,10 @@ void wxMacLocalToGlobal( WindowRef window , Point*pt )
     // TODO check toolbar offset
     HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ;
     HIPointConvert( &p, kHICoordSpaceView, contentView, kHICoordSpace72DPIGlobal, NULL );
-    pt->h = p.x;
-    pt->v = p.y;
+    PointFromHIPoint(p, pt);
 }
-#endif
+
+#endif // wxMAC_USE_QUICKDRAW
 
 #endif // wxUSE_GUI