From 97138ef264e9811ed7b6d814ffacfe79f8b2e040 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 22 Oct 2002 15:38:17 +0000 Subject: [PATCH] added system version getter git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/uma.h | 1 + src/mac/carbon/uma.cpp | 5 +++++ src/mac/uma.cpp | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h index c9172b6c8a..7709e2a12a 100644 --- a/include/wx/mac/uma.h +++ b/include/wx/mac/uma.h @@ -16,6 +16,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls) ; void UMACleanupToolbox() ; +long UMAGetSystemVersion() ; bool UMAHasAppearance() ; long UMAGetAppearanceVersion() ; bool UMAHasWindowManager() ; diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp index 7f12124698..a0759d2551 100644 --- a/src/mac/carbon/uma.cpp +++ b/src/mac/carbon/uma.cpp @@ -23,12 +23,14 @@ static bool sUMAHasAppearance = false ; static long sUMAAppearanceVersion = 0 ; +static long sUMASystemVersion = 0 ; static bool sUMAHasAquaLayout = false ; static bool sUMASystemInitialized = false ; extern int gAGABackgroundColor ; bool UMAHasAppearance() { return sUMAHasAppearance ; } long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; } +long UMAGetSystemVersion() { return sUMASystemVersion ; } static bool sUMAHasWindowManager = false ; static long sUMAWindowManagerAttr = 0 ; @@ -71,6 +73,9 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls ) InitCursor(); #endif + if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr) + sUMASystemVersion = 0x0000 ; + long theAppearance ; if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr ) { diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp index 7f12124698..a0759d2551 100644 --- a/src/mac/uma.cpp +++ b/src/mac/uma.cpp @@ -23,12 +23,14 @@ static bool sUMAHasAppearance = false ; static long sUMAAppearanceVersion = 0 ; +static long sUMASystemVersion = 0 ; static bool sUMAHasAquaLayout = false ; static bool sUMASystemInitialized = false ; extern int gAGABackgroundColor ; bool UMAHasAppearance() { return sUMAHasAppearance ; } long UMAGetAppearanceVersion() { return sUMAAppearanceVersion ; } +long UMAGetSystemVersion() { return sUMASystemVersion ; } static bool sUMAHasWindowManager = false ; static long sUMAWindowManagerAttr = 0 ; @@ -71,6 +73,9 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls ) InitCursor(); #endif + if ( Gestalt(gestaltSystemVersion, &sUMASystemVersion) != noErr) + sUMASystemVersion = 0x0000 ; + long theAppearance ; if ( Gestalt( gestaltAppearanceAttr, &theAppearance ) == noErr ) {