From 9bba42e315f8db2ceac8a96c89f32652cff05fad Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Wed, 11 Jan 2012 22:14:08 +0100 Subject: A few GSEAL issues (bzr r10872) --- src/dialogs/export.cpp | 2 +- src/display/sp-canvas.cpp | 2 +- src/inkview.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp index 31e978f86..43824dec5 100644 --- a/src/dialogs/export.cpp +++ b/src/dialogs/export.cpp @@ -1376,7 +1376,7 @@ sp_export_browse_clicked (GtkButton */*button*/, gpointer /*userdata*/) wcsncpy(_filename, (wchar_t*)utf16_path_string, _MAX_PATH); g_free(utf16_path_string); - opf.hwndOwner = (HWND)(GDK_WINDOW_HWND(GTK_WIDGET(dlg)->window)); + opf.hwndOwner = (HWND)(GDK_WINDOW_HWND(gtk_widget_get_window(GTK_WIDGET(dlg)))); opf.lpstrFilter = filter_string; opf.lpstrCustomFilter = 0; opf.nMaxCustFilter = 0L; diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 67ba89391..71700d6a5 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -1796,7 +1796,7 @@ sp_canvas_paint_rect_internal (PaintRectSetup const *setup, Geom::IntRect const r.width = this_rect.x1 - this_rect.x0; r.height = this_rect.y1 - this_rect.y0; - GdkWindow *window = GTK_WIDGET(setup->canvas)->window; + GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(setup->canvas)); gdk_window_begin_paint_rect(window, &r);*/ sp_canvas_paint_single_buffer (setup->canvas, diff --git a/src/inkview.cpp b/src/inkview.cpp index 1fd5c2d56..b71a65508 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -412,11 +412,11 @@ static void sp_svgview_waiting_cursor(struct SPSlideShow *ss) { GdkCursor *waiting = gdk_cursor_new(GDK_WATCH); - gdk_window_set_cursor(GTK_WIDGET(ss->window)->window, waiting); + gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ss->window)), waiting); gdk_cursor_unref(waiting); if (ctrlwin) { GdkCursor *waiting = gdk_cursor_new(GDK_WATCH); - gdk_window_set_cursor(GTK_WIDGET(ctrlwin)->window, waiting); + gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), waiting); gdk_cursor_unref(waiting); } while(gtk_events_pending()) @@ -426,9 +426,9 @@ sp_svgview_waiting_cursor(struct SPSlideShow *ss) static void sp_svgview_normal_cursor(struct SPSlideShow *ss) { - gdk_window_set_cursor(GTK_WIDGET(ss->window)->window, NULL); + gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ss->window)), NULL); if (ctrlwin) { - gdk_window_set_cursor(GTK_WIDGET(ctrlwin)->window, NULL); + gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), NULL); } } -- cgit v1.2.3