diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-08-19 04:36:40 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-08-19 04:36:40 +0000 |
| commit | d4951b8e7ec0dd0e945d0732bb3d62954d0a0904 (patch) | |
| tree | 303a372e324138778d527b77aea257f241e07f31 | |
| parent | beebce0a291a3c35b3c726d79a1e47c9b2c6305b (diff) | |
| download | wireshark-d4951b8e7ec0dd0e945d0732bb3d62954d0a0904.tar.gz wireshark-d4951b8e7ec0dd0e945d0732bb3d62954d0a0904.tar.bz2 wireshark-d4951b8e7ec0dd0e945d0732bb3d62954d0a0904.zip | |
GTK 3.0 "Comment out" GTK 2 code for now. Functionality needs to be restored on GTK 3.
svn path=/trunk/; revision=38614
| -rw-r--r-- | gtk/iax2_analysis.c | 6 | ||||
| -rw-r--r-- | gtk/io_stat.c | 4 | ||||
| -rw-r--r-- | gtk/rtp_analysis.c | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/gtk/iax2_analysis.c b/gtk/iax2_analysis.c index 685f22fa8f..f9ea1b8f05 100644 --- a/gtk/iax2_analysis.c +++ b/gtk/iax2_analysis.c @@ -1562,13 +1562,15 @@ static void create_filter_box(dialog_graph_graph_t *dgg, GtkWidget *box, int num label=gtk_label_new(dgg->title); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - +#if GTK_CHECK_VERSION(3,0,0) + /* Fix me: Add the GTK 3.0 equivalents */ +#else gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &dgg->color); gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &dgg->color); gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, &dgg->color); gtk_widget_modify_fg(label, GTK_STATE_SELECTED, &dgg->color); gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, &dgg->color); - +#endif return; } diff --git a/gtk/io_stat.c b/gtk/io_stat.c index 4813162ae2..50a077cf91 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -2090,11 +2090,15 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num) gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); +#if GTK_CHECK_VERSION(3,0,0) + /* Fix me: Add the GTK 3.0 equivalents */ +#else gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &gio->color); gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &gio->color); gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, &gio->color); gtk_widget_modify_fg(label, GTK_STATE_SELECTED, &gio->color); gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, &gio->color); +#endif /* g_signal_connect(gio->display_button, "toggled", G_CALLBACK(filter_callback), gio);*/ diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index cc1fb73351..789b9a885c 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -1605,12 +1605,15 @@ static void create_filter_box(dialog_graph_graph_t *dgg, GtkWidget *box, int num gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); +#if GTK_CHECK_VERSION(3,0,0) + /* Fix me: Add the GTK 3.0 equivalents */ +#else gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &dgg->color); gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &dgg->color); gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, &dgg->color); gtk_widget_modify_fg(label, GTK_STATE_SELECTED, &dgg->color); gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, &dgg->color); - +#endif return; } |