Don't clear all of the pen_style, just the PS_STYLE_MASK. Seems to fix

2002-03-22  Tor Lillqvist  <tml@iki.fi>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index d6a6d4ff5136c4b9cf199b9c808cbeed8d3c99f4..2c7ce724797144c300f1803a706c9b23e9476a0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-22  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkaccelgroup.c (gtk_accelerator_valid): Trivial typo

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d6a6d4ff5136c4b9cf199b9c808cbeed8d3c99f4..2c7ce724797144c300f1803a706c9b23e9476a0c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2002-03-22  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkaccelgroup.c (gtk_accelerator_valid): Trivial typo

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d6a6d4ff5136c4b9cf199b9c808cbeed8d3c99f4..2c7ce724797144c300f1803a706c9b23e9476a0c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2002-03-22  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkaccelgroup.c (gtk_accelerator_valid): Trivial typo

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d6a6d4ff5136c4b9cf199b9c808cbeed8d3c99f4..2c7ce724797144c300f1803a706c9b23e9476a0c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2002-03-22  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkaccelgroup.c (gtk_accelerator_valid): Trivial typo

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d6a6d4ff5136c4b9cf199b9c808cbeed8d3c99f4..2c7ce724797144c300f1803a706c9b23e9476a0c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2002-03-22  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkaccelgroup.c (gtk_accelerator_valid): Trivial typo

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d6a6d4ff5136c4b9cf199b9c808cbeed8d3c99f4..2c7ce724797144c300f1803a706c9b23e9476a0c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2002-03-22  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkaccelgroup.c (gtk_accelerator_valid): Trivial typo

diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c
index 4bbc76750ccd73e4e62da34d61f7dfdc1840dbcf..cefdfd9c98c6ea3e502f89ce7d7e2247545fc47e 100644 (file)
--- 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;