wxMessageBox off the main thread lost result code.

[wxWidgets.git] / src / common / filepickercmn.cpp

diff --git a/src/common/filepickercmn.cpp b/src/common/filepickercmn.cpp
index 949ee2c8c364358817f9c33a2e92e502b5ba9ca0..a58b4adfecd9c769a4b2fce1fbd75f71748bc358 100644 (file)
--- a/src/common/filepickercmn.cpp
+++ b/src/common/filepickercmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Francesco Montorsi (readapted code written by Vadim Zeitlin)
 // Modified by:
 // Created:     15/04/2006
 // Author:      Francesco Montorsi (readapted code written by Vadim Zeitlin)
 // Modified by:
 // Created:     15/04/2006

-// RCS-ID:      $Id$

 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -24,45 +23,72 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/filepicker.h"
+#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL

 
 

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

 
 

+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif

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

-#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
+const char wxFilePickerCtrlNameStr[] = "filepicker";
+const char wxFilePickerWidgetNameStr[] = "filepickerwidget";
+const char wxDirPickerCtrlNameStr[] = "dirpicker";
+const char wxDirPickerWidgetNameStr[] = "dirpickerwidget";
+const char wxFilePickerWidgetLabel[] = wxTRANSLATE("Browse");
+const char wxDirPickerWidgetLabel[] = wxTRANSLATE("Browse");

 
 

-DEFINE_EVENT_TYPE(wxEVT_COMMAND_FILEPICKER_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DIRPICKER_CHANGED)
+wxDEFINE_EVENT( wxEVT_FILEPICKER_CHANGED, wxFileDirPickerEvent );
+wxDEFINE_EVENT( wxEVT_DIRPICKER_CHANGED,  wxFileDirPickerEvent );

 IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent)
 
 // ----------------------------------------------------------------------------
 // wxFileDirPickerCtrlBase
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent)
 
 // ----------------------------------------------------------------------------
 // wxFileDirPickerCtrlBase
 // ----------------------------------------------------------------------------
 

-#define M_PICKER     ((wxFilePickerWidget*)m_picker)
-
-bool wxFileDirPickerCtrlBase::CreateBase( wxWindow *parent, wxWindowID id,
-                        const wxString &path, const wxString &message,
-                        const wxString &wildcard,
-                        const wxPoint &pos, const wxSize &size,
-                        long style, const wxValidator& validator,
-                        const wxString &name )
+bool wxFileDirPickerCtrlBase::CreateBase(wxWindow *parent,
+                                         wxWindowID id,
+                                         const wxString &path,
+                                         const wxString &message,
+                                         const wxString &wildcard,
+                                         const wxPoint &pos,
+                                         const wxSize &size,
+                                         long style,
+                                         const wxValidator& validator,
+                                         const wxString &name )

 {
 {

-    wxASSERT_MSG(path.IsEmpty() || CheckPath(path), wxT("Invalid initial path !"));
-

     if (!wxPickerBase::CreateBase(parent, id, path, pos, size,
                                    style, validator, name))
         return false;
 
     if (!wxPickerBase::CreateBase(parent, id, path, pos, size,
                                    style, validator, name))
         return false;
 

+    if (!HasFlag(wxFLP_OPEN) && !HasFlag(wxFLP_SAVE))
+        m_windowStyle |= wxFLP_OPEN;     // wxFD_OPEN is the default
+
+    // check that the styles are not contradictory
+    wxASSERT_MSG( !(HasFlag(wxFLP_SAVE) && HasFlag(wxFLP_OPEN)),
+                  wxT("can't specify both wxFLP_SAVE and wxFLP_OPEN at once") );
+
+    wxASSERT_MSG( !HasFlag(wxFLP_SAVE) || !HasFlag(wxFLP_FILE_MUST_EXIST),
+                   wxT("wxFLP_FILE_MUST_EXIST can't be used with wxFLP_SAVE" ) );
+
+    wxASSERT_MSG( !HasFlag(wxFLP_OPEN) || !HasFlag(wxFLP_OVERWRITE_PROMPT),
+                  wxT("wxFLP_OVERWRITE_PROMPT can't be used with wxFLP_OPEN") );
+

     // create a wxFilePickerWidget or a wxDirPickerWidget...
     // create a wxFilePickerWidget or a wxDirPickerWidget...

-    if (!CreatePicker(this, path, message, wildcard))
+    m_pickerIface = CreatePicker(this, path, message, wildcard);
+    if ( !m_pickerIface )

         return false;
         return false;

-    m_picker->Connect(GetEventType(),
-            wxFileDirPickerEventHandler(wxFileDirPickerCtrlBase::OnFileDirChange),
-            NULL, this);
+    m_picker = m_pickerIface->AsControl();
+
+    // complete sizer creation
+    wxPickerBase::PostCreation();
+
+    DoConnect( m_picker, this );

 
     // default's wxPickerBase textctrl limit is too small for this control:
     // make it bigger
 
     // default's wxPickerBase textctrl limit is too small for this control:
     // make it bigger


@@ -71,9 +97,14 @@ bool wxFileDirPickerCtrlBase::CreateBase( wxWindow *parent, wxWindowID id,
     return true;
 }
 
     return true;
 }
 

+wxString wxFileDirPickerCtrlBase::GetPath() const
+{
+    return m_pickerIface->GetPath();
+}
+

 void wxFileDirPickerCtrlBase::SetPath(const wxString &path)
 {
 void wxFileDirPickerCtrlBase::SetPath(const wxString &path)
 {

-    M_PICKER->SetPath(path);
+    m_pickerIface->SetPath(path);

     UpdateTextCtrlFromPicker();
 }
 
     UpdateTextCtrlFromPicker();
 }
 


@@ -81,31 +112,27 @@ void wxFileDirPickerCtrlBase::UpdatePickerFromTextCtrl()
 {
     wxASSERT(m_text);
 
 {
     wxASSERT(m_text);
 

-    if (m_bIgnoreNextTextCtrlUpdate)
-    {
-        // ignore this update
-        m_bIgnoreNextTextCtrlUpdate = false;
-        return;
-    }
-

     // remove the eventually present path-separator from the end of the textctrl
     // string otherwise we would generate a wxFileDirPickerEvent when changing
     // from e.g. /home/user to /home/user/ and we want to avoid it !
     // remove the eventually present path-separator from the end of the textctrl
     // string otherwise we would generate a wxFileDirPickerEvent when changing
     // from e.g. /home/user to /home/user/ and we want to avoid it !

-    wxString newpath(m_text->GetValue());
-    if (!newpath.empty() && wxFileName::IsPathSeparator(newpath.Last()))
-        newpath.RemoveLast();
-    if (!CheckPath(newpath))
-        return;       // invalid user input
+    wxString newpath(GetTextCtrlValue());
+
+    // Notice that we use to check here whether the current path is valid, i.e.
+    // if the corresponding file or directory exists for the controls with
+    // wxFLP_FILE_MUST_EXIST or wxDIRP_DIR_MUST_EXIST flag, however we don't do
+    // this any more as we still must notify the program about any changes in
+    // the control, otherwise its view of it would be different from what is
+    // actually shown on the screen, resulting in very confusing UI.

 
 

-    if (M_PICKER->GetPath() != newpath)
+    if (m_pickerIface->GetPath() != newpath)

     {
     {

-        M_PICKER->SetPath(newpath);
+        m_pickerIface->SetPath(newpath);

 
         // update current working directory, if necessary
         // NOTE: the path separator is required because if newpath is "C:"
         //       then no change would happen
         if (IsCwdToUpdate())
 
         // update current working directory, if necessary
         // NOTE: the path separator is required because if newpath is "C:"
         //       then no change would happen
         if (IsCwdToUpdate())

-            wxSetWorkingDirectory(newpath + wxFileName::GetPathSeparator());
+            wxSetWorkingDirectory(newpath);

 
         // fire an event
         wxFileDirPickerEvent event(GetEventType(), this, GetId(), newpath);
 
         // fire an event
         wxFileDirPickerEvent event(GetEventType(), this, GetId(), newpath);


@@ -118,11 +145,10 @@ void wxFileDirPickerCtrlBase::UpdateTextCtrlFromPicker()
     if (!m_text)
         return;     // no textctrl to update
 
     if (!m_text)
         return;     // no textctrl to update
 

-    // NOTE: this SetValue() will generate an unwanted wxEVT_COMMAND_TEXT_UPDATED
-    //       which will trigger a unneeded UpdateFromTextCtrl(); thus before using
-    //       SetValue() we set the m_bIgnoreNextTextCtrlUpdate flag...
-    m_bIgnoreNextTextCtrlUpdate = true;
-    m_text->SetValue(M_PICKER->GetPath());
+    // Take care to use ChangeValue() here and not SetValue() to avoid
+    // generating an event that would trigger UpdateTextCtrlFromPicker()
+    // resulting in infinite recursion.
+    m_text->ChangeValue(m_pickerIface->GetPath());

 }
 
 
 }
 
 


@@ -143,9 +169,80 @@ void wxFileDirPickerCtrlBase::OnFileDirChange(wxFileDirPickerEvent &ev)
 
 #endif  // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 
 
 #endif  // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 

+// ----------------------------------------------------------------------------
+// wxFileDirPickerCtrl
+// ----------------------------------------------------------------------------
+

 #if wxUSE_FILEPICKERCTRL
 #if wxUSE_FILEPICKERCTRL

+

 IMPLEMENT_DYNAMIC_CLASS(wxFilePickerCtrl, wxPickerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxFilePickerCtrl, wxPickerBase)

-#endif
+
+bool wxFilePickerCtrl::Create(wxWindow *parent,
+                              wxWindowID id,
+                              const wxString& path,
+                              const wxString& message,
+                              const wxString& wildcard,
+                              const wxPoint& pos,
+                              const wxSize& size,
+                              long style,
+                              const wxValidator& validator,
+                              const wxString& name)
+{
+    if ( !wxFileDirPickerCtrlBase::CreateBase
+                                   (
+                                        parent, id, path, message, wildcard,
+                                        pos, size, style, validator, name
+                                   ) )
+        return false;
+
+    if ( HasTextCtrl() )
+        GetTextCtrl()->AutoCompleteFileNames();
+
+    return true;
+}
+
+wxString wxFilePickerCtrl::GetTextCtrlValue() const
+{
+    // filter it through wxFileName to remove any spurious path separator
+    return wxFileName(m_text->GetValue()).GetFullPath();
+}
+
+#endif // wxUSE_FILEPICKERCTRL
+
+// ----------------------------------------------------------------------------
+// wxDirPickerCtrl
+// ----------------------------------------------------------------------------
+

 #if wxUSE_DIRPICKERCTRL
 IMPLEMENT_DYNAMIC_CLASS(wxDirPickerCtrl, wxPickerBase)
 #if wxUSE_DIRPICKERCTRL
 IMPLEMENT_DYNAMIC_CLASS(wxDirPickerCtrl, wxPickerBase)

-#endif
+
+bool wxDirPickerCtrl::Create(wxWindow *parent,
+                             wxWindowID id,
+                             const wxString& path,
+                             const wxString& message,
+                             const wxPoint& pos,
+                             const wxSize& size,
+                             long style,
+                             const wxValidator& validator,
+                             const wxString& name)
+{
+    if ( !wxFileDirPickerCtrlBase::CreateBase
+                                   (
+                                        parent, id, path, message, wxString(),
+                                        pos, size, style, validator, name
+                                   ) )
+        return false;
+
+    if ( HasTextCtrl() )
+        GetTextCtrl()->AutoCompleteDirectories();
+
+    return true;
+}
+
+wxString wxDirPickerCtrl::GetTextCtrlValue() const
+{
+    // filter it through wxFileName to remove any spurious path separator
+    return wxFileName::DirName(m_text->GetValue()).GetPath();
+}
+
+#endif // wxUSE_DIRPICKERCTRL