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

fixed to not duplicate code needlessly; clarified why gtk_file_chooser_set_current_name is called as it is

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-11-28 09:33:43 +00:00
parent 82c1f2a390
commit e0107cbd45
2 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gtk/filedlg.cpp
View File

@@ -237,21 +237,9 @@ void wxFileDialog::SetPath(const wxString& path)
wxFileName fn(path); wxFileName fn(path);
m_path = fn.GetFullPath(); m_path = fn.GetFullPath();
m_dir = fn.GetPath();
m_fileName = fn.GetFullName();
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), SetDirectory(fn.GetPath());
wxGTK_CONV(m_dir)); SetFilename(fn.GetFullName());
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
wxGTK_CONV(m_path));
// pre-fill the filename, too:
if (GetWindowStyle() & wxSAVE) // Why only then??
{
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
wxGTK_CONV(m_fileName));
}
} }
void wxFileDialog::SetDirectory(const wxString& dir) void wxFileDialog::SetDirectory(const wxString& dir)
@@ -275,8 +263,10 @@ void wxFileDialog::SetFilename(const wxString& name)
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
wxGTK_CONV(m_path)); wxGTK_CONV(m_path));
// pre-fill the filename, too: // pre-fill the filename when saving, too (there's no text entry
if (GetWindowStyle() & wxSAVE) // Why only then?? // control when opening a file, so it doesn't make sense to
// do this in when opening files):
if (GetWindowStyle() & wxSAVE)
{ {
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
wxGTK_CONV(m_fileName)); wxGTK_CONV(m_fileName));

22
src/gtk1/filedlg.cpp
View File

@@ -237,21 +237,9 @@ void wxFileDialog::SetPath(const wxString& path)
wxFileName fn(path); wxFileName fn(path);
m_path = fn.GetFullPath(); m_path = fn.GetFullPath();
m_dir = fn.GetPath();
m_fileName = fn.GetFullName();
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), SetDirectory(fn.GetPath());
wxGTK_CONV(m_dir)); SetFilename(fn.GetFullName());
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
wxGTK_CONV(m_path));
// pre-fill the filename, too:
if (GetWindowStyle() & wxSAVE) // Why only then??
{
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
wxGTK_CONV(m_fileName));
}
} }
void wxFileDialog::SetDirectory(const wxString& dir) void wxFileDialog::SetDirectory(const wxString& dir)
@@ -275,8 +263,10 @@ void wxFileDialog::SetFilename(const wxString& name)
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget),
wxGTK_CONV(m_path)); wxGTK_CONV(m_path));
// pre-fill the filename, too: // pre-fill the filename when saving, too (there's no text entry
if (GetWindowStyle() & wxSAVE) // Why only then?? // control when opening a file, so it doesn't make sense to
// do this in when opening files):
if (GetWindowStyle() & wxSAVE)
{ {
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget),
wxGTK_CONV(m_fileName)); wxGTK_CONV(m_fileName));