#include "wx/filename.h" // wxFilename
#include "wx/tokenzr.h" // wxStringTokenizer
#include "wx/filefn.h" // ::wxGetCwd
+#include "wx/testing.h"
//-----------------------------------------------------------------------------
// "clicked" for OK-button
wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
// gtk version numbers must be identical with the one in ctor (that calls set_do_overwrite_confirmation)
+#ifndef __WXGTK3__
#if GTK_CHECK_VERSION(2,7,3)
if (gtk_check_version(2, 7, 3) != NULL)
#endif
}
}
}
+#endif
if (style & wxFD_FILE_MUST_EXIST)
{
}
#if GTK_CHECK_VERSION(2,7,3)
- if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3))
+ if ((style & wxFD_OVERWRITE_PROMPT)
+#ifndef __WXGTK3__
+ && gtk_check_version(2,7,3) == NULL
+#endif
+ )
+ {
gtk_file_chooser_set_do_overwrite_confirmation(file_chooser, true);
+ }
#endif
}
else // wxFD_OPEN
int wxFileDialog::ShowModal()
{
+ WX_TESTING_SHOW_MODAL_HOOK();
+
CreateExtraControl();
return wxDialog::ShowModal();
void wxFileDialog::SetPath(const wxString& path)
{
+ wxFileDialogBase::SetPath(path);
+
// Don't do anything if no path is specified, in particular don't set the
// path to m_dir below as this would result in opening the dialog in the
// parent directory of this one instead of m_dir itself.
void wxFileDialog::SetDirectory(const wxString& 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;
- }
+ wxFileDialogBase::SetDirectory(dir);
+
+ m_fc.SetDirectory(dir);
}
wxString wxFileDialog::GetDirectory() const
void wxFileDialog::SetFilename(const wxString& name)
{
+ wxFileDialogBase::SetFilename(name);
+
if (HasFdFlag(wxFD_SAVE))
{
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name));
- m_fileName = name;
}
else
return;
}
SetPath(wxFileName(path, name).GetFullPath());
- m_fileName = name;
}
}