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

Avoiding some more warnings when compiling with Gtk+ 3.0

Browse Source
This commit is contained in:
Pierre Pronchery 2013-03-01 00:51:25 +01:00
parent 3366404b7b
commit 1a211d9c95
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mixer.c
View File

@ -418,7 +418,11 @@ Mixer * mixer_new(char const * device, MixerLayout layout, gboolean embedded)
} }
if(control == NULL) if(control == NULL)
continue; continue;
# if GTK_CHECK_VERSION(3, 0, 0)
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
# else
vbox2 = gtk_vbox_new(FALSE, 4); vbox2 = gtk_vbox_new(FALSE, 4);
# endif
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4); gtk_container_set_border_width(GTK_CONTAINER(vbox2), 4);
gtk_box_pack_start(GTK_BOX(vbox2), control, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox2), control, TRUE, TRUE, 0);
label = _new_frame_label(NULL, md.label.name, NULL); label = _new_frame_label(NULL, md.label.name, NULL);
@ -613,7 +617,11 @@ static GtkWidget * _new_enum(Mixer * mixer, int dev,
free(mc); free(mc);
return NULL; return NULL;
} }
# if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
# else
vbox = gtk_vbox_new(TRUE, 0); vbox = gtk_vbox_new(TRUE, 0);
# endif
for(i = 0; i < e->num_mem; i++) for(i = 0; i < e->num_mem; i++)
{ {
widget = gtk_radio_button_new_with_label(group, widget = gtk_radio_button_new_with_label(group,
@ -650,11 +658,11 @@ static GtkWidget * _new_mute(Mixer * mixer, int dev,
free(mc); free(mc);
return NULL; return NULL;
} }
#if GTK_CHECK_VERSION(3, 0, 0) # if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else # else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif # endif
widget = gtk_image_new_from_icon_name("audio-volume-muted", widget = gtk_image_new_from_icon_name("audio-volume-muted",
GTK_ICON_SIZE_BUTTON); GTK_ICON_SIZE_BUTTON);
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
@ -686,7 +694,11 @@ static GtkWidget * _new_set(Mixer * mixer, int dev, struct audio_mixer_set * s)
free(mc); free(mc);
return NULL; return NULL;
} }
# if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
# else
vbox = gtk_vbox_new(TRUE, 0); vbox = gtk_vbox_new(TRUE, 0);
# endif
for(i = 0; i < s->num_mem; i++) for(i = 0; i < s->num_mem; i++)
{ {
widget = gtk_check_button_new_with_label( widget = gtk_check_button_new_with_label(
@ -765,7 +777,11 @@ static GtkWidget * _new_value(Mixer * mixer, int index, GtkWidget ** bbox)
return hbox; return hbox;
align = gtk_alignment_new(0.5, 0.5, 0.0, 1.0); align = gtk_alignment_new(0.5, 0.5, 0.0, 1.0);
gtk_container_add(GTK_CONTAINER(align), hbox); gtk_container_add(GTK_CONTAINER(align), hbox);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
#endif
gtk_box_pack_start(GTK_BOX(vbox), align, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), align, TRUE, TRUE, 0);
g_object_set_data(G_OBJECT(bind), "list", list); g_object_set_data(G_OBJECT(bind), "list", list);
gtk_container_add(GTK_CONTAINER(*bbox), bind); gtk_container_add(GTK_CONTAINER(*bbox), bind);