[vinagre] Remove deprecated GTK+ API usage in ovBox
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vinagre] Remove deprecated GTK+ API usage in ovBox
- Date: Sun, 25 Sep 2011 10:07:13 +0000 (UTC)
commit 840fdd598442c92fbe4214b557d2303255b7d0fb
Author: David King <amigadave amigadave com>
Date: Sun Sep 25 10:29:10 2011 +0200
Remove deprecated GTK+ API usage in ovBox
Fixes the remaining build failures in bug 659698.
vinagre/view/ovBox.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/vinagre/view/ovBox.c b/vinagre/view/ovBox.c
index 4159f13..83d392a 100644
--- a/vinagre/view/ovBox.c
+++ b/vinagre/view/ovBox.c
@@ -331,13 +331,14 @@ static void
ViewOvBoxSetBackground(ViewOvBox *that) // IN
{
GtkWidget *widget;
- GtkStyle *style;
+ GtkStyleContext *context;
widget = GTK_WIDGET(that);
- style = gtk_widget_get_style (widget);
- gtk_style_set_background(style, gtk_widget_get_window(widget), GTK_STATE_NORMAL);
- gtk_style_set_background(style, that->priv->underWin, GTK_STATE_NORMAL);
- gtk_style_set_background(style, that->priv->overWin, GTK_STATE_NORMAL);
+ context = gtk_widget_get_style_context (widget);
+ gtk_style_context_set_state(context, GTK_STATE_FLAG_NORMAL);
+ gtk_style_context_set_background(context, gtk_widget_get_window(widget));
+ gtk_style_context_set_background(context, that->priv->underWin);
+ gtk_style_context_set_background(context, that->priv->overWin);
}
@@ -387,7 +388,6 @@ ViewOvBoxRealize(GtkWidget *widget) // IN
&attributes, mask);
gtk_widget_set_window(widget, window);
gdk_window_set_user_data(window, that);
- gtk_widget_set_style(widget, gtk_style_attach(gtk_widget_get_style(widget), window));
/*
* The order in which we create the children X window matters: the child
@@ -491,8 +491,8 @@ ViewOvBoxSizeRequest(GtkWidget *widget, // IN
that = VIEW_OV_BOX(widget);
priv = that->priv;
- gtk_widget_size_request(priv->under, &underR);
- gtk_widget_size_request(priv->over, &priv->overR);
+ gtk_widget_get_preferred_size(priv->under, &underR, NULL);
+ gtk_widget_get_preferred_size(priv->over, &priv->overR, NULL);
gtk_container_child_get(GTK_CONTAINER(that), priv->over,
"expand", &expand,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]