From edd971741e8778de6b709f0a4aa59e5b5f93e54e Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Thu, 27 Sep 2001 00:35:24 +0000
Subject: [PATCH] Fixed problem with wxPen::SetDashes. (An array of bytes was
typcast to an array of DWORDs.)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/msw/pen.h | 2 +-
src/msw/pen.cpp | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 1cf0f4266c..3c56bdaa70 100644
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -38,7 +38,7 @@ protected:
int m_cap ;
wxBitmap m_stipple ;
int m_nbDash ;
- wxMSWDash * m_dash ;
+ wxDash * m_dash ;
wxColour m_colour;
WXHPEN m_hPen;
};
diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index e07b7a1e76..3149b72ecf 100644
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -41,7 +41,7 @@ wxPenRefData::wxPenRefData()
m_join = wxJOIN_ROUND ;
m_cap = wxCAP_ROUND ;
m_nbDash = 0 ;
- m_dash = (wxMSWDash*)NULL;
+ m_dash = (wxDash*)NULL;
m_hPen = 0;
}
@@ -89,7 +89,7 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ;
- M_PENDATA->m_dash = (wxMSWDash*)NULL;
+ M_PENDATA->m_dash = (wxDash*)NULL;
M_PENDATA->m_hPen = 0 ;
#ifndef __WIN32__
@@ -132,7 +132,7 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ;
- M_PENDATA->m_dash = (wxMSWDash*)NULL;
+ M_PENDATA->m_dash = (wxDash*)NULL;
M_PENDATA->m_hPen = 0 ;
RealizeResource();
@@ -240,7 +240,7 @@ bool wxPen::RealizeResource()
if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash)
{
real_dash = new wxMSWDash[M_PENDATA->m_nbDash];
- int i;
+ int i, dsh;
for (i=0; i<M_PENDATA->m_nbDash; i++)
real_dash[i] = M_PENDATA->m_dash[i] * M_PENDATA->m_width;
}
@@ -377,7 +377,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
Unshare();
M_PENDATA->m_nbDash = nb_dashes;
- M_PENDATA->m_dash = (wxMSWDash *)Dash;
+ M_PENDATA->m_dash = (wxDash *)Dash;
RealizeResource();
}
--
2.47.2