Update OpenVMS compile support

[wxWidgets.git] / src / common / fldlgcmn.cpp

diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index 5dfa9e516b5aa47c0098601c435ca4b724f4969c..7c6e7fda2c653ee2cd529f710fc1346f7e5e0925 100644 (file)
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/fldlgcmn.cpp
+// Name:        src/common/fldlgcmn.cpp

 // Purpose:     wxFileDialog common functions
 // Author:      John Labenski
 // Modified by:
 // Created:     14.06.03 (extracted from src/*/filedlg.cpp)
 // Purpose:     wxFileDialog common functions
 // Author:      John Labenski
 // Modified by:
 // Created:     14.06.03 (extracted from src/*/filedlg.cpp)

-// RCS-ID:
+// RCS-ID:      $Id$

 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif


@@ -20,100 +16,106 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_FILEDLG
+
+#include "wx/filedlg.h"
+#include "wx/dirdlg.h"
+

 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/window.h"
 #endif // WX_PRECOMP
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/window.h"
 #endif // WX_PRECOMP
 

-#include "wx/filedlg.h"
-
-#if wxUSE_FILEDLG
-

 //----------------------------------------------------------------------------
 // wxFileDialogBase
 //----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog)
 
 //----------------------------------------------------------------------------
 // wxFileDialogBase
 //----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog)
 

-wxFileDialogBase::wxFileDialogBase(wxWindow *parent,
-                                   const wxString& message,
-                                   const wxString& defaultDir,
-                                   const wxString& defaultFile,
-                                   const wxString& wildCard,
-                                   long style,
-                                   const wxPoint& WXUNUSED(pos))
+void wxFileDialogBase::Init()
+{
+    m_filterIndex = 0;
+    m_windowStyle = 0;
+    m_extraControl = NULL;
+    m_extraControlCreator = NULL;
+}
+
+bool wxFileDialogBase::Create(wxWindow *parent,
+                              const wxString& message,
+                              const wxString& defaultDir,
+                              const wxString& defaultFile,
+                              const wxString& wildCard,
+                              long style,
+                              const wxPoint& WXUNUSED(pos),
+                              const wxSize& WXUNUSED(sz),
+                              const wxString& WXUNUSED(name))

 {
 {

-    m_parent = parent;

     m_message = message;
     m_dir = defaultDir;
     m_fileName = defaultFile;
     m_message = message;
     m_dir = defaultDir;
     m_fileName = defaultFile;

-    m_wildCard = wildCard.empty() ? wxFileSelectorDefaultWildcardStr : wildCard;
-    m_dialogStyle = style;
-    m_path = wxT("");
+    m_wildCard = wildCard;
+
+    m_parent = parent;
+    m_windowStyle = style;

     m_filterIndex = 0;
 
     m_filterIndex = 0;
 

-    // convert m_wildCard from "*.bar" to "Files (*.bar)|*.bar"
-    if ( m_wildCard.Find(wxT('|')) == wxNOT_FOUND )
-    {
-        m_wildCard = wxString::Format(_("Files (%s)|%s"),
-                                        m_wildCard.c_str(), m_wildCard.c_str());
-    }
-}
+    if (!HasFdFlag(wxFD_OPEN) && !HasFdFlag(wxFD_SAVE))
+        m_windowStyle |= wxFD_OPEN;     // wxFD_OPEN is the default

 
 

-// Parses the filterStr, returning the number of filters.
-// Returns 0 if none or if there's a problem.
-// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpg"
+    // check that the styles are not contradictory
+    wxASSERT_MSG( !(HasFdFlag(wxFD_SAVE) && HasFdFlag(wxFD_OPEN)),
+                  _T("can't specify both wxFD_SAVE and wxFD_OPEN at once") );

 
 

-int wxFileDialogBase::ParseWildcard(const wxString& filterStr,
-                                    wxArrayString& descriptions,
-                                    wxArrayString& filters)
-{
-    descriptions.Clear();
-    filters.Clear();
+    wxASSERT_MSG( !HasFdFlag(wxFD_SAVE) ||
+                    (!HasFdFlag(wxFD_MULTIPLE) && !HasFdFlag(wxFD_FILE_MUST_EXIST)),
+                   _T("wxFD_MULTIPLE or wxFD_FILE_MUST_EXIST can't be used with wxFD_SAVE" ) );

 
 

-    wxString str(filterStr);
+    wxASSERT_MSG( !HasFdFlag(wxFD_OPEN) || !HasFdFlag(wxFD_OVERWRITE_PROMPT),
+                  _T("wxFD_OVERWRITE_PROMPT can't be used with wxFD_OPEN") );

 
 

-    wxString description, filter;
-    for ( int pos = 0; pos != wxNOT_FOUND; )
+    if ( wildCard.empty() || wildCard == wxFileSelectorDefaultWildcardStr )
+    {
+        m_wildCard = wxString::Format(_("All files (%s)|%s"),
+                                      wxFileSelectorDefaultWildcardStr,
+                                      wxFileSelectorDefaultWildcardStr);
+    }
+    else // have wild card

     {
     {

-        pos = str.Find(wxT('|'));
-        if ( pos == wxNOT_FOUND )
+        // convert m_wildCard from "*.bar" to "bar files (*.bar)|*.bar"
+        if ( m_wildCard.Find(wxT('|')) == wxNOT_FOUND )

         {
         {

-            // if there are no '|'s at all in the string just take the entire
-            // string as filter
-            if ( filters.IsEmpty() )
-            {
-                descriptions.Add(filterStr);
-                filters.Add(filterStr);
-            }
+            wxString::size_type nDot = m_wildCard.find(_T("*."));
+            if ( nDot != wxString::npos )
+                nDot++;

             else
             else

-            {
-                wxFAIL_MSG( _T("missing '|' in the wildcard string!") );
-            }
-
-            break;
+                nDot = 0;
+
+            m_wildCard = wxString::Format
+                         (
+                            _("%s files (%s)|%s"),
+                            wildCard.c_str() + nDot,
+                            wildCard.c_str(),
+                            wildCard.c_str()
+                         );

         }
         }

+    }

 
 

-        description = str.Left(pos);
-        str = str.Mid(pos + 1);
-        pos = str.Find(wxT('|'));
-        if ( pos == wxNOT_FOUND )
-        {
-            filter = str;
-        }
-        else
-        {
-            filter = str.Left(pos);
-            str = str.Mid(pos + 1);
-        }
+    return true;
+}

 
 

-        descriptions.Add(description);
-        filters.Add(filter);
-    }
+#if WXWIN_COMPATIBILITY_2_6
+long wxFileDialogBase::GetStyle() const
+{
+    return GetWindowStyle();
+}

 
 

-    return filters.GetCount();
+void wxFileDialogBase::SetStyle(long style)
+{
+    SetWindowStyle(style);

 }
 }

+#endif // WXWIN_COMPATIBILITY_2_6
+

 
 wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
                                            const wxString &extensionList)
 
 wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
                                            const wxString &extensionList)


@@ -122,16 +124,16 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
     wxString fileName = filePath.AfterLast(wxFILE_SEP_PATH);
 
     // if fileName is of form "foo.bar" it's ok, return it
     wxString fileName = filePath.AfterLast(wxFILE_SEP_PATH);
 
     // if fileName is of form "foo.bar" it's ok, return it

-    int idx_dot = fileName.Find(wxT('.'), TRUE);
-    if ((idx_dot != wxNOT_FOUND) && (idx_dot < (int)fileName.Len() - 1))
+    int idx_dot = fileName.Find(wxT('.'), true);
+    if ((idx_dot != wxNOT_FOUND) && (idx_dot < (int)fileName.length() - 1))

         return filePath;
 
     // get the first extension from extensionList, or all of it
     wxString ext = extensionList.BeforeFirst(wxT(';'));
 
     // if ext == "foo" or "foo." there's no extension
         return filePath;
 
     // get the first extension from extensionList, or all of it
     wxString ext = extensionList.BeforeFirst(wxT(';'));
 
     // if ext == "foo" or "foo." there's no extension

-    int idx_ext_dot = ext.Find(wxT('.'), TRUE);
-    if ((idx_ext_dot == wxNOT_FOUND) || (idx_ext_dot == (int)ext.Len() - 1))
+    int idx_ext_dot = ext.Find(wxT('.'), true);
+    if ((idx_ext_dot == wxNOT_FOUND) || (idx_ext_dot == (int)ext.length() - 1))

         return filePath;
     else
         ext = ext.AfterLast(wxT('.'));
         return filePath;
     else
         ext = ext.AfterLast(wxT('.'));


@@ -139,7 +141,7 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
     // if ext == "*" or "bar*" or "b?r" or " " then its not valid
     if ((ext.Find(wxT('*')) != wxNOT_FOUND) ||
         (ext.Find(wxT('?')) != wxNOT_FOUND) ||
     // if ext == "*" or "bar*" or "b?r" or " " then its not valid
     if ((ext.Find(wxT('*')) != wxNOT_FOUND) ||
         (ext.Find(wxT('?')) != wxNOT_FOUND) ||

-        (ext.Strip(wxString::both).IsEmpty()))
+        (ext.Strip(wxString::both).empty()))

         return filePath;
 
     // if fileName doesn't have a '.' then add one
         return filePath;
 
     // if fileName doesn't have a '.' then add one


@@ -149,20 +151,37 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
     return filePath + ext;
 }
 
     return filePath + ext;
 }
 

+bool wxFileDialogBase::SetExtraControlCreator(ExtraControlCreatorFunction c)
+{
+    wxCHECK_MSG( !m_extraControlCreator, false,
+                 "wxFileDialog::SetExtraControl() called second time" );
+
+    m_extraControlCreator = c;
+    return SupportsExtraControl();
+}
+
+bool wxFileDialogBase::CreateExtraControl()
+{
+    if (!m_extraControlCreator || m_extraControl)
+        return false;
+    m_extraControl = (*m_extraControlCreator)(this);
+    return true;
+}
+

 //----------------------------------------------------------------------------
 // wxFileDialog convenience functions
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
 // wxFileDialog convenience functions
 //----------------------------------------------------------------------------
 

-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)
+wxString wxFileSelector(const wxString& title,
+                        const wxString& defaultDir,
+                        const wxString& defaultFileName,
+                        const wxString& defaultExtension,
+                        const wxString& filter,
+                        int flags,
+                        wxWindow *parent,
+                        int x, int y)

 {
 {

-    // The defaultExtension, if non-NULL, is
+    // The defaultExtension, if non-empty, is

     // appended to the filename if the user fails to type an extension. The new
     // implementation (taken from wxFileSelectorEx) appends the extension
     // automatically, by looking at the filter specification. In fact this
     // appended to the filename if the user fails to type an extension. The new
     // implementation (taken from wxFileSelectorEx) appends the extension
     // automatically, by looking at the filter specification. In fact this


@@ -174,43 +193,35 @@ wxString wxFileSelector(const wxChar *title,
     // suitable filter.
 
     wxString filter2;
     // suitable filter.
 
     wxString filter2;

-    if ( defaultExtension && !filter )
+    if ( !defaultExtension.empty() && filter.empty() )

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

-    else if ( filter )
+    else if ( !filter.empty() )

         filter2 = filter;
 
         filter2 = filter;
 

-    wxString defaultDirString;
-    if (defaultDir)
-        defaultDirString = defaultDir;
-
-    wxString defaultFilenameString;
-    if (defaultFileName)
-        defaultFilenameString = defaultFileName;
-
-    wxFileDialog fileDialog(parent, title, defaultDirString,
-                            defaultFilenameString, filter2,
+    wxFileDialog fileDialog(parent, title, defaultDir,
+                            defaultFileName, filter2,

                             flags, wxPoint(x, y));
 
                             flags, wxPoint(x, y));
 

-   // if filter is of form "All files (*)|*|..." set correct filter index
-    if((wxStrlen(defaultExtension) != 0) && (filter2.Find(wxT('|')) != wxNOT_FOUND))
-            {
+    // if filter is of form "All files (*)|*|..." set correct filter index
+    if ( !defaultExtension.empty() && filter2.find(wxT('|')) != wxString::npos )
+    {

         int filterIndex = 0;
 
         wxArrayString descriptions, filters;
         // don't care about errors, handled already by wxFileDialog
         int filterIndex = 0;
 
         wxArrayString descriptions, filters;
         // don't care about errors, handled already by wxFileDialog

-        (void)wxFileDialogBase::ParseWildcard(filter2, descriptions, filters);
+        (void)wxParseCommonDialogsFilter(filter2, descriptions, filters);

         for (size_t n=0; n<filters.GetCount(); n++)
         for (size_t n=0; n<filters.GetCount(); n++)

-                {
+        {

             if (filters[n].Contains(defaultExtension))
             if (filters[n].Contains(defaultExtension))

-                    {
+            {

                 filterIndex = n;
                 filterIndex = n;

-                        break;
-                    }
-                }
+                break;
+            }
+        }

 
         if (filterIndex > 0)
             fileDialog.SetFilterIndex(filterIndex);
 
         if (filterIndex > 0)
             fileDialog.SetFilterIndex(filterIndex);

-        }
+    }

 
     wxString filename;
     if ( fileDialog.ShowModal() == wxID_OK )
 
     wxString filename;
     if ( fileDialog.ShowModal() == wxID_OK )


@@ -225,22 +236,22 @@ wxString wxFileSelector(const wxChar *title,
 // wxFileSelectorEx
 //----------------------------------------------------------------------------
 
 // wxFileSelectorEx
 //----------------------------------------------------------------------------
 

-wxString wxFileSelectorEx(const wxChar *title,
-                          const wxChar *defaultDir,
-                          const wxChar *defaultFileName,
-                          int* defaultFilterIndex,
-                          const wxChar *filter,
-                          int       flags,
-                          wxWindow* parent,
-                          int       x,
-                          int       y)
+wxString wxFileSelectorEx(const wxString& title,
+                          const wxString& defaultDir,
+                          const wxString& defaultFileName,
+                          int*            defaultFilterIndex,
+                          const wxString& filter,
+                          int             flags,
+                          wxWindow*       parent,
+                          int             x,
+                          int             y)

 
 {
     wxFileDialog fileDialog(parent,
 
 {
     wxFileDialog fileDialog(parent,

-                            title ? title : wxT(""),
-                            defaultDir ? defaultDir : wxT(""),
-                            defaultFileName ? defaultFileName : wxT(""),
-                            filter ? filter : wxT(""),
+                            title,
+                            defaultDir,
+                            defaultFileName,
+                            filter,

                             flags, wxPoint(x, y));
 
     wxString filename;
                             flags, wxPoint(x, y));
 
     wxString filename;


@@ -260,9 +271,9 @@ wxString wxFileSelectorEx(const wxChar *title,
 //----------------------------------------------------------------------------
 
 static wxString wxDefaultFileSelector(bool load,
 //----------------------------------------------------------------------------
 
 static wxString wxDefaultFileSelector(bool load,

-                                      const wxChar *what,
-                                      const wxChar *extension,
-                                      const wxChar *default_name,
+                                      const wxString& what,
+                                      const wxString& extension,
+                                      const wxString& default_name,

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


@@ -274,11 +285,13 @@ static wxString wxDefaultFileSelector(bool load,
     prompt.Printf(str, what);
 
     wxString wild;
     prompt.Printf(str, what);
 
     wxString wild;

-    const wxChar *ext = extension;
-    if ( ext )
+    wxString ext;
+    if ( !extension.empty() )

     {
     {

-        if ( *ext == wxT('.') )
-            ext++;
+        if ( extension[0u] == _T('.') )
+            ext = extension.substr(1);
+        else
+            ext = extension;

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


@@ -287,33 +300,50 @@ static wxString wxDefaultFileSelector(bool load,
         wild = wxFileSelectorDefaultWildcardStr;
     }
 
         wild = wxFileSelectorDefaultWildcardStr;
     }
 

-    return wxFileSelector(prompt, NULL, default_name, ext, wild,
-                          load ? wxOPEN : wxSAVE, parent);
+    return wxFileSelector(prompt, wxEmptyString, default_name, ext, wild,
+                          load ? wxFD_OPEN : wxFD_SAVE, parent);

 }
 
 //----------------------------------------------------------------------------
 // wxLoadFileSelector
 //----------------------------------------------------------------------------
 
 }
 
 //----------------------------------------------------------------------------
 // wxLoadFileSelector
 //----------------------------------------------------------------------------
 

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

                                         wxWindow *parent)
 {
                                         wxWindow *parent)
 {

-    return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
+    return wxDefaultFileSelector(true, what, extension, default_name, parent);

 }
 
 //----------------------------------------------------------------------------
 // wxSaveFileSelector
 //----------------------------------------------------------------------------
 
 }
 
 //----------------------------------------------------------------------------
 // wxSaveFileSelector
 //----------------------------------------------------------------------------
 

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

                                         wxWindow *parent)
 {
                                         wxWindow *parent)
 {

-    return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
+    return wxDefaultFileSelector(false, what, extension, default_name, parent);

 }
 
 }
 

-#endif // wxUSE_FILEDLG

 
 

+//----------------------------------------------------------------------------
+// wxDirDialogBase
+//----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_6
+long wxDirDialogBase::GetStyle() const
+{
+    return GetWindowStyle();
+}
+
+void wxDirDialogBase::SetStyle(long style)
+{
+    SetWindowStyle(style);
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+
+#endif // wxUSE_FILEDLG