X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..d05005c11f6c702273be30d4c306e94081df06aa:/src/msw/pen.cpp diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp index 993af83b62..cd58107ac9 100644 --- a/src/msw/pen.cpp +++ b/src/msw/pen.cpp @@ -1,51 +1,170 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/pen.cpp +// Name: src/msw/pen.cpp // Purpose: wxPen // Author: Julian Smart -// Modified by: +// Modified by: Vadim Zeitlin: refactored wxPen code to wxPenRefData // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "pen.h" -#endif +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#ifndef WX_PRECOMP -#include -#include "wx/setup.h" -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" #include "wx/pen.h" + +#ifndef WX_PRECOMP + #include "wx/bitmap.h" + #include "wx/utils.h" #endif #include "wx/msw/private.h" -#include "assert.h" -IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) +#define M_PENDATA ((wxPenRefData*)m_refData) + +// Win32 has ExtCreatePen() but WinCE doesn't +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) + #define wxHAVE_EXT_CREATE_PEN +#endif + +// ---------------------------------------------------------------------------- +// wxPenRefData: contains information about an HPEN and its handle +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxPenRefData : public wxGDIRefData +{ +public: + // ctors and dtor + // -------------- + + wxPenRefData(); + wxPenRefData(const wxPenRefData& data); + wxPenRefData(const wxColour& col, int width, int style); + wxPenRefData(const wxBitmap& stipple, int width); + virtual ~wxPenRefData(); + + bool operator==(const wxPenRefData& data) const + { + // we intentionally don't compare m_hPen fields here + return m_style == data.m_style && + m_width == data.m_width && + m_join == data.m_join && + m_cap == data.m_cap && + m_colour == data.m_colour && + (m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) && + (m_style != wxUSER_DASH || + (m_nbDash == data.m_nbDash && + memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0)); + } + + + // accessors and setters + // --------------------- + + wxColour& GetColour() const { return wx_const_cast(wxColour&, m_colour); } + int GetWidth() const { return m_width; } + int GetStyle() const { return m_style; } + int GetJoin() const { return m_join; } + int GetCap() const { return m_cap; } + wxDash* GetDash() const { return m_dash; } + int GetDashCount() const { return m_nbDash; } + wxBitmap* GetStipple() const { return wx_const_cast(wxBitmap *, &m_stipple); } + + void SetColour(const wxColour& col) { Free(); m_colour = col; } + void SetWidth(int width) { Free(); m_width = width; } + void SetStyle(int style) { Free(); m_style = style; } + void SetStipple(const wxBitmap& stipple) + { + Free(); + + m_style = wxSTIPPLE; + m_stipple = stipple; + } + + void SetDashes(int nb_dashes, const wxDash *dash) + { + Free(); + + m_nbDash = nb_dashes; + m_dash = wx_const_cast(wxDash *, dash); + } + + void SetJoin(int join) { Free(); m_join = join; } + void SetCap(int cap) { Free(); m_cap = cap; } + + + // HPEN management + // --------------- + + // create the HPEN if we don't have it yet + bool Alloc(); + + // get the HPEN creating it on demand + WXHPEN GetHPEN() const; + + // return true if we have a valid HPEN + bool HasHPEN() const { return m_hPen != 0; } + + // return true if we had a valid handle before, false otherwise + bool Free(); + +private: + // initialize the fields which have reasonable default values + // + // doesn't initialize m_width and m_style which must be initialize in ctor + void Init() + { + m_join = wxJOIN_ROUND; + m_cap = wxCAP_ROUND; + m_nbDash = 0; + m_dash = NULL; + m_hPen = 0; + } + + int m_width; + int m_style; + int m_join; + int m_cap; + wxBitmap m_stipple; + int m_nbDash; + wxDash * m_dash; + wxColour m_colour; + HPEN m_hPen; + + DECLARE_NO_ASSIGN_CLASS(wxPenRefData) +}; + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxPenRefData ctors/dtor +// ---------------------------------------------------------------------------- wxPenRefData::wxPenRefData() { - m_style = wxSOLID; - m_width = 1; - m_join = wxJOIN_ROUND ; - m_cap = wxCAP_ROUND ; - m_nbDash = 0 ; - m_dash = (wxDash*)NULL; - m_hPen = 0; + Init(); + + m_style = wxSOLID; + m_width = 1; } wxPenRefData::wxPenRefData(const wxPenRefData& data) + :wxGDIRefData() { m_style = data.m_style; m_width = data.m_width; @@ -57,382 +176,408 @@ wxPenRefData::wxPenRefData(const wxPenRefData& data) m_hPen = 0; } -wxPenRefData::~wxPenRefData() +wxPenRefData::wxPenRefData(const wxColour& col, int width, int style) { - if ( m_hPen ) - ::DeleteObject((HPEN) m_hPen); -} + Init(); -// Pens + m_style = style; + m_width = width; + + m_colour = col; +} -wxPen::wxPen() +wxPenRefData::wxPenRefData(const wxBitmap& stipple, int width) { + Init(); + + m_style = wxSTIPPLE; + m_width = width; + + m_stipple = stipple; } -wxPen::~wxPen() +wxPenRefData::~wxPenRefData() { + if ( m_hPen ) + ::DeleteObject(m_hPen); } -// Should implement Create -wxPen::wxPen(const wxColour& col, int Width, int Style) +// ---------------------------------------------------------------------------- +// wxPenRefData HPEN management +// ---------------------------------------------------------------------------- + +#ifdef wxHAVE_EXT_CREATE_PEN + +static int ConvertPenStyle(int style) { - m_refData = new wxPenRefData; + switch ( style ) + { + case wxDOT: + return PS_DOT; + + case wxDOT_DASH: + return PS_DASHDOT; + + case wxSHORT_DASH: + case wxLONG_DASH: + return PS_DASH; + + case wxTRANSPARENT: + return PS_NULL; + + case wxUSER_DASH: + return PS_USERSTYLE; + + default: + wxFAIL_MSG( _T("unknown pen style") ); + // fall through + + case wxSTIPPLE: + case wxBDIAGONAL_HATCH: + case wxCROSSDIAG_HATCH: + case wxFDIAGONAL_HATCH: + case wxCROSS_HATCH: + case wxHORIZONTAL_HATCH: + case wxVERTICAL_HATCH: + case wxSOLID: + return PS_SOLID; + } +} - M_PENDATA->m_colour = col; -// M_PENDATA->m_stipple = NULL; - M_PENDATA->m_width = Width; - M_PENDATA->m_style = Style; - M_PENDATA->m_join = wxJOIN_ROUND ; - M_PENDATA->m_cap = wxCAP_ROUND ; - M_PENDATA->m_nbDash = 0 ; - M_PENDATA->m_dash = (wxDash*)NULL; - M_PENDATA->m_hPen = 0 ; +static int ConvertJoinStyle(int join) +{ + switch( join ) + { + case wxJOIN_BEVEL: + return PS_JOIN_BEVEL; -#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 + case wxJOIN_MITER: + return PS_JOIN_MITER; - 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(); + default: + wxFAIL_MSG( _T("unknown pen join style") ); + // fall through + case wxJOIN_ROUND: + return PS_JOIN_ROUND; + } } -wxPen::wxPen(const wxBitmap& stipple, int Width) +static int ConvertCapStyle(int cap) { - m_refData = new wxPenRefData; + switch ( cap ) + { + case wxCAP_PROJECTING: + return PS_ENDCAP_SQUARE; -// M_PENDATA->m_colour = col; - M_PENDATA->m_stipple = stipple; - M_PENDATA->m_width = Width; - M_PENDATA->m_style = wxSTIPPLE; - M_PENDATA->m_join = wxJOIN_ROUND ; - M_PENDATA->m_cap = wxCAP_ROUND ; - M_PENDATA->m_nbDash = 0 ; - M_PENDATA->m_dash = (wxDash*)NULL; - M_PENDATA->m_hPen = 0 ; + case wxCAP_BUTT: + return PS_ENDCAP_FLAT; - RealizeResource(); + default: + wxFAIL_MSG( _T("unknown pen cap style") ); + // fall through + case wxCAP_ROUND: + return PS_ENDCAP_ROUND; + } } -bool wxPen::RealizeResource() +#endif // wxHAVE_EXT_CREATE_PEN + +bool wxPenRefData::Alloc() { - if (M_PENDATA && (M_PENDATA->m_hPen == 0)) + if ( m_hPen ) + return false; + + if ( m_style == wxTRANSPARENT ) { - if (M_PENDATA->m_style==wxTRANSPARENT) + m_hPen = (HPEN)::GetStockObject(NULL_PEN); + return true; + } + + const COLORREF col = m_colour.GetPixel(); + +#ifdef wxHAVE_EXT_CREATE_PEN + // Only NT can display dashed or dotted lines with width > 1 + static const int os = wxGetOsVersion(); + if ( os != wxOS_WINDOWS_NT && + (m_style == wxDOT || + m_style == wxLONG_DASH || + m_style == wxSHORT_DASH || + m_style == wxDOT_DASH || + m_style == wxUSER_DASH) && + m_width > 1 ) + { + m_width = 1; + } + + // check if it's a standard kind of pen which can be created with just + // CreatePen() + if ( m_join == wxJOIN_ROUND && + m_cap == wxCAP_ROUND && + m_style != wxUSER_DASH && + m_style != wxSTIPPLE && + (m_width <= 1 || m_style == wxSOLID) ) +#endif // !wxHAVE_EXT_CREATE_PEN + { + m_hPen = ::CreatePen(ConvertPenStyle(m_style), m_width, col); + } +#ifdef wxHAVE_EXT_CREATE_PEN + else // need to use ExtCreatePen() + { + DWORD styleMSW = PS_GEOMETRIC | + ConvertPenStyle(m_style) | + ConvertJoinStyle(m_join) | + ConvertCapStyle(m_cap); + + LOGBRUSH lb; + switch( m_style ) { - M_PENDATA->m_hPen = (WXHPEN) ::GetStockObject(NULL_PEN); - return TRUE; + case wxSTIPPLE: + lb.lbStyle = BS_PATTERN; + lb.lbHatch = (LONG)m_stipple.GetHBITMAP(); + break; + + case wxBDIAGONAL_HATCH: + lb.lbStyle = BS_HATCHED; + lb.lbHatch = HS_BDIAGONAL; + break; + + case wxCROSSDIAG_HATCH: + lb.lbStyle = BS_HATCHED; + lb.lbHatch = HS_DIAGCROSS; + break; + + case wxFDIAGONAL_HATCH: + lb.lbStyle = BS_HATCHED; + lb.lbHatch = HS_FDIAGONAL; + break; + + case wxCROSS_HATCH: + lb.lbStyle = BS_HATCHED; + lb.lbHatch = HS_CROSS; + break; + + case wxHORIZONTAL_HATCH: + lb.lbStyle = BS_HATCHED; + lb.lbHatch = HS_HORIZONTAL; + break; + + case wxVERTICAL_HATCH: + lb.lbStyle = BS_HATCHED; + lb.lbHatch = HS_VERTICAL; + break; + + default: + lb.lbStyle = BS_SOLID; +#ifdef __WXDEBUG__ + // this should be unnecessary (it's unused) but suppresses the + // Purify messages about uninitialized memory read + lb.lbHatch = 0; +#endif + break; } - COLORREF ms_colour = 0; - ms_colour = M_PENDATA->m_colour.GetPixel(); - - // Join style, Cap style, Pen Stippling only on Win32. - // Currently no time to find equivalent on Win3.1, sorry - // [if such equiv exist!!] -#if defined(__WIN32__) && !defined(__WXMICROWIN__) - if (M_PENDATA->m_join==wxJOIN_ROUND && - M_PENDATA->m_cap==wxCAP_ROUND && - M_PENDATA->m_style!=wxUSER_DASH && - M_PENDATA->m_style!=wxSTIPPLE && - M_PENDATA->m_width <= 1) + lb.lbColor = col; + + DWORD *dash; + if ( m_style == wxUSER_DASH && m_nbDash && m_dash ) { - M_PENDATA->m_hPen = - (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style), - M_PENDATA->m_width, - ms_colour ); + dash = new DWORD[m_nbDash]; + int rw = m_width > 1 ? m_width : 1; + for ( int i = 0; i < m_nbDash; i++ ) + dash[i] = m_dash[i] * rw; } else { - DWORD ms_style = PS_GEOMETRIC | wx2msPenStyle(M_PENDATA->m_style); - - switch(M_PENDATA->m_join) - { - case wxJOIN_BEVEL: ms_style |= PS_JOIN_BEVEL; break; - case wxJOIN_MITER: ms_style |= PS_JOIN_MITER; break; - default: - case wxJOIN_ROUND: ms_style |= PS_JOIN_ROUND; break; - } - - switch(M_PENDATA->m_cap) - { - case wxCAP_PROJECTING: ms_style |= PS_ENDCAP_SQUARE; break; - case wxCAP_BUTT: ms_style |= PS_ENDCAP_FLAT; break; - default: - case wxCAP_ROUND: ms_style |= PS_ENDCAP_ROUND; break; - } - - LOGBRUSH logb; - - switch(M_PENDATA->m_style) - { - case wxSTIPPLE: - logb.lbStyle = BS_PATTERN ; - if (M_PENDATA->m_stipple.Ok()) - logb.lbHatch = (LONG)M_PENDATA->m_stipple.GetHBITMAP(); - else - logb.lbHatch = (LONG)0; - break; - case wxBDIAGONAL_HATCH: - logb.lbStyle = BS_HATCHED; - logb.lbHatch = HS_BDIAGONAL; - break; - case wxCROSSDIAG_HATCH: - logb.lbStyle = BS_HATCHED; - logb.lbHatch = HS_DIAGCROSS; - break; - case wxFDIAGONAL_HATCH: - logb.lbStyle = BS_HATCHED; - logb.lbHatch = HS_FDIAGONAL; - break; - case wxCROSS_HATCH: - logb.lbStyle = BS_HATCHED; - logb.lbHatch = HS_CROSS; - break; - case wxHORIZONTAL_HATCH: - logb.lbStyle = BS_HATCHED; - logb.lbHatch = HS_HORIZONTAL; - break; - case wxVERTICAL_HATCH: - logb.lbStyle = BS_HATCHED; - logb.lbHatch = HS_VERTICAL; - break; - default: - logb.lbStyle = BS_SOLID; -#ifdef __WXDEBUG__ - // this should be unnecessary (it's unused) but suppresses the Purigy - // messages about uninitialized memory read - logb.lbHatch = 0; -#endif - break; - } - - logb.lbColor = ms_colour; - - wxMSWDash *real_dash; - if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash) - { - real_dash = new wxMSWDash[M_PENDATA->m_nbDash]; - for ( int i = 0; i < M_PENDATA->m_nbDash; i++ ) - real_dash[i] = M_PENDATA->m_dash[i] * M_PENDATA->m_width; - } - else - { - real_dash = (wxMSWDash*)NULL; - } - - // Win32s doesn't have ExtCreatePen function... - if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95) - { - M_PENDATA->m_hPen = - (WXHPEN) ExtCreatePen( ms_style, - M_PENDATA->m_width, - &logb, - M_PENDATA->m_style == wxUSER_DASH - ? M_PENDATA->m_nbDash - : 0, - (LPDWORD)real_dash ); - } - else - { - M_PENDATA->m_hPen = - (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style), - M_PENDATA->m_width, - ms_colour ); - } - - if (real_dash) - delete [] real_dash; + dash = NULL; } -#else - M_PENDATA->m_hPen = - (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style), - M_PENDATA->m_width, - ms_colour ); -#endif -#ifdef WXDEBUG_CREATE - if (M_PENDATA->m_hPen==0) - wxError("Cannot create pen","Internal error") ; -#endif - return TRUE; - } - return FALSE; + + m_hPen = ::ExtCreatePen(styleMSW, m_width, &lb, m_nbDash, (LPDWORD)dash); + + delete [] dash; + } +#endif // wxHAVE_EXT_CREATE_PEN + + return m_hPen != 0; +} + +bool wxPenRefData::Free() +{ + if ( !m_hPen ) + return false; + + ::DeleteObject(m_hPen); + m_hPen = 0; + + return true; +} + +WXHPEN wxPenRefData::GetHPEN() const +{ + if ( !m_hPen ) + wx_const_cast(wxPenRefData *, this)->Alloc(); + + return (WXHPEN)m_hPen; +} + +// ---------------------------------------------------------------------------- +// wxPen +// ---------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) + +wxPen::wxPen(const wxColour& col, int width, int style) +{ + m_refData = new wxPenRefData(col, width, style); +} + +wxPen::wxPen(const wxBitmap& stipple, int width) +{ + m_refData = new wxPenRefData(stipple, width); +} + +bool wxPen::operator==(const wxPen& pen) const +{ + const wxPenRefData * + penData = wx_static_cast(const wxPenRefData *, pen.m_refData); + + // an invalid pen is only equal to another invalid pen + return m_refData ? penData && *M_PENDATA == *penData : !penData; +} + +bool wxPen::RealizeResource() +{ + return M_PENDATA && M_PENDATA->Alloc(); } WXHANDLE wxPen::GetResourceHandle() const { - if ( !M_PENDATA ) - return 0; - else - return (WXHANDLE)M_PENDATA->m_hPen; + return M_PENDATA ? M_PENDATA->GetHPEN() : 0; } bool wxPen::FreeResource(bool WXUNUSED(force)) { - if (M_PENDATA && (M_PENDATA->m_hPen != 0)) - { - DeleteObject((HPEN) M_PENDATA->m_hPen); - M_PENDATA->m_hPen = 0; - return TRUE; - } - else return FALSE; + return M_PENDATA && M_PENDATA->Free(); } bool wxPen::IsFree() const { - return (M_PENDATA && M_PENDATA->m_hPen == 0); + return M_PENDATA && !M_PENDATA->HasHPEN(); } -void wxPen::Unshare() +wxObjectRefData* wxPen::CreateRefData() const { - // Don't change shared data - if (!m_refData) - { - m_refData = new wxPenRefData(); - } - else - { - wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData); - UnRef(); - m_refData = ref; - } + return new wxPenRefData; } -void wxPen::SetColour(const wxColour& col) +wxObjectRefData* wxPen::CloneRefData(const wxObjectRefData* data) const { - Unshare(); + return new wxPenRefData(*wx_static_cast(const wxPenRefData*, data)); +} - M_PENDATA->m_colour = col; +void wxPen::SetColour(const wxColour& col) +{ + AllocExclusive(); - RealizeResource(); + M_PENDATA->SetColour(col); } void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b) { - Unshare(); + SetColour(wxColour(r, g, b)); +} - M_PENDATA->m_colour.Set(r, g, b); +void wxPen::SetWidth(int width) +{ + AllocExclusive(); - RealizeResource(); + M_PENDATA->SetWidth(width); } -void wxPen::SetWidth(int Width) +void wxPen::SetStyle(int style) { - Unshare(); - - M_PENDATA->m_width = Width; + AllocExclusive(); - RealizeResource(); + M_PENDATA->SetStyle(style); } -void wxPen::SetStyle(int Style) +void wxPen::SetStipple(const wxBitmap& stipple) { - Unshare(); + AllocExclusive(); - M_PENDATA->m_style = Style; - - RealizeResource(); + M_PENDATA->SetStipple(stipple); } -void wxPen::SetStipple(const wxBitmap& Stipple) +void wxPen::SetDashes(int nb_dashes, const wxDash *dash) { - Unshare(); + AllocExclusive(); - M_PENDATA->m_stipple = Stipple; - M_PENDATA->m_style = wxSTIPPLE; + M_PENDATA->SetDashes(nb_dashes, dash); +} - RealizeResource(); +void wxPen::SetJoin(int join) +{ + AllocExclusive(); + + M_PENDATA->SetJoin(join); } -void wxPen::SetDashes(int nb_dashes, const wxDash *Dash) +void wxPen::SetCap(int cap) { - Unshare(); + AllocExclusive(); - M_PENDATA->m_nbDash = nb_dashes; - M_PENDATA->m_dash = (wxDash *)Dash; + M_PENDATA->SetCap(cap); +} - RealizeResource(); +wxColour& wxPen::GetColour() const +{ + return m_refData ? M_PENDATA->GetColour() : wxNullColour; } -void wxPen::SetJoin(int Join) +int wxPen::GetWidth() const { - Unshare(); + return m_refData ? M_PENDATA->GetWidth() : 0; +} - M_PENDATA->m_join = Join; +int wxPen::GetStyle() const +{ + return m_refData ? M_PENDATA->GetStyle() : 0; +} - RealizeResource(); +int wxPen::GetJoin() const +{ + return m_refData ? M_PENDATA->GetJoin() : 0; } -void wxPen::SetCap(int Cap) +int wxPen::GetCap() const { - Unshare(); + return m_refData ? M_PENDATA->GetCap() : 0; +} - M_PENDATA->m_cap = Cap; +int wxPen::GetDashes(wxDash** ptr) const +{ + if ( !m_refData ) + { + *ptr = NULL; + return 0; + } - RealizeResource(); + *ptr = M_PENDATA->GetDash(); + return M_PENDATA->GetDashCount(); } -int wx2msPenStyle(int wx_style) +wxDash* wxPen::GetDash() const { - int cstyle; - switch (wx_style) - { -#if !defined(__WXMICROWIN__) - case wxDOT: - cstyle = PS_DOT; - break; - - case wxDOT_DASH: - cstyle = PS_DASHDOT; - break; - - case wxSHORT_DASH: - case wxLONG_DASH: - cstyle = PS_DASH; - break; - - case wxTRANSPARENT: - cstyle = PS_NULL; - break; -#endif + return m_refData ? M_PENDATA->GetDash() : NULL; +} - case wxUSER_DASH: -#if !defined(__WXMICROWIN__) -#ifdef __WIN32__ - // Win32s doesn't have PS_USERSTYLE - if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95) - cstyle = PS_USERSTYLE; - else - cstyle = PS_DOT; // We must make a choice... This is mine! -#else - cstyle = PS_DASH; -#endif -#endif - break; - case wxSOLID: - default: - cstyle = PS_SOLID; - break; - } - return cstyle; +int wxPen::GetDashCount() const +{ + return m_refData ? M_PENDATA->GetDashCount() : 0; } +wxBitmap* wxPen::GetStipple() const +{ + return m_refData ? M_PENDATA->GetStipple() : NULL; +}