Don't complain under MicroWindows if a wxDC's HDC is NULL - it happens

[wxWidgets.git] / src / common / filename.cpp

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index c84ded0f6e4f586dda74653b6e421a6e160d0a6c..d3ee13116efd6e7998600cff3c89dff41b036aca 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -48,19 +48,6 @@
 #include "wx/msw/winundef.h"
 #endif
 
 #include "wx/msw/winundef.h"
 #endif
 

-// at least some of these are required for file mod time
-#ifdef __WXGTK__
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <pwd.h>
-#ifndef __VMS
-# include <grp.h>
-#endif
-# include <time.h>
-#include <unistd.h>
-#endif
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -167,24 +154,8 @@ bool wxFileName::DirExists( const wxString &dir )
 
 wxDateTime wxFileName::GetModificationTime()
 {
 
 wxDateTime wxFileName::GetModificationTime()
 {

-#ifdef __WXGTK__
-    struct stat buff;
-    stat( GetFullName().fn_str(), &buff );
-
-#if !defined( __EMX__ ) && !defined(__VMS)
-    struct stat lbuff;
-    lstat( GetFullName().fn_str(), &lbuff );
-    struct tm *t = localtime( &lbuff.st_mtime );
-#else
-    struct tm *t = localtime( &buff.st_mtime );
-#endif
+    wxDateTime ret( wxFileModificationTime( GetFullPath() ) );

 
 

-    wxDateTime ret( t->tm_mday, (wxDateTime::Month)t->tm_mon, t->tm_year+1900, t->tm_hour, t->tm_min, t->tm_sec );
-#else
-    
-    wxDateTime ret = wxDateTime::Now();
-
-#endif

     return ret;
 }
 
     return ret;
 }
 


@@ -493,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 "[...]")
 {
     // 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;
 }
 
     return m_name.find_first_of(_T("*?")) != wxString::npos;
 }
 


@@ -558,13 +530,14 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
 
 wxString wxFileName::GetFullPath( 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
 {
     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);
     wxString path(GetFullPath());
     wxString pathOut;
     DWORD sz = ::GetShortPathName(path, NULL, 0);


@@ -591,7 +564,7 @@ wxString wxFileName::GetShortPath() const
 // Return the long form of the path (returns identity on non-Windows platforms)
 wxString wxFileName::GetLongPath() 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;
     wxString path(GetFullPath());
     wxString pathOut;
     bool success = FALSE;


@@ -600,17 +573,16 @@ wxString wxFileName::GetLongPath() const
     typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
 
     static bool s_triedToLoad = FALSE;
     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 ( !s_triedToLoad )
     {
         s_triedToLoad = TRUE;

-
+#if 0

         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));

-               short avoidCompilerWarning = 0;
-        if ( avoidCompilerWarning ) // dllKernel )
+        if ( dllKernel )

         {
             // may succeed or fail depending on the Windows version
         {
             // 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
 #ifdef _UNICODE
             s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameW"));
 #else


@@ -643,6 +615,7 @@ wxString wxFileName::GetLongPath() const
                 }
             }
         }
                 }
             }
         }

+#endif         

     }
     if (success)
         return pathOut;
     }
     if (success)
         return pathOut;