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

Avoid more warnings when compiling with Gtk+ 3.0

Browse Source
This commit is contained in:
Pierre Pronchery 2014-03-29 20:37:30 +01:00
parent 7432a86b9d
commit fdbc0f891c
1 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/desktop.c
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2007-2013 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2007-2014 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Desktop Browser */ /* This file is part of DeforaOS Desktop Browser */
/* This program is free software: you can redistribute it and/or modify /* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -1678,6 +1678,10 @@ static void _desktop_draw_background(Desktop * desktop, GdkColor * color,
gint n = 1; gint n = 1;
gint i; gint i;
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s(\"%s\", %u, %s)\n", __func__, filename, how,
extend ? "TRUE" : "FALSE");
#endif
if(how == DESKTOP_HOW_NONE) if(how == DESKTOP_HOW_NONE)
return; return;
/* draw default color */ /* draw default color */
@ -1934,7 +1938,11 @@ static void _preferences_background(Desktop * desktop, GtkWidget * notebook)
#endif #endif
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4);
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Default color: ")); label = gtk_label_new(_("Default color: "));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_size_group_add_widget(group, label); gtk_size_group_add_widget(group, label);
@ -1942,7 +1950,11 @@ static void _preferences_background(Desktop * desktop, GtkWidget * notebook)
desktop->pr_color = gtk_color_button_new(); desktop->pr_color = gtk_color_button_new();
gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_color, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_color, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Wallpaper: ")); label = gtk_label_new(_("Wallpaper: "));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_size_group_add_widget(group, label); gtk_size_group_add_widget(group, label);
@ -1971,7 +1983,11 @@ static void _preferences_background(Desktop * desktop, GtkWidget * notebook)
gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_background, TRUE, TRUE, gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_background, TRUE, TRUE,
0); 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Position: ")); label = gtk_label_new(_("Position: "));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_size_group_add_widget(group, label); gtk_size_group_add_widget(group, label);
@ -2029,7 +2045,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook)
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4);
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* icons */ /* icons */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Layout: ")); label = gtk_label_new(_("Layout: "));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_size_group_add_widget(group, label); gtk_size_group_add_widget(group, label);
@ -2052,7 +2072,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook)
gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ilayout, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ilayout, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* monitor */ /* monitor */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Monitor: ")); label = gtk_label_new(_("Monitor: "));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_size_group_add_widget(group, label); gtk_size_group_add_widget(group, label);
@ -2065,7 +2089,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook)
gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_imonitor, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_imonitor, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* background color */ /* background color */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Background color: ")); label = gtk_label_new(_("Background color: "));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_size_group_add_widget(group, label); gtk_size_group_add_widget(group, label);
@ -2074,7 +2102,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook)
gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ibcolor, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ibcolor, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* foreground color */ /* foreground color */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Foreground color: ")); label = gtk_label_new(_("Foreground color: "));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_size_group_add_widget(group, label); gtk_size_group_add_widget(group, label);
@ -2083,7 +2115,11 @@ static void _preferences_icons(Desktop * desktop, GtkWidget * notebook)
gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ifcolor, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_ifcolor, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* font */ /* font */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Font: ")); label = gtk_label_new(_("Font: "));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_size_group_add_widget(group, label); gtk_size_group_add_widget(group, label);
@ -2112,7 +2148,11 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook)
#endif #endif
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4);
/* selector */ /* selector */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Monitor: ")); label = gtk_label_new(_("Monitor: "));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_size_group_add_widget(group, label); gtk_size_group_add_widget(group, label);
@ -2125,7 +2165,11 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook)
gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_monitors, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), desktop->pr_monitors, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* geometry */ /* geometry */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Resolution: ")); label = gtk_label_new(_("Resolution: "));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_size_group_add_widget(group, label); gtk_size_group_add_widget(group, label);
@ -2136,7 +2180,11 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook)
0); 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* size */ /* size */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(_("Size: ")); label = gtk_label_new(_("Size: "));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_size_group_add_widget(group, label); gtk_size_group_add_widget(group, label);
@ -2147,7 +2195,11 @@ static void _preferences_monitors(Desktop * desktop, GtkWidget * notebook)
0); 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, TRUE, 0);
/* refresh */ /* refresh */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
#endif
label = gtk_label_new(NULL); label = gtk_label_new(NULL);
gtk_size_group_add_widget(group, label); gtk_size_group_add_widget(group, label);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);