try to clear the device/logical unit fog; remove unused and unsupported (an assertion...

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

diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp
index 5e9de59ee3b2ca0bb81cb22044589ca958e6e875..3e928c146219d37af017fdae2340fcc54136b0a2 100644 (file)
--- a/src/msw/stdpaths.cpp
+++ b/src/msw/stdpaths.cpp
@@ -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 _T("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


@@ -75,7 +79,6 @@ static const wxChar *TRACE_MASK = _T("stdpaths");
 #ifndef SHGFP_TYPE_DEFAULT
     #define SHGFP_TYPE_DEFAULT 1
 #endif
 #ifndef SHGFP_TYPE_DEFAULT
     #define SHGFP_TYPE_DEFAULT 1
 #endif

-

 // ----------------------------------------------------------------------------
 // module globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // module globals
 // ----------------------------------------------------------------------------


@@ -254,7 +257,7 @@ wxString wxStandardPaths::GetAppDir()
     {
         lastdir = fn.GetDirs().Last();
         lastdir.MakeLower();
     {
         lastdir = fn.GetDirs().Last();
         lastdir.MakeLower();

-        if ( lastdir.Matches(_T("debug*")) || lastdir.Matches(_T("vc_msw*")) )
+        if ( lastdir.Matches(_T("debug*")) || lastdir.Matches(_T("vc*msw*")) )

             fn.RemoveLastDir();
     }
 #endif // __WXDEBUG__
             fn.RemoveLastDir();
     }
 #endif // __WXDEBUG__


@@ -262,13 +265,23 @@ wxString wxStandardPaths::GetAppDir()
     return fn.GetPath();
 }
 
     return fn.GetPath();
 }
 

+wxString wxStandardPaths::GetDocumentsDir() const
+{
+    return DoGetDirectory(CSIDL_PERSONAL);
+}
+

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

+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 +298,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