X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68623b593770cabc5a2de82fd39498a3cbe8126d..4e15d1caa03346c126015019c1fdf093033ef40b:/src/generic/filepickerg.cpp diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp index f8d7a827c3..a33a965db0 100644 --- a/src/generic/filepickerg.cpp +++ b/src/generic/filepickerg.cpp @@ -26,8 +26,11 @@ #if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL +#include "wx/filename.h" #include "wx/filepicker.h" +#include "wx/scopedptr.h" + // ============================================================================ // implementation @@ -48,12 +51,30 @@ bool wxGenericFileDirButton::Create(wxWindow *parent, const wxString& wildcard, const wxPoint& pos, const wxSize& size, - long WXUNUSED(style), + long style, const wxValidator& validator, const wxString& name) { + m_pickerStyle = style; + + // If the special wxPB_SMALL flag is used, ignore the provided label and + // use the shortest possible label and the smallest possible button fitting + // it. + long styleButton = 0; + wxString labelButton; + if ( m_pickerStyle & wxPB_SMALL ) + { + labelButton = _("..."); + styleButton = wxBU_EXACTFIT; + } + else + { + labelButton = label; + } + // create this button - if ( !wxButton::Create(parent, id, label, pos, size, 0, validator, name) ) + if ( !wxButton::Create(parent, id, labelButton, + pos, size, styleButton, validator, name) ) { wxFAIL_MSG( wxT("wxGenericFileButton creation failed") ); return false; @@ -74,18 +95,62 @@ bool wxGenericFileDirButton::Create(wxWindow *parent, void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev)) { - wxDialog *p = CreateDialog(); + wxScopedPtr<wxDialog> p(CreateDialog()); if (p->ShowModal() == wxID_OK) { // save updated path in m_path - UpdatePathFromDialog(p); + UpdatePathFromDialog(p.get()); // fire an event wxFileDirPickerEvent event(GetEventType(), this, GetId(), m_path); GetEventHandler()->ProcessEvent(event); } +} - wxDELETE(p); +void wxGenericFileDirButton::SetInitialDirectory(const wxString& dir) +{ + m_initialDir = dir; +} + +// ---------------------------------------------------------------------------- +// wxGenericFileButton +// ---------------------------------------------------------------------------- + +wxDialog *wxGenericFileButton::CreateDialog() +{ + // Determine the initial directory for the dialog: it comes either from the + // default path, if it has it, or from the separately specified initial + // directory that can be set even if the path is e.g. empty. + wxFileName fn(m_path); + wxString initialDir = fn.GetPath(); + if ( initialDir.empty() ) + initialDir = m_initialDir; + + return new wxFileDialog + ( + GetDialogParent(), + m_message, + initialDir, + fn.GetFullName(), + m_wildcard, + GetDialogStyle() + ); +} + +// ---------------------------------------------------------------------------- +// wxGenericDirButton +// ---------------------------------------------------------------------------- + +wxDialog *wxGenericDirButton::CreateDialog() +{ + wxDirDialog* const dialog = new wxDirDialog + ( + GetDialogParent(), + m_message, + m_path.empty() ? m_initialDir : m_path, + GetDialogStyle() + ); + return dialog; } #endif // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL