diff options
author | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
---|---|---|
committer | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
commit | 0703404654d2a40cacae2d94c6e0e22ca28b4acf (patch) | |
tree | bfdbe1e8952814f73a6b0e190ae0a77fd0cfc7bd /riscos/window.c | |
parent | 54f719aa960159c5b1978846223732c9669ca7fa (diff) | |
parent | 89856f55929907642013e45435b9d18cd1fafe36 (diff) | |
download | netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.gz netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.bz2 |
Merge branch 'master' into mono/removing-windom-dependencymono/removing-windom-dependency
Conflicts:
atari/toolbar.c
Diffstat (limited to 'riscos/window.c')
-rw-r--r-- | riscos/window.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/riscos/window.c b/riscos/window.c index 535105459..2f8bec614 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -74,6 +74,7 @@ #include "riscos/oslib_pre7.h" #include "riscos/save.h" #include "riscos/content-handlers/sprite.h" +#include "riscos/textselection.h" #include "riscos/toolbar.h" #include "riscos/thumbnail.h" #include "riscos/url_complete.h" @@ -2600,6 +2601,14 @@ void ro_gui_window_menu_warning(wimp_w w, wimp_i i, wimp_menu *menu, } +static void ro_gui_window_paste_cb(void *pw) +{ + struct browser_window *bw = pw; + + browser_window_key_press(bw, KEY_PASTE); +} + + /** * Handle selections from a browser window menu * @@ -2833,7 +2842,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, browser_window_key_press(bw, KEY_CUT_SELECTION); break; case BROWSER_SELECTION_PASTE: - browser_window_key_press(bw, KEY_PASTE); + ro_gui_selection_prepare_paste(w, ro_gui_window_paste_cb, bw); break; case BROWSER_SELECTION_ALL: browser_window_key_press(bw, KEY_SELECT_ALL); |