check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index e975a2adf730a20e515f3f3100cefb698c562743..47a6fb92c8ac7da84a0ef1559b66ccdaa7f79c3b 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -11,141 +11,30 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

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

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

-#ifndef __DARWIN__
-#  include <MacTextEditor.h>
-#  include <Navigation.h>
-#  if defined(TARGET_CARBON)
-#    if PM_USE_SESSION_APIS
-#      include <PMCore.h>
-#    endif
-#    include <PMApplication.h>
-#  else
-#    include <Printing.h>
-#  endif
-#endif
-
-#ifndef __DARWIN__
-#  include <Scrap.h>
-#endif
-

 #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 bool sUMAHasAppearance = false ;
-static long sUMAAppearanceVersion = 0 ;
-static long sUMASystemVersion = 0 ;
-static bool sUMAHasAquaLayout = false ;
-
-static bool sUMAHasInittedAppearance = false;
-
-extern int gAGABackgroundColor ;
-
-bool UMAHasAppearance() { return sUMAHasAppearance ; }
-long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }
-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()
-{
-    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
-
-    ::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 ;
+static SInt32 sUMASystemVersion = 0 ;

 
 

-#if TARGET_CARBON
-// Call currently implicitely done :        InitFloatingWindows() ;
-#else
-    if (!isEmbedded)
+long UMAGetSystemVersion() 
+{ 
+    if ( sUMASystemVersion == 0 )

     {
     {

-        if ( sUMAHasWindowManager )
-            InitFloatingWindows() ;
-        else
-            InitWindows();
+        verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));

     }
     }

-#endif
-
-    if ( NavServicesAvailable() )
-        NavLoad() ;
-
-    long menuMgrAttr ;
-    Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
-    if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
-        sUMAHasAquaLayout = true ;
+    return sUMASystemVersion ; 
+}

 
 

-    if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
+void UMAInitToolbox( UInt16 WXUNUSED(inMoreMastersCalls),
+                     bool WXUNUSED(isEmbedded) )
+{
+#if 0 // ndef __LP64__

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


@@ -163,63 +52,22 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded )
 
         OptionBits options = 0 ;
 
 
         OptionBits options = 0 ;
 

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

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

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

 #endif
 #endif

-
-// process manager
-long UMAGetProcessMode()
-{
-    OSErr err ;
-    ProcessInfoRec processinfo;
-    ProcessSerialNumber procno ;
-
-    procno.highLongOfPSN = 0 ;
-    procno.lowLongOfPSN = kCurrentProcess ;
-    processinfo.processInfoLength = sizeof(ProcessInfoRec);
-    processinfo.processName = NULL;
-    processinfo.processAppSpec = NULL;
-
-    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 ;
 
 MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding )
 {
     wxString str = wxStripMenuCodes( title ) ;
     MenuRef menu ;
 

-#if TARGET_CARBON

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

-#else
-    Str255 ptitle ;
-    wxMacStringToPascal( str , ptitle ) ;
-    menu = ::NewMenu( id , ptitle ) ;
-#endif

 
     return menu ;
 }
 
     return menu ;
 }


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

-#if TARGET_CARBON

     SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;
     SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;

-
-#else
-    Str255 ptitle ;
-    wxMacStringToPascal( str , ptitle ) ;
-    SetMenuTitle( menu , ptitle ) ;
-#endif

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


@@ -243,19 +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 ;
 

-#if TARGET_CARBON

     SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;
     SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;

-
-#else
-    Str255 ptitle ;
-    wxMacStringToPascal( str , ptitle ) ;
-    SetMenuItemText( menu , item , ptitle ) ;
-#endif
-}
-
-UInt32 UMAMenuEvent( EventRecord *inEvent )
-{
-    return MenuEvent( inEvent ) ;

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


@@ -268,14 +97,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 +142,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 +252,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 +262,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 ) ;


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

-// quickdraw
-
-#if !TARGET_CARBON
-
-int gPrOpenCounter = 0 ;
-
-OSStatus UMAPrOpen()
-{
-    OSErr err = noErr ;
-
-    ++gPrOpenCounter ;
-
-    if ( gPrOpenCounter == 1 )
-    {
-        PrOpen() ;
-        err = PrError() ;
-        wxASSERT( err == noErr ) ;
-    }
-
-    return err ;
-}
-
-OSStatus UMAPrClose()
-{
-    OSErr err = noErr ;
-
-    wxASSERT( gPrOpenCounter >= 1 ) ;
-
-    if ( gPrOpenCounter == 1 )
-    {
-        PrClose() ;
-        err = PrError() ;
-        wxASSERT( err == noErr ) ;
-    }
-
-    --gPrOpenCounter ;
-
-    return err ;
-}
-
-pascal QDGlobalsPtr GetQDGlobalsPtr() ;
-pascal QDGlobalsPtr GetQDGlobalsPtr()
-{
-    return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);
-}
-
-#endif
-
-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
-    }
-}
-
-void UMAShowArrowCursor()
-{
-#if TARGET_CARBON
-    Cursor arrow;
-    SetCursor( GetQDGlobalsArrow(&arrow) );
-#else
-    SetCursor (&(qd.arrow));
-#endif
-}
-
-// window manager
-
-GrafPtr UMAGetWindowPort( WindowRef inWindowRef )
-{
-    wxASSERT( inWindowRef != NULL ) ;
-
-#if TARGET_CARBON
-    return (GrafPtr) GetWindowPort( inWindowRef ) ;
-#else
-    return (GrafPtr) inWindowRef ;
-#endif
-}
-
-void UMADisposeWindow( WindowRef inWindowRef )
-{
-    wxASSERT( inWindowRef != NULL ) ;
-
-    DisposeWindow( inWindowRef ) ;
-}
-
-void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding )
-{
-#if TARGET_CARBON
-    SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ;
-
-#else
-    Str255 ptitle ;
-    wxMacStringToPascal( title , ptitle ) ;
-    SetWTitle( inWindowRef , ptitle ) ;
-#endif
-}
-
-// appearance additions
-
-void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding )
-{
-#if TARGET_CARBON
-    SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ;
-
-#else
-    Str255 ptitle ;
-    wxMacStringToPascal( title , ptitle ) ;
-    SetControlTitle( inControl , ptitle ) ;
-#endif
-}
-
-void UMAActivateControl( ControlRef inControl )
-{
-#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 ) )
-    {
-        bool visible = IsControlVisible( inControl ) ;
-        if ( visible )
-            SetControlVisibility( inControl , false , false ) ;
-
-        ::ActivateControl( inControl ) ;
-
-        if ( visible )
-        {
-            SetControlVisibility( inControl , true , false ) ;
-
-            Rect ctrlBounds ;
-            InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ;
-        }
-    }
-#endif
-}
-
-void UMAMoveControl( ControlRef inControl , short x , short y )
-{
-#if TARGET_API_MAC_OSX
-    ::MoveControl( inControl , x , y ) ;
-
-#else
-    bool visible = IsControlVisible( inControl ) ;
-    if ( visible )
-    {
-        SetControlVisibility( inControl , false , false ) ;
-        Rect ctrlBounds ;
-        InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
-    }
-
-    ::MoveControl( inControl , x , y ) ;
-
-    if ( visible )
-    {
-        SetControlVisibility( inControl , true , false ) ;
-        Rect ctrlBounds ;
-        InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
-    }

 #endif
 #endif

-}
-
-void UMASizeControl( ControlRef inControl , short x , short y )
-{
-#if TARGET_API_MAC_OSX
-    ::SizeControl( inControl , x , y ) ;
-
-#else
-    bool visible = IsControlVisible( inControl ) ;
-    if ( visible )
-    {
-        SetControlVisibility( inControl , false , false ) ;
-        Rect ctrlBounds ;
-        InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
-    }

 
 

-    ::SizeControl( inControl , x , y ) ;
+#if wxMAC_USE_COCOA == 0

 
 

-    if ( visible )
-    {
-        SetControlVisibility( inControl , true , false ) ;
-        Rect ctrlBounds ;
-        InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
-    }
-#endif
-}
+static OSStatus UMAGetHelpMenu(
+                               MenuRef *        outHelpMenu,
+                               MenuItemIndex *  outFirstCustomItemIndex,
+                               bool             allowHelpMenuCreation);

 
 

-void UMADeactivateControl( ControlRef inControl )
+static OSStatus UMAGetHelpMenu(
+                               MenuRef *        outHelpMenu,
+                               MenuItemIndex *  outFirstCustomItemIndex,
+                               bool             allowHelpMenuCreation)

 {
 {

-#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 ) ;
-
-    ::DeactivateControl( inControl ) ;
-
-    if ( visible )
+    static bool s_createdHelpMenu = false ;
+    
+    if ( !s_createdHelpMenu && !allowHelpMenuCreation )

     {
     {

-        SetControlVisibility( inControl , true , false ) ;
-        Rect ctrlBounds ;
-        InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ;
+        return paramErr ;

     }
     }

-#endif
-}
-
-// shows the control and adds the region to the update region
-void UMAShowControl( ControlRef inControl )
-{
-    SetControlVisibility( inControl , true , false ) ;
-    Rect ctrlBounds ;
-    InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ;
+    
+    OSStatus status = HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
+    s_createdHelpMenu = ( status == noErr ) ;
+    return status ;

 }
 
 }
 

-// 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) ) ;
-}
-
-// keyboard focus
-OSErr UMASetKeyboardFocus( WindowPtr inWindow,
-                                 ControlRef inControl,
-                                 ControlFocusPart inPart )
-{
-    OSErr err = noErr;
-    GrafPtr port ;
-
-    GetPort( &port ) ;
-    SetPortWindowPort( inWindow ) ;
-
-    err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
-    SetPort( port ) ;
-
-    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 )
-
-        GrafPtr port ;
-        GetPort( &port ) ;
-        SetPortWindowPort( inWindowRef ) ;
-        HiliteWindow( inWindowRef , inActivate ) ;
-        ControlRef control = NULL ;
-        ::GetRootControl( inWindowRef , &control ) ;
-        if ( control )
-        {
-            if ( inActivate )
-                UMAActivateControl( control ) ;
-            else
-                UMADeactivateControl( control ) ;
-        }
-
-        SetPort( port ) ;
-    }
-}
-
-OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
-{
-    return ::DrawThemePlacard( inRect , inState ) ;
-}
-
-#if !TARGET_CARBON
-static OSStatus helpMenuStatus = noErr ;
-static MenuItemIndex firstCustomItemIndex = 0 ;
-#endif
-

 OSStatus UMAGetHelpMenu(
 OSStatus UMAGetHelpMenu(

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

 {
 {

-#if TARGET_CARBON
-    return HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
-
-#else
-    MenuRef helpMenuHandle ;
-
-    helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
-    if ( firstCustomItemIndex == 0 && helpMenuStatus == noErr )
-        firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;
-
-    if ( outFirstCustomItemIndex )
-        *outFirstCustomItemIndex = firstCustomItemIndex ;
-
-    *outHelpMenu = helpMenuHandle ;
-
-    return helpMenuStatus ;
-#endif
+    return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , true );

 }
 
 }
 

-wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport )
+OSStatus UMAGetHelpMenuDontCreate(
+                                  MenuRef *        outHelpMenu,
+                                  MenuItemIndex *  outFirstCustomItemIndex)

 {
 {

-    m_clip = NULL ;
-    Setup( newport ) ;
+    return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , false );

 }
 
 }
 

-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 ) ;
-    }
-}
-
-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 ) ;
-
-#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 ;
-}
-

 #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