Border corrections

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index e975a2adf730a20e515f3f3100cefb698c562743..75132f7124fc2f81cd2917461813e206775b3003 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -11,6 +11,8 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

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

 #if wxUSE_GUI
 
 #include "wx/toplevel.h"
 #if wxUSE_GUI
 
 #include "wx/toplevel.h"


@@ -29,10 +31,6 @@
 #  endif
 #endif
 
 #  endif
 #endif
 

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

 #include "wx/mac/uma.h"
 
 // since we have decided that we only support 8.6 upwards we are
 #include "wx/mac/uma.h"
 
 // since we have decided that we only support 8.6 upwards we are


@@ -41,111 +39,23 @@
 // windows manager, control manager, navigation services etc. are
 // present
 
 // 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 bool sUMAHasInittedAppearance = false;
+static SInt32 sUMASystemVersion = 0 ;

 
 

-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 )
+void UMAInitToolbox( UInt16 WXUNUSED(inMoreMastersCalls),
+                     bool WXUNUSED(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
-

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

-    long theAppearance ;
-    if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
-    {
-        // 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.
-
-        sUMAHasAppearance = true ;
-        OSStatus status = RegisterAppearanceClient();
-        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 )
-        sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
-
-#if TARGET_CARBON
-// Call currently implicitely done :        InitFloatingWindows() ;
-#else
-    if (!isEmbedded)
-    {
-        if ( sUMAHasWindowManager )
-            InitFloatingWindows() ;
-        else
-            InitWindows();
-    }
-#endif
-
-    if ( NavServicesAvailable() )
-        NavLoad() ;
-
-    long menuMgrAttr ;
-    Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
-    if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
-        sUMAHasAquaLayout = true ;
-
-    if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
+#ifndef __LP64__

     {
         FontFamilyID fontId ;
         Str255 fontName ;
     {
         FontFamilyID fontId ;
         Str255 fontName ;


@@ -168,19 +78,11 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded )
 
         TXNInitTextension( fontDescriptions,  noOfFontDescriptions, options );
     }
 
         TXNInitTextension( fontDescriptions,  noOfFontDescriptions, options );
     }

+#endif

 
     UMASetSystemIsInitialized( true );
 }
 
 
     UMASetSystemIsInitialized( true );
 }
 

-#if 0
-Boolean CanUseATSUI()
-{
-    long result;
-    OSErr err = Gestalt(gestaltATSUVersion, &result);
-    return (err == noErr);
-}
-#endif
-

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


@@ -192,7 +94,9 @@ 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 ) ;


@@ -268,14 +172,17 @@ 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" );
+    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  )
 {
     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  )
 {

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

     UMASetMenuItemText( menu, item+1, title , encoding );
     SetMenuItemHierarchicalID( menu , item+1 , id ) ;
 }
     UMASetMenuItemText( menu, item+1, title , encoding );
     SetMenuItemHierarchicalID( menu , item+1 , id ) ;
 }


@@ -310,7 +217,7 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
             macKey = 0 ;
             glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
             if ( key >= WXK_F13 )
             macKey = 0 ;
             glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
             if ( key >= WXK_F13 )

-                glyph += 13 ;
+                glyph += 12 ;

         }
         else
         {
         }
         else
         {


@@ -420,8 +327,8 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
 
 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");
-
+    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 );
     // 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 );


@@ -430,7 +337,8 @@ void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding enc
 
 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) ;
+    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 ) ;
 
     // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise)
     ChangeMenuItemAttributes( menu , item+1, kMenuItemAttrIgnoreMeta , 0 ) ;


@@ -488,37 +396,12 @@ pascal QDGlobalsPtr GetQDGlobalsPtr()
 
 void UMAShowWatchCursor()
 {
 
 void UMAShowWatchCursor()
 {

-    OSErr err = noErr;
-
-    CursHandle watchFob = GetCursor(watchCursor);
-
-    if (watchFob == NULL)
-    {
-        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


@@ -671,16 +554,14 @@ void UMADeactivateControl( ControlRef inControl )
 void UMAShowControl( ControlRef inControl )
 {
     SetControlVisibility( inControl , true , false ) ;
 void UMAShowControl( ControlRef inControl )
 {
     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
 void UMAHideControl( ControlRef inControl )
 {
     SetControlVisibility( inControl , false , false ) ;
 }
 
 // hides the control and adds the region to the update region
 void UMAHideControl( ControlRef inControl )
 {
     SetControlVisibility( inControl , false , false ) ;

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

 }
 
 // keyboard focus
 }
 
 // keyboard focus


@@ -689,13 +570,17 @@ OSErr UMASetKeyboardFocus( WindowPtr inWindow,
                                  ControlFocusPart inPart )
 {
     OSErr err = noErr;
                                  ControlFocusPart inPart )
 {
     OSErr err = noErr;

+#ifndef __LP64__

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

+#endif

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

+#ifndef __LP64__

     SetPort( port ) ;
     SetPort( port ) ;

+#endif

 
     return err ;
 }
 
     return err ;
 }


@@ -724,10 +609,11 @@ 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 ;
         ::GetRootControl( inWindowRef , &control ) ;
         HiliteWindow( inWindowRef , inActivate ) ;
         ControlRef control = NULL ;
         ::GetRootControl( inWindowRef , &control ) ;


@@ -738,14 +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


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

-OSStatus UMAGetHelpMenu(
+static OSStatus UMAGetHelpMenu(

     MenuRef *        outHelpMenu,
     MenuRef *        outHelpMenu,

-    MenuItemIndex *  outFirstCustomItemIndex)
+    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 ;
 
     helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
     MenuRef helpMenuHandle ;
 
     helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;


@@ -776,6 +682,22 @@ OSStatus UMAGetHelpMenu(
 #endif
 }
 
 #endif
 }
 

+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 ;
 wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport )
 {
     m_clip = NULL ;


@@ -830,22 +752,8 @@ 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 == noErr )
-        err = PutScrapFlavor( scrap, type , 0, size, data );

 #endif
 
 #endif
 

-    return err ;
-}
-

 Rect * UMAGetControlBoundsInWindowCoords( ControlRef theControl, Rect *bounds )
 {
     GetControlBounds( theControl , bounds ) ;
 Rect * UMAGetControlBoundsInWindowCoords( ControlRef theControl, Rect *bounds )
 {
     GetControlBounds( theControl , bounds ) ;


@@ -866,6 +774,72 @@ Rect * UMAGetControlBoundsInWindowCoords( ControlRef theControl, Rect *bounds )
     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