summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2011-03-22 01:31:48 +0000
committerjstebbins <[email protected]>2011-03-22 01:31:48 +0000
commit36a97492d3a09e579077a6ea96c5a4585154590b (patch)
tree4f3c5e10e8591eeca819ec54680182f2aa5c7d17
parent8af0a82a5e85c29663f56092e148c54680e17bf7 (diff)
LinGui: Remove use of deprecated GTK_WIDGET_VISIBLE macro
Replace with gtk_widget_get_visible() git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3866 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--gtk/src/ghbcompositor.c15
-rw-r--r--gtk/src/preview.c8
2 files changed, 13 insertions, 10 deletions
diff --git a/gtk/src/ghbcompositor.c b/gtk/src/ghbcompositor.c
index 2da37c6da..eb46cde50 100644
--- a/gtk/src/ghbcompositor.c
+++ b/gtk/src/ghbcompositor.c
@@ -225,8 +225,11 @@ ghb_compositor_set_child_property(
break;
}
- if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (compositor))
+ if (gtk_widget_get_visible (child) &&
+ gtk_widget_get_visible (GTK_WIDGET(compositor)))
+ {
gtk_widget_queue_resize (child);
+ }
}
@@ -415,12 +418,12 @@ ghb_compositor_remove(GtkContainer *container, GtkWidget *child)
cc = (GhbCompositorChild*)link->data;
if (cc->widget == child)
{
- gboolean was_visible = GTK_WIDGET_VISIBLE( child );
+ gboolean was_visible = gtk_widget_get_visible( child );
gtk_widget_unparent(child);
compositor->children = g_list_remove(compositor->children, child);
g_free(child);
- if (was_visible && GTK_WIDGET_VISIBLE (container))
+ if (was_visible && gtk_widget_get_visible (GTK_WIDGET(container)))
gtk_widget_queue_resize(GTK_WIDGET(container));
break;
}
@@ -538,7 +541,7 @@ ghb_compositor_size_request(
for (link = compositor->children; link != NULL; link = link->next)
{
cc = (GhbCompositorChild*)link->data;
- if (GTK_WIDGET_VISIBLE(cc->widget))
+ if (gtk_widget_get_visible(cc->widget))
{
gtk_widget_size_request(cc->widget, NULL);
gtk_widget_get_child_requisition(cc->widget, &child_requisition);
@@ -621,8 +624,8 @@ ghb_compositor_blend (GtkWidget *widget, GdkEventExpose *event)
{
/* get our child */
child = GTK_WIDGET(draw->data);
- if (!GTK_WIDGET_VISIBLE(cc->widget) ||
- !GTK_WIDGET_VISIBLE(child))
+ if (!gtk_widget_get_visible(cc->widget) ||
+ !gtk_widget_get_visible(child))
continue;
/* the source data is the (composited) event box */
diff --git a/gtk/src/preview.c b/gtk/src/preview.c
index 39cf014a3..1023ade6d 100644
--- a/gtk/src/preview.c
+++ b/gtk/src/preview.c
@@ -1158,7 +1158,7 @@ preview_motion_cb(
g_source_destroy(source);
}
widget = GHB_WIDGET(ud->builder, "preview_hud");
- if (!GTK_WIDGET_VISIBLE(widget))
+ if (!gtk_widget_get_visible(widget))
{
gtk_widget_show(widget);
}
@@ -1222,7 +1222,7 @@ preview_hud_size_alloc_cb(
GdkDrawable *shape;
//g_message("preview_hud_size_alloc_cb()");
- if (GTK_WIDGET_VISIBLE(widget) && allocation->height > 50)
+ if (gtk_widget_get_visible(widget) && allocation->height > 50)
{
shape = ghb_curved_rect_mask(allocation->width,
allocation->height, allocation->height/4);
@@ -1243,7 +1243,7 @@ preview_configure_cb(
gint x, y;
//g_message("preview_configure_cb()");
- if (GTK_WIDGET_VISIBLE(widget))
+ if (gtk_widget_get_visible(widget))
{
gtk_window_get_position(GTK_WINDOW(widget), &x, &y);
ghb_settings_set_int(ud->settings, "preview_x", x);
@@ -1264,7 +1264,7 @@ settings_configure_cb(
gint x, y;
//g_message("settings_configure_cb()");
- if (GTK_WIDGET_VISIBLE(widget))
+ if (gtk_widget_get_visible(widget))
{
gtk_window_get_position(GTK_WINDOW(widget), &x, &y);
ghb_settings_set_int(ud->settings, "settings_x", x);