From 0075eab1949e4de071b3649c68ba402b8ffce6fb Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 14 Jan 2014 23:31:54 +0000 Subject: move remaining gui operations to table --- windows/gui.c | 19 ++++--------------- windows/main.c | 7 ++----- 2 files changed, 6 insertions(+), 20 deletions(-) (limited to 'windows') diff --git a/windows/gui.c b/windows/gui.c index c813c8b46..fc0af679e 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -1729,7 +1729,7 @@ static void gui_window_remove_caret(struct gui_window *w) * \param buffer UTF-8 text, allocated by front end, ownership yeilded to core * \param length Byte length of UTF-8 text in buffer */ -void gui_get_clipboard(char **buffer, size_t *length) +static void gui_get_clipboard(char **buffer, size_t *length) { /* TODO: Implement this */ HANDLE clipboard_handle; @@ -1751,7 +1751,7 @@ void gui_get_clipboard(char **buffer, size_t *length) * \param styles Array of styles given to text runs, owned by core, or NULL * \param n_styles Number of text run styles in array */ -void gui_set_clipboard(const char *buffer, size_t length, +static void gui_set_clipboard(const char *buffer, size_t length, nsclipboard_styles styles[], int n_styles) { /* TODO: Implement this */ @@ -1777,19 +1777,6 @@ void gui_set_clipboard(const char *buffer, size_t length, } -void gui_create_form_select_menu(struct browser_window *bw, - struct form_control *control) -{ -} - - -void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, - unsigned long num, - nserror (*cb)(bool proceed, void *pw), void *cbpw) -{ - cb(false, cbpw); -} - /** * Create the main window class. */ @@ -1844,6 +1831,8 @@ static struct gui_window_table win32_window_table = { static struct gui_table gui_table = { .poll = gui_poll, + .get_clipboard = gui_get_clipboard, + .set_clipboard = gui_set_clipboard, .window = &win32_window_table, }; diff --git a/windows/main.c b/windows/main.c index eb63357af..997d98120 100644 --- a/windows/main.c +++ b/windows/main.c @@ -41,7 +41,7 @@ static char **respaths; /** resource search path vector. */ char *options_file_location; -nsurl *gui_get_resource_url(const char *path) +static nsurl *gui_get_resource_url(const char *path) { char buf[PATH_MAX]; char *raw; @@ -56,10 +56,6 @@ nsurl *gui_get_resource_url(const char *path) return url; } -void gui_launch_url(const char *url) -{ -} - /** * Ensures output logging stream is available */ @@ -156,6 +152,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hLastInstance, LPSTR lpcli, int ncmd) messages = filepath_find(respaths, "messages"); win32_gui_table->download = nsgtk_gui_download_table; + win32_gui_table->get_resource_url = get_resource_url; ret = netsurf_init(messages, win32_gui_table); free(messages); -- cgit v1.2.3