fixing string param

[wxWidgets.git] / src / mac / carbon / utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index b91247bfd521e441e1f8be6421f19533e313f241..7c8de25d0bb2a8de7cbb621a04878ed9eed7007b 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -220,7 +220,7 @@ int wxDisplayDepth()
 
     return theDepth;
 #else
 
     return theDepth;
 #else

-    return 32; // TODO 
+    return 32; // TODO

 #endif
 }
 
 #endif
 }
 


@@ -266,7 +266,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
         *height = bounds.size.height;
 #else
     int w, h;
         *height = bounds.size.height;
 #else
     int w, h;

-    wxDisplaySize(&w,&h); 
+    wxDisplaySize(&w,&h);

     if ( x )
         *x = 0;
     if ( y )
     if ( x )
         *x = 0;
     if ( y )


@@ -469,7 +469,7 @@ OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType in
 
 IMPLEMENT_DYNAMIC_CLASS( wxMacControl , wxObject )
 
 
 IMPLEMENT_DYNAMIC_CLASS( wxMacControl , wxObject )
 

-wxMacControl::wxMacControl() 
+wxMacControl::wxMacControl()

 {
     Init();
 }
 {
     Init();
 }


@@ -654,7 +654,7 @@ void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , l
             flush = kHIThemeTextHorizontalFlushRight;
         HIViewSetTextFont( m_controlRef , part , (CTFontRef) font.MacGetCTFont() );
         HIViewSetTextHorizontalFlush( m_controlRef, part, flush );
             flush = kHIThemeTextHorizontalFlushRight;
         HIViewSetTextFont( m_controlRef , part , (CTFontRef) font.MacGetCTFont() );
         HIViewSetTextHorizontalFlush( m_controlRef, part, flush );

-        
+

         if ( foreground != *wxBLACK )
         {
             ControlFontStyleRec fontStyle;
         if ( foreground != *wxBLACK )
         {
             ControlFontStyleRec fontStyle;


@@ -662,7 +662,7 @@ void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , l
             fontStyle.flags = kControlUseForeColorMask;
             ::SetControlFontStyle( m_controlRef , &fontStyle );
         }
             fontStyle.flags = kControlUseForeColorMask;
             ::SetControlFontStyle( m_controlRef , &fontStyle );
         }

-        
+

     }
 #endif
 #if wxMAC_USE_ATSU_TEXT
     }
 #endif
 #if wxMAC_USE_ATSU_TEXT


@@ -845,9 +845,9 @@ void wxMacControl::GetRect( Rect *r )
 void wxMacControl::GetRectInWindowCoords( Rect *r )
 {
     GetControlBounds( m_controlRef , r ) ;
 void wxMacControl::GetRectInWindowCoords( Rect *r )
 {
     GetControlBounds( m_controlRef , r ) ;

-    
+

     WindowRef tlwref = GetControlOwner( m_controlRef ) ;
     WindowRef tlwref = GetControlOwner( m_controlRef ) ;

-    
+

     wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
     if ( tlwwx != NULL )
     {
     wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
     if ( tlwwx != NULL )
     {


@@ -874,7 +874,7 @@ void wxMacControl::SetLabel( const wxString &title )
     else
         encoding = wxFont::GetDefaultEncoding();
 
     else
         encoding = wxFont::GetDefaultEncoding();
 

-    SetControlTitleWithCFString( m_controlRef , wxMacCFStringHolder( title , encoding ) );
+    SetControlTitleWithCFString( m_controlRef , wxCFStringRef( title , encoding ) );

 }
 
 void wxMacControl::GetFeatures( UInt32 * features )
 }
 
 void wxMacControl::GetFeatures( UInt32 * features )


@@ -1340,7 +1340,7 @@ void wxMacDataItem::SetColumn( short col )
 void wxMacDataItem::SetLabel( const wxString& str)
 {
     m_label = str;
 void wxMacDataItem::SetLabel( const wxString& str)
 {
     m_label = str;

-    m_cfLabel.Assign( str , wxLocale::GetSystemEncoding());
+    m_cfLabel = wxCFStringRef( str , wxLocale::GetSystemEncoding());

 }
 
 const wxString& wxMacDataItem::GetLabel() const
 }
 
 const wxString& wxMacDataItem::GetLabel() const


@@ -1601,8 +1601,7 @@ void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyTyp
         enc = m_font.GetEncoding();
     else
         enc = wxLocale::GetSystemEncoding();
         enc = m_font.GetEncoding();
     else
         enc = wxLocale::GetSystemEncoding();

-    wxMacCFStringHolder cfTitle;
-    cfTitle.Assign( title, enc );
+    wxCFStringRef cfTitle( title, enc );

     columnDesc.headerBtnDesc.titleString = cfTitle;
 
     columnDesc.headerBtnDesc.minimumWidth = 0;
     columnDesc.headerBtnDesc.titleString = cfTitle;
 
     columnDesc.headerBtnDesc.minimumWidth = 0;


@@ -1908,7 +1907,7 @@ void wxMacDataItemBrowserControl::MacScrollTo( unsigned int n )
     UInt32 linebottom = linetop + height;
     Rect rect ;
     GetRect( &rect );
     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 ) ;
 
     if ( linetop < top || linebottom > (top + rect.bottom - rect.top ) )
         SetScrollPosition( wxMax( n-2, 0 ) * ((UInt32)height) , left ) ;
 


@@ -1944,17 +1943,17 @@ OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable )
 
 CGColorSpaceRef wxMacGetGenericRGBColorSpace()
 {
 
 CGColorSpaceRef wxMacGetGenericRGBColorSpace()
 {

-    static wxMacCFRefHolder<CGColorSpaceRef> genericRGBColorSpace;
+    static wxCFRef<CGColorSpaceRef> genericRGBColorSpace;

 
     if (genericRGBColorSpace == NULL)
     {
 
     if (genericRGBColorSpace == NULL)
     {

-        genericRGBColorSpace.Set( CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ) );
+        genericRGBColorSpace.reset( CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ) );

     }
 
     return genericRGBColorSpace;
 }
 
     }
 
     return genericRGBColorSpace;
 }
 

-CGColorRef wxMacCreateCGColorFromHITheme( ThemeBrush brush ) 
+CGColorRef wxMacCreateCGColorFromHITheme( ThemeBrush brush )

 {
     CGColorRef color ;
     HIThemeBrushCreateCGColor( brush, &color );
 {
     CGColorRef color ;
     HIThemeBrushCreateCGColor( brush, &color );


@@ -1963,6 +1962,12 @@ CGColorRef wxMacCreateCGColorFromHITheme( ThemeBrush brush )
 
 #if wxMAC_USE_QUICKDRAW
 
 
 #if wxMAC_USE_QUICKDRAW
 

+static inline void PointFromHIPoint(const HIPoint& p, Point *pt)
+{
+    pt->h = wx_static_cast(short, p.x);
+    pt->v = wx_static_cast(short, p.y);
+}
+

 void wxMacGlobalToLocal( WindowRef window , Point*pt )
 {
     HIPoint p = CGPointMake( pt->h, pt->v );
 void wxMacGlobalToLocal( WindowRef window , Point*pt )
 {
     HIPoint p = CGPointMake( pt->h, pt->v );


@@ -1970,8 +1975,7 @@ void wxMacGlobalToLocal( WindowRef window , Point*pt )
     // TODO check toolbar offset
     HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ;
     HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceView, contentView );
     // 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 )
 }
 
 void wxMacLocalToGlobal( WindowRef window , Point*pt )


@@ -1981,10 +1985,10 @@ void wxMacLocalToGlobal( WindowRef window , Point*pt )
     // TODO check toolbar offset
     HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ;
     HIPointConvert( &p, kHICoordSpaceView, contentView, kHICoordSpace72DPIGlobal, NULL );
     // 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
 
 
 #endif // wxUSE_GUI