From 8ffc6439a75f54ed77aa770c464297c80cedb195 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 17 May 2012 16:48:20 +0000 Subject: fix build on gtk 2.12 svn path=/trunk/netsurf/; revision=13927 --- gtk/compat.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++ gtk/compat.h | 20 ++++++++--- gtk/dialogs/about.c | 10 +++--- gtk/dialogs/source.c | 4 +-- gtk/gui.c | 2 +- gtk/scaffolding.c | 10 +++--- gtk/theme.c | 4 ++- gtk/treeview.c | 46 ++++++++++++------------ gtk/window.c | 82 +++++++++++++++++++++---------------------- 9 files changed, 195 insertions(+), 82 deletions(-) diff --git a/gtk/compat.c b/gtk/compat.c index 191351408..98e4de3ad 100644 --- a/gtk/compat.c +++ b/gtk/compat.c @@ -24,6 +24,10 @@ #include "gtk/compat.h" +#if !GTK_CHECK_VERSION(2,16,0) +#include "gtk/sexy_icon_entry.c" +#endif + void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus) { #if GTK_CHECK_VERSION(2,22,0) @@ -250,7 +254,11 @@ GtkStateFlags nsgtk_widget_get_state_flags(GtkWidget *widget) #if GTK_CHECK_VERSION(3,0,0) return gtk_widget_get_state_flags(widget); #else +#if GTK_CHECK_VERSION(2,18,0) return gtk_widget_get_state(widget); +#else + return 0; /* FIXME */ +#endif #endif } @@ -300,4 +308,95 @@ void nsgtk_widget_modify_font(GtkWidget *widget, PangoFontDescription *font_desc #endif } +GdkWindow *nsgtk_widget_get_window(GtkWidget *widget) +{ +#if GTK_CHECK_VERSION(2,14,0) +return gtk_widget_get_window(widget); +#else + return widget->window; +#endif +} + +GtkWidget *nsgtk_dialog_get_content_area(GtkDialog *dialog) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_dialog_get_content_area(dialog); +#else + return dialog->vbox; +#endif +} + +GtkWidget *nsgtk_dialog_get_action_area(GtkDialog *dialog) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_dialog_get_action_area(dialog); +#else + return dialog->action_area; +#endif +} + +gboolean nsgtk_show_uri(GdkScreen *screen, const gchar *uri, guint32 timestamp, GError **error) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_show_uri(screen, uri, timestamp, error); +#else + return FALSE; /* FIXME */ +#endif +} + +GdkWindow *nsgtk_layout_get_bin_window(GtkLayout *layout) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_layout_get_bin_window(layout); +#else + return layout->bin_window; +#endif +} + +gdouble nsgtk_adjustment_get_step_increment(GtkAdjustment *adjustment) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_adjustment_get_step_increment(adjustment); +#else + return adjustment->step_increment; +#endif +} + +gdouble nsgtk_adjustment_get_upper(GtkAdjustment *adjustment) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_adjustment_get_upper(adjustment); +#else + return adjustment->upper; +#endif +} + +gdouble nsgtk_adjustment_get_lower(GtkAdjustment *adjustment) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_adjustment_get_lower(adjustment); +#else + return adjustment->lower; +#endif +} +gdouble nsgtk_adjustment_get_page_increment(GtkAdjustment *adjustment) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_adjustment_get_page_increment(adjustment); +#else + return adjustment->page_increment; +#endif +} + +void nsgtk_widget_get_allocation(GtkWidget *widget, GtkAllocation *allocation) +{ +#if GTK_CHECK_VERSION(2,18,0) + gtk_widget_get_allocation(widget, allocation); +#else + allocation->x = widget->allocation.x; + allocation->y = widget->allocation.y; + allocation->width = widget->allocation.width; + allocation->height = widget->allocation.height; +#endif +} diff --git a/gtk/compat.h b/gtk/compat.h index dea23e1db..ff3222ca9 100644 --- a/gtk/compat.h +++ b/gtk/compat.h @@ -62,10 +62,6 @@ GtkWidget *nsgtk_entry_new(void); void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf); void nsgtk_entry_set_icon_from_stock(GtkWidget *entry, GtkEntryIconPosition icon_pos, const gchar *stock_id); void nsgtk_widget_override_background_color(GtkWidget *widget, GtkStateFlags state, uint16_t a, uint16_t r, uint16_t g, uint16_t b); -GtkAdjustment *nsgtk_layout_get_vadjustment(GtkLayout *layout); -GtkAdjustment *nsgtk_layout_get_hadjustment(GtkLayout *layout); -void nsgtk_layout_set_hadjustment(GtkLayout *layout, GtkAdjustment *adj); -void nsgtk_layout_set_vadjustment(GtkLayout *layout, GtkAdjustment *adj); GtkWidget* nsgtk_hbox_new(gboolean homogeneous, gint spacing); GtkWidget* nsgtk_vbox_new(gboolean homogeneous, gint spacing); GtkStateFlags nsgtk_widget_get_state_flags(GtkWidget *widget); @@ -74,5 +70,21 @@ const PangoFontDescription* nsgtk_style_context_get_font(GtkStyleContext *style, gulong nsgtk_connect_draw_event(GtkWidget *widget, GCallback callback, gpointer g); void nsgdk_cursor_unref(GdkCursor *cursor); void nsgtk_widget_modify_font(GtkWidget *widget, PangoFontDescription *font_desc); +GdkWindow *nsgtk_widget_get_window(GtkWidget *widget); +GtkWidget *nsgtk_dialog_get_action_area(GtkDialog *dialog); +GtkWidget *nsgtk_dialog_get_content_area(GtkDialog *dialog); +gboolean nsgtk_show_uri(GdkScreen *screen, const gchar *uri, guint32 timestamp, GError **error); +GdkWindow *nsgtk_layout_get_bin_window(GtkLayout *layout); +void nsgtk_widget_get_allocation(GtkWidget *widget, GtkAllocation *allocation); + +GtkAdjustment *nsgtk_layout_get_vadjustment(GtkLayout *layout); +GtkAdjustment *nsgtk_layout_get_hadjustment(GtkLayout *layout); +void nsgtk_layout_set_hadjustment(GtkLayout *layout, GtkAdjustment *adj); +void nsgtk_layout_set_vadjustment(GtkLayout *layout, GtkAdjustment *adj); +gdouble nsgtk_adjustment_get_step_increment(GtkAdjustment *adjustment); +gdouble nsgtk_adjustment_get_upper(GtkAdjustment *adjustment); +gdouble nsgtk_adjustment_get_lower(GtkAdjustment *adjustment); +gdouble nsgtk_adjustment_get_page_increment(GtkAdjustment *adjustment); + #endif /* NETSURF_GTK_COMPAT_H */ diff --git a/gtk/dialogs/about.c b/gtk/dialogs/about.c index c75a9787b..35150ff5d 100644 --- a/gtk/dialogs/about.c +++ b/gtk/dialogs/about.c @@ -59,7 +59,7 @@ void nsgtk_about_dialog_init(GtkWindow *parent, vbox = nsgtk_vbox_new(FALSE, 8); - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(nsgtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0); if (pixbufs != NULL) { GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf(GDK_PIXBUF(g_list_nth_data(pixbufs, 0))); @@ -103,16 +103,16 @@ void nsgtk_about_dialog_init(GtkWindow *parent, /* Add the credits button */ button = gtk_button_new_from_stock ("Credits"); - gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), + gtk_box_pack_end(GTK_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, FALSE, TRUE, 0); - gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE); + gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE); g_signal_connect(button, "clicked", G_CALLBACK(nsgtk_about_dialog_credits), (gpointer)bw); /* Add the Licence button */ button = gtk_button_new_from_stock ("Licence"); - gtk_box_pack_end(GTK_BOX (GTK_DIALOG(gtk_dialog_get_action_area(GTK_DIALOG(dialog)))), + gtk_box_pack_end(GTK_BOX (GTK_DIALOG(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog)))), button, FALSE, TRUE, 0); - gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE); + gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE); g_signal_connect(button, "clicked", G_CALLBACK(nsgtk_about_dialog_licence), (gpointer)bw); diff --git a/gtk/dialogs/source.c b/gtk/dialogs/source.c index a364b3804..ad2ee2c63 100644 --- a/gtk/dialogs/source.c +++ b/gtk/dialogs/source.c @@ -332,7 +332,7 @@ static void nsgtk_source_file_save(GtkWindow *parent, const char *filename, warn[len] = '\0'; label = gtk_label_new(warn); - gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(confd))), + gtk_container_add(GTK_CONTAINER(nsgtk_dialog_get_content_area(GTK_DIALOG(confd))), label); gtk_widget_show(label); if (gtk_dialog_run(GTK_DIALOG(confd)) == GTK_RESPONSE_ACCEPT) { @@ -360,7 +360,7 @@ static void nsgtk_source_file_save(GtkWindow *parent, const char *filename, g_signal_connect_swapped(notif, "response", G_CALLBACK(gtk_widget_destroy), notif); label = gtk_label_new(temp); - gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(notif))), label); + gtk_container_add(GTK_CONTAINER(nsgtk_dialog_get_content_area(GTK_DIALOG(notif))), label); gtk_widget_show_all(notif); } diff --git a/gtk/gui.c b/gtk/gui.c index c7e90aeb1..1e23d07b9 100644 --- a/gtk/gui.c +++ b/gtk/gui.c @@ -670,7 +670,7 @@ void gui_launch_url(const char *url) gboolean ok; GError *error = NULL; - ok = gtk_show_uri(NULL, url, GDK_CURRENT_TIME, &error); + ok = nsgtk_show_uri(NULL, url, GDK_CURRENT_TIME, &error); if (ok == TRUE) return; diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index f09dc446c..990444e3b 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -1410,7 +1410,7 @@ MULTIHANDLER(localhistory) gtk_widget_show(GTK_WIDGET(g->history_window->window)); gtk_window_move(g->history_window->window, x + g->historybase, y + g->toolbarbase); - gdk_window_raise(gtk_widget_get_window(GTK_WIDGET(g->history_window->window))); + gdk_window_raise(nsgtk_widget_get_window(GTK_WIDGET(g->history_window->window))); return TRUE; } @@ -1418,7 +1418,7 @@ MULTIHANDLER(localhistory) MULTIHANDLER(globalhistory) { gtk_widget_show(GTK_WIDGET(wndHistory)); - gdk_window_raise(gtk_widget_get_window(GTK_WIDGET(wndHistory))); + gdk_window_raise(nsgtk_widget_get_window(GTK_WIDGET(wndHistory))); return TRUE; } @@ -1437,7 +1437,7 @@ MULTIHANDLER(addbookmarks) MULTIHANDLER(showbookmarks) { gtk_widget_show(GTK_WIDGET(wndHotlist)); - gdk_window_raise(gtk_widget_get_window(GTK_WIDGET(wndHotlist))); + gdk_window_raise(nsgtk_widget_get_window(GTK_WIDGET(wndHotlist))); gtk_window_set_focus(wndHotlist, NULL); return TRUE; @@ -1446,7 +1446,7 @@ MULTIHANDLER(showbookmarks) MULTIHANDLER(showcookies) { gtk_widget_show(GTK_WIDGET(wndCookies)); - gdk_window_raise(gtk_widget_get_window(GTK_WIDGET(wndCookies))); + gdk_window_raise(nsgtk_widget_get_window(GTK_WIDGET(wndCookies))); return TRUE; } @@ -1577,7 +1577,7 @@ nsgtk_history_draw_event(GtkWidget *widget, GdkEventExpose *event, gpointer g) current_widget = widget; - current_cr = gdk_cairo_create(gtk_widget_get_window(widget)); + current_cr = gdk_cairo_create(nsgtk_widget_get_window(widget)); clip.x0 = event->area.x; clip.y0 = event->area.y; diff --git a/gtk/theme.c b/gtk/theme.c index a8c33225c..f16bd2d11 100644 --- a/gtk/theme.c +++ b/gtk/theme.c @@ -18,12 +18,14 @@ #include #include +#include #include #include #include "content/content.h" #include "content/content_type.h" #include "content/hlcache.h" +#include "gtk/compat.h" #include "gtk/gui.h" #include "gtk/scaffolding.h" #include "gtk/menu.h" @@ -254,7 +256,7 @@ void nsgtk_theme_add(const char *themename) } g_signal_connect_swapped(notification, "response", G_CALLBACK(gtk_widget_destroy), notification); - gtk_container_add(GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(notification))), label); + gtk_container_add(GTK_CONTAINER(nsgtk_dialog_get_action_area(GTK_DIALOG(notification))), label); gtk_widget_show_all(notification); /* update combo */ diff --git a/gtk/treeview.c b/gtk/treeview.c index ca936ef5f..efba9c410 100644 --- a/gtk/treeview.c +++ b/gtk/treeview.c @@ -215,7 +215,7 @@ nsgtk_tree_window_draw_event(GtkWidget *widget, GdkEventExpose *event, gpointer height = event->area.height; current_widget = widget; - current_cr = gdk_cairo_create(gtk_widget_get_window(widget)); + current_cr = gdk_cairo_create(nsgtk_widget_get_window(widget)); tree_set_redraw(tree, true); tree_draw(tree, 0, 0, x, y, width, height, &ctx); @@ -422,7 +422,7 @@ gboolean nsgtk_tree_window_keypress_event(GtkWidget *widget, GdkEventKey *event, if (edited) break; scroll = vscroll; - value = gtk_adjustment_get_lower(scroll); + value = nsgtk_adjustment_get_lower(scroll); break; case GDK_KEY(End): @@ -430,9 +430,9 @@ gboolean nsgtk_tree_window_keypress_event(GtkWidget *widget, GdkEventKey *event, if (edited) break; scroll = vscroll; - value = gtk_adjustment_get_upper(scroll) - vpage; - if (value < gtk_adjustment_get_lower(scroll)) - value = gtk_adjustment_get_lower(scroll); + value = nsgtk_adjustment_get_upper(scroll) - vpage; + if (value < nsgtk_adjustment_get_lower(scroll)) + value = nsgtk_adjustment_get_lower(scroll); break; case GDK_KEY(Left): @@ -441,18 +441,18 @@ gboolean nsgtk_tree_window_keypress_event(GtkWidget *widget, GdkEventKey *event, break; scroll = hscroll; value = gtk_adjustment_get_value(scroll) - - gtk_adjustment_get_step_increment(scroll); - if (value < gtk_adjustment_get_lower(scroll)) - value = gtk_adjustment_get_lower(scroll); + nsgtk_adjustment_get_step_increment(scroll); + if (value < nsgtk_adjustment_get_lower(scroll)) + value = nsgtk_adjustment_get_lower(scroll); break; case GDK_KEY(Up): case GDK_KEY(KP_Up): scroll = vscroll; value = gtk_adjustment_get_value(scroll) - - gtk_adjustment_get_step_increment(scroll); - if (value < gtk_adjustment_get_lower(scroll)) - value = gtk_adjustment_get_lower(scroll); + nsgtk_adjustment_get_step_increment(scroll); + if (value < nsgtk_adjustment_get_lower(scroll)) + value = nsgtk_adjustment_get_lower(scroll); break; case GDK_KEY(Right): @@ -461,28 +461,28 @@ gboolean nsgtk_tree_window_keypress_event(GtkWidget *widget, GdkEventKey *event, break; scroll = hscroll; value = gtk_adjustment_get_value(scroll) + - gtk_adjustment_get_step_increment(scroll); - if (value > gtk_adjustment_get_upper(scroll) - hpage) - value = gtk_adjustment_get_upper(scroll) - hpage; + nsgtk_adjustment_get_step_increment(scroll); + if (value > nsgtk_adjustment_get_upper(scroll) - hpage) + value = nsgtk_adjustment_get_upper(scroll) - hpage; break; case GDK_KEY(Down): case GDK_KEY(KP_Down): scroll = vscroll; value = gtk_adjustment_get_value(scroll) + - gtk_adjustment_get_step_increment(scroll); - if (value > gtk_adjustment_get_upper(scroll) - vpage) - value = gtk_adjustment_get_upper(scroll) - vpage; + nsgtk_adjustment_get_step_increment(scroll); + if (value > nsgtk_adjustment_get_upper(scroll) - vpage) + value = nsgtk_adjustment_get_upper(scroll) - vpage; break; case GDK_KEY(Page_Up): case GDK_KEY(KP_Page_Up): scroll = vscroll; value = gtk_adjustment_get_value(scroll) - - gtk_adjustment_get_page_increment(scroll); + nsgtk_adjustment_get_page_increment(scroll); - if (value < gtk_adjustment_get_lower(scroll)) - value = gtk_adjustment_get_lower(scroll); + if (value < nsgtk_adjustment_get_lower(scroll)) + value = nsgtk_adjustment_get_lower(scroll); break; @@ -490,10 +490,10 @@ gboolean nsgtk_tree_window_keypress_event(GtkWidget *widget, GdkEventKey *event, case GDK_KEY(KP_Page_Down): scroll = vscroll; value = gtk_adjustment_get_value(scroll) + - gtk_adjustment_get_page_increment(scroll); + nsgtk_adjustment_get_page_increment(scroll); - if (value > gtk_adjustment_get_upper(scroll) - vpage) - value = gtk_adjustment_get_upper(scroll) - vpage; + if (value > nsgtk_adjustment_get_upper(scroll) - vpage) + value = nsgtk_adjustment_get_upper(scroll) - vpage; break; default: diff --git a/gtk/window.c b/gtk/window.c index bf5f022da..a9283f0e3 100644 --- a/gtk/window.c +++ b/gtk/window.c @@ -218,7 +218,7 @@ nsgtk_window_draw_event(GtkWidget *widget, GdkEventExpose *event, gpointer data) assert(GTK_WIDGET(gw->layout) == widget); current_widget = (GtkWidget *)gw->layout; - current_cr = gdk_cairo_create(gtk_layout_get_bin_window(gw->layout)); + current_cr = gdk_cairo_create(nsgtk_layout_get_bin_window(gw->layout)); clip.x0 = event->area.x; clip.y0 = event->area.y; @@ -391,10 +391,10 @@ static gboolean nsgtk_window_scroll_event(GtkWidget *widget, /* core did not handle event do horizontal scroll */ value = gtk_adjustment_get_value(hscroll) - - (gtk_adjustment_get_step_increment(hscroll) *2); + (nsgtk_adjustment_get_step_increment(hscroll) *2); - if (value < gtk_adjustment_get_lower(hscroll)) { - value = gtk_adjustment_get_lower(hscroll); + if (value < nsgtk_adjustment_get_lower(hscroll)) { + value = nsgtk_adjustment_get_lower(hscroll); } gtk_adjustment_set_value(hscroll, value); @@ -411,10 +411,10 @@ static gboolean nsgtk_window_scroll_event(GtkWidget *widget, */ value = gtk_adjustment_get_value(vscroll) - - (gtk_adjustment_get_step_increment(vscroll) * 2); + (nsgtk_adjustment_get_step_increment(vscroll) * 2); - if (value < gtk_adjustment_get_lower(vscroll)) { - value = gtk_adjustment_get_lower(vscroll); + if (value < nsgtk_adjustment_get_lower(vscroll)) { + value = nsgtk_adjustment_get_lower(vscroll); } gtk_adjustment_set_value(vscroll, value); @@ -432,13 +432,13 @@ static gboolean nsgtk_window_scroll_event(GtkWidget *widget, */ value = gtk_adjustment_get_value(hscroll) + - (gtk_adjustment_get_step_increment(hscroll) * 2); + (nsgtk_adjustment_get_step_increment(hscroll) * 2); /* @todo consider gtk_widget_get_allocated_width() */ - gtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); + nsgtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); - if (value > gtk_adjustment_get_upper(hscroll) - alloc.width) { - value = gtk_adjustment_get_upper(hscroll) - + if (value > nsgtk_adjustment_get_upper(hscroll) - alloc.width) { + value = nsgtk_adjustment_get_upper(hscroll) - alloc.width; } @@ -456,12 +456,12 @@ static gboolean nsgtk_window_scroll_event(GtkWidget *widget, */ value = gtk_adjustment_get_value(vscroll) + - (gtk_adjustment_get_step_increment(vscroll) * 2); + (nsgtk_adjustment_get_step_increment(vscroll) * 2); /* @todo consider gtk_widget_get_allocated_height */ - gtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); + nsgtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); - if (value > gtk_adjustment_get_upper(vscroll) - alloc.height) { - value = gtk_adjustment_get_upper(vscroll) - + if (value > nsgtk_adjustment_get_upper(vscroll) - alloc.height) { + value = nsgtk_adjustment_get_upper(vscroll) - alloc.height; } @@ -494,22 +494,22 @@ static gboolean nsgtk_window_keypress_event(GtkWidget *widget, GtkAllocation alloc; /* @todo consider gtk_widget_get_allocated_width() */ - gtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); + nsgtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); switch (event->keyval) { case GDK_KEY(Home): case GDK_KEY(KP_Home): - value = gtk_adjustment_get_lower(vscroll); + value = nsgtk_adjustment_get_lower(vscroll); gtk_adjustment_set_value(vscroll, value); break; case GDK_KEY(End): case GDK_KEY(KP_End): - value = gtk_adjustment_get_upper(vscroll) - alloc.height; + value = nsgtk_adjustment_get_upper(vscroll) - alloc.height; - if (value < gtk_adjustment_get_lower(vscroll)) - value = gtk_adjustment_get_lower(vscroll); + if (value < nsgtk_adjustment_get_lower(vscroll)) + value = nsgtk_adjustment_get_lower(vscroll); gtk_adjustment_set_value(vscroll, value); break; @@ -517,10 +517,10 @@ static gboolean nsgtk_window_keypress_event(GtkWidget *widget, case GDK_KEY(Left): case GDK_KEY(KP_Left): value = gtk_adjustment_get_value(hscroll) - - gtk_adjustment_get_step_increment(hscroll); + nsgtk_adjustment_get_step_increment(hscroll); - if (value < gtk_adjustment_get_lower(hscroll)) - value = gtk_adjustment_get_lower(hscroll); + if (value < nsgtk_adjustment_get_lower(hscroll)) + value = nsgtk_adjustment_get_lower(hscroll); gtk_adjustment_set_value(hscroll, value); break; @@ -528,10 +528,10 @@ static gboolean nsgtk_window_keypress_event(GtkWidget *widget, case GDK_KEY(Up): case GDK_KEY(KP_Up): value = gtk_adjustment_get_value(vscroll) - - gtk_adjustment_get_step_increment(vscroll); + nsgtk_adjustment_get_step_increment(vscroll); - if (value < gtk_adjustment_get_lower(vscroll)) - value = gtk_adjustment_get_lower(vscroll); + if (value < nsgtk_adjustment_get_lower(vscroll)) + value = nsgtk_adjustment_get_lower(vscroll); gtk_adjustment_set_value(vscroll, value); break; @@ -539,10 +539,10 @@ static gboolean nsgtk_window_keypress_event(GtkWidget *widget, case GDK_KEY(Right): case GDK_KEY(KP_Right): value = gtk_adjustment_get_value(hscroll) + - gtk_adjustment_get_step_increment(hscroll); + nsgtk_adjustment_get_step_increment(hscroll); - if (value > gtk_adjustment_get_upper(hscroll) - alloc.width) - value = gtk_adjustment_get_upper(hscroll) - alloc.width; + if (value > nsgtk_adjustment_get_upper(hscroll) - alloc.width) + value = nsgtk_adjustment_get_upper(hscroll) - alloc.width; gtk_adjustment_set_value(hscroll, value); break; @@ -550,10 +550,10 @@ static gboolean nsgtk_window_keypress_event(GtkWidget *widget, case GDK_KEY(Down): case GDK_KEY(KP_Down): value = gtk_adjustment_get_value(vscroll) + - gtk_adjustment_get_step_increment(vscroll); + nsgtk_adjustment_get_step_increment(vscroll); - if (value > gtk_adjustment_get_upper(vscroll) - alloc.height) - value = gtk_adjustment_get_upper(vscroll) - alloc.height; + if (value > nsgtk_adjustment_get_upper(vscroll) - alloc.height) + value = nsgtk_adjustment_get_upper(vscroll) - alloc.height; gtk_adjustment_set_value(vscroll, value); break; @@ -561,10 +561,10 @@ static gboolean nsgtk_window_keypress_event(GtkWidget *widget, case GDK_KEY(Page_Up): case GDK_KEY(KP_Page_Up): value = gtk_adjustment_get_value(vscroll) - - gtk_adjustment_get_page_increment(vscroll); + nsgtk_adjustment_get_page_increment(vscroll); - if (value < gtk_adjustment_get_lower(vscroll)) - value = gtk_adjustment_get_lower(vscroll); + if (value < nsgtk_adjustment_get_lower(vscroll)) + value = nsgtk_adjustment_get_lower(vscroll); gtk_adjustment_set_value(vscroll, value); break; @@ -572,10 +572,10 @@ static gboolean nsgtk_window_keypress_event(GtkWidget *widget, case GDK_KEY(Page_Down): case GDK_KEY(KP_Page_Down): value = gtk_adjustment_get_value(vscroll) + - gtk_adjustment_get_page_increment(vscroll); + nsgtk_adjustment_get_page_increment(vscroll); - if (value > gtk_adjustment_get_upper(vscroll) - alloc.height) - value = gtk_adjustment_get_upper(vscroll) - alloc.height; + if (value > nsgtk_adjustment_get_upper(vscroll) - alloc.height) + value = nsgtk_adjustment_get_upper(vscroll) - alloc.height; gtk_adjustment_set_value(vscroll, value); break; @@ -775,7 +775,7 @@ void nsgtk_window_process_reformats(void) g->bw->reformat_pending = false; /* @todo consider gtk_widget_get_allocated_width() */ - gtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); + nsgtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); browser_window_reformat(g->bw, false, alloc.width, alloc.height); } @@ -1042,7 +1042,7 @@ void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) gtk_widget_get_display( GTK_WIDGET(g->layout)), cursortype); - gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(g->layout)), + gdk_window_set_cursor(nsgtk_widget_get_window(GTK_WIDGET(g->layout)), cursor); if (!nullcursor) @@ -1100,7 +1100,7 @@ void gui_window_get_dimensions(struct gui_window *g, int *width, int *height, GtkAllocation alloc; /* @todo consider gtk_widget_get_allocated_width() */ - gtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); + nsgtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); *width = alloc.width; *height = alloc.height; -- cgit v1.2.3