X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ba03e3cd2c40129bef01381c25c7c2189e381dc..5942996c94a82dcbedf7b1041b08acd8d1d97449:/src/generic/filepickerg.cpp

diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp
index 32f76b8633..55583a121e 100644
--- a/src/generic/filepickerg.cpp
+++ b/src/generic/filepickerg.cpp
@@ -24,20 +24,15 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-#endif //WX_PRECOMP
+#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 
 #include "wx/filepicker.h"
-#include "wx/filedlg.h"
 
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
-
 IMPLEMENT_DYNAMIC_CLASS(wxGenericFileButton, wxButton)
 IMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton)
 
@@ -66,20 +61,26 @@ bool wxGenericFileDirButton::Create( wxWindow *parent, wxWindowID id,
 
     // create the dialog associated with this button
     m_path = path;
-    return CreateDialog(message, wildcard);
+    m_message = message;
+    m_wildcard = wildcard;
+
+    return true;
 }
 
 void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 {
-    if (m_dialog->ShowModal() == wxID_OK)
+    wxDialog *p = CreateDialog();
+    if (p->ShowModal() == wxID_OK)
     {
-        // save the path
-        UpdatePathFromDialog();
+        // save updated path in m_path
+        UpdatePathFromDialog(p);
 
         // fire an event
         wxFileDirPickerEvent event(GetEventType(), this, GetId(), m_path);
         GetEventHandler()->ProcessEvent(event);
     }
+
+    wxDELETE(p);
 }
 
 #endif      // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL