missing commit

[wxWidgets.git] / src / msw / stdpaths.cpp

diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp
index 5e9de59ee3b2ca0bb81cb22044589ca958e6e875..a4a016c85b5454aa75ed516af2f2281a3cd65f39 100644 (file)
--- a/src/msw/stdpaths.cpp
+++ b/src/msw/stdpaths.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/stdpaths.cpp
+// Name:        src/msw/stdpaths.cpp

 // Purpose:     wxStandardPaths implementation for Win32
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Purpose:     wxStandardPaths implementation for Win32
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -26,15 +26,15 @@
 
 #if wxUSE_STDPATHS
 
 
 #if wxUSE_STDPATHS
 

+#include "wx/stdpaths.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/app.h"
+    #include "wx/utils.h"

 #endif //WX_PRECOMP
 
 #include "wx/dynlib.h"
 #include "wx/filename.h"
 
 #endif //WX_PRECOMP
 
 #include "wx/dynlib.h"
 #include "wx/filename.h"
 

-#include "wx/stdpaths.h"
-

 #include "wx/msw/private.h"
 #include "wx/msw/wrapshl.h"
 
 #include "wx/msw/private.h"
 #include "wx/msw/wrapshl.h"
 


@@ -50,7 +50,7 @@ typedef HRESULT (WINAPI *SHGetSpecialFolderPath_t)(HWND, LPTSTR, int, BOOL);
 // ----------------------------------------------------------------------------
 
 // used in our wxLogTrace messages
 // ----------------------------------------------------------------------------
 
 // used in our wxLogTrace messages

-static const wxChar *TRACE_MASK = _T("stdpaths");
+#define TRACE_MASK wxT("stdpaths")

 
 #ifndef CSIDL_APPDATA
     #define CSIDL_APPDATA         0x001a
 
 #ifndef CSIDL_APPDATA
     #define CSIDL_APPDATA         0x001a


@@ -68,6 +68,10 @@ static const wxChar *TRACE_MASK = _T("stdpaths");
     #define CSIDL_PROGRAM_FILES   0x0026
 #endif
 
     #define CSIDL_PROGRAM_FILES   0x0026
 #endif
 

+#ifndef CSIDL_PERSONAL
+    #define CSIDL_PERSONAL        0x0005
+#endif
+

 #ifndef SHGFP_TYPE_CURRENT
     #define SHGFP_TYPE_CURRENT 0
 #endif
 #ifndef SHGFP_TYPE_CURRENT
     #define SHGFP_TYPE_CURRENT 0
 #endif


@@ -80,6 +84,9 @@ static const wxChar *TRACE_MASK = _T("stdpaths");
 // module globals
 // ----------------------------------------------------------------------------
 
 // module globals
 // ----------------------------------------------------------------------------
 

+namespace
+{
+

 struct ShellFunctions
 {
     ShellFunctions()
 struct ShellFunctions
 {
     ShellFunctions()


@@ -98,28 +105,28 @@ struct ShellFunctions
 // in spite of using a static variable, this is MT-safe as in the worst case it
 // results in initializing the function pointer several times -- but this is
 // harmless
 // in spite of using a static variable, this is MT-safe as in the worst case it
 // results in initializing the function pointer several times -- but this is
 // harmless

-static ShellFunctions gs_shellFuncs;
+ShellFunctions gs_shellFuncs;

 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 

-static void ResolveShellFunctions()
+void ResolveShellFunctions()

 {
 #if wxUSE_DYNLIB_CLASS
 
     // start with the newest functions, fall back to the oldest ones
 #ifdef __WXWINCE__
 {
 #if wxUSE_DYNLIB_CLASS
 
     // start with the newest functions, fall back to the oldest ones
 #ifdef __WXWINCE__

-    wxString shellDllName(_T("coredll"));
+    wxString shellDllName(wxT("coredll"));

 #else
     // first check for SHGetFolderPath (shell32.dll 5.0)
 #else
     // first check for SHGetFolderPath (shell32.dll 5.0)

-    wxString shellDllName(_T("shell32"));
+    wxString shellDllName(wxT("shell32"));

 #endif
 
     wxDynamicLibrary dllShellFunctions( shellDllName );
     if ( !dllShellFunctions.IsLoaded() )
     {
 #endif
 
     wxDynamicLibrary dllShellFunctions( shellDllName );
     if ( !dllShellFunctions.IsLoaded() )
     {

-        wxLogTrace(TRACE_MASK, _T("Failed to load %s.dll"), shellDllName.c_str() );
+        wxLogTrace(TRACE_MASK, wxT("Failed to load %s.dll"), shellDllName.c_str() );

     }
 
     // don't give errors if the functions are unavailable, we're ready to deal
     }
 
     // don't give errors if the functions are unavailable, we're ready to deal


@@ -136,14 +143,14 @@ static void ResolveShellFunctions()
     static const char UNICODE_SUFFIX = 'A';
 #endif // Unicode/!Unicode
 
     static const char UNICODE_SUFFIX = 'A';
 #endif // Unicode/!Unicode
 

-    wxString funcname(_T("SHGetFolderPath"));
+    wxString funcname(wxT("SHGetFolderPath"));

     gs_shellFuncs.pSHGetFolderPath =
         (SHGetFolderPath_t)dllShellFunctions.GetSymbol(funcname + UNICODE_SUFFIX);
 
     // then for SHGetSpecialFolderPath (shell32.dll 4.71)
     if ( !gs_shellFuncs.pSHGetFolderPath )
     {
     gs_shellFuncs.pSHGetFolderPath =
         (SHGetFolderPath_t)dllShellFunctions.GetSymbol(funcname + UNICODE_SUFFIX);
 
     // then for SHGetSpecialFolderPath (shell32.dll 4.71)
     if ( !gs_shellFuncs.pSHGetFolderPath )
     {

-        funcname = _T("SHGetSpecialFolderPath");
+        funcname = wxT("SHGetSpecialFolderPath");

         gs_shellFuncs.pSHGetSpecialFolderPath = (SHGetSpecialFolderPath_t)
             dllShellFunctions.GetSymbol(funcname + UNICODE_SUFFIX);
     }
         gs_shellFuncs.pSHGetSpecialFolderPath = (SHGetSpecialFolderPath_t)
             dllShellFunctions.GetSymbol(funcname + UNICODE_SUFFIX);
     }


@@ -158,6 +165,8 @@ static void ResolveShellFunctions()
 #endif
 }
 
 #endif
 }
 

+} // anonymous namespace
+

 // ============================================================================
 // wxStandardPaths implementation
 // ============================================================================
 // ============================================================================
 // wxStandardPaths implementation
 // ============================================================================


@@ -242,33 +251,100 @@ wxString wxStandardPaths::DoGetDirectory(int csidl)
     return dir;
 }
 
     return dir;
 }
 

-/* static */
-wxString wxStandardPaths::GetAppDir()
+wxString wxStandardPaths::GetAppDir() const
+{
+    if ( m_appDir.empty() )
+    {
+        m_appDir = wxFileName(wxGetFullModuleName()).GetPath();
+    }
+
+    return m_appDir;
+}
+
+wxString wxStandardPaths::GetDocumentsDir() const
+{
+    return DoGetDirectory(CSIDL_PERSONAL);
+}
+
+// ----------------------------------------------------------------------------
+// MSW-specific functions
+// ----------------------------------------------------------------------------
+
+void wxStandardPaths::IgnoreAppSubDir(const wxString& subdirPattern)

 {
 {

-    wxFileName fn(wxGetFullModuleName());
+    wxFileName fn = wxFileName::DirName(GetAppDir());

 
 

-    // allow running the apps directly from build directory in debug builds
-#ifdef __WXDEBUG__
-    wxString lastdir;
-    if ( fn.GetDirCount() )
+    if ( !fn.GetDirCount() )

     {
     {

-        lastdir = fn.GetDirs().Last();
-        lastdir.MakeLower();
-        if ( lastdir.Matches(_T("debug*")) || lastdir.Matches(_T("vc_msw*")) )
-            fn.RemoveLastDir();
+        // no last directory to ignore anyhow
+        return;

     }
     }

-#endif // __WXDEBUG__

 
 

-    return fn.GetPath();
+    const wxString lastdir = fn.GetDirs().Last().Lower();
+    if ( lastdir.Matches(subdirPattern.Lower()) )
+    {
+        fn.RemoveLastDir();
+
+        // store the cached value so that subsequent calls to GetAppDir() will
+        // reuse it instead of using just the program binary directory
+        m_appDir = fn.GetPath();
+    }
+}
+
+void wxStandardPaths::IgnoreAppBuildSubDirs()
+{
+    IgnoreAppSubDir("debug");
+    IgnoreAppSubDir("release");
+
+    wxString compilerPrefix;
+#ifdef __VISUALC__
+    compilerPrefix = "vc";
+#elif defined(__GNUG__)
+    compilerPrefix = "gcc";
+#elif defined(__BORLANDC__)
+    compilerPrefix = "bcc";
+#elif defined(__DIGITALMARS__)
+    compilerPrefix = "dmc";
+#elif defined(__WATCOMC__)
+    compilerPrefix = "wat";
+#else
+    return;
+#endif
+
+    IgnoreAppSubDir(compilerPrefix + "_msw*");
+}
+
+void wxStandardPaths::DontIgnoreAppSubDir()
+{
+    // this will force the next call to GetAppDir() to use the program binary
+    // path as the application directory
+    m_appDir.clear();
+}
+
+/* static */
+wxString wxStandardPaths::MSWGetShellDir(int csidl)
+{
+    return DoGetDirectory(csidl);

 }
 
 // ----------------------------------------------------------------------------
 // public functions
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // public functions
 // ----------------------------------------------------------------------------
 

+wxStandardPaths::wxStandardPaths()
+{
+    // make it possible to run uninstalled application from the build directory
+    IgnoreAppBuildSubDirs();
+}
+
+wxString wxStandardPaths::GetExecutablePath() const
+{
+    return wxGetFullModuleName();
+}
+

 wxString wxStandardPaths::GetConfigDir() const
 {
 wxString wxStandardPaths::GetConfigDir() const
 {

-    return AppendAppName(DoGetDirectory(CSIDL_COMMON_APPDATA));
+    return AppendAppInfo(DoGetDirectory(CSIDL_COMMON_APPDATA));

 }
 
 wxString wxStandardPaths::GetUserConfigDir() const
 }
 
 wxString wxStandardPaths::GetUserConfigDir() const


@@ -285,12 +361,12 @@ wxString wxStandardPaths::GetDataDir() const
 
 wxString wxStandardPaths::GetUserDataDir() const
 {
 
 wxString wxStandardPaths::GetUserDataDir() const
 {

-    return AppendAppName(GetUserConfigDir());
+    return AppendAppInfo(GetUserConfigDir());

 }
 
 wxString wxStandardPaths::GetUserLocalDataDir() const
 {
 }
 
 wxString wxStandardPaths::GetUserLocalDataDir() const
 {

-    return AppendAppName(DoGetDirectory(CSIDL_LOCAL_APPDATA));
+    return AppendAppInfo(DoGetDirectory(CSIDL_LOCAL_APPDATA));

 }
 
 wxString wxStandardPaths::GetPluginsDir() const
 }
 
 wxString wxStandardPaths::GetPluginsDir() const


@@ -312,7 +388,7 @@ wxString wxStandardPathsWin16::GetConfigDir() const
 #ifndef __WXWINCE__
     if ( !::GetWindowsDirectory(wxStringBuffer(dir, MAX_PATH), MAX_PATH) )
     {
 #ifndef __WXWINCE__
     if ( !::GetWindowsDirectory(wxStringBuffer(dir, MAX_PATH), MAX_PATH) )
     {

-        wxLogLastError(_T("GetWindowsDirectory"));
+        wxLogLastError(wxT("GetWindowsDirectory"));

     }
 #else
     // TODO: use CSIDL_WINDOWS (eVC4, possibly not eVC3)
     }
 #else
     // TODO: use CSIDL_WINDOWS (eVC4, possibly not eVC3)