X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Fgtkmultivpaned.c;h=ec8b37552f39619188359154410efe5a2fe4adef;hb=25fba83632ff8e52e801b57189379803d70a228b;hp=d79c826263f0cad0c1b75ac5d5b4b06297b1aa3e;hpb=2d262115fc06b5ffb6038207a6d0c1d5f81763c2;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/gtkmultivpaned.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/gtkmultivpaned.c index d79c8262..ec8b3755 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/gtkmultivpaned.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/gtkmultivpaned.c @@ -16,6 +16,10 @@ * MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include @@ -172,7 +176,7 @@ void gtk_multi_vpaned_set_adjust(GtkMultiVPaned * multi_vpaned, const TimeWindow { TimeInterval *time_span; double len, start; - Tab *tab = (Tab*)multi_vpaned->tab; + Tab *tab = (Tab *)g_object_get_data(G_OBJECT(multi_vpaned), "Tab_Info"); LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); @@ -219,7 +223,7 @@ void gtk_multi_vpaned_widget_add(GtkMultiVPaned * multi_vpaned, GtkWidget * widg { GtkPaned * tmpPane; GtkWidget * w; - Tab *tab = (Tab*)multi_vpaned->tab; + Tab *tab = (Tab *)g_object_get_data(G_OBJECT(multi_vpaned), "Tab_Info"); g_return_if_fail(GTK_IS_MULTI_VPANED(multi_vpaned)); g_object_ref(G_OBJECT(widget1)); @@ -277,11 +281,12 @@ void gtk_multi_vpaned_widget_add(GtkMultiVPaned * multi_vpaned, GtkWidget * widg void gtk_multi_vpaned_widget_delete(GtkMultiVPaned * multi_vpaned) { GtkPaned * tmp, *prev, *next; + GtkWidget *widget; if(!multi_vpaned->focused_pane) return; - tmp = (GtkPaned*)multi_vpaned->focused_pane->child2; //widget in vpaned - g_object_unref(G_OBJECT(tmp)); + widget = GTK_WIDGET(multi_vpaned->focused_pane->child2); //widget in vpaned + g_object_unref(G_OBJECT(widget)); if(multi_vpaned->focused_pane == multi_vpaned->first_pane && multi_vpaned->focused_pane == multi_vpaned->last_pane){ @@ -418,7 +423,7 @@ void gtk_multi_vpaned_scroll_value_changed(GtkAdjustment *adjust, gpointer multi GtkMultiVPaned * multi_vpaned = (GtkMultiVPaned*)multi_vpaned_arg; gdouble value = gtk_adjustment_get_value(adjust); gdouble upper, lower, ratio; - Tab *tab = (Tab*)multi_vpaned->tab; + Tab *tab = (Tab *)g_object_get_data(G_OBJECT(multi_vpaned), "Tab_Info"); LttvTracesetContext * tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);