From e82d83f1847ebc369a5f48a18217a8f5fecf3824 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 13 Jan 2014 14:51:27 +0000 Subject: move four more optional window operations to table --- beos/scaffolding.h | 3 ++- beos/window.cpp | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'beos') diff --git a/beos/scaffolding.h b/beos/scaffolding.h index fe726147c..2dd364d08 100644 --- a/beos/scaffolding.h +++ b/beos/scaffolding.h @@ -202,8 +202,9 @@ void nsbeos_scaffolding_popup_menu(nsbeos_scaffolding *g, BPoint where); void gui_window_set_title(struct gui_window *_g, const char *title); void gui_window_set_url(struct gui_window *_g, const char *url); +void gui_window_set_icon(struct gui_window *_g, hlcache_handle *icon); +void gui_window_set_status(struct gui_window *_g, const char *text); void gui_window_start_throbber(struct gui_window* _g); void gui_window_stop_throbber(struct gui_window* _g); -void gui_window_set_icon(struct gui_window *_g, hlcache_handle *icon); #endif /* NETSURF_BEOS_SCAFFOLDING_H */ diff --git a/beos/window.cpp b/beos/window.cpp index cff33a35b..84199242d 100644 --- a/beos/window.cpp +++ b/beos/window.cpp @@ -1169,7 +1169,7 @@ const uint8 kWatch2CursorBits[] = { }; -void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) +static void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) { BCursor *cursor = NULL; bool allocated = false; @@ -1209,7 +1209,7 @@ void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) delete cursor; } -void gui_window_place_caret(struct gui_window *g, int x, int y, int height, +static void gui_window_place_caret(struct gui_window *g, int x, int y, int height, const struct rect *clip) { //CALLED(); @@ -1230,7 +1230,7 @@ void gui_window_place_caret(struct gui_window *g, int x, int y, int height, g->view->UnlockLooper(); } -void gui_window_remove_caret(struct gui_window *g) +static void gui_window_remove_caret(struct gui_window *g) { int oh = g->careth; @@ -1373,11 +1373,15 @@ static struct gui_window_table gui_window_table = { .update_extent = gui_window_update_extent, .new_content = gui_window_new_content, + .set_pointer = gui_window_set_pointer, + .place_caret = gui_window_place_caret, + .remove_caret = gui_window_remove_caret, /* from scaffold */ .set_icon = gui_window_set_icon, .set_title = gui_window_set_title, .set_url = gui_window_set_url, + .set_status = gui_window_set_status, .start_throbber = gui_window_start_throbber, .stop_throbber = gui_window_stop_throbber, }; -- cgit v1.2.3