document On{Open,Save}Document()

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index ae6266011bdc2de760733300583a635d7e127d0c..b1d5ade518a53d1d8368b40a10bbba4e4b6a20a9 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -20,29 +20,21 @@
 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 

-// 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 SInt32 sUMASystemVersion = 0 ;
 
 static SInt32 sUMASystemVersion = 0 ;
 

-long UMAGetSystemVersion() { return sUMASystemVersion ; }
-
-void UMACleanupToolbox()
-{
+long UMAGetSystemVersion() 
+{ 
+    if ( sUMASystemVersion == 0 )
+    {
+        verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));
+    }
+    return sUMASystemVersion ; 

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

-    ::InitCursor();
-
-    if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr)
-        sUMASystemVersion = 0x0000 ;
-
-#ifndef __LP64__
+#if 0 // ndef __LP64__

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


@@ -60,51 +52,22 @@ void UMAInitToolbox( UInt16 WXUNUSED(inMoreMastersCalls),
 
         OptionBits options = 0 ;
 
 
         OptionBits options = 0 ;
 

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

         TXNInitTextension( fontDescriptions,  noOfFontDescriptions, options );
     }
 #endif
         TXNInitTextension( fontDescriptions,  noOfFontDescriptions, options );
     }
 #endif

-
-    UMASetSystemIsInitialized( true );
-}
-
-// process manager
-long UMAGetProcessMode()
-{
-    OSErr err ;
-    ProcessInfoRec processinfo;
-    ProcessSerialNumber procno ;
-
-    procno.highLongOfPSN = 0 ;
-    procno.lowLongOfPSN = kCurrentProcess ;
-    processinfo.processInfoLength = sizeof(ProcessInfoRec);
-    processinfo.processName = NULL;
-#ifndef __LP64__
-    processinfo.processAppSpec = NULL;
-#endif
-
-    err = ::GetProcessInformation( &procno , &processinfo ) ;
-    wxASSERT( err == noErr ) ;
-
-    return processinfo.processMode ;
-}
-
-bool UMAGetProcessModeDoesActivateOnFGSwitch()
-{
-    return UMAGetProcessMode() & modeDoesActivateOnFGSwitch ;

 }
 
 // menu manager
 
 }
 
 // menu manager
 

+#if wxMAC_USE_COCOA == 0
+

 MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding )
 {
     wxString str = wxStripMenuCodes( title ) ;
     MenuRef menu ;
 
     CreateNewMenu( id , 0 , &menu ) ;
 MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding )
 {
     wxString str = wxStripMenuCodes( title ) ;
     MenuRef menu ;
 
     CreateNewMenu( id , 0 , &menu ) ;

-    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ;
+    SetMenuTitleWithCFString( menu , wxCFStringRef(str , encoding ) ) ;

 
     return menu ;
 }
 
     return menu ;
 }


@@ -113,7 +76,7 @@ void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding enco
 {
     wxString str = wxStripMenuCodes( title ) ;
 
 {
     wxString str = wxStripMenuCodes( title ) ;
 

-    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;
+    SetMenuTitleWithCFString( menu , wxCFStringRef(str , encoding) ) ;

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


@@ -121,12 +84,7 @@ void UMASetMenuItemText( MenuRef menu,  MenuItemIndex item, const wxString& titl
     // we don't strip the accels here anymore, must be done before
     wxString str = title ;
 
     // we don't strip the accels here anymore, must be done before
     wxString str = title ;
 

-    SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;
-}
-
-UInt32 UMAMenuEvent( EventRecord *inEvent )
-{
-    return MenuEvent( inEvent ) ;
+    SetMenuItemTextWithCFString( menu , item , wxCFStringRef(str , encoding) ) ;

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


@@ -313,349 +271,46 @@ void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding enc
     UMASetMenuItemShortcut( menu , item+1 , entry ) ;
 }
 
     UMASetMenuItemShortcut( menu , item+1 , entry ) ;
 }
 

-void UMAShowWatchCursor()
-{
-    SetThemeCursor(kThemeWatchCursor);
-}
-
-void UMAShowArrowCursor()
-{
-    SetThemeCursor(kThemeArrowCursor);
-}
-
-// window manager
-
-GrafPtr UMAGetWindowPort( WindowRef inWindowRef )
-{
-    wxASSERT( inWindowRef != NULL ) ;
-
-    return (GrafPtr) GetWindowPort( inWindowRef ) ;
-}
-
-void UMADisposeWindow( WindowRef inWindowRef )
-{
-    wxASSERT( inWindowRef != NULL ) ;
-
-    DisposeWindow( inWindowRef ) ;
-}
-
-void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding )
-{
-    SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ;
-}
-
-// appearance additions
-
-void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding )
-{
-    SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ;
-}
-
-void UMAActivateControl( ControlRef inControl )
-{
-    ::ActivateControl( inControl ) ;
-}
-
-void UMAMoveControl( ControlRef inControl , short x , short y )
-{
-    ::MoveControl( inControl , x , y ) ;
-}
-
-void UMASizeControl( ControlRef inControl , short x , short y )
-{
-    ::SizeControl( inControl , x , y ) ;
-}
-
-void UMADeactivateControl( ControlRef inControl )
-{
-    ::DeactivateControl( inControl ) ;
-}
-
-// shows the control and adds the region to the update region
-void UMAShowControl( ControlRef inControl )
-{
-    SetControlVisibility( inControl , true , false ) ;
-    HIViewSetNeedsDisplay( inControl, true );
-}
-
-// hides the control and adds the region to the update region
-void UMAHideControl( ControlRef inControl )
-{
-    SetControlVisibility( inControl , false , false ) ;
-    HIViewSetNeedsDisplay( inControl, true );
-}
-
-// keyboard focus
-OSErr UMASetKeyboardFocus( WindowPtr inWindow,
-                                 ControlRef inControl,
-                                 ControlFocusPart inPart )
-{
-    OSErr err = noErr;
-#ifndef __LP64__
-    GrafPtr port ;
-
-    GetPort( &port ) ;
-    SetPortWindowPort( inWindow ) ;
-#endif
-
-    err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
-#ifndef __LP64__
-    SetPort( port ) ;
-#endif
-
-    return err ;
-}
-
-bool UMAIsWindowFloating( WindowRef inWindow )
-{
-    WindowClass cl ;
-
-    GetWindowClass( inWindow , &cl ) ;
-    return cl == kFloatingWindowClass ;
-}
-
-bool UMAIsWindowModal( WindowRef inWindow )
-{
-    WindowClass cl ;
-
-    GetWindowClass( inWindow , &cl ) ;
-    return cl < kFloatingWindowClass ;
-}
-
-// others
-
-void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
-{
-    if ( inWindowRef )
-    {
-//        bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
-//        if ( inActivate != isHighlighted )
-#ifndef __LP64__
-        GrafPtr port ;
-        GetPort( &port ) ;
-        SetPortWindowPort( inWindowRef ) ;
-#endif
-        HiliteWindow( inWindowRef , inActivate ) ;
-        ControlRef control = NULL ;
-        ::GetRootControl( inWindowRef , &control ) ;
-        if ( control )
-        {
-            if ( inActivate )
-                UMAActivateControl( control ) ;
-            else
-                UMADeactivateControl( control ) ;
-        }
-#ifndef __LP64__
-        SetPort( port ) ;

 #endif
 #endif

-    }
-}

 
 

-OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
-{
-#ifndef __LP64__
-    return ::DrawThemePlacard( inRect , inState ) ;
-#else
-    return noErr;
-#endif
-}
+#if wxMAC_USE_COCOA == 0

 
 static OSStatus UMAGetHelpMenu(
 
 static OSStatus UMAGetHelpMenu(

-    MenuRef *        outHelpMenu,
-    MenuItemIndex *  outFirstCustomItemIndex,
-    bool             allowHelpMenuCreation);
+                               MenuRef *        outHelpMenu,
+                               MenuItemIndex *  outFirstCustomItemIndex,
+                               bool             allowHelpMenuCreation);

 
 static OSStatus UMAGetHelpMenu(
 
 static OSStatus UMAGetHelpMenu(

-    MenuRef *        outHelpMenu,
-    MenuItemIndex *  outFirstCustomItemIndex,
-    bool             allowHelpMenuCreation)
+                               MenuRef *        outHelpMenu,
+                               MenuItemIndex *  outFirstCustomItemIndex,
+                               bool             allowHelpMenuCreation)

 {
     static bool s_createdHelpMenu = false ;
 {
     static bool s_createdHelpMenu = false ;

-
+    

     if ( !s_createdHelpMenu && !allowHelpMenuCreation )
     {
         return paramErr ;
     }
     if ( !s_createdHelpMenu && !allowHelpMenuCreation )
     {
         return paramErr ;
     }

-
+    

     OSStatus status = HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
     s_createdHelpMenu = ( status == noErr ) ;
     return status ;
 }
 
 OSStatus UMAGetHelpMenu(
     OSStatus status = HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
     s_createdHelpMenu = ( status == noErr ) ;
     return status ;
 }
 
 OSStatus UMAGetHelpMenu(

-    MenuRef *        outHelpMenu,
-    MenuItemIndex *  outFirstCustomItemIndex)
+                        MenuRef *        outHelpMenu,
+                        MenuItemIndex *  outFirstCustomItemIndex)

 {
     return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , true );
 }
 
 OSStatus UMAGetHelpMenuDontCreate(
 {
     return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , true );
 }
 
 OSStatus UMAGetHelpMenuDontCreate(

-    MenuRef *        outHelpMenu,
-    MenuItemIndex *  outFirstCustomItemIndex)
+                                  MenuRef *        outHelpMenu,
+                                  MenuItemIndex *  outFirstCustomItemIndex)

 {
     return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , false );
 }
 
 {
     return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , false );
 }
 

-#ifndef __LP64__
-
-wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport )
-{
-    m_clip = NULL ;
-    Setup( newport ) ;
-}
-
-wxMacPortStateHelper::wxMacPortStateHelper()
-{
-    m_clip = NULL ;
-}
-
-void wxMacPortStateHelper::Setup( GrafPtr newport )
-{
-    GetPort( &m_oldPort ) ;
-    SetPort( newport ) ;
-    SetOrigin(0, 0);
-
-    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 );
-    GetThemeDrawingState( &m_drawingState ) ;
-    m_currentPort = newport ;
-}
-
-void wxMacPortStateHelper::Clear()
-{
-    if ( m_clip )
-    {
-        DisposeRgn( m_clip ) ;
-        DisposeThemeDrawingState( m_drawingState ) ;
-        m_clip = NULL ;
-    }
-}
-
-wxMacPortStateHelper::~wxMacPortStateHelper()
-{
-    if ( m_clip )
-    {
-        SetPort( m_currentPort ) ;
-        SetClip( m_clip ) ;
-        DisposeRgn( m_clip ) ;
-        TextFont( m_textFont );
-        TextSize( m_textSize );
-        TextFace( m_textStyle );
-        TextMode( m_textMode );
-        SetThemeDrawingState( m_drawingState , true ) ;
-        SetPort( m_oldPort ) ;
-    }
-}
-

 #endif
 
 #endif
 

-Rect * UMAGetControlBoundsInWindowCoords( ControlRef theControl, Rect *bounds )
-{
-    GetControlBounds( theControl , bounds ) ;
-
-#if TARGET_API_MAC_OSX
-    WindowRef tlwref = GetControlOwner( theControl ) ;
-
-    wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
-    if ( tlwwx != NULL )
-    {
-        ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
-        HIPoint hiPoint = CGPointMake( 0 , 0 ) ;
-        HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl ) ;
-        OffsetRect( bounds , (short) hiPoint.x , (short) hiPoint.y ) ;
-    }
-#endif
-
-    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 *WXUNUSED(data),
-                                      size_t WXUNUSED(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
 #endif  // wxUSE_GUI

-
-#if wxUSE_BASE
-
-static bool sUMASystemInitialized = false ;
-
-bool UMASystemIsInitialized()
-{
-    return sUMASystemInitialized ;
-}
-
-void UMASetSystemIsInitialized(bool val)
-{
-    sUMASystemInitialized = val;
-}
-
-#endif // wxUSE_BASE