From 5a22fa9a169a5fe15a61e4cd8cbf6fb3e85d8dd5 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sat, 6 Oct 2007 11:24:13 +0000 Subject: [PATCH] fix typo in wx_dc for Windows svn: r7437 --- src/wxwindow/src/msw/wx_dc.cxx | 2 +- src/wxwindow/src/msw/wx_gdi.cxx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wxwindow/src/msw/wx_dc.cxx b/src/wxwindow/src/msw/wx_dc.cxx index 996d7bfbd2..841f62cd16 100644 --- a/src/wxwindow/src/msw/wx_dc.cxx +++ b/src/wxwindow/src/msw/wx_dc.cxx @@ -2849,7 +2849,7 @@ void wxDC::GetSizeMM(double *width, double *height) void wxDC::SetAlpha(double a) { - wxbDC:::SetAlpha(a); + wxbDC::SetAlpha(a); } wxCanvasDC::wxCanvasDC(void) diff --git a/src/wxwindow/src/msw/wx_gdi.cxx b/src/wxwindow/src/msw/wx_gdi.cxx index b701077b41..aa39f7c168 100644 --- a/src/wxwindow/src/msw/wx_gdi.cxx +++ b/src/wxwindow/src/msw/wx_gdi.cxx @@ -792,7 +792,8 @@ Pen *wxPen::GraphicsPen(Bool align, double xs) if (const_pen) return const_pen->GraphicsPen(align, xs); - if (align || !g_p) { + if ((!align && !g_p) + || (align && !a_g_p)) { Pen *p; double pw; REAL offset, *dashes;