X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2FEvent_Hooks.c;h=93ac25af69aaf5c6aa1e97092311a6b2998d1e4d;hb=b6db18f8146b58641bfc639049bc53aaeb658bb9;hp=111e13409452d240d48b4aefc608bdd2e17e4ac1;hpb=8d70e03bc0026687c050287b3dc9b3ec42281191;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c
index 111e1340..93ac25af 100644
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c
@@ -253,16 +253,16 @@ int draw_event_hook(void *hook_data, void *call_data)
     DrawContext *draw_context_out = hashed_process_data_out->draw_context;
     draw_context_out->current->modify_over->x = x;
     draw_context_out->current->modify_over->y = y_out;
-    draw_context_out->drawable = control_flow_data->Drawing->Pixmap;
+    draw_context_out->drawable = control_flow_data->Drawing->pixmap;
     draw_context_out->pango_layout = control_flow_data->Drawing->pango_layout;
     GtkWidget *widget = control_flow_data->Drawing->drawing_area;
     //draw_context_out->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)];
-    draw_context_out->gc = gdk_gc_new(control_flow_data->Drawing->Pixmap);
+    draw_context_out->gc = gdk_gc_new(control_flow_data->Drawing->pixmap);
     gdk_gc_copy(draw_context_out->gc, widget->style->black_gc);
     //draw_context_out->gc = widget->style->black_gc;
     
     //draw_arc((void*)&prop_arc, (void*)draw_context_out);
-    //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->Pixmap);
+    //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->pixmap);
     
     GdkColor colorfg_out = { 0, 0xffff, 0x0000, 0x0000 };
     GdkColor colorbg_out = { 0, 0xffff, 0xffff, 0xffff };
@@ -301,10 +301,10 @@ int draw_event_hook(void *hook_data, void *call_data)
     draw_context_out->current->middle->x = x;
     draw_context_out->current->middle->y = y_out + height/2;
     draw_context_out->previous->middle->y = y_out + height/2;
-    draw_context_out->drawable = control_flow_data->Drawing->Pixmap;
+    draw_context_out->drawable = control_flow_data->Drawing->pixmap;
     draw_context_out->pango_layout = control_flow_data->Drawing->pango_layout;
     //draw_context_out->gc = widget->style->black_gc;
-    draw_context_out->gc = gdk_gc_new(control_flow_data->Drawing->Pixmap);
+    draw_context_out->gc = gdk_gc_new(control_flow_data->Drawing->pixmap);
     gdk_gc_copy(draw_context_out->gc, widget->style->black_gc);
 
     PropertiesLine prop_line_out;
@@ -367,16 +367,16 @@ int draw_event_hook(void *hook_data, void *call_data)
     DrawContext *draw_context_in = hashed_process_data_in->draw_context;
     draw_context_in->current->modify_over->x = x;
     draw_context_in->current->modify_over->y = y_in;
-    draw_context_in->drawable = control_flow_data->Drawing->Pixmap;
+    draw_context_in->drawable = control_flow_data->Drawing->pixmap;
     draw_context_in->pango_layout = control_flow_data->Drawing->pango_layout;
     widget = control_flow_data->Drawing->drawing_area;
     //draw_context_in->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)];
     //draw_context_in->gc = widget->style->black_gc;
-    draw_context_in->gc = gdk_gc_new(control_flow_data->Drawing->Pixmap);
+    draw_context_in->gc = gdk_gc_new(control_flow_data->Drawing->pixmap);
     gdk_gc_copy(draw_context_in->gc, widget->style->black_gc);
     
     //draw_arc((void*)&prop_arc, (void*)draw_context_in);
-    //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->Pixmap);
+    //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->pixmap);
     
     GdkColor colorfg_in = { 0, 0x0000, 0xffff, 0x0000 };
     GdkColor colorbg_in = { 0, 0xffff, 0xffff, 0xffff };
@@ -415,10 +415,10 @@ int draw_event_hook(void *hook_data, void *call_data)
     draw_context_in->current->middle->x = x;
     draw_context_in->previous->middle->y = y_in + height/2;
     draw_context_in->current->middle->y = y_in + height/2;
-    draw_context_in->drawable = control_flow_data->Drawing->Pixmap;
+    draw_context_in->drawable = control_flow_data->Drawing->pixmap;
     draw_context_in->pango_layout = control_flow_data->Drawing->pango_layout;
     //draw_context_in->gc = widget->style->black_gc;
-    draw_context_in->gc = gdk_gc_new(control_flow_data->Drawing->Pixmap);
+    draw_context_in->gc = gdk_gc_new(control_flow_data->Drawing->pixmap);
     gdk_gc_copy(draw_context_in->gc, widget->style->black_gc);
     
     PropertiesLine prop_line_in;
@@ -630,14 +630,14 @@ int draw_after_hook(void *hook_data, void *call_data)
     DrawContext *draw_context_out = hashed_process_data_out->draw_context;
     //draw_context_out->current->modify_over->x = x;
     draw_context_out->current->modify_over->y = y_out;
-    draw_context_out->drawable = control_flow_data->Drawing->Pixmap;
+    draw_context_out->drawable = control_flow_data->Drawing->pixmap;
     draw_context_out->pango_layout = control_flow_data->Drawing->pango_layout;
     GtkWidget *widget = control_flow_data->Drawing->drawing_area;
     //draw_context_out->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)];
     draw_context_out->gc = widget->style->black_gc;
     
     //draw_arc((void*)&prop_arc, (void*)draw_context_out);
-    //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->Pixmap);
+    //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->pixmap);
     
     GdkColor colorfg_out = { 0, 0xffff, 0x0000, 0x0000 };
     GdkColor colorbg_out = { 0, 0xffff, 0xffff, 0xffff };
@@ -705,14 +705,14 @@ int draw_after_hook(void *hook_data, void *call_data)
     DrawContext *draw_context_in = hashed_process_data_in->draw_context;
     //draw_context_in->current->modify_over->x = x;
     draw_context_in->current->modify_over->y = y_in;
-    draw_context_in->drawable = control_flow_data->Drawing->Pixmap;
+    draw_context_in->drawable = control_flow_data->Drawing->pixmap;
     draw_context_in->pango_layout = control_flow_data->Drawing->pango_layout;
     widget = control_flow_data->Drawing->drawing_area;
     //draw_context_in->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)];
     draw_context_in->gc = widget->style->black_gc;
     
     //draw_arc((void*)&prop_arc, (void*)draw_context_in);
-    //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->Pixmap);
+    //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->pixmap);
     
     GdkColor colorfg_in = { 0, 0x0000, 0xffff, 0x0000 };
     GdkColor colorbg_in = { 0, 0xffff, 0xffff, 0xffff };
@@ -838,9 +838,9 @@ gint update_time_window_hook(void *hook_data, void *call_data)
           &x);
 
       /* Copy old data to new location */
-      gdk_draw_drawable (control_flow_data->Drawing->Pixmap,
+      gdk_draw_drawable (control_flow_data->Drawing->pixmap,
           control_flow_data->Drawing->drawing_area->style->white_gc,
-          control_flow_data->Drawing->Pixmap,
+          control_flow_data->Drawing->pixmap,
           x, 0,
           0, 0,
           -1, -1);
@@ -854,7 +854,7 @@ gint update_time_window_hook(void *hook_data, void *call_data)
 
       *old_time_window = *new_time_window;
       /* Clear the data request background, but not SAFETY */
-      gdk_draw_rectangle (control_flow_data->Drawing->Pixmap,
+      gdk_draw_rectangle (control_flow_data->Drawing->pixmap,
           control_flow_data->Drawing->drawing_area->style->white_gc,
           TRUE,
           x+SAFETY, 0,
@@ -862,7 +862,7 @@ gint update_time_window_hook(void *hook_data, void *call_data)
           control_flow_data->Drawing->height+SAFETY);
       /* Get new data for the rest. */
       drawing_data_request(control_flow_data->Drawing,
-          &control_flow_data->Drawing->Pixmap,
+          &control_flow_data->Drawing->pixmap,
           x, 0,
           control_flow_data->Drawing->width - x,
           control_flow_data->Drawing->height);
@@ -892,9 +892,9 @@ gint update_time_window_hook(void *hook_data, void *call_data)
             &x);
   
         /* Copy old data to new location */
-        gdk_draw_drawable (control_flow_data->Drawing->Pixmap,
+        gdk_draw_drawable (control_flow_data->Drawing->pixmap,
             control_flow_data->Drawing->drawing_area->style->white_gc,
-            control_flow_data->Drawing->Pixmap,
+            control_flow_data->Drawing->pixmap,
             0, 0,
             x, 0,
             -1, -1);
@@ -902,7 +902,7 @@ gint update_time_window_hook(void *hook_data, void *call_data)
         *old_time_window = *new_time_window;
 
         /* Clean the data request background */
-        gdk_draw_rectangle (control_flow_data->Drawing->Pixmap,
+        gdk_draw_rectangle (control_flow_data->Drawing->pixmap,
           control_flow_data->Drawing->drawing_area->style->white_gc,
           TRUE,
           0, 0,
@@ -910,7 +910,7 @@ gint update_time_window_hook(void *hook_data, void *call_data)
           control_flow_data->Drawing->height+SAFETY);
         /* Get new data for the rest. */
         drawing_data_request(control_flow_data->Drawing,
-            &control_flow_data->Drawing->Pixmap,
+            &control_flow_data->Drawing->pixmap,
             0, 0,
             x,
             control_flow_data->Drawing->height);
@@ -926,7 +926,7 @@ gint update_time_window_hook(void *hook_data, void *call_data)
         *old_time_window = *new_time_window;
         
         
-        gdk_draw_rectangle (control_flow_data->Drawing->Pixmap,
+        gdk_draw_rectangle (control_flow_data->Drawing->pixmap,
           control_flow_data->Drawing->drawing_area->style->white_gc,
           TRUE,
           0, 0,
@@ -934,7 +934,7 @@ gint update_time_window_hook(void *hook_data, void *call_data)
           control_flow_data->Drawing->height+SAFETY);
 
         drawing_data_request(control_flow_data->Drawing,
-            &control_flow_data->Drawing->Pixmap,
+            &control_flow_data->Drawing->pixmap,
             0, 0,
             control_flow_data->Drawing->width,
             control_flow_data->Drawing->height);
@@ -951,7 +951,7 @@ gint update_time_window_hook(void *hook_data, void *call_data)
 
     *old_time_window = *new_time_window;
   
-    gdk_draw_rectangle (control_flow_data->Drawing->Pixmap,
+    gdk_draw_rectangle (control_flow_data->Drawing->pixmap,
           control_flow_data->Drawing->drawing_area->style->white_gc,
           TRUE,
           0, 0,
@@ -960,7 +960,7 @@ gint update_time_window_hook(void *hook_data, void *call_data)
 
   
     drawing_data_request(control_flow_data->Drawing,
-        &control_flow_data->Drawing->Pixmap,
+        &control_flow_data->Drawing->pixmap,
         0, 0,
         control_flow_data->Drawing->width,
         control_flow_data->Drawing->height);
@@ -1086,10 +1086,10 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
   draw_context->current->middle->x = closure_data->event_request->x_end;
   draw_context->current->middle->y = y + height/2;
   draw_context->previous->middle->y = y + height/2;
-  draw_context->drawable = control_flow_data->Drawing->Pixmap;
+  draw_context->drawable = control_flow_data->Drawing->pixmap;
   draw_context->pango_layout = control_flow_data->Drawing->pango_layout;
   //draw_context->gc = widget->style->black_gc;
-  draw_context->gc = gdk_gc_new(control_flow_data->Drawing->Pixmap);
+  draw_context->gc = gdk_gc_new(control_flow_data->Drawing->pixmap);
   gdk_gc_copy(draw_context->gc, widget->style->black_gc);
 
   PropertiesLine prop_line;