X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis-viewer.h;h=c20cac843672fe6163b21b51043c9c11828a4205;hb=3b7e4136d6f8442c80c617581e3e83f30afdcdb1;hp=89b95835121fe5a6cce61eb39e0b1645c5f4777e;hpb=f93aa6df36b91a106bd9be7e8dd60b83b0f6a0cb;p=grits

diff --git a/src/gis-viewer.h b/src/gis-viewer.h
index 89b9583..c20cac8 100644
--- a/src/gis-viewer.h
+++ b/src/gis-viewer.h
@@ -40,10 +40,10 @@ typedef struct _GisViewerClass GisViewerClass;
 
 typedef gdouble (*GisHeightFunc)(gdouble lat, gdouble lon, gpointer user_data);
 
-#include "gis-tile.h"
 #include "gis-plugin.h"
 #include "gis-prefs.h"
-#include "gis-object.h"
+#include "objects/gis-object.h"
+#include "objects/gis-tile.h"
 
 struct _GisViewer {
 	GtkDrawingArea parent_instance;
@@ -55,6 +55,10 @@ struct _GisViewer {
 	gdouble     location[3];
 	gdouble     rotation[3];
 	gboolean    offline;
+
+	/* For dragging */
+	gint    drag_mode;
+	gdouble drag_x, drag_y;
 };
 
 struct _GisViewerClass {
@@ -73,12 +77,9 @@ struct _GisViewerClass {
 	                          GisHeightFunc height_func, gpointer user_data,
 	                          gboolean update);
 
-	void (*begin)            (GisViewer *viewer);
-	void (*end)              (GisViewer *viewer);
-
 	gpointer (*add)          (GisViewer *viewer, GisObject *object,
 	                          gint level, gboolean sort);
-	void (*remove)           (GisViewer *viewer, gpointer ref);
+	GisObject *(*remove)     (GisViewer *viewer, gpointer ref);
 };
 
 GType gis_viewer_get_type(void);
@@ -116,11 +117,8 @@ void gis_viewer_set_height_func(GisViewer *self, GisTile *tile,
 		GisHeightFunc height_func, gpointer user_data,
 		gboolean update);
 
-void gis_viewer_begin(GisViewer *viewer);
-void gis_viewer_end  (GisViewer *viewer);
-
 gpointer gis_viewer_add(GisViewer *self, GisObject *object,
 		gint level, gboolean sort);
-void gis_viewer_remove(GisViewer *self, gpointer ref);
+GisObject *gis_viewer_remove(GisViewer *self, gpointer ref);
 
 #endif