Let wxToolBar assume that no orientation flag means horizontal.

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 2e50863903ee53493cbfc528b211b988b561691c..f6bd01f91f09360764787645054b9a3b3b78ec73 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -4,7 +4,15 @@
 #include <MacTextEditor.h>
 
 #ifndef __DARWIN__
-  #include <Navigation.h>
+#  include <Navigation.h>
+#  if defined(TARGET_CARBON)
+#    if PM_USE_SESSION_APIS
+#      include <PMCore.h>
+#    endif
+#    include <PMApplication.h>
+#  else
+#    include <Printing.h>
+#  endif
 #endif
 
 // since we have decided that we only support 8.6 upwards we are
@@ -13,9 +21,6 @@
 // windows manager, control manager, navigation services etc. are 
 // present
 
-#define wxUSE_MLTE 0
-
-
 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static bool sUMAHasAquaLayout = false ;
@@ -43,9 +48,8 @@ void UMACleanupToolbox()
        {
                NavUnload() ;
        }
-#if wxUSE_MLTE
-       TXNTerminateTextension( ) ;
-#endif
+  if ( TXNTerminateTextension != (void*) kUnresolvedCFragSymbolAddress )
+         TXNTerminateTextension( ) ;
 }
 void UMAInitToolbox( UInt16 inMoreMastersCalls )
 {
@@ -86,7 +90,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
        }
                
-#ifndef __DARWIN__
 #if TARGET_CARBON
 // Call currently implicitely done :           InitFloatingWindows() ;
 #else
@@ -94,7 +97,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                InitFloatingWindows() ;
        else
                InitWindows();
-#endif
 #endif
 
        if ( NavServicesAvailable() )
@@ -102,21 +104,52 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                NavLoad() ;
        }
 
-#if wxUSE_MLTE
-  TXNMacOSPreferredFontDescription defaults;
-  defaults.fontID = kFontIDGeneva ;
-  defaults.pointSize = (10 << 16) ;
-  defaults.fontStyle = kTXNDefaultFontStyle;
-  defaults.encoding = kTXNSystemDefaultEncoding;
-       TXNInitTextension(&defaults,  1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
-#endif
   long menuMgrAttr ;
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
     sUMAHasAquaLayout = true ;
+
+  if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
+  { 
+    FontFamilyID fontId ;
+       Str255 fontName ;
+       SInt16 fontSize ;
+       Style fontStyle ;
+       GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+    GetFNum( fontName, &fontId );
+
+    TXNMacOSPreferredFontDescription fontDescriptions[] =
+    {
+        { 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
+    {
+        options |= kTXNAlwaysUseQuickDrawTextMask ;
+    }
+       TXNInitTextension(fontDescriptions,  noOfFontDescriptions, options );
+  }
+
+
   sUMASystemInitialized = true ;
+
 }
 
+/*
+Boolean CanUseATSUI()
+       {
+       long result;
+       OSErr err = Gestalt(gestaltATSUVersion, &result);
+       return (err == noErr);
+       }
+*/
 // process manager
 long UMAGetProcessMode() 
 {
@@ -255,11 +288,7 @@ void UMAInsertMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16
 
 int gPrOpenCounter = 0 ;
 
-#if TARGET_CARBON && PM_USE_SESSION_APIS
-OSStatus UMAPrOpen(PMPrintSession *macPrintSession)
-#else
-OSStatus UMAPrOpen()
-#endif
+OSStatus UMAPrOpen(void *macPrintSession)
 {
 #if !TARGET_CARBON
        OSErr err = noErr ;
@@ -277,7 +306,7 @@ OSStatus UMAPrOpen()
        if ( gPrOpenCounter == 1 )
        {
   #if PM_USE_SESSION_APIS
-           err = PMCreateSession(macPrintSession) ;
+           err = PMCreateSession((PMPrintSession *)macPrintSession) ;
   #else
            err = PMBegin() ;
   #endif
@@ -287,11 +316,7 @@ OSStatus UMAPrOpen()
 #endif
 }
 
-#if TARGET_CARBON && PM_USE_SESSION_APIS
-OSStatus UMAPrClose(PMPrintSession *macPrintSession)
-#else
-OSStatus UMAPrClose()
-#endif
+OSStatus UMAPrClose(void *macPrintSession)
 {
 #if !TARGET_CARBON
        OSErr err = noErr ;
@@ -310,8 +335,8 @@ OSStatus UMAPrClose()
        if ( gPrOpenCounter == 1 )
        {
   #if PM_USE_SESSION_APIS
-           err = PMRelease(*macPrintSession) ;
-           *macPrintSession = kPMNoReference;
+           err = PMRelease(*(PMPrintSession *)macPrintSession) ;
+           *(PMPrintSession *)macPrintSession = kPMNoReference;
   #else
            err = PMEnd() ;
   #endif
@@ -370,7 +395,7 @@ GrafPtr             UMAGetWindowPort( WindowRef inWindowRef )
 {
        wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 
-       return GetWindowPort( inWindowRef ) ; 
+       return (GrafPtr) GetWindowPort( inWindowRef ) ; 
 #else
        return (GrafPtr) inWindowRef ;
 #endif
@@ -579,9 +604,10 @@ OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
   return ::DrawThemePlacard( inRect , inState ) ;
 }
 
+#if !TARGET_CARBON
 static OSStatus helpMenuStatus = noErr ;
-static MenuRef helpMenuHandle = NULL ;
 static MenuItemIndex firstCustomItemIndex = 0 ;
+#endif
 
 OSStatus UMAGetHelpMenu(
   MenuRef *        outHelpMenu,
@@ -590,13 +616,11 @@ OSStatus UMAGetHelpMenu(
 #if TARGET_CARBON
   return HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
 #else
-  if ( helpMenuHandle == NULL )
+  MenuRef helpMenuHandle ;
+  helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
+  if ( firstCustomItemIndex == 0 && helpMenuStatus == noErr )
   {
-    helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
-    if ( helpMenuStatus == noErr )
-    {
-      firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;
-    }
+    firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;
   }
   if ( outFirstCustomItemIndex )
   {