warning fixed for lttvwindow and controlflow view

[lttv.git] / ltt / branches / poly / lttv / modules / gui / controlflow / drawing.h

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h
index 02dd33e4948a2b77d9a939026efd0e2971110eb9..5a4dc820a27f48f407a2f9111eca7e3f7b1eef16 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h
@@ -73,7 +73,15 @@ extern GdkColor drawing_colors[NUM_COLORS];
  * of the shown processes.
  */
 
+#ifndef TYPE_DRAWING_T_DEFINED
+#define TYPE_DRAWING_T_DEFINED
 typedef struct _Drawing_t Drawing_t;
+#endif //TYPE_DRAWING_T_DEFINED
+
+#ifndef TYPE_CONTROLFLOWDATA_DEFINED
+#define TYPE_CONTROLFLOWDATA_DEFINED
+typedef struct _ControlFlowData ControlFlowData;
+#endif //TYPE_CONTROLFLOWDATA_DEFINED
 
 struct _Drawing_t {
   GtkWidget *vbox;
@@ -110,6 +118,13 @@ void drawing_destroy(Drawing_t *drawing);
 GtkWidget *drawing_get_widget(Drawing_t *drawing);
 GtkWidget *drawing_get_drawing_area(Drawing_t *drawing);
 
+
+void drawing_data_request(Drawing_t *drawing,
+      GdkPixmap **pixmap,
+      gint x, gint y,
+      gint width,
+      gint height);
+
 void drawing_draw_line( Drawing_t *drawing,
       GdkPixmap *pixmap,
       guint x1, guint y1,
@@ -157,7 +172,7 @@ tree_row_activated(GtkTreeModel *treemodel,
  *
  * Convert from window pixel and time interval to an absolute time.
  */
-inline void convert_pixels_to_time(
+static inline void convert_pixels_to_time(
     gint width,
     guint x,
     TimeWindow time_window,
@@ -172,7 +187,7 @@ inline void convert_pixels_to_time(
 }
 
 
-inline void convert_time_to_pixels(
+static inline void convert_time_to_pixels(
     TimeWindow time_window,
     LttTime time,
     int width,