A few tweaks and cleanups

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 4f0d03e24345fb24b8f8ca722316464d0a822f00..ac7478a9d8406a23f3578fbe7d601a781ba3a90d 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -259,12 +259,13 @@ int wxFileDialog::ShowModal()
     {
         msw_flags |= OFN_NOCHANGEDIR;
     }
-
+/* chris elliott for some reason this does not work usefully if no extension
+   is given, as it test for junk instead of junk.ext
     if ( m_dialogStyle & wxOVERWRITE_PROMPT )
     {
         msw_flags |= OFN_OVERWRITEPROMPT;
     }
-
+*/
     OPENFILENAME of;
     wxZeroMemory(of);
 
@@ -398,29 +399,6 @@ int wxFileDialog::ShowModal()
                                             : (GetOpenFileName(&of) != 0);
         }
     }
-
-#if wxUSE_UNICODE_MSLU && defined(OFN_EXPLORER)
-    // VS: there's a bug in unicows.dll - when multiple files are selected, 
-    //     of.nFileOffset doesn't point to the first filename but rather to 
-    //     the last component of directory name. This bug is known to MSLU
-    //     developers, but they are not going to fix it: "this is a true 
-    //     limitation, that we have decided to live with" and "working
-    //     harder on this case just did not seem worth the effort"...
-    //
-    //     Our only option is to try to fix it ourselves:
-
-    if ( (m_dialogStyle & wxMULTIPLE) &&
-         (fileNameBuffer[of.nFileOffset-1] != wxT('\0')) &&
-         wxGetOsVersion() == wxWIN95 /*using unicows.dll*/)
-    {
-        if ( wxDirExists(fileNameBuffer) )
-        {
-            // 1st component is dir => multiple files selected
-            of.nFileOffset = wxStrlen(fileNameBuffer)+1;
-        }
-    }
-#endif // wxUSE_UNICODE_MSLU
-
 #endif // __WIN32__
 
     if ( success )
@@ -515,6 +493,18 @@ int wxFileDialog::ShowModal()
             m_fileNames.Add(m_fileName);
             m_dir = wxPathOnly(fileNameBuffer);
         }
+        //=== Simulating the wxOVERWRITE_PROMPT >>============================
+        //should we also test for file save style ??
+        if ( (m_dialogStyle & wxOVERWRITE_PROMPT) &&
+             ::wxFileExists( fileNameBuffer ) )
+             {
+             wxString messageText;
+             messageText.Printf(_("File '%s' already exists.\nDo you want to replace it?"), fileNameBuffer);
+             if ( wxMessageBox(messageText, wxT("Save File As"), wxYES_NO | wxICON_EXCLAMATION  ) != wxYES )
+             {
+                 success = FALSE;
+             }            
+        }
     }
     else
     {