always compile at least a minimal version of wxStandardPaths class, it's used too often

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

include/wx/apptrait.h

@@ -73,11 +73,9 @@ public:
     // NB: returned pointer will be deleted by the caller
     virtual wxRendererNative *CreateRenderer() = 0;
 
-#if wxUSE_STDPATHS
     // wxStandardPaths object is normally the same for wxBase and wxGUI
     // except in the case of wxMac and wxCocoa
     virtual wxStandardPathsBase& GetStandardPaths();
-#endif // wxUSE_STDPATHS
 
 #if wxUSE_INTL
     // called during wxApp initialization to set the locale to correspond to

include/wx/stdpaths.h

@@ -14,8 +14,6 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_STDPATHS
-
 #include "wx/string.h"
 #include "wx/filefn.h"
 
@@ -23,6 +21,8 @@
 // wxStandardPaths returns the standard locations in the file system
 // ----------------------------------------------------------------------------
 
+// NB: This is always compiled in, wxUSE_STDPATHS=0 only disables native
+//     wxStandardPaths class, but a minimal version is always available
 class WXDLLIMPEXP_BASE wxStandardPathsBase
 {
 public:
@@ -135,23 +135,34 @@ protected:
     static wxString AppendAppName(const wxString& dir);
 };
 
-#if defined(__WXMSW__)
+#if wxUSE_STDPATHS
-    #include "wx/msw/stdpaths.h"
+    #if defined(__WXMSW__)
-// We want CoreFoundation paths on both CarbonLib and Darwin (for all ports)
+        #include "wx/msw/stdpaths.h"
-#elif defined(__WXMAC__) || defined(__DARWIN__)
+        #define wxHAS_NATIVE_STDPATHS
-    #include "wx/mac/corefoundation/stdpaths.h"
+    // We want CoreFoundation paths on both CarbonLib and Darwin (for all ports)
-#elif defined(__OS2__)
+    #elif defined(__WXMAC__) || defined(__DARWIN__)
-    #include "wx/os2/stdpaths.h"
+        #include "wx/mac/corefoundation/stdpaths.h"
-#elif defined(__UNIX__)
+        #define wxHAS_NATIVE_STDPATHS
-    #include "wx/unix/stdpaths.h"
+    #elif defined(__OS2__)
-#elif defined(__PALMOS__)
+        #include "wx/os2/stdpaths.h"
-    #include "wx/palmos/stdpaths.h"
+        #define wxHAS_NATIVE_STDPATHS
-#else
+    #elif defined(__UNIX__)
+        #include "wx/unix/stdpaths.h"
+        #define wxHAS_NATIVE_STDPATHS
+    #elif defined(__PALMOS__)
+        #include "wx/palmos/stdpaths.h"
+        #define wxHAS_NATIVE_STDPATHS
+    #endif
+#endif
 
 // ----------------------------------------------------------------------------
 // Minimal generic implementation
 // ----------------------------------------------------------------------------
 
+// NB: Note that this minimal implementation is compiled in even if
+//     wxUSE_STDPATHS=0, so that our code can still use wxStandardPaths.
+
+#ifndef wxHAS_NATIVE_STDPATHS
 class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
 {
 public:
@@ -170,10 +181,7 @@ public:
 private:
     wxString m_prefix;
 };
-
+#endif // !wxHAS_NATIVE_STDPATHS
-#endif
-
-#endif // wxUSE_STDPATHS
 
 #endif // _WX_STDPATHS_H_
 

include/wx/unix/apptrait.h

@@ -43,7 +43,7 @@ public:
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
 
-#if defined(__WXMAC__) || defined(__WXCOCOA__)
+#if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS
     virtual wxStandardPathsBase& GetStandardPaths();
 #endif
     virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;

src/common/stdpbase.cpp

@@ -24,8 +24,6 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_STDPATHS
-
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif //WX_PRECOMP
@@ -126,5 +124,3 @@ wxString wxStandardPathsBase::AppendAppName(const wxString& dir)
 
     return subdir;
 }
-
-#endif // wxUSE_STDPATHS