X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/942bef71b0d8ff9375c08ac5082c6a45686644fb..30a72e62977e4c532ae2f265db72535a5cccbbab:/src/common/filename.cpp?ds=inline

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index cebec267bc..d3ee13116e 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -464,6 +464,7 @@ bool wxFileName::IsWild( wxPathFormat format )
 {
     // FIXME: this is probably false for Mac and this is surely wrong for most
     //        of Unix shells (think about "[...]")
+	(void)format;
     return m_name.find_first_of(_T("*?")) != wxString::npos;
 }
 
@@ -529,13 +530,14 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {
+	(void)format;
     return GetPathWithSep() + GetFullName();
 }
 
 // Return the short form of the path (returns identity on non-Windows platforms)
 wxString wxFileName::GetShortPath() const
 {
-#if defined(__WXMSW__) && defined(__WIN32__)
+#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__)
     wxString path(GetFullPath());
     wxString pathOut;
     DWORD sz = ::GetShortPathName(path, NULL, 0);
@@ -562,7 +564,7 @@ wxString wxFileName::GetShortPath() const
 // Return the long form of the path (returns identity on non-Windows platforms)
 wxString wxFileName::GetLongPath() const
 {
-#if defined(__WXMSW__) && defined(__WIN32__)
+#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__)
     wxString path(GetFullPath());
     wxString pathOut;
     bool success = FALSE;
@@ -571,17 +573,16 @@ wxString wxFileName::GetLongPath() const
     typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
 
     static bool s_triedToLoad = FALSE;
-    static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;
 
     if ( !s_triedToLoad )
     {
         s_triedToLoad = TRUE;
-
+#if 0
         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
-        short avoidCompilerWarning = 0;
-        if ( avoidCompilerWarning ) // dllKernel )
+        if ( dllKernel )
         {
             // may succeed or fail depending on the Windows version
+			static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;
 #ifdef _UNICODE
             s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameW"));
 #else
@@ -614,6 +615,7 @@ wxString wxFileName::GetLongPath() const
                 }
             }
         }
+#endif		
     }
     if (success)
         return pathOut;