From 86a90abf97c2c12edaccbb987966e46528de356f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 11 Sep 2002 20:51:05 +0000 Subject: [PATCH] Merge from gtk-2-0: 2002-09-12 Tor Lillqvist Merge from gtk-2-0: * gdk/win32/gdkdrawable-win32.c (render_line_horizontal, render_line_vertical): Some spacing cleanup. Return TRUE. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gdk/win32/gdkdrawable-win32.c | 37 ++++++++++++++++++++--------------- 7 files changed, 63 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index f655caaeb..a33d1012f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-09-12 Tor Lillqvist + + Merge from gtk-2-0: + + * gdk/win32/gdkdrawable-win32.c (render_line_horizontal, + render_line_vertical): Some spacing cleanup. Return TRUE. + Wed Sep 11 15:48:38 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f655caaeb..a33d1012f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2002-09-12 Tor Lillqvist + + Merge from gtk-2-0: + + * gdk/win32/gdkdrawable-win32.c (render_line_horizontal, + render_line_vertical): Some spacing cleanup. Return TRUE. + Wed Sep 11 15:48:38 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f655caaeb..a33d1012f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2002-09-12 Tor Lillqvist + + Merge from gtk-2-0: + + * gdk/win32/gdkdrawable-win32.c (render_line_horizontal, + render_line_vertical): Some spacing cleanup. Return TRUE. + Wed Sep 11 15:48:38 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f655caaeb..a33d1012f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2002-09-12 Tor Lillqvist + + Merge from gtk-2-0: + + * gdk/win32/gdkdrawable-win32.c (render_line_horizontal, + render_line_vertical): Some spacing cleanup. Return TRUE. + Wed Sep 11 15:48:38 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f655caaeb..a33d1012f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2002-09-12 Tor Lillqvist + + Merge from gtk-2-0: + + * gdk/win32/gdkdrawable-win32.c (render_line_horizontal, + render_line_vertical): Some spacing cleanup. Return TRUE. + Wed Sep 11 15:48:38 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f655caaeb..a33d1012f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2002-09-12 Tor Lillqvist + + Merge from gtk-2-0: + + * gdk/win32/gdkdrawable-win32.c (render_line_horizontal, + render_line_vertical): Some spacing cleanup. Return TRUE. + Wed Sep 11 15:48:38 2002 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c index f4d37b3d5..148484ed5 100644 --- a/gdk/win32/gdkdrawable-win32.c +++ b/gdk/win32/gdkdrawable-win32.c @@ -259,15 +259,16 @@ gdk_win32_set_colormap (GdkDrawable *drawable, * too limited to do so */ static inline gboolean -render_line_horizontal (HDC hdc, - int x1, - int x2, - int y, - int pen_width, - int *dashes, - int num_dashes) +render_line_horizontal (HDC hdc, + int x1, + int x2, + int y, + int pen_width, + DWORD *dashes, + int num_dashes) { int n; + for (n = 0; x1 < x2; n++) { int len = dashes[n % num_dashes]; @@ -286,19 +287,21 @@ render_line_horizontal (HDC hdc, x1 += dashes[n % num_dashes]; } -} + return TRUE; +} static inline gboolean -render_line_vertical (HDC hdc, - int x, - int y1, - int y2, - int pen_width, - int *dashes, - int num_dashes) +render_line_vertical (HDC hdc, + int x, + int y1, + int y2, + int pen_width, + DWORD *dashes, + int num_dashes) { int n; + for (n = 0; y1 < y2; n++) { int len = dashes[n % num_dashes]; @@ -315,6 +318,8 @@ render_line_vertical (HDC hdc, } y1 += dashes[n % num_dashes]; } + + return TRUE; } static void @@ -1323,7 +1328,7 @@ _gdk_win32_blit (gboolean use_fg_bg, HRGN src_rgn, draw_rgn, outside_rgn; RECT r; GdkDrawableImplWin32 *draw_impl; - GdkDrawableImplWin32 *src_impl; + GdkDrawableImplWin32 *src_impl = NULL; gint src_width, src_height; GDK_NOTE (MISC, g_print ("_gdk_win32_blit: src:%s %dx%d@+%d+%d\n" -- 2.43.2