diff options
Diffstat (limited to 'widgets/misc/e-map.c')
-rw-r--r-- | widgets/misc/e-map.c | 50 |
1 files changed, 6 insertions, 44 deletions
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index ff13e41be8..22ea72fa6a 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -198,8 +198,11 @@ static void e_map_init (EMap *view) { EMapPrivate *priv; + GtkWidget *widget; gchar *map_file_name = g_build_filename (EVOLUTION_IMAGESDIR, "world_map-960.png", NULL); + widget = GTK_WIDGET (view); + priv = g_new0 (EMapPrivate, 1); view->priv = priv; @@ -210,8 +213,8 @@ e_map_init (EMap *view) priv->zoom_state = E_MAP_ZOOMED_OUT; priv->points = g_ptr_array_new (); - GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS); - GTK_WIDGET_UNSET_FLAGS (view, GTK_NO_WINDOW); + gtk_widget_set_can_focus (widget, TRUE); + gtk_widget_set_has_window (widget, TRUE); } /* Destroy handler for the map view */ @@ -300,7 +303,7 @@ e_map_realize (GtkWidget *widget) g_return_if_fail (widget != NULL); g_return_if_fail (E_IS_MAP (widget)); - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); + gtk_widget_set_realized (widget, TRUE); gtk_widget_get_allocation (widget, &allocation); @@ -382,11 +385,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 +409,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 +644,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 +697,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 +717,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 +953,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 +1018,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 +1229,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 +1543,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 +1710,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)); |