X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/26078494a002dc9efb83e8a2f320a38777b99dd4..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/filedlg.h

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 68639359df..01a33015d6 100644
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -19,7 +19,8 @@
 #include "wx/dialog.h"
 #include "wx/arrstr.h"
 
-// this symbol is defined for the platforms which support multiple 
+// this symbol is defined for the platforms which support multiple
+// ('|'-separated) filters in the file dialog
 #if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
     #define wxHAS_MULTIPLE_FILEDLG_FILTERS
 #endif
@@ -106,9 +107,9 @@ public:
     bool HasFdFlag(int flag) const { return HasFlag(flag); }
 
     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 SetPath(const wxString& path);
+    virtual void SetDirectory(const wxString& dir);
+    virtual void SetFilename(const wxString& name);
     virtual void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
     virtual void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; }
 
@@ -121,6 +122,9 @@ public:
     virtual wxString GetWildcard() const { return m_wildCard; }
     virtual int GetFilterIndex() const { return m_filterIndex; }
 
+    virtual wxString GetCurrentlySelectedFilename() const
+        { return m_currentlySelectedFilename; }
+
     // this function is called with wxFileDialog as parameter and should
     // create the window containing the extra controls we want to show in it
     typedef wxWindow *(*ExtraControlCreatorFunction)(wxWindow*);
@@ -154,6 +158,13 @@ protected:
     wxString      m_fileName;
     wxString      m_wildCard;
     int           m_filterIndex;
+
+    // Currently selected, but not yet necessarily accepted by the user, file.
+    // This should be updated whenever the selection in the control changes by
+    // the platform-specific code to provide a useful implementation of
+    // GetCurrentlySelectedFilename().
+    wxString      m_currentlySelectedFilename;
+
     wxWindow*     m_extraControl;
 
     // returns true if control is created (if it already exists returns false)
@@ -169,7 +180,7 @@ private:
 
     void Init();
     DECLARE_DYNAMIC_CLASS(wxFileDialogBase)
-    DECLARE_NO_COPY_CLASS(wxFileDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxFileDialogBase);
 };
 
 
@@ -231,9 +242,6 @@ wxSaveFileSelector(const wxString& what,
     #include "wx/cocoa/filedlg.h"
 #elif defined(__WXPM__)
     #include "wx/os2/filedlg.h"
-#elif defined(__WXPALMOS__)
-    #define wxHAS_GENERIC_FILEDIALOG
-    #include "wx/generic/filedlgg.h"
 #endif
 
 #endif // wxUSE_FILEDLG