--- trunk/src/gpxview.h	2009/06/26 20:07:33	12
+++ trunk/src/gpxview.h	2009/08/14 12:19:45	56
@@ -61,6 +61,8 @@
 #if MAEMO_VERSION_MAJOR >= 5
 #define USE_PANNABLE_AREA
 #include <hildon/hildon-pannable-area.h>
+/* panning a gtkhtml view currently doesn't work well */
+#define PANNABLE_HTML
 #endif
 #endif
 
@@ -143,6 +145,10 @@
   GtkTextBuffer *active_buffer;
 #endif
 
+#ifdef USE_STACKABLE_WINDOW
+  GtkWidget *export_menu, *tools_menu;
+#endif
+
   /* save result here to be able to "goto" it */
   pos_t geomath;
 
@@ -190,6 +196,15 @@
 #else
   GtkWidget *window;
 #endif
+
+#ifdef ENABLE_OSM_GPS_MAP
+  struct {
+    struct map_context_s *context;
+    int zoom;
+    pos_t pos;
+  } map;
+#endif
+
   GtkWidget *vbox;    
 } appdata_t;
 
@@ -208,6 +223,10 @@
 #include "precpos.h"
 #include "garmin_export.h"
 
+#ifdef ENABLE_OSM_GPS_MAP
+#include "map-tool.h"
+#endif
+
 #ifdef USE_MAEMO
 #include "dbus.h"
 #endif