Cleanup

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 088123b720022271b70dba9cc6f41787c54fe800..0659a8b565749e16a65c9cdee72522d8ef9c941e 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -585,7 +585,7 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
     }
 
 #elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-#ifdef __WIN32__
+
     if ( dir.empty() )
     {
         if ( !::GetTempPath(MAX_PATH, wxStringBuffer(dir, MAX_PATH + 1)) )
@@ -612,12 +612,6 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
 
         path.clear();
     }
-#else // Win16
-    if ( !::GetTempFileName(NULL, prefix, 0, wxStringBuffer(path, 1025)) )
-    {
-        path.clear();
-    }
-#endif // Win32/16
 
 #else // !Windows
     if ( dir.empty() )
@@ -946,7 +940,7 @@ bool wxFileName::Normalize(int flags,
         m_dirs.Add(dir);
     }
     
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
     if ( (flags & wxPATH_NORM_SHORTCUT) )
     {
         wxString filename;
@@ -1001,7 +995,7 @@ bool wxFileName::Normalize(int flags,
 // files\myapp.exe) that includes spaces needs to be enclosed in
 // quotation marks."
 
-#if defined(__WIN32__) && !defined(__WXWINCE__)
+#if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
 // The following lines are necessary under WinCE
 // #include "wx/msw/private.h"
 // #include <ole2.h>
@@ -1009,15 +1003,9 @@ bool wxFileName::Normalize(int flags,
 #if defined(__WXWINCE__)
 #include <shlguid.h>
 #endif
-#endif
 
-#ifdef __WIN32__
 bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targetFilename, wxString* arguments)
 {
-#ifdef __WXWINCE__
-    // Doesn't compile on WinCE yet
-    return FALSE;
-#else
     wxString path, file, ext;
     wxSplitPath(shortcutPath, & path, & file, & ext);
     
@@ -1063,7 +1051,6 @@ bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targe
        }
        psl->Release();
        return success;
-#endif
 }
 #endif
 
@@ -1990,25 +1977,25 @@ WX_DEFINE_EXPORTED_OBJARRAY(MacDefaultExtensionArray) ;
 
 MacDefaultExtensionArray gMacDefaultExtensions ;
 
-static void MacEnsureDefaultExtensionsLoaded()
+// load the default extensions
+MacDefaultExtensionRecord gDefaults[] =
 {
-  if ( !gMacDefaultExtensionsInited )
-  {
-
-    // load the default extensions
-    MacDefaultExtensionRecord defaults[1] =
-    {
-      MacDefaultExtensionRecord( wxT("txt") , 'TEXT' , 'ttxt' ) ,
-
-    } ;
-    // we could load the pc exchange prefs here too
+    MacDefaultExtensionRecord( wxT("txt") , 'TEXT' , 'ttxt' ) ,
+    MacDefaultExtensionRecord( wxT("tif") , 'TIFF' , '****' ) ,
+    MacDefaultExtensionRecord( wxT("jpg") , 'JPEG' , '****' ) ,
+} ;
 
-    for ( size_t i = 0 ; i < WXSIZEOF( defaults ) ; ++i )
+static void MacEnsureDefaultExtensionsLoaded()
+{
+    if ( !gMacDefaultExtensionsInited )
     {
-      gMacDefaultExtensions.Add( defaults[i] ) ;
+        // we could load the pc exchange prefs here too
+        for ( size_t i = 0 ; i < WXSIZEOF( gDefaults ) ; ++i )
+        {
+            gMacDefaultExtensions.Add( gDefaults[i] ) ;
+        }
+        gMacDefaultExtensionsInited = true ;
     }
-    gMacDefaultExtensionsInited = true ;
-  }
 }
 bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator )
 {