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

Simplify Gtk+ 3 support

Browse Source
This commit is contained in:
Pierre Pronchery 2015-10-27 23:16:42 +01:00
parent 3ea112ede1
commit cb4d67c2fd
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/camera.c
View File

@ -233,11 +233,7 @@ Camera * camera_new(GtkWidget * window, GtkAccelGroup * group,
camera->bold = pango_font_description_new(); camera->bold = pango_font_description_new();
pango_font_description_set_weight(camera->bold, PANGO_WEIGHT_BOLD); pango_font_description_set_weight(camera->bold, PANGO_WEIGHT_BOLD);
camera->gc = gdk_gc_new(window->window); /* XXX */ camera->gc = gdk_gc_new(window->window); /* XXX */
#if GTK_CHECK_VERSION(3, 0, 0)
camera->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); camera->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#else
camera->widget = gtk_vbox_new(FALSE, 0);
#endif
vbox = camera->widget; vbox = camera->widget;
/* toolbar */ /* toolbar */
widget = desktop_toolbar_create(_camera_toolbar, camera, group); widget = desktop_toolbar_create(_camera_toolbar, camera, group);
@ -666,11 +662,7 @@ static void _preferences_window(Camera * camera)
_preferences_on_response), camera); _preferences_on_response), camera);
notebook = gtk_notebook_new(); notebook = gtk_notebook_new();
/* picture */ /* picture */
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4);
#endif
camera->pr_hflip = gtk_check_button_new_with_mnemonic( camera->pr_hflip = gtk_check_button_new_with_mnemonic(
_("Flip _horizontally")); _("Flip _horizontally"));
gtk_box_pack_start(GTK_BOX(vbox), camera->pr_hflip, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), camera->pr_hflip, FALSE, TRUE, 0);
@ -681,11 +673,7 @@ static void _preferences_window(Camera * camera)
_("Keep aspect _ratio")); _("Keep aspect _ratio"));
gtk_box_pack_start(GTK_BOX(vbox), camera->pr_ratio, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), camera->pr_ratio, FALSE, TRUE, 0);
/* interpolation */ /* interpolation */
#if GTK_CHECK_VERSION(3, 0, 0)
widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
widget = gtk_hbox_new(FALSE, 4);
#endif
gtk_box_pack_start(GTK_BOX(widget), gtk_label_new(_("Interpolation: ")), gtk_box_pack_start(GTK_BOX(widget), gtk_label_new(_("Interpolation: ")),
FALSE, TRUE, 0); FALSE, TRUE, 0);
store = gtk_list_store_new(2, G_TYPE_UINT, G_TYPE_STRING); store = gtk_list_store_new(2, G_TYPE_UINT, G_TYPE_STRING);
@ -706,17 +694,9 @@ static void _preferences_window(Camera * camera)
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,
gtk_label_new(_("Picture"))); gtk_label_new(_("Picture")));
/* snapshots */ /* snapshots */
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4);
#endif
/* format */ /* format */
#if GTK_CHECK_VERSION(3, 0, 0)
widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
widget = gtk_hbox_new(FALSE, 4);
#endif
gtk_box_pack_start(GTK_BOX(widget), gtk_label_new(_("Format: ")), gtk_box_pack_start(GTK_BOX(widget), gtk_label_new(_("Format: ")),
FALSE, TRUE, 0); FALSE, TRUE, 0);
store = gtk_list_store_new(2, G_TYPE_UINT, G_TYPE_STRING); store = gtk_list_store_new(2, G_TYPE_UINT, G_TYPE_STRING);
@ -807,11 +787,7 @@ static GtkWidget * _properties_label(Camera * camera, 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); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new(label); widget = gtk_label_new(label);
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_override_font(widget, camera->bold); gtk_widget_override_font(widget, camera->bold);