summaryrefslogtreecommitdiff
path: root/gtk/gtk_selection.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-12-17 23:55:02 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-12-17 23:55:02 +0000
commit355799ce0bbb078237dfc1ae9874bbc5342acbc4 (patch)
tree7ca980c01c0d4d1d55a3b7b15418c95c5618afae /gtk/gtk_selection.c
parent4346b2b62b940182575e6612e46234355afa083c (diff)
downloadnetsurf-355799ce0bbb078237dfc1ae9874bbc5342acbc4.tar.gz
netsurf-355799ce0bbb078237dfc1ae9874bbc5342acbc4.tar.bz2
Merge branches/MarkieB/gtkmain to trunk.
svn path=/trunk/netsurf/; revision=9729
Diffstat (limited to 'gtk/gtk_selection.c')
-rw-r--r--gtk/gtk_selection.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk/gtk_selection.c b/gtk/gtk_selection.c
index cf9e1decd..41869d753 100644
--- a/gtk/gtk_selection.c
+++ b/gtk/gtk_selection.c
@@ -79,7 +79,7 @@ void gui_start_selection(struct gui_window *g)
else
g_string_set_size(current_selection, 0);
- gtk_widget_grab_focus(GTK_WIDGET(g->drawing_area));
+ gtk_widget_grab_focus(GTK_WIDGET(nsgtk_window_get_drawing_area(g)));
}
void gui_paste_from_clipboard(struct gui_window *g, int x, int y)
@@ -89,7 +89,8 @@ void gui_paste_from_clipboard(struct gui_window *g, int x, int y)
text = gtk_clipboard_wait_for_text (clipboard);
/* clipboard_wait... converts the string to utf8 for us */
if (text != NULL)
- browser_window_paste_text(g->bw, text, strlen(text), true);
+ browser_window_paste_text(gui_window_get_browser_window(g),
+ text, strlen(text), true);
g_free(text);
}