From a622843f4d984c1366c33f6693204e2834c9e0e9 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 4 May 2005 11:43:44 +0000 Subject: [PATCH] gdk/win32/gdkdrawable-win32.c (generic_draw, blit_from_pixmap) Minor fixes 2005-05-04 Tor Lillqvist * gdk/win32/gdkdrawable-win32.c (generic_draw, blit_from_pixmap) * gdk/win32/gdkgc-win32.c (gdk_win32_gc_values_to_win32values, _gdk_win32_gc_new, _gdk_windowing_gc_set_clip_region, gdk_win32_hdc_get): Minor fixes to make Win32 backend compile again. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gdk/win32/gdkdrawable-win32.c | 7 ++++--- gdk/win32/gdkgc-win32.c | 16 +++++++++------- 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index d53f0fd6d5..17b5b26bc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-05-04 Tor Lillqvist + + * gdk/win32/gdkdrawable-win32.c (generic_draw, blit_from_pixmap) + * gdk/win32/gdkgc-win32.c (gdk_win32_gc_values_to_win32values, + _gdk_win32_gc_new, _gdk_windowing_gc_set_clip_region, + gdk_win32_hdc_get): Minor fixes to make Win32 backend compile + again. + 2005-05-03 Matthias Clasen * gtk/gtkfilesystem.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d53f0fd6d5..17b5b26bc5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2005-05-04 Tor Lillqvist + + * gdk/win32/gdkdrawable-win32.c (generic_draw, blit_from_pixmap) + * gdk/win32/gdkgc-win32.c (gdk_win32_gc_values_to_win32values, + _gdk_win32_gc_new, _gdk_windowing_gc_set_clip_region, + gdk_win32_hdc_get): Minor fixes to make Win32 backend compile + again. + 2005-05-03 Matthias Clasen * gtk/gtkfilesystem.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d53f0fd6d5..17b5b26bc5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2005-05-04 Tor Lillqvist + + * gdk/win32/gdkdrawable-win32.c (generic_draw, blit_from_pixmap) + * gdk/win32/gdkgc-win32.c (gdk_win32_gc_values_to_win32values, + _gdk_win32_gc_new, _gdk_windowing_gc_set_clip_region, + gdk_win32_hdc_get): Minor fixes to make Win32 backend compile + again. + 2005-05-03 Matthias Clasen * gtk/gtkfilesystem.c: diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c index 58576ffc2f..a7959733dc 100644 --- a/gdk/win32/gdkdrawable-win32.c +++ b/gdk/win32/gdkdrawable-win32.c @@ -525,7 +525,7 @@ generic_draw (GdkDrawable *drawable, GdkGCWin32 *gcwin32 = GDK_GC_WIN32 (gc); HDC hdc; va_list args; - GdkFillStyle *fill_style = _gdk_gc_get_fill (gc); + GdkFill fill_style = _gdk_gc_get_fill (gc); va_start (args, region); @@ -1510,7 +1510,7 @@ blit_from_pixmap (gboolean use_fg_bg, GdkDrawableImplWin32 *dest, HDC hdc, GdkPixmapImplWin32 *src, - GdkGCWin32 *gcwin32, + GdkGC *gc, gint xsrc, gint ysrc, gint xdest, @@ -1518,6 +1518,7 @@ blit_from_pixmap (gboolean use_fg_bg, gint width, gint height) { + GdkGCWin32 *gcwin32 = GDK_GC_WIN32 (gc); HDC srcdc; HBITMAP holdbitmap; RGBQUAD oldtable[256], newtable[256]; @@ -1809,7 +1810,7 @@ _gdk_win32_blit (gboolean use_fg_bg, if (GDK_IS_PIXMAP_IMPL_WIN32 (src_impl)) blit_from_pixmap (use_fg_bg, draw_impl, hdc, - (GdkPixmapImplWin32 *) src_impl, GDK_GC_WIN32 (gc), + (GdkPixmapImplWin32 *) src_impl, gc, xsrc, ysrc, xdest, ydest, width, height); else if (draw_impl->handle == src_impl->handle) blit_inside_window (hdc, GDK_GC_WIN32 (gc), xsrc, ysrc, xdest, ydest, width, height); diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c index 0be44dd7f3..73f001f195 100644 --- a/gdk/win32/gdkgc-win32.c +++ b/gdk/win32/gdkgc-win32.c @@ -125,14 +125,16 @@ gdk_win32_gc_values_to_win32values (GdkGCValues *values, if (mask & GDK_GC_FOREGROUND) { win32_gc->values_mask |= GDK_GC_FOREGROUND; - GDK_NOTE (GC, (g_print ("fg=%.06lx", values->, + GDK_NOTE (GC, (g_print ("fg=%.06x", + _gdk_gc_get_fg_pixel (&win32_gc->parent_instance)), s = ",")); } if (mask & GDK_GC_BACKGROUND) { win32_gc->values_mask |= GDK_GC_BACKGROUND; - GDK_NOTE (GC, (g_print ("%sbg=%.06lx", s, win32_gc->background), + GDK_NOTE (GC, (g_print ("%sbg=%.06x", s, + _gdk_gc_get_bg_pixel (&win32_gc->parent_instance)), s = ",")); } @@ -419,7 +421,7 @@ gdk_win32_gc_values_to_win32values (GdkGCValues *values, GdkGC* _gdk_win32_gc_new (GdkDrawable *drawable, GdkGCValues *values, - GdkGCValuesMask mask) + GdkGCValuesMask values_mask) { GdkGC *gc; GdkGCWin32 *win32_gc; @@ -451,7 +453,7 @@ _gdk_win32_gc_new (GdkDrawable *drawable, win32_gc->values_mask = GDK_GC_FUNCTION | GDK_GC_FILL; GDK_NOTE (GC, g_print ("_gdk_win32_gc_new: %p: ", win32_gc)); - gdk_win32_gc_values_to_win32values (values, mask, win32_gc); + gdk_win32_gc_values_to_win32values (values, values_mask, win32_gc); GDK_NOTE (GC, g_print ("\n")); win32_gc->hdc = NULL; @@ -587,8 +589,8 @@ gdk_win32_gc_set_dashes (GdkGC *gc, } void -_gdk_windowing_set_clip_region (GdkGC *gc, - GdkRegion *region) +_gdk_windowing_gc_set_clip_region (GdkGC *gc, + GdkRegion *region) { GdkGCWin32 *win32_gc = GDK_GC_WIN32 (gc); @@ -858,7 +860,7 @@ gdk_win32_hdc_get (GdkDrawable *drawable, /* For drawing GDK_LINE_DOUBLE_DASH */ if ((usage & GDK_GC_BACKGROUND) && win32_gc->pen_double_dash) { - bg = _gdk_win32_colormap_color (impl->colormap, win32_gc->background); + bg = _gdk_win32_colormap_color (impl->colormap, _gdk_gc_get_bg_pixel (gc)); if ((win32_gc->pen_hbrbg = CreateSolidBrush (bg)) == NULL) WIN32_GDI_FAILED ("CreateSolidBrush"), ok = FALSE; }