r3335 - in trunk/src/target/OM-2007.2/applications/openmoko-worldclock2: . src
chris at sita.openmoko.org
chris at sita.openmoko.org
Fri Nov 2 15:33:15 CET 2007
Author: chris
Date: 2007-11-02 15:33:14 +0100 (Fri, 02 Nov 2007)
New Revision: 3335
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/worldclock-main.c
Log:
* src/worldclock-main.c: (map_clicked_cb), (main):
Use new JanaGtkWorldMap "clicked" signal
Modified: trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/ChangeLog 2007-11-02 12:01:06 UTC (rev 3334)
+++ trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/ChangeLog 2007-11-02 14:33:14 UTC (rev 3335)
@@ -1,5 +1,10 @@
2007-11-02 Chris Lord <chris at openedhand.com>
+ * src/worldclock-main.c: (map_clicked_cb), (main):
+ Use new JanaGtkWorldMap "clicked" signal
+
+2007-11-02 Chris Lord <chris at openedhand.com>
+
* src/worldclock-main.c: (hadjust_changed_cb),
(vadjust_changed_cb), (zoom_map), (main):
Zoom into the centre of the map rather than the top-left
Modified: trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/worldclock-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/worldclock-main.c 2007-11-02 12:01:06 UTC (rev 3334)
+++ trunk/src/target/OM-2007.2/applications/openmoko-worldclock2/src/worldclock-main.c 2007-11-02 14:33:14 UTC (rev 3335)
@@ -45,8 +45,6 @@
gdouble zoom_level;
gdouble xpos;
gdouble ypos;
-
- gboolean map_entered;
} WorldClockData;
static inline GtkToolItem *
@@ -340,32 +338,14 @@
g_source_remove_by_user_data (clock);
}
-static gboolean
-map_enter_notify_cb (GtkWidget *widget, GdkEventCrossing *event,
- WorldClockData *data)
+static void
+map_clicked_cb (JanaGtkWorldMap *map, GdkEventButton *event,
+ WorldClockData *data)
{
- data->map_entered = TRUE;
- return FALSE;
-}
-
-static gboolean
-map_leave_notify_cb (GtkWidget *widget, GdkEventCrossing *event,
- WorldClockData *data)
-{
- data->map_entered = FALSE;
- return FALSE;
-}
-
-static gboolean
-map_button_release_event_cb (JanaGtkWorldMap *map, GdkEventButton *event,
- WorldClockData *data)
-{
GList *markers, *m;
gdouble lat, lon, old_distance;
JanaGtkWorldMapMarker *marker;
- if (!data->map_entered) return FALSE;
-
jana_gtk_world_map_get_latlon (map, event->x, event->y, &lat, &lon);
markers = jana_gtk_world_map_get_markers (map);
@@ -532,8 +512,6 @@
}
g_list_free (markers);
-
- return FALSE;
}
int
@@ -584,14 +562,8 @@
jana_gtk_world_map_set_height (JANA_GTK_WORLD_MAP (data.map), 1024);
jana_gtk_world_map_set_static (JANA_GTK_WORLD_MAP (data.map), TRUE);
add_marks (&data);
- gtk_widget_add_events (GTK_WIDGET (data.map),
- GDK_BUTTON_RELEASE_MASK);
- g_signal_connect (data.map, "enter-notify-event",
- G_CALLBACK (map_enter_notify_cb), &data);
- g_signal_connect (data.map, "leave-notify-event",
- G_CALLBACK (map_leave_notify_cb), &data);
- g_signal_connect (data.map, "button-release-event",
- G_CALLBACK (map_button_release_event_cb), &data);
+ g_signal_connect (data.map, "clicked",
+ G_CALLBACK (map_clicked_cb), &data);
data.map_aspect = gtk_aspect_frame_new (NULL, 0.5, 0.5, 2.0, FALSE);
gtk_frame_set_shadow_type (GTK_FRAME (
More information about the commitlog
mailing list