diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2014-01-16 13:37:14 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2014-01-16 13:37:14 +0000 |
| commit | a1361f22b43e78b00cdddab3a0a2b9e4871965f7 (patch) | |
| tree | 0d7a34e8035a06a8cbffa9678ad8689f953281d2 /desktop/selection.c | |
| parent | 444d3ac94a1d19a30963c38ad605deec778f3c27 (diff) | |
| parent | a2247a75a3dab9d583617299a88d0e76c923f83b (diff) | |
| download | netsurf-a1361f22b43e78b00cdddab3a0a2b9e4871965f7.tar.gz netsurf-a1361f22b43e78b00cdddab3a0a2b9e4871965f7.tar.bz2 | |
Merge branch 'vince/guivtable'
Diffstat (limited to 'desktop/selection.c')
| -rw-r--r-- | desktop/selection.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/desktop/selection.c b/desktop/selection.c index 13a1293e3..96c7e0c3c 100644 --- a/desktop/selection.c +++ b/desktop/selection.c @@ -30,6 +30,7 @@ #include "desktop/browser_private.h" #include "desktop/gui.h" +#include "desktop/gui_factory.h" #include "desktop/mouse.h" #include "desktop/plotters.h" #include "desktop/save_text.h" @@ -274,7 +275,7 @@ bool selection_click(struct selection *s, browser_mouse_state mouse, (modkeys && (mouse & BROWSER_MOUSE_DRAG_2)))) { /* drag-saving selection */ char *sel = selection_get_copy(s); - gui_drag_save_selection(top->window, sel); + guit->window->drag_save_selection(top->window, sel); free(sel); } else if (!modkeys) { @@ -293,7 +294,7 @@ bool selection_click(struct selection *s, browser_mouse_state mouse, s->drag_state = DRAG_END; - gui_start_selection(top->window); + guit->window->start_selection(top->window); } else if (mouse & BROWSER_MOUSE_DRAG_2) { @@ -312,7 +313,7 @@ bool selection_click(struct selection *s, browser_mouse_state mouse, s->drag_state = DRAG_START; } - gui_start_selection(top->window); + guit->window->start_selection(top->window); } else if (mouse & BROWSER_MOUSE_CLICK_2) { @@ -844,7 +845,7 @@ bool selection_copy_to_clipboard(struct selection *s) return false; } - gui_set_clipboard(sel_string.buffer, sel_string.length, + guit->clipboard->set(sel_string.buffer, sel_string.length, sel_string.styles, sel_string.n_styles); free(sel_string.buffer); |