added method for finding out, whether the macos system is fully initialized for this...

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

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index 6a7de05e46ba586e5d21f379833824ce3f16e9da..b242acb9616c6a6602fa874bff63acd241213635 100644 (file)
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -21,6 +21,7 @@ long UMAGetAppearanceVersion() ;
 bool UMAHasWindowManager() ;
 long UMAGetWindowManagerAttr() ;
 bool UMAHasAquaLayout() ;
 bool UMAHasWindowManager() ;
 long UMAGetWindowManagerAttr() ;
 bool UMAHasAquaLayout() ;

+bool UMASystemIsInitialized() ;

 
 // process manager
 
 
 // process manager
 

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 1c31f87d4c8356d76f5ae89f2b18782281ac7d79..2e50863903ee53493cbfc528b211b988b561691c 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -19,6 +19,8 @@
 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static bool sUMAHasAquaLayout = false ;
 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static bool sUMAHasAquaLayout = false ;

+static bool sUMASystemInitialized = false ;
+

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


@@ -29,7 +31,7 @@ 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()
 {


@@ -112,7 +114,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
     sUMAHasAquaLayout = true ;
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
     sUMAHasAquaLayout = true ;

-
+  sUMASystemInitialized = true ;

 }
 
 // process manager
 }
 
 // process manager

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index 1c31f87d4c8356d76f5ae89f2b18782281ac7d79..2e50863903ee53493cbfc528b211b988b561691c 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -19,6 +19,8 @@
 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static bool sUMAHasAquaLayout = false ;
 static bool    sUMAHasAppearance = false ;
 static long sUMAAppearanceVersion = 0 ;
 static bool sUMAHasAquaLayout = false ;

+static bool sUMASystemInitialized = false ;
+

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


@@ -29,7 +31,7 @@ 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()
 {


@@ -112,7 +114,7 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
     sUMAHasAquaLayout = true ;
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
     sUMAHasAquaLayout = true ;

-
+  sUMASystemInitialized = true ;

 }
 
 // process manager
 }
 
 // process manager