diff options
| author | Tor Lillqvist <tml@iki.fi> | 2002-09-11 20:51:05 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2002-09-11 20:51:05 +0000 |
| commit | 86a90abf97c2c12edaccbb987966e46528de356f (patch) | |
| tree | 3569697d70b98f586118d33ac8211b8df192319a /gdk | |
| parent | e8215b332540323dd3895c15d569e69c51ea462b (diff) | |
| download | gdk-pixbuf-86a90abf97c2c12edaccbb987966e46528de356f.tar.gz | |
Merge from gtk-2-0:
2002-09-12 Tor Lillqvist <tml@iki.fi>
Merge from gtk-2-0:
* gdk/win32/gdkdrawable-win32.c (render_line_horizontal,
render_line_vertical): Some spacing cleanup. Return TRUE.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/win32/gdkdrawable-win32.c | 37 |
1 files changed, 21 insertions, 16 deletions
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" |