Added wxDataViewBitmapCell

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 1be91db75f158297d260f8768edd0e6347ec27ed..b4ea82e56a960adea19bb2f8e4d83f6a000657de 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -68,6 +68,9 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h" // For GetShort/LongPathName
+    #endif

     #include "wx/dynarray.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/dynarray.h"
     #include "wx/intl.h"
     #include "wx/log.h"


@@ -81,12 +84,8 @@
 #include "wx/file.h"
 #include "wx/dynlib.h"
 
 #include "wx/file.h"
 #include "wx/dynlib.h"
 

-// For GetShort/LongPathName
-#ifdef __WIN32__
-#include "wx/msw/wrapwin.h"
-#if defined(__MINGW32__)
-#include "wx/msw/gccpriv.h"
-#endif
+#if defined(__WIN32__) && defined(__MINGW32__)
+    #include "wx/msw/gccpriv.h"

 #endif
 
 #ifdef __WXWINCE__
 #endif
 
 #ifdef __WXWINCE__


@@ -1047,7 +1046,9 @@ bool wxFileName::Normalize(int flags,
 #include <shlguid.h>
 #endif
 
 #include <shlguid.h>
 #endif
 

-bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targetFilename, wxString* arguments)
+bool wxFileName::GetShortcutTarget(const wxString& shortcutPath,
+                                   wxString& targetFilename,
+                                   wxString* arguments)

 {
     wxString path, file, ext;
     wxSplitPath(shortcutPath, & path, & file, & ext);
 {
     wxString path, file, ext;
     wxSplitPath(shortcutPath, & path, & file, & ext);


@@ -1076,6 +1077,8 @@ bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targe
                                 MAX_PATH);
 
             hres = ppf->Load(wsz, 0);
                                 MAX_PATH);
 
             hres = ppf->Load(wsz, 0);

+            ppf->Release();
+

             if (SUCCEEDED(hres))
             {
                 wxChar buf[2048];
             if (SUCCEEDED(hres))
             {
                 wxChar buf[2048];


@@ -1096,11 +1099,13 @@ bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targe
                 }
             }
         }
                 }
             }
         }

+
+        psl->Release();

     }
     }

-    psl->Release();

     return success;
 }
     return success;
 }

-#endif
+
+#endif // __WIN32__ && !__WXWINCE__

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -2034,7 +2039,10 @@ wxULongLong wxFileName::GetSize(const wxString &filename)
     if (!wxFileExists(filename))
         return wxInvalidSize;
 
     if (!wxFileExists(filename))
         return wxInvalidSize;
 

-#ifdef __WIN32__
+#if defined(__WXPALMOS__)
+    // TODO
+    return wxInvalidSize;
+#elif defined(__WIN32__)

     wxFileHandle f(filename, wxFileHandle::Read);
     if (!f.IsOk())
         return wxInvalidSize;
     wxFileHandle f(filename, wxFileHandle::Read);
     if (!f.IsOk())
         return wxInvalidSize;