From b5ab6d19d38765d196a457bce03f8ea6ff57ff62 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Mon, 1 Aug 2005 16:39:57 +0000 Subject: [PATCH] [wxGTK] wxFileDialog: Use native overwrite confirmation if possible git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/filedlg.cpp | 9 +++++++++ src/gtk1/filedlg.cpp | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index 1293d32fd3..420c2e32c0 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -50,6 +50,10 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) int style = dialog->GetStyle(); gchar* 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 & wxSAVE) && (style & wxOVERWRITE_PROMPT)) { if ( g_file_test(filename, G_FILE_TEST_EXISTS) ) @@ -200,6 +204,11 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(defaultFileName)); + +#if GTK_CHECK_VERSION(2,7,3) + if (!gtk_check_version(2,7,3)) + gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(m_widget), TRUE); +#endif } else { diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp index 1293d32fd3..420c2e32c0 100644 --- a/src/gtk1/filedlg.cpp +++ b/src/gtk1/filedlg.cpp @@ -50,6 +50,10 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) int style = dialog->GetStyle(); gchar* 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 & wxSAVE) && (style & wxOVERWRITE_PROMPT)) { if ( g_file_test(filename, G_FILE_TEST_EXISTS) ) @@ -200,6 +204,11 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(defaultFileName)); + +#if GTK_CHECK_VERSION(2,7,3) + if (!gtk_check_version(2,7,3)) + gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(m_widget), TRUE); +#endif } else { -- 2.47.2