ignore WinCE projects and build directories

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 063377993f1f11078cebb3a11f1a022b8c34e3b8..7ed1c81362c784de7e37f4872445875fca424032 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


@@ -65,7 +64,8 @@
 // globals
 // ----------------------------------------------------------------------------
 
 // globals
 // ----------------------------------------------------------------------------
 

-// standard dialog size
+// standard dialog size for the old Windows systems where the dialog wasn't
+// resizeable

 static wxRect gs_rectDialog(0, 0, 428, 266);
 
 // ============================================================================
 static wxRect gs_rectDialog(0, 0, 428, 266);
 
 // ============================================================================


@@ -91,16 +91,9 @@ wxFileDialogHookFunction(HWND      hDlg,
                 OFNOTIFY *pNotifyCode = wx_reinterpret_cast(OFNOTIFY *, lParam);
                 if ( pNotifyCode->hdr.code == CDN_INITDONE )
                 {
                 OFNOTIFY *pNotifyCode = wx_reinterpret_cast(OFNOTIFY *, lParam);
                 if ( pNotifyCode->hdr.code == CDN_INITDONE )
                 {

-                    // note that we need to move the parent window: hDlg is a
-                    // child of it when OFN_EXPLORER is used
-                    ::SetWindowPos
-                      (
-                        ::GetParent(hDlg),
-                        HWND_TOP,
-                        gs_rectDialog.x, gs_rectDialog.y,
-                        0, 0,
-                        SWP_NOZORDER | SWP_NOSIZE
-                      );
+                    wx_reinterpret_cast(wxFileDialog *,
+                                        pNotifyCode->lpOFN->lCustData)
+                        ->MSWOnInitDone((WXHWND)hDlg);

                  }
             }
             break;
                  }
             }
             break;


@@ -136,18 +129,18 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
                                wildCard, style, pos, sz, name)
 
 {
                                wildCard, style, pos, sz, name)
 
 {

-    if ( ( m_windowStyle & wxFD_MULTIPLE ) && ( m_windowStyle & wxFD_SAVE ) )
-        m_windowStyle &= ~wxFD_MULTIPLE;
+    // NB: all style checks are done by wxFileDialogBase::Create

 
     m_bMovedWindow = false;
 
     m_bMovedWindow = false;

+    m_centreDir = 0;

 
     // 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;
 
     // 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();


@@ -187,7 +180,6 @@ void wxFileDialog::DoGetPosition(int *x, int *y) const
         *y = gs_rectDialog.y;
 }
 
         *y = gs_rectDialog.y;
 }
 

-

 void wxFileDialog::DoGetSize(int *width, int *height) const
 {
     if ( width )
 void wxFileDialog::DoGetSize(int *width, int *height) const
 {
     if ( width )


@@ -198,13 +190,64 @@ void wxFileDialog::DoGetSize(int *width, int *height) const
 
 void wxFileDialog::DoMoveWindow(int x, int y, int WXUNUSED(w), int WXUNUSED(h))
 {
 
 void wxFileDialog::DoMoveWindow(int x, int y, int WXUNUSED(w), int WXUNUSED(h))
 {

-    m_bMovedWindow = true;
-

     gs_rectDialog.x = x;
     gs_rectDialog.y = y;
 
     gs_rectDialog.x = x;
     gs_rectDialog.y = y;
 

-    // size of the dialog can't be changed because the controls are not laid
-    // out correctly then
+    // our HWND is only set when we're called from MSWOnInitDone(), test if
+    // this is the case
+    HWND hwnd = GetHwnd();
+    if ( hwnd )
+    {
+        // size of the dialog can't be changed because the controls are not
+        // laid out correctly then
+       ::SetWindowPos(hwnd, HWND_TOP, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
+    }
+    else // just remember that we were requested to move the window
+    {
+        m_bMovedWindow = true;
+
+        // if Centre() had been called before, it shouldn't be taken into
+        // account now
+        m_centreDir = 0;
+    }
+}
+
+void wxFileDialog::DoCentre(int dir)
+{
+    m_centreDir = dir;
+    m_bMovedWindow = true;
+
+    // it's unnecessary to do anything else at this stage as we'll redo it in
+    // MSWOnInitDone() anyhow
+}
+
+void wxFileDialog::MSWOnInitDone(WXHWND hDlg)
+{
+    // note the the dialog is the parent window: hDlg is a child of it when
+    // OFN_EXPLORER is used
+    HWND hFileDlg = ::GetParent((HWND)hDlg);
+
+    // set HWND so that our DoMoveWindow() works correctly
+    SetHWND((WXHWND)hFileDlg);
+
+    if ( m_centreDir )
+    {
+        // now we have the real dialog size, remember it
+        RECT rect;
+        GetWindowRect(hFileDlg, &rect);
+        gs_rectDialog = wxRectFromRECT(rect);
+
+        // and position the window correctly: notice that we must use the base
+        // class version as our own doesn't do anything except setting flags
+        wxFileDialogBase::DoCentre(m_centreDir);
+    }
+    else // need to just move it to the correct place
+    {
+        SetPosition(gs_rectDialog.GetPosition());
+    }
+
+    // we shouldn't destroy this HWND
+    SetHWND(NULL);

 }
 
 // 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


@@ -278,15 +321,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_windowStyle & wxHIDE_READONLY) || (m_windowStyle & wxFD_SAVE) )
-        msw_flags |= OFN_HIDEREADONLY;
-#else

     long msw_flags = OFN_HIDEREADONLY;
     long msw_flags = OFN_HIDEREADONLY;

-#endif

 
 

-    if ( m_windowStyle & wxFD_FILE_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


@@ -304,7 +341,7 @@ int wxFileDialog::ShowModal()
 #endif
     }
 
 #endif
     }
 

-    if (m_windowStyle & wxFD_MULTIPLE )
+    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;


@@ -313,12 +350,12 @@ int wxFileDialog::ShowModal()
     // 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)
     // 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)

-    if ( !(m_windowStyle & wxFD_CHANGE_DIR) )
+    if ( !HasFdFlag(wxFD_CHANGE_DIR) )

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

-    if ( m_windowStyle & wxFD_OVERWRITE_PROMPT )
+    if ( HasFdFlag(wxFD_OVERWRITE_PROMPT) )

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


@@ -328,7 +365,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;
 


@@ -375,6 +412,7 @@ int wxFileDialog::ShowModal()
 
     of.Flags             = msw_flags;
     of.lpfnHook          = wxFileDialogHookFunction;
 
     of.Flags             = msw_flags;
     of.lpfnHook          = wxFileDialogHookFunction;

+    of.lCustData         = (LPARAM)this;

 
     wxArrayString wildDescriptions, wildFilters;
 
 
     wxArrayString wildDescriptions, wildFilters;
 


@@ -399,12 +437,12 @@ int wxFileDialog::ShowModal()
         }
     }
 
         }
     }
 

-    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
     fileNameBuffer[ wxMAXPATH-1 ] = wxT('\0');
 
     of.lpstrFile = fileNameBuffer;  // holds returned filename


@@ -415,9 +453,9 @@ int wxFileDialog::ShowModal()
     // 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_windowStyle & wxFD_SAVE)
+    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


@@ -427,7 +465,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();
         }
     }


@@ -472,7 +510,7 @@ int wxFileDialog::ShowModal()
 
         m_fileNames.Empty();
 
 
         m_fileNames.Empty();
 

-        if ( ( m_windowStyle & wxFD_MULTIPLE ) &&
+        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


@@ -519,7 +557,7 @@ 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
                 int   maxFilter = (int)(of.nFilterIndex*2L) - 1;
 
                 for( int i = 0; i < maxFilter; i++ )           // get extension