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;