detection of aqua layout scheme added

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 91203d7176bb397af194174ef66534a87c61adf9..f76e81511428597c83918b020a73c7e74300a29f 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -15,8 +15,10 @@
 
 #define wxUSE_MLTE 0
 
 
 #define wxUSE_MLTE 0
 

+

 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;

+static bool sUMAHasAquaLayout = false ;

 extern int gAGABackgroundColor ;
 bool UMAHasAppearance() { return sUMAHasAppearance ; }
 long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }
 extern int gAGABackgroundColor ;
 bool UMAHasAppearance() { return sUMAHasAppearance ; }
 long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }


@@ -26,6 +28,8 @@ static long sUMAWindowManagerAttr = 0 ;
 
 bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
 long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }
 
 bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
 long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }

+bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; }
+

 
 void UMACleanupToolbox()
 {
 
 void UMACleanupToolbox()
 {


@@ -104,6 +108,11 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
   defaults.encoding = kTXNSystemDefaultEncoding;
        TXNInitTextension(&defaults,  1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
 #endif
   defaults.encoding = kTXNSystemDefaultEncoding;
        TXNInitTextension(&defaults,  1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
 #endif

+  long menuMgrAttr ;
+  Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
+  if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
+    sUMAHasAquaLayout = true ;
+

 }
 
 // process manager
 }
 
 // process manager

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index 91203d7176bb397af194174ef66534a87c61adf9..f76e81511428597c83918b020a73c7e74300a29f 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -15,8 +15,10 @@
 
 #define wxUSE_MLTE 0
 
 
 #define wxUSE_MLTE 0
 

+

 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;

+static bool sUMAHasAquaLayout = false ;

 extern int gAGABackgroundColor ;
 bool UMAHasAppearance() { return sUMAHasAppearance ; }
 long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }
 extern int gAGABackgroundColor ;
 bool UMAHasAppearance() { return sUMAHasAppearance ; }
 long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; }


@@ -26,6 +28,8 @@ static long sUMAWindowManagerAttr = 0 ;
 
 bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
 long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }
 
 bool UMAHasWindowManager() { return sUMAHasWindowManager ; }
 long UMAGetWindowManagerAttr() { return sUMAWindowManagerAttr ; }

+bool UMAHasAquaLayout() { return sUMAHasAquaLayout ; }
+

 
 void UMACleanupToolbox()
 {
 
 void UMACleanupToolbox()
 {


@@ -104,6 +108,11 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
   defaults.encoding = kTXNSystemDefaultEncoding;
        TXNInitTextension(&defaults,  1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
 #endif
   defaults.encoding = kTXNSystemDefaultEncoding;
        TXNInitTextension(&defaults,  1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
 #endif

+  long menuMgrAttr ;
+  Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
+  if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
+    sUMAHasAquaLayout = true ;
+

 }
 
 // process manager
 }
 
 // process manager