Compile fixes for the const patch

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index eb513c4001031f474c90f96922fcb95d22d38730..2bf5d527c3b387a8a7dbfe99882a2f984dfc2fd9 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "filedlg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,7 +24,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_FILEDLG && !wxUSE_SMARTPHONE
+#if wxUSE_FILEDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))

 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"


@@ -40,22 +36,16 @@
     #include "wx/app.h"
 #endif
 
     #include "wx/app.h"
 #endif
 

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

 
 

-#if !defined(__WIN32__) || defined(__WXWINCE__)
-    #include <commdlg.h>
-#endif
-
-#include <math.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"

 
 

-#ifndef OFN_EXPLORER
-    #define OFN_EXPLORER 0x00080000
-#endif
+#include "wx/msw/missing.h"

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


@@ -71,12 +61,65 @@
 
 # define wxMAXEXT    5
 
 
 # define wxMAXEXT    5
 

+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+// standard dialog size
+static wxRect gs_rectDialog(0, 0, 428, 266);
+

 // ============================================================================
 // implementation
 // ============================================================================
 
 IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
 

+// ----------------------------------------------------------------------------
+// hook function for moving the dialog
+// ----------------------------------------------------------------------------
+
+UINT_PTR APIENTRY
+wxFileDialogHookFunction(HWND      hDlg,
+                         UINT      iMsg,
+                         WPARAM    WXUNUSED(wParam),
+                         LPARAM    lParam)
+{
+    HWND   hwndDialog;
+    hwndDialog = ::GetParent( hDlg );
+    switch (iMsg)
+    {
+        case WM_DESTROY:
+            {
+                RECT dlgRect;
+                GetWindowRect( hwndDialog, & dlgRect );
+                gs_rectDialog.x = dlgRect.left;
+                gs_rectDialog.y = dlgRect.top;
+                gs_rectDialog.width = dlgRect.right - dlgRect.left;
+                gs_rectDialog.height = dlgRect.bottom - dlgRect.top;
+            }
+            break;
+
+        case WM_NOTIFY:
+            {
+                OFNOTIFY *   pNotifyCode;
+                pNotifyCode = (LPOFNOTIFY) lParam;
+                if (CDN_INITDONE == (pNotifyCode->hdr).code)
+                {
+                    SetWindowPos( hwndDialog, HWND_TOP,
+                                  gs_rectDialog.x,
+                                  gs_rectDialog.y,
+                                  gs_rectDialog.width,
+                                  gs_rectDialog.height,
+                                  SWP_NOZORDER|SWP_NOSIZE);
+                 }
+            }
+            break;
+    }
+
+    // do the default processing
+    return 0;
+}
+

 // ----------------------------------------------------------------------------
 // wxFileDialog
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFileDialog
 // ----------------------------------------------------------------------------


@@ -88,13 +131,22 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
                            const wxString& wildCard,
                            long style,
                            const wxPoint& pos)
                            const wxString& wildCard,
                            long style,
                            const wxPoint& pos)

-             :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos)
+            : wxFileDialogBase(parent, message, defaultDir, defaultFileName,
+                               wildCard, style, pos)

 
 {
     if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) )
         m_dialogStyle &= ~wxMULTIPLE;
 
 {
     if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) )
         m_dialogStyle &= ~wxMULTIPLE;

-}

 
 

+    m_bMovedWindow = false;
+
+    // Must set to zero, otherwise the wx routines won't size the window
+    // the second time you call the file dialog, because it thinks it is
+    // already at the requested size.. (when centering)
+    gs_rectDialog.x =
+    gs_rectDialog.y = 0;
+
+}

 void wxFileDialog::GetPaths(wxArrayString& paths) const
 {
     paths.Empty();
 void wxFileDialog::GetPaths(wxArrayString& paths) const
 {
     paths.Empty();


@@ -113,6 +165,11 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const
     }
 }
 
     }
 }
 

+void wxFileDialog::GetFilenames(wxArrayString& files) const
+{
+    files = m_fileNames;
+}
+

 void wxFileDialog::SetPath(const wxString& path)
 {
     wxString ext;
 void wxFileDialog::SetPath(const wxString& path)
 {
     wxString ext;


@@ -121,6 +178,34 @@ void wxFileDialog::SetPath(const wxString& path)
         m_fileName << _T('.') << ext;
 }
 
         m_fileName << _T('.') << ext;
 }
 

+void wxFileDialog::DoGetPosition( int *x, int *y ) const
+{
+    *x = gs_rectDialog.x;
+    *y = gs_rectDialog.y;
+}
+
+
+void wxFileDialog::DoGetSize(int *width, int *height) const
+{
+    *width  = gs_rectDialog.width;
+    *height = gs_rectDialog.height;
+}
+
+void wxFileDialog::DoMoveWindow(int x, int y, int WXUNUSED(width), int WXUNUSED(height))
+{
+    m_bMovedWindow = true;
+
+    gs_rectDialog.x = x;
+    gs_rectDialog.y = y;
+
+    /*
+        The width and height can not be set by the programmer
+        its just not possible.  But the program can get the
+        size of the Dlg after it has been shown, in case they need
+        that data.
+    */
+}
+

 int wxFileDialog::ShowModal()
 {
     HWND hWnd = 0;
 int wxFileDialog::ShowModal()
 {
     HWND hWnd = 0;


@@ -134,11 +219,36 @@ 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;
     long msw_flags = 0;
     if ( (m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE) )
         msw_flags |= OFN_HIDEREADONLY;

+#else
+    long msw_flags = OFN_HIDEREADONLY;
+#endif
+

     if ( m_dialogStyle & wxFILE_MUST_EXIST )
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
     if ( m_dialogStyle & wxFILE_MUST_EXIST )
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;

+    /*
+        If the window has been moved the programmer is probably
+        trying to center or position it.  Thus we set the callback
+        or hook function so that we can actually adjust the position.
+        Without moving or centering the dlg, it will just stay
+        in the upper left of the frame, it does not center
+        automatically..  One additional note, when the hook is
+        enabled, the PLACES BAR in the dlg (shown on later versions
+        of windows (2000 and XP) will automatically be turned off
+        according to the MSDN docs.  This is normal.  If the
+        programmer needs the PLACES BAR (left side of dlg) they
+        just shouldn't move or center the dlg.
+    */
+    if (m_bMovedWindow) // we need these flags.
+    {
+        msw_flags |= OFN_EXPLORER|OFN_ENABLEHOOK;
+#ifndef __WXWINCE__
+        msw_flags |= OFN_ENABLESIZING;
+#endif
+    }

 
     if (m_dialogStyle & wxMULTIPLE )
     {
 
     if (m_dialogStyle & wxMULTIPLE )
     {


@@ -147,18 +257,18 @@ int wxFileDialog::ShowModal()
     }
 
     // if wxCHANGE_DIR flag is not given we shouldn't change the CWD which the
     }
 
     // if wxCHANGE_DIR flag is not given we shouldn't change the CWD which the

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

     if ( !(m_dialogStyle & wxCHANGE_DIR) )
     {
         msw_flags |= OFN_NOCHANGEDIR;
     }
     if ( !(m_dialogStyle & wxCHANGE_DIR) )
     {
         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;
     }
     if ( m_dialogStyle & wxOVERWRITE_PROMPT )
     {
         msw_flags |= OFN_OVERWRITEPROMPT;
     }

-*/
+

     OPENFILENAME of;
     wxZeroMemory(of);
 
     OPENFILENAME of;
     wxZeroMemory(of);
 


@@ -182,8 +292,8 @@ int wxFileDialog::ShowModal()
     // forward slashes) and also squeeze multiple consecutive slashes into one
     // as it doesn't like two backslashes in a row neither
 
     // forward slashes) and also squeeze multiple consecutive slashes into one
     // as it doesn't like two backslashes in a row neither
 

-    wxString   dir;
-    size_t     i, len = m_dir.length();
+    wxString  dir;
+    size_t    i, len = m_dir.length();

     dir.reserve(len);
     for ( i = 0; i < len; i++ )
     {
     dir.reserve(len);
     for ( i = 0; i < len; i++ )
     {


@@ -207,7 +317,7 @@ int wxFileDialog::ShowModal()
                     if (i > 0)
                         i++;
                     else
                     if (i > 0)
                         i++;
                     else

-                        break;    
+                        break;

                 }
                 // fall through
 
                 }
                 // fall through
 


@@ -220,38 +330,24 @@ int wxFileDialog::ShowModal()
     of.lpstrInitialDir   = dir.c_str();
 
     of.Flags             = msw_flags;
     of.lpstrInitialDir   = dir.c_str();
 
     of.Flags             = msw_flags;

+    of.lpfnHook          = wxFileDialogHookFunction;

 
 

+    wxArrayString wildDescriptions, wildFilters;

 
 

-    //=== Like Alejandro Sierra's wildcard modification >>===================
-    /*
-       In wxFileSelector you can put, instead of a single wild_card,
-       pairs of strings separated by '|'.
-       The first string is a description, and the
-       second is the wild card. You can put any number of pairs.
-
-       eg.  "description1 (*.ex1)|*.ex1|description2 (*.ex2)|*.ex2"
+    size_t items = wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters);

 
 

-       If you put a single wild card, it works as before the modification.
-     */
-    //=======================================================================
+    wxASSERT_MSG( items > 0 , _T("empty wildcard list") );

 
 

-    wxString theFilter;
-    if ( wxStrlen(m_wildCard) == 0 )
-        theFilter = wxString(wxT("*.*"));
-    else
-        theFilter = m_wildCard ;

     wxString filterBuffer;
 
     wxString filterBuffer;
 

-    if ( !wxStrchr( theFilter, wxT('|') ) ) {    // only one filter ==> default text
-        filterBuffer.Printf(_("Files (%s)|%s"),
-                            theFilter.c_str(), theFilter.c_str());
-    }
-    else {                                // more then one filter
-        filterBuffer = theFilter;
-
+    for (i = 0; i < items ; i++)
+    {
+        filterBuffer += wildDescriptions[i];
+        filterBuffer += wxT("|");
+        filterBuffer += wildFilters[i];
+        filterBuffer += wxT("|");

     }
 
     }
 

-    filterBuffer += wxT("|");

     // Replace | with \0
     for (i = 0; i < filterBuffer.Len(); i++ ) {
         if ( filterBuffer.GetChar(i) == wxT('|') ) {
     // Replace | with \0
     for (i = 0; i < filterBuffer.Len(); i++ ) {
         if ( filterBuffer.GetChar(i) == wxT('|') ) {


@@ -259,7 +355,7 @@ int wxFileDialog::ShowModal()
         }
     }
 
         }
     }
 

-    of.lpstrFilter  = (LPTSTR)(const wxChar *)filterBuffer;
+    of.lpstrFilter  = (LPTSTR)filterBuffer.c_str();

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


@@ -270,6 +366,31 @@ int wxFileDialog::ShowModal()
     of.lpstrFile = fileNameBuffer;  // holds returned filename
     of.nMaxFile  = wxMAXPATH;
 
     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
+    // 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)
+    {
+        const wxChar* extension = filterBuffer;
+        int maxFilter = (int)(of.nFilterIndex*2L) - 1;
+
+        for( int i = 0; i < maxFilter; i++ )           // get extension
+            extension = extension + wxStrlen( extension ) + 1;
+
+        // use dummy name a to avoid assert in AppendExtension
+        defextBuffer = AppendExtension(wxT("a"), extension);
+        if (defextBuffer.StartsWith(wxT("a.")))
+        {
+            defextBuffer.Mid(2);
+            of.lpstrDefExt = defextBuffer.c_str();
+        }
+    }
+
+    // store off before the standard windows dialog can possibly change it
+    const wxString cwdOrig = wxGetCwd();
+

     //== Execute FileDialog >>=================================================
 
     bool success = (m_dialogStyle & wxSAVE ? GetSaveFileName(&of)
     //== Execute FileDialog >>=================================================
 
     bool success = (m_dialogStyle & wxSAVE ? GetSaveFileName(&of)


@@ -277,6 +398,19 @@ int wxFileDialog::ShowModal()
 
     DWORD errCode = CommDlgExtendedError();
 
 
     DWORD errCode = CommDlgExtendedError();
 

+    // 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 was before the
+    // dialog was shown (assuming this behavior extends to Windows Server 2003
+    // seems safe).
+    if ( success &&
+            (msw_flags & OFN_NOCHANGEDIR) &&
+                wxGetOsVersion() == wxWINDOWS_NT )
+    {
+        wxSetWorkingDirectory(cwdOrig);
+    }
+

 #ifdef __WIN32__
     if (!success && (errCode == CDERR_STRUCTSIZE))
     {
 #ifdef __WIN32__
     if (!success && (errCode == CDERR_STRUCTSIZE))
     {


@@ -336,6 +470,7 @@ int wxFileDialog::ShowModal()
                 dir += _T('\\');
 
             m_path = dir + m_fileName;
                 dir += _T('\\');
 
             m_path = dir + m_fileName;

+            m_filterIndex = (int)of.nFilterIndex - 1;

         }
         else
         {
         }
         else
         {


@@ -343,7 +478,7 @@ int wxFileDialog::ShowModal()
 
             m_filterIndex = (int)of.nFilterIndex - 1;
 
 
             m_filterIndex = (int)of.nFilterIndex - 1;
 

-            if ( !of.nFileExtension || 
+            if ( !of.nFileExtension ||

                  (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:


@@ -363,18 +498,6 @@ int wxFileDialog::ShowModal()
             m_fileNames.Add(m_fileName);
             m_dir = wxPathOnly(fileNameBuffer);
         }
             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, _("Save File As"), wxYES_NO | wxICON_EXCLAMATION    ) != wxYES )
-             {
-                 success = FALSE;
-             }            
-        }

     }
     else
     {
     }
     else
     {


@@ -395,5 +518,5 @@ int wxFileDialog::ShowModal()
 
 }
 
 
 }
 

-#endif // wxUSE_FILEDLG
+#endif // wxUSE_FILEDLG && !(__SMARTPHONE__ && __WXWINCE__)