fixing 10.5 only compiles

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 52e0497c558d7000867570bcd526b1fc038ac60f..47a6fb92c8ac7da84a0ef1559b66ccdaa7f79c3b 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -1,1470 +1,316 @@
-#include "wx/defs.h"
-#include "wx/dc.h"
-#include "wx/mac/uma.h"
-#include "wx/mac/aga.h"
-
-#ifndef __UNIX__
-  #include <Navigation.h>
-#endif
-
-// init
-
-#if !TARGET_CARBON
-#define        GetControlOwner( control ) (**control).contrlOwner
-// since we always call this in the right context we don't have to set and reset the port
-#define InvalWindowRgn( window , rgn ) InvalRgn( rgn )
-#endif
-
-static bool    sUMAHasAppearance = false ;
-static long sUMAAppearanceVersion = 0 ;
-extern int gAGABackgroundColor ;
-bool UMAHasAppearance() { return sUMAHasAppearance ; }
-long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }
-
-static bool    sUMAHasWindowManager = false ;
-static long sUMAWindowManagerAttr = 0 ;
-
-bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
-long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }
-void UMACleanupToolbox()
-{
-#if UMA_USE_APPEARANCE
-       if ( sUMAHasAppearance )
-       {
-               UnregisterAppearanceClient() ;
-       }
-#endif
-       if ( NavServicesAvailable() )
-       {
-               NavUnload() ;
-       }
-}
-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
-
-#if UMA_USE_APPEARANCE
-       long theAppearance ;
-       if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
-       {
-               sUMAHasAppearance = true ;
-               RegisterAppearanceClient();
-               if ( Gestalt( gestaltAppearanceVersion, &theAppearance ) == noErr )
-               {
-                       sUMAAppearanceVersion = theAppearance ;
-               }
-               else
-               {
-                       sUMAAppearanceVersion = 0x0100 ;
-               }
-       }
-#endif // UMA_USE_APPEARANCE
-#if UMA_USE_8_6
-#if UMA_USE_WINDOWMGR
-       if ( Gestalt( gestaltWindowMgrAttr, &sUMAWindowManagerAttr ) == noErr )
-       {
-               sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
-       }
-#endif // UMA_USE_WINDOWMGR
-#endif
-               
-#ifndef __UNIX__
-#if TARGET_CARBON
-// Call currently implicitely done :           InitFloatingWindows() ;
-#else
-       if ( sUMAHasWindowManager )
-               InitFloatingWindows() ;
-       else
-               InitWindows();
-#endif
-#endif
-
-       if ( NavServicesAvailable() )
-       {
-               NavLoad() ;
-       }
-}
-
-// 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 ;
-}
-
-bool UMAGetProcessModeDoesActivateOnFGSwitch() 
-{
-       return UMAGetProcessMode() & modeDoesActivateOnFGSwitch ;
-}
-
-// 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
-}
-
-UInt32 UMAMenuEvent( EventRecord *inEvent )
-{
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-               return MenuEvent( inEvent ) ;
-       }
-       else
-#endif
-       {
-                       if ( inEvent->what == keyDown && inEvent->modifiers & cmdKey)
-                       {
-                               return MenuKey( inEvent->message & charCodeMask ) ;
-                       }
-               return NULL ;
-       }
-}
-
-void                   UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem ) 
-{
-#if UMA_USE_8_6 || TARGET_CARBON
-       EnableMenuItem( inMenu , inItem ) ;
-#else
-       EnableItem( inMenu , inItem ) ;
-#endif
-}
-
-void                   UMADisableMenuItem( MenuRef inMenu , MenuItemIndex inItem ) 
-{
-#if UMA_USE_8_6 || TARGET_CARBON
-       DisableMenuItem( inMenu , inItem ) ;
-#else
-       DisableItem( inMenu , inItem ) ;
-#endif
-}
-
-void UMAAppendSubMenuItem( MenuRef menu , StringPtr l , 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;
-       MacAppendMenu(menu, label);
-}
-
-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);
-}
-
-void UMAAppendMenuItem( MenuRef menu , StringPtr l , 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 ;
-       }
-       MacAppendMenu( menu , label ) ;
-}
-
-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) ;
-}
-
-void UMADrawMenuBar() 
-{
-       DrawMenuBar() ;
-}
-
-
-void UMASetMenuItemText( MenuRef menu , MenuItemIndex item , StringPtr label ) 
-{
-       ::SetMenuItemText( menu , item , label ) ;
-}
+/////////////////////////////////////////////////////////////////////////////
+// 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"

 
 

-MenuRef        UMANewMenu( SInt16 menuid , StringPtr label ) 
-{
-       return ::NewMenu(menuid, label);
-}
-
-void UMADisposeMenu( MenuRef menu )
-{
-       DisposeMenu( menu ) ;
-}
-void UMADeleteMenu( SInt16 menuId ) 
-{
-       ::DeleteMenu( menuId ) ;
-}
-
-void UMAInsertMenu( MenuRef insertMenu , SInt16 afterId ) 
-{
-       ::InsertMenu( insertMenu , afterId ) ;
-}
-
-
-// quickdraw
+#include "wx/mac/uma.h"

 
 

-int gPrOpenCounter = 0 ;
+#if wxUSE_GUI

 
 

-#if TARGET_CARBON && PM_USE_SESSION_APIS
-OSStatus UMAPrOpen(PMPrintSession *macPrintSession)
-#else
-OSStatus UMAPrOpen()
-#endif
-{
-#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(macPrintSession) ;
-  #else
-           err = PMBegin() ;
-  #endif
-               wxASSERT( err == noErr ) ;
-       }
-       return err ;
-#endif
-}
+#include "wx/toplevel.h"
+#include "wx/dc.h"

 
 

-#if TARGET_CARBON && PM_USE_SESSION_APIS
-OSStatus UMAPrClose(PMPrintSession *macPrintSession)
-#else
-OSStatus UMAPrClose()
-#endif
-{
-#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(*macPrintSession) ;
-           *macPrintSession = kPMNoReference;
-  #else
-           err = PMEnd() ;
-  #endif
-       }
-       --gPrOpenCounter ;
-       return err ;
-#endif
-}
+#include "wx/mac/uma.h"

 
 

-#if !TARGET_CARBON
+static SInt32 sUMASystemVersion = 0 ;

 
 

-pascal QDGlobalsPtr GetQDGlobalsPtr (void)
-{
-       return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);
+long UMAGetSystemVersion() 
+{ 
+    if ( sUMASystemVersion == 0 )
+    {
+        verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));
+    }
+    return sUMASystemVersion ; 

 }
 
 }
 

-#endif
-
-void UMAShowWatchCursor() 
+void UMAInitToolbox( UInt16 WXUNUSED(inMoreMastersCalls),
+                     bool WXUNUSED(isEmbedded) )

 {
 {

-       OSErr err = noErr;
-
-       CursHandle watchFob = GetCursor (watchCursor);
+#if 0 // ndef __LP64__
+    {
+        FontFamilyID fontId ;
+        Str255 fontName ;
+        SInt16 fontSize ;
+        Style fontStyle ;

 
 

-       if (!watchFob)
-               err = nilHandleErr;
-       else
-       {
-       #if TARGET_CARBON
-               Cursor preservedArrow;
-               GetQDGlobalsArrow (&preservedArrow);
-               SetQDGlobalsArrow (*watchFob);
-               InitCursor ( );
-               SetQDGlobalsArrow (&preservedArrow);
-       #else
-               SetCursor (*watchFob);  
-       #endif
-       }
-}
+        GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+        GetFNum( fontName, &fontId );

 
 

-void                   UMAShowArrowCursor() 
-{
-#if TARGET_CARBON
-       Cursor arrow;
-       SetCursor (GetQDGlobalsArrow (&arrow));
-#else
-       SetCursor (&(qd.arrow));
-#endif
-}
+        TXNMacOSPreferredFontDescription fontDescriptions[] =
+        {
+            { fontId , (fontSize << 16) , kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
+        } ;
+        int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;

 
 

-// window manager
+        OptionBits options = 0 ;

 
 

-GrafPtr                UMAGetWindowPort( WindowRef inWindowRef ) 
-{
-       wxASSERT( inWindowRef != NULL ) ;
-#if TARGET_CARBON 
-       return GetWindowPort( inWindowRef ) ; 
-#else
-       return (GrafPtr) inWindowRef ;
+        TXNInitTextension( fontDescriptions,  noOfFontDescriptions, options );
+    }

 #endif
 }
 
 #endif
 }
 

-void                   UMADisposeWindow( WindowRef inWindowRef ) 
-{
-       wxASSERT( inWindowRef != NULL ) ;
-       DisposeWindow( inWindowRef ) ;
-}
+// menu manager

 
 

-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 ) ;
-}
+#if wxMAC_USE_COCOA == 0

 
 

-void                   UMAGetWTitleC( WindowRef inWindowRef , char *title ) 
+MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding )

 {
 {

-       GetWTitle( inWindowRef , (unsigned char*)title ) ;
-#if TARGET_CARBON
-       p2cstrcpy( title, (unsigned char *)title ) ;
-#else
-       p2cstr( (unsigned char*)title ) ;
-#endif
-}
+    wxString str = wxStripMenuCodes( title ) ;
+    MenuRef menu ;

 
 

-void                   UMAShowWindow( WindowRef inWindowRef ) 
-{
-       ShowWindow( inWindowRef ) ;
+    CreateNewMenu( id , 0 , &menu ) ;
+    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ;

 
 

+    return menu ;

 }
 
 }
 

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

 {
 {

-       HideWindow( inWindowRef) ;
-}
+    wxString str = wxStripMenuCodes( title ) ;

 
 

-void                   UMASelectWindow( WindowRef inWindowRef ) 
-{
-       SelectWindow( inWindowRef ) ;
+    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;

 }
 
 }
 

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

 {
 {

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

 
 

-void                   UMASendBehind( WindowRef inWindowRef , WindowRef behindWindow ) 
-{
-       SendBehind( inWindowRef , behindWindow ) ;
+    SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;

 }
 
 }
 

-void                   UMACloseWindow(WindowRef inWindowRef) 
+void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)

 {
 {

-#if TARGET_CARBON
-#else
-       CloseWindow( inWindowRef ) ;
-#endif
+    if ( enable )
+        EnableMenuItem( inMenu , inItem ) ;
+    else
+        DisableMenuItem( inMenu , inItem ) ;

 }
 
 }
 

-// appearance additions
-
-void UMAActivateControl( ControlHandle inControl ) 
+void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , SInt16 id )

 {
 {

-#if UMA_USE_APPEARANCE
-    if ( UMAHasAppearance() )
-    { 
-      if ( !UMAIsControlActive( 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) ) ;
-        }
-       }
-    }
-    else
-#endif
-#if !TARGET_CARBON
-    {
-        AGAActivateControl( inControl ) ;
-    }
-#else
-    {
-    }
-#endif
+    AppendMenuItemTextWithCFString( menu,
+                                CFSTR("A"), 0, 0,NULL);
+    UMASetMenuItemText( menu, (SInt16) ::CountMenuItems(menu), title , encoding );
+    SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;

 }
 
 }
 

-void UMADrawControl( ControlHandle inControl ) 
+void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , SInt16 id  )

 {
 {

-    WindowRef theWindow = GetControlOwner(inControl) ;
-    RgnHandle updateRgn = NewRgn() ;
-#if TARGET_CARBON
-    GetWindowRegion( theWindow , kWindowUpdateRgn, updateRgn ) ;
-#else
-    GetWindowUpdateRgn( theWindow , updateRgn ) ;
-#endif
-       Point zero = { 0 , 0 } ;
-       LocalToGlobal( &zero ) ;
-       OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
-#if UMA_USE_APPEARANCE
-    if ( UMAHasAppearance() )
-    {
-        ::DrawControlInCurrentPort( inControl ) ;
-    }
-    else
-#endif
-#if !TARGET_CARBON
-    {
-        AGADrawControl( inControl ) ;
-    }
-#else
-    {
-    }
-#endif
-#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0332)
-    InvalWindowRgn( theWindow, updateRgn) ;
-#else
-    InvalRgn( updateRgn ) ;
-#endif
-       DisposeRgn( updateRgn ) ;
+    InsertMenuItemTextWithCFString( menu,
+                CFSTR("A"), item, 0, 0);

 
 

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

 }
 
 }
 

-void UMAMoveControl( ControlHandle inControl , short x , short y ) 
+void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry )

 {
 {

-    if ( UMAHasAppearance() )
-    {
-        bool visible = UMAIsControlVisible( 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) ) ;
-        }
-    }
-}
+    if ( !entry )
+        return ;

 
 

-void UMASizeControl( ControlHandle inControl , short x , short y ) 
-{
-    if ( UMAHasAppearance() )
+    UInt8 modifiers = 0 ;
+    SInt16 key = entry->GetKeyCode() ;
+    if ( key )

     {
     {

-        bool visible = UMAIsControlVisible( inControl ) ;
-        if ( visible ) {
-          SetControlVisibility( inControl , false , false ) ;
-          Rect ctrlBounds ;
-          InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+        bool explicitCommandKey = (entry->GetFlags() & wxACCEL_CTRL);
+
+        if (entry->GetFlags() & wxACCEL_ALT)
+            modifiers |= kMenuOptionModifier ;
+
+        if (entry->GetFlags() & wxACCEL_SHIFT)
+            modifiers |= kMenuShiftModifier ;
+
+        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 )
+                glyph += 12 ;

         }
         }

-        ::SizeControl( inControl , x , y ) ;
-        if ( visible ) {
-          SetControlVisibility( inControl , true , false ) ;
-          Rect ctrlBounds ;
-          InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+        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 UMADeactivateControl( ControlHandle inControl ) 
-{
-    if ( UMAHasAppearance() )
-    {
-      if ( UMAIsControlActive( inControl ) )
-      {
-        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) ) ;
-        }
-       }
-    }
-}
-
-void UMASetThemeWindowBackground              (WindowRef                               inWindow,
-                                               ThemeBrush                      inBrush,
-                                               Boolean                                 inUpdate)
-{
-#if UMA_USE_APPEARANCE
-    if ( UMAHasAppearance() )
-    {
-        ::SetThemeWindowBackground( inWindow ,inBrush , inUpdate ) ;
-    }
-    else
-#endif
-#if !TARGET_CARBON
-    {
-        AGASetThemeWindowBackground( inWindow , inBrush , inUpdate ) ;
-    }
-#else
-    {
-    }
-#endif
-}
-
-void                   UMAApplyThemeBackground                 (ThemeBackgroundKind    inKind,
-                                                                const Rect *                   bounds,
-                                                                ThemeDrawState                 inState,
-                                                                SInt16                                 inDepth,
-                                                                Boolean                                inColorDev)
-{
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-       /*
-               if ( sUMAAppearanceVersion >= 0x0110 )
-                       ::ApplyThemeBackground( inKind ,bounds , inState , inDepth , inColorDev ) ;
-   */
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-       AGAApplyThemeBackground( inKind ,bounds , inState , inDepth , inColorDev ) ;
-   }
-#else
-       {
-       }
-#endif
-}
-
-ControlHandle UMANewControl(WindowPtr                  owningWindow,
-                           const Rect *                boundsRect,
-                           ConstStr255Param            controlTitle,
-                           Boolean                     initiallyVisible,
-                           SInt16                      initialValue,
-                           SInt16                      minimumValue,
-                           SInt16                      maximumValue,
-                           SInt16                      procID,
-                           SInt32                      controlReference)
-{
-       ControlHandle theControl = NULL ;
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-   theControl =  NewControl( owningWindow , boundsRect , controlTitle , initiallyVisible ,
-               initialValue , minimumValue , maximumValue , procID , controlReference ) ;
-       }
-       else
-#endif
-#if !TARGET_CARBON
-       {
-               theControl = AGANewControl( owningWindow , boundsRect , controlTitle , initiallyVisible ,
-               initialValue , minimumValue , maximumValue , procID , controlReference ) ;
-       }
-#else
-       {
-       }
-#endif
-       return theControl ;
-}
-
-void UMADisposeControl (ControlHandle                  theControl)
-{
-    if ( UMAHasAppearance() )
-    {
-        ::DisposeControl( theControl ) ;
-    }
-    else
-    {
-        ::DisposeControl( theControl ) ;
-    }
-}
-
-void UMAHiliteControl  (ControlHandle                  inControl,
-                        ControlPartCode                hiliteState)
-{
-    if ( UMAHasAppearance() )
-    {
-        ::HiliteControl( inControl , hiliteState ) ;
-    }
-    else
-    {
-        ::HiliteControl( inControl , hiliteState ) ;
-    }
-}
-
-// shows the control and adds the region to the update region
-void UMAShowControl                                            (ControlHandle                  inControl)
-{
-    if ( UMAHasAppearance() )
-    {
-        SetControlVisibility( inControl , true , false ) ;
-        Rect ctrlBounds ;
-        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
-    }
-}

 
 

-// Hides the control and adds the region to the update region
-void UMAHideControl                                            (ControlHandle                  inControl)
-{
-    if ( UMAHasAppearance() )
-    {
-        ::HideControl( inControl ) ;
-    }
-    else
-    {
-        ::HideControl( inControl ) ;
-    }
-}
+        // 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 );

 
 

+        SetMenuItemModifiers( menu, item , modifiers ) ;

 
 

-void UMASetControlVisibility                   (ControlHandle                  inControl,
-                                                                Boolean                                inIsVisible,
-                                                                Boolean                                inDoDraw)
-{
-    if ( UMAHasAppearance() )
-    {
-#if UMA_USE_APPEARANCE
-        ::SetControlVisibility( inControl , inIsVisible, inDoDraw ) ;
-#endif
+        if ( glyph )
+            SetMenuItemKeyGlyph( menu, item , glyph ) ;

     }
 }
 
     }
 }
 

-
-
-bool UMAIsControlActive                                        (ControlHandle                  inControl)
-{
-#if TARGET_CARBON
-       return IsControlActive( inControl ) ;
-#else
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-       return IsControlActive( inControl ) ;
-   }
-  else
-#endif
-       return (**inControl).contrlHilite == 0 ;
-#endif
-}
-
-
-bool UMAIsControlVisible                               (ControlHandle                  inControl)
-{
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-       return IsControlVisible( inControl ) ;
-   }
-   else
-#endif
-  {
-#if !TARGET_CARBON
-    return (**inControl).contrlVis == 255 ;
-#endif
-  }
-       return true ;
-}
-
-OSErr UMAGetBestControlRect                            (ControlHandle                  inControl,
-                                                                Rect *                                 outRect,
-                                                                SInt16 *                               outBaseLineOffset)
-{
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-       return GetBestControlRect( inControl , outRect , outBaseLineOffset ) ;
-   }
-  else
-#endif
-#if !TARGET_CARBON
-  {
-       return AGAGetBestControlRect( inControl , outRect , outBaseLineOffset ) ;
-  }
-#else
-       {
-               return noErr ;
-       }
-#endif
-}
-
-
-OSErr UMASetControlFontStyle                           (ControlHandle                  inControl,
-                                                                const ControlFontStyleRec * inStyle)   
-{
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-               return ::SetControlFontStyle( inControl , inStyle ) ;
-       }
-       else
-#endif
-#if !TARGET_CARBON
-               return AGASetControlFontStyle( inControl , inStyle ) ;
-#else
-       {
-               return noErr ;
-       }
-#endif
-}
-
-
-
-// control hierarchy
-
-OSErr UMACreateRootControl                             (WindowPtr                              inWindow,
-                                                                ControlHandle *                outControl)
-{
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-       return CreateRootControl( inWindow , outControl  ) ;
-   }
-  else
-#endif
-#if !TARGET_CARBON
-       return AGACreateRootControl( inWindow , outControl ) ;
-#else
-       {
-               return noErr ;
-       }
-#endif
-}
-
-
-
-OSErr UMAEmbedControl                                  (ControlHandle                  inControl,
-                                                                ControlHandle                  inContainer)
+void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry )

 {
 {

-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-       return EmbedControl( inControl , inContainer ) ;
-   }
-  else
-#endif
-#if !TARGET_CARBON
-       return AGAEmbedControl( inControl , inContainer ) ; ;
-#else
-       {
-               return noErr ;
-       }
-#endif
+    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)
+void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry )

 {
 {

-       OSErr err = noErr;
-       GrafPtr port ;
-       GetPort( &port ) ;
-#if TARGET_CARBON
-       SetPort( GetWindowPort( inWindow ) ) ;
-#else
-       SetPort( inWindow ) ;
-#endif
-       SetOrigin( 0 , 0 ) ;
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-       err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
-   }
-  else
-#endif
-#if !TARGET_CARBON
-       err = AGASetKeyboardFocus( inWindow , inControl , inPart ) ;
-#else
-       {
-       }
-#endif
-       SetPort( port ) ;
-       return err ;
-}
-
+    InsertMenuItemTextWithCFString( menu,
+                CFSTR("A"), item, 0, 0);

 
 

-
-
-// events
-
-ControlPartCode UMAHandleControlClick                          (ControlHandle                  inControl,
-                                                                Point                                  inWhere,
-                                                                SInt16                                 inModifiers,
-                                                                ControlActionUPP               inAction)                
-{
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-       return HandleControlClick( inControl , inWhere , inModifiers , inAction ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-       return AGAHandleControlClick( inControl , inWhere , inModifiers , inAction ) ;
-   }
-#else
-       {
-               return noErr ;
-       }
-#endif
+    // 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 ) ;

 }
 
 }
 

-
-SInt16 UMAHandleControlKey                             (ControlHandle                  inControl,
-                                                                SInt16                                 inKeyCode,
-                                                                SInt16                                 inCharCode,
-                                                                SInt16                                 inModifiers)
-{
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-       return HandleControlKey( inControl , inKeyCode , inCharCode , inModifiers ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-       return AGAHandleControlKey(inControl , inKeyCode , inCharCode , inModifiers ) ;
-   }
-#else
-       {
-               return noErr ;
-       }

 #endif
 #endif

-}

 
 

+#if wxMAC_USE_COCOA == 0

 
 

-                                                                
-void UMAIdleControls                                   (WindowPtr                              inWindow)
-{
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-               IdleControls( inWindow ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-   {
-               AGAIdleControls( inWindow ) ;
-   }
-#else
-       {
-       }
-#endif
-}
+static OSStatus UMAGetHelpMenu(
+                               MenuRef *        outHelpMenu,
+                               MenuItemIndex *  outFirstCustomItemIndex,
+                               bool             allowHelpMenuCreation);

 
 

-void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) 
+static OSStatus UMAGetHelpMenu(
+                               MenuRef *        outHelpMenu,
+                               MenuItemIndex *  outFirstCustomItemIndex,
+                               bool             allowHelpMenuCreation)

 {
 {

-    RgnHandle updateRgn = NewRgn() ;
-#if TARGET_CARBON
-    GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn ) ;
-#else
-    GetWindowUpdateRgn( inWindow , updateRgn ) ;
-#endif
-       Point zero = { 0 , 0 } ;
-       LocalToGlobal( &zero ) ;
-       OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
-#if UMA_USE_APPEARANCE
-    if ( UMAHasAppearance() )
+    static bool s_createdHelpMenu = false ;
+    
+    if ( !s_createdHelpMenu && !allowHelpMenuCreation )

     {
     {

-        UpdateControls( inWindow , inRgn ) ;
+        return paramErr ;

     }
     }

-    else
-#endif
-#if !TARGET_CARBON
-    {
-        AGAUpdateControls( inWindow , inRgn ) ;
-    }
-#else
-    {
-    }
-#endif
-#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0332)
-    InvalWindowRgn( inWindow, updateRgn) ;
-#else
-    InvalRgn( updateRgn ) ;
-#endif
-       DisposeRgn( updateRgn ) ;
-
+    
+    OSStatus status = HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
+    s_createdHelpMenu = ( status == noErr ) ;
+    return status ;

 }
 
 }
 

-OSErr UMAGetRootControl( WindowPtr inWindow , ControlHandle *outControl ) 
+OSStatus UMAGetHelpMenu(
+                        MenuRef *        outHelpMenu,
+                        MenuItemIndex *  outFirstCustomItemIndex)

 {
 {

-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-               return GetRootControl( inWindow , outControl ) ;
-       }
-       else
-#endif
-#if !TARGET_CARBON
-       {
-               return AGAGetRootControl( inWindow , outControl ) ;
-       }
-#else
-       {
-               return noErr ;
-       }
-#endif
+    return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , true );

 }
 
 }
 

-
-// handling control data
-
-OSErr UMASetControlData                                        (ControlHandle                  inControl,
-                                                                ControlPartCode                inPart,
-                                                                ResType                                inTagName,
-                                                                Size                                   inSize,
-                                                                Ptr                                    inData)
+OSStatus UMAGetHelpMenuDontCreate(
+                                  MenuRef *        outHelpMenu,
+                                  MenuItemIndex *  outFirstCustomItemIndex)

 {
 {

-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-        return SetControlData( inControl , inPart , inTagName , inSize , inData ) ;
-   }
-   else
-#endif
-#if !TARGET_CARBON
-               return AGASetControlData( inControl , inPart , inTagName , inSize , inData ) ;
-#else
-       {
-               return noErr ;
-       }
-#endif
-}
-
-
-
-OSErr UMAGetControlData                                        (ControlHandle                  inControl,
-                                                                ControlPartCode                inPart,
-                                                                ResType                                inTagName,
-                                                                Size                                   inBufferSize,
-                                                                Ptr                                    outBuffer,
-                                                                Size *                                 outActualSize)
-{
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-               return ::GetControlData( inControl , inPart , inTagName , inBufferSize , outBuffer , outActualSize ) ;
-       }
-       else
-#endif
-#if !TARGET_CARBON
-       {
-               return AGAGetControlData( inControl , inPart , inTagName , inBufferSize , outBuffer , outActualSize ) ;
-       }
-#else
-       {
-               return noErr ;
-       }
-#endif
-}
-
-
-OSErr UMAGetControlDataSize                            (ControlHandle                  inControl,
-                                                                ControlPartCode                inPart,
-                                                                ResType                                inTagName,
-                                                                Size *                                 outMaxSize)
-{
-#if UMA_USE_APPEARANCE
-       if ( UMAHasAppearance() )
-       {
-               return GetControlDataSize( inControl , inPart , inTagName , outMaxSize ) ;
-       }
-       else
-#endif
-#if !TARGET_CARBON
-       {
-               return AGAGetControlDataSize( inControl , inPart , inTagName , outMaxSize ) ;
-       }
-#else
-       {
-               return noErr ;
-       }
-#endif
-}
-
-
-
-
-
-// system 8.0 changes
-
-short UMAFindWindow( Point inPoint , WindowRef *outWindow )
-{
-       // todo add the additional area codes
-       return FindWindow( inPoint , outWindow ) ;
+    return UMAGetHelpMenu( outHelpMenu , outFirstCustomItemIndex , false );

 }
 
 }
 

-OSStatus UMAGetWindowFeatures( WindowRef inWindowRef , UInt32 *outFeatures )
-{
-#if UMA_USE_WINDOWMGR
-       return GetWindowFeatures( inWindowRef , outFeatures ) ;
-#else
-       return 0 ;

 #endif
 #endif

-}
-
-OSStatus UMAGetWindowRegion( WindowRef inWindowRef , WindowRegionCode inRegionCode , RgnHandle ioWinRgn )
-{
-#if UMA_USE_WINDOWMGR
-       return GetWindowRegion( inWindowRef , inRegionCode , ioWinRgn ) ;
-#else
-       return 0 ;
-#endif
-}
-
-void UMADrawGrowIcon( WindowRef inWindowRef )
-{
-       DrawGrowIcon( inWindowRef ) ;
-}
-
-OSStatus UMACollapseWindow( WindowRef inWindowRef , Boolean inCollapseIt )
-{
-       return CollapseWindow( inWindowRef , inCollapseIt ) ;
-}
-
-OSStatus UMACollapseAllWindows( Boolean inCollapseEm )
-{
-       return CollapseAllWindows( inCollapseEm ) ;
-}
-
-Boolean UMAIsWindowCollapsed( WindowRef inWindowRef )
-{
-       return IsWindowCollapsed( inWindowRef ) ;
-}
-
-Boolean UMAIsWindowCollapsable( WindowRef inWindowRef )
-{
-       return IsWindowCollapsable( inWindowRef ) ;
-}
-
-// system 8.5 changes<MacWindows.h>
-OSStatus       UMACreateNewWindow( WindowClass windowClass , WindowAttributes attributes , const Rect *bounds,  WindowRef *outWindow ) 
-{
-#if UMA_USE_WINDOWMGR
-       if ( UMAHasWindowManager() )
-       {
-               return CreateNewWindow( windowClass , attributes, bounds, outWindow ) ;
-       }
-       else
-#endif
-       {
-               short procID ;
-               if ( UMAHasAppearance() )
-               {
-                       switch( windowClass )
-                       {
-                               case kMovableModalWindowClass :
-                                       procID = kWindowMovableModalDialogProc;
-                                       break ;
-                               case kModalWindowClass :
-                                       procID = kWindowShadowDialogProc;
-                                       break ;
-                               case kFloatingWindowClass :
-                                       if ( attributes & kWindowSideTitlebarAttribute )
-                                       {
-                                               if( ( attributes & kWindowResizableAttribute ) &&  
-                                                       ( attributes & kWindowFullZoomAttribute ) )
-                                               {
-                                                       procID = kWindowFloatSideFullZoomGrowProc ;
-                                               }
-                                               else if( attributes & kWindowFullZoomAttribute )
-                                               {
-                                                       procID = kWindowFloatSideFullZoomProc;
-                                               }
-                                               else if ( attributes & kWindowResizableAttribute )
-                                               {
-                                                       procID = kWindowFloatSideGrowProc;
-                                               }
-                                               else
-                                               {
-                                                       procID = kWindowFloatSideProc;
-                                               }
-                                       }
-                                       else
-                                       {
-                                               if( ( attributes & kWindowResizableAttribute ) &&  
-                                                       ( attributes & kWindowFullZoomAttribute ) )
-                                               {
-                                                       procID = kWindowFloatFullZoomGrowProc ;
-                                               }
-                                               else if( attributes & kWindowFullZoomAttribute )
-                                               {
-                                                       procID = kWindowFloatFullZoomProc;
-                                               }
-                                               else if ( attributes & kWindowResizableAttribute )
-                                               {
-                                                       procID = kWindowFloatGrowProc;
-                                               }
-                                               else
-                                               {
-                                                       procID = kWindowFloatProc;
-                                               }
-                                       }
-                                       break ;
-                               case kDocumentWindowClass :
-                               default :
-                                       if( ( attributes & kWindowResizableAttribute ) &&  
-                                               ( attributes & kWindowFullZoomAttribute ) )
-                                       {
-                                               procID = kWindowFullZoomGrowDocumentProc;
-                                       }
-                                       else if( attributes & kWindowFullZoomAttribute )
-                                       {
-                                               procID = kWindowFullZoomDocumentProc;
-                                       }
-                                       else if ( attributes & kWindowResizableAttribute )
-                                       {
-                                               procID = kWindowGrowDocumentProc;
-                                       }
-                                       else
-                                       {
-                                               procID = kWindowDocumentProc;
-                                       }
-                                       break ;
-                       }
-               }
-               else
-               {
-                       switch( windowClass )
-                       {
-                               case kMovableModalWindowClass :
-                                       procID = movableDBoxProc;
-                                       break ;
-                               case kModalWindowClass :
-                                       procID = altDBoxProc;
-                                       break ;
-                               case kFloatingWindowClass :
-                                       if ( attributes & kWindowSideTitlebarAttribute )
-                                       {
-                                               if( ( attributes & kWindowResizableAttribute ) &&  
-                                                       ( attributes & kWindowFullZoomAttribute ) )
-                                               {
-                                                       procID = floatSideZoomGrowProc ;
-                                               }
-                                               else if( attributes & kWindowFullZoomAttribute )
-                                               {
-                                                       procID = floatSideZoomProc;
-                                               }
-                                               else if ( attributes & kWindowResizableAttribute )
-                                               {
-                                                       procID = floatSideGrowProc;
-                                               }
-                                               else
-                                               {
-                                                       procID = floatSideProc;
-                                               }
-                                       }
-                                       else
-                                       {
-                                               if( ( attributes & kWindowResizableAttribute ) &&  
-                                                       ( attributes & kWindowFullZoomAttribute ) )
-                                               {
-                                                       procID = floatZoomGrowProc ;
-                                               }
-                                               else if( attributes & kWindowFullZoomAttribute )
-                                               {
-                                                       procID = floatZoomProc;
-                                               }
-                                               else if ( attributes & kWindowResizableAttribute )
-                                               {
-                                                       procID = floatGrowProc;
-                                               }
-                                               else
-                                               {
-                                                       procID = floatProc;
-                                               }
-                                       }
-                                       break ;
-                               case kDocumentWindowClass :
-                               default :
-                                       if( ( attributes & kWindowResizableAttribute ) &&  
-                                               ( attributes & kWindowFullZoomAttribute ) )
-                                       {
-                                               procID = zoomDocProc;
-                                       }
-                                       else if( attributes & kWindowFullZoomAttribute )
-                                       {
-                                               procID = zoomNoGrow;
-                                       }
-                                       else if ( attributes & kWindowResizableAttribute )
-                                       {
-                                               procID = documentProc;
-                                       }
-                                       else
-                                       {
-                                               procID = noGrowDocProc;
-                                       }
-                                       break ;
-                                       break ;
-                       }
-               }
-               *outWindow = NewCWindow(nil, bounds, "\p", false, procID,  (WindowRef) -1 /*behind*/,
-                               attributes & kWindowCloseBoxAttribute , (long)NULL);
-               return noErr ;          
-       }
-}
-
-OSStatus       UMAGetWindowClass( WindowRef inWindowRef , WindowClass *outWindowClass ) 
-{
-#if UMA_USE_WINDOWMGR
-       if ( UMAHasWindowManager() )
-       {
-               return GetWindowClass( inWindowRef , outWindowClass ) ;
-       }
-       else
-#endif
-               return kDocumentWindowClass ;
-}
-
-OSStatus       UMAGetWindowAttributes( WindowRef inWindowRef , WindowAttributes *outAttributes ) 
-{
-#if UMA_USE_WINDOWMGR
-       if ( UMAHasWindowManager() )
-       {
-               return GetWindowAttributes( inWindowRef , outAttributes ) ;
-       }
-#endif
-       return kWindowNoAttributes ;
-}
-
-void UMAShowFloatingWindows() 
-{
-#if UMA_USE_WINDOWMGR
-       if ( UMAHasWindowManager() )
-       {
-               ShowFloatingWindows() ;
-       }
-#endif
-}
-
-void UMAHideFloatingWindows() 
-{
-#if UMA_USE_WINDOWMGR
-       if ( UMAHasWindowManager() )
-       {
-               HideFloatingWindows() ;
-       }
-#endif
-}
-
-Boolean        UMAAreFloatingWindowsVisible() 
-{
-#if UMA_USE_WINDOWMGR
-       if ( UMAHasWindowManager() )
-       {
-               return AreFloatingWindowsVisible() ;
-       }
-#endif
-       return false ;
-}
-
-WindowRef UMAFrontNonFloatingWindow()
-{
-#if UMA_USE_WINDOWMGR
-       if ( UMAHasWindowManager() )
-       {
-               return FrontNonFloatingWindow() ;
-       }
-       else
-#endif
-       {
-               return FrontWindow() ;
-       }
-}
-
-WindowRef UMAFrontWindow()
-{
-#if UMA_USE_WINDOWMGR
-       if ( UMAHasWindowManager() )
-       {
-               return FrontWindow() ;
-       }
-       else
-#endif
-       {
-               return FrontWindow() ;
-       }
-}
-
-WindowRef UMAGetActiveNonFloatingWindow()
-{
-       return NULL ;
-}
-
-bool UMAIsWindowFloating( WindowRef inWindow ) 
-{
-       WindowClass cl ;
-       
-       UMAGetWindowClass( inWindow , &cl ) ;
-       return cl == kFloatingWindowClass ;
-}
-
-bool UMAIsWindowModal( WindowRef inWindow ) 
-{
-       WindowClass cl ;
-       
-       UMAGetWindowClass( inWindow , &cl ) ;
-       return cl < kFloatingWindowClass ;
-}
-
-// others
-
-void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
-{
-       if ( inWindowRef )
-       {
-//             bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
-//             if ( inActivate != isHightlited )
-               GrafPtr port ;
-               GetPort( &port ) ;
-#if TARGET_CARBON
-               SetPort( GetWindowPort( inWindowRef ) ) ;
-#else
-               SetPort( inWindowRef ) ;
-#endif
-               SetOrigin( 0 , 0 ) ;
-               HiliteWindow( inWindowRef , inActivate ) ;
-               ControlHandle control = NULL ;
-               UMAGetRootControl( inWindowRef , & control ) ;
-               if ( control )
-               {
-                       if ( inActivate )
-                               UMAActivateControl( control ) ;
-                       else
-                               UMADeactivateControl( control ) ;
-               }       
-               SetPort( port ) ;
-       }
-}
-OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) 
-{
-#if UMA_USE_APPEARANCE
-  if ( UMAHasAppearance() )
-  {
-    ::DrawThemePlacard( inRect , inState ) ;
-  }
-  else
-#endif
-#if !TARGET_CARBON
-  {
-  }
-#else
-  {
-  }
-#endif
-  return noErr ;
-}

 
 

+#endif  // wxUSE_GUI