From bdf7affb1929f9fb588df2f9b0b2ec01661b7934 Mon Sep 17 00:00:00 2001 From: Rob Kendrick Date: Sat, 10 Feb 2007 02:21:32 +0000 Subject: Fix almost all warnings in gtk/ svn path=/trunk/netsurf/; revision=3173 --- gtk/gtk_bitmap.c | 3 +-- gtk/gtk_gui.c | 9 ++------- gtk/gtk_history.c | 11 ++++++----- gtk/gtk_options.c | 1 + gtk/gtk_scaffolding.c | 37 +------------------------------------ gtk/gtk_window.c | 2 +- utils/utils.h | 2 ++ 7 files changed, 14 insertions(+), 51 deletions(-) diff --git a/gtk/gtk_bitmap.c b/gtk/gtk_bitmap.c index 6a4606d37..a719485a8 100644 --- a/gtk/gtk_bitmap.c +++ b/gtk/gtk_bitmap.c @@ -17,6 +17,7 @@ #include #include #include "netsurf/content/content.h" +#include "netsurf/gtk/gtk_bitmap.h" #include "netsurf/gtk/gtk_scaffolding.h" #include "netsurf/image/bitmap.h" #include "netsurf/utils/log.h" @@ -239,7 +240,6 @@ gtk_bitmap_get_pretile_x(struct bitmap* bitmap) { if (!bitmap->pretile_x) { int width = gdk_pixbuf_get_width(bitmap->primary); - int height = gdk_pixbuf_get_height(bitmap->primary); int xmult = (MIN_PRETILE_WIDTH + width - 1)/width; LOG(("Pretiling %p for X*%d", bitmap, xmult)); bitmap->pretile_x = gtk_bitmap_generate_pretile(bitmap->primary, xmult, 1); @@ -257,7 +257,6 @@ GdkPixbuf * gtk_bitmap_get_pretile_y(struct bitmap* bitmap) { if (!bitmap->pretile_y) { - int width = gdk_pixbuf_get_width(bitmap->primary); int height = gdk_pixbuf_get_height(bitmap->primary); int ymult = (MIN_PRETILE_HEIGHT + height - 1)/height; LOG(("Pretiling %p for Y*%d", bitmap, ymult)); diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index b93dff021..ec52d735e 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -162,8 +162,8 @@ void gui_init(int argc, char** argv) find_resource(buf, "netsurf.xpm", "./gtk/res/netsurf.xpm"); gtk_window_set_default_icon_from_file(buf, NULL); - wndTooltip = glade_xml_get_widget(gladeWindows, "wndTooltip"); - labelTooltip = glade_xml_get_widget(gladeWindows, "tooltip"); + wndTooltip = GTK_WINDOW(glade_xml_get_widget(gladeWindows, "wndTooltip")); + labelTooltip = GTK_LABEL(glade_xml_get_widget(gladeWindows, "tooltip")); nsgtk_completion_init(); @@ -447,8 +447,3 @@ bool cookies_update(const char *domain, const struct cookie_data *data) { return true; } - -void nsgtk_choices_apply_clicked(GtkWidget *widget) { - LOG(("Apply button clicked!")); -} - diff --git a/gtk/gtk_history.c b/gtk/gtk_history.c index 424ce333e..a7b75ef1f 100644 --- a/gtk/gtk_history.c +++ b/gtk/gtk_history.c @@ -11,6 +11,7 @@ #include "netsurf/content/urldb.h" #include "netsurf/gtk/gtk_history.h" #include "netsurf/gtk/gtk_gui.h" +#include "netsurf/gtk/gtk_window.h" enum { @@ -89,22 +90,22 @@ bool nsgtk_history_add_internal(const char *url, const struct url_data *data) void nsgtk_history_selection_changed(GtkTreeSelection *treesel, gpointer g) { GtkTreeIter iter; - - if (gtk_tree_selection_get_selected(treesel, &history_tree, &iter)) + GtkTreeModel *model = GTK_TREE_MODEL(history_tree); + if (gtk_tree_selection_get_selected(treesel, &model, &iter)) { gchar *b; gint i; char buf[20]; - gtk_tree_model_get(history_tree, &iter, COL_ADDRESS, &b, -1); + gtk_tree_model_get(model, &iter, COL_ADDRESS, &b, -1); gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(gladeWindows, "labelHistoryAddress")), b); - gtk_tree_model_get(history_tree, &iter, COL_LASTVISIT, &b, -1); + gtk_tree_model_get(model, &iter, COL_LASTVISIT, &b, -1); gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(gladeWindows, "labelHistoryLastVisit")), b); - gtk_tree_model_get(history_tree, &iter, COL_TOTALVISITS, + gtk_tree_model_get(model, &iter, COL_TOTALVISITS, &i, -1); snprintf(buf, 20, "%d", i); gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(gladeWindows, diff --git a/gtk/gtk_options.c b/gtk/gtk_options.c index f91c4d2ee..820e1828c 100644 --- a/gtk/gtk_options.c +++ b/gtk/gtk_options.c @@ -16,6 +16,7 @@ #include "netsurf/gtk/gtk_gui.h" #include "netsurf/gtk/gtk_scaffolding.h" #include "netsurf/gtk/gtk_options.h" +#include "netsurf/gtk/gtk_window.h" GtkWindow *wndChoices; diff --git a/gtk/gtk_scaffolding.c b/gtk/gtk_scaffolding.c index 9460c91d6..f52397394 100644 --- a/gtk/gtk_scaffolding.c +++ b/gtk/gtk_scaffolding.c @@ -93,8 +93,6 @@ static gboolean nsgtk_window_url_changed(GtkWidget *, GdkEventKey *, gpointer); static gboolean nsgtk_history_expose_event(GtkWidget *, GdkEventExpose *, gpointer); -static gboolean nsgtk_history_motion_notify_event(GtkWidget *, GdkEventMotion *, - gpointer); static gboolean nsgtk_history_button_press_event(GtkWidget *, GdkEventButton *, gpointer); @@ -497,46 +495,13 @@ gboolean nsgtk_history_expose_event(GtkWidget *widget, return FALSE; } -gboolean nsgtk_history_motion_notify_event(GtkWidget *widget, - GdkEventMotion *event, gpointer g) -{ - /* if we're hovering over a history item, popup our tooltip bodge - * describing the page. - */ - struct gtk_history_window *gw = g; - struct browser_window *bw = nsgtk_get_browser_for_gui(gw->g->top_level); - const char *url; - int winx, winy; - -// if (!option_history_tooltip) -// return TRUE; - - url = history_position_url(bw->history, event->x, event->y); - if (url == NULL) { - gtk_widget_hide(GTK_WIDGET(wndTooltip)); - return TRUE; - } - - gtk_label_set_text(labelTooltip, url); - gtk_window_get_position(gw->g->window, &winx, &winy); - - LOG(("winx = %d, winy = %d, event->x = %d, event->y = %d", - winx, winy, (int)(event->x), (int)(event->y))); - - gtk_widget_show(GTK_WIDGET(wndTooltip)); - LOG(("Move")); - gtk_window_move(wndTooltip, event->x + winx, event->y + winy); - - return TRUE; -} - gboolean nsgtk_history_button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer g) { struct gtk_history_window *hw = (struct gtk_history_window *)g; struct browser_window *bw = nsgtk_get_browser_for_gui(hw->g->top_level); - LOG(("X=%d, Y=%d", event->x, event->y)); + LOG(("X=%g, Y=%g", event->x, event->y)); history_click(bw, bw->history, event->x, event->y, false); diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c index 6b72932bd..2c0ef8722 100644 --- a/gtk/gtk_window.c +++ b/gtk/gtk_window.c @@ -131,7 +131,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, GTK_WIDGET(g->fixed)); gtk_scrolled_window_set_shadow_type(g->scrolledwindow, GTK_SHADOW_NONE); - g->viewport = gtk_bin_get_child(GTK_BIN(g->scrolledwindow)); + g->viewport = GTK_VIEWPORT(gtk_bin_get_child(GTK_BIN(g->scrolledwindow))); /* Attach ourselves into our parent at the right point */ nsgtk_gui_window_attach_child(bw->parent->window, g); } else { diff --git a/utils/utils.h b/utils/utils.h index 85e6ebede..bd7ab166e 100644 --- a/utils/utils.h +++ b/utils/utils.h @@ -55,7 +55,9 @@ void regcomp_wrapper(regex_t *preg, const char *regex, int cflags); void unicode_transliterate(unsigned int c, char **r); char *human_friendly_bytesize(unsigned long bytesize); const char *rfc1123_date(time_t t); +#ifndef _GNU_SOURCE char *strcasestr(const char *haystack, const char *needle); +#endif unsigned int wallclock(void); char *make_useragent(void); #ifdef __FreeBSD__ -- cgit v1.2.3