Glow and ev merge

xtt/lib/glow/src/glow_growbarchart.cpp

@@ -483,10 +483,10 @@ void GrowBarChart::draw(GlowWind* w, GlowTransform* t, int highlight, int hot,
 	      drawtype = GlowColor::shift_drawtype(fillcolor, chot, 0);
 	    else
 	      drawtype = fillcolor;
-	    ctx->gdraw->rect(bar_ll_x, bar_down_ll_y, bar_ur_x - bar_ll_x,
+	    ctx->gdraw->rect(w, bar_ll_x, bar_down_ll_y, bar_ur_x - bar_ll_x,
 	         bar_down_ur_y - bar_down_ll_y, drawtype, 1, 0);
 	    if (bar_up_ll_y > ll_y)
-	      ctx->gdraw->rect(bar_ll_x, ll_y, bar_ur_x - bar_ll_x,
+	      ctx->gdraw->rect(w, bar_ll_x, ll_y, bar_ur_x - bar_ll_x,
 			       bar_up_ll_y - ll_y, drawtype, 1, 0);
 	  } else {
 	    glow_eDrawType f1, f2;

xtt/lib/xtt/gtk/xtt_ev_gtk.cpp

@@ -1236,7 +1236,7 @@ void EvGtk::eve_activate_analyse(GtkWidget* w, gpointer ev)
   ((Ev*)ev)->eve_activate_analyse();
 }
 
-void EvGtk::eve_activate_ack_last(GtkWidget* w, gpointer ev)
+void EvGtk::eve_activate_ack_last(GtkWidget* w, gpointer data)
 {
   Ev* ev = (Ev*)data;