06a419244f
Create wxFileDialog with correct initial directory and default file name from the very beginning instead of updating it later. This makes the code simpler and also actually makes it work as the initial directory setting was overwritten by setting the default path later even if it didn't contain any directory component. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
157 lines
5.1 KiB
C++
157 lines
5.1 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: src/generic/filepickerg.cpp
|
|
// Purpose: wxGenericFileDirButton class implementation
|
|
// Author: Francesco Montorsi
|
|
// Modified by:
|
|
// Created: 15/04/2006
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) Francesco Montorsi
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
// ============================================================================
|
|
// declarations
|
|
// ============================================================================
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// For compilers that support precompilation, includes "wx.h".
|
|
#include "wx/wxprec.h"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
|
|
|
|
#include "wx/filename.h"
|
|
#include "wx/filepicker.h"
|
|
|
|
#include "wx/scopedptr.h"
|
|
|
|
|
|
// ============================================================================
|
|
// implementation
|
|
// ============================================================================
|
|
|
|
IMPLEMENT_DYNAMIC_CLASS(wxGenericFileButton, wxButton)
|
|
IMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton)
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGenericFileButton
|
|
// ----------------------------------------------------------------------------
|
|
|
|
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;
|
|
|
|
// 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, labelButton,
|
|
pos, size, styleButton, validator, name) )
|
|
{
|
|
wxFAIL_MSG( wxT("wxGenericFileButton creation failed") );
|
|
return false;
|
|
}
|
|
|
|
// and handle user clicks on it
|
|
Connect(GetId(), wxEVT_COMMAND_BUTTON_CLICKED,
|
|
wxCommandEventHandler(wxGenericFileDirButton::OnButtonClick),
|
|
NULL, this);
|
|
|
|
// create the dialog associated with this button
|
|
m_path = path;
|
|
m_message = message;
|
|
m_wildcard = wildcard;
|
|
|
|
return true;
|
|
}
|
|
|
|
void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
|
|
{
|
|
wxScopedPtr<wxDialog> p(CreateDialog());
|
|
if (p->ShowModal() == wxID_OK)
|
|
{
|
|
// save updated path in m_path
|
|
UpdatePathFromDialog(p.get());
|
|
|
|
// fire an event
|
|
wxFileDirPickerEvent event(GetEventType(), this, GetId(), m_path);
|
|
GetEventHandler()->ProcessEvent(event);
|
|
}
|
|
}
|
|
|
|
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
|