[QA] Remove unneeded include statement.

[andy/viking.git] / src / vikwindow.h

diff --git a/src/vikwindow.h b/src/vikwindow.h
index e86c97057f8a078992832192b5827ebba2bf0e2f..20c372ad9a24dfab39707eab7d5a7443800e48d1 100644 (file)
--- a/src/vikwindow.h
+++ b/src/vikwindow.h
@@ -28,6 +28,7 @@
 #include <gtk/gtk.h>
 
 #include "vikviewport.h"
+#include "vikstatus.h"
 
 G_BEGIN_DECLS
 
@@ -44,12 +45,15 @@ struct _VikWindowClass
 {
   GtkWindowClass window_class;
   void (* newwindow) (VikWindow *vw);
-  void (* openwindow) (VikWindow *vw, const gchar *filename);
+  void (* openwindow) (VikWindow *vw, GSList *filenames);
+  void (* statusbarupdate) (VikWindow *vw, const gchar *message, vik_statusbar_type_t vs_type);
 };
 
 GType vik_window_get_type ();
 
-VikWindow *vik_window_new ();
+// To call from main to start things off:
+VikWindow *vik_window_new_window ();
+
 GtkWidget *vik_window_get_drawmode_button ( VikWindow *vw, VikViewportDrawMode mode );
 gboolean vik_window_get_pan_move ( VikWindow *vw );
 void vik_window_open_file ( VikWindow *vw, const gchar *filename, gboolean changefilename );
@@ -57,6 +61,10 @@ struct _VikLayer;
 void vik_window_selected_layer(VikWindow *vw, struct _VikLayer *vl);
 struct _VikViewport * vik_window_viewport(VikWindow *vw);
 struct _VikLayersPanel * vik_window_layers_panel(VikWindow *vw);
+struct _VikStatusbar * vik_window_get_statusbar(VikWindow *vw);
+// Only for use from background threads:
+void vik_window_signal_statusbar_update (VikWindow *vw, const gchar* message, vik_statusbar_type_t vs_type);
+
 void vik_window_set_redraw_trigger(struct _VikLayer *vl);
 
 void vik_window_enable_layer_tool ( VikWindow *vw, gint layer_id, gint tool_id );
@@ -76,6 +84,16 @@ gpointer vik_window_get_containing_trw_layer ( VikWindow *vw );
 /* return indicates if a redraw is necessary */
 gboolean vik_window_clear_highlight ( VikWindow *vw );
 
+typedef struct {
+  VikWindow *vw;
+  VikViewport *vvp;
+  gpointer *vtl; // VikTrwlayer
+  gboolean holding;
+  gboolean is_waypoint; // otherwise a track
+  GdkGC *gc;
+  int oldx, oldy;
+} tool_ed_t;
+
 G_END_DECLS
 
 #define VIK_WINDOW_FROM_WIDGET(x) VIK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(x)))