correct hhp2cached path

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 2ad859c32db6746caf6b007e5cf154efc54a1b6a..02f46c0bc5f69b170aa8b6e25a56d72e6556ee0f 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -37,9 +37,8 @@
 
 // #include "MoreFilesX.h"
 
 
 // #include "MoreFilesX.h"
 

-#ifndef __DARWIN__
-    #include <Threads.h>
-    #include <Sound.h>
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    #include <AudioToolbox/AudioServices.h>

 #endif
 
 #if wxUSE_GUI
 #endif
 
 #if wxUSE_GUI


@@ -87,8 +86,16 @@ extern bool WXDLLEXPORT wxIsDebuggerRunning()
 // Emit a beeeeeep
 void wxBell()
 {
 // Emit a beeeeeep
 void wxBell()
 {

-#ifndef __LP64__
-    SysBeep(30);
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    if ( AudioServicesPlayAlertSound )
+        AudioServicesPlayAlertSound(kUserPreferredAlert);
+    else
+#endif
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+        SysBeep(30);
+#else
+    {
+    }

 #endif
 }
 
 #endif
 }
 


@@ -126,6 +133,8 @@ void wxBeginBusyCursor(const wxCursor *cursor)
     {
         gMacStoredActiveCursor = gMacCurrentCursor;
         cursor->MacInstall();
     {
         gMacStoredActiveCursor = gMacCurrentCursor;
         cursor->MacInstall();

+
+        wxSetCursor(*cursor);

     }
     //else: nothing to do, already set
 }
     }
     //else: nothing to do, already set
 }


@@ -140,6 +149,8 @@ void wxEndBusyCursor()
     {
         gMacStoredActiveCursor.MacInstall();
         gMacStoredActiveCursor = wxNullCursor;
     {
         gMacStoredActiveCursor.MacInstall();
         gMacStoredActiveCursor = wxNullCursor;

+
+        wxSetCursor(wxNullCursor);

     }
 }
 
     }
 }
 


@@ -220,7 +231,7 @@ int wxDisplayDepth()
 
     return theDepth;
 #else
 
     return theDepth;
 #else

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

 #endif
 }
 
 #endif
 }
 


@@ -266,7 +277,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 )


@@ -299,14 +310,16 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 
 #if wxUSE_BASE
 
 
 #if wxUSE_BASE
 

+#include <sys/utsname.h>
+

 wxString wxGetOsDescription()
 {
 wxString wxGetOsDescription()
 {

-#ifdef WXWIN_OS_DESCRIPTION
-    // use configure generated description if available
-    return wxString(wxT("MacOS (")) + wxT(WXWIN_OS_DESCRIPTION) + wxString(wxT(")"));
-#else
-    return wxT("MacOS"); //TODO:define further
-#endif
+    struct utsname name;
+    uname(&name);
+    return wxString::Format(_T("Mac OS X (%s %s %s)"),
+            wxString::FromAscii(name.sysname).c_str(),
+            wxString::FromAscii(name.release).c_str(),
+            wxString::FromAscii(name.machine).c_str());

 }
 
 #ifndef __DARWIN__
 }
 
 #ifndef __DARWIN__


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

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

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


@@ -643,7 +656,29 @@ void wxMacControl::SuperChangedPosition()
 void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle )
 {
     m_font = font;
 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 )
     {
     ControlFontStyleRec fontStyle;
     if ( font.MacGetThemeFontID() != kThemeCurrentPortFont )
     {


@@ -823,9 +858,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 )
     {


@@ -852,7 +887,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 )


@@ -1318,7 +1353,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


@@ -1525,7 +1560,7 @@ unsigned int wxMacDataItemBrowserControl::GetLineFromItem(const wxMacDataItem* i
 {
     DataBrowserTableViewRowIndex row;
     OSStatus err = GetItemRow( (DataBrowserItemID) item , &row);
 {
     DataBrowserTableViewRowIndex row;
     OSStatus err = GetItemRow( (DataBrowserItemID) item , &row);

-    wxASSERT( err == noErr);
+    wxCHECK( err == noErr, (unsigned)-1 );

     return row;
 }
 
     return row;
 }
 


@@ -1533,7 +1568,7 @@ wxMacDataItem*  wxMacDataItemBrowserControl::GetItemFromLine(unsigned int n) con
 {
     DataBrowserItemID id;
     OSStatus err =  GetItemID( (DataBrowserTableViewRowIndex) n , &id);
 {
     DataBrowserItemID id;
     OSStatus err =  GetItemID( (DataBrowserTableViewRowIndex) n , &id);

-    wxASSERT( err == noErr);
+    wxCHECK( err == noErr, NULL );

     return (wxMacDataItem*) id;
 }
 
     return (wxMacDataItem*) id;
 }
 


@@ -1579,8 +1614,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;


@@ -1886,7 +1920,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 ) ;
 


@@ -1922,17 +1956,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 );


@@ -1941,6 +1975,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 );


@@ -1948,8 +1988,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 )


@@ -1959,10 +1998,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