Fix for user input processing in wxProgressDialog.

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

diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp
index ce5efc0d4cefc8006eb89a4f0d9e36f009bb8c87..1aaf01a42044c46c5d45211e7bbdd9bb538cb5de 100644 (file)
--- a/src/generic/filepickerg.cpp
+++ b/src/generic/filepickerg.cpp
@@ -24,20 +24,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-#endif //WX_PRECOMP
+#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL

 
 #include "wx/filepicker.h"
 
 #include "wx/filepicker.h"

-#include "wx/filedlg.h"

 
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
-

 IMPLEMENT_DYNAMIC_CLASS(wxGenericFileButton, wxButton)
 IMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton)
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericFileButton, wxButton)
 IMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton)
 


@@ -45,51 +40,54 @@ IMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton)
 // wxGenericFileButton
 // ----------------------------------------------------------------------------
 
 // wxGenericFileButton
 // ----------------------------------------------------------------------------
 

-static wxString s_message, s_wildcard;
-
-bool wxGenericFileDirButton::Create( wxWindow *parent, wxWindowID id,
-                        const wxString &label, const wxString &path,
-                        const wxString &message, const wxString &wildcard,
-                        const wxPoint &pos, const wxSize &size, long style,
-                        const wxValidator& validator, const wxString &name)
+bool wxGenericFileDirButton::Create(wxWindow *parent,
+                                    wxWindowID id,
+                                    const wxString& label,
+                                    const wxString& path,
+                                    const wxString& message,
+                                    const wxString& wildcard,
+                                    const wxPoint& pos,
+                                    const wxSize& size,
+                                    long style,
+                                    const wxValidator& validator,
+                                    const wxString& name)

 {
 {

+    m_pickerStyle = style;
+

     // create this button
     // create this button

-    if (!wxButton::Create(parent, id, label, pos, size, style,
-                          validator, name))
+    if ( !wxButton::Create(parent, id, label, pos, size, 0, validator, name) )

     {
         wxFAIL_MSG( wxT("wxGenericFileButton creation failed") );
         return false;
     }
 
     // and handle user clicks on it
     {
         wxFAIL_MSG( wxT("wxGenericFileButton creation failed") );
         return false;
     }
 
     // and handle user clicks on it

-    Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+    Connect(GetId(), wxEVT_COMMAND_BUTTON_CLICKED,

             wxCommandEventHandler(wxGenericFileDirButton::OnButtonClick),
             NULL, this);
 
     // create the dialog associated with this button
     m_path = path;
             wxCommandEventHandler(wxGenericFileDirButton::OnButtonClick),
             NULL, this);
 
     // create the dialog associated with this button
     m_path = path;

-    s_message = message;
-    s_wildcard = wildcard;
+    m_message = message;
+    m_wildcard = wildcard;

 
 

-    m_dialog = NULL;

     return true;
 }
 
 void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 {
     return true;
 }
 
 void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 {

-    CreateDialog(s_message, s_wildcard);
-
-    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);
     }
 
 
         // fire an event
         wxFileDirPickerEvent event(GetEventType(), this, GetId(), m_path);
         GetEventHandler()->ProcessEvent(event);
     }
 

-    wxDELETE(m_dialog);
+    wxDELETE(p);

 }
 
 #endif      // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 }
 
 #endif      // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL