X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b9bb74e9fc1c1eb611251ba3d7da4374233f9fa5..a9c5eac9e49fd0b76178e0edfd04ae5c83bc3f02:/src/generic/filepickerg.cpp

diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp
index aaeffe2e34..3d5b975a9a 100644
--- a/src/generic/filepickerg.cpp
+++ b/src/generic/filepickerg.cpp
@@ -26,6 +26,7 @@
 
 #if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 
+#include "wx/filename.h"
 #include "wx/filepicker.h"
 
 #include "wx/scopedptr.h"
@@ -106,4 +107,68 @@ void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
     }
 }
 
+void wxGenericFileDirButton::SetInitialDirectory(const wxString& dir)
+{
+    m_initialDir = dir;
+}
+
+// ----------------------------------------------------------------------------
+// wxGenericFileutton
+// ----------------------------------------------------------------------------
+
+void
+wxGenericFileButton::DoSetInitialDirectory(wxFileDialog* dialog,
+                                           const wxString& dir)
+{
+    if ( m_path.find_first_of(wxFileName::GetPathSeparators()) ==
+            wxString::npos )
+    {
+        dialog->SetDirectory(dir);
+    }
+}
+
+wxDialog *wxGenericFileButton::CreateDialog()
+{
+    wxFileDialog* const dialog = new wxFileDialog
+                                     (
+                                        GetDialogParent(),
+                                        m_message,
+                                        wxEmptyString,
+                                        wxEmptyString,
+                                        m_wildcard,
+                                        GetDialogStyle()
+                                     );
+
+    // If there is no default file or if it doesn't have any path, use the
+    // explicitly set initial directory.
+    //
+    // Notice that it is important to call this before SetPath() below as if we
+    // do have m_initialDir and no directory in m_path, we need to interpret
+    // the path as being relative with respect to m_initialDir.
+    if ( !m_initialDir.empty() )
+        DoSetInitialDirectory(dialog, m_initialDir);
+
+    // This sets both the default file name and the default directory of the
+    // dialog if m_path contains directory part.
+    dialog->SetPath(m_path);
+
+    return dialog;
+}
+
+// ----------------------------------------------------------------------------
+// wxGenericDirButton
+// ----------------------------------------------------------------------------
+
+wxDialog *wxGenericDirButton::CreateDialog()
+{
+    wxDirDialog* const dialog = new wxDirDialog
+                                    (
+                                        GetDialogParent(),
+                                        m_message,
+                                        m_path.empty() ? m_initialDir : m_path,
+                                        GetDialogStyle()
+                                    );
+    return dialog;
+}
+
 #endif      // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL