DeforaOS/Editor
DeforaOS/Editor
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid some warnings when building with Gtk+ >= 3.0

Browse Source
This commit is contained in:
Pierre Pronchery 2014-04-06 15:57:25 +02:00
parent a3b2cff03f
commit 88ecab3fe7
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/editor.c
View File

@ -328,7 +328,11 @@ Editor * editor_new(EditorPrefs * prefs)
G_CALLBACK(on_closex), editor); G_CALLBACK(on_closex), editor);
editor->bold = pango_font_description_new(); editor->bold = pango_font_description_new();
pango_font_description_set_weight(editor->bold, PANGO_WEIGHT_BOLD); pango_font_description_set_weight(editor->bold, PANGO_WEIGHT_BOLD);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
#endif
/* menubar */ /* menubar */
#ifndef EMBEDDED #ifndef EMBEDDED
widget = desktop_menubar_create(editor->prefs.filter widget = desktop_menubar_create(editor->prefs.filter
@ -374,7 +378,11 @@ Editor * editor_new(EditorPrefs * prefs)
gtk_container_add(GTK_CONTAINER(widget), editor->view); gtk_container_add(GTK_CONTAINER(widget), editor->view);
gtk_box_pack_start(GTK_BOX(vbox), widget, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), widget, TRUE, TRUE, 0);
/* find */ /* find */
#if GTK_CHECK_VERSION(3, 0, 0)
editor->fi_dialog = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
editor->fi_dialog = gtk_hbox_new(FALSE, 4); editor->fi_dialog = gtk_hbox_new(FALSE, 4);
#endif
hbox = editor->fi_dialog; hbox = editor->fi_dialog;
gtk_container_set_border_width(GTK_CONTAINER(hbox), 4); gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
widget = gtk_label_new(_("Find:")); widget = gtk_label_new(_("Find:"));
@ -1110,7 +1118,11 @@ void editor_show_preferences(Editor * editor, gboolean show)
#endif #endif
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* font */ /* font */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new(_("Font:")); widget = gtk_label_new(_("Font:"));
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -1120,7 +1132,11 @@ void editor_show_preferences(Editor * editor, gboolean show)
gtk_box_pack_start(GTK_BOX(hbox), editor->pr_font, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), editor->pr_font, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
/* wrap mode */ /* wrap mode */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new(_("Wrap mode:")); widget = gtk_label_new(_("Wrap mode:"));
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
@ -1272,7 +1288,11 @@ static GtkWidget * _properties_widget(Editor * editor, GtkSizeGroup * group,
GtkWidget * hbox; GtkWidget * hbox;
GtkWidget * widget; GtkWidget * widget;
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new(label); widget = gtk_label_new(label);
gtk_widget_modify_font(widget, editor->bold); gtk_widget_modify_font(widget, editor->bold);
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);