Fix broken and missing DataView interface items for Phoenix

[wxWidgets.git] / src / generic / filepickerg.cpp

diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp
index aaeffe2e34e14488afc48d2035d7188d385cac3f..a33a965db0f52f103185f7989731e33adfd994cc 100644 (file)
--- 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,50 @@ void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
     }
 }
 
+void wxGenericFileDirButton::SetInitialDirectory(const wxString& dir)
+{
+    m_initialDir = dir;
+}
+
+// ----------------------------------------------------------------------------
+// wxGenericFileButton
+// ----------------------------------------------------------------------------
+
+wxDialog *wxGenericFileButton::CreateDialog()
+{
+    // Determine the initial directory for the dialog: it comes either from the
+    // default path, if it has it, or from the separately specified initial
+    // directory that can be set even if the path is e.g. empty.
+    wxFileName fn(m_path);
+    wxString initialDir = fn.GetPath();
+    if ( initialDir.empty() )
+        initialDir = m_initialDir;
+
+    return new wxFileDialog
+               (
+                    GetDialogParent(),
+                    m_message,
+                    initialDir,
+                    fn.GetFullName(),
+                    m_wildcard,
+                    GetDialogStyle()
+               );
+}
+
+// ----------------------------------------------------------------------------
+// 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