fixing mem leak

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

diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp
index 4f2cfd65c531a9d2961f75a2ee056faaf2954e96..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

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


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

-#define TRACE_MASK _T("stdpaths")
+#define TRACE_MASK wxT("stdpaths")

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


@@ -117,16 +117,16 @@ void ResolveShellFunctions()
 
     // start with the newest functions, fall back to the oldest ones
 #ifdef __WXWINCE__
 
     // 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


@@ -143,14 +143,14 @@ 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);
     }


@@ -321,15 +321,18 @@ void wxStandardPaths::DontIgnoreAppSubDir()
     m_appDir.clear();
 }
 
     m_appDir.clear();
 }
 

+/* static */
+wxString wxStandardPaths::MSWGetShellDir(int csidl)
+{
+    return DoGetDirectory(csidl);
+}
+

 // ----------------------------------------------------------------------------
 // public functions
 // ----------------------------------------------------------------------------
 
 wxStandardPaths::wxStandardPaths()
 {
 // ----------------------------------------------------------------------------
 // public functions
 // ----------------------------------------------------------------------------
 
 wxStandardPaths::wxStandardPaths()
 {

-    // under MSW it's common to use both the applicatio nand vendor
-    UseAppInfo(AppInfo_AppName | AppInfo_VendorName);
-

     // make it possible to run uninstalled application from the build directory
     IgnoreAppBuildSubDirs();
 }
     // make it possible to run uninstalled application from the build directory
     IgnoreAppBuildSubDirs();
 }


@@ -385,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)