X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c50c6fb23b0a538f3403f42149e2f5b90957d7ac..96e93f5b8325700896eb6043ffbf5e496b279747:/include/wx/app.h?ds=sidebyside

diff --git a/include/wx/app.h b/include/wx/app.h
index 553a29aa5c..ef542febc3 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -198,6 +198,13 @@ public:
     // allows us to abstract the differences behind the common facade
     wxAppTraits *GetTraits();
 
+    // this function provides safer access to traits object than
+    // wxTheApp->GetTraits() during startup or termination when the global
+    // application object itself may be unavailable
+    //
+    // of course, it still returns NULL in this case and the caller must check
+    // for it
+    static wxAppTraits *GetTraitsIfExists();
 
     // event processing functions
     // --------------------------
@@ -596,7 +603,7 @@ protected:
 #elif defined(__WXX11__)
     #include "wx/x11/app.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/app.h"
+    #include "wx/osx/app.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/app.h"
 #elif defined(__WXPM__)