#include "wx/filename.h" // wxFilename
#include "wx/tokenzr.h" // wxStringTokenizer
#include "wx/filefn.h" // ::wxGetCwd
-
-//-----------------------------------------------------------------------------
-// "clicked" for OK-button
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
-{
- int style = dialog->GetWindowStyle();
- 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)
-#if GTK_CHECK_VERSION(2,7,3)
- if (gtk_check_version(2, 7, 3) != NULL)
-#endif
- {
- if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT))
- {
- if ( g_file_test(filename, G_FILE_TEST_EXISTS) )
- {
- wxString msg;
-
- msg.Printf(
- _("File '%s' already exists, do you really want to overwrite it?"),
- wxString::FromUTF8(filename));
-
- wxMessageDialog dlg(dialog, msg, _("Confirm"),
- wxYES_NO | wxICON_QUESTION);
- if (dlg.ShowModal() != wxID_YES)
- return;
- }
- }
- }
-
- if (style & wxFD_FILE_MUST_EXIST)
- {
- if ( !g_file_test(filename, G_FILE_TEST_EXISTS) )
- {
- wxMessageDialog dlg( dialog, _("Please choose an existing file."),
- _("Error"), wxOK| wxICON_ERROR);
- dlg.ShowModal();
- return;
- }
- }
-
- // change to the directory where the user went if asked
- if (style & wxFD_CHANGE_DIR)
- {
- // Use chdir to not care about filename encodings
- wxGtkString folder(g_path_get_dirname(filename));
- chdir(folder);
- }
-
- wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
- event.SetEventObject(dialog);
- dialog->HandleWindowEvent(event);
-}
-}
-
-//-----------------------------------------------------------------------------
-// "clicked" for Cancel-button
-//-----------------------------------------------------------------------------
+#include "wx/testing.h"
extern "C"
{
-
-static void
-gtk_filedialog_cancel_callback(GtkWidget * WXUNUSED(w), wxFileDialog *dialog)
-{
- wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
- event.SetEventObject(dialog);
- dialog->HandleWindowEvent(event);
-}
-
-static void gtk_filedialog_response_callback(GtkWidget *w,
+static void gtk_filedialog_response_callback(GtkWidget * WXUNUSED(w),
gint response,
wxFileDialog *dialog)
{
if (response == GTK_RESPONSE_ACCEPT)
- gtk_filedialog_ok_callback(w, dialog);
+ dialog->GTKOnAccept();
else // GTK_RESPONSE_CANCEL or GTK_RESPONSE_NONE
- gtk_filedialog_cancel_callback(w, dialog);
+ dialog->GTKOnCancel();
}
static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser,
} // extern "C"
-//-----------------------------------------------------------------------------
-// "size_request" from m_extraControl
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, wxWindow* win)
+void wxFileDialog::AddChildGTK(wxWindowGTK* child)
{
// allow dialog to be resized smaller horizontally
- req->width = win->GetMinWidth();
-}
-}
+ gtk_widget_set_size_request(
+ child->m_widget, child->GetMinWidth(), child->m_height);
-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(m_widget), child->m_widget);
}
IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase)
BEGIN_EVENT_TABLE(wxFileDialog,wxFileDialogBase)
- EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk)
EVT_SIZE(wxFileDialog::OnSize)
END_EVENT_TABLE()
const wxSize& sz,
const wxString& name)
: wxFileDialogBase()
+{
+ Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name);
+}
+
+bool wxFileDialog::Create(wxWindow *parent, const wxString& message,
+ const wxString& defaultDir,
+ const wxString& defaultFileName,
+ const wxString& wildCard,
+ long style, const wxPoint& pos,
+ const wxSize& sz,
+ const wxString& name)
{
parent = GetParentForModalDialog(parent, style);
if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName,
wildCard, style, pos, sz, name))
{
- return;
+ return false;
}
if (!PreCreation(parent, pos, wxDefaultSize) ||
wxDefaultValidator, wxT("filedialog")))
{
wxFAIL_MSG( wxT("wxFileDialog creation failed") );
- return;
+ return false;
}
GtkFileChooserAction gtk_action;
const wxString dir = fn.GetPath();
if ( !dir.empty() )
{
- gtk_file_chooser_set_current_folder(file_chooser, dir.fn_str());
+ gtk_file_chooser_set_current_folder(file_chooser, wxGTK_CONV_FN(dir));
}
const wxString fname = fn.GetFullName();
{
if ( !fname.empty() )
{
- gtk_file_chooser_set_current_name(file_chooser, fname.fn_str());
+ gtk_file_chooser_set_current_name(file_chooser, wxGTK_CONV_FN(fname));
}
#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
if ( !fname.empty() )
{
gtk_file_chooser_set_filename(file_chooser,
- fn.GetFullPath().fn_str());
+ wxGTK_CONV_FN(fn.GetFullPath()));
}
}
G_CALLBACK(gtk_filedialog_update_preview_callback),
previewImage);
}
+
+ return true;
}
wxFileDialog::~wxFileDialog()
GTK_FILE_CHOOSER(m_widget), NULL);
}
}
-
-void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
+void wxFileDialog::GTKOnAccept()
{
+ int style = GetWindowStyle();
+ wxString filename = m_fc.GetPath();
+ m_selectedDirectory = m_fc.GetDirectory();
+
+ // 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
+ {
+ if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT))
+ {
+ if ( g_file_test(filename.utf8_str(), G_FILE_TEST_EXISTS) )
+ {
+ wxString msg;
+
+ msg.Printf(
+ _("File '%s' already exists, do you really want to overwrite it?"),
+ wxString::FromUTF8(filename.utf8_str()));
+
+ wxMessageDialog dlg(this, msg, _("Confirm"),
+ wxYES_NO | wxICON_QUESTION);
+ if (dlg.ShowModal() != wxID_YES)
+ return;
+ }
+ }
+ }
+#endif
+
+ if (style & wxFD_FILE_MUST_EXIST)
+ {
+ if ( !g_file_test(filename.utf8_str(), G_FILE_TEST_EXISTS) )
+ {
+ wxMessageDialog dlg( this, _("Please choose an existing file."),
+ _("Error"), wxOK| wxICON_ERROR);
+ dlg.ShowModal();
+ return;
+ }
+ }
+
+ // change to the directory where the user went if asked
+ if (style & wxFD_CHANGE_DIR)
+ {
+ // Use chdir to not care about filename encodings
+ wxGtkString folder(g_path_get_dirname(filename.utf8_str()));
+ chdir(folder);
+ }
EndDialog(wxID_OK);
}
+void wxFileDialog::GTKOnCancel()
+{
+ EndDialog(wxID_CANCEL);
+}
+
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.
+ if ( path.empty() )
+ return;
+
// we need an absolute path for GTK native chooser so ensure that we have
- // it
+ // 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();
+ fn.MakeAbsolute(m_dir);
m_fc.SetPath(fn.GetFullPath());
}
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);
+ m_selectedDirectory = dir;
}
wxString wxFileDialog::GetDirectory() const
{
- 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;
+ return m_selectedDirectory;
}
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;
}
}
projects / wxWidgets.git / blobdiff