Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/unix/stdpaths.h b/include/wx/unix/stdpaths.h
index b2627508034e6d62c3f3d73cee8bbd1f49fb3bc2..2f111992a3f423e0f68adcc3c5332de5a797802c 100644 (file)
--- a/include/wx/unix/stdpaths.h
+++ b/include/wx/unix/stdpaths.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19

-// RCS-ID:      $Id$

 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -19,28 +18,45 @@
 class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
 {
 public:
 class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
 {
 public:

+    // tries to determine the installation prefix automatically (Linux only right
+    // now) and returns /usr/local if it failed
+    void DetectPrefix();
+

     // set the program installation directory which is /usr/local by default
     //
     // under some systems (currently only Linux) the program directory can be
     // determined automatically but for portable programs you should always set
     // set the program installation directory which is /usr/local by default
     //
     // under some systems (currently only Linux) the program directory can be
     // determined automatically but for portable programs you should always set

-    // it explicitely
+    // it explicitly

     void SetInstallPrefix(const wxString& prefix);
 
     // get the program installation prefix
     //
     // if the prefix had been previously by SetInstallPrefix, returns that
     void SetInstallPrefix(const wxString& prefix);
 
     // get the program installation prefix
     //
     // if the prefix had been previously by SetInstallPrefix, returns that

-    // value, otherwise tries to determine it automatically (Linux only right
-    // now) and returns /usr/local if it failed
+    // value, otherwise calls DetectPrefix()

     wxString GetInstallPrefix() const;
 
 
     // implement base class pure virtuals
     wxString GetInstallPrefix() const;
 
 
     // implement base class pure virtuals

+    virtual wxString GetExecutablePath() const;

     virtual wxString GetConfigDir() const;
     virtual wxString GetUserConfigDir() const;
     virtual wxString GetDataDir() const;
     virtual wxString GetLocalDataDir() const;
     virtual wxString GetUserDataDir() const;
     virtual wxString GetPluginsDir() const;
     virtual wxString GetConfigDir() const;
     virtual wxString GetUserConfigDir() const;
     virtual wxString GetDataDir() const;
     virtual wxString GetLocalDataDir() const;
     virtual wxString GetUserDataDir() const;
     virtual wxString GetPluginsDir() const;

+    virtual wxString GetLocalizedResourcesDir(const wxString& lang,
+                                              ResourceCat category) const;
+#ifndef __VMS
+    virtual wxString GetDocumentsDir() const;
+#endif
+
+protected:
+    // Ctor is protected, use wxStandardPaths::Get() instead of instantiating
+    // objects of this class directly.
+    wxStandardPaths() { }
+
+private:
+    wxString m_prefix;

 };
 
 #endif // _WX_UNIX_STDPATHS_H_
 };
 
 #endif // _WX_UNIX_STDPATHS_H_