X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2dbc444a1986c63f8e41731fd75f92c43e6af4da..56d061c578db49bb2dc98ccf34559d3027982a3b:/src/mac/carbon/uma.cpp?ds=sidebyside

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index f7356b7c59..1c901902a6 100644
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -45,6 +45,8 @@ static long sUMAAppearanceVersion = 0 ;
 static long sUMASystemVersion = 0 ;
 static bool sUMAHasAquaLayout = false ;
 
+static bool sUMAHasInittedAppearance = false;
+
 extern int gAGABackgroundColor ;
 bool UMAHasAppearance() { return sUMAHasAppearance ; }
 long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }
@@ -60,7 +62,7 @@ bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; }
 
 void UMACleanupToolbox()
 {
-    if ( sUMAHasAppearance )
+    if (sUMAHasInittedAppearance)
     {
         UnregisterAppearanceClient() ;
     }
@@ -71,26 +73,29 @@ void UMACleanupToolbox()
   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();
 
-    ::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);
-#else
-    InitCursor();
 #endif
 
+    ::InitCursor();
+
     if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr)
         sUMASystemVersion = 0x0000 ;
 
@@ -98,7 +103,17 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
     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 ;
@@ -116,10 +131,13 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 #if TARGET_CARBON
 // Call currently implicitely done :        InitFloatingWindows() ;
 #else
-    if ( sUMAHasWindowManager )
-        InitFloatingWindows() ;
-    else
-        InitWindows();
+    if (!isEmbedded)
+    {
+        if ( sUMAHasWindowManager )
+            InitFloatingWindows() ;
+        else
+            InitWindows();
+    }
 #endif
 
     if ( NavServicesAvailable() )
@@ -143,21 +161,17 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 
     TXNMacOSPreferredFontDescription fontDescriptions[] =
     {
-        { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding } ,
+        { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding }
     } ;
     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 ;
     }
-      TXNInitTextension(fontDescriptions,  noOfFontDescriptions, options );
+    TXNInitTextension(fontDescriptions,  noOfFontDescriptions, options );
   }
 
 
@@ -198,13 +212,13 @@ bool UMAGetProcessModeDoesActivateOnFGSwitch()
 
 // 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 ) ;
-    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ;
+    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;
@@ -213,11 +227,11 @@ MenuRef UMANewMenu( SInt16 id , const wxString& title )
     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
-    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ;
+    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;
@@ -225,11 +239,11 @@ void UMASetMenuTitle( MenuRef menu , const wxString& title )
 #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
-    SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str) ) ;
+    SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( str , ptitle ) ;
@@ -251,17 +265,17 @@ void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
         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");
-    UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
+    UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );
     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);
-    UMASetMenuItemText(menu, item , title );
+    UMASetMenuItemText(menu, item , title , encoding);
     SetMenuItemHierarchicalID( menu , item , id ) ;
 }
 
@@ -376,17 +390,17 @@ 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");
-    UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title );
+    UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );
     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 , "\pA" , item) ;
-    UMASetMenuItemText(menu, item+1 , title );
+    UMASetMenuItemText(menu, item+1 , title , encoding );
     UMASetMenuItemShortcut( menu , item+1 , entry ) ;
 }
 
@@ -482,10 +496,10 @@ void             UMADisposeWindow( WindowRef inWindowRef )
     DisposeWindow( inWindowRef ) ;
 }
 
-void UMASetWTitle( WindowRef inWindowRef , const wxString& title )
+void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding)
 {
 #if TARGET_CARBON
-    SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title) ) ;
+    SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( title , ptitle ) ;
@@ -493,22 +507,12 @@ void UMASetWTitle( WindowRef inWindowRef , const wxString& title )
 #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
 
-void UMASetControlTitle( ControlHandle inControl , const wxString& title )
+void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding)
 {
 #if TARGET_CARBON
-    SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title) ) ;
+    SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ;
 #else
     Str255 ptitle ;
     wxMacStringToPascal( title , ptitle ) ;
@@ -516,8 +520,9 @@ void UMASetControlTitle( ControlHandle inControl , const wxString& title )
 #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 ) )
@@ -525,92 +530,95 @@ void UMAActivateControl( ControlHandle inControl )
         bool visible = IsControlVisible( inControl ) ;
         if ( visible )
             SetControlVisibility( inControl , false , false ) ;
+#endif    
         ::ActivateControl( inControl ) ;
+#if !TARGET_API_MAC_OSX
         if ( visible ) {
             SetControlVisibility( inControl , true , false ) ;
+        
             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) ) ;
     }
+#endif    
     ::MoveControl( inControl , x , y ) ;
+#if !TARGET_API_MAC_OSX
     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) ) ;
     }
+#endif
     ::SizeControl( inControl , x , y ) ;
+#if !TARGET_API_MAC_OSX
     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 ) ;
+#endif
     ::DeactivateControl( inControl ) ;
+#if !TARGET_API_MAC_OSX
     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
-void UMAShowControl                        (ControlHandle             inControl)
+void UMAShowControl                        (ControlRef             inControl)
 {
     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 ;
-    InvalWindowRect(GetControlOwner(inControl),GetControlBounds(inControl,&ctrlBounds) ) ;
+    InvalWindowRect(GetControlOwner(inControl),UMAGetControlBoundsInWindowCoords(inControl,&ctrlBounds) ) ;
 }
 // keyboard focus
 OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,
-                                 ControlHandle             inControl,
+                                 ControlRef             inControl,
                                  ControlFocusPart         inPart)
 {
     OSErr err = noErr;
@@ -624,10 +632,10 @@ OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,
     return err ;
 }
 
-
 // events
 void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn )
 {
+    wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) inWindow) ) ;
     RgnHandle updateRgn = NewRgn() ;
     GetWindowUpdateRgn( inWindow , updateRgn ) ;
 
@@ -668,7 +676,7 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
         GetPort( &port ) ;
         SetPortWindowPort( inWindowRef ) ;
         HiliteWindow( inWindowRef , inActivate ) ;
-        ControlHandle control = NULL ;
+        ControlRef control = NULL ;
         ::GetRootControl( inWindowRef , & control ) ;
         if ( control )
         {
@@ -728,6 +736,7 @@ void wxMacPortStateHelper::Setup( GrafPtr newport )
 {
     GetPort( &m_oldPort ) ;
     SetPort( newport ) ;
+    SetOrigin(0,0);
     wxASSERT_MSG( m_clip == NULL , wxT("Cannot call setup twice") ) ;
     m_clip = NewRgn() ;
     GetClip( m_clip );
@@ -780,6 +789,29 @@ OSStatus UMAPutScrap( Size size , OSType type , void *data )
     return err ;
 }
 
+Rect* UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds)
+{
+    wxWindow* win = wxFindControlFromMacControl( theControl ) ;
+    
+    GetControlBounds( theControl , bounds ) ;
+#if TARGET_API_MAC_OSX
+    if ( win != NULL && win->MacGetTopLevelWindow() != NULL )   
+    {
+        int x , y ;
+        x = 0 ;
+        y = 0 ;
+        
+        win->GetParent()->MacWindowToRootWindow( &x , & y ) ;
+        bounds->left += x ;
+        bounds->right += x ;
+        bounds->top += y ;
+        bounds->bottom += y ;
+    }
+#endif
+    return bounds ;
+}
+
+
 #endif  // wxUSE_GUI
 
 #if wxUSE_BASE