Fix to MDI to restore 3D border; kludge to OGL Studio sample to redraw

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index c596792816ed60ad00fe6bd014b794a442d09df9..b3f2a2999bae66f636bf8030b1e4028ca9244eb9 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -15,42 +15,40 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

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

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP

-    #include <stdio.h>
-    #include "wx/defs.h"

     #include "wx/utils.h"
     #include "wx/msgdlg.h"
     #include "wx/dialog.h"
     #include "wx/filedlg.h"
     #include "wx/intl.h"
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
     #include "wx/dialog.h"
     #include "wx/filedlg.h"
     #include "wx/intl.h"

-#endif
+    #include "wx/log.h"

 
 

-#include <windows.h>
+//    #include "wx/msw/private.h"
+#endif

 
 

-#if !defined(__WIN32__) || defined(__SALFORDC__)
+#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)

     #include <commdlg.h>
 #endif
 
     #include <commdlg.h>
 #endif
 

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

 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_CLASS(wxFileDialog, wxDialog)
-#endif
+#include "wx/tokenzr.h"
+
+IMPLEMENT_CLASS(wxFileDialog, wxDialog)

 
 

-wxString wxFileSelector(const char *title,
-                        const char *defaultDir,
-                        const char *defaultFileName,
-                        const char *defaultExtension,
-                        const char *filter,
+wxString wxFileSelector(const wxChar *title,
+                        const wxChar *defaultDir,
+                        const wxChar *defaultFileName,
+                        const wxChar *defaultExtension,
+                        const wxChar *filter,

                         int flags,
                         wxWindow *parent,
                         int x, int y)
                         int flags,
                         wxWindow *parent,
                         int x, int y)


@@ -69,7 +67,7 @@ wxString wxFileSelector(const char *title,
 
     wxString filter2;
     if ( defaultExtension && !filter )
 
     wxString filter2;
     if ( defaultExtension && !filter )

-        filter2 = wxString("*.") + defaultExtension;
+        filter2 = wxString(wxT("*.")) + defaultExtension;

     else if ( filter )
         filter2 = filter;
 
     else if ( filter )
         filter2 = filter;
 


@@ -84,14 +82,14 @@ wxString wxFileSelector(const char *title,
     wxFileDialog fileDialog(parent, title, defaultDirString,
                             defaultFilenameString, filter2,
                             flags, wxPoint(x, y));
     wxFileDialog fileDialog(parent, title, defaultDirString,
                             defaultFilenameString, filter2,
                             flags, wxPoint(x, y));

-    if( Strlen(defaultExtension) != 0 )
+    if( wxStrlen(defaultExtension) != 0 )

     {
         int filterFind = 1,
             filterIndex = 0;
 
         for( unsigned int i = 0; i < filter2.Len(); i++ )
         {
     {
         int filterFind = 1,
             filterIndex = 0;
 
         for( unsigned int i = 0; i < filter2.Len(); i++ )
         {

-            if( filter2.GetChar(i) == '|' )
+            if( filter2.GetChar(i) == wxT('|') )

             {
                 // save the start index of the new filter
                 unsigned int is = i++;
             {
                 // save the start index of the new filter
                 unsigned int is = i++;


@@ -100,7 +98,7 @@ wxString wxFileSelector(const char *title,
                 // find the end of the filter
                 for( ; i < filter2.Len(); i++ )
                 {
                 // find the end of the filter
                 for( ; i < filter2.Len(); i++ )
                 {

-                    if(filter2[i] == '|')
+                    if(filter2[i] == wxT('|'))

                         break;
                 }
 
                         break;
                 }
 


@@ -121,7 +119,7 @@ wxString wxFileSelector(const char *title,
 
     if ( fileDialog.ShowModal() == wxID_OK )
     {
 
     if ( fileDialog.ShowModal() == wxID_OK )
     {

-        strcpy(wxBuffer, (const char *)fileDialog.GetPath());
+        wxStrcpy(wxBuffer, (const wxChar *)fileDialog.GetPath());

         return wxBuffer;
     }
     else
         return wxBuffer;
     }
     else


@@ -149,24 +147,24 @@ wxString wxFileSelector(const char *title,
 # endif
 
 
 # endif
 
 

-wxString wxFileSelectorEx(const char *title,
-                       const char *defaultDir,
-                       const char *defaultFileName,
+wxString wxFileSelectorEx(const wxChar *title,
+                       const wxChar *defaultDir,
+                       const wxChar *defaultFileName,

                        int* defaultFilterIndex,
                        int* defaultFilterIndex,

-                       const char *filter,
+                       const wxChar *filter,

                        int       flags,
                        wxWindow* parent,
                        int       x,
                        int       y)
 
 {
                        int       flags,
                        wxWindow* parent,
                        int       x,
                        int       y)
 
 {

-    wxFileDialog fileDialog(parent, title ? title : "", defaultDir ? defaultDir : "",
-        defaultFileName ? defaultFileName : "", filter ? filter : "", flags, wxPoint(x, y));
+    wxFileDialog fileDialog(parent, title ? title : wxT(""), defaultDir ? defaultDir : wxT(""),
+        defaultFileName ? defaultFileName : wxT(""), filter ? filter : wxT(""), flags, wxPoint(x, y));

 
     if ( fileDialog.ShowModal() == wxID_OK )
     {
         *defaultFilterIndex = fileDialog.GetFilterIndex();
 
     if ( fileDialog.ShowModal() == wxID_OK )
     {
         *defaultFilterIndex = fileDialog.GetFilterIndex();

-        strcpy(wxBuffer, (const char *)fileDialog.GetPath());
+        wxStrcpy(wxBuffer, (const wxChar *)fileDialog.GetPath());

         return wxBuffer;
     }
     else
         return wxBuffer;
     }
     else


@@ -179,30 +177,53 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 {
     m_message = message;
     m_dialogStyle = style;
 {
     m_message = message;
     m_dialogStyle = style;

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

     m_parent = parent;
     m_parent = parent;

-    m_path = "";
+    m_path = wxT("");

     m_fileName = defaultFileName;
     m_dir = defaultDir;
     m_wildCard = wildCard;
     m_fileName = defaultFileName;
     m_dir = defaultDir;
     m_wildCard = wildCard;

-    m_filterIndex = 1;
+    m_filterIndex = 0;

 }
 
 }
 

-int wxFileDialog::ShowModal(void)
+void wxFileDialog::GetPaths(wxArrayString& paths) const
+{
+    paths.Empty();
+
+    wxString dir(m_dir);
+    if ( m_dir.Last() != _T('\\') )
+        dir += _T('\\');
+
+    size_t count = m_fileNames.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        paths.Add(dir + m_fileNames[n]);
+    }
+}
+
+int wxFileDialog::ShowModal()

 {
     HWND hWnd = 0;
     if (m_parent) hWnd = (HWND) m_parent->GetHWND();
 
 {
     HWND hWnd = 0;
     if (m_parent) hWnd = (HWND) m_parent->GetHWND();
 

-    static char  fileNameBuffer [ MAXPATH ];           // the file-name
-    char         titleBuffer    [ MAXFILE+1+MAXEXT ];  // the file-name, without path
+    static wxChar fileNameBuffer [ MAXPATH ];           // the file-name
+    wxChar        titleBuffer    [ MAXFILE+1+MAXEXT ];  // the file-name, without path

 
 

-    *fileNameBuffer = '\0';
-    *titleBuffer    = '\0';
+    *fileNameBuffer = wxT('\0');
+    *titleBuffer    = wxT('\0');

 
     long msw_flags = 0;
     if ( (m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE) )
         msw_flags |= OFN_HIDEREADONLY;
     if ( m_dialogStyle & wxFILE_MUST_EXIST )
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
 
     long msw_flags = 0;
     if ( (m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE) )
         msw_flags |= OFN_HIDEREADONLY;
     if ( m_dialogStyle & wxFILE_MUST_EXIST )
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;

+    if (m_dialogStyle & wxMULTIPLE )
+        msw_flags |=
+#if defined(OFN_EXPLORER)
+        OFN_EXPLORER |
+#endif // OFN_EXPLORER
+        OFN_ALLOWMULTISELECT;

 
     OPENFILENAME of;
     memset(&of, 0, sizeof(OPENFILENAME));
 
     OPENFILENAME of;
     memset(&of, 0, sizeof(OPENFILENAME));


@@ -216,16 +237,23 @@ int wxFileDialog::ShowModal(void)
 
     of.lStructSize       = sizeof(OPENFILENAME);
     of.hwndOwner         = hWnd;
 
     of.lStructSize       = sizeof(OPENFILENAME);
     of.hwndOwner         = hWnd;

-    of.lpstrTitle        = (char *)(const char *)m_message;
+    of.lpstrTitle        = WXSTRINGCAST m_message;

 
 
     of.lpstrFileTitle    = titleBuffer;
     of.nMaxFileTitle     = MAXFILE + 1 + MAXEXT;    // Windows 3.0 and 3.1
 
 
 
     of.lpstrFileTitle    = titleBuffer;
     of.nMaxFileTitle     = MAXFILE + 1 + MAXEXT;    // Windows 3.0 and 3.1
 

-    of.lpstrInitialDir   = (const char *) m_dir;
+    // Convert forward slashes to backslashes (file selector doesn't like
+    // forward slashes)
+    size_t i = 0;
+    size_t len = m_dir.Length();
+    for (i = 0; i < len; i++)
+        if (m_dir[i] == wxT('/'))
+            m_dir[i] = wxT('\\');

 
 

-    of.Flags             = msw_flags;
+    of.lpstrInitialDir   = m_dir.c_str();

 
 

+    of.Flags             = msw_flags;

 
 
     //=== Like Alejandro Sierra's wildcard modification >>===================
 
 
     //=== Like Alejandro Sierra's wildcard modification >>===================


@@ -241,10 +269,14 @@ int wxFileDialog::ShowModal(void)
      */
     //=======================================================================
 
      */
     //=======================================================================
 

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

     wxString filterBuffer;
 
     wxString filterBuffer;
 

-    if ( !strchr( theFilter, '|' ) ) {    // only one filter ==> default text
+    if ( !wxStrchr( theFilter, wxT('|') ) ) {    // only one filter ==> default text

         filterBuffer.Printf(_("Files (%s)|%s"),
                             theFilter.c_str(), theFilter.c_str());
     }
         filterBuffer.Printf(_("Files (%s)|%s"),
                             theFilter.c_str(), theFilter.c_str());
     }


@@ -253,21 +285,21 @@ int wxFileDialog::ShowModal(void)
 
     }
 
 
     }
 

-    filterBuffer += "|";
+    filterBuffer += wxT("|");

     // Replace | with \0
     // Replace | with \0

-    for ( unsigned int i = 0; i < filterBuffer.Len(); i++ ) {
-        if ( filterBuffer.GetChar(i) == '|' ) {
-            filterBuffer[i] = '\0';
+    for (i = 0; i < filterBuffer.Len(); i++ ) {
+        if ( filterBuffer.GetChar(i) == wxT('|') ) {
+            filterBuffer[i] = wxT('\0');

         }
     }
 
         }
     }
 

-    of.lpstrFilter  = (LPSTR)(const char *)filterBuffer;
-    of.nFilterIndex = m_filterIndex;
+    of.lpstrFilter  = (LPTSTR)(const wxChar *)filterBuffer;
+    of.nFilterIndex = m_filterIndex + 1;

 
     //=== Setting defaultFileName >>=========================================
 
 
     //=== Setting defaultFileName >>=========================================
 

-    strncpy( fileNameBuffer, (const char *)m_fileName, MAXPATH-1 );
-    fileNameBuffer[ MAXPATH-1 ] = '\0';
+    wxStrncpy( fileNameBuffer, (const wxChar *)m_fileName, MAXPATH-1 );
+    fileNameBuffer[ MAXPATH-1 ] = wxT('\0');

 
     of.lpstrFile = fileNameBuffer;  // holds returned filename
     of.nMaxFile  = MAXPATH;
 
     of.lpstrFile = fileNameBuffer;  // holds returned filename
     of.nMaxFile  = MAXPATH;


@@ -279,41 +311,84 @@ int wxFileDialog::ShowModal(void)
 
     if ( success )
     {
 
     if ( success )
     {

-        const char* extension = NULL;
+        m_fileNames.Empty();
+
+        if ( ( m_dialogStyle & wxMULTIPLE ) &&
+#if defined(OFN_EXPLORER)
+             ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') ) )
+#else
+             ( fileNameBuffer[of.nFileOffset-1] == wxT(' ') ) )
+#endif // OFN_EXPLORER
+        {
+#if defined(OFN_EXPLORER)
+            m_dir = fileNameBuffer;
+            i = of.nFileOffset;
+            m_fileName = &fileNameBuffer[i];
+            m_fileNames.Add(m_fileName);
+            i += m_fileName.Len() + 1;
+
+            while (fileNameBuffer[i] != wxT('\0'))
+            {
+                m_fileNames.Add(&fileNameBuffer[i]);
+                i += wxStrlen(&fileNameBuffer[i]) + 1;
+            }
+#else
+            wxStringTokenizer toke(fileNameBuffer, " \t\r\n");
+            m_dir = toke.GetNextToken();
+            m_fileName = toke.GetNextToken();
+            m_fileNames.Add(m_fileName);
+
+            while (toke.HasMoreTokens())
+                m_fileNames.Add(toke.GetNextToken());
+#endif // OFN_EXPLORER
+
+            wxString dir(m_dir);
+            if ( m_dir.Last() != _T('\\') )
+                dir += _T('\\');
+
+            m_fileNames.Sort();
+            m_path = dir + m_fileName;
+        }
+        else
+        {
+            const wxChar* extension = NULL;

 
 

-        //=== Adding the correct extension >>=================================
+            //=== Adding the correct extension >>=================================

 
 

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

 
 

-        if ( of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != '.' )
-        {                                    // user has typed an filename
-            // without an extension:
+            if ( !of.nFileExtension || (of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != wxT('.')) )
+            {                                    // user has typed an filename
+                // without an extension:

 
 

-            int   maxFilter = (int)(of.nFilterIndex*2L-1L);
-            extension = filterBuffer;
+                int   maxFilter = (int)(of.nFilterIndex*2L-1L);
+                extension = filterBuffer;

 
 

-            for( int i = 0; i < maxFilter; i++ ) {          // get extension
-                extension = extension + strlen( extension ) +1;
-            }
+                for( int i = 0; i < maxFilter; i++ ) {          // get extension
+                    extension = extension + wxStrlen( extension ) +1;
+                }

 
 

-            extension = strrchr( extension, '.' );
-            if (  extension                                 // != "blabla"
-                    && !strrchr( extension, '*' )             // != "blabla.*"
-                    && !strrchr( extension, '?' )             // != "blabla.?"
-                    && extension[1]                           // != "blabla."
-                    && extension[1] != ' ' )                  // != "blabla. "
-            {
-                // now concat extension to the fileName:
-                m_fileName = wxString(fileNameBuffer) + extension;
+                extension = wxStrrchr( extension, wxT('.') );
+                if (  extension                                 // != "blabla"
+                        && !wxStrrchr( extension, wxT('*') )       // != "blabla.*"
+                        && !wxStrrchr( extension, wxT('?') )       // != "blabla.?"
+                        && extension[1]                           // != "blabla."
+                        && extension[1] != wxT(' ') )              // != "blabla. "
+                {
+                    // now concat extension to the fileName:
+                    m_fileName = wxString(fileNameBuffer) + extension;

 
 

-                int len = strlen( fileNameBuffer );
-                strncpy( fileNameBuffer + len, extension, MAXPATH - len );
-                fileNameBuffer[ MAXPATH -1 ] = '\0';
+                    int len = wxStrlen( fileNameBuffer );
+                    wxStrncpy( fileNameBuffer + len, extension, MAXPATH - len );
+                    fileNameBuffer[ MAXPATH -1 ] = wxT('\0');
+                }

             }
             }

-        }

 
 

-        m_path = fileNameBuffer;
-        m_fileName = wxFileNameFromPath(fileNameBuffer);
+            m_path = fileNameBuffer;
+            m_fileName = wxFileNameFromPath(fileNameBuffer);
+            m_fileNames.Add(m_fileName);
+            m_dir = wxPathOnly(fileNameBuffer);
+        }

 
 
         //=== Simulating the wxOVERWRITE_PROMPT >>============================
 
 
         //=== Simulating the wxOVERWRITE_PROMPT >>============================


@@ -330,49 +405,66 @@ int wxFileDialog::ShowModal(void)
             }
         }
 
             }
         }
 

-    } // END: if ( success )
+    }
+    else
+    {
+        // common dialog failed - why?
+#ifdef __WXDEBUG__
+        DWORD dwErr = CommDlgExtendedError();
+        if ( dwErr != 0 )
+        {
+            // this msg is only for developers
+            wxLogError(wxT("Common dialog failed with error code %0lx."),
+                       dwErr);
+        }
+        //else: it was just cancelled
+#endif
+    }

 
 

-    return (success ? wxID_OK : wxID_CANCEL) ;
+    return success ? wxID_OK : wxID_CANCEL;

 
 }
 
 // Generic file load/save dialog (for internal use only)
 static
 wxString wxDefaultFileSelector(bool load,
 
 }
 
 // Generic file load/save dialog (for internal use only)
 static
 wxString wxDefaultFileSelector(bool load,

-                               const char *what,
-                               const char *extension,
-                               const char *default_name,
+                               const wxChar *what,
+                               const wxChar *extension,
+                               const wxChar *default_name,

                                wxWindow *parent)
 {
   wxString prompt;
                                wxWindow *parent)
 {
   wxString prompt;

-  wxString str = load ? _("Load %s file") : _("Save %s file");
+  wxString str;
+  if (load) str = _("Load %s file");
+  else str = _("Save %s file");

   prompt.Printf(str, what);
 
   prompt.Printf(str, what);
 

-  const char *ext = extension;
-  if (*ext == '.')
+  const wxChar *ext = extension;
+  if (*ext == wxT('.'))

       ext++;
 
   wxString wild;
       ext++;
 
   wxString wild;

-  wild.Printf("*.%s", ext);
+  wild.Printf(wxT("*.%s"), ext);

 
   return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent);
 }
 
 // Generic file load dialog
 
   return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent);
 }
 
 // Generic file load dialog

-WXDLLEXPORT wxString wxLoadFileSelector(const char *what,
-                                        const char *extension,
-                                        const char *default_name,
+WXDLLEXPORT wxString wxLoadFileSelector(const wxChar *what,
+                                        const wxChar *extension,
+                                        const wxChar *default_name,

                                         wxWindow *parent)
 {
     return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
 }
 
 // Generic file save dialog
                                         wxWindow *parent)
 {
     return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
 }
 
 // Generic file save dialog

-WXDLLEXPORT wxString wxSaveFileSelector(const char *what,
-                                        const char *extension,
-                                        const char *default_name,
+WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
+                                        const wxChar *extension,
+                                        const wxChar *default_name,

                                         wxWindow *parent)
 {
     return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
 }
 
                                         wxWindow *parent)
 {
     return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
 }
 

+