X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54ddeb7e1bb71cd067c667e129726bcdc16948f0..b77b87881bae2e6306366d79e7fe160334b3d4a2:/src/mac/uma.cpp

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index 9e84f4d9e9..68a62c217c 100644
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -1,6 +1,19 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        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/defs.h"
+
+#if wxUSE_GUI
+
 #include "wx/dc.h"
-#include "wx/mac/uma.h"
 #include <MacTextEditor.h>
 
 #ifndef __DARWIN__
@@ -15,591 +28,680 @@
 #  endif
 #endif
 
+#ifndef __DARWIN__
+#include <Scrap.h>
+#endif
+#include "wx/mac/uma.h"
+
+
 // since we have decided that we only support 8.6 upwards we are
 // 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 
+// windows manager, control manager, navigation services etc. are
 // present
 
-static bool	sUMAHasAppearance = false ;
+static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
+static long sUMASystemVersion = 0 ;
 static bool sUMAHasAquaLayout = false ;
-static bool sUMASystemInitialized = 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 bool    sUMAHasWindowManager = false ;
 static long sUMAWindowManagerAttr = 0 ;
 
 bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
 long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }
 bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; }
-bool UMASystemIsInitialized() { return sUMASystemInitialized ; }
+
 
 void UMACleanupToolbox()
 {
-	if ( sUMAHasAppearance )
-	{
-		UnregisterAppearanceClient() ;
-	}
-	if ( NavServicesAvailable() )
-	{
-		NavUnload() ;
-	}
+    if (sUMAHasInittedAppearance)
+    {
+        UnregisterAppearanceClient() ;
+    }
+    if ( NavServicesAvailable() )
+    {
+        NavUnload() ;
+    }
   if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
-	  TXNTerminateTextension( ) ;
+      TXNTerminateTextension( ) ;
 }
-void UMAInitToolbox( UInt16 inMoreMastersCalls )
+void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded )
 {
 #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();
+    ::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
 
-	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 ;
-	}
-		
+    ::InitCursor();
+
+    if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr)
+        sUMASystemVersion = 0x0000 ;
+
+    long theAppearance ;
+    if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
+    {
+        sUMAHasAppearance = true ;
+        OSStatus status = RegisterAppearanceClient();
+        // 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.
+        if (status != appearanceProcessRegisteredErr)
+        {
+            // Appearance client wasn't registered yet.
+            sUMAHasInittedAppearance = true;
+        }
+
+        if ( Gestalt( gestaltAppearanceVersion, &theAppearance ) == noErr )
+        {
+            sUMAAppearanceVersion = theAppearance ;
+        }
+        else
+        {
+            sUMAAppearanceVersion = 0x0100 ;
+        }
+    }
+    if ( Gestalt( gestaltWindowMgrAttr, &sUMAWindowManagerAttr ) == noErr )
+    {
+        sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
+    }
+
 #if TARGET_CARBON
-// Call currently implicitely done :		InitFloatingWindows() ;
+// Call currently implicitely done :        InitFloatingWindows() ;
 #else
-	if ( sUMAHasWindowManager )
-		InitFloatingWindows() ;
-	else
-		InitWindows();
+    if (!isEmbedded)
+    {
+        if ( sUMAHasWindowManager )
+            InitFloatingWindows() ;
+        else
+            InitWindows();
+    }
 #endif
 
-	if ( NavServicesAvailable() )
-	{
-		NavLoad() ;
-	}
+    if ( NavServicesAvailable() )
+    {
+        NavLoad() ;
+    }
+
+  long menuMgrAttr ;
+  Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
+  if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
+    sUMAHasAquaLayout = true ;
 
   if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
-  { 
+  {
     FontFamilyID fontId ;
-	Str255 fontName ;
-	SInt16 fontSize ;
-	Style fontStyle ;
-	GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+    Str255 fontName ;
+    SInt16 fontSize ;
+    Style fontStyle ;
+    GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
     GetFNum( fontName, &fontId );
 
     TXNMacOSPreferredFontDescription fontDescriptions[] =
     {
-        { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding } ,
+        { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
     } ;
     int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
-#if 0 // TARGET_CARBON  
+#if 0 // TARGET_CARBON
     --noOfFontDescriptions ;
 #endif
-  	// kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke
-  	OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ;
+      // kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke
+      OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ;
 #if TARGET_CARBON
     if ( !UMAHasAquaLayout() )
 #endif
     {
         options |= kTXNAlwaysUseQuickDrawTextMask ;
     }
-  	TXNInitTextension(fontDescriptions,  noOfFontDescriptions, options );
+      TXNInitTextension(fontDescriptions,  noOfFontDescriptions, options );
   }
 
-  long menuMgrAttr ;
-  Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
-  if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
-    sUMAHasAquaLayout = true ;
-  sUMASystemInitialized = true ;
+
+  UMASetSystemIsInitialized(true);
 
 }
 
 /*
 Boolean CanUseATSUI()
-	{
-	long result;
-	OSErr err = Gestalt(gestaltATSUVersion, &result);
-	return (err == noErr);
-	}
+    {
+    long result;
+    OSErr err = Gestalt(gestaltATSUVersion, &result);
+    return (err == noErr);
+    }
 */
 // process manager
-long UMAGetProcessMode() 
+long UMAGetProcessMode()
 {
-	OSErr err ; 
-	ProcessInfoRec processinfo;
-	ProcessSerialNumber procno ;
-	
-	procno.highLongOfPSN = NULL ;
-	procno.lowLongOfPSN = kCurrentProcess ;
-	processinfo.processInfoLength = sizeof(ProcessInfoRec);
-	processinfo.processName = NULL;
-	processinfo.processAppSpec = NULL;
+    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 ;
+    err = ::GetProcessInformation( &procno , &processinfo ) ;
+    wxASSERT( err == noErr ) ;
+    return processinfo.processMode ;
 }
 
-bool UMAGetProcessModeDoesActivateOnFGSwitch() 
+bool UMAGetProcessModeDoesActivateOnFGSwitch()
 {
-	return UMAGetProcessMode() & modeDoesActivateOnFGSwitch ;
+    return UMAGetProcessMode() & modeDoesActivateOnFGSwitch ;
 }
 
 // menu manager
 
-void UMASetMenuTitle( MenuRef menu , StringPtr title )
+MenuRef UMANewMenu( SInt16 id , const wxString& 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 ) ) ;
-	}
+    wxString str = wxStripMenuCodes( title ) ;
+    MenuRef menu ;
+#if TARGET_CARBON
+    CreateNewMenu( id , 0 , &menu ) ;
+    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ;
 #else
-*/
-	SetMenuTitle( menu , title ) ;
-//#endif
+    Str255 ptitle ;
+    wxMacStringToPascal( str , ptitle ) ;
+    menu = ::NewMenu( id , ptitle ) ;
+#endif
+    return menu ;
 }
 
-UInt32 UMAMenuEvent( EventRecord *inEvent )
+void UMASetMenuTitle( MenuRef menu , const wxString& title )
 {
-		return MenuEvent( inEvent ) ;
+    wxString str = wxStripMenuCodes( title ) ;
+#if TARGET_CARBON
+    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ;
+#else
+    Str255 ptitle ;
+    wxMacStringToPascal( str , ptitle ) ;
+    SetMenuTitle( menu , ptitle ) ;
+#endif
 }
 
-void 			UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem ) 
+void UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wxString& title )
 {
-	EnableMenuItem( inMenu , inItem ) ;
+    wxString str = wxStripMenuCodes( title ) ;
+#if TARGET_CARBON
+    SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str) ) ;
+#else
+    Str255 ptitle ;
+    wxMacStringToPascal( str , ptitle ) ;
+    SetMenuItemText( menu , item , ptitle ) ;
+#endif
 }
 
-void 			UMADisableMenuItem( MenuRef inMenu , MenuItemIndex inItem ) 
+
+UInt32 UMAMenuEvent( EventRecord *inEvent )
+{
+        return MenuEvent( inEvent ) ;
+}
+
+void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
 {
-	DisableMenuItem( inMenu , inItem ) ;
+    if ( enable )
+        EnableMenuItem( inMenu , inItem ) ;
+    else
+        DisableMenuItem( inMenu , inItem ) ;
 }
 
-void UMAAppendSubMenuItem( MenuRef menu , StringPtr l , SInt16 id ) 
+void UMAAppendSubMenuItem( MenuRef menu , const wxString& title , SInt16 id )
 {
-	Str255 label ;
-	memcpy( label , l , l[0]+1 ) ;
-	// hardcoded adding of the submenu combination for mac
+    MacAppendMenu(menu, "\pA");
+    UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
+    SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
+}
 
-	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 , const wxString& title , MenuItemIndex item , SInt16 id  )
+{
+    MacInsertMenuItem(menu, "\pA" , item);
+    UMASetMenuItemText(menu, item , title );
+    SetMenuItemHierarchicalID( menu , item , id ) ;
 }
 
-void UMAInsertSubMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 id  ) 
+void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry )
 {
-	Str255 label ;
-	memcpy( label , l , l[0]+1 ) ;
-	// hardcoded adding of the submenu combination for mac
+    if ( !entry )
+        return ;
+
+    UInt8 modifiers = 0 ;
+    SInt16 key = entry->GetKeyCode() ;
+    if ( key )
+    {
+        bool explicitCommandKey = false ;
+
+        if ( entry->GetFlags() & wxACCEL_CTRL )
+        {
+            explicitCommandKey = true ;
+        }
+
+        if (entry->GetFlags() & wxACCEL_ALT )
+        {
+            modifiers |= kMenuOptionModifier ;
+        }
 
-	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);
+        if (entry->GetFlags() & wxACCEL_SHIFT)
+        {
+            modifiers |= kMenuShiftModifier ;
+        }
+
+        SInt16 glyph = 0 ;
+        SInt16 macKey = key ;
+        if ( key >= WXK_F1 && key <= WXK_F15 )
+        {
+            // 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 += 13 ;
+            if ( !explicitCommandKey )
+                modifiers |= kMenuNoCommandModifier ;
+          }
+        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_PRIOR : // PAGE UP
+                    macKey = kPageUpCharCode ;
+                    glyph = kMenuPageUpGlyph ;
+                    break ;
+                case WXK_NEXT :
+                    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 ;
+            }
+        }
+
+        SetItemCmd( menu, item , macKey );
+        SetMenuItemModifiers(menu, item , modifiers ) ;
+
+        if ( glyph )
+            SetMenuItemKeyGlyph(menu, item , glyph ) ;
+    }
 }
 
-void UMAAppendMenuItem( MenuRef menu , StringPtr l , SInt16 key, UInt8 modifiers ) 
+void UMAAppendMenuItem( MenuRef menu , const wxString& title , wxAcceleratorEntry *entry )
 {
-	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 ) ;
+    MacAppendMenu(menu, "\pA");
+    UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
+    UMASetMenuItemShortcut( menu ,  (SInt16) ::CountMenuItems(menu), entry ) ;
 }
 
-void UMAInsertMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 key, UInt8 modifiers ) 
+void UMAInsertMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , wxAcceleratorEntry *entry )
 {
-	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) ;
+    MacInsertMenuItem( menu , "\pA" , item) ;
+    UMASetMenuItemText(menu, item+1 , title );
+    UMASetMenuItemShortcut( menu , item+1 , entry ) ;
 }
 
 // quickdraw
 
+#if !TARGET_CARBON
+
 int gPrOpenCounter = 0 ;
 
-OSStatus UMAPrOpen(void *macPrintSession)
+OSStatus UMAPrOpen()
 {
-#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
+    OSErr err = noErr ;
+    ++gPrOpenCounter ;
+    if ( gPrOpenCounter == 1 )
+    {
+        PrOpen() ;
+        err = PrError() ;
+        wxASSERT( err == noErr ) ;
+    }
+    return err ;
 }
 
-OSStatus UMAPrClose(void *macPrintSession)
+OSStatus UMAPrClose()
 {
-#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
+    OSErr err = noErr ;
+    wxASSERT( gPrOpenCounter >= 1 ) ;
+    if ( gPrOpenCounter == 1 )
+    {
+        PrClose() ;
+        err = PrError() ;
+        wxASSERT( err == noErr ) ;
+    }
+    --gPrOpenCounter ;
+    return err ;
 }
 
-#if !TARGET_CARBON
-
 pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
 pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 {
-	return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);
+    return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);
 }
 
 #endif
 
-void UMAShowWatchCursor() 
+void UMAShowWatchCursor()
 {
-	OSErr err = noErr;
+    OSErr err = noErr;
 
-	CursHandle watchFob = GetCursor (watchCursor);
+    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
-	}
+    if (!watchFob)
+        err = nilHandleErr;
+    else
+    {
+    #if TARGET_CARBON
+//        Cursor preservedArrow;
+//        GetQDGlobalsArrow (&preservedArrow);
+//        SetQDGlobalsArrow (*watchFob);
+//        InitCursor ( );
+//        SetQDGlobalsArrow (&preservedArrow);
+        SetCursor (*watchFob);
+    #else
+        SetCursor (*watchFob);
+    #endif
+    }
 }
 
-void			UMAShowArrowCursor() 
+void            UMAShowArrowCursor()
 {
 #if TARGET_CARBON
-	Cursor arrow;
-	SetCursor (GetQDGlobalsArrow (&arrow));
+    Cursor arrow;
+    SetCursor (GetQDGlobalsArrow (&arrow));
 #else
-	SetCursor (&(qd.arrow));
+    SetCursor (&(qd.arrow));
 #endif
 }
 
 // window manager
 
-GrafPtr		UMAGetWindowPort( WindowRef inWindowRef ) 
+GrafPtr        UMAGetWindowPort( WindowRef inWindowRef )
 {
-	wxASSERT( inWindowRef != NULL ) ;
-#if TARGET_CARBON 
-	return (GrafPtr) GetWindowPort( inWindowRef ) ; 
+    wxASSERT( inWindowRef != NULL ) ;
+#if TARGET_CARBON
+    return (GrafPtr) GetWindowPort( inWindowRef ) ;
 #else
-	return (GrafPtr) inWindowRef ;
+    return (GrafPtr) inWindowRef ;
 #endif
 }
 
-void		 	UMADisposeWindow( WindowRef inWindowRef ) 
+void             UMADisposeWindow( WindowRef inWindowRef )
 {
-	wxASSERT( inWindowRef != NULL ) ;
-	DisposeWindow( inWindowRef ) ;
+    wxASSERT( inWindowRef != NULL ) ;
+    DisposeWindow( inWindowRef ) ;
 }
 
-void 			UMASetWTitleC( WindowRef inWindowRef , const char *title ) 
+void UMASetWTitle( WindowRef inWindowRef , const wxString& title )
 {
-	Str255	ptitle ;
-	strncpy( (char*)ptitle , title , 96 ) ;
-	ptitle[96] = 0 ;
 #if TARGET_CARBON
-	c2pstrcpy( ptitle, (char *)ptitle ) ;
+    SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title) ) ;
 #else
-	c2pstr( (char*)ptitle ) ;
+    Str255 ptitle ;
+    wxMacStringToPascal( title , ptitle ) ;
+    SetWTitle( inWindowRef , ptitle ) ;
 #endif
-	SetWTitle( inWindowRef , ptitle ) ;
 }
 
-void 			UMAGetWTitleC( WindowRef inWindowRef , char *title ) 
+void             UMAGetWTitleC( WindowRef inWindowRef , char *title )
 {
-	GetWTitle( inWindowRef , (unsigned char*)title ) ;
+    GetWTitle( inWindowRef , (unsigned char*)title ) ;
 #if TARGET_CARBON
-	p2cstrcpy( title, (unsigned char *)title ) ;
+    p2cstrcpy( title, (unsigned char *)title ) ;
 #else
-	p2cstr( (unsigned char*)title ) ;
+    p2cstr( (unsigned char*)title ) ;
 #endif
 }
 
 // appearance additions
 
-void UMAActivateControl( ControlHandle inControl ) 
+void UMASetControlTitle( ControlHandle inControl , const wxString& title )
+{
+#if TARGET_CARBON
+    SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title) ) ;
+#else
+    Str255 ptitle ;
+    wxMacStringToPascal( title , ptitle ) ;
+    SetControlTitle( inControl , ptitle ) ;
+#endif
+}
+
+void UMAActivateControl( ControlHandle inControl )
 {
     // we have to add the control after again to the update rgn
     // otherwise updates get lost
-  if ( !IsControlActive( inControl ) )
-  {
+    if ( !IsControlActive( inControl ) )
+    {
         bool visible = IsControlVisible( inControl ) ;
         if ( visible )
-          SetControlVisibility( inControl , false , false ) ;
+            SetControlVisibility( inControl , false , false ) ;
         ::ActivateControl( inControl ) ;
         if ( visible ) {
-          SetControlVisibility( inControl , true , false ) ;
-          Rect ctrlBounds ;
-          InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+            SetControlVisibility( inControl , true , false ) ;
+            Rect ctrlBounds ;
+            InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
         }
-  }
+    }
 }
 
-void UMADrawControl( ControlHandle inControl ) 
+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 ) ;
+    Point zero = { 0 , 0 } ;
+    LocalToGlobal( &zero ) ;
+    OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
     ::DrawControlInCurrentPort( inControl ) ;
     InvalWindowRgn( theWindow, updateRgn) ;
-	  DisposeRgn( updateRgn ) ;
+    DisposeRgn( updateRgn ) ;
 }
 
-void UMAMoveControl( ControlHandle inControl , short x , short y ) 
+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) ) ;
-  }
+    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) ) ;
+    }
 }
 
-void UMASizeControl( ControlHandle inControl , short x , short y ) 
+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) ) ;
-  }
+    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) ) ;
+    }
 }
 
-void UMADeactivateControl( ControlHandle inControl ) 
+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)
-{
+    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) ) ;
 }
 
 // shows the control and adds the region to the update region
-void UMAHideControl						(ControlHandle 			inControl)
+void UMAHideControl                        (ControlHandle             inControl)
 {
-        SetControlVisibility( inControl , false , false ) ;
-        Rect ctrlBounds ;
-        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+    SetControlVisibility( inControl , false , false ) ;
+    Rect ctrlBounds ;
+    InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
 }
 // keyboard focus
-OSErr UMASetKeyboardFocus				(WindowPtr 				inWindow,
-								 ControlHandle 			inControl,
-								 ControlFocusPart 		inPart)
+OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,
+                                 ControlHandle             inControl,
+                                 ControlFocusPart         inPart)
 {
-	OSErr err = noErr;
-	GrafPtr port ;
-	GetPort( &port ) ;
+    OSErr err = noErr;
+    GrafPtr port ;
+    GetPort( &port ) ;
 
-	SetPortWindowPort( inWindow ) ;
+    SetPortWindowPort( inWindow ) ;
 
-  err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
-	SetPort( port ) ;
-	return err ;
+    err = SetKeyboardFocus( inWindow , inControl , inPart ) ;
+    SetPort( port ) ;
+    return err ;
 }
 
 
-
-
 // events
-void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) 
+void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn )
 {
-  RgnHandle updateRgn = NewRgn() ;
-  GetWindowUpdateRgn( inWindow , updateRgn ) ;
-
-	Point zero = { 0 , 0 } ;
-	LocalToGlobal( &zero ) ;
-	OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
+    RgnHandle updateRgn = NewRgn() ;
+    GetWindowUpdateRgn( inWindow , updateRgn ) ;
 
-  UpdateControls( inWindow , inRgn ) ;
-  InvalWindowRgn( inWindow, updateRgn) ;
-	DisposeRgn( updateRgn ) ;
+    Point zero = { 0 , 0 } ;
+    LocalToGlobal( &zero ) ;
+    OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
 
+    UpdateControls( inWindow , inRgn ) ;
+    InvalWindowRgn( inWindow, updateRgn) ;
+    DisposeRgn( updateRgn ) ;
 }
 
-bool UMAIsWindowFloating( WindowRef inWindow ) 
+bool UMAIsWindowFloating( WindowRef inWindow )
 {
-	WindowClass cl ;
-	
-	GetWindowClass( inWindow , &cl ) ;
-	return cl == kFloatingWindowClass ;
+    WindowClass cl ;
+
+    GetWindowClass( inWindow , &cl ) ;
+    return cl == kFloatingWindowClass ;
 }
 
-bool UMAIsWindowModal( WindowRef inWindow ) 
+bool UMAIsWindowModal( WindowRef inWindow )
 {
-	WindowClass cl ;
-	
-	GetWindowClass( inWindow , &cl ) ;
-	return cl < kFloatingWindowClass ;
+    WindowClass cl ;
+
+    GetWindowClass( 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 ) ;
-		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 ) 
-{
-  return ::DrawThemePlacard( inRect , inState ) ;
+    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 )
+{
+    return ::DrawThemePlacard( inRect , inState ) ;
 }
 
 #if !TARGET_CARBON
@@ -612,71 +714,105 @@ OSStatus UMAGetHelpMenu(
   MenuItemIndex *  outFirstCustomItemIndex)
 {
 #if TARGET_CARBON
-  return HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
+    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 ;
+    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) 
+wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport)
 {
-  m_clip = NULL ;
-  Setup( newport ) ;
+    m_clip = NULL ;
+    Setup( newport ) ;
 }
 
 wxMacPortStateHelper::wxMacPortStateHelper()
 {
-	m_clip = NULL ;
+    m_clip = NULL ;
 }
 
 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 ;
+    GetPort( &m_oldPort ) ;
+    SetPort( newport ) ;
+    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 ;
-	}
+    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 ) ;
-	}
+    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 )
+    {
+        err = PutScrapFlavor (scrap, type , 0, size, data);
+    }
+#endif
+    return err ;
+}
+
+#endif  // wxUSE_GUI
+
+#if wxUSE_BASE
+
+static bool sUMASystemInitialized = false ;
+
+bool UMASystemIsInitialized()
+{
+    return sUMASystemInitialized ;
+}
+
+void UMASetSystemIsInitialized(bool val)
+{
+    sUMASystemInitialized = val;
 }
 
+
+#endif // wxUSE_BASE