diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-19 14:33:50 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-19 14:33:50 +0000 |
| commit | 7525fa89e425e0b9024d8c7f43de68bc30e1120e (patch) | |
| tree | 65187b8182cb54ec5afa33ccc790c67eca423853 /gtk/rtp_analysis.c | |
| parent | 90b9c8585894b840d76629c215688aca5b658c70 (diff) | |
Get rid of all GtkAdjustment element accesses. Fix a bug
introduced when fixing this stuff for rtp_player.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38111 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/rtp_analysis.c')
| -rw-r--r-- | gtk/rtp_analysis.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index fa170c604e..f9e644dd80 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -1284,6 +1284,17 @@ static void dialog_graph_draw(user_data_t* user_data) /* update the scrollbar */ +#if GTK_CHECK_VERSION(2,18,0) + gtk_adjustment_set_upper(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) user_data->dlg.dialog_graph.max_interval); + gtk_adjustment_set_step_increment(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) ((last_interval-first_interval)/10)); + gtk_adjustment_set_page_increment(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) (last_interval-first_interval)); + if((last_interval-first_interval)*100 < user_data->dlg.dialog_graph.max_interval){ + gtk_adjustment_set_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) (user_data->dlg.dialog_graph.max_interval/100)); + } else { + gtk_adjustment_set_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) (last_interval-first_interval)); + } + gtk_adjustment_set_value(user_data->dlg.dialog_graph.scrollbar_adjustment, last_interval - gtk_adjustment_get_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment)); +#else user_data->dlg.dialog_graph.scrollbar_adjustment->upper=(gfloat) user_data->dlg.dialog_graph.max_interval; user_data->dlg.dialog_graph.scrollbar_adjustment->step_increment=(gfloat) ((last_interval-first_interval)/10); user_data->dlg.dialog_graph.scrollbar_adjustment->page_increment=(gfloat) (last_interval-first_interval); @@ -1293,6 +1304,7 @@ static void dialog_graph_draw(user_data_t* user_data) user_data->dlg.dialog_graph.scrollbar_adjustment->page_size=(gfloat) (last_interval-first_interval); } user_data->dlg.dialog_graph.scrollbar_adjustment->value=last_interval-user_data->dlg.dialog_graph.scrollbar_adjustment->page_size; +#endif gtk_adjustment_changed(user_data->dlg.dialog_graph.scrollbar_adjustment); gtk_adjustment_value_changed(user_data->dlg.dialog_graph.scrollbar_adjustment); @@ -1388,7 +1400,11 @@ static gint scrollbar_changed(GtkWidget *widget _U_, gpointer data) user_data_t *user_data=(user_data_t *)data; guint32 mi; +#if GTK_CHECK_VERSION(2,14,0) + mi=(guint32) (gtk_adjustment_get_value(user_data->dlg.dialog_graph.scrollbar_adjustment) + gtk_adjustment_get_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment)); +#else mi=(guint32) (user_data->dlg.dialog_graph.scrollbar_adjustment->value+user_data->dlg.dialog_graph.scrollbar_adjustment->page_size); +#endif if(user_data->dlg.dialog_graph.last_interval==mi){ return TRUE; } |