Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. don't assert if we're passed an empty defaultDir and full path in

Browse Source 
defaultFileName (the other ports don't do it)
2. don't duplicate gtk_file_chooser_set_current_folder() calls for
   save and open dialogs unnecessarily
3. reformated a couple of comments to fit in 80 columns


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-12-08 00:35:55 +00:00
parent 04680d2c7e
commit bf34520682
1 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/gtk/filedlg.cpp
View File

@@ -200,19 +200,21 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
if ( style & wxFD_MULTIPLE ) if ( style & wxFD_MULTIPLE )
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true); gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true);
// gtk_widget_hide_on_delete is used here to avoid that Gtk automatically destroys // gtk_widget_hide_on_delete is used here to avoid that Gtk automatically
// the dialog when the user press ESC on the dialog: in that case a second call to // destroys the dialog when the user press ESC on the dialog: in that case
// ShowModal() would result in a bunch of Gtk-CRITICAL errors... // a second call to ShowModal() would result in a bunch of Gtk-CRITICAL
// errors...
g_signal_connect (G_OBJECT(m_widget), g_signal_connect (G_OBJECT(m_widget),
"delete_event", "delete_event",
G_CALLBACK (gtk_widget_hide_on_delete), G_CALLBACK (gtk_widget_hide_on_delete),
(gpointer)this); (gpointer)this);
// local-only property could be set to false to allow non-local files to be loaded. // local-only property could be set to false to allow non-local files to be
// In that case get/set_uri(s) should be used instead of get/set_filename(s) everywhere // loaded. In that case get/set_uri(s) should be used instead of
// and the GtkFileChooserDialog should probably also be created with a backend, // get/set_filename(s) everywhere and the GtkFileChooserDialog should
// e.g "gnome-vfs", "default", ... (gtk_file_chooser_dialog_new_with_backend). // probably also be created with a backend, e.g "gnome-vfs", "default", ...
// Currently local-only is kept as the default - true: // (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); // gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(m_widget), true);
g_signal_connect (m_widget, "response", g_signal_connect (m_widget, "response",
@@ -220,14 +222,34 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
SetWildcard(wildCard); SetWildcard(wildCard);
// 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);
// set the initial file name and/or directory
wxString fname = fn.GetFullName();
if ( fname.empty() )
{
wxString dir = fn.GetPath();
if ( !dir.empty() )
{
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
dir.fn_str());
}
}
if ( style & wxFD_SAVE ) if ( style & wxFD_SAVE )
{ {
if ( !defaultDir.empty() ) if ( !fname.empty() )
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), {
wxConvFileName->cWX2MB(defaultDir)); gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
fname.fn_str());
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), }
wxGTK_CONV(defaultFileName));
#if GTK_CHECK_VERSION(2,7,3) #if GTK_CHECK_VERSION(2,7,3)
if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3)) if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3))
@@ -236,22 +258,10 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
} }
else // wxFD_OPEN else // wxFD_OPEN
{ {
if ( !defaultFileName.empty() ) if ( !fname.empty() )
{ {
wxString dir; gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
if ( defaultDir.empty() ) fn.GetFullPath().fn_str());
dir = ::wxGetCwd();
else
dir = defaultDir;
gtk_file_chooser_set_filename(
GTK_FILE_CHOOSER(m_widget),
wxConvFileName->cWX2MB( wxFileName(dir, defaultFileName).GetFullPath() ) );
}
else if ( !defaultDir.empty() )
{
gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
wxConvFileName->cWX2MB(defaultDir) );
} }
} }