X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..45212047969548b7d4a848e3a9c6cfdcb0484104:/src/msw/brush.cpp diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp index e47a77f3b1..f1109f4633 100644 --- a/src/msw/brush.cpp +++ b/src/msw/brush.cpp @@ -5,8 +5,8 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -151,26 +151,30 @@ void wxBrushRefData::Free() static int TransllateHatchStyle(int style) { +#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) switch ( style ) { -#ifndef __WXMICROWIN__ case wxBDIAGONAL_HATCH: return HS_BDIAGONAL; case wxCROSSDIAG_HATCH: return HS_DIAGCROSS; case wxFDIAGONAL_HATCH: return HS_FDIAGONAL; case wxCROSS_HATCH: return HS_CROSS; case wxHORIZONTAL_HATCH:return HS_HORIZONTAL; case wxVERTICAL_HATCH: return HS_VERTICAL; -#endif // __WXMICROWIN__ default: return -1; } +#else // __WXMICROWIN__ + return -1; +#endif } HBRUSH wxBrushRefData::GetHBRUSH() { if ( !m_hBrush ) { +#ifndef __WXWINCE__ int hatchStyle = TransllateHatchStyle(m_style); if ( hatchStyle == -1 ) +#endif { switch ( m_style ) { @@ -196,10 +200,12 @@ HBRUSH wxBrushRefData::GetHBRUSH() break; } } +#ifndef __WXWINCE__ else // create a hatched brush { m_hBrush = ::CreateHatchBrush(hatchStyle, m_colour.GetPixel()); } +#endif if ( !m_hBrush ) {