[libgda] Replace (deprecated) gtk_widget_modify_base/bg().
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Replace (deprecated) gtk_widget_modify_base/bg().
- Date: Mon, 4 Jul 2011 11:48:45 +0000 (UTC)
commit b7155127bde857dfa75c9b9dc8d7857fffdafe64
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Jul 4 13:45:07 2011 +0200
Replace (deprecated) gtk_widget_modify_base/bg().
Use gtk_widget_override_background_color() instead.
This does not replace all uses, because one depends on copying a
GtkStyle, but I cannot find an equivalent for GtkStyleContext.
control-center/cc-gray-bar.c | 7 +++--
libgda-ui/gdaui-cloud.c | 10 ++++----
tools/browser/query-exec/query-editor.c | 34 ++++++++++++++----------------
3 files changed, 25 insertions(+), 26 deletions(-)
---
diff --git a/control-center/cc-gray-bar.c b/control-center/cc-gray-bar.c
index 7b78a19..b8172c4 100644
--- a/control-center/cc-gray-bar.c
+++ b/control-center/cc-gray-bar.c
@@ -188,15 +188,16 @@ static void
cc_gray_bar_style_set (GtkWidget *w, GtkStyle *previous_style)
{
static int in_style_set = 0;
- GtkStyle *style;
+ GtkStyleContext *style_context = gtk_widget_get_style_context (w);
if (in_style_set > 0)
return;
in_style_set ++;
- style = gtk_rc_get_style (GTK_WIDGET (w));
- gtk_widget_modify_bg (GTK_WIDGET (w), GTK_STATE_NORMAL, &style->bg[GTK_STATE_ACTIVE]);
+ GdkRGBA color;
+ gtk_style_context_get_background_color (style_context, GTK_STATE_FLAG_ACTIVE, &color);
+ gtk_widget_override_background_color (GTK_WIDGET (w), GTK_STATE_FLAG_NORMAL, &color);
in_style_set --;
diff --git a/libgda-ui/gdaui-cloud.c b/libgda-ui/gdaui-cloud.c
index 474edf6..a08a5a6 100644
--- a/libgda-ui/gdaui-cloud.c
+++ b/libgda-ui/gdaui-cloud.c
@@ -125,11 +125,11 @@ static void
cloud_map (GtkWidget *widget)
{
GTK_WIDGET_CLASS (parent_class)->map (widget);
- GtkStyle *style;
- GdkColor color;
- style = gtk_widget_get_style (widget);
- color = style->bg[GTK_STATE_NORMAL];
- gtk_widget_modify_base (GDAUI_CLOUD (widget)->priv->tview, GTK_STATE_NORMAL, &color);
+ GtkStyleContext *style_context;
+ GdkRGBA color;
+ style_context = gtk_widget_get_style_context (widget);
+ gtk_style_context_get_background_color (style_context, GTK_STATE_FLAG_NORMAL, &color);
+ gtk_widget_override_background_color (GDAUI_CLOUD (widget)->priv->tview, GTK_STATE_FLAG_NORMAL, &color);
}
static void
diff --git a/tools/browser/query-exec/query-editor.c b/tools/browser/query-exec/query-editor.c
index f3b6f2f..7ca7248 100644
--- a/tools/browser/query-exec/query-editor.c
+++ b/tools/browser/query-exec/query-editor.c
@@ -743,14 +743,13 @@ query_editor_map (GtkWidget *widget)
{
GTK_WIDGET_CLASS (parent_class)->map (widget);
if (QUERY_EDITOR (widget)->priv->mode == QUERY_EDITOR_HISTORY) {
- GtkStyle *style;
- GdkColor color;
- style = gtk_widget_get_style (widget);
- color = style->bg[GTK_STATE_NORMAL];
- color.red += (65535 - color.red) / COLOR_ALTER_FACTOR;
- color.green += (65535 - color.green) / COLOR_ALTER_FACTOR;
- color.blue += (65535 - color.blue) / COLOR_ALTER_FACTOR;
- gtk_widget_modify_base (QUERY_EDITOR (widget)->priv->text, GTK_STATE_NORMAL, &color);
+ GtkStyleContext* style_context = gtk_widget_get_style_context (widget);
+ GdkRGBA color;
+ gtk_style_context_get_background_color (style_context, GTK_STATE_FLAG_NORMAL, &color);
+ color.red += (1.0 - color.red) / COLOR_ALTER_FACTOR;
+ color.green += (1.0 - color.green) / COLOR_ALTER_FACTOR;
+ color.blue += (1.0 - color.blue) / COLOR_ALTER_FACTOR;
+ gtk_widget_override_background_color (QUERY_EDITOR (widget)->priv->text, GTK_STATE_FLAG_NORMAL, &color);
}
}
@@ -935,21 +934,20 @@ query_editor_set_mode (QueryEditor *editor, QueryEditorMode mode)
}
if (mode == QUERY_EDITOR_HISTORY) {
- GtkStyle *style;
- GdkColor color;
- style = gtk_widget_get_style ((GtkWidget*) editor);
- color = style->bg[GTK_STATE_NORMAL];
- color.red += (65535 - color.red) / COLOR_ALTER_FACTOR;
- color.green += (65535 - color.green) / COLOR_ALTER_FACTOR;
- color.blue += (65535 - color.blue) / COLOR_ALTER_FACTOR;
- gtk_widget_modify_base (editor->priv->text, GTK_STATE_NORMAL, &color);
+ GtkStyleContext *style_context = gtk_widget_get_style_context (GTK_WIDGET (editor));
+ GdkRGBA color;
+ gtk_style_context_get_background_color (style_context, GTK_STATE_FLAG_NORMAL, &color);
+ color.red += (1.0 - color.red) / COLOR_ALTER_FACTOR;
+ color.green += (1.0 - color.green) / COLOR_ALTER_FACTOR;
+ color.blue += (1.0 - color.blue) / COLOR_ALTER_FACTOR;
+ gtk_widget_override_background_color (editor->priv->text, GTK_STATE_FLAG_NORMAL, &color);
editor->priv->hash = g_hash_table_new_full (NULL, NULL, NULL,
(GDestroyNotify) hist_item_data_unref);
}
else {
- gtk_widget_modify_base (editor->priv->text,
- GTK_STATE_NORMAL, NULL);
+ gtk_widget_override_background_color (editor->priv->text,
+ GTK_STATE_FLAG_NORMAL, NULL);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]