Border corrections

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 22120e08f60efcbe403621ff9f511848b1728d43..75132f7124fc2f81cd2917461813e206775b3003 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        uma.cpp
+// Name:        src/mac/carbon/uma.cpp

 // Purpose:     UMA support
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     UMA support
 // Author:      Stefan Csomor
 // Modified by:


@@ -11,12 +11,15 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#include "wx/mac/uma.h"
+

 #if wxUSE_GUI
 
 #if wxUSE_GUI
 

+#include "wx/toplevel.h"

 #include "wx/dc.h"
 #include "wx/dc.h"

-#include <MacTextEditor.h>

 
 #ifndef __DARWIN__
 
 #ifndef __DARWIN__

+#  include <MacTextEditor.h>

 #  include <Navigation.h>
 #  if defined(TARGET_CARBON)
 #    if PM_USE_SESSION_APIS
 #  include <Navigation.h>
 #  if defined(TARGET_CARBON)
 #    if PM_USE_SESSION_APIS


@@ -28,168 +31,58 @@
 #  endif
 #endif
 
 #  endif
 #endif
 

-#ifndef __DARWIN__
-#include <Scrap.h>
-#endif

 #include "wx/mac/uma.h"
 
 #include "wx/mac/uma.h"
 

-#if TARGET_API_MAC_OSX
-#include "wx/toplevel.h"
-#endif
-

 // since we have decided that we only support 8.6 upwards we are
 // checking for these minimum requirements in the startup code of
 // the application so all wxWidgets code can safely assume that appearance 1.1
 // windows manager, control manager, navigation services etc. are
 // present
 
 // since we have decided that we only support 8.6 upwards we are
 // checking for these minimum requirements in the startup code of
 // the application so all wxWidgets code can safely assume that appearance 1.1
 // windows manager, control manager, navigation services etc. are
 // present
 

-static bool    sUMAHasAppearance = false ;
-static long sUMAAppearanceVersion = 0 ;
-static long sUMASystemVersion = 0 ;
-static bool sUMAHasAquaLayout = false ;
+static SInt32 sUMASystemVersion = 0 ;

 
 

-static bool sUMAHasInittedAppearance = false;
-
-extern int gAGABackgroundColor ;
-bool UMAHasAppearance() { return sUMAHasAppearance ; }
-long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }

 long UMAGetSystemVersion() { return sUMASystemVersion ; }
 
 long UMAGetSystemVersion() { return sUMASystemVersion ; }
 

-static bool    sUMAHasWindowManager = false ;
-static long sUMAWindowManagerAttr = 0 ;
-
-bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
-long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }
-bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; }
-
-

 void UMACleanupToolbox()
 {
 void UMACleanupToolbox()
 {

-    if (sUMAHasInittedAppearance)
-    {
-        UnregisterAppearanceClient() ;
-    }
-    if ( NavServicesAvailable() )
-    {
-        NavUnload() ;
-    }
-  if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
-      TXNTerminateTextension( ) ;

 }
 }

-void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded )
-{
-#if !TARGET_CARBON
-    ::MaxApplZone();
-    for (long i = 1; i <= inMoreMastersCalls; i++)
-        ::MoreMasters();
-
-    if (!isEmbedded)
-    {
-        ::InitGraf(&qd.thePort);
-        ::InitFonts();
-        ::InitMenus();
-        ::TEInit();
-        ::InitDialogs(0L);
-        ::FlushEvents(everyEvent, 0);
-    }
-
-    long total,contig;
-    PurgeSpace(&total, &contig);
-#endif

 
 

+void UMAInitToolbox( UInt16 WXUNUSED(inMoreMastersCalls),
+                     bool WXUNUSED(isEmbedded) )
+{

     ::InitCursor();
 
     if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr)
         sUMASystemVersion = 0x0000 ;
 
     ::InitCursor();
 
     if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr)
         sUMASystemVersion = 0x0000 ;
 

-    long theAppearance ;
-    if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
-    {
-        sUMAHasAppearance = true ;
-        OSStatus status = RegisterAppearanceClient();
-        // If status equals appearanceProcessRegisteredErr it means the
-        // appearance client already was registered (For example if we run
-        // embedded, the host might have registered it). In such a case
-        // we don't unregister it later on.
-        if (status != appearanceProcessRegisteredErr)
-        {
-            // Appearance client wasn't registered yet.
-            sUMAHasInittedAppearance = true;
-        }
-
-        if ( Gestalt( gestaltAppearanceVersion, &theAppearance ) == noErr )
-        {
-            sUMAAppearanceVersion = theAppearance ;
-        }
-        else
-        {
-            sUMAAppearanceVersion = 0x0100 ;
-        }
-    }
-    if ( Gestalt( gestaltWindowMgrAttr, &sUMAWindowManagerAttr ) == noErr )
+#ifndef __LP64__

     {
     {

-        sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
-    }
+        FontFamilyID fontId ;
+        Str255 fontName ;
+        SInt16 fontSize ;
+        Style fontStyle ;

 
 

-#if TARGET_CARBON
-// Call currently implicitely done :        InitFloatingWindows() ;
-#else
-    if (!isEmbedded)
-    {
-        if ( sUMAHasWindowManager )
-            InitFloatingWindows() ;
-        else
-            InitWindows();
-    }
-#endif
+        GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+        GetFNum( fontName, &fontId );

 
 

-    if ( NavServicesAvailable() )
-    {
-        NavLoad() ;
-    }
+        TXNMacOSPreferredFontDescription fontDescriptions[] =
+        {
+            { fontId , (fontSize << 16) , kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
+        } ;
+        int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;

 
 

-  long menuMgrAttr ;
-  Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
-  if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
-    sUMAHasAquaLayout = true ;
-
-  if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
-  {
-    FontFamilyID fontId ;
-    Str255 fontName ;
-    SInt16 fontSize ;
-    Style fontStyle ;
-    GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
-    GetFNum( fontName, &fontId );
-
-    TXNMacOSPreferredFontDescription fontDescriptions[] =
-    {
-        { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
-    } ;
-    int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
+        OptionBits options = 0 ;

 
 

-    OptionBits options = 0 ;
+        if ( UMAGetSystemVersion() < 0x1000 )
+            options |= kTXNAlwaysUseQuickDrawTextMask ;

 
 

-    if ( UMAGetSystemVersion() < 0x1000 )
-    {
-        options |= kTXNAlwaysUseQuickDrawTextMask ;
+        TXNInitTextension( fontDescriptions,  noOfFontDescriptions, options );

     }
     }

-    TXNInitTextension(fontDescriptions,  noOfFontDescriptions, options );
-  }
-
-
-  UMASetSystemIsInitialized(true);
+#endif

 
 

+    UMASetSystemIsInitialized( true );

 }
 
 }
 

-/*
-Boolean CanUseATSUI()
-    {
-    long result;
-    OSErr err = Gestalt(gestaltATSUVersion, &result);
-    return (err == noErr);
-    }
-*/

 // process manager
 long UMAGetProcessMode()
 {
 // process manager
 long UMAGetProcessMode()
 {


@@ -201,10 +94,13 @@ long UMAGetProcessMode()
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     processinfo.processName = NULL;
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     processinfo.processName = NULL;

+#ifndef __LP64__

     processinfo.processAppSpec = NULL;
     processinfo.processAppSpec = NULL;

+#endif

 
     err = ::GetProcessInformation( &procno , &processinfo ) ;
     wxASSERT( err == noErr ) ;
 
     err = ::GetProcessInformation( &procno , &processinfo ) ;
     wxASSERT( err == noErr ) ;

+

     return processinfo.processMode ;
 }
 
     return processinfo.processMode ;
 }
 


@@ -219,6 +115,7 @@ MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding
 {
     wxString str = wxStripMenuCodes( title ) ;
     MenuRef menu ;
 {
     wxString str = wxStripMenuCodes( title ) ;
     MenuRef menu ;

+

 #if TARGET_CARBON
     CreateNewMenu( id , 0 , &menu ) ;
     SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ;
 #if TARGET_CARBON
     CreateNewMenu( id , 0 , &menu ) ;
     SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ;


@@ -227,14 +124,17 @@ MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding
     wxMacStringToPascal( str , ptitle ) ;
     menu = ::NewMenu( id , ptitle ) ;
 #endif
     wxMacStringToPascal( str , ptitle ) ;
     menu = ::NewMenu( id , ptitle ) ;
 #endif

+

     return menu ;
 }
 
     return menu ;
 }
 

-void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding)
+void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding )

 {
     wxString str = wxStripMenuCodes( title ) ;
 {
     wxString str = wxStripMenuCodes( title ) ;

+

 #if TARGET_CARBON
     SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;
 #if TARGET_CARBON
     SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;

+

 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;


@@ -242,11 +142,14 @@ void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding enco
 #endif
 }
 
 #endif
 }
 

-void UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wxString& title , wxFontEncoding encoding)
+void UMASetMenuItemText( MenuRef menu,  MenuItemIndex item, const wxString& title, wxFontEncoding encoding )

 {
 {

-    wxString str = wxStripMenuCodes( title ) ;
+    // we don't strip the accels here anymore, must be done before
+    wxString str = title ;
+

 #if TARGET_CARBON
     SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;
 #if TARGET_CARBON
     SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;

+

 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;


@@ -254,10 +157,9 @@ void UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wxString& tit
 #endif
 }
 
 #endif
 }
 

-

 UInt32 UMAMenuEvent( EventRecord *inEvent )
 {
 UInt32 UMAMenuEvent( EventRecord *inEvent )
 {

-        return MenuEvent( inEvent ) ;
+    return MenuEvent( inEvent ) ;

 }
 
 void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
 }
 
 void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)


@@ -270,15 +172,18 @@ void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
 
 void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , SInt16 id )
 {
 
 void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , SInt16 id )
 {

-    MacAppendMenu(menu, "\pA");
-    UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );
+    AppendMenuItemTextWithCFString( menu,
+                                CFSTR("A"), 0, 0,NULL); 
+    UMASetMenuItemText( menu, (SInt16) ::CountMenuItems(menu), title , encoding );

     SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
 }
 
 void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , SInt16 id  )
 {
     SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
 }
 
 void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , SInt16 id  )
 {

-    MacInsertMenuItem(menu, "\pA" , item);
-    UMASetMenuItemText(menu, item+1, title , encoding);
+    InsertMenuItemTextWithCFString( menu,
+                CFSTR("A"), item, 0, 0); 
+                
+    UMASetMenuItemText( menu, item+1, title , encoding );

     SetMenuItemHierarchicalID( menu , item+1 , id ) ;
 }
 
     SetMenuItemHierarchicalID( menu , item+1 , id ) ;
 }
 


@@ -291,101 +196,117 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
     SInt16 key = entry->GetKeyCode() ;
     if ( key )
     {
     SInt16 key = entry->GetKeyCode() ;
     if ( key )
     {

-        bool explicitCommandKey = false ;
+        bool explicitCommandKey = (entry->GetFlags() & wxACCEL_CTRL);

 
 

-        if ( entry->GetFlags() & wxACCEL_CTRL )
-        {
-            explicitCommandKey = true ;
-        }
-
-        if (entry->GetFlags() & wxACCEL_ALT )
-        {
+        if (entry->GetFlags() & wxACCEL_ALT)

             modifiers |= kMenuOptionModifier ;
             modifiers |= kMenuOptionModifier ;

-        }

 
         if (entry->GetFlags() & wxACCEL_SHIFT)
 
         if (entry->GetFlags() & wxACCEL_SHIFT)

-        {

             modifiers |= kMenuShiftModifier ;
             modifiers |= kMenuShiftModifier ;

-        }

 
         SInt16 glyph = 0 ;
         SInt16 macKey = key ;
         if ( key >= WXK_F1 && key <= WXK_F15 )
         {
 
         SInt16 glyph = 0 ;
         SInt16 macKey = key ;
         if ( key >= WXK_F1 && key <= WXK_F15 )
         {

+            if ( !explicitCommandKey )
+                modifiers |= kMenuNoCommandModifier ;
+

             // for some reasons this must be 0 right now
             // everything else leads to just the first function key item
             // to be selected. Thanks to Ryan Wilcox for finding out.
             macKey = 0 ;
             glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
             if ( key >= WXK_F13 )
             // for some reasons this must be 0 right now
             // everything else leads to just the first function key item
             // to be selected. Thanks to Ryan Wilcox for finding out.
             macKey = 0 ;
             glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
             if ( key >= WXK_F13 )

-                glyph += 13 ;
-            if ( !explicitCommandKey )
-                modifiers |= kMenuNoCommandModifier ;
+                glyph += 12 ;

         }
         else
         {
         }
         else
         {

-            switch( key )
+            switch ( key )

             {
                 case WXK_BACK :
                     macKey = kBackspaceCharCode ;
                     glyph = kMenuDeleteLeftGlyph ;
                     break ;
             {
                 case WXK_BACK :
                     macKey = kBackspaceCharCode ;
                     glyph = kMenuDeleteLeftGlyph ;
                     break ;

+

                 case WXK_TAB :
                     macKey = kTabCharCode ;
                     glyph = kMenuTabRightGlyph ;
                     break ;
                 case WXK_TAB :
                     macKey = kTabCharCode ;
                     glyph = kMenuTabRightGlyph ;
                     break ;

+

                 case kEnterCharCode :
                     macKey = kEnterCharCode ;
                     glyph = kMenuEnterGlyph ;
                     break ;
                 case kEnterCharCode :
                     macKey = kEnterCharCode ;
                     glyph = kMenuEnterGlyph ;
                     break ;

+

                 case WXK_RETURN :
                     macKey = kReturnCharCode ;
                     glyph = kMenuReturnGlyph ;
                     break ;
                 case WXK_RETURN :
                     macKey = kReturnCharCode ;
                     glyph = kMenuReturnGlyph ;
                     break ;

+

                 case WXK_ESCAPE :
                     macKey = kEscapeCharCode ;
                     glyph = kMenuEscapeGlyph ;
                     break ;
                 case WXK_ESCAPE :
                     macKey = kEscapeCharCode ;
                     glyph = kMenuEscapeGlyph ;
                     break ;

+

                 case WXK_SPACE :
                     macKey = ' ' ;
                     glyph = kMenuSpaceGlyph ;
                     break ;
                 case WXK_SPACE :
                     macKey = ' ' ;
                     glyph = kMenuSpaceGlyph ;
                     break ;

+

                 case WXK_DELETE :
                     macKey = kDeleteCharCode ;
                     glyph = kMenuDeleteRightGlyph ;
                     break ;
                 case WXK_DELETE :
                     macKey = kDeleteCharCode ;
                     glyph = kMenuDeleteRightGlyph ;
                     break ;

+

                 case WXK_CLEAR :
                     macKey = kClearCharCode ;
                     glyph = kMenuClearGlyph ;
                     break ;
                 case WXK_CLEAR :
                     macKey = kClearCharCode ;
                     glyph = kMenuClearGlyph ;
                     break ;

-                case WXK_PRIOR : // PAGE UP
+
+                case WXK_PAGEUP :

                     macKey = kPageUpCharCode ;
                     glyph = kMenuPageUpGlyph ;
                     break ;
                     macKey = kPageUpCharCode ;
                     glyph = kMenuPageUpGlyph ;
                     break ;

-                case WXK_NEXT :
+
+                case WXK_PAGEDOWN :

                     macKey = kPageDownCharCode ;
                     glyph = kMenuPageDownGlyph ;
                     break ;
                     macKey = kPageDownCharCode ;
                     glyph = kMenuPageDownGlyph ;
                     break ;

+

                 case WXK_LEFT :
                     macKey = kLeftArrowCharCode ;
                     glyph = kMenuLeftArrowGlyph ;
                     break ;
                 case WXK_LEFT :
                     macKey = kLeftArrowCharCode ;
                     glyph = kMenuLeftArrowGlyph ;
                     break ;

+

                 case WXK_UP :
                     macKey = kUpArrowCharCode ;
                     glyph = kMenuUpArrowGlyph ;
                     break ;
                 case WXK_UP :
                     macKey = kUpArrowCharCode ;
                     glyph = kMenuUpArrowGlyph ;
                     break ;

+

                 case WXK_RIGHT :
                     macKey = kRightArrowCharCode ;
                     glyph = kMenuRightArrowGlyph ;
                     break ;
                 case WXK_RIGHT :
                     macKey = kRightArrowCharCode ;
                     glyph = kMenuRightArrowGlyph ;
                     break ;

+

                 case WXK_DOWN :
                     macKey = kDownArrowCharCode ;
                     glyph = kMenuDownArrowGlyph ;
                     break ;
                 case WXK_DOWN :
                     macKey = kDownArrowCharCode ;
                     glyph = kMenuDownArrowGlyph ;
                     break ;

+
+                case WXK_HOME :
+                    macKey = kHomeCharCode ;
+                    glyph = kMenuNorthwestArrowGlyph ;
+                    break ;
+
+                case WXK_END :
+                    macKey = kEndCharCode ;
+                    glyph = kMenuSoutheastArrowGlyph ;
+                    break ;

                 default :
                     macKey = toupper( key ) ;
                     break ;
             }
                 default :
                     macKey = toupper( key ) ;
                     break ;
             }

+

             // we now allow non command key shortcuts
             // remove in case this gives problems
             if ( !explicitCommandKey )
             // we now allow non command key shortcuts
             // remove in case this gives problems
             if ( !explicitCommandKey )


@@ -394,29 +315,32 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
 
         // 1d and 1e have special meaning to SetItemCmd, so
         // do not use for these character codes.
 
         // 1d and 1e have special meaning to SetItemCmd, so
         // do not use for these character codes.

-        if (key != WXK_UP && key != WXK_RIGHT)
+        if (key != WXK_UP && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_LEFT)

             SetItemCmd( menu, item , macKey );
 
             SetItemCmd( menu, item , macKey );
 

-        SetMenuItemModifiers(menu, item , modifiers ) ;
+        SetMenuItemModifiers( menu, item , modifiers ) ;

 
         if ( glyph )
 
         if ( glyph )

-            SetMenuItemKeyGlyph(menu, item , glyph ) ;
+            SetMenuItemKeyGlyph( menu, item , glyph ) ;

     }
 }
 
 void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry )
 {
     }
 }
 
 void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry )
 {

-    MacAppendMenu(menu, "\pA");
-    // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise) 
+    AppendMenuItemTextWithCFString( menu,
+                                CFSTR("A"), 0, 0,NULL); 
+    // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise)

     ChangeMenuItemAttributes( menu , ::CountMenuItems(menu), kMenuItemAttrIgnoreMeta , 0 ) ;
     UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );
     ChangeMenuItemAttributes( menu , ::CountMenuItems(menu), kMenuItemAttrIgnoreMeta , 0 ) ;
     UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );

-    UMASetMenuItemShortcut( menu ,  (SInt16) ::CountMenuItems(menu), entry ) ;
+    UMASetMenuItemShortcut( menu , (SInt16) ::CountMenuItems(menu), entry ) ;

 }
 
 void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry )
 {
 }
 
 void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry )
 {

-    MacInsertMenuItem( menu , "\pA" , item) ;
-    // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise) 
+    InsertMenuItemTextWithCFString( menu,
+                CFSTR("A"), item, 0, 0); 
+
+    // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise)

     ChangeMenuItemAttributes( menu , item+1, kMenuItemAttrIgnoreMeta , 0 ) ;
     UMASetMenuItemText(menu, item+1 , title , encoding );
     UMASetMenuItemShortcut( menu , item+1 , entry ) ;
     ChangeMenuItemAttributes( menu , item+1, kMenuItemAttrIgnoreMeta , 0 ) ;
     UMASetMenuItemText(menu, item+1 , title , encoding );
     UMASetMenuItemShortcut( menu , item+1 , entry ) ;


@@ -431,32 +355,39 @@ int gPrOpenCounter = 0 ;
 OSStatus UMAPrOpen()
 {
     OSErr err = noErr ;
 OSStatus UMAPrOpen()
 {
     OSErr err = noErr ;

+

     ++gPrOpenCounter ;
     ++gPrOpenCounter ;

+

     if ( gPrOpenCounter == 1 )
     {
         PrOpen() ;
         err = PrError() ;
         wxASSERT( err == noErr ) ;
     }
     if ( gPrOpenCounter == 1 )
     {
         PrOpen() ;
         err = PrError() ;
         wxASSERT( err == noErr ) ;
     }

+

     return err ;
 }
 
 OSStatus UMAPrClose()
 {
     OSErr err = noErr ;
     return err ;
 }
 
 OSStatus UMAPrClose()
 {
     OSErr err = noErr ;

+

     wxASSERT( gPrOpenCounter >= 1 ) ;
     wxASSERT( gPrOpenCounter >= 1 ) ;

+

     if ( gPrOpenCounter == 1 )
     {
         PrClose() ;
         err = PrError() ;
         wxASSERT( err == noErr ) ;
     }
     if ( gPrOpenCounter == 1 )
     {
         PrClose() ;
         err = PrError() ;
         wxASSERT( err == noErr ) ;
     }

+

     --gPrOpenCounter ;
     --gPrOpenCounter ;

+

     return err ;
 }
 
     return err ;
 }
 

-pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
-pascal QDGlobalsPtr GetQDGlobalsPtr (void)
+pascal QDGlobalsPtr GetQDGlobalsPtr() ;
+pascal QDGlobalsPtr GetQDGlobalsPtr()

 {
     return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);
 }
 {
     return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);
 }


@@ -465,42 +396,20 @@ pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 
 void UMAShowWatchCursor()
 {
 
 void UMAShowWatchCursor()
 {

-    OSErr err = noErr;
-
-    CursHandle watchFob = GetCursor (watchCursor);
-
-    if (!watchFob)
-        err = nilHandleErr;
-    else
-    {
-    #if TARGET_CARBON
-//        Cursor preservedArrow;
-//        GetQDGlobalsArrow (&preservedArrow);
-//        SetQDGlobalsArrow (*watchFob);
-//        InitCursor ( );
-//        SetQDGlobalsArrow (&preservedArrow);
-        SetCursor (*watchFob);
-    #else
-        SetCursor (*watchFob);
-    #endif
-    }
+    SetThemeCursor(kThemeWatchCursor);

 }
 
 }
 

-void            UMAShowArrowCursor()
+void UMAShowArrowCursor()

 {
 {

-#if TARGET_CARBON
-    Cursor arrow;
-    SetCursor (GetQDGlobalsArrow (&arrow));
-#else
-    SetCursor (&(qd.arrow));
-#endif
+    SetThemeCursor(kThemeArrowCursor);

 }
 
 // window manager
 
 }
 
 // window manager
 

-GrafPtr        UMAGetWindowPort( WindowRef inWindowRef )
+GrafPtr UMAGetWindowPort( WindowRef inWindowRef )

 {
     wxASSERT( inWindowRef != NULL ) ;
 {
     wxASSERT( inWindowRef != NULL ) ;

+

 #if TARGET_CARBON
     return (GrafPtr) GetWindowPort( inWindowRef ) ;
 #else
 #if TARGET_CARBON
     return (GrafPtr) GetWindowPort( inWindowRef ) ;
 #else


@@ -508,16 +417,18 @@ GrafPtr        UMAGetWindowPort( WindowRef inWindowRef )
 #endif
 }
 
 #endif
 }
 

-void             UMADisposeWindow( WindowRef inWindowRef )
+void UMADisposeWindow( WindowRef inWindowRef )

 {
     wxASSERT( inWindowRef != NULL ) ;
 {
     wxASSERT( inWindowRef != NULL ) ;

+

     DisposeWindow( inWindowRef ) ;
 }
 
     DisposeWindow( inWindowRef ) ;
 }
 

-void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding)
+void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding )

 {
 #if TARGET_CARBON
     SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ;
 {
 #if TARGET_CARBON
     SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ;

+

 #else
     Str255 ptitle ;
     wxMacStringToPascal( title , ptitle ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( title , ptitle ) ;


@@ -527,10 +438,11 @@ void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncodin
 
 // appearance additions
 
 
 // appearance additions
 

-void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding)
+void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding )

 {
 #if TARGET_CARBON
     SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ;
 {
 #if TARGET_CARBON
     SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ;

+

 #else
     Str255 ptitle ;
     wxMacStringToPascal( title , ptitle ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( title , ptitle ) ;


@@ -540,7 +452,10 @@ void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEn
 
 void UMAActivateControl( ControlRef inControl )
 {
 
 void UMAActivateControl( ControlRef inControl )
 {

-#if !TARGET_API_MAC_OSX
+#if TARGET_API_MAC_OSX
+    ::ActivateControl( inControl ) ;
+
+#else

     // we have to add the control after again to the update rgn
     // otherwise updates get lost
     if ( !IsControlActive( inControl ) )
     // we have to add the control after again to the update rgn
     // otherwise updates get lost
     if ( !IsControlActive( inControl ) )


@@ -548,105 +463,125 @@ void UMAActivateControl( ControlRef inControl )
         bool visible = IsControlVisible( inControl ) ;
         if ( visible )
             SetControlVisibility( inControl , false , false ) ;
         bool visible = IsControlVisible( inControl ) ;
         if ( visible )
             SetControlVisibility( inControl , false , false ) ;

-#endif    
+

         ::ActivateControl( inControl ) ;
         ::ActivateControl( inControl ) ;

-#if !TARGET_API_MAC_OSX
-        if ( visible ) {
+
+        if ( visible )
+        {

             SetControlVisibility( inControl , true , false ) ;
             SetControlVisibility( inControl , true , false ) ;

-        
+

             Rect ctrlBounds ;
             Rect ctrlBounds ;

-            InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
+            InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ;

         }
     }
         }
     }

-#endif    
+#endif

 }
 
 void UMAMoveControl( ControlRef inControl , short x , short y )
 {
 }
 
 void UMAMoveControl( ControlRef inControl , short x , short y )
 {

-#if !TARGET_API_MAC_OSX
+#if TARGET_API_MAC_OSX
+    ::MoveControl( inControl , x , y ) ;
+
+#else

     bool visible = IsControlVisible( inControl ) ;
     bool visible = IsControlVisible( inControl ) ;

-    if ( visible ) {
+    if ( visible )
+    {

         SetControlVisibility( inControl , false , false ) ;
         Rect ctrlBounds ;
         SetControlVisibility( inControl , false , false ) ;
         Rect ctrlBounds ;

-        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+        InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;

     }
     }

-#endif    
+

     ::MoveControl( inControl , x , y ) ;
     ::MoveControl( inControl , x , y ) ;

-#if !TARGET_API_MAC_OSX
-    if ( visible ) {
+
+    if ( visible )
+    {

         SetControlVisibility( inControl , true , false ) ;
         Rect ctrlBounds ;
         SetControlVisibility( inControl , true , false ) ;
         Rect ctrlBounds ;

-        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+        InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;

     }
 #endif
 }
 
 void UMASizeControl( ControlRef inControl , short x , short y )
 {
     }
 #endif
 }
 
 void UMASizeControl( ControlRef inControl , short x , short y )
 {

-#if !TARGET_API_MAC_OSX
+#if TARGET_API_MAC_OSX
+    ::SizeControl( inControl , x , y ) ;
+
+#else

     bool visible = IsControlVisible( inControl ) ;
     bool visible = IsControlVisible( inControl ) ;

-    if ( visible ) {
+    if ( visible )
+    {

         SetControlVisibility( inControl , false , false ) ;
         Rect ctrlBounds ;
         SetControlVisibility( inControl , false , false ) ;
         Rect ctrlBounds ;

-        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+        InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;

     }
     }

-#endif
+

     ::SizeControl( inControl , x , y ) ;
     ::SizeControl( inControl , x , y ) ;

-#if !TARGET_API_MAC_OSX
-    if ( visible ) {
+
+    if ( visible )
+    {

         SetControlVisibility( inControl , true , false ) ;
         Rect ctrlBounds ;
         SetControlVisibility( inControl , true , false ) ;
         Rect ctrlBounds ;

-        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+        InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;

     }
 #endif
 }
 
 void UMADeactivateControl( ControlRef inControl )
 {
     }
 #endif
 }
 
 void UMADeactivateControl( ControlRef inControl )
 {

-#if !TARGET_API_MAC_OSX
+#if TARGET_API_MAC_OSX
+    ::DeactivateControl( inControl ) ;
+
+#else

     // we have to add the control after again to the update rgn
     // otherwise updates get lost
     bool visible = IsControlVisible( inControl ) ;
     if ( visible )
         SetControlVisibility( inControl , false , false ) ;
     // we have to add the control after again to the update rgn
     // otherwise updates get lost
     bool visible = IsControlVisible( inControl ) ;
     if ( visible )
         SetControlVisibility( inControl , false , false ) ;

-#endif
+

     ::DeactivateControl( inControl ) ;
     ::DeactivateControl( inControl ) ;

-#if !TARGET_API_MAC_OSX
-    if ( visible ) {
+
+    if ( visible )
+    {

         SetControlVisibility( inControl , true , false ) ;
         Rect ctrlBounds ;
         SetControlVisibility( inControl , true , false ) ;
         Rect ctrlBounds ;

-        InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
+        InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ;

     }
 #endif
 }
     }
 #endif
 }

+

 // shows the control and adds the region to the update region
 // shows the control and adds the region to the update region

-void UMAShowControl                        (ControlRef             inControl)
+void UMAShowControl( ControlRef inControl )

 {
     SetControlVisibility( inControl , true , false ) ;
 {
     SetControlVisibility( inControl , true , false ) ;

-    Rect ctrlBounds ;
-    InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
+    HIViewSetNeedsDisplay( inControl, true );

 }
 
 // hides the control and adds the region to the update region
 }
 
 // hides the control and adds the region to the update region

-void UMAHideControl                        (ControlRef             inControl)
+void UMAHideControl( ControlRef inControl )

 {
     SetControlVisibility( inControl , false , false ) ;
 {
     SetControlVisibility( inControl , false , false ) ;

-    Rect ctrlBounds ;
-    InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
+    HIViewSetNeedsDisplay( inControl, true );

 }
 }

+

 // keyboard focus
 // keyboard focus

-OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,
-                                 ControlRef             inControl,
-                                 ControlFocusPart         inPart)
+OSErr UMASetKeyboardFocus( WindowPtr inWindow,
+                                 ControlRef inControl,
+                                 ControlFocusPart inPart )

 {
     OSErr err = noErr;
 {
     OSErr err = noErr;

+#ifndef __LP64__

     GrafPtr port ;
     GrafPtr port ;

-    GetPort( &port ) ;

 
 

+    GetPort( &port ) ;

     SetPortWindowPort( inWindow ) ;
     SetPortWindowPort( inWindow ) ;

+#endif

 
     err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
 
     err = SetKeyboardFocus( inWindow , inControl , inPart ) ;

+#ifndef __LP64__

     SetPort( port ) ;
     SetPort( port ) ;

+#endif
+

     return err ;
 }
 
     return err ;
 }
 


@@ -674,12 +609,14 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
     {
 //        bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
 //        if ( inActivate != isHighlighted )
     {
 //        bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
 //        if ( inActivate != isHighlighted )

+#ifndef __LP64__

         GrafPtr port ;
         GetPort( &port ) ;
         SetPortWindowPort( inWindowRef ) ;
         GrafPtr port ;
         GetPort( &port ) ;
         SetPortWindowPort( inWindowRef ) ;

+#endif

         HiliteWindow( inWindowRef , inActivate ) ;
         ControlRef control = NULL ;
         HiliteWindow( inWindowRef , inActivate ) ;
         ControlRef control = NULL ;

-        ::GetRootControl( inWindowRef , & control ) ;
+        ::GetRootControl( inWindowRef , &control ) ;

         if ( control )
         {
             if ( inActivate )
         if ( control )
         {
             if ( inActivate )


@@ -687,13 +624,19 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
             else
                 UMADeactivateControl( control ) ;
         }
             else
                 UMADeactivateControl( control ) ;
         }

+#ifndef __LP64__

         SetPort( port ) ;
         SetPort( port ) ;

+#endif

     }
 }
 
 OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
 {
     }
 }
 
 OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
 {

+#ifndef __LP64__

     return ::DrawThemePlacard( inRect , inState ) ;
     return ::DrawThemePlacard( inRect , inState ) ;

+#else
+    return noErr;
+#endif

 }
 
 #if !TARGET_CARBON
 }
 
 #if !TARGET_CARBON


@@ -701,29 +644,61 @@ static OSStatus helpMenuStatus = noErr ;
 static MenuItemIndex firstCustomItemIndex = 0 ;
 #endif
 
 static MenuItemIndex firstCustomItemIndex = 0 ;
 #endif
 

-OSStatus UMAGetHelpMenu(
-  MenuRef *        outHelpMenu,
-  MenuItemIndex *  outFirstCustomItemIndex)
+static OSStatus UMAGetHelpMenu(
+    MenuRef *        outHelpMenu,
+    MenuItemIndex *  outFirstCustomItemIndex,
+    bool             allowHelpMenuCreation);
+
+static OSStatus UMAGetHelpMenu(
+    MenuRef *        outHelpMenu,
+    MenuItemIndex *  outFirstCustomItemIndex,
+    bool             allowHelpMenuCreation)

 {
 #if TARGET_CARBON
 {
 #if TARGET_CARBON

-    return HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
+    static bool s_createdHelpMenu = false ;
+
+    if ( !s_createdHelpMenu && !allowHelpMenuCreation )
+    {
+        return paramErr ;
+    }
+
+    OSStatus status = HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
+    s_createdHelpMenu = ( status == noErr ) ;
+    return status ;

 #else
 #else

+    wxUnusedVar( allowHelpMenuCreation ) ;

     MenuRef helpMenuHandle ;
     MenuRef helpMenuHandle ;

+

     helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
     if ( firstCustomItemIndex == 0 && helpMenuStatus == noErr )
     helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
     if ( firstCustomItemIndex == 0 && helpMenuStatus == noErr )

-    {

         firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;
         firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;

-    }
+

     if ( outFirstCustomItemIndex )
     if ( outFirstCustomItemIndex )

-    {

         *outFirstCustomItemIndex = firstCustomItemIndex ;
         *outFirstCustomItemIndex = firstCustomItemIndex ;

-    }
+

     *outHelpMenu = helpMenuHandle ;
     *outHelpMenu = helpMenuHandle ;

+

     return helpMenuStatus ;
 #endif
 }
 
     return helpMenuStatus ;
 #endif
 }
 

-wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport)
+OSStatus UMAGetHelpMenu(
+    MenuRef *        outHelpMenu,
+    MenuItemIndex *  outFirstCustomItemIndex)
+{
+    return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , true );
+}
+
+OSStatus UMAGetHelpMenuDontCreate(
+    MenuRef *        outHelpMenu,
+    MenuItemIndex *  outFirstCustomItemIndex)
+{
+    return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , false );
+}
+
+#ifndef __LP64__
+
+wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport )

 {
     m_clip = NULL ;
     Setup( newport ) ;
 {
     m_clip = NULL ;
     Setup( newport ) ;


@@ -738,17 +713,19 @@ void wxMacPortStateHelper::Setup( GrafPtr newport )
 {
     GetPort( &m_oldPort ) ;
     SetPort( newport ) ;
 {
     GetPort( &m_oldPort ) ;
     SetPort( newport ) ;

-    SetOrigin(0,0);
+    SetOrigin(0, 0);
+

     wxASSERT_MSG( m_clip == NULL , wxT("Cannot call setup twice") ) ;
     m_clip = NewRgn() ;
     GetClip( m_clip );
     wxASSERT_MSG( m_clip == NULL , wxT("Cannot call setup twice") ) ;
     m_clip = NewRgn() ;
     GetClip( m_clip );

-    m_textFont = GetPortTextFont( (CGrafPtr) newport);
-    m_textSize = GetPortTextSize( (CGrafPtr) newport);
-    m_textStyle = GetPortTextFace( (CGrafPtr) newport);
-    m_textMode = GetPortTextMode( (CGrafPtr) newport);
+    m_textFont = GetPortTextFont( (CGrafPtr) newport );
+    m_textSize = GetPortTextSize( (CGrafPtr) newport );
+    m_textStyle = GetPortTextFace( (CGrafPtr) newport );
+    m_textMode = GetPortTextMode( (CGrafPtr) newport );

     GetThemeDrawingState( &m_drawingState ) ;
     m_currentPort = newport ;
 }
     GetThemeDrawingState( &m_drawingState ) ;
     m_currentPort = newport ;
 }

+

 void wxMacPortStateHelper::Clear()
 {
     if ( m_clip )
 void wxMacPortStateHelper::Clear()
 {
     if ( m_clip )


@@ -775,41 +752,94 @@ wxMacPortStateHelper::~wxMacPortStateHelper()
     }
 }
 
     }
 }
 

-OSStatus UMAPutScrap( Size size , OSType type , void *data )
-{
-    OSStatus err = noErr ;
-#if !TARGET_CARBON
-    err = PutScrap( size , type , data ) ;
-#else
-    ScrapRef    scrap;
-    err = GetCurrentScrap (&scrap);
-    if ( !err )
-    {
-        err = PutScrapFlavor (scrap, type , 0, size, data);
-    }

 #endif
 #endif

-    return err ;
-}

 
 

-Rect* UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds)
+Rect * UMAGetControlBoundsInWindowCoords( ControlRef theControl, Rect *bounds )

 {
     GetControlBounds( theControl , bounds ) ;
 {
     GetControlBounds( theControl , bounds ) ;

+

 #if TARGET_API_MAC_OSX
     WindowRef tlwref = GetControlOwner( theControl ) ;
 
     wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
 #if TARGET_API_MAC_OSX
     WindowRef tlwref = GetControlOwner( theControl ) ;
 
     wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;

-    if ( tlwwx != NULL && tlwwx->MacUsesCompositing() )
+    if ( tlwwx != NULL )

     {
         ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
     {
         ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;

-        HIPoint hiPoint = CGPointMake(  0 , 0 ) ;
-        HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl  ) ;
+        HIPoint hiPoint = CGPointMake( 0 , 0 ) ;
+        HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl ) ;

         OffsetRect( bounds , (short) hiPoint.x , (short) hiPoint.y ) ;
     }
 #endif
         OffsetRect( bounds , (short) hiPoint.x , (short) hiPoint.y ) ;
     }
 #endif

+

     return bounds ;
 }
 
     return bounds ;
 }
 

+size_t UMAPutBytesCFRefCallback( void *info, const void *bytes, size_t count )
+{
+    CFMutableDataRef data = (CFMutableDataRef) info;
+    if ( data )
+    {
+        CFDataAppendBytes( data, (const UInt8*) bytes, count );
+    }
+    return count;
+}
+
+void UMAReleaseCFDataProviderCallback( void *info, const void *data, size_t count )
+{
+    if ( info )
+        CFRelease( (CFDataRef) info );
+}

 
 

+void UMAReleaseCFDataConsumerCallback( void *info )
+{
+    if ( info )
+        CFRelease( (CFDataRef) info );
+}
+
+CGDataProviderRef UMACGDataProviderCreateWithCFData( CFDataRef data )
+{
+    if ( data == NULL )
+        return NULL;
+        
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+    if( &CGDataProviderCreateWithCFData != NULL )
+    {
+        return CGDataProviderCreateWithCFData( data );
+    }
+#endif
+
+    // make sure we keep it until done
+    CFRetain( data );
+    CGDataProviderRef provider = CGDataProviderCreateWithData( (void*) data , CFDataGetBytePtr( data ) ,
+        CFDataGetLength( data ), UMAReleaseCFDataProviderCallback );
+    // if provider couldn't be created, release the data again
+    if ( provider == NULL )
+        CFRelease( data );
+    return provider;
+}
+
+CGDataConsumerRef UMACGDataConsumerCreateWithCFData( CFMutableDataRef data )
+{
+    if ( data == NULL )
+        return NULL;
+        
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+    if( &CGDataConsumerCreateWithCFData != NULL )
+    {
+        return CGDataConsumerCreateWithCFData( data );
+    }
+#endif
+    // make sure we keep it until done
+    CFRetain( data );
+    CGDataConsumerCallbacks callbacks;
+    callbacks.putBytes = UMAPutBytesCFRefCallback;
+    callbacks.releaseConsumer = UMAReleaseCFDataConsumerCallback;
+    CGDataConsumerRef consumer = CGDataConsumerCreate( data , &callbacks );
+    // if consumer couldn't be created, release the data again
+    if ( consumer == NULL )
+        CFRelease( data );
+    return consumer;
+}

 #endif  // wxUSE_GUI
 
 #if wxUSE_BASE
 #endif  // wxUSE_GUI
 
 #if wxUSE_BASE


@@ -826,5 +856,4 @@ void UMASetSystemIsInitialized(bool val)
     sUMASystemInitialized = val;
 }
 
     sUMASystemInitialized = val;
 }
 

-

 #endif // wxUSE_BASE
 #endif // wxUSE_BASE