From 1ffa06c6a52e64602f5cd7992b61b40d97948f50 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 21 Mar 2002 22:36:02 +0000 Subject: [PATCH] Don't clear all of the pen_style, just the PS_STYLE_MASK. Seems to fix 2002-03-22 Tor Lillqvist * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Don't clear all of the pen_style, just the PS_STYLE_MASK. Seems to fix #74441, but that is just the special case of one-pixel wide one-pixel on-off dotted lines. To fully implement generic X11 style dashed lines a major rewrite would be needed. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gdk/win32/gdkgc-win32.c | 4 ++-- 7 files changed, 50 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6a6d4ff51..2c7ce72479 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-03-22 Tor Lillqvist + + * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Don't clear + all of the pen_style, just the PS_STYLE_MASK. Seems to fix #74441, + but that is just the special case of one-pixel wide one-pixel + on-off dotted lines. To fully implement generic X11 style dashed + lines a major rewrite would be needed. + 2002-03-21 Matthias Clasen * gtk/gtkaccelgroup.c (gtk_accelerator_valid): Trivial typo diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d6a6d4ff51..2c7ce72479 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2002-03-22 Tor Lillqvist + + * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Don't clear + all of the pen_style, just the PS_STYLE_MASK. Seems to fix #74441, + but that is just the special case of one-pixel wide one-pixel + on-off dotted lines. To fully implement generic X11 style dashed + lines a major rewrite would be needed. + 2002-03-21 Matthias Clasen * gtk/gtkaccelgroup.c (gtk_accelerator_valid): Trivial typo diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d6a6d4ff51..2c7ce72479 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2002-03-22 Tor Lillqvist + + * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Don't clear + all of the pen_style, just the PS_STYLE_MASK. Seems to fix #74441, + but that is just the special case of one-pixel wide one-pixel + on-off dotted lines. To fully implement generic X11 style dashed + lines a major rewrite would be needed. + 2002-03-21 Matthias Clasen * gtk/gtkaccelgroup.c (gtk_accelerator_valid): Trivial typo diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d6a6d4ff51..2c7ce72479 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2002-03-22 Tor Lillqvist + + * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Don't clear + all of the pen_style, just the PS_STYLE_MASK. Seems to fix #74441, + but that is just the special case of one-pixel wide one-pixel + on-off dotted lines. To fully implement generic X11 style dashed + lines a major rewrite would be needed. + 2002-03-21 Matthias Clasen * gtk/gtkaccelgroup.c (gtk_accelerator_valid): Trivial typo diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d6a6d4ff51..2c7ce72479 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2002-03-22 Tor Lillqvist + + * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Don't clear + all of the pen_style, just the PS_STYLE_MASK. Seems to fix #74441, + but that is just the special case of one-pixel wide one-pixel + on-off dotted lines. To fully implement generic X11 style dashed + lines a major rewrite would be needed. + 2002-03-21 Matthias Clasen * gtk/gtkaccelgroup.c (gtk_accelerator_valid): Trivial typo diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d6a6d4ff51..2c7ce72479 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2002-03-22 Tor Lillqvist + + * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Don't clear + all of the pen_style, just the PS_STYLE_MASK. Seems to fix #74441, + but that is just the special case of one-pixel wide one-pixel + on-off dotted lines. To fully implement generic X11 style dashed + lines a major rewrite would be needed. + 2002-03-21 Matthias Clasen * gtk/gtkaccelgroup.c (gtk_accelerator_valid): Trivial typo diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c index 4bbc76750c..cefdfd9c98 100644 --- a/gdk/win32/gdkgc-win32.c +++ b/gdk/win32/gdkgc-win32.c @@ -614,7 +614,7 @@ gdk_win32_gc_set_dashes (GdkGC *gc, return; } - win32_gc->pen_style = PS_COSMETIC; /* ??? */ + win32_gc->pen_style &= ~PS_STYLE_MASK; switch (n) { case 2: @@ -627,7 +627,7 @@ gdk_win32_gc_set_dashes (GdkGC *gc, else { win32_gc->pen_style |= PS_DOT; - GDK_NOTE (GC, g_print ("gdk_win32_gc_set_dashes: PS_DOT (%d,%d)\n", + GDK_NOTE (GC, g_print ("gdk_win32_gc_set_dashes: PS_DOT (%d,%d)\n", dash_list[0], dash_list[1])); } break;