X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8638e69ba1960474a30fadf42b1b8a5a83785656..6493aacaeb7b22b9fa35c559f7753e9fec0da71f:/src/mac/carbon/utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 6709344e9b..5cb7a352f9 100644
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -488,7 +488,7 @@ extern wxCursor    gMacCurrentCursor ;
 wxCursor        gMacStoredActiveCursor ;
 
 // Set the cursor to the busy cursor for all windows
-void wxBeginBusyCursor(wxCursor *cursor)
+void wxBeginBusyCursor(const wxCursor *cursor)
 {
     if (gs_wxBusyCursorCount++ == 0)
     {
@@ -644,7 +644,7 @@ wxChar *wxGetUserHome (const wxString& user)
     return NULL;
 }
 
-bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
+bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree)
 {
     if ( path.empty() )
         return false;
@@ -674,9 +674,9 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
             if ( noErr == err )
             {
                 if ( pTotal )
-                    *pTotal = wxLongLong( totalBytes ) ;
+                    *pTotal = wxDiskspaceSize_t( totalBytes ) ;
                 if ( pFree )
-                    *pFree = wxLongLong( freeBytes ) ;
+                    *pFree = wxDiskspaceSize_t( freeBytes ) ;
             }
         }
     }
@@ -1411,94 +1411,6 @@ void wxMacControl::ScrollRect( wxRect *r , int dx , int dy )
     }
 }
 
-// SetNeedsDisplay would not invalidate the children
-
-//
-// Databrowser
-//
-
-OSStatus wxMacControl::SetSelectionFlags( DataBrowserSelectionFlags options )
-{
-    return SetDataBrowserSelectionFlags( m_controlRef , options ) ;
-}
-
-OSStatus wxMacControl::AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
-        DataBrowserTableViewColumnIndex position )
-{
-    return AddDataBrowserListViewColumn( m_controlRef , columnDesc, position ) ;
-}
-
-OSStatus wxMacControl::AutoSizeListViewColumns()
-{
-    return AutoSizeDataBrowserListViewColumns(m_controlRef) ;
-}
-
-OSStatus wxMacControl::SetHasScrollBars( bool horiz , bool vert )
-{
-    return SetDataBrowserHasScrollBars( m_controlRef , horiz , vert ) ;
-}
-
-OSStatus wxMacControl::SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle )
-{
-    return SetDataBrowserTableViewHiliteStyle( m_controlRef , hiliteStyle ) ;
-}
-
-OSStatus wxMacControl::SetListViewHeaderBtnHeight(UInt16 height)
-{
-    return SetDataBrowserListViewHeaderBtnHeight( m_controlRef ,height ) ;
-}
-
-OSStatus wxMacControl::SetCallbacks(const DataBrowserCallbacks *  callbacks)
-{
-    return SetDataBrowserCallbacks( m_controlRef , callbacks ) ;
-}
-
-OSStatus wxMacControl::UpdateItems( DataBrowserItemID container, UInt32 numItems,
-        const DataBrowserItemID* items,
-        DataBrowserPropertyID preSortProperty,
-        DataBrowserPropertyID propertyID )
-{
-    return UpdateDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty, propertyID ) ;
-}
-
-bool wxMacControl::IsItemSelected( DataBrowserItemID item )
-{
-    return IsDataBrowserItemSelected( m_controlRef , item ) ;
-}
-
-OSStatus wxMacControl::AddItems( DataBrowserItemID container, UInt32 numItems,
-            const DataBrowserItemID* items,
-            DataBrowserPropertyID preSortProperty )
-{
-    return AddDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ;
-}
-
-OSStatus wxMacControl::RemoveItems( DataBrowserItemID container, UInt32 numItems,
-            const DataBrowserItemID* items,
-            DataBrowserPropertyID preSortProperty )
-{
-    return RemoveDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ;
-}
-
-OSStatus wxMacControl::RevealItem( DataBrowserItemID item,
-            DataBrowserPropertyID propertyID,
-            DataBrowserRevealOptions options )
-{
-    return RevealDataBrowserItem( m_controlRef , item , propertyID , options ) ;
-}
-
-OSStatus wxMacControl::SetSelectedItems(UInt32 numItems,
-            const DataBrowserItemID * items,
-            DataBrowserSetOption operation )
-{
-    return SetDataBrowserSelectedItems( m_controlRef , numItems , items, operation ) ;
-}
-
-OSStatus wxMacControl::GetSelectionAnchor( DataBrowserItemID * first, DataBrowserItemID * last )
-{
-    return GetDataBrowserSelectionAnchor( m_controlRef , first , last ) ;
-}
-
 //
 // Tab Control
 //
@@ -1554,10 +1466,6 @@ CMProfileRef wxMacOpenGenericProfile()
     return it whenever this function is called.
 */
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4
-#define kCGColorSpaceGenericRGB   CFSTR("kCGColorSpaceGenericRGB")
-#endif
-
 CGColorSpaceRef wxMacGetGenericRGBColorSpace()
 {
     static wxMacCFRefHolder<CGColorSpaceRef> genericRGBColorSpace ;
@@ -1566,7 +1474,7 @@ CGColorSpaceRef wxMacGetGenericRGBColorSpace()
     {
         if ( UMAGetSystemVersion() >= 0x1040 )
         {
-            genericRGBColorSpace.Set( CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ) ) ;
+            genericRGBColorSpace.Set( CGColorSpaceCreateWithName( CFSTR("kCGColorSpaceGenericRGB") ) ) ;
         }
         else
         {
@@ -1588,4 +1496,15 @@ CGColorSpaceRef wxMacGetGenericRGBColorSpace()
 }
 #endif
 
+wxMacPortSaver::wxMacPortSaver( GrafPtr port )
+{
+    ::GetPort( &m_port ) ;
+    ::SetPort( port ) ;
+}
+
+wxMacPortSaver::~wxMacPortSaver()
+{
+    ::SetPort( m_port ) ;
+}
+
 #endif // wxUSE_GUI