Make the routines that manipulate the hex/text display window take a

GtkWidget * as an argument, rather than a version-of-GTK+-dependent
pointer; that way, we need fewer #ifdefs.

Use WIDGET_SET_SIZE() instead of #ifdeffed code using
gtk_widget_set_usize() or gtk_widget_set_size_request() -
WIDGET_SET_SIZE() was created to encapsulate that GTK+ 1.2[.x] vs. 2.x
difference.

Make some variables not used outside gtk/main.c static.

Clean up white space.

Clean up handling of return value from load_airpcap() a bit.

Use one big #ifdef HAVE_AIRPCAP/#endif for all the AirPcap stuff in
gtk/main.c.

Attach _U_ to the unused arguments to driver_warning_dialog_cb(), not to
the arguments that are being used - and don't include it at all if
HAVE_AIRPCAP isn't defined, as it's not used in that case.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19798 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 3 insertions, 22 deletions

diff --git a/gtk/proto_draw.h b/gtk/proto_draw.h
index e5928b8b56..d49930c03f 100644
--- a/gtk/proto_draw.h
+++ b/gtk/proto_draw.h
@@ -116,7 +116,6 @@ extern void savehex_cb(GtkWidget * w, gpointer data);
  */
 extern void copy_hex_cb(GtkWidget * w, gpointer data, int data_type);
 
-#if GTK_MAJOR_VERSION < 2
 /** Redraw a given byte view window.
  *
  * @param bv the byte view
@@ -125,7 +124,7 @@ extern void copy_hex_cb(GtkWidget * w, gpointer data, int data_type);
  * @param finfo the current field info
  * @param len the byte view length
  */
-extern void packet_hex_print(GtkText *bv, const guint8 *pd, frame_data *fd,
+extern void packet_hex_print(GtkWidget *bv, const guint8 *pd, frame_data *fd,
 		 field_info *finfo, guint len);
 
 /**
@@ -134,33 +133,15 @@ extern void packet_hex_print(GtkText *bv, const guint8 *pd, frame_data *fd,
  *
  * @param bv the byte view
  */
-extern void packet_hex_reprint(GtkText *bv);
+extern void packet_hex_reprint(GtkWidget *bv);
 
+#if GTK_MAJOR_VERSION < 2
 /** Set a new font for all protocol trees.
  *
  * @param font the new font
  */
 extern void set_ptree_font_all(GdkFont *font);
 #else
-/** Redraw a given byte view window.
- *
- * @param bv the byte view
- * @param pd the packet data
- * @param fd the current fame
- * @param finfo the current field info
- * @param len the byte view length
- */
-extern void packet_hex_print(GtkTextView *bv, const guint8 *pd, frame_data *fd,
-		 field_info *finfo, guint len);
-
-/**
- * Redraw the text using the saved information. Usually called if
- * the preferences have changed.
- *
- * @param bv the byte view
- */
-extern void packet_hex_reprint(GtkTextView *bv);
-
 /** Set a new font for all protocol trees.
  *
  * @param font the new font