Replace deprecated gtk_widget_{show,hide} calls
The replacement, gtk_widget_set_visible(), is available since 2.18. There is some code duplication in menu.c that could eventually be unified.
This commit is contained in:
committed by
Geoffrey D. Bennett
parent
fb3429ba6c
commit
2936f110be
@@ -17,7 +17,7 @@ void show_error(GtkWindow *w, char *s) {
|
||||
"%s",
|
||||
s
|
||||
);
|
||||
gtk_widget_show(dialog);
|
||||
gtk_widget_set_visible(dialog, TRUE);
|
||||
|
||||
g_signal_connect(dialog, "response", G_CALLBACK(gtk_window_destroy), NULL);
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ GtkWidget *create_window_iface_none(GtkApplication *app) {
|
||||
GTK_APPLICATION_WINDOW(w), TRUE
|
||||
);
|
||||
add_window_action_map(GTK_WINDOW(w));
|
||||
gtk_widget_show(w);
|
||||
gtk_widget_set_visible(w, TRUE);
|
||||
|
||||
return w;
|
||||
}
|
||||
|
||||
35
src/menu.c
35
src/menu.c
@@ -13,13 +13,10 @@ static void activate_hardware(
|
||||
) {
|
||||
GVariant *state = g_action_get_state(G_ACTION(action));
|
||||
|
||||
int new_state = !g_variant_get_boolean(state);
|
||||
gboolean new_state = !g_variant_get_boolean(state);
|
||||
g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
|
||||
|
||||
if (new_state)
|
||||
gtk_widget_show(window_hardware);
|
||||
else
|
||||
gtk_widget_hide(window_hardware);
|
||||
gtk_widget_set_visible(window_hardware, new_state);
|
||||
}
|
||||
|
||||
static void activate_quit(
|
||||
@@ -39,13 +36,10 @@ static void activate_routing(
|
||||
|
||||
GVariant *state = g_action_get_state(G_ACTION(action));
|
||||
|
||||
int new_state = !g_variant_get_boolean(state);
|
||||
gboolean new_state = !g_variant_get_boolean(state);
|
||||
g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
|
||||
|
||||
if (new_state)
|
||||
gtk_widget_show(card->window_routing);
|
||||
else
|
||||
gtk_widget_hide(card->window_routing);
|
||||
gtk_widget_set_visible(card->window_routing, new_state);
|
||||
}
|
||||
|
||||
static void activate_mixer(
|
||||
@@ -57,13 +51,10 @@ static void activate_mixer(
|
||||
|
||||
GVariant *state = g_action_get_state(G_ACTION(action));
|
||||
|
||||
int new_state = !g_variant_get_boolean(state);
|
||||
gboolean new_state = !g_variant_get_boolean(state);
|
||||
g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
|
||||
|
||||
if (new_state)
|
||||
gtk_widget_show(card->window_mixer);
|
||||
else
|
||||
gtk_widget_hide(card->window_mixer);
|
||||
gtk_widget_set_visible(card->window_mixer, new_state);
|
||||
}
|
||||
|
||||
static void activate_levels(
|
||||
@@ -75,13 +66,10 @@ static void activate_levels(
|
||||
|
||||
GVariant *state = g_action_get_state(G_ACTION(action));
|
||||
|
||||
int new_state = !g_variant_get_boolean(state);
|
||||
gboolean new_state = !g_variant_get_boolean(state);
|
||||
g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
|
||||
|
||||
if (new_state)
|
||||
gtk_widget_show(card->window_levels);
|
||||
else
|
||||
gtk_widget_hide(card->window_levels);
|
||||
gtk_widget_set_visible(card->window_levels, new_state);
|
||||
}
|
||||
|
||||
static void activate_startup(
|
||||
@@ -93,13 +81,10 @@ static void activate_startup(
|
||||
|
||||
GVariant *state = g_action_get_state(G_ACTION(action));
|
||||
|
||||
int new_state = !g_variant_get_boolean(state);
|
||||
gboolean new_state = !g_variant_get_boolean(state);
|
||||
g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
|
||||
|
||||
if (new_state)
|
||||
gtk_widget_show(card->window_startup);
|
||||
else
|
||||
gtk_widget_hide(card->window_startup);
|
||||
gtk_widget_set_visible(card->window_startup, new_state);
|
||||
}
|
||||
|
||||
static const GActionEntry app_entries[] = {
|
||||
|
||||
@@ -67,7 +67,7 @@ void create_card_window(struct alsa_card *card) {
|
||||
GTK_WINDOW(card->window_main),
|
||||
card->window_main_contents
|
||||
);
|
||||
gtk_widget_show(card->window_main);
|
||||
gtk_widget_set_visible(card->window_main, TRUE);
|
||||
}
|
||||
|
||||
void create_no_card_window(void) {
|
||||
|
||||
Reference in New Issue
Block a user