missing commit

[wxWidgets.git] / src / gtk / filepicker.cpp

diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index 803815982efd7d57e7d69b78b5204fb8410c9c15..bebcf84931e415d05d90a0f17bbbc7e4173c1bec 100644 (file)
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -17,7 +17,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#if wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
+#if wxUSE_FILEPICKERCTRL
 
 #include "wx/filepicker.h"
 #include "wx/tooltip.h"
@@ -44,11 +44,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
 {
     // we can't use the native button for wxFLP_SAVE pickers as it can only
     // open existing files and there is no way to create a new file using it
-    if (!(style & wxFLP_SAVE) && !(style & wxFLP_USE_TEXTCTRL)
-#ifndef __WXGTK3__
-        && gtk_check_version(2,6,0) == NULL
-#endif
-        )
+    if (!(style & wxFLP_SAVE) && !(style & wxFLP_USE_TEXTCTRL))
     {
         // VERY IMPORTANT: this code is identical to relative code in wxDirButton;
         //                 if you find a problem here, fix it also in wxDirButton !
@@ -90,7 +86,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
         // we need to know when the dialog has been dismissed clicking OK...
         // NOTE: the "clicked" signal is not available for a GtkFileChooserButton
         //       thus we are forced to use wxFileDialog's event
-        m_dialog->Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+        m_dialog->Connect(wxEVT_BUTTON,
                 wxCommandEventHandler(wxFileButton::OnDialogOK),
                 NULL, this);
 
@@ -107,6 +103,18 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
 
 wxFileButton::~wxFileButton()
 {
+    if ( m_dialog )
+    {
+        // We need to delete the C++ dialog object here but we shouldn't delete
+        // its widget which is used by our GtkFileChooserButton and will be
+        // deleted by it when it is itself destroyed in our base class dtor. So
+        // take the widget ownership away from the dialog to avoid GTK+ errors
+        // that would happen if GtkFileChooserButton tried to access the
+        // already destroyed dialog widget.
+        g_object_unref(m_dialog->m_widget);
+        m_dialog->m_widget = NULL;
+        delete m_dialog;
+    }
 }
 
 void wxFileButton::OnDialogOK(wxCommandEvent& ev)
@@ -119,7 +127,7 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev)
         UpdatePathFromDialog(m_dialog);
 
         // ...and fire an event
-        wxFileDirPickerEvent event(wxEVT_COMMAND_FILEPICKER_CHANGED, this, GetId(), m_path);
+        wxFileDirPickerEvent event(wxEVT_FILEPICKER_CHANGED, this, GetId(), m_path);
         HandleWindowEvent(event);
     }
 }
@@ -135,17 +143,22 @@ void wxFileButton::SetPath(const wxString &str)
 void wxFileButton::SetInitialDirectory(const wxString& dir)
 {
     if (m_dialog)
-        DoSetInitialDirectory(static_cast<wxFileDialog*>(m_dialog), dir);
+    {
+        // Only change the directory if the default file name doesn't have any
+        // directory in it, otherwise it takes precedence.
+        if ( m_path.find_first_of(wxFileName::GetPathSeparators()) ==
+                wxString::npos )
+        {
+            static_cast<wxFileDialog*>(m_dialog)->SetDirectory(dir);
+        }
+    }
     else
         wxGenericFileButton::SetInitialDirectory(dir);
 }
 
-#endif      // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
-
-
+#endif // wxUSE_FILEPICKERCTRL
 
-
-#if wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)
+#if wxUSE_DIRPICKERCTRL
 
 #ifdef __UNIX__
 #include <unistd.h> // chdir
@@ -182,7 +195,7 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi
         chdir(filename);
 
     // ...and fire an event
-    wxFileDirPickerEvent event(wxEVT_COMMAND_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath());
+    wxFileDirPickerEvent event(wxEVT_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath());
     p->HandleWindowEvent(event);
 }
 }
@@ -201,11 +214,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
                         long style, const wxValidator& validator,
                         const wxString &name )
 {
-    if (!(style & wxDIRP_USE_TEXTCTRL)
-#ifndef __WXGTK3__
-        && gtk_check_version(2,6,0) == NULL
-#endif
-        )
+    if (!(style & wxDIRP_USE_TEXTCTRL))
     {
         // VERY IMPORTANT: this code is identic to relative code in wxFileButton;
         //                 if you find a problem here, fix it also in wxFileButton !
@@ -261,6 +270,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
 
 wxDirButton::~wxDirButton()
 {
+    delete m_dialog;
 }
 
 void wxDirButton::GTKUpdatePath(const char *gtkpath)
@@ -299,4 +309,4 @@ void wxDirButton::SetInitialDirectory(const wxString& dir)
         wxGenericDirButton::SetInitialDirectory(dir);
 }
 
-#endif      // wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)
+#endif // wxUSE_DIRPICKERCTRL