// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#if wxUSE_FILEDLG
+#if wxUSE_FILEDLG
#include "wx/filedlg.h"
#include <gtk/gtk.h>
#include "wx/gtk/private.h"
+#ifdef __UNIX__
#include <unistd.h> // chdir
+#endif
#include "wx/filename.h" // wxFilename
#include "wx/tokenzr.h" // wxStringTokenizer
msg.Printf(
_("File '%s' already exists, do you really want to overwrite it?"),
- wxString(filename, *wxConvFileName));
+ wxString::FromUTF8(filename));
wxMessageDialog dlg(dialog, msg, _("Confirm"),
wxYES_NO | wxICON_QUESTION);
}
}
-static void wxInsertChildInFileDialog(wxWindow* parent, wxWindow* child)
+void wxFileDialog::AddChildGTK(wxWindowGTK* child)
{
g_signal_connect_after(child->m_widget, "size_request",
G_CALLBACK(extra_widget_size_request), child);
gtk_file_chooser_set_extra_widget(
- GTK_FILE_CHOOSER(parent->m_widget), child->m_widget);
+ GTK_FILE_CHOOSER(m_widget), child->m_widget);
}
//-----------------------------------------------------------------------------
const wxString& name)
: wxFileDialogBase()
{
- m_insertCallback = wxInsertChildInFileDialog;
- parent = GetParentForModalDialog(parent);
+ parent = GetParentForModalDialog(parent, style);
if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName,
wildCard, style, pos, sz, name))
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
ok_btn_stock, GTK_RESPONSE_ACCEPT,
NULL);
+ g_object_ref(m_widget);
GtkFileChooser* file_chooser = GTK_FILE_CHOOSER(m_widget);
m_fc.SetWidget(file_chooser);
// local-only property could be set to false to allow non-local files to be
// loaded. In that case get/set_uri(s) should be used instead of
// get/set_filename(s) everywhere and the GtkFileChooserDialog should
- // probably also be created with a backend, e.g "gnome-vfs", "default", ...
+ // probably also be created with a backend, e.g. "gnome-vfs", "default", ...
// (gtk_file_chooser_dialog_new_with_backend). Currently local-only is kept
// as the default - true:
// gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true);
g_signal_connect (m_widget, "response",
G_CALLBACK (gtk_filedialog_response_callback), this);
+
+ // deal with extensions/filters
SetWildcard(wildCard);
+ wxString defaultFileNameWithExt = defaultFileName;
+ if ( !wildCard.empty() && !defaultFileName.empty() &&
+ !wxFileName(defaultFileName).HasExt() )
+ {
+ // append the default extension to the initial file name: GTK won't do
+ // it for us by default (unlike e.g. MSW)
+ const wxString defaultExt = m_fc.GetCurrentWildCard().AfterFirst('.');
+ if ( defaultExt.find_first_of("?*") == wxString::npos )
+ defaultFileNameWithExt += "." + defaultExt;
+ }
+
+
// if defaultDir is specified it should contain the directory and
// defaultFileName should contain the default name of the file, however if
// directory is not given, defaultFileName contains both
wxFileName fn;
if ( defaultDir.empty() )
- fn.Assign(defaultFileName);
- else if ( !defaultFileName.empty() )
- fn.Assign(defaultDir, defaultFileName);
+ fn.Assign(defaultFileNameWithExt);
+ else if ( !defaultFileNameWithExt.empty() )
+ fn.Assign(defaultDir, defaultFileNameWithExt);
else
fn.AssignDir(defaultDir);
}
}
+wxFileDialog::~wxFileDialog()
+{
+ if (m_extraControl)
+ {
+ // get chooser to drop its reference right now, allowing wxWindow dtor
+ // to verify that ref count drops to zero
+ gtk_file_chooser_set_extra_widget(
+ GTK_FILE_CHOOSER(m_widget), NULL);
+ }
+}
+
void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
{
EndDialog(wxID_OK);
return wxDialog::ShowModal();
}
-void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
- int WXUNUSED(width), int WXUNUSED(height),
+void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
+ int WXUNUSED(width), int WXUNUSED(height),
int WXUNUSED(sizeFlags))
{
}
void wxFileDialog::SetPath(const wxString& path)
{
- m_fc.SetPath( path );
+ // we need an absolute path for GTK native chooser so ensure that we have
+ // it: use the initial directory if it was set or just CWD otherwise (this
+ // is the default behaviour if m_dir is empty)
+ wxFileName fn(path);
+ fn.MakeAbsolute(m_dir);
+ m_fc.SetPath(fn.GetFullPath());
}
void wxFileDialog::SetDirectory(const wxString& dir)
{
- m_fc.SetDirectory( dir );
+ if (m_fc.SetDirectory( dir ))
+ {
+ // Cache the dir, as gtk_file_chooser_get_current_folder()
+ // doesn't return anything until the dialog has been shown
+ m_dir = dir;
+ }
}
wxString wxFileDialog::GetDirectory() const
{
- return m_fc.GetDirectory();
+ wxString currentDir( m_fc.GetDirectory() );
+ if (currentDir.empty())
+ {
+ // m_fc.GetDirectory() will return empty until the dialog has been shown
+ // in which case use any previously provided value
+ currentDir = m_dir;
+ }
+ return currentDir;
}
void wxFileDialog::SetFilename(const wxString& name)
{
if (HasFdFlag(wxFD_SAVE))
+ {
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));
+ m_fileName = name;
+ }
+
else
- SetPath(wxFileName(GetDirectory(), name).GetFullPath());
+ {
+ wxString path( GetDirectory() );
+ if (path.empty())
+ {
+ // SetPath() fires an assert if fed other than filepaths
+ return;
+ }
+ SetPath(wxFileName(path, name).GetFullPath());
+ m_fileName = name;
+ }
}
wxString wxFileDialog::GetFilename() const
{
- return m_fc.GetFilename();
+ wxString currentFilename( m_fc.GetFilename() );
+ if (currentFilename.empty())
+ {
+ // m_fc.GetFilename() will return empty until the dialog has been shown
+ // in which case use any previously provided value
+ currentFilename = m_fileName;
+ }
+ return currentFilename;
}
void wxFileDialog::SetWildcard(const wxString& wildCard)
{
- m_fc.SetWildcard( wildCard );
+ wxFileDialogBase::SetWildcard(wildCard);
+ m_fc.SetWildcard( GetWildcard() );
}
void wxFileDialog::SetFilterIndex(int filterIndex)
{
-
m_fc.SetFilterIndex( filterIndex);
}
return m_fc.GetFilterIndex();
}
-#endif // wxUSE_FILEDLG
+#endif // wxUSE_FILEDLG
projects / wxWidgets.git / blobdiff