diff options
| author | Stefano Karapetsas <[email protected]> | 2014-01-21 17:11:27 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-01-21 17:11:27 +0100 |
| commit | e4540e7be4b396c8b1bb34157c105e172ccdf0a1 (patch) | |
| tree | 746a48a9c7256268879e5c48b5fe31d2e94d5af7 /shell/ev-annotation-properties-dialog.c | |
| parent | 75173c8f5ebdac9a095a466af602d6b07324029f (diff) | |
| download | atril-e4540e7be4b396c8b1bb34157c105e172ccdf0a1.tar.bz2 atril-e4540e7be4b396c8b1bb34157c105e172ccdf0a1.tar.xz | |
shell: Add GTK3 support
Diffstat (limited to 'shell/ev-annotation-properties-dialog.c')
| -rw-r--r-- | shell/ev-annotation-properties-dialog.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/shell/ev-annotation-properties-dialog.c b/shell/ev-annotation-properties-dialog.c index 837d6164..40f8a972 100644 --- a/shell/ev-annotation-properties-dialog.c +++ b/shell/ev-annotation-properties-dialog.c @@ -100,17 +100,17 @@ ev_annotation_properties_dialog_constructed (GObject *object) GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (label); - dialog->icon = gtk_combo_box_new_text (); - gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Note")); - gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Comment")); - gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Key")); - gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Help")); - gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("New Paragraph")); - gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Paragraph")); - gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Insert")); - gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Cross")); - gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Circle")); - gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->icon), _("Unknown")); + dialog->icon = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Note")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Comment")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Key")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Help")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("New Paragraph")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Paragraph")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Insert")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Cross")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Circle")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->icon), _("Unknown")); gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->icon), 0); gtk_table_attach (GTK_TABLE (table), dialog->icon, 1, 2, 5, 6, @@ -139,7 +139,9 @@ ev_annotation_properties_dialog_init (EvAnnotationPropertiesDialog *annot_dialog gtk_window_set_title (GTK_WINDOW (annot_dialog), _("Annotation Properties")); gtk_window_set_destroy_with_parent (GTK_WINDOW (annot_dialog), TRUE); gtk_container_set_border_width (GTK_CONTAINER (annot_dialog), 5); +#if !GTK_CHECK_VERSION (3, 0, 0) gtk_dialog_set_has_separator (dialog, FALSE); +#endif gtk_dialog_add_buttons (dialog, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, @@ -222,9 +224,9 @@ ev_annotation_properties_dialog_init (EvAnnotationPropertiesDialog *annot_dialog GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (label); - annot_dialog->popup_state = gtk_combo_box_new_text (); - gtk_combo_box_append_text (GTK_COMBO_BOX (annot_dialog->popup_state), _("Open")); - gtk_combo_box_append_text (GTK_COMBO_BOX (annot_dialog->popup_state), _("Close")); + annot_dialog->popup_state = gtk_combo_box_text_new (); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (annot_dialog->popup_state), _("Open")); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (annot_dialog->popup_state), _("Close")); gtk_combo_box_set_active (GTK_COMBO_BOX (annot_dialog->popup_state), 1); gtk_table_attach (GTK_TABLE (table), annot_dialog->popup_state, 1, 2, 4, 5, |