Revert "using #ifdef wxABORT_ON_CONFIG_ERROR not just #if as elsewhere"

[wxWidgets.git] / src / osx / core / utilsexc_cf.cpp

diff --git a/src/osx/core/utilsexc_cf.cpp b/src/osx/core/utilsexc_cf.cpp
index f00cb5e38fff670c8819ce364a0e599803fbebbe..2a8c436223fcf27ee273672f7d30ffeba5b8d716 100644 (file)
--- a/src/osx/core/utilsexc_cf.cpp
+++ b/src/osx/core/utilsexc_cf.cpp
@@ -4,7 +4,6 @@
 // Author:      David Elliott, Ryan Norton (wxMacExecute)
 // Modified by: Stefan Csomor (added necessary wxT for unicode builds)
 // Created:     2004-11-04
 // Author:      David Elliott, Ryan Norton (wxMacExecute)
 // Modified by: Stefan Csomor (added necessary wxT for unicode builds)
 // Created:     2004-11-04

-// RCS-ID:      $Id$

 // Copyright:   (c) David Elliott, Ryan Norton
 //              (c) 2013 Rob Bresalier
 // Licence:     wxWindows licence
 // Copyright:   (c) David Elliott, Ryan Norton
 //              (c) 2013 Rob Bresalier
 // Licence:     wxWindows licence


@@ -156,9 +155,19 @@ wxEventLoopSourcesManagerBase* wxGUIAppTraits::GetEventLoopSourcesManager()
 // NOTE: This doesn't really belong here but this was a handy file to
 // put it in because it's already compiled for wxCocoa and wxMac GUI lib.
 #if wxUSE_STDPATHS
 // NOTE: This doesn't really belong here but this was a handy file to
 // put it in because it's already compiled for wxCocoa and wxMac GUI lib.
 #if wxUSE_STDPATHS

-static wxStandardPathsCF gs_stdPaths;

 wxStandardPaths& wxGUIAppTraits::GetStandardPaths()
 {
 wxStandardPaths& wxGUIAppTraits::GetStandardPaths()
 {

+    // Derive a class just to be able to create it: wxStandardPaths ctor is
+    // protected to prevent its misuse, but it also means we can't create an
+    // object of this class directly.
+    class wxStandardPathsDefault : public wxStandardPathsCF
+    {
+    public:
+        wxStandardPathsDefault() { }
+    };
+
+    static wxStandardPathsDefault gs_stdPaths;
+

     return gs_stdPaths;
 }
 #endif
     return gs_stdPaths;
 }
 #endif