aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-12-12 13:12:26 -0800
committerGuy Harris <guy@alum.mit.edu>2016-12-12 21:12:58 +0000
commit9e9b5ecc0c001b8f742746b2b9f0104bab9a9d9a (patch)
tree022227b3eba93ae1df728eee38972ec22099f395
parent334485f65b1f35b193b18780cb7c166f62e1ffc9 (diff)
Move the declaration of packet_list_select_last_row() to ui/gtk/packet_list.h.
It's GTK+-only, so it shouldn't be in ui/ui_util.h. Get rid of the unused Qt packet list implementation of it. Change-Id: Ia9f8fe2209939dff5244e6948c36f29509340f68 Reviewed-on: https://code.wireshark.org/review/19226 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--ui/gtk/goto_dlg.c3
-rw-r--r--ui/gtk/packet_list.h1
-rw-r--r--ui/qt/packet_list.cpp9
-rw-r--r--ui/ui_util.h1
4 files changed, 2 insertions, 12 deletions
diff --git a/ui/gtk/goto_dlg.c b/ui/gtk/goto_dlg.c
index dbfee24b8c..65a5bd86f2 100644
--- a/ui/gtk/goto_dlg.c
+++ b/ui/gtk/goto_dlg.c
@@ -27,7 +27,6 @@
#include <stdlib.h>
-
#include "../../globals.h"
#include "ui/simple_dialog.h"
@@ -35,7 +34,7 @@
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/help_dlg.h"
-
+#include "ui/gtk/packet_list.h"
/* Capture callback data keys */
#define E_GOTO_FNUMBER_KEY "goto_fnumber_te"
diff --git a/ui/gtk/packet_list.h b/ui/gtk/packet_list.h
index 59fd5865fe..9c2a9d1ff5 100644
--- a/ui/gtk/packet_list.h
+++ b/ui/gtk/packet_list.h
@@ -54,6 +54,7 @@ void packet_list_column_menu_cb (GtkWidget *w, gpointer data, COLUMN_SELECTED_E
void packet_list_resize_columns_cb(GtkWidget *widget _U_, gpointer data _U_);
gboolean packet_list_get_event_row_column(GdkEventButton *event_button, gint *physical_row, gint *row, gint *column);
guint packet_list_get_column_id (gint col_num);
+void packet_list_select_last_row(void);
/** Set the font of the packet list window.
*
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index 50985d8070..b5f5493a77 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -123,15 +123,6 @@ packet_list_select_first_row(void)
gbl_cur_packet_list->goFirstPacket();
}
-// GTK+ only
-void
-packet_list_select_last_row(void)
-{
- if (!gbl_cur_packet_list)
- return;
- gbl_cur_packet_list->goLastPacket();
-}
-
/*
* Given a frame_data structure, scroll to and select the row in the
* packet list corresponding to that frame. If there is no such
diff --git a/ui/ui_util.h b/ui/ui_util.h
index 1e9176a49b..5a20ab7b8e 100644
--- a/ui/ui_util.h
+++ b/ui/ui_util.h
@@ -77,7 +77,6 @@ void packet_list_set_selected_row(gint row);
void packet_list_enable_color(gboolean enable);
void packet_list_queue_draw(void);
void packet_list_select_first_row(void);
-void packet_list_select_last_row(void); /* GTK+ only */
void packet_list_moveto_end(void);
gboolean packet_list_check_end(void); /* GTK+ only */
gboolean packet_list_select_row_from_data(frame_data *fdata_needle);