X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a65ffcb229be96bbea86808bab3b1239407e8d9a..8472511246c9160d4ff40ab86f635fc67c10b54a:/src/common/filepickercmn.cpp diff --git a/src/common/filepickercmn.cpp b/src/common/filepickercmn.cpp index 06931b3b56..5923767f2d 100644 --- a/src/common/filepickercmn.cpp +++ b/src/common/filepickercmn.cpp @@ -37,25 +37,32 @@ // implementation // ============================================================================ -DEFINE_EVENT_TYPE(wxEVT_COMMAND_FILEPICKER_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_DIRPICKER_CHANGED) +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"); + +wxDEFINE_EVENT( wxEVT_FILEPICKER_CHANGED, wxFileDirPickerEvent ); +wxDEFINE_EVENT( wxEVT_DIRPICKER_CHANGED, wxFileDirPickerEvent ); 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.empty() || CheckPath(path), wxT("Invalid initial path !")); - if (!wxPickerBase::CreateBase(parent, id, path, pos, size, style, validator, name)) return false; @@ -65,24 +72,24 @@ bool wxFileDirPickerCtrlBase::CreateBase( wxWindow *parent, wxWindowID id, // check that the styles are not contradictory wxASSERT_MSG( !(HasFlag(wxFLP_SAVE) && HasFlag(wxFLP_OPEN)), - _T("can't specify both wxFLP_SAVE and wxFLP_OPEN at once") ); + wxT("can't specify both wxFLP_SAVE and wxFLP_OPEN at once") ); wxASSERT_MSG( !HasFlag(wxFLP_SAVE) || !HasFlag(wxFLP_FILE_MUST_EXIST), - _T("wxFLP_FILE_MUST_EXIST can't be used with wxFLP_SAVE" ) ); + wxT("wxFLP_FILE_MUST_EXIST can't be used with wxFLP_SAVE" ) ); wxASSERT_MSG( !HasFlag(wxFLP_OPEN) || !HasFlag(wxFLP_OVERWRITE_PROMPT), - _T("wxFLP_OVERWRITE_PROMPT can't be used with wxFLP_OPEN") ); + wxT("wxFLP_OVERWRITE_PROMPT can't be used with wxFLP_OPEN") ); // create a wxFilePickerWidget or a wxDirPickerWidget... - if (!CreatePicker(this, path, message, wildcard)) + m_pickerIface = CreatePicker(this, path, message, wildcard); + if ( !m_pickerIface ) return false; + m_picker = m_pickerIface->AsControl(); // complete sizer creation wxPickerBase::PostCreation(); - m_picker->Connect(GetEventType(), - wxFileDirPickerEventHandler(wxFileDirPickerCtrlBase::OnFileDirChange), - NULL, this); + DoConnect( m_picker, this ); // default's wxPickerBase textctrl limit is too small for this control: // make it bigger @@ -91,9 +98,14 @@ bool wxFileDirPickerCtrlBase::CreateBase( wxWindow *parent, wxWindowID id, return true; } +wxString wxFileDirPickerCtrlBase::GetPath() const +{ + return m_pickerIface->GetPath(); +} + void wxFileDirPickerCtrlBase::SetPath(const wxString &path) { - M_PICKER->SetPath(path); + m_pickerIface->SetPath(path); UpdateTextCtrlFromPicker(); } @@ -101,23 +113,21 @@ void wxFileDirPickerCtrlBase::UpdatePickerFromTextCtrl() { 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 ! wxString newpath(GetTextCtrlValue()); - if (!CheckPath(newpath)) - return; // invalid user input - if (M_PICKER->GetPath() != newpath) + // 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_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:" @@ -136,11 +146,10 @@ void wxFileDirPickerCtrlBase::UpdateTextCtrlFromPicker() 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()); } @@ -169,13 +178,28 @@ void wxFileDirPickerCtrlBase::OnFileDirChange(wxFileDirPickerEvent &ev) IMPLEMENT_DYNAMIC_CLASS(wxFilePickerCtrl, wxPickerBase) -bool wxFilePickerCtrl::CheckPath(const wxString& path) const +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 wxFLP_SAVE was given or wxFLP_FILE_MUST_EXIST has NOT been given we - // must accept any path - return HasFlag(wxFLP_SAVE) || - !HasFlag(wxFLP_FILE_MUST_EXIST) || - wxFileName::FileExists(path); + 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 @@ -193,10 +217,27 @@ wxString wxFilePickerCtrl::GetTextCtrlValue() const #if wxUSE_DIRPICKERCTRL IMPLEMENT_DYNAMIC_CLASS(wxDirPickerCtrl, wxPickerBase) -bool wxDirPickerCtrl::CheckPath(const wxString& path) const +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 wxDIRP_DIR_MUST_EXIST has NOT been given we must accept any path - return !HasFlag(wxDIRP_DIR_MUST_EXIST) || wxFileName::DirExists(path); + 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