svn not cvs

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 027b72e29d72ced592a01e8c59c1d975575e38fc..175b241358a330f141e98f63b6229ecdeb1b8763 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -26,26 +26,25 @@
 
 #if wxUSE_FILEDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 
 #if wxUSE_FILEDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 

+#include "wx/filedlg.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/msw/wrapcdlg.h"
+    #include "wx/msw/missing.h"

     #include "wx/utils.h"
     #include "wx/msgdlg.h"
     #include "wx/utils.h"
     #include "wx/msgdlg.h"

-    #include "wx/filedlg.h"

     #include "wx/filefn.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/filefn.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/math.h"

 #endif
 
 #endif
 

-#include "wx/msw/wrapcdlg.h"
-

 #include <stdlib.h>
 #include <string.h>
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
 #include <stdlib.h>
 #include <string.h>
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"

-#include "wx/math.h"
-
-#include "wx/msw/missing.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -129,13 +128,14 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
                            const wxString& defaultFileName,
                            const wxString& wildCard,
                            long style,
                            const wxString& defaultFileName,
                            const wxString& wildCard,
                            long style,

-                           const wxPoint& pos)
+                           const wxPoint& pos,
+                           const wxSize& sz,
+                           const wxString& name)

             : wxFileDialogBase(parent, message, defaultDir, defaultFileName,
             : wxFileDialogBase(parent, message, defaultDir, defaultFileName,

-                               wildCard, style, pos)
+                               wildCard, style, pos, sz, name)

 
 {
 
 {

-    if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) )
-        m_dialogStyle &= ~wxMULTIPLE;
+    // NB: all style checks are done by wxFileDialogBase::Create

 
     m_bMovedWindow = false;
 
 
     m_bMovedWindow = false;
 


@@ -206,12 +206,12 @@ void wxFileDialog::DoMoveWindow(int x, int y, int WXUNUSED(w), int WXUNUSED(h))
 }
 
 // helper used below in ShowModal(): style is used to determine whether to show
 }
 
 // helper used below in ShowModal(): style is used to determine whether to show

-// the "Save file" dialog (if it contains wxSAVE bit) or "Open file" one;
+// the "Save file" dialog (if it contains wxFD_SAVE bit) or "Open file" one;

 // returns true on success or false on failure in which case err is filled with
 // the CDERR_XXX constant
 static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err)
 {
 // returns true on success or false on failure in which case err is filled with
 // the CDERR_XXX constant
 static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err)
 {

-    if ( style & wxSAVE ? GetSaveFileName(of) : GetOpenFileName(of) )
+    if ( style & wxFD_SAVE ? GetSaveFileName(of) : GetOpenFileName(of) )

         return true;
 
     if ( err )
         return true;
 
     if ( err )


@@ -229,20 +229,20 @@ static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err)
     return false;
 }
 
     return false;
 }
 

-// Basically, the problem is that we need to use the "new" size of the
-// OPENFILENAME structure
-// (OPENFILENAME_SIZE_VERSION_400 + void* + DWORD + DWORD)
-// in Windows 2000 and XP so that the new-style file dialog with the
-// "Places Bar" shows up. Unfortunately, there seems to be no reliable way
-// to test for it in the headers, so we need to always make one
-// with the extra bytes.
+// We want to use OPENFILENAME struct version 5 (Windows 2000/XP) but we don't
+// know if the OPENFILENAME declared in the currently used headers is a V5 or
+// V4 (smaller) one so we try to manually extend the struct in case it is the
+// old one.

 //
 //

-// We don't do this on Windows CE, however.
-#ifdef __WXWINCE__
+// We don't do this on Windows CE nor under Win64, however, as there are no
+// compilers with old headers for these architectures
+#if defined(__WXWINCE__) || defined(__WIN64__)

     typedef OPENFILENAME wxOPENFILENAME;
 
     typedef OPENFILENAME wxOPENFILENAME;
 

-    static const DWORD wxOPENFILENAME_V5_SIZE = sizeof(OPENFILENAME);
-#else // !__WXWINCE__
+    static const DWORD gs_ofStructSize = sizeof(OPENFILENAME);
+#else // !__WXWINCE__ || __WIN64__
+    #define wxTRY_SMALLER_OPENFILENAME
+

     struct wxOPENFILENAME : public OPENFILENAME
     {
         // fields added in Windows 2000/XP comdlg32.dll version
     struct wxOPENFILENAME : public OPENFILENAME
     {
         // fields added in Windows 2000/XP comdlg32.dll version


@@ -258,10 +258,10 @@ static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err)
 
     // this is hardcoded sizeof(OPENFILENAME_NT4) from Platform SDK
     static const DWORD wxOPENFILENAME_V4_SIZE = 76;
 
     // this is hardcoded sizeof(OPENFILENAME_NT4) from Platform SDK
     static const DWORD wxOPENFILENAME_V4_SIZE = 76;

-#endif // __WXWINCE__/!__WXWINCE__

 
 

-// always try the new one first
-static DWORD gs_ofStructSize = wxOPENFILENAME_V5_SIZE;
+    // always try the new one first
+    static DWORD gs_ofStructSize = wxOPENFILENAME_V5_SIZE;
+#endif // __WXWINCE__ || __WIN64__/!...

 
 int wxFileDialog::ShowModal()
 {
 
 int wxFileDialog::ShowModal()
 {


@@ -276,15 +276,9 @@ int wxFileDialog::ShowModal()
     *fileNameBuffer = wxT('\0');
     *titleBuffer    = wxT('\0');
 
     *fileNameBuffer = wxT('\0');
     *titleBuffer    = wxT('\0');
 

-#if WXWIN_COMPATIBILITY_2_4
-    long msw_flags = 0;
-    if ( (m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE) )
-        msw_flags |= OFN_HIDEREADONLY;
-#else

     long msw_flags = OFN_HIDEREADONLY;
     long msw_flags = OFN_HIDEREADONLY;

-#endif

 
 

-    if ( m_dialogStyle & wxFILE_MUST_EXIST )
+    if ( HasFdFlag(wxFD_FILE_MUST_EXIST) )

         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
     /*
         If the window has been moved the programmer is probably
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
     /*
         If the window has been moved the programmer is probably


@@ -302,21 +296,21 @@ int wxFileDialog::ShowModal()
 #endif
     }
 
 #endif
     }
 

-    if (m_dialogStyle & wxMULTIPLE )
+    if ( HasFdFlag(wxFD_MULTIPLE) )

     {
         // OFN_EXPLORER must always be specified with OFN_ALLOWMULTISELECT
         msw_flags |= OFN_EXPLORER | OFN_ALLOWMULTISELECT;
     }
 
     {
         // OFN_EXPLORER must always be specified with OFN_ALLOWMULTISELECT
         msw_flags |= OFN_EXPLORER | OFN_ALLOWMULTISELECT;
     }
 

-    // if wxCHANGE_DIR flag is not given we shouldn't change the CWD which the
+    // if wxFD_CHANGE_DIR flag is not given we shouldn't change the CWD which the

     // standard dialog does by default (notice that under NT it does it anyhow,
     // OFN_NOCHANGEDIR or not, see below)
     // standard dialog does by default (notice that under NT it does it anyhow,
     // OFN_NOCHANGEDIR or not, see below)

-    if ( !(m_dialogStyle & wxCHANGE_DIR) )
+    if ( !HasFdFlag(wxFD_CHANGE_DIR) )

     {
         msw_flags |= OFN_NOCHANGEDIR;
     }
 
     {
         msw_flags |= OFN_NOCHANGEDIR;
     }
 

-    if ( m_dialogStyle & wxOVERWRITE_PROMPT )
+    if ( HasFdFlag(wxFD_OVERWRITE_PROMPT) )

     {
         msw_flags |= OFN_OVERWRITEPROMPT;
     }
     {
         msw_flags |= OFN_OVERWRITEPROMPT;
     }


@@ -326,7 +320,7 @@ int wxFileDialog::ShowModal()
 
     of.lStructSize       = gs_ofStructSize;
     of.hwndOwner         = hWnd;
 
     of.lStructSize       = gs_ofStructSize;
     of.hwndOwner         = hWnd;

-    of.lpstrTitle        = WXSTRINGCAST m_message;
+    of.lpstrTitle        = m_message.wx_str();

     of.lpstrFileTitle    = titleBuffer;
     of.nMaxFileTitle     = wxMAXFILE + 1 + wxMAXEXT;
 
     of.lpstrFileTitle    = titleBuffer;
     of.nMaxFileTitle     = wxMAXFILE + 1 + wxMAXEXT;
 


@@ -391,31 +385,31 @@ int wxFileDialog::ShowModal()
     }
 
     // Replace | with \0
     }
 
     // Replace | with \0

-    for (i = 0; i < filterBuffer.Len(); i++ ) {
+    for (i = 0; i < filterBuffer.length(); i++ ) {

         if ( filterBuffer.GetChar(i) == wxT('|') ) {
             filterBuffer[i] = wxT('\0');
         }
     }
 
         if ( filterBuffer.GetChar(i) == wxT('|') ) {
             filterBuffer[i] = wxT('\0');
         }
     }
 

-    of.lpstrFilter  = (LPTSTR)filterBuffer.c_str();
+    of.lpstrFilter  = (LPTSTR)filterBuffer.wx_str();

     of.nFilterIndex = m_filterIndex + 1;
 
     //=== Setting defaultFileName >>=========================================
 
     of.nFilterIndex = m_filterIndex + 1;
 
     //=== Setting defaultFileName >>=========================================
 

-    wxStrncpy( fileNameBuffer, (const wxChar *)m_fileName, wxMAXPATH-1 );
+    wxStrncpy(fileNameBuffer, m_fileName, wxMAXPATH-1);

     fileNameBuffer[ wxMAXPATH-1 ] = wxT('\0');
 
     of.lpstrFile = fileNameBuffer;  // holds returned filename
     of.nMaxFile  = wxMAXPATH;
 
     // we must set the default extension because otherwise Windows would check
     fileNameBuffer[ wxMAXPATH-1 ] = wxT('\0');
 
     of.lpstrFile = fileNameBuffer;  // holds returned filename
     of.nMaxFile  = wxMAXPATH;
 
     // we must set the default extension because otherwise Windows would check

-    // for the existing of a wrong file with wxOVERWRITE_PROMPT (i.e. if the
+    // for the existing of a wrong file with wxFD_OVERWRITE_PROMPT (i.e. if the

     // user types "foo" and the default extension is ".bar" we should force it
     // to check for "foo.bar" existence and not "foo")
     wxString defextBuffer; // we need it to be alive until GetSaveFileName()!
     // user types "foo" and the default extension is ".bar" we should force it
     // to check for "foo.bar" existence and not "foo")
     wxString defextBuffer; // we need it to be alive until GetSaveFileName()!

-    if (m_dialogStyle & wxSAVE)
+    if (HasFdFlag(wxFD_SAVE))

     {
     {

-        const wxChar* extension = filterBuffer;
+        const wxChar* extension = filterBuffer.wx_str();

         int maxFilter = (int)(of.nFilterIndex*2L) - 1;
 
         for( int i = 0; i < maxFilter; i++ )           // get extension
         int maxFilter = (int)(of.nFilterIndex*2L) - 1;
 
         for( int i = 0; i < maxFilter; i++ )           // get extension


@@ -425,7 +419,7 @@ int wxFileDialog::ShowModal()
         defextBuffer = AppendExtension(wxT("a"), extension);
         if (defextBuffer.StartsWith(wxT("a.")))
         {
         defextBuffer = AppendExtension(wxT("a"), extension);
         if (defextBuffer.StartsWith(wxT("a.")))
         {

-            defextBuffer.Mid(2);
+            defextBuffer = defextBuffer.Mid(2); // remove "a."

             of.lpstrDefExt = defextBuffer.c_str();
         }
     }
             of.lpstrDefExt = defextBuffer.c_str();
         }
     }


@@ -436,9 +430,9 @@ int wxFileDialog::ShowModal()
     //== Execute FileDialog >>=================================================
 
     DWORD errCode;
     //== Execute FileDialog >>=================================================
 
     DWORD errCode;

-    bool success = DoShowCommFileDialog(&of, m_dialogStyle, &errCode);
+    bool success = DoShowCommFileDialog(&of, m_windowStyle, &errCode);

 
 

-#ifndef __WXWINCE__
+#ifdef wxTRY_SMALLER_OPENFILENAME

     // the system might be too old to support the new version file dialog
     // boxes, try with the old size
     if ( !success && errCode == CDERR_STRUCTSIZE &&
     // the system might be too old to support the new version file dialog
     // boxes, try with the old size
     if ( !success && errCode == CDERR_STRUCTSIZE &&


@@ -446,7 +440,7 @@ int wxFileDialog::ShowModal()
     {
         of.lStructSize = wxOPENFILENAME_V4_SIZE;
 
     {
         of.lStructSize = wxOPENFILENAME_V4_SIZE;
 

-        success = DoShowCommFileDialog(&of, m_dialogStyle, &errCode);
+        success = DoShowCommFileDialog(&of, m_windowStyle, &errCode);

 
         if ( success || !errCode )
         {
 
         if ( success || !errCode )
         {


@@ -454,14 +448,14 @@ int wxFileDialog::ShowModal()
             gs_ofStructSize = of.lStructSize;
         }
     }
             gs_ofStructSize = of.lStructSize;
         }
     }

-#endif // !__WXWINCE__
+#endif // wxTRY_SMALLER_OPENFILENAME

 
     if ( success )
     {
         // GetOpenFileName will always change the current working directory on
         // (according to MSDN) "Windows NT 4.0/2000/XP" because the flag
         // OFN_NOCHANGEDIR has no effect.  If the user did not specify
 
     if ( success )
     {
         // GetOpenFileName will always change the current working directory on
         // (according to MSDN) "Windows NT 4.0/2000/XP" because the flag
         // OFN_NOCHANGEDIR has no effect.  If the user did not specify

-        // wxCHANGE_DIR let's restore the current working directory to what it
+        // wxFD_CHANGE_DIR let's restore the current working directory to what it

         // was before the dialog was shown.
         if ( msw_flags & OFN_NOCHANGEDIR )
         {
         // was before the dialog was shown.
         if ( msw_flags & OFN_NOCHANGEDIR )
         {


@@ -470,7 +464,7 @@ int wxFileDialog::ShowModal()
 
         m_fileNames.Empty();
 
 
         m_fileNames.Empty();
 

-        if ( ( m_dialogStyle & wxMULTIPLE ) &&
+        if ( ( HasFdFlag(wxFD_MULTIPLE) ) &&

 #if defined(OFN_EXPLORER)
              ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') )
 #else
 #if defined(OFN_EXPLORER)
              ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') )
 #else


@@ -483,7 +477,7 @@ int wxFileDialog::ShowModal()
             i = of.nFileOffset;
             m_fileName = &fileNameBuffer[i];
             m_fileNames.Add(m_fileName);
             i = of.nFileOffset;
             m_fileName = &fileNameBuffer[i];
             m_fileNames.Add(m_fileName);

-            i += m_fileName.Len() + 1;
+            i += m_fileName.length() + 1;

 
             while (fileNameBuffer[i] != wxT('\0'))
             {
 
             while (fileNameBuffer[i] != wxT('\0'))
             {


@@ -517,15 +511,15 @@ int wxFileDialog::ShowModal()
                  (of.nFileExtension && fileNameBuffer[of.nFileExtension] == wxT('\0')) )
             {
                 // User has typed a filename without an extension:
                  (of.nFileExtension && fileNameBuffer[of.nFileExtension] == wxT('\0')) )
             {
                 // User has typed a filename without an extension:

-                const wxChar* extension = filterBuffer;
+                const wxChar* extension = filterBuffer.wx_str();

                 int   maxFilter = (int)(of.nFilterIndex*2L) - 1;
 
                 for( int i = 0; i < maxFilter; i++ )           // get extension
                     extension = extension + wxStrlen( extension ) + 1;
 
                 m_fileName = AppendExtension(fileNameBuffer, extension);
                 int   maxFilter = (int)(of.nFilterIndex*2L) - 1;
 
                 for( int i = 0; i < maxFilter; i++ )           // get extension
                     extension = extension + wxStrlen( extension ) + 1;
 
                 m_fileName = AppendExtension(fileNameBuffer, extension);

-                wxStrncpy(fileNameBuffer, m_fileName.c_str(), wxMin(m_fileName.Len(), wxMAXPATH-1));
-                fileNameBuffer[wxMin(m_fileName.Len(), wxMAXPATH-1)] = wxT('\0');
+                wxStrncpy(fileNameBuffer, m_fileName.c_str(), wxMin(m_fileName.length(), wxMAXPATH-1));
+                fileNameBuffer[wxMin(m_fileName.length(), wxMAXPATH-1)] = wxT('\0');

             }
 
             m_path = fileNameBuffer;
             }
 
             m_path = fileNameBuffer;


@@ -553,4 +547,3 @@ int wxFileDialog::ShowModal()
 }
 
 #endif // wxUSE_FILEDLG && !(__SMARTPHONE__ && __WXWINCE__)
 }
 
 #endif // wxUSE_FILEDLG && !(__SMARTPHONE__ && __WXWINCE__)

-