Disable typemap for wxImage constructors

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

diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp
index 27fa594c7e6e605686acda7652989f930cd5db71..02b714d8f4cdc39a2bdd2df8809d7a277618e188 100644 (file)
--- a/src/msw/stdpaths.cpp
+++ b/src/msw/stdpaths.cpp
@@ -24,6 +24,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_STDPATHS
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif //WX_PRECOMP
@@ -50,6 +52,10 @@ typedef HRESULT (WINAPI *SHGetSpecialFolderPath_t)(HWND, LPTSTR, int, BOOL);
 // used in our wxLogTrace messages
 static const wxChar *TRACE_MASK = _T("stdpaths");
 
+#ifndef CSIDL_APPDATA
+    #define CSIDL_APPDATA         0x001a
+#endif
+
 #ifndef CSIDL_LOCAL_APPDATA
     #define CSIDL_LOCAL_APPDATA   0x001c
 #endif
@@ -240,7 +246,9 @@ wxString wxStandardPaths::GetUserConfigDir() const
 
 wxString wxStandardPaths::GetDataDir() const
 {
-    return AppendAppName(DoGetDirectory(CSIDL_PROGRAM_FILES));
+    // under Windows each program is usually installed in its own directory and
+    // so its datafiles are in the same directory as its main executable
+    return wxFileName(wxGetFullModuleName()).GetPath();
 }
 
 wxString wxStandardPaths::GetUserDataDir() const
@@ -274,9 +282,8 @@ wxString wxStandardPathsWin16::GetConfigDir() const
         wxLogLastError(_T("GetWindowsDirectory"));
     }
 #else
-    // TODO:
-    //    eVC4 - use CSIDL_WINDOWS
-    //    eVC3 - probably not possible through API
+    // TODO: use CSIDL_WINDOWS (eVC4, possibly not eVC3)
+    return wxT("\\Windows");
 #endif
 
     return dir;
@@ -288,3 +295,4 @@ wxString wxStandardPathsWin16::GetUserConfigDir() const
     return wxGetHomeDir();
 }
 
+#endif // wxUSE_STDPATHS