osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

the last commit broke windows compilation. 

minor changes in typing variables
 exclude a GTK2 call from being called while using GTK1


svn path=/trunk/; revision=13539
This commit is contained in:
Luis Ontanon 2005-02-27 20:17:06 +00:00
parent 972ca3c8c9
commit c81ca733db
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/stats_tree_stat.c
View File

@ -67,7 +67,7 @@ struct _tree_pres {
GtkTreeStore* store; GtkTreeStore* store;
GtkWidget* tree; GtkWidget* tree;
#else #else
struct GtkText* textbox; GtkWidget* textbox;
#endif #endif
}; };
@ -164,7 +164,7 @@ static void draw_gtk_tree( void *psp ) {
gtk_text_freeze(GTK_TEXT(st->pr->textbox)); gtk_text_freeze(GTK_TEXT(st->pr->textbox));
gtk_text_set_point(GTK_TEXT(st->pr->textbox),0); gtk_text_set_point(GTK_TEXT(st->pr->textbox),0);
gtk_text_forward_delete(GTK_TEXT(st->pr->textbox),gtk_text_get_length(st->pr->textbox)); gtk_text_forward_delete(GTK_TEXT(st->pr->textbox),gtk_text_get_length(GTK_TEXT(st->pr->textbox)));
gtk_text_insert(GTK_TEXT(st->pr->textbox),NULL, gtk_text_insert(GTK_TEXT(st->pr->textbox),NULL,
NULL,NULL,text->str,-1); NULL,NULL,text->str,-1);
gtk_text_thaw(GTK_TEXT(st->pr->textbox)); gtk_text_thaw(GTK_TEXT(st->pr->textbox));
@ -317,8 +317,10 @@ static void init_gtk_tree(char* optarg) {
gtk_widget_show_all(st->pr->win); gtk_widget_show_all(st->pr->win);
window_present(st->pr->win); window_present(st->pr->win);
#if GTK_MAJOR_VERSION >= 2
gtk_tree_view_set_model(GTK_TREE_VIEW(st->pr->tree),GTK_TREE_MODEL(st->pr->store)); gtk_tree_view_set_model(GTK_TREE_VIEW(st->pr->tree),GTK_TREE_MODEL(st->pr->store));
#endif
if (st->filter) { if (st->filter) {
reinit_stats_tree(st); reinit_stats_tree(st);
} else { } else {