X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fplugins%2Ftest.c;h=8d12dc1172faec9fe1736cc3b919af511077c821;hp=e1dab0e3964338275a7a479a0984e16bb772f5e6;hb=67a63167629adc48ff31530dd58ece577f3d7460;hpb=420f1ea8e4aea5dd7bddc77325ab643900c34cd5

diff --git a/src/plugins/test.c b/src/plugins/test.c
index e1dab0e..8d12dc1 100644
--- a/src/plugins/test.c
+++ b/src/plugins/test.c
@@ -65,9 +65,9 @@ static gboolean on_poly_key(GritsPoly *poly, GdkEventKey *event)
 {
 	g_debug("GritsPluginTest: on_poly_key - %d", event->keyval);
 	gdouble colors[0xff][3] = {
-		[GDK_r] {1, 0, 0},
-		[GDK_g] {0, 1, 0},
-		[GDK_b] {0, 0, 1},
+		[GDK_KEY_r] {1, 0, 0},
+		[GDK_KEY_g] {0, 1, 0},
+		[GDK_KEY_b] {0, 0, 1},
 	};
 	if (event->keyval >= G_N_ELEMENTS(colors))
 		return FALSE;
@@ -77,23 +77,6 @@ static gboolean on_poly_key(GritsPoly *poly, GdkEventKey *event)
 	return TRUE;
 }
 
-static gboolean on_marker_enter(GritsMarker *marker, GdkEvent *event, GritsViewer *viewer)
-{
-	g_debug("GritsPluginTest: on_marker_enter");
-	GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(viewer));
-	GdkCursor *cursor = gdk_cursor_new(GDK_HAND2);
-	gdk_window_set_cursor(window, cursor);
-	return FALSE;
-}
-
-static gboolean on_marker_leave(GritsMarker *marker, GdkEvent *event, GritsViewer *viewer)
-{
-	g_debug("GritsPluginTest: on_marker_leave");
-	GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(viewer));
-	gdk_window_set_cursor(window, NULL);
-	return FALSE;
-}
-
 static gboolean on_marker_button(GritsMarker *marker, GdkEventButton *event)
 {
 	g_debug("GritsPluginTest: on_marker_button");
@@ -113,9 +96,8 @@ void _load_marker(GritsPluginTest *test)
 	GRITS_OBJECT(test->marker)->center.lon  = -90.491982;
 	GRITS_OBJECT(test->marker)->center.elev =   0.0;
 	GRITS_OBJECT(test->marker)->lod         = EARTH_R*3;
+	grits_object_set_cursor(GRITS_OBJECT(test->marker), GDK_HAND2);
 	grits_viewer_add(test->viewer, GRITS_OBJECT(test->marker), GRITS_LEVEL_HUD, FALSE);
-	g_signal_connect(test->marker, "enter",   G_CALLBACK(on_marker_enter),  test->viewer);
-	g_signal_connect(test->marker, "leave",   G_CALLBACK(on_marker_leave),  test->viewer);
 	g_signal_connect(test->marker, "clicked", G_CALLBACK(on_marker_button), test->viewer);
 }
 
@@ -193,11 +175,12 @@ static void grits_plugin_test_dispose(GObject *_test)
 	g_debug("GritsPluginTest: dispose");
 	GritsPluginTest *test = GRITS_PLUGIN_TEST(_test);
 	if (test->viewer) {
-		grits_viewer_remove(test->viewer, GRITS_OBJECT(test->marker));
-		grits_viewer_remove(test->viewer, GRITS_OBJECT(test->poly));
-		grits_viewer_remove(test->viewer, GRITS_OBJECT(test->line));
-		g_object_unref(test->viewer);
+		GritsViewer *viewer = test->viewer;
 		test->viewer = NULL;
+		grits_object_destroy_pointer(&test->marker);
+		grits_object_destroy_pointer(&test->poly);
+		grits_object_destroy_pointer(&test->line);
+		g_object_unref(viewer);
 	}
 	G_OBJECT_CLASS(grits_plugin_test_parent_class)->dispose(_test);
 }