X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38a36cf51782be0a645d3f5a83289d5e702fe3ab..ada175836e7b9e456b7f32d82bfb5f6b21d5608d:/src/gtk/filedlg.cpp diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index 09f353fb7f..b1d189e564 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -10,7 +10,7 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_FILEDLG +#if wxUSE_FILEDLG #include "wx/filedlg.h" @@ -40,22 +40,24 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) // 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) + 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) ) + if ((style & wxFD_SAVE) && (style & wxFD_OVERWRITE_PROMPT)) { - wxString msg; - - msg.Printf( - _("File '%s' already exists, do you really want to overwrite it?"), - wxString(filename, *wxConvFileName)); - - wxMessageDialog dlg(dialog, msg, _("Confirm"), - wxYES_NO | wxICON_QUESTION); - if (dlg.ShowModal() != wxID_YES) - return; + 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(filename, *wxConvFileName)); + + wxMessageDialog dlg(dialog, msg, _("Confirm"), + wxYES_NO | wxICON_QUESTION); + if (dlg.ShowModal() != wxID_YES) + return; + } } } @@ -136,19 +138,21 @@ static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser, //----------------------------------------------------------------------------- extern "C" { -static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, void*) +static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, wxWindow* win) { // allow dialog to be resized smaller horizontally - req->width = 1; + req->width = win->GetMinWidth(); } } -static void wxInsertChildInFileDialog(wxWindow* WXUNUSED(parent), - wxWindow* WXUNUSED(child)) +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); } - //----------------------------------------------------------------------------- // wxFileDialog //----------------------------------------------------------------------------- @@ -169,9 +173,8 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, const wxString& name) : wxFileDialogBase() { - m_insertCallback = wxInsertChildInFileDialog; parent = GetParentForModalDialog(parent); - + if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name)) { @@ -210,22 +213,24 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, ok_btn_stock, GTK_RESPONSE_ACCEPT, NULL); + g_object_ref(m_widget); + GtkFileChooser* file_chooser = GTK_FILE_CHOOSER(m_widget); - m_fc.SetWidget( GTK_FILE_CHOOSER(m_widget) ); + m_fc.SetWidget(file_chooser); gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT); if ( style & wxFD_MULTIPLE ) - gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true); + gtk_file_chooser_set_select_multiple(file_chooser, true); // gtk_widget_hide_on_delete is used here to avoid that Gtk automatically // destroys the dialog when the user press ESC on the dialog: in that case // a second call to ShowModal() would result in a bunch of Gtk-CRITICAL // errors... - g_signal_connect (G_OBJECT(m_widget), + g_signal_connect(m_widget, "delete_event", G_CALLBACK (gtk_widget_hide_on_delete), - (gpointer)this); + this); // local-only property could be set to false to allow non-local files to be // loaded. In that case get/set_uri(s) should be used instead of @@ -256,8 +261,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, const wxString dir = fn.GetPath(); if ( !dir.empty() ) { - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), - dir.fn_str()); + gtk_file_chooser_set_current_folder(file_chooser, dir.fn_str()); } const wxString fname = fn.GetFullName(); @@ -265,20 +269,19 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, { if ( !fname.empty() ) { - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), - fname.fn_str()); + gtk_file_chooser_set_current_name(file_chooser, fname.fn_str()); } #if GTK_CHECK_VERSION(2,7,3) if ((style & wxFD_OVERWRITE_PROMPT) && !gtk_check_version(2,7,3)) - gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(m_widget), TRUE); + gtk_file_chooser_set_do_overwrite_confirmation(file_chooser, true); #endif } else // wxFD_OPEN { if ( !fname.empty() ) { - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(m_widget), + gtk_file_chooser_set_filename(file_chooser, fn.GetFullPath().fn_str()); } } @@ -287,14 +290,23 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, { GtkWidget *previewImage = gtk_image_new(); - gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(m_widget), - previewImage); + gtk_file_chooser_set_preview_widget(file_chooser, previewImage); g_signal_connect(m_widget, "update-preview", G_CALLBACK(gtk_filedialog_update_preview_callback), previewImage); } } +wxFileDialog::~wxFileDialog() +{ + if (m_extraControl) + { + // get chooser to drop its reference right now, allowing wxWindow dtor + // to verify that ref count drops to zero + gtk_file_chooser_set_extra_widget( + GTK_FILE_CHOOSER(m_widget), NULL); + } +} void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event)) { @@ -303,23 +315,13 @@ void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event)) int wxFileDialog::ShowModal() { - if (CreateExtraControl()) - { - GtkWidget *control = m_extraControl->m_widget; - - wxASSERT(control->parent == NULL); - - gtk_widget_show(control); - g_signal_connect_after(control, "size_request", - G_CALLBACK(extra_widget_size_request), NULL); - gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(m_widget), control); - } + CreateExtraControl(); return wxDialog::ShowModal(); } -void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), +void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(sizeFlags)) { } @@ -332,7 +334,21 @@ void wxFileDialog::OnSize(wxSizeEvent&) wxString wxFileDialog::GetPath() const { - return m_fc.GetPath(); + wxFileName fn = m_fc.GetPath(); + + if (HasFdFlag(wxFD_SAVE)) + { + // add extension + if (!fn.HasExt()) + { + wxFileName wildcard( "/dummy", m_fc.GetCurrentWildCard() ); + wxString ext = wildcard.GetExt(); + if (!ext.empty() && (ext.Find('?') == wxNOT_FOUND) && (ext.Find('*') == wxNOT_FOUND)) + fn.SetExt( ext ); + } + } + + return fn.GetFullPath(); } void wxFileDialog::GetFilenames(wxArrayString& files) const @@ -353,30 +369,63 @@ void wxFileDialog::SetMessage(const wxString& message) void wxFileDialog::SetPath(const wxString& path) { + wxCHECK_RET(wxIsAbsolutePath(path), " wxFileDialog::SetPath requires an absolute filepath"); m_fc.SetPath( path ); } void wxFileDialog::SetDirectory(const wxString& dir) { - m_fc.SetDirectory( 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; + } } wxString wxFileDialog::GetDirectory() const { - return m_fc.GetDirectory(); + 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; } void wxFileDialog::SetFilename(const wxString& name) { if (HasFdFlag(wxFD_SAVE)) + { gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(m_widget), wxGTK_CONV(name)); + m_fileName = name; + } + else - SetPath(wxFileName(GetDirectory(), name).GetFullPath()); + { + wxString path( GetDirectory() ); + if (path.empty()) + { + // SetPath() fires an assert if fed other than filepaths + return; + } + SetPath(wxFileName(path, name).GetFullPath()); + m_fileName = name; + } } wxString wxFileDialog::GetFilename() const { - return m_fc.GetFilename(); + wxString currentFilename( m_fc.GetFilename() ); + if (currentFilename.empty()) + { + // m_fc.GetFilename() will return empty until the dialog has been shown + // in which case use any previously provided value + currentFilename = m_fileName; + } + return currentFilename; } void wxFileDialog::SetWildcard(const wxString& wildCard) @@ -395,4 +444,4 @@ int wxFileDialog::GetFilterIndex() const return m_fc.GetFilterIndex(); } -#endif // wxUSE_FILEDLG +#endif // wxUSE_FILEDLG