mac paths updated

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

diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index 8ce087ed5cead9871fa2df31158e5539343991f8..fffa3b0da9bce15c2c73c2ecef80011fbfad6e6a 100644 (file)
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -41,7 +41,9 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
                         long style, const wxValidator& validator,
                         const wxString &name )
 {
-    if (!gtk_check_version(2,6,0))
+    // 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) && !gtk_check_version(2,6,0) )
     {
         // VERY IMPORTANT: this code is identic to relative code in wxDirButton;
         //                 if you find a problem here, fix it also in wxDirButton !
@@ -105,7 +107,8 @@ wxFileButton::~wxFileButton()
     // GtkFileChooserDialog associated with m_dialog.
     // Thus we have to set its m_widget to NULL to avoid
     // double destruction on same widget
-    m_dialog->m_widget = NULL;
+    if (m_dialog)
+        m_dialog->m_widget = NULL;
 }
 
 void wxFileButton::OnDialogOK(wxCommandEvent& ev)
@@ -119,14 +122,15 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev)
 
         // ...and fire an event
         wxFileDirPickerEvent event(wxEVT_COMMAND_FILEPICKER_CHANGED, this, GetId(), m_path);
-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent(event);
     }
 }
 
 void wxFileButton::SetPath(const wxString &str)
 {
     m_path = str;
-    UpdateDialogPath(m_dialog);
+    if (m_dialog)
+        UpdateDialogPath(m_dialog);
 }
 
 #endif      // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
@@ -170,7 +174,7 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi
 
     // ...and fire an event
     wxFileDirPickerEvent event(wxEVT_COMMAND_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath());
-    p->GetEventHandler()->ProcessEvent(event);
+    p->HandleWindowEvent(event);
 }
 }
 
@@ -249,7 +253,8 @@ wxDirButton::~wxDirButton()
     // GtkFileChooserDialog associated with m_dialog.
     // Thus we have to set its m_widget to NULL to avoid
     // double destruction on same widget
-    m_dialog->m_widget = NULL;
+    if (m_dialog)
+        m_dialog->m_widget = NULL;
 }
 
 void wxDirButton::SetPath(const wxString &str)
@@ -263,7 +268,8 @@ void wxDirButton::SetPath(const wxString &str)
     // general with all wxWidgets control-manipulation functions which do not send events).
     m_bIgnoreNextChange = true;
 
-    UpdateDialogPath(m_dialog);
+    if (m_dialog)
+        UpdateDialogPath(m_dialog);
 }
 
 #endif      // wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)