continuous

[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 253b17bc4b4e5a0ec154cf293b29e2fde94b7807..d15b2c522d3dd670d34bfbca52c4d30c8fd8b696 100644 (file)
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/CFV.c
@@ -10,6 +10,9 @@
 #include "CFV-private.h"
 
 
+#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
+#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
+
 extern GSList *gControl_Flow_Data_List;
 
 /*****************************************************************************
@@ -26,7 +29,7 @@ extern GSList *gControl_Flow_Data_List;
 ControlFlowData *
 guicontrolflow(void)
 {
-       GtkWidget *Process_List_Widget, *Drawing_Widget;
+       GtkWidget *Process_List_Widget, *Drawing_Widget;//, *button;
 
        ControlFlowData* Control_Flow_Data = g_new(ControlFlowData,1) ;
 
@@ -52,15 +55,22 @@ guicontrolflow(void)
        Process_List_Widget = 
                processlist_get_widget(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); // FALSE TRUE
-       gtk_box_pack_start(
-               GTK_BOX(Control_Flow_Data->Inside_HBox_V),
-               Drawing_Widget, TRUE, TRUE, 0);
-
+       //Control_Flow_Data->Inside_HBox_V = gtk_hbox_new(0, 0);
+       Control_Flow_Data->HPaned = gtk_hpaned_new();
+               
+       //gtk_box_pack_start(
+       //      GTK_BOX(Control_Flow_Data->Inside_HBox_V),
+       //      Process_List_Widget, FALSE, TRUE, 0); // FALSE TRUE
+       //gtk_box_pack_start(
+       //      GTK_BOX(Control_Flow_Data->Inside_HBox_V),
+       //      Drawing_Widget, TRUE, TRUE, 0);
+       
+       //button = gtk_button_new();
+       //gtk_button_set_relief(button, GTK_RELIEF_NONE);
+       //gtk_container_set_border_width(GTK_CONTAINER(button),0);
+       //gtk_container_add(GTK_CONTAINER(button), Drawing_Widget);
+       gtk_paned_pack1(GTK_PANED(Control_Flow_Data->HPaned), Process_List_Widget, FALSE, TRUE);
+       gtk_paned_pack2(GTK_PANED(Control_Flow_Data->HPaned), Drawing_Widget, TRUE, TRUE);
 
        Control_Flow_Data->VAdjust_C = 
                GTK_ADJUSTMENT(gtk_adjustment_new(      0.0,    /* Value */
@@ -81,8 +91,8 @@ guicontrolflow(void)
 
        gtk_scrolled_window_add_with_viewport(
                GTK_SCROLLED_WINDOW(Control_Flow_Data->Scrolled_Window_VC),
-               Control_Flow_Data->Inside_HBox_V);
-       
+               //Control_Flow_Data->Inside_HBox_V);
+               Control_Flow_Data->HPaned);
        
        //g_signal_connect (G_OBJECT (Control_Flow_Data->Drawing_Area_V),
        //              "expose_event",
@@ -105,8 +115,10 @@ guicontrolflow(void)
 
 
        gtk_widget_show(Drawing_Widget);
+       //gtk_widget_show(button);
        gtk_widget_show(Process_List_Widget);
-       gtk_widget_show(Control_Flow_Data->Inside_HBox_V);
+       //gtk_widget_show(Control_Flow_Data->Inside_HBox_V);
+       gtk_widget_show(Control_Flow_Data->HPaned);
        gtk_widget_show(Control_Flow_Data->Scrolled_Window_VC);
        
        g_object_set_data_full(
@@ -114,7 +126,12 @@ guicontrolflow(void)
                        "Control_Flow_Data",
                        Control_Flow_Data,
                        (GDestroyNotify)guicontrolflow_destructor);
-                       
+               
+       g_object_set_data(
+                       G_OBJECT(Drawing_Widget),
+                       "Control_Flow_Data",
+                       Control_Flow_Data);
+                               
        gControl_Flow_Data_List = g_slist_append(
                        gControl_Flow_Data_List,
                        Control_Flow_Data);
@@ -132,28 +149,38 @@ guicontrolflow(void)
 void
 guicontrolflow_destructor_full(ControlFlowData *Control_Flow_Data)
 {
+       g_info("CFV.c : guicontrolflow_destructor_full, %p", Control_Flow_Data);
        /* 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);
+       //Control_Flow_Data->Parent_Window = NULL;
+       //FIXME guicontrolflow_destructor(Control_Flow_Data);
 }
 
+/* When this destructor is called, the widgets are already disconnected */
 void
 guicontrolflow_destructor(ControlFlowData *Control_Flow_Data)
 {
        guint index;
        
+       g_info("CFV.c : guicontrolflow_destructor, %p", Control_Flow_Data);
+       g_info("%p, %p, %p", update_time_window_hook, Control_Flow_Data, Control_Flow_Data->Parent_Window);
+       if(GTK_IS_WIDGET(Control_Flow_Data->Scrolled_Window_VC))
+               g_info("widget still exists");
+       
        /* Process List is removed with it's widget */
        //ProcessList_destroy(Control_Flow_Data->Process_List);
-       unreg_update_time_window(update_time_window_hook,
+       if(Control_Flow_Data->Parent_Window != NULL)
+       {
+               unreg_update_time_window(update_time_window_hook,
                                Control_Flow_Data,
-                               Control_Flow_Data->Scrolled_Window_VC->parent);
+                               Control_Flow_Data->Parent_Window);
        
-       unreg_update_current_time(update_current_time_hook,
+               unreg_update_current_time(update_current_time_hook,
                                Control_Flow_Data,
-                               Control_Flow_Data->Scrolled_Window_VC->parent);
-       
+                               Control_Flow_Data->Parent_Window);
+       }
+       g_info("CFV.c : guicontrolflow_destructor, %p", Control_Flow_Data);
        g_slist_remove(gControl_Flow_Data_List,Control_Flow_Data);
        g_free(Control_Flow_Data);
 }