Include tooltip for Filter combo
[geeqie.git] / src / print.cc
index c200afe..323cb63 100644 (file)
@@ -127,7 +127,7 @@ static void font_activated_cb(GtkFontChooser *widget, gchar *fontname, gpointer
 
        g_free(fontname);
 
-       gtk_widget_destroy(GTK_WIDGET(widget));
+       gq_gtk_widget_destroy(GTK_WIDGET(widget));
 }
 #pragma GCC diagnostic pop
 
@@ -143,7 +143,7 @@ static void font_response_cb(GtkDialog *dialog, int response_id, gpointer option
                g_free(font);
                }
 
-       gtk_widget_destroy(GTK_WIDGET(dialog));
+       gq_gtk_widget_destroy(GTK_WIDGET(dialog));
 }
 
 static void print_set_font_cb(GtkWidget *widget, gpointer data)
@@ -406,7 +406,7 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw)
        gq_gtk_box_pack_start(GTK_BOX(subgroup), scrolled, TRUE, TRUE, 5);
        gtk_widget_show(scrolled);
 
-       gtk_container_add(GTK_CONTAINER(scrolled), image_text_template_view);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), image_text_template_view);
        gtk_widget_show(image_text_template_view);
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(image_text_template_view));
@@ -465,7 +465,7 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw)
        g_object_ref(pw->page_text);
 
        gtk_widget_set_tooltip_markup(page_text_view, (_("Text shown on each page of a single or multi-page print job")));
-       gtk_container_add(GTK_CONTAINER(scrolled), page_text_view);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), page_text_view);
        gtk_widget_show(page_text_view);
 
        hbox = pref_box_new(subgroup, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);
@@ -849,6 +849,11 @@ static void end_print_cb(GtkPrintOperation *operation, GtkPrintContext *, gpoint
        g_free(pw);
 }
 
+static void print_response_cb(GtkDialog *dialog, gint, gpointer)
+{
+       gq_gtk_widget_destroy(GTK_WIDGET(dialog));
+}
+
 void print_window_new(FileData *, GList *selection, GList *, GtkWidget *parent)
 {
        GtkWidget *vbox;
@@ -950,7 +955,7 @@ void print_window_new(FileData *, GList *selection, GList *, GtkWidget *parent)
                                                                "%s", error->message);
                g_error_free (error);
 
-               g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
+               g_signal_connect(dialog, "response", G_CALLBACK(print_response_cb), NULL);
 
                gtk_widget_show (dialog);
                }