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

code cleanup for the pen width condition (patch 1034942 + more)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-09-27 21:02:57 +00:00
parent a951722b6a
commit 8b0975a38e
1 changed files with 140 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/msw/pen.cpp
View File

@@ -89,31 +89,7 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
M_PENDATA->m_dash = (wxDash*)NULL; M_PENDATA->m_dash = (wxDash*)NULL;
M_PENDATA->m_hPen = 0 ; M_PENDATA->m_hPen = 0 ;
#ifndef __WIN32__
// In Windows, only a pen of width = 1 can be dotted or dashed!
if ((Style == wxDOT) || (Style == wxLONG_DASH) ||
(Style == wxSHORT_DASH) || (Style == wxDOT_DASH) ||
(Style == wxUSER_DASH))
M_PENDATA->m_width = 1;
#else
/***
DWORD vers = GetVersion() ;
WORD high = HIWORD(vers) ; // high bit=0 for NT, 1 for Win32s
// Win32s doesn't support wide dashed pens
if ((high&0x8000)!=0)
***/
if (wxGetOsVersion()==wxWIN32S)
{
// In Windows, only a pen of width = 1 can be dotted or dashed!
if ((Style == wxDOT) || (Style == wxLONG_DASH) ||
(Style == wxSHORT_DASH) || (Style == wxDOT_DASH) ||
(Style == wxUSER_DASH))
M_PENDATA->m_width = 1;
}
#endif
RealizeResource(); RealizeResource();
} }
wxPen::wxPen(const wxBitmap& stipple, int Width) wxPen::wxPen(const wxBitmap& stipple, int Width)
@@ -131,25 +107,36 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
M_PENDATA->m_hPen = 0 ; M_PENDATA->m_hPen = 0 ;
RealizeResource(); RealizeResource();
} }
bool wxPen::RealizeResource() bool wxPen::RealizeResource()
{ {
if (M_PENDATA && (M_PENDATA->m_hPen == 0)) if ( !M_PENDATA || M_PENDATA->m_hPen )
{ return false;
if (M_PENDATA->m_style==wxTRANSPARENT) if (M_PENDATA->m_style==wxTRANSPARENT)
{ {
M_PENDATA->m_hPen = (WXHPEN) ::GetStockObject(NULL_PEN); M_PENDATA->m_hPen = (WXHPEN) ::GetStockObject(NULL_PEN);
return true; return true;
} }
static const int os = wxGetOsVersion();
COLORREF ms_colour = M_PENDATA->m_colour.GetPixel(); COLORREF ms_colour = M_PENDATA->m_colour.GetPixel();
// Join style, Cap style, Pen Stippling only on Win32. // Join style, Cap style, Pen Stippling
// Currently no time to find equivalent on Win3.1, sorry #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
// [if such equiv exist!!] // Only NT can display dashed or dotted lines with width > 1
#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) if ( os != wxWINDOWS_NT &&
(M_PENDATA->m_style & (wxDOT |
wxLONG_DASH |
wxSHORT_DASH |
wxDOT_DASH |
wxUSER_DASH)) &&
M_PENDATA->m_width > 1 )
{
M_PENDATA->m_width = 1;
}
if (M_PENDATA->m_join==wxJOIN_ROUND && if (M_PENDATA->m_join==wxJOIN_ROUND &&
M_PENDATA->m_cap==wxCAP_ROUND && M_PENDATA->m_cap==wxCAP_ROUND &&
M_PENDATA->m_style!=wxUSER_DASH && M_PENDATA->m_style!=wxUSER_DASH &&
@@ -242,7 +229,7 @@ bool wxPen::RealizeResource()
} }
// Win32s doesn't have ExtCreatePen function... // Win32s doesn't have ExtCreatePen function...
if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95) if (os==wxWINDOWS_NT || os==wxWIN95)
{ {
M_PENDATA->m_hPen = M_PENDATA->m_hPen =
(WXHPEN) ExtCreatePen( ms_style, (WXHPEN) ExtCreatePen( ms_style,
@@ -261,22 +248,16 @@ bool wxPen::RealizeResource()
ms_colour ); ms_colour );
} }
if (real_dash)
delete [] real_dash; delete [] real_dash;
} }
#else #else // WinCE
M_PENDATA->m_hPen = M_PENDATA->m_hPen =
(WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style), (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
M_PENDATA->m_width, M_PENDATA->m_width,
ms_colour ); ms_colour );
#endif #endif // !WinCE/WinCE
#ifdef WXDEBUG_CREATE
if (M_PENDATA->m_hPen==0)
wxError("Cannot create pen","Internal error") ;
#endif
return true; return true;
}
return false;
} }
WXHANDLE wxPen::GetResourceHandle() const WXHANDLE wxPen::GetResourceHandle() const