[libegg] Fix compiler warnings introduced by the previous DGSEAL_ENABLE cleanups.
- From: Andre Klapper <aklapper src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libegg] Fix compiler warnings introduced by the previous DGSEAL_ENABLE cleanups.
- Date: Sat, 10 Apr 2010 12:41:06 +0000 (UTC)
commit f9e19edc34dc031b79f37280c70b2cf4ab3a10c5
Author: Andre Klapper <a9016009 gmx de>
Date: Sat Apr 10 14:40:35 2010 +0200
Fix compiler warnings introduced by the previous DGSEAL_ENABLE cleanups.
libegg/dock/egg-dock-item.c | 6 +++---
libegg/dock/egg-dock-layout.c | 4 ++--
libegg/dock/egg-dock.c | 14 +++++++-------
3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/libegg/dock/egg-dock-item.c b/libegg/dock/egg-dock-item.c
index 51f6318..36664f2 100644
--- a/libegg/dock/egg-dock-item.c
+++ b/libegg/dock/egg-dock-item.c
@@ -831,7 +831,7 @@ egg_dock_item_realize (GtkWidget *widget)
widget->style = gtk_style_attach (widget->style, widget->window);
#if GTK_CHECK_VERSION(2,20,0)
gtk_style_set_background (widget->style, widget->window,
- gtk_widget_get_state (item));
+ gtk_widget_get_state (GTK_WIDGET (item)));
#else
gtk_style_set_background (widget->style, widget->window,
GTK_WIDGET_STATE (item));
@@ -1230,7 +1230,7 @@ egg_dock_item_dock (EggDockObject *object,
/* show automatic object */
#if GTK_CHECK_VERSION(2,20,0)
- if (gtk_widget_get_visible (object))
+ if (gtk_widget_get_visible (GTK_WIDGET (object)))
#else
if (GTK_WIDGET_VISIBLE (object))
#endif
@@ -1303,7 +1303,7 @@ egg_dock_item_drag_start (EggDockItem *item)
GdkCursor *fleur;
#if GTK_CHECK_VERSION(2,20,0)
- if (!gtk_widget_get_realized (item))
+ if (!gtk_widget_get_realized (GTK_WIDGET (item)))
#else
if (!GTK_WIDGET_REALIZED (item))
#endif
diff --git a/libegg/dock/egg-dock-layout.c b/libegg/dock/egg-dock-layout.c
index dca0cdf..e003822 100644
--- a/libegg/dock/egg-dock-layout.c
+++ b/libegg/dock/egg-dock-layout.c
@@ -954,7 +954,7 @@ egg_dock_layout_recursive_build (EggDockMaster *master,
else if (egg_dock_object_is_compound (parent)) {
gtk_container_add (GTK_CONTAINER (parent), GTK_WIDGET (object));
#if GTK_CHECK_VERSION(2,20,0)
- if (gtk_widget_get_visible (parent))
+ if (gtk_widget_get_visible (GTK_WIDGET (parent)))
#else
if (GTK_WIDGET_VISIBLE (parent))
#endif
@@ -964,7 +964,7 @@ egg_dock_layout_recursive_build (EggDockMaster *master,
else {
EggDockObject *controller = egg_dock_master_get_controller (master);
#if GTK_CHECK_VERSION(2,20,0)
- if (controller != object && gtk_widget_get_visible (controller))
+ if (controller != object && gtk_widget_get_visible (GTK_WIDGET (controller)))
#else
if (controller != object && GTK_WIDGET_VISIBLE (controller))
#endif
diff --git a/libegg/dock/egg-dock.c b/libegg/dock/egg-dock.c
index d428b0e..a68fc28 100644
--- a/libegg/dock/egg-dock.c
+++ b/libegg/dock/egg-dock.c
@@ -553,7 +553,7 @@ egg_dock_size_request (GtkWidget *widget,
/* make request to root */
#if GTK_CHECK_VERSION(2,20,0)
- if (dock->root && gtk_widget_get_visible (dock->root))
+ if (dock->root && gtk_widget_get_visible (GTK_WIDGET (dock->root)))
#else
if (dock->root && GTK_WIDGET_VISIBLE (dock->root))
#endif
@@ -593,7 +593,7 @@ egg_dock_size_allocate (GtkWidget *widget,
allocation->height = MAX (1, allocation->height - 2 * border_width);
#if GTK_CHECK_VERSION(2,20,0)
- if (dock->root && gtk_widget_get_visible (dock->root))
+ if (dock->root && gtk_widget_get_visible (GTK_WIDGET (dock->root)))
#else
if (dock->root && GTK_WIDGET_VISIBLE (dock->root))
#endif
@@ -943,7 +943,7 @@ egg_dock_dock (EggDockObject *object,
/* Realize the item (create its corresponding GdkWindow) when
EggDock has been realized. */
#if GTK_CHECK_VERSION(2,20,0)
- if (gtk_widget_get_realized (dock))
+ if (gtk_widget_get_realized (GTK_WIDGET (dock)))
#else
if (GTK_WIDGET_REALIZED (dock))
#endif
@@ -953,9 +953,9 @@ egg_dock_dock (EggDockObject *object,
been mapped. This is done to make sure that the GdkWindow is
visible. */
#if GTK_CHECK_VERSION(2,20,0)
- if (gtk_widget_get_visible (dock) &&
+ if (gtk_widget_get_visible (GTK_WIDGET (dock)) &&
gtk_widget_get_visible (widget)) {
- if (gtk_widget_get_mapped (dock))
+ if (gtk_widget_get_mapped (GTK_WIDGET (dock)))
#else
if (GTK_WIDGET_VISIBLE (dock) &&
GTK_WIDGET_VISIBLE (widget)) {
@@ -1126,9 +1126,9 @@ egg_dock_add_floating_item (EggDock *dock,
NULL));
#if GTK_CHECK_VERSION(2,20,0)
- if (gtk_widget_get_visible (dock)) {
+ if (gtk_widget_get_visible (GTK_WIDGET (dock))) {
gtk_widget_show (GTK_WIDGET (new_dock));
- if (gtk_widget_get_mapped (dock))
+ if (gtk_widget_get_mapped (GTK_WIDGET (dock)))
#else
if (GTK_WIDGET_VISIBLE (dock)) {
gtk_widget_show (GTK_WIDGET (new_dock));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]