Commit 86a90abf authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

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.
parent e8215b33
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.
Wed Sep 11 15:48:38 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make
......
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.
Wed Sep 11 15:48:38 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make
......
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.
Wed Sep 11 15:48:38 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make
......
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.
Wed Sep 11 15:48:38 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make
......
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.
Wed Sep 11 15:48:38 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make
......
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.
Wed Sep 11 15:48:38 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_row_reference_get_type): Make
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment