cleanup - fixed warnings, reformatting

[wxWidgets.git] / include / wx / stdpaths.h

diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index 106790f7d529effbf477c58996d411450449fe9e..c4b3cb2b7b061d767dae52c479720c6bafb766f4 100644 (file)
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -12,9 +12,11 @@
 #ifndef _WX_STDPATHS_H_
 #define _WX_STDPATHS_H_
 
 #ifndef _WX_STDPATHS_H_
 #define _WX_STDPATHS_H_
 

-#include "wx/string.h"
+#include "wx/defs.h"
+
+#if wxUSE_STDPATHS

 
 

-class WXDLLIMPEXP_BASE wxStandardPaths;
+#include "wx/string.h"

 
 // ----------------------------------------------------------------------------
 // wxStandardPaths returns the standard locations in the file system
 
 // ----------------------------------------------------------------------------
 // wxStandardPaths returns the standard locations in the file system


@@ -24,7 +26,7 @@ class WXDLLIMPEXP_BASE wxStandardPathsBase
 {
 public:
     // return the global standard paths object
 {
 public:
     // return the global standard paths object

-    static wxStandardPaths& Get();
+    static wxStandardPathsBase& Get();

 
 
     // return the directory with system config files:
 
 
     // return the directory with system config files:


@@ -84,11 +86,40 @@ protected:
 
 #if defined(__WXMSW__)
     #include "wx/msw/stdpaths.h"
 
 #if defined(__WXMSW__)
     #include "wx/msw/stdpaths.h"

-#elif defined(__WXMAC__) || defined(__WXCOCOA__)
+// We want CoreFoundation paths on both CarbonLib and Darwin (for all ports)
+#elif defined(__WXMAC__) || defined(__DARWIN__)

     #include "wx/mac/corefoundation/stdpaths.h"
     #include "wx/mac/corefoundation/stdpaths.h"

+#elif defined(__OS2__)
+    #include "wx/os2/stdpaths.h"

 #elif defined(__UNIX__)
     #include "wx/unix/stdpaths.h"
 #elif defined(__UNIX__)
     #include "wx/unix/stdpaths.h"

+#elif defined(__PALMOS__)
+    #include "wx/palmos/stdpaths.h"
+#else
+
+// ----------------------------------------------------------------------------
+// Minimal generic implementation
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
+{
+public:
+    void SetInstallPrefix(const wxString& prefix) { m_prefix = prefix; }
+    wxString GetInstallPrefix() const { return m_prefix; }
+    virtual wxString GetConfigDir() const { return m_prefix; }
+    virtual wxString GetUserConfigDir() const { return m_prefix; }
+    virtual wxString GetDataDir() const { return m_prefix; }
+    virtual wxString GetLocalDataDir() const { return m_prefix; }
+    virtual wxString GetUserDataDir() const { return m_prefix; }
+    virtual wxString GetPluginsDir() const { return m_prefix; }
+
+private:
+    wxString m_prefix;
+};
+

 #endif
 
 #endif
 

+#endif // wxUSE_STDPATHS
+

 #endif // _WX_STDPATHS_H_
 
 #endif // _WX_STDPATHS_H_