Added spline support to GNOME print

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 12bed007094ab5751ec89f7a11d4a5e693c88885..5eb2fbc5ba94663ba1b5092c633d5a0b27a9bedb 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -9,7 +9,10 @@
 // Licence:     The wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     The wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_GUI
+

 #include "wx/dc.h"
 #include <MacTextEditor.h>
 
 #include "wx/dc.h"
 #include <MacTextEditor.h>
 


@@ -30,17 +33,22 @@
 #endif
 #include "wx/mac/uma.h"
 
 #endif
 #include "wx/mac/uma.h"
 

+#if TARGET_API_MAC_OSX
+#include "wx/toplevel.h"
+#endif
+

 // since we have decided that we only support 8.6 upwards we are
 // checking for these minimum requirements in the startup code of
 // 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 
+// the application so all wxWidgets code can safely assume that appearance 1.1
+// windows manager, control manager, navigation services etc. are

 // present
 
 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static long sUMASystemVersion = 0 ;
 static bool sUMAHasAquaLayout = false ;
 // present
 
 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 ; }
 
 extern int gAGABackgroundColor ;
 bool UMAHasAppearance() { return sUMAHasAppearance ; }


@@ -53,11 +61,11 @@ static long sUMAWindowManagerAttr = 0 ;
 bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
 long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }
 bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; }
 bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
 long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }
 bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; }

-bool UMASystemIsInitialized() { return sUMASystemInitialized ; }
+

 
 void UMACleanupToolbox()
 {
 
 void UMACleanupToolbox()
 {

-    if ( sUMAHasAppearance )
+    if (sUMAHasInittedAppearance)

     {
         UnregisterAppearanceClient() ;
     }
     {
         UnregisterAppearanceClient() ;
     }


@@ -68,34 +76,47 @@ void UMACleanupToolbox()
   if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
       TXNTerminateTextension( ) ;
 }
   if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
       TXNTerminateTextension( ) ;
 }

-void UMAInitToolbox( UInt16 inMoreMastersCalls )
+void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded )

 {
 #if !TARGET_CARBON
     ::MaxApplZone();
     for (long i = 1; i <= inMoreMastersCalls; i++)
         ::MoreMasters();
 
 {
 #if !TARGET_CARBON
     ::MaxApplZone();
     for (long i = 1; i <= inMoreMastersCalls; i++)
         ::MoreMasters();
 

-    ::InitGraf(&qd.thePort);
-    ::InitFonts();
-    ::InitMenus();
-    ::TEInit();
-    ::InitDialogs(0L);
-    ::FlushEvents(everyEvent, 0);
-    ::InitCursor();
+    if (!isEmbedded)
+    {
+        ::InitGraf(&qd.thePort);
+        ::InitFonts();
+        ::InitMenus();
+        ::TEInit();
+        ::InitDialogs(0L);
+        ::FlushEvents(everyEvent, 0);
+    }
+

     long total,contig;
     PurgeSpace(&total, &contig);
     long total,contig;
     PurgeSpace(&total, &contig);

-#else
-    InitCursor();

 #endif
 
 #endif
 

+    ::InitCursor();
+

     if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr)
         sUMASystemVersion = 0x0000 ;
     if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr)
         sUMASystemVersion = 0x0000 ;

-        
+

     long theAppearance ;
     if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
     {
         sUMAHasAppearance = true ;
     long theAppearance ;
     if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr )
     {
         sUMAHasAppearance = true ;

-        RegisterAppearanceClient();
+        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 ;
         if ( Gestalt( gestaltAppearanceVersion, &theAppearance ) == noErr )
         {
             sUMAAppearanceVersion = theAppearance ;


@@ -109,14 +130,17 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
     {
         sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
     }
     {
         sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
     }

-        
+

 #if TARGET_CARBON
 // Call currently implicitely done :        InitFloatingWindows() ;
 #else
 #if TARGET_CARBON
 // Call currently implicitely done :        InitFloatingWindows() ;
 #else

-    if ( sUMAHasWindowManager )
-        InitFloatingWindows() ;
-    else
-        InitWindows();
+    if (!isEmbedded)
+    {
+        if ( sUMAHasWindowManager )
+            InitFloatingWindows() ;
+        else
+            InitWindows();
+    }

 #endif
 
     if ( NavServicesAvailable() )
 #endif
 
     if ( NavServicesAvailable() )


@@ -130,7 +154,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
     sUMAHasAquaLayout = true ;
 
   if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
     sUMAHasAquaLayout = true ;
 
   if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )

-  { 
+  {

     FontFamilyID fontId ;
     Str255 fontName ;
     SInt16 fontSize ;
     FontFamilyID fontId ;
     Str255 fontName ;
     SInt16 fontSize ;


@@ -140,25 +164,21 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 
     TXNMacOSPreferredFontDescription fontDescriptions[] =
     {
 
     TXNMacOSPreferredFontDescription fontDescriptions[] =
     {

-        { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding } ,
+        { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }

     } ;
     int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
     } ;
     int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;

-#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 ;
-#if TARGET_CARBON
-    if ( !UMAHasAquaLayout() )
-#endif
+
+    OptionBits options = 0 ;
+
+    if ( UMAGetSystemVersion() < 0x1000 )

     {
         options |= kTXNAlwaysUseQuickDrawTextMask ;
     }
     {
         options |= kTXNAlwaysUseQuickDrawTextMask ;
     }

-      TXNInitTextension(fontDescriptions,  noOfFontDescriptions, options );
+    TXNInitTextension(fontDescriptions,  noOfFontDescriptions, options );

   }
 
 
   }
 
 

-  sUMASystemInitialized = true ;
+  UMASetSystemIsInitialized(true);

 
 }
 
 
 }
 


@@ -171,13 +191,13 @@ Boolean CanUseATSUI()
     }
 */
 // process manager
     }
 */
 // process manager

-long UMAGetProcessMode() 
+long UMAGetProcessMode()

 {
 {

-    OSErr err ; 
+    OSErr err ;

     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;
     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;

-    
-    procno.highLongOfPSN = NULL ;
+
+    procno.highLongOfPSN = 0 ;

     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     processinfo.processName = NULL;
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     processinfo.processName = NULL;


@@ -188,20 +208,20 @@ long UMAGetProcessMode()
     return processinfo.processMode ;
 }
 
     return processinfo.processMode ;
 }
 

-bool UMAGetProcessModeDoesActivateOnFGSwitch() 
+bool UMAGetProcessModeDoesActivateOnFGSwitch()

 {
     return UMAGetProcessMode() & modeDoesActivateOnFGSwitch ;
 }
 
 // menu manager
 
 {
     return UMAGetProcessMode() & modeDoesActivateOnFGSwitch ;
 }
 
 // menu manager
 

-MenuRef UMANewMenu( SInt16 id , const wxString& title )
+MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding )

 {
     wxString str = wxStripMenuCodes( title ) ;
     MenuRef menu ;
 #if TARGET_CARBON
     CreateNewMenu( id , 0 , &menu ) ;
 {
     wxString str = wxStripMenuCodes( title ) ;
     MenuRef menu ;
 #if TARGET_CARBON
     CreateNewMenu( id , 0 , &menu ) ;

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

 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;


@@ -210,11 +230,11 @@ MenuRef UMANewMenu( SInt16 id , const wxString& title )
     return menu ;
 }
 
     return menu ;
 }
 

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

 {
     wxString str = wxStripMenuCodes( title ) ;
 #if TARGET_CARBON
 {
     wxString str = wxStripMenuCodes( title ) ;
 #if TARGET_CARBON

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

 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;


@@ -222,11 +242,11 @@ void UMASetMenuTitle( MenuRef menu , const wxString& title )
 #endif
 }
 
 #endif
 }
 

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

 {
     wxString str = wxStripMenuCodes( title ) ;
 #if TARGET_CARBON
 {
     wxString str = wxStripMenuCodes( title ) ;
 #if TARGET_CARBON

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

 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;


@@ -240,7 +260,7 @@ UInt32 UMAMenuEvent( EventRecord *inEvent )
         return MenuEvent( inEvent ) ;
 }
 
         return MenuEvent( inEvent ) ;
 }
 

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

 {
     if ( enable )
         EnableMenuItem( inMenu , inItem ) ;
 {
     if ( enable )
         EnableMenuItem( inMenu , inItem ) ;


@@ -248,42 +268,42 @@ void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
         DisableMenuItem( inMenu , inItem ) ;
 }
 
         DisableMenuItem( inMenu , inItem ) ;
 }
 

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

 {
     MacAppendMenu(menu, "\pA");
 {
     MacAppendMenu(menu, "\pA");

-    UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
+    UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );

     SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
 }
 
     SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
 }
 

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

 {
     MacInsertMenuItem(menu, "\pA" , item);
 {
     MacInsertMenuItem(menu, "\pA" , item);

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

 }
 
 void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry )
 {
     if ( !entry )
         return ;
 }
 
 void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry )
 {
     if ( !entry )
         return ;

-        
+

     UInt8 modifiers = 0 ;
     SInt16 key = entry->GetKeyCode() ;
     if ( key )
     {
         bool explicitCommandKey = false ;
 
     UInt8 modifiers = 0 ;
     SInt16 key = entry->GetKeyCode() ;
     if ( key )
     {
         bool explicitCommandKey = false ;
 

-        if ( entry->GetFlags() & wxACCEL_CTRL ) 
+        if ( entry->GetFlags() & wxACCEL_CTRL )

         {
             explicitCommandKey = true ;
         }
 
         {
             explicitCommandKey = true ;
         }
 

-        if (entry->GetFlags() & wxACCEL_ALT ) 
+        if (entry->GetFlags() & wxACCEL_ALT )

         {
             modifiers |= kMenuOptionModifier ;
         }
 
         {
             modifiers |= kMenuOptionModifier ;
         }
 

-        if (entry->GetFlags() & wxACCEL_SHIFT) 
+        if (entry->GetFlags() & wxACCEL_SHIFT)

         {
             modifiers |= kMenuShiftModifier ;
         }
         {
             modifiers |= kMenuShiftModifier ;
         }


@@ -292,69 +312,16 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
         SInt16 macKey = key ;
         if ( key >= WXK_F1 && key <= WXK_F15 )
         {
         SInt16 macKey = key ;
         if ( key >= WXK_F1 && key <= WXK_F15 )
         {

-            macKey = kFunctionKeyCharCode ;
+            // 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 ;
             glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
             if ( key >= WXK_F13 )
                 glyph += 13 ;
             if ( !explicitCommandKey )
                 modifiers |= kMenuNoCommandModifier ;

-                
-            switch( key )
-            {
-                case WXK_F1 :
-                    macKey += ( 0x7a << 8 ) ;
-                    break ;
-                case WXK_F2 :
-                    macKey += ( 0x78 << 8 ) ;
-                    break ;
-                case WXK_F3 :
-                    macKey += ( 0x63 << 8 ) ;
-                    break ;
-                case WXK_F4 :
-                    macKey += ( 0x76 << 8 ) ;
-                    break ;
-                case WXK_F5 :
-                    macKey += ( 0x60 << 8 ) ;
-                    break ;
-                case WXK_F6 :
-                    macKey += ( 0x61 << 8 ) ;
-                    break ;
-                case WXK_F7 :
-                    macKey += ( 0x62 << 8 ) ;
-                    break ;
-                case WXK_F8 :
-                    macKey += ( 0x64 << 8 ) ;
-                    break ;
-                case WXK_F9 :
-                    macKey += ( 0x65 << 8 ) ;
-                    break ;
-                case WXK_F10 :
-                    macKey += ( 0x6D << 8 ) ;
-                    break ;
-                case WXK_F11 :
-                    macKey += ( 0x67 << 8 ) ;
-                    break ;
-                case WXK_F12 :
-                    macKey += ( 0x6F << 8 ) ;
-                    break ;
-                case WXK_F13 :
-                    macKey += ( 0x69 << 8 ) ;
-                    break ;
-                case WXK_F14 :
-                    macKey += ( 0x6B << 8 ) ;
-                    break ;
-                case WXK_F15 :
-                    macKey += ( 0x71 << 8 ) ;
-                    break ;
-                default :
-                    break ;
-            } ;
-            // unfortunately this does not yet trigger the right key ,
-            // for some reason mac justs picks the first function key menu
-            // defined, so we turn this off
-            macKey = 0 ;
-            glyph = 0 ;
-          }
+        }

         else
         {
             switch( key )
         else
         {
             switch( key )


@@ -415,10 +382,21 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
                     macKey = kDownArrowCharCode ;
                     glyph = kMenuDownArrowGlyph ;
                     break ;
                     macKey = kDownArrowCharCode ;
                     glyph = kMenuDownArrowGlyph ;
                     break ;

+                default :
+                    macKey = toupper( key ) ;
+                    break ;

             }
             }

+            // we now allow non command key shortcuts
+            // remove in case this gives problems
+            if ( !explicitCommandKey )
+                modifiers |= kMenuNoCommandModifier ;

         }
 
         }
 

-        SetItemCmd( menu, item , macKey );
+        // 1d and 1e have special meaning to SetItemCmd, so
+        // do not use for these character codes.
+        if (key != WXK_UP && key != WXK_RIGHT)
+            SetItemCmd( menu, item , macKey );
+

         SetMenuItemModifiers(menu, item , modifiers ) ;
 
         if ( glyph )
         SetMenuItemModifiers(menu, item , modifiers ) ;
 
         if ( glyph )


@@ -426,27 +404,32 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
     }
 }
 
     }
 }
 

-void UMAAppendMenuItem( MenuRef menu , const wxString& title , wxAcceleratorEntry *entry ) 
+void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry )

 {
     MacAppendMenu(menu, "\pA");
 {
     MacAppendMenu(menu, "\pA");

-    UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
+    // 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 ) ;
 }
 
     UMASetMenuItemShortcut( menu ,  (SInt16) ::CountMenuItems(menu), entry ) ;
 }
 

-void UMAInsertMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , wxAcceleratorEntry *entry ) 
+void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry )

 {
 {

-    MacInsertMenuItem( menu , "\p" , item) ;
-    UMASetMenuItemText(menu, item , title );
-    UMASetMenuItemShortcut( menu , item , entry ) ;
+    MacInsertMenuItem( menu , "\pA" , item) ;
+    // 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 ) ;

 }
 
 // quickdraw
 
 }
 
 // quickdraw
 

+#if !TARGET_CARBON
+

 int gPrOpenCounter = 0 ;
 
 int gPrOpenCounter = 0 ;
 

-OSStatus UMAPrOpen(void *macPrintSession)
+OSStatus UMAPrOpen()

 {
 {

-#if !TARGET_CARBON

     OSErr err = noErr ;
     ++gPrOpenCounter ;
     if ( gPrOpenCounter == 1 )
     OSErr err = noErr ;
     ++gPrOpenCounter ;
     if ( gPrOpenCounter == 1 )


@@ -456,25 +439,10 @@ OSStatus UMAPrOpen(void *macPrintSession)
         wxASSERT( err == noErr ) ;
     }
     return err ;
         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

 }
 
 }
 

-OSStatus UMAPrClose(void *macPrintSession)
+OSStatus UMAPrClose()

 {
 {

-#if !TARGET_CARBON

     OSErr err = noErr ;
     wxASSERT( gPrOpenCounter >= 1 ) ;
     if ( gPrOpenCounter == 1 )
     OSErr err = noErr ;
     wxASSERT( gPrOpenCounter >= 1 ) ;
     if ( gPrOpenCounter == 1 )


@@ -485,25 +453,8 @@ OSStatus UMAPrClose(void *macPrintSession)
     }
     --gPrOpenCounter ;
     return err ;
     }
     --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

 }
 
 }
 

-#if !TARGET_CARBON
-

 pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
 pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 {
 pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
 pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 {


@@ -512,7 +463,7 @@ pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 
 #endif
 
 
 #endif
 

-void UMAShowWatchCursor() 
+void UMAShowWatchCursor()

 {
     OSErr err = noErr;
 
 {
     OSErr err = noErr;
 


@@ -528,14 +479,14 @@ void UMAShowWatchCursor()
 //        SetQDGlobalsArrow (*watchFob);
 //        InitCursor ( );
 //        SetQDGlobalsArrow (&preservedArrow);
 //        SetQDGlobalsArrow (*watchFob);
 //        InitCursor ( );
 //        SetQDGlobalsArrow (&preservedArrow);

-        SetCursor (*watchFob);    
+        SetCursor (*watchFob);

     #else
     #else

-        SetCursor (*watchFob);    
+        SetCursor (*watchFob);

     #endif
     }
 }
 
     #endif
     }
 }
 

-void            UMAShowArrowCursor() 
+void            UMAShowArrowCursor()

 {
 #if TARGET_CARBON
     Cursor arrow;
 {
 #if TARGET_CARBON
     Cursor arrow;


@@ -547,26 +498,26 @@ void            UMAShowArrowCursor()
 
 // window manager
 
 
 // window manager
 

-GrafPtr        UMAGetWindowPort( WindowRef inWindowRef ) 
+GrafPtr        UMAGetWindowPort( WindowRef inWindowRef )

 {
     wxASSERT( inWindowRef != NULL ) ;
 {
     wxASSERT( inWindowRef != NULL ) ;

-#if TARGET_CARBON 
-    return (GrafPtr) GetWindowPort( inWindowRef ) ; 
+#if TARGET_CARBON
+    return (GrafPtr) GetWindowPort( inWindowRef ) ;

 #else
     return (GrafPtr) inWindowRef ;
 #endif
 }
 
 #else
     return (GrafPtr) inWindowRef ;
 #endif
 }
 

-void             UMADisposeWindow( WindowRef inWindowRef ) 
+void             UMADisposeWindow( WindowRef inWindowRef )

 {
     wxASSERT( inWindowRef != NULL ) ;
     DisposeWindow( inWindowRef ) ;
 }
 
 {
     wxASSERT( inWindowRef != NULL ) ;
     DisposeWindow( inWindowRef ) ;
 }
 

-void UMASetWTitle( WindowRef inWindowRef , const wxString& title ) 
+void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding)

 {
 #if TARGET_CARBON
 {
 #if TARGET_CARBON

-    SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title) ) ;
+    SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ;

 #else
     Str255 ptitle ;
     wxMacStringToPascal( title , ptitle ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( title , ptitle ) ;


@@ -574,22 +525,12 @@ void UMASetWTitle( WindowRef inWindowRef , const wxString& title )
 #endif
 }
 
 #endif
 }
 

-void             UMAGetWTitleC( WindowRef inWindowRef , char *title ) 
-{
-    GetWTitle( inWindowRef , (unsigned char*)title ) ;
-#if TARGET_CARBON
-    p2cstrcpy( title, (unsigned char *)title ) ;
-#else
-    p2cstr( (unsigned char*)title ) ;
-#endif
-}
-

 // appearance additions
 
 // appearance additions
 

-void UMASetControlTitle( ControlHandle inControl , const wxString& title ) 
+void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding)

 {
 #if TARGET_CARBON
 {
 #if TARGET_CARBON

-    SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title) ) ;
+    SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ;

 #else
     Str255 ptitle ;
     wxMacStringToPascal( title , ptitle ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( title , ptitle ) ;


@@ -597,8 +538,9 @@ void UMASetControlTitle( ControlHandle inControl , const wxString& title )
 #endif
 }
 
 #endif
 }
 

-void UMAActivateControl( ControlHandle inControl ) 
+void UMAActivateControl( ControlRef inControl )

 {
 {

+#if !TARGET_API_MAC_OSX

     // we have to add the control after again to the update rgn
     // otherwise updates get lost
     if ( !IsControlActive( inControl ) )
     // we have to add the control after again to the update rgn
     // otherwise updates get lost
     if ( !IsControlActive( inControl ) )


@@ -606,92 +548,95 @@ void UMAActivateControl( ControlHandle inControl )
         bool visible = IsControlVisible( inControl ) ;
         if ( visible )
             SetControlVisibility( inControl , false , false ) ;
         bool visible = IsControlVisible( inControl ) ;
         if ( visible )
             SetControlVisibility( inControl , false , false ) ;

+#endif    

         ::ActivateControl( inControl ) ;
         ::ActivateControl( inControl ) ;

+#if !TARGET_API_MAC_OSX

         if ( visible ) {
             SetControlVisibility( inControl , true , false ) ;
         if ( visible ) {
             SetControlVisibility( inControl , true , false ) ;

+        

             Rect ctrlBounds ;
             Rect ctrlBounds ;

-            InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+            InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;

         }
     }
         }
     }

+#endif    

 }
 
 }
 

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

 {
 {

+#if !TARGET_API_MAC_OSX

     bool visible = IsControlVisible( inControl ) ;
     if ( visible ) {
         SetControlVisibility( inControl , false , 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) ) ;
     }

+#endif    

     ::MoveControl( inControl , x , y ) ;
     ::MoveControl( inControl , x , y ) ;

+#if !TARGET_API_MAC_OSX

     if ( visible ) {
         SetControlVisibility( inControl , true , false ) ;
         Rect ctrlBounds ;
         InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
     }
     if ( visible ) {
         SetControlVisibility( inControl , true , false ) ;
         Rect ctrlBounds ;
         InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
     }

+#endif

 }
 
 }
 

-void UMASizeControl( ControlHandle inControl , short x , short y ) 
+void UMASizeControl( ControlRef inControl , short x , short y )

 {
 {

+#if !TARGET_API_MAC_OSX

     bool visible = IsControlVisible( inControl ) ;
     if ( visible ) {
         SetControlVisibility( inControl , false , 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) ) ;

-    } 
+    }
+#endif

     ::SizeControl( inControl , x , y ) ;
     ::SizeControl( inControl , x , y ) ;

+#if !TARGET_API_MAC_OSX

     if ( visible ) {
         SetControlVisibility( inControl , true , false ) ;
         Rect ctrlBounds ;
         InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
     }
     if ( visible ) {
         SetControlVisibility( inControl , true , false ) ;
         Rect ctrlBounds ;
         InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
     }

+#endif

 }
 
 }
 

-void UMADeactivateControl( ControlHandle inControl ) 
+void UMADeactivateControl( ControlRef inControl )

 {
 {

+#if !TARGET_API_MAC_OSX

     // 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 ) ;
     // 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 ) ;

+#endif

     ::DeactivateControl( inControl ) ;
     ::DeactivateControl( inControl ) ;

+#if !TARGET_API_MAC_OSX

     if ( visible ) {
         SetControlVisibility( inControl , true , false ) ;
         Rect ctrlBounds ;
     if ( visible ) {
         SetControlVisibility( inControl , true , false ) ;
         Rect ctrlBounds ;

-        InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+        InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;

     }
     }

+#endif

 }
 // shows the control and adds the region to the update region
 }
 // shows the control and adds the region to the update region

-void UMAShowControl                        (ControlHandle             inControl)
+void UMAShowControl                        (ControlRef             inControl)

 {
     SetControlVisibility( inControl , true , false ) ;
     Rect ctrlBounds ;
 {
     SetControlVisibility( inControl , true , false ) ;
     Rect ctrlBounds ;

-    InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+    InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;

 }
 
 }
 

-// shows the control and adds the region to the update region
-void UMAHideControl                        (ControlHandle             inControl)
+// hides the control and adds the region to the update region
+void UMAHideControl                        (ControlRef             inControl)

 {
     SetControlVisibility( inControl , false , false ) ;
     Rect ctrlBounds ;
 {
     SetControlVisibility( inControl , false , false ) ;
     Rect ctrlBounds ;

-    InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+    InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;

 }
 // keyboard focus
 OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,
 }
 // keyboard focus
 OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,

-                                 ControlHandle             inControl,
+                                 ControlRef             inControl,

                                  ControlFocusPart         inPart)
 {
     OSErr err = noErr;
                                  ControlFocusPart         inPart)
 {
     OSErr err = noErr;


@@ -705,34 +650,18 @@ OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,
     return err ;
 }
 
     return err ;
 }
 

-
-// events
-void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) 
-{
-    RgnHandle updateRgn = NewRgn() ;
-    GetWindowUpdateRgn( inWindow , updateRgn ) ;
-    
-    Point zero = { 0 , 0 } ;
-    LocalToGlobal( &zero ) ;
-    OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
-    
-    UpdateControls( inWindow , inRgn ) ;
-    InvalWindowRgn( inWindow, updateRgn) ;
-    DisposeRgn( updateRgn ) ;
-}
-
-bool UMAIsWindowFloating( WindowRef inWindow ) 
+bool UMAIsWindowFloating( WindowRef inWindow )

 {
     WindowClass cl ;
 {
     WindowClass cl ;

-    
+

     GetWindowClass( inWindow , &cl ) ;
     return cl == kFloatingWindowClass ;
 }
 
     GetWindowClass( inWindow , &cl ) ;
     return cl == kFloatingWindowClass ;
 }
 

-bool UMAIsWindowModal( WindowRef inWindow ) 
+bool UMAIsWindowModal( WindowRef inWindow )

 {
     WindowClass cl ;
 {
     WindowClass cl ;

-    
+

     GetWindowClass( inWindow , &cl ) ;
     return cl < kFloatingWindowClass ;
 }
     GetWindowClass( inWindow , &cl ) ;
     return cl < kFloatingWindowClass ;
 }


@@ -749,7 +678,7 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
         GetPort( &port ) ;
         SetPortWindowPort( inWindowRef ) ;
         HiliteWindow( inWindowRef , inActivate ) ;
         GetPort( &port ) ;
         SetPortWindowPort( inWindowRef ) ;
         HiliteWindow( inWindowRef , inActivate ) ;

-        ControlHandle control = NULL ;
+        ControlRef control = NULL ;

         ::GetRootControl( inWindowRef , & control ) ;
         if ( control )
         {
         ::GetRootControl( inWindowRef , & control ) ;
         if ( control )
         {


@@ -757,12 +686,12 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
                 UMAActivateControl( control ) ;
             else
                 UMADeactivateControl( control ) ;
                 UMAActivateControl( control ) ;
             else
                 UMADeactivateControl( control ) ;

-        }    
+        }

         SetPort( port ) ;
     }
 }
 
         SetPort( port ) ;
     }
 }
 

-OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) 
+OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )

 {
     return ::DrawThemePlacard( inRect , inState ) ;
 }
 {
     return ::DrawThemePlacard( inRect , inState ) ;
 }


@@ -794,7 +723,7 @@ OSStatus UMAGetHelpMenu(
 #endif
 }
 
 #endif
 }
 

-wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport) 
+wxMacPortStateHelper::wxMacPortStateHelper( GrafPtr newport)

 {
     m_clip = NULL ;
     Setup( newport ) ;
 {
     m_clip = NULL ;
     Setup( newport ) ;


@@ -809,13 +738,14 @@ void wxMacPortStateHelper::Setup( GrafPtr newport )
 {
     GetPort( &m_oldPort ) ;
     SetPort( newport ) ;
 {
     GetPort( &m_oldPort ) ;
     SetPort( newport ) ;

+    SetOrigin(0,0);

     wxASSERT_MSG( m_clip == NULL , wxT("Cannot call setup twice") ) ;
     m_clip = NewRgn() ;
     GetClip( m_clip );
     m_textFont = GetPortTextFont( (CGrafPtr) newport);
     m_textSize = GetPortTextSize( (CGrafPtr) newport);
     m_textStyle = GetPortTextFace( (CGrafPtr) newport);
     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);    
+    m_textMode = GetPortTextMode( (CGrafPtr) newport);

     GetThemeDrawingState( &m_drawingState ) ;
     m_currentPort = newport ;
 }
     GetThemeDrawingState( &m_drawingState ) ;
     m_currentPort = newport ;
 }


@@ -852,7 +782,7 @@ OSStatus UMAPutScrap( Size size , OSType type , void *data )
     err = PutScrap( size , type , data ) ;
 #else
     ScrapRef    scrap;
     err = PutScrap( size , type , data ) ;
 #else
     ScrapRef    scrap;

-    err = GetCurrentScrap (&scrap); 
+    err = GetCurrentScrap (&scrap);

     if ( !err )
     {
         err = PutScrapFlavor (scrap, type , 0, size, data);
     if ( !err )
     {
         err = PutScrapFlavor (scrap, type , 0, size, data);


@@ -861,3 +791,40 @@ OSStatus UMAPutScrap( Size size , OSType type , void *data )
     return err ;
 }
 
     return err ;
 }
 

+Rect* UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds)
+{
+    GetControlBounds( theControl , bounds ) ;
+#if TARGET_API_MAC_OSX
+    WindowRef tlwref = GetControlOwner( theControl ) ;
+
+    wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
+    if ( tlwwx != NULL && tlwwx->MacUsesCompositing() )
+    {
+        ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
+        HIPoint hiPoint = CGPointMake(  0 , 0 ) ;
+        HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl  ) ;
+        OffsetRect( bounds , (short) hiPoint.x , (short) hiPoint.y ) ;
+    }
+#endif
+    return bounds ;
+}
+
+
+#endif  // wxUSE_GUI
+
+#if wxUSE_BASE
+
+static bool sUMASystemInitialized = false ;
+
+bool UMASystemIsInitialized()
+{
+    return sUMASystemInitialized ;
+}
+
+void UMASetSystemIsInitialized(bool val)
+{
+    sUMASystemInitialized = val;
+}
+
+
+#endif // wxUSE_BASE