[gtkhtml] Work around recent GTK+ deprecations.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkhtml] Work around recent GTK+ deprecations.
- Date: Wed, 10 Mar 2010 12:46:28 +0000 (UTC)
commit 74fa5af312d2540111ffca3f9d4d664b1438d753
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed Mar 10 07:45:14 2010 -0500
Work around recent GTK+ deprecations.
components/editor/gtkhtml-color-combo.c | 12 ++++++++++--
components/editor/gtkhtml-face-tool-button.c | 6 +++++-
2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/components/editor/gtkhtml-color-combo.c b/components/editor/gtkhtml-color-combo.c
index 51c14e6..76f110e 100644
--- a/components/editor/gtkhtml-color-combo.c
+++ b/components/editor/gtkhtml-color-combo.c
@@ -318,7 +318,11 @@ color_combo_default_release_event_cb (GtkhtmlColorCombo *combo,
GdkEventButton *event,
GtkButton *button)
{
- if (GTK_WIDGET_STATE (button) != GTK_STATE_NORMAL)
+ GtkStateType state;
+
+ state = gtk_widget_get_state (GTK_WIDGET (button));
+
+ if (state != GTK_STATE_NORMAL)
gtk_button_clicked (button);
return FALSE;
@@ -371,7 +375,11 @@ color_combo_swatch_release_event_cb (GtkhtmlColorCombo *combo,
GdkEventButton *event,
GtkButton *button)
{
- if (GTK_WIDGET_STATE (button) != GTK_STATE_NORMAL)
+ GtkStateType state;
+
+ state = gtk_widget_get_state (GTK_WIDGET (button));
+
+ if (state != GTK_STATE_NORMAL)
gtk_button_clicked (button);
return FALSE;
diff --git a/components/editor/gtkhtml-face-tool-button.c b/components/editor/gtkhtml-face-tool-button.c
index 1c1e737..ba03914 100644
--- a/components/editor/gtkhtml-face-tool-button.c
+++ b/components/editor/gtkhtml-face-tool-button.c
@@ -146,7 +146,11 @@ face_tool_button_face_release_event_cb (GtkhtmlFaceToolButton *button,
GdkEventButton *event,
GtkButton *face_button)
{
- if (GTK_WIDGET_STATE (button) != GTK_STATE_NORMAL)
+ GtkStateType state;
+
+ state = gtk_widget_get_state (GTK_WIDGET (button));
+
+ if (state != GTK_STATE_NORMAL)
gtk_button_clicked (face_button);
return FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]