More GTK warning fixes.

svn path=/trunk/netsurf/; revision=5523

3 files changed, 7 insertions, 6 deletions

diff --git a/gtk/gtk_tabs.c b/gtk/gtk_tabs.c
index c8ae0cdde..6a759dfdf 100644
--- a/gtk/gtk_tabs.c
+++ b/gtk/gtk_tabs.c
@@ -23,6 +23,7 @@
 #include "content/content.h"
 #include "desktop/options.h"
 #include "gtk/options.h"
+#include "gtk/gtk_tabs.h"
 
 #define TAB_WIDTH_N_CHARS 15
 #define GET_WIDGET(x) glade_xml_get_widget(gladeWindows, (x))
@@ -55,7 +56,6 @@ void nsgtk_tab_init(GtkWidget *tabs)
 
 void nsgtk_tab_add(struct gui_window *window)
 {
-        GtkWidget *scrollbar;
 	GtkNotebook *tabs = nsgtk_scaffolding_get_notebook(window);
 
 	GtkWidget *tabBox = nsgtk_tab_label_setup(window);
@@ -133,7 +133,6 @@ void nsgtk_tab_update_size(GtkWidget *hbox, GtkStyle *previous_style,
 {
 	PangoFontMetrics *metrics;
 	PangoContext *context;
-	GtkWidget *button;
 	int char_width, h, w;
 
 	context = gtk_widget_get_pango_context (hbox);
diff --git a/gtk/gtk_throbber.c b/gtk/gtk_throbber.c
index 0ccd89b5f..86b5f3318 100644
--- a/gtk/gtk_throbber.c
+++ b/gtk/gtk_throbber.c
@@ -97,13 +97,13 @@ bool nsgtk_throbber_initialise_from_png(const int frames, ...)
  * \return true on success.
  */
 #ifdef WITH_GIF
+extern gif_bitmap_callback_vt gif_bitmap_callbacks;	/**< external structure containing
+								*  bitmap callback functions */
 bool nsgtk_throbber_initialise_from_gif(const char *fn)
 {
 	/* disect the GIF provided by filename in *fn into a series of
 	 * GdkPixbuf for use later.
 	 */
-	extern gif_bitmap_callback_vt gif_bitmap_callbacks;	/**< external structure containing
-								*  bitmap callback functions */
 	gif_animation gif;
 	struct nsgtk_throbber throb;				/**< structure we generate */
 	int res;
diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c
index 41582aefd..e521e1b7d 100644
--- a/gtk/gtk_window.c
+++ b/gtk/gtk_window.c
@@ -386,12 +386,13 @@ gboolean nsgtk_window_button_press_event(GtkWidget *widget,
 	
 	browser_window_mouse_click(g->bw, g->mouse->state, g->mouse->pressed_x,
 			g->mouse->pressed_y);
+		
+	return TRUE;
 }
 
 gboolean nsgtk_window_button_release_event(GtkWidget *widget,
                                          GdkEventButton *event, gpointer data)
 {
-	int button;
 	struct gui_window *g = data;
 	bool shift = event->state & GDK_SHIFT_MASK;
 	bool ctrl = event->state & GDK_CONTROL_MASK;
@@ -571,7 +572,8 @@ gboolean nsgtk_window_size_allocate_event(GtkWidget *widget,
 void nsgtk_reflow_all_windows(void)
 {
 	for (struct gui_window *g = window_list; g; g = g->next) {
-                nsgtk_tab_options_changed(nsgtk_scaffolding_get_notebook(g));
+                nsgtk_tab_options_changed(GTK_WIDGET(
+							nsgtk_scaffolding_get_notebook(g)));
 		g->bw->reformat_pending = true;
         }