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 c9342a3947819817e6d340e8800f32428478b0ee..47a6fb92c8ac7da84a0ef1559b66ccdaa7f79c3b 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -1,666 +1,316 @@
-#include "wx/defs.h"
-#include "wx/dc.h"
-#include "wx/mac/uma.h"
-#include <MacTextEditor.h>
-
-#ifndef __DARWIN__
-#  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
-
-// 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 wxWindows code can safely assume that appearance 1.1
-// windows manager, control manager, navigation services etc. are 
-// present
-
-#define wxUSE_MLTE 0
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/mac/carbon/uma.cpp
+// Purpose:     UMA support
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     The wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"

 
 

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

 
 

-static bool    sUMAHasAppearance = false ;
-static long sUMAAppearanceVersion = 0 ;
-static bool sUMAHasAquaLayout = false ;
-static bool sUMASystemInitialized = false ;
+#if wxUSE_GUI

 
 

-extern int gAGABackgroundColor ;
-bool UMAHasAppearance() { return sUMAHasAppearance ; }
-long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }
+#include "wx/toplevel.h"
+#include "wx/dc.h"

 
 

-static bool    sUMAHasWindowManager = false ;
-static long sUMAWindowManagerAttr = 0 ;
+#include "wx/mac/uma.h"

 
 

-bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
-long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }
-bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; }
-bool UMASystemIsInitialized() { return sUMASystemInitialized ; }
+static SInt32 sUMASystemVersion = 0 ;

 
 

-void UMACleanupToolbox()
-{
-       if ( sUMAHasAppearance )
-       {
-               UnregisterAppearanceClient() ;
-       }
-       if ( NavServicesAvailable() )
-       {
-               NavUnload() ;
-       }
-#if wxUSE_MLTE
-       TXNTerminateTextension( ) ;
-#endif
+long UMAGetSystemVersion() 
+{ 
+    if ( sUMASystemVersion == 0 )
+    {
+        verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));
+    }
+    return sUMASystemVersion ; 

 }
 }

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

 
 

-       long theAppearance ;
-       if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
-       {
-               sUMAHasAppearance = true ;
-               RegisterAppearanceClient();
-               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 ( sUMAHasWindowManager )
-               InitFloatingWindows() ;
-       else
-               InitWindows();
-#endif
+void UMAInitToolbox( UInt16 WXUNUSED(inMoreMastersCalls),
+                     bool WXUNUSED(isEmbedded) )
+{
+#if 0 // ndef __LP64__
+    {
+        FontFamilyID fontId ;
+        Str255 fontName ;
+        SInt16 fontSize ;
+        Style fontStyle ;

 
 

-       if ( NavServicesAvailable() )
-       {
-               NavLoad() ;
-       }
-
-#if wxUSE_MLTE
-  TXNMacOSPreferredFontDescription defaults;
-  defaults.fontID = kFontIDGeneva ;
-  defaults.pointSize = (10 << 16) ;
-  defaults.fontStyle = kTXNDefaultFontStyle;
-  defaults.encoding = kTXNSystemDefaultEncoding;
-       TXNInitTextension(&defaults,  1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
-#endif
-  long menuMgrAttr ;
-  Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
-  if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
-    sUMAHasAquaLayout = true ;
-  sUMASystemInitialized = true ;
+        GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+        GetFNum( fontName, &fontId );

 
 

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

 
 

-/*
-Boolean CanUseATSUI()
-       {
-       long result;
-       OSErr err = Gestalt(gestaltATSUVersion, &result);
-       return (err == noErr);
-       }
-*/
-// process manager
-long UMAGetProcessMode() 
-{
-       OSErr err ; 
-       ProcessInfoRec processinfo;
-       ProcessSerialNumber procno ;
-       
-       procno.highLongOfPSN = NULL ;
-       procno.lowLongOfPSN = kCurrentProcess ;
-       processinfo.processInfoLength = sizeof(ProcessInfoRec);
-       processinfo.processName = NULL;
-       processinfo.processAppSpec = NULL;
-
-       err = ::GetProcessInformation( &procno , &processinfo ) ;
-       wxASSERT( err == noErr ) ;
-       return processinfo.processMode ;
-}
+        OptionBits options = 0 ;

 
 

-bool UMAGetProcessModeDoesActivateOnFGSwitch() 
-{
-       return UMAGetProcessMode() & modeDoesActivateOnFGSwitch ;
+        TXNInitTextension( fontDescriptions,  noOfFontDescriptions, options );
+    }
+#endif

 }
 
 // menu manager
 
 }
 
 // menu manager
 

-void UMASetMenuTitle( MenuRef menu , StringPtr title )
-{
-/*
-#if !TARGET_CARBON
-       long                    size = GetHandleSize( (Handle) menu ) ;
-       const long              headersize = 14 ;
-       int                             oldlen = (**menu).menuData[0] + 1;
-       int                             newlen = title[0] + 1 ;
-       
-       if ( oldlen < newlen )
-       {
-               // enlarge before adjusting
-               SetHandleSize( (Handle) menu , size + (newlen - oldlen ) );
-       }
-
-       if ( oldlen != newlen )
-               memmove( (char*) (**menu).menuData + newlen , (char*) (**menu).menuData + oldlen , size - headersize - oldlen ) ;
-
-       memcpy( (char*) (**menu).menuData , title ,  newlen ) ;
-       if ( oldlen > newlen )
-       {
-               // shrink after
-               SetHandleSize( (Handle) menu , size + (newlen - oldlen ) ) ;
-       }
-#else
-*/
-       SetMenuTitle( menu , title ) ;
-//#endif
-}
+#if wxMAC_USE_COCOA == 0

 
 

-UInt32 UMAMenuEvent( EventRecord *inEvent )
+MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding )

 {
 {

-               return MenuEvent( inEvent ) ;
-}
+    wxString str = wxStripMenuCodes( title ) ;
+    MenuRef menu ;

 
 

-void                   UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem ) 
-{
-       EnableMenuItem( inMenu , inItem ) ;
-}
+    CreateNewMenu( id , 0 , &menu ) ;
+    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ;

 
 

-void                   UMADisableMenuItem( MenuRef inMenu , MenuItemIndex inItem ) 
-{
-       DisableMenuItem( inMenu , inItem ) ;
+    return menu ;

 }
 
 }
 

-void UMAAppendSubMenuItem( MenuRef menu , StringPtr l , SInt16 id ) 
+void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding )

 {
 {

-       Str255 label ;
-       memcpy( label , l , l[0]+1 ) ;
-       // hardcoded adding of the submenu combination for mac
-
-       int theEnd = label[0] + 1; 
-       if (theEnd > 251) 
-               theEnd = 251; // mac allows only 255 characters
-       label[theEnd++] = '/';
-       label[theEnd++] = hMenuCmd; 
-       label[theEnd++] = '!';
-       label[theEnd++] = id ; 
-       label[theEnd] = 0x00;
-       label[0] = theEnd;
-       MacAppendMenu(menu, label);
-}
+    wxString str = wxStripMenuCodes( title ) ;

 
 

-void UMAInsertSubMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 id  ) 
-{
-       Str255 label ;
-       memcpy( label , l , l[0]+1 ) ;
-       // hardcoded adding of the submenu combination for mac
-
-       int theEnd = label[0] + 1; 
-       if (theEnd > 251) 
-               theEnd = 251; // mac allows only 255 characters
-       label[theEnd++] = '/';
-       label[theEnd++] = hMenuCmd; 
-       label[theEnd++] = '!';
-       label[theEnd++] = id; 
-       label[theEnd] = 0x00;
-       label[0] = theEnd;
-       MacInsertMenuItem(menu, label , item);
+    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;

 }
 
 }
 

-void UMAAppendMenuItem( MenuRef menu , StringPtr l , SInt16 key, UInt8 modifiers ) 
+void UMASetMenuItemText( MenuRef menu,  MenuItemIndex item, const wxString& title, wxFontEncoding encoding )

 {
 {

-       Str255 label ;
-       memcpy( label , l , l[0]+1 ) ;
-       if ( key )
-       {
-                       int pos = label[0] ;
-                       label[++pos] = '/';
-                       label[++pos] = toupper( key );
-                       label[0] = pos ;
-       }
-       MacAppendMenu( menu , label ) ;
-}
+    // we don't strip the accels here anymore, must be done before
+    wxString str = title ;

 
 

-void UMAInsertMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 key, UInt8 modifiers ) 
-{
-       Str255 label ;
-       memcpy( label , l , l[0]+1 ) ;
-       if ( key )
-       {
-                       int pos = label[0] ;
-                       label[++pos] = '/';
-                       label[++pos] = toupper( key );
-                       label[0] = pos ;
-       }
-       MacInsertMenuItem( menu , label , item) ;
+    SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;

 }
 
 }
 

-// quickdraw
-
-int gPrOpenCounter = 0 ;
-
-OSStatus UMAPrOpen(void *macPrintSession)
+void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)

 {
 {

-#if !TARGET_CARBON
-       OSErr err = noErr ;
-       ++gPrOpenCounter ;
-       if ( gPrOpenCounter == 1 )
-       {
-               PrOpen() ;
-               err = PrError() ;
-               wxASSERT( err == noErr ) ;
-       }
-       return err ;
-#else
-       OSStatus err = noErr ;
-       ++gPrOpenCounter ;
-       if ( gPrOpenCounter == 1 )
-       {
-  #if PM_USE_SESSION_APIS
-           err = PMCreateSession((PMPrintSession *)macPrintSession) ;
-  #else
-           err = PMBegin() ;
-  #endif
-               wxASSERT( err == noErr ) ;
-       }
-       return err ;
-#endif
+    if ( enable )
+        EnableMenuItem( inMenu , inItem ) ;
+    else
+        DisableMenuItem( inMenu , inItem ) ;

 }
 
 }
 

-OSStatus UMAPrClose(void *macPrintSession)
+void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , SInt16 id )

 {
 {

-#if !TARGET_CARBON
-       OSErr err = noErr ;
-       wxASSERT( gPrOpenCounter >= 1 ) ;
-       if ( gPrOpenCounter == 1 )
-       {
-               PrClose() ;
-               err = PrError() ;
-               wxASSERT( err == noErr ) ;
-       }
-       --gPrOpenCounter ;
-       return err ;
-#else
-       OSStatus err = noErr ;
-       wxASSERT( gPrOpenCounter >= 1 ) ;
-       if ( gPrOpenCounter == 1 )
-       {
-  #if PM_USE_SESSION_APIS
-           err = PMRelease(*(PMPrintSession *)macPrintSession) ;
-           *(PMPrintSession *)macPrintSession = kPMNoReference;
-  #else
-           err = PMEnd() ;
-  #endif
-       }
-       --gPrOpenCounter ;
-       return err ;
-#endif
+    AppendMenuItemTextWithCFString( menu,
+                                CFSTR("A"), 0, 0,NULL);
+    UMASetMenuItemText( menu, (SInt16) ::CountMenuItems(menu), title , encoding );
+    SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;

 }
 
 }
 

-#if !TARGET_CARBON
-
-pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
-pascal QDGlobalsPtr GetQDGlobalsPtr (void)
+void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , SInt16 id  )

 {
 {

-       return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);
-}
-
-#endif
+    InsertMenuItemTextWithCFString( menu,
+                CFSTR("A"), item, 0, 0);

 
 

-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
-       }
+    UMASetMenuItemText( menu, item+1, title , encoding );
+    SetMenuItemHierarchicalID( menu , item+1 , id ) ;

 }
 
 }
 

-void                   UMAShowArrowCursor() 
+void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry )

 {
 {

-#if TARGET_CARBON
-       Cursor arrow;
-       SetCursor (GetQDGlobalsArrow (&arrow));
-#else
-       SetCursor (&(qd.arrow));
-#endif
-}
+    if ( !entry )
+        return ;

 
 

-// window manager
+    UInt8 modifiers = 0 ;
+    SInt16 key = entry->GetKeyCode() ;
+    if ( key )
+    {
+        bool explicitCommandKey = (entry->GetFlags() & wxACCEL_CTRL);

 
 

-GrafPtr                UMAGetWindowPort( WindowRef inWindowRef ) 
-{
-       wxASSERT( inWindowRef != NULL ) ;
-#if TARGET_CARBON 
-       return (GrafPtr) GetWindowPort( inWindowRef ) ; 
-#else
-       return (GrafPtr) inWindowRef ;
-#endif
-}
+        if (entry->GetFlags() & wxACCEL_ALT)
+            modifiers |= kMenuOptionModifier ;

 
 

-void                   UMADisposeWindow( WindowRef inWindowRef ) 
-{
-       wxASSERT( inWindowRef != NULL ) ;
-       DisposeWindow( inWindowRef ) ;
-}
+        if (entry->GetFlags() & wxACCEL_SHIFT)
+            modifiers |= kMenuShiftModifier ;

 
 

-void                   UMASetWTitleC( WindowRef inWindowRef , const char *title ) 
-{
-       Str255  ptitle ;
-       strncpy( (char*)ptitle , title , 96 ) ;
-       ptitle[96] = 0 ;
-#if TARGET_CARBON
-       c2pstrcpy( ptitle, (char *)ptitle ) ;
-#else
-       c2pstr( (char*)ptitle ) ;
-#endif
-       SetWTitle( inWindowRef , ptitle ) ;
-}
+        SInt16 glyph = 0 ;
+        SInt16 macKey = key ;
+        if ( key >= WXK_F1 && key <= WXK_F15 )
+        {
+            if ( !explicitCommandKey )
+                modifiers |= kMenuNoCommandModifier ;

 
 

-void                   UMAGetWTitleC( WindowRef inWindowRef , char *title ) 
-{
-       GetWTitle( inWindowRef , (unsigned char*)title ) ;
-#if TARGET_CARBON
-       p2cstrcpy( title, (unsigned char *)title ) ;
-#else
-       p2cstr( (unsigned char*)title ) ;
-#endif
-}
-
-// appearance additions
-
-void UMAActivateControl( ControlHandle inControl ) 
-{
-    // 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),GetControlBounds(inControl,&ctrlBounds) ) ;
+            // 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 += 12 ;
+        }
+        else
+        {
+            switch ( key )
+            {
+                case WXK_BACK :
+                    macKey = kBackspaceCharCode ;
+                    glyph = kMenuDeleteLeftGlyph ;
+                    break ;
+
+                case WXK_TAB :
+                    macKey = kTabCharCode ;
+                    glyph = kMenuTabRightGlyph ;
+                    break ;
+
+                case kEnterCharCode :
+                    macKey = kEnterCharCode ;
+                    glyph = kMenuEnterGlyph ;
+                    break ;
+
+                case WXK_RETURN :
+                    macKey = kReturnCharCode ;
+                    glyph = kMenuReturnGlyph ;
+                    break ;
+
+                case WXK_ESCAPE :
+                    macKey = kEscapeCharCode ;
+                    glyph = kMenuEscapeGlyph ;
+                    break ;
+
+                case WXK_SPACE :
+                    macKey = ' ' ;
+                    glyph = kMenuSpaceGlyph ;
+                    break ;
+
+                case WXK_DELETE :
+                    macKey = kDeleteCharCode ;
+                    glyph = kMenuDeleteRightGlyph ;
+                    break ;
+
+                case WXK_CLEAR :
+                    macKey = kClearCharCode ;
+                    glyph = kMenuClearGlyph ;
+                    break ;
+
+                case WXK_PAGEUP :
+                    macKey = kPageUpCharCode ;
+                    glyph = kMenuPageUpGlyph ;
+                    break ;
+
+                case WXK_PAGEDOWN :
+                    macKey = kPageDownCharCode ;
+                    glyph = kMenuPageDownGlyph ;
+                    break ;
+
+                case WXK_LEFT :
+                    macKey = kLeftArrowCharCode ;
+                    glyph = kMenuLeftArrowGlyph ;
+                    break ;
+
+                case WXK_UP :
+                    macKey = kUpArrowCharCode ;
+                    glyph = kMenuUpArrowGlyph ;
+                    break ;
+
+                case WXK_RIGHT :
+                    macKey = kRightArrowCharCode ;
+                    glyph = kMenuRightArrowGlyph ;
+                    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 ;
+            }
+
+            // we now allow non command key shortcuts
+            // remove in case this gives problems
+            if ( !explicitCommandKey )
+                modifiers |= kMenuNoCommandModifier ;

         }
         }

-  }
-}
-
-void UMADrawControl( ControlHandle inControl ) 
-{
-    WindowRef theWindow = GetControlOwner(inControl) ;
-    RgnHandle updateRgn = NewRgn() ;
-    GetWindowUpdateRgn( theWindow , updateRgn ) ;
-         Point zero = { 0 , 0 } ;
-         LocalToGlobal( &zero ) ;
-         OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
-    ::DrawControlInCurrentPort( inControl ) ;
-    InvalWindowRgn( theWindow, updateRgn) ;
-         DisposeRgn( updateRgn ) ;
-}

 
 

-void UMAMoveControl( ControlHandle inControl , short x , short y ) 
-{
-  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) ) ;
-  }
-}
+        // 1d and 1e have special meaning to SetItemCmd, so
+        // do not use for these character codes.
+        if (key != WXK_UP && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_LEFT)
+            SetItemCmd( menu, item , macKey );

 
 

-void UMASizeControl( ControlHandle inControl , short x , short y ) 
-{
-  bool visible = IsControlVisible( inControl ) ;
-  if ( visible ) {
-    SetControlVisibility( inControl , false , false ) ;
-    Rect ctrlBounds ;
-    InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
-  } 
-  ::SizeControl( inControl , x , y ) ;
-  if ( visible ) {
-    SetControlVisibility( inControl , true , false ) ;
-    Rect ctrlBounds ;
-    InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
-  }
-}
+        SetMenuItemModifiers( menu, item , modifiers ) ;

 
 

-void UMADeactivateControl( ControlHandle inControl ) 
-{
-    // 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 ) {
-       SetControlVisibility( inControl , true , false ) ;
-       Rect ctrlBounds ;
-       InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
-     }
-}
-// shows the control and adds the region to the update region
-void UMAShowControl                                            (ControlHandle                  inControl)
-{
-        SetControlVisibility( inControl , true , false ) ;
-        Rect ctrlBounds ;
-        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+        if ( glyph )
+            SetMenuItemKeyGlyph( menu, item , glyph ) ;
+    }

 }
 
 }
 

-// shows the control and adds the region to the update region
-void UMAHideControl                                            (ControlHandle                  inControl)
+void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry )

 {
 {

-        SetControlVisibility( inControl , false , false ) ;
-        Rect ctrlBounds ;
-        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+    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 );
+    UMASetMenuItemShortcut( menu , (SInt16) ::CountMenuItems(menu), entry ) ;

 }
 }

-// keyboard focus
-OSErr UMASetKeyboardFocus                              (WindowPtr                              inWindow,
-                                                                ControlHandle                  inControl,
-                                                                ControlFocusPart               inPart)
-{
-       OSErr err = noErr;
-       GrafPtr port ;
-       GetPort( &port ) ;
-
-       SetPortWindowPort( inWindow ) ;
-
-  err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
-       SetPort( port ) ;
-       return err ;
-}
-
-

 
 

-
-// events
-void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) 
+void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry )

 {
 {

-  RgnHandle updateRgn = NewRgn() ;
-  GetWindowUpdateRgn( inWindow , updateRgn ) ;
-
-       Point zero = { 0 , 0 } ;
-       LocalToGlobal( &zero ) ;
-       OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
-
-  UpdateControls( inWindow , inRgn ) ;
-  InvalWindowRgn( inWindow, updateRgn) ;
-       DisposeRgn( updateRgn ) ;
+    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 ) ;

 }
 
 }
 

-bool UMAIsWindowFloating( WindowRef inWindow ) 
-{
-       WindowClass cl ;
-       
-       GetWindowClass( inWindow , &cl ) ;
-       return cl == kFloatingWindowClass ;
-}
+#endif

 
 

-bool UMAIsWindowModal( WindowRef inWindow ) 
-{
-       WindowClass cl ;
-       
-       GetWindowClass( inWindow , &cl ) ;
-       return cl < kFloatingWindowClass ;
-}
+#if wxMAC_USE_COCOA == 0

 
 

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

 
 

-void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
-{
-       if ( inWindowRef )
-       {
-//             bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
-//             if ( inActivate != isHightlited )
-               GrafPtr port ;
-               GetPort( &port ) ;
-               SetPortWindowPort( inWindowRef ) ;
-               HiliteWindow( inWindowRef , inActivate ) ;
-               ControlHandle control = NULL ;
-               ::GetRootControl( inWindowRef , & control ) ;
-               if ( control )
-               {
-                       if ( inActivate )
-                               UMAActivateControl( control ) ;
-                       else
-                               UMADeactivateControl( control ) ;
-               }       
-               SetPort( port ) ;
-       }
-}
-OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) 
+static OSStatus UMAGetHelpMenu(
+                               MenuRef *        outHelpMenu,
+                               MenuItemIndex *  outFirstCustomItemIndex,
+                               bool             allowHelpMenuCreation)

 {
 {

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

 }
 
 }
 

-#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
-}
-
-wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport) 
-{
-  m_clip = NULL ;
-  Setup( newport ) ;
-}
-
-wxMacPortStateHelper::wxMacPortStateHelper()
-{
-       m_clip = NULL ;
+    return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , true );

 }
 
 }
 

-void wxMacPortStateHelper::Setup( GrafPtr newport )
-{
-       GetPort( &m_oldPort ) ;
-       SetPort( newport ) ;
-       wxASSERT_MSG( m_clip == NULL , "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()
+OSStatus UMAGetHelpMenuDontCreate(
+                                  MenuRef *        outHelpMenu,
+                                  MenuItemIndex *  outFirstCustomItemIndex)

 {
 {

-       if ( m_clip )
-       {
-               DisposeRgn( m_clip ) ;
-               DisposeThemeDrawingState( m_drawingState ) ;
-               m_clip = NULL ;
-       }
+    return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , false );

 }
 
 }
 

-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  // wxUSE_GUI