diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-01-31 03:03:19 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-04-08 23:05:26 +0800 |
commit | 72797decc12602b181f69dba7c54df7a0d1b9326 (patch) | |
tree | ecd1314c92bc26b59647b351b2d47e446f4ed21d /widgets/misc/e-map.c | |
parent | 3ba0b61f9f447b01c3a83bfb78ee33a45d413700 (diff) | |
download | gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.gz gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.bz2 gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.lz gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.xz gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.tar.zst gsoc2013-evolution-72797decc12602b181f69dba7c54df7a0d1b9326.zip |
Giant leap towards GSEAL compliance.
Diffstat (limited to 'widgets/misc/e-map.c')
-rw-r--r-- | widgets/misc/e-map.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index ff13e41be8..4ce8d75084 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -382,11 +382,7 @@ e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation) gtk_widget_set_allocation (widget, allocation); -#if GTK_CHECK_VERSION(2,19,7) if (gtk_widget_get_realized (widget)) { -#else - if (GTK_WIDGET_REALIZED (widget)) { -#endif GdkWindow *window; window = gtk_widget_get_window (widget); @@ -410,11 +406,7 @@ e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation) static gint e_map_button_press (GtkWidget *widget, GdkEventButton *event) { -#if GTK_CHECK_VERSION(2,19,7) if (!gtk_widget_has_focus (widget)) gtk_widget_grab_focus (widget); -#else - if (!GTK_WIDGET_HAS_FOCUS (widget)) gtk_widget_grab_focus (widget); -#endif return TRUE; } @@ -649,11 +641,7 @@ e_map_window_to_world (EMap *map, gdouble win_x, gdouble win_y, gdouble *world_l g_return_if_fail (map); priv = map->priv; -#if GTK_CHECK_VERSION(2,19,7) g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (map))); -#else - g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map))); -#endif width = gdk_pixbuf_get_width (priv->map_render_pixbuf); height = gdk_pixbuf_get_height (priv->map_render_pixbuf); @@ -706,11 +694,7 @@ e_map_zoom_to_location (EMap *map, gdouble longitude, gdouble latitude) EMapPrivate *priv; g_return_if_fail (map); -#if GTK_CHECK_VERSION(2,19,7) g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (map))); -#else - g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map))); -#endif priv = map->priv; @@ -730,11 +714,7 @@ e_map_zoom_out (EMap *map) EMapPrivate *priv; g_return_if_fail (map); -#if GTK_CHECK_VERSION(2,19,7) g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (map))); -#else - g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map))); -#endif priv = map->priv; @@ -970,11 +950,7 @@ update_render_pixbuf (EMap *map, gdouble zoom; gint i; -#if GTK_CHECK_VERSION(2,19,7) if (!gtk_widget_get_realized (GTK_WIDGET (map))) -#else - if (!GTK_WIDGET_REALIZED (map)) -#endif return; gtk_widget_get_allocation (GTK_WIDGET (map), &allocation); @@ -1039,13 +1015,8 @@ request_paint_area (EMap *view, GdkRectangle *area) EMapPrivate *priv; gint width, height; -#if GTK_CHECK_VERSION(2,19,7) if (!gtk_widget_is_drawable (GTK_WIDGET (view)) || !gtk_widget_get_realized (GTK_WIDGET (view))) return; -#else - if (!GTK_WIDGET_DRAWABLE (GTK_WIDGET (view)) || - !GTK_WIDGET_REALIZED (GTK_WIDGET (view))) return; -#endif priv = view->priv; if (!priv->map_render_pixbuf) return; @@ -1255,11 +1226,7 @@ scroll_to (EMap *view, gint x, gint y) priv->xofs = x; priv->yofs = y; -#if GTK_CHECK_VERSION(2,19,7) if (!gtk_widget_is_drawable (GTK_WIDGET (view))) -#else - if (!GTK_WIDGET_DRAWABLE (view)) -#endif return; gtk_widget_get_allocation (GTK_WIDGET (view), &allocation); @@ -1573,11 +1540,7 @@ zoom_in_smooth (EMap *map) gdouble x, y; g_return_if_fail (map); -#if GTK_CHECK_VERSION(2,19,7) g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (map))); -#else - g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map))); -#endif gtk_widget_get_allocation (GTK_WIDGET (map), &allocation); @@ -1744,11 +1707,7 @@ set_scroll_area (EMap *view) priv = view->priv; -#if GTK_CHECK_VERSION(2,19,7) if (!gtk_widget_get_realized (GTK_WIDGET (view))) return; -#else - if (!GTK_WIDGET_REALIZED (GTK_WIDGET (view))) return; -#endif if (!priv->hadj || !priv->vadj) return; g_object_freeze_notify (G_OBJECT (priv->hadj)); |