Fix for #15224: wxRichTextTable: Setting a cell's text colour affects subsequent...

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

diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp
index aaeffe2e34e14488afc48d2035d7188d385cac3f..225da729d28cf41cdce45848d074939929dadb3d 100644 (file)
--- a/src/generic/filepickerg.cpp
+++ b/src/generic/filepickerg.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     15/04/2006
-// RCS-ID:      $Id$
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -26,6 +25,7 @@
 
 #if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 
+#include "wx/filename.h"
 #include "wx/filepicker.h"
 
 #include "wx/scopedptr.h"
@@ -80,7 +80,7 @@ bool wxGenericFileDirButton::Create(wxWindow *parent,
     }
 
     // and handle user clicks on it
-    Connect(GetId(), wxEVT_COMMAND_BUTTON_CLICKED,
+    Connect(GetId(), wxEVT_BUTTON,
             wxCommandEventHandler(wxGenericFileDirButton::OnButtonClick),
             NULL, this);
 
@@ -106,4 +106,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