Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed problem with wxPen::SetDashes. (An array of bytes was typcast

Browse Source 
to an array of DWORDs.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-09-27 00:35:24 +00:00
parent 217cb2fab8
commit edd971741e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/pen.h
View File

@@ -38,7 +38,7 @@ protected:
int m_cap ; int m_cap ;
wxBitmap m_stipple ; wxBitmap m_stipple ;
int m_nbDash ; int m_nbDash ;
wxMSWDash * m_dash ; wxDash * m_dash ;
wxColour m_colour; wxColour m_colour;
WXHPEN m_hPen; WXHPEN m_hPen;
}; };

10
src/msw/pen.cpp
View File

@@ -41,7 +41,7 @@ wxPenRefData::wxPenRefData()
m_join = wxJOIN_ROUND ; m_join = wxJOIN_ROUND ;
m_cap = wxCAP_ROUND ; m_cap = wxCAP_ROUND ;
m_nbDash = 0 ; m_nbDash = 0 ;
m_dash = (wxMSWDash*)NULL; m_dash = (wxDash*)NULL;
m_hPen = 0; 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_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = (wxMSWDash*)NULL; M_PENDATA->m_dash = (wxDash*)NULL;
M_PENDATA->m_hPen = 0 ; M_PENDATA->m_hPen = 0 ;
#ifndef __WIN32__ #ifndef __WIN32__
@@ -132,7 +132,7 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = (wxMSWDash*)NULL; M_PENDATA->m_dash = (wxDash*)NULL;
M_PENDATA->m_hPen = 0 ; M_PENDATA->m_hPen = 0 ;
RealizeResource(); RealizeResource();
@@ -240,7 +240,7 @@ bool wxPen::RealizeResource()
if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash) if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash)
{ {
real_dash = new wxMSWDash[M_PENDATA->m_nbDash]; real_dash = new wxMSWDash[M_PENDATA->m_nbDash];
int i; int i, dsh;
for (i=0; i<M_PENDATA->m_nbDash; i++) for (i=0; i<M_PENDATA->m_nbDash; i++)
real_dash[i] = M_PENDATA->m_dash[i] * M_PENDATA->m_width; 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(); Unshare();
M_PENDATA->m_nbDash = nb_dashes; M_PENDATA->m_nbDash = nb_dashes;
M_PENDATA->m_dash = (wxMSWDash *)Dash; M_PENDATA->m_dash = (wxDash *)Dash;
RealizeResource(); RealizeResource();
} }