Author: jmb Date: Sat Oct 2 11:58:37 2010 New Revision: 10857 URL: http://source.netsurf-browser.org?rev=10857&view=rev Log: Apply some consistency to the GTK treeview binding. Modified: branches/jmb/treeview-redux/gtk/gtk_treeview.c branches/jmb/treeview-redux/gtk/gtk_treeview.h Modified: branches/jmb/treeview-redux/gtk/gtk_treeview.c URL: http://source.netsurf-browser.org/branches/jmb/treeview-redux/gtk/gtk_tre... ============================================================================== --- branches/jmb/treeview-redux/gtk/gtk_treeview.c (original) +++ branches/jmb/treeview-redux/gtk/gtk_treeview.c Sat Oct 2 11:58:37 2010 @@ -48,17 +48,17 @@ const char tree_directory_icon_name[] = "directory.png"; const char tree_content_icon_name[] = "content.png"; -static void gtk_tree_redraw_request(int x, int y, int width, int height, +static void nsgtk_tree_redraw_request(int x, int y, int width, int height, void *data); -static void tree_resized(struct tree *tree, int width, int height, void *data); -static void tree_scroll_visible(int y, int height, void *data); -static void tree_get_window_dimensions(int *width, int *height, void *data); - -const struct treeview_table gtk_tree_callbacks = { - .redraw_request = gtk_tree_redraw_request, - .resized = tree_resized, - .scroll_visible = tree_scroll_visible, - .get_window_dimensions = tree_get_window_dimensions +static void nsgtk_tree_resized(struct tree *tree, int width, int height, void *data); +static void nsgtk_tree_scroll_visible(int y, int height, void *data); +static void nsgtk_tree_get_window_dimensions(int *width, int *height, void *data); + +static const struct treeview_table nsgtk_tree_callbacks = { + .redraw_request = nsgtk_tree_redraw_request, + .resized = nsgtk_tree_resized, + .scroll_visible = nsgtk_tree_scroll_visible, + .get_window_dimensions = nsgtk_tree_get_window_dimensions }; struct nsgtk_treeview *nsgtk_treeview_create(unsigned int flags, @@ -77,7 +77,7 @@ tv->window = window; tv->scrolled = scrolled; tv->drawing_area = drawing_area; - tv->tree = tree_create(flags, &gtk_tree_callbacks, tv); + tv->tree = tree_create(flags, &nsgtk_tree_callbacks, tv); tv->mouse_state = 0; gtk_widget_modify_bg(GTK_WIDGET(drawing_area), GTK_STATE_NORMAL, @@ -116,7 +116,7 @@ return tv->tree; } -void gtk_tree_redraw_request(int x, int y, int width, int height, void *data) +void nsgtk_tree_redraw_request(int x, int y, int width, int height, void *data) { struct nsgtk_treeview *tw = data; @@ -130,7 +130,7 @@ * * \param tree the tree to update the owner of */ -void tree_resized(struct tree *tree, int width, int height, void *data) +void nsgtk_tree_resized(struct tree *tree, int width, int height, void *data) { struct nsgtk_treeview *tw = data; @@ -194,7 +194,7 @@ * \param height height of the element * \param data user data assigned to the tree on tree creation */ -void tree_scroll_visible(int y, int height, void *data) +void nsgtk_tree_scroll_visible(int y, int height, void *data) { int y0, y1; gdouble page; @@ -225,7 +225,7 @@ * \param width will be updated to window width if not NULL * \param height will be updated to window height if not NULL */ -void tree_get_window_dimensions(int *width, int *height, void *data) +void nsgtk_tree_get_window_dimensions(int *width, int *height, void *data) { struct nsgtk_treeview *tw = data; GtkAdjustment *vadj; Modified: branches/jmb/treeview-redux/gtk/gtk_treeview.h URL: http://source.netsurf-browser.org/branches/jmb/treeview-redux/gtk/gtk_tre... ============================================================================== --- branches/jmb/treeview-redux/gtk/gtk_treeview.h (original) +++ branches/jmb/treeview-redux/gtk/gtk_treeview.h Sat Oct 2 11:58:37 2010 @@ -47,6 +47,4 @@ gboolean nsgtk_tree_window_keypress_event(GtkWidget *widget, GdkEventKey *event, gpointer g); -extern const struct treeview_table gtk_tree_callbacks; - #endif /*__NSGTK_TREEVIEW_H__*/