guiControlFlow Process List completed

[lttv.git] / ltt / branches / poly / lttv / modules / guiControlFlow / CFV.c

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c
index 9cea4bc913481d46d86c60a9018e8035eabe802a..18f3b52e4e484a31907d0c2cda856f8bb728b813 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c
@@ -34,7 +34,7 @@ struct _ControlFlowData {
        
        /* Shown events information */
        guint First_Event, Last_Event;
-       ltt_time Begin_Time, End_Time;
+       LttTime Begin_Time, End_Time;
        
        
        /* TEST DATA, TO BE READ FROM THE TRACE */
@@ -75,16 +75,16 @@ GuiControlFlow(void)
 
 
        /* Create the Process list */
-       //Control_Flow_Data->Process_List = ProcessList_contruct();
+       Control_Flow_Data->Process_List = ProcessList_construct();
        
-       //Process_List_Widget = 
-       //      ProcessList_getWidget(Control_Flow_Data->Process_List);
+       Process_List_Widget = 
+               ProcessList_getWidget(Control_Flow_Data->Process_List);
        
        Control_Flow_Data->Inside_HBox_V = gtk_hbox_new(0, 0);
 
-       //gtk_box_pack_start(
-       //      GTK_BOX(Control_Flow_Data->Inside_HBox_V),
-       //      Process_List_Widget, FALSE, TRUE, 0);
+       gtk_box_pack_start(
+               GTK_BOX(Control_Flow_Data->Inside_HBox_V),
+               Process_List_Widget, TRUE, TRUE, 0); // FALSE TRUE
        //gtk_box_pack_start(
        //      GTK_BOX(Control_Flow_Data->Inside_HBox_V),
        //      Control_Flow_Data->Drawing_Area_V, TRUE, TRUE, 0);
@@ -133,7 +133,7 @@ GuiControlFlow(void)
 
 
        //gtk_widget_show(Control_Flow_Data->Drawing_Area_V);
-       //gtk_widget_show(Process_List_Widget);
+       gtk_widget_show(Process_List_Widget);
        gtk_widget_show(Control_Flow_Data->Inside_HBox_V);
        gtk_widget_show(Control_Flow_Data->Scrolled_Window_VC);
        
@@ -149,22 +149,29 @@ GuiControlFlow(void)
 
 }
 
+/* Destroys widget also */
 void
-GuiControlFlow_Destructor(ControlFlowData *Control_Flow_Data)
+GuiControlFlow_Destructor_Full(ControlFlowData *Control_Flow_Data)
 {
-       guint index;
-
-       /* May already been done by GTK window closing */
+       /* May already have been done by GTK window closing */
        if(GTK_IS_WIDGET(Control_Flow_Data->Scrolled_Window_VC))
                gtk_widget_destroy(Control_Flow_Data->Scrolled_Window_VC);
+
+       GuiControlFlow_Destructor(Control_Flow_Data);
+}
+
+void
+GuiControlFlow_Destructor(ControlFlowData *Control_Flow_Data)
+{
+       guint index;
        
+       /* Process List is removed with it's widget */
        //ProcessList_destroy(Control_Flow_Data->Process_List);
        
        g_slist_remove(gControl_Flow_Data_List,Control_Flow_Data);
+       g_free(Control_Flow_Data);
 }
 
-//FIXME : call hGuiEvents_Destructor for corresponding data upon widget destroy
-
 GtkWidget *GuiControlFlow_get_Widget(ControlFlowData *Control_Flow_Data)
 {
        return Control_Flow_Data->Scrolled_Window_VC ;