X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ce68f7fc03beda6b7cbfdd7180a8f7f7eee952d..e413198572959f013fc2537a3c8cc184c9ac820d:/src/gtk/filedlg.cpp?ds=inline diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index f7f6d51fb7..d7a2d8a57e 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -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; + } } } @@ -131,11 +133,25 @@ static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser, } // extern "C" -static void wxInsertChildInFileDialog(wxWindow* WXUNUSED(parent), - wxWindow* WXUNUSED(child)) +//----------------------------------------------------------------------------- +// "size_request" from m_extraControl +//----------------------------------------------------------------------------- + +extern "C" { +static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, wxWindow* win) { + // allow dialog to be resized smaller horizontally + req->width = win->GetMinWidth(); +} } +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 @@ -145,6 +161,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase) BEGIN_EVENT_TABLE(wxFileDialog,wxFileDialogBase) EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk) + EVT_SIZE(wxFileDialog::OnSize) END_EVENT_TABLE() wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, @@ -156,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)) { @@ -197,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 @@ -243,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(); @@ -252,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()); } } @@ -274,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)) { @@ -290,17 +315,7 @@ void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event)) int wxFileDialog::ShowModal() { - if (CreateExtraControl()) - { - GtkWidget *control = m_extraControl->m_widget; - - // see wxNotebook::InsertPage() for explaination - // why gtk_widget_unparent() is not used here - control->parent = NULL; - - gtk_widget_show(control); - gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(m_widget), control); - } + CreateExtraControl(); return wxDialog::ShowModal(); } @@ -311,9 +326,29 @@ void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), { } +void wxFileDialog::OnSize(wxSizeEvent&) +{ + // avoid calling DoLayout(), which will set the (wrong) size of + // m_extraControl, its size is managed by GtkFileChooser +} + 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