Bug #1040683: Remove assert when deleting menu entry.

[wxWidgets.git] / include / wx / filedlg.h

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 929ba286a48dfa429690d286e01e161b6f706c33..3b4de90118b77f648ad164a71c0c2ca31bdea973 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -14,12 +14,15 @@
 
 #if wxUSE_FILEDLG
 
 
 #if wxUSE_FILEDLG
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "filedlg.h"
 #endif
 
 #pragma interface "filedlg.h"
 #endif
 

+#include "wx/dialog.h"
+#include "wx/arrstr.h"
+

 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------

-// wxFileDialog data and generic functions
+// wxFileDialog data

 //----------------------------------------------------------------------------
 
 enum
 //----------------------------------------------------------------------------
 
 enum


@@ -27,7 +30,9 @@ enum
     wxOPEN              = 0x0001,
     wxSAVE              = 0x0002,
     wxOVERWRITE_PROMPT  = 0x0004,
     wxOPEN              = 0x0001,
     wxSAVE              = 0x0002,
     wxOVERWRITE_PROMPT  = 0x0004,

+#if WXWIN_COMPATIBILITY_2_4

     wxHIDE_READONLY     = 0x0008,
     wxHIDE_READONLY     = 0x0008,

+#endif

     wxFILE_MUST_EXIST   = 0x0010,
     wxMULTIPLE          = 0x0020,
     wxCHANGE_DIR        = 0x0040
     wxFILE_MUST_EXIST   = 0x0010,
     wxMULTIPLE          = 0x0020,
     wxCHANGE_DIR        = 0x0040


@@ -36,14 +41,75 @@ enum
 WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr;
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr;
 

-// Parses the filterStr, returning the number of filters.
-// Returns 0 if none or if there's a problem, they arrays will contain an equal
-// number of items found before the error.
-// filterStr is in the form:
-// "All files (*.*)|*.*|Image Files (*.jpeg *.png)|*.jpg;*.png"
-extern int wxParseFileFilter(const wxString& filterStr,
+//----------------------------------------------------------------------------
+// wxFileDialogBase
+//----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxFileDialogBase: public wxDialog
+{
+public:
+    wxFileDialogBase () {}
+
+    wxFileDialogBase(wxWindow *parent,
+                 const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& defaultDir = wxEmptyString,
+                 const wxString& defaultFile = wxEmptyString,
+                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
+                 long style = 0,
+                 const wxPoint& pos = wxDefaultPosition);
+
+    virtual void SetMessage(const wxString& message) { m_message = message; }
+    virtual void SetPath(const wxString& path) { m_path = path; }
+    virtual void SetDirectory(const wxString& dir) { m_dir = dir; }
+    virtual void SetFilename(const wxString& name) { m_fileName = name; }
+    virtual void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
+    virtual void SetStyle(long style) { m_dialogStyle = style; }
+    virtual void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; }
+
+    virtual wxString GetMessage() const { return m_message; }
+    virtual wxString GetPath() const { return m_path; }
+    virtual void GetPaths(wxArrayString& paths) const { paths.Empty(); paths.Add(m_path); }
+    virtual wxString GetDirectory() const { return m_dir; }
+    virtual wxString GetFilename() const { return m_fileName; }
+    virtual void GetFilenames(wxArrayString& files) const { files.Empty(); files.Add(m_fileName); }
+    virtual wxString GetWildcard() const { return m_wildCard; }
+    virtual long GetStyle() const { return m_dialogStyle; }
+    virtual int GetFilterIndex() const { return m_filterIndex; }
+
+    // Utility functions
+
+#if WXWIN_COMPATIBILITY_2_4
+    // Parses the wildCard, returning the number of filters.
+    // Returns 0 if none or if there's a problem,
+    // The arrays will contain an equal number of items found before the error.
+    // wildCard is in the form:
+    // "All files (*)|*|Image Files (*.jpeg *.png)|*.jpg;*.png"
+    static int ParseWildcard(const wxString& wildCard,

                              wxArrayString& descriptions,
                              wxArrayString& filters);
                              wxArrayString& descriptions,
                              wxArrayString& filters);

+#endif // WXWIN_COMPATIBILITY_2_4
+
+    // Append first extension to filePath from a ';' separated extensionList
+    // if filePath = "path/foo.bar" just return it as is
+    // if filePath = "foo[.]" and extensionList = "*.jpg;*.png" return "foo.jpg"
+    // if the extension is "*.j?g" (has wildcards) or "jpg" then return filePath
+    static wxString AppendExtension(const wxString &filePath,
+                                    const wxString &extensionList);
+
+protected:
+    wxString      m_message;
+    long          m_dialogStyle;
+    wxWindow     *m_parent;
+    wxString      m_dir;
+    wxString      m_path;       // Full path
+    wxString      m_fileName;
+    wxString      m_wildCard;
+    int           m_filterIndex;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxFileDialogBase)
+    DECLARE_NO_COPY_CLASS(wxFileDialogBase)
+};

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


@@ -58,7 +124,7 @@ wxFileSelector(const wxChar *message = wxFileSelectorPromptStr,
                const wxChar *wildcard = wxFileSelectorDefaultWildcardStr,
                int flags = 0,
                wxWindow *parent = NULL,
                const wxChar *wildcard = wxFileSelectorDefaultWildcardStr,
                int flags = 0,
                wxWindow *parent = NULL,

-               int x = -1, int y = -1);
+               int x = wxDefaultCoord, int y = wxDefaultCoord);

 
 // An extended version of wxFileSelector
 WXDLLEXPORT wxString
 
 // An extended version of wxFileSelector
 WXDLLEXPORT wxString


@@ -69,7 +135,7 @@ wxFileSelectorEx(const wxChar *message = wxFileSelectorPromptStr,
                  const wxChar *wildcard = wxFileSelectorDefaultWildcardStr,
                  int flags = 0,
                  wxWindow *parent = NULL,
                  const wxChar *wildcard = wxFileSelectorDefaultWildcardStr,
                  int flags = 0,
                  wxWindow *parent = NULL,

-                 int x = -1, int y = -1);
+                 int x = wxDefaultCoord, int y = wxDefaultCoord);

 
 // Ask for filename to load
 WXDLLEXPORT wxString
 
 // Ask for filename to load
 WXDLLEXPORT wxString


@@ -93,7 +159,7 @@ wxSaveFileSelector(const wxChar *what,
 #elif defined(__WXMOTIF__)
 #include "wx/motif/filedlg.h"
 #elif defined(__WXGTK__)
 #elif defined(__WXMOTIF__)
 #include "wx/motif/filedlg.h"
 #elif defined(__WXGTK__)

-#include "wx/generic/filedlgg.h"
+#include "wx/gtk/filedlg.h"

 #elif defined(__WXX11__)
 #include "wx/generic/filedlgg.h"
 #elif defined(__WXMGL__)
 #elif defined(__WXX11__)
 #include "wx/generic/filedlgg.h"
 #elif defined(__WXMGL__)


@@ -101,7 +167,7 @@ wxSaveFileSelector(const wxChar *what,
 #elif defined(__WXMAC__)
 #include "wx/mac/filedlg.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
 #include "wx/mac/filedlg.h"
 #elif defined(__WXCOCOA__)

-#include "wx/generic/filedlgg.h"
+#include "wx/cocoa/filedlg.h"

 #elif defined(__WXPM__)
 #include "wx/os2/filedlg.h"
 #endif
 #elif defined(__WXPM__)
 #include "wx/os2/filedlg.h"
 #endif