X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c9a19aabab3a878b565e6c2a5f2a3824277c4dc..6afa47d63d56094958ed4d2528bf45ad67340954:/src/msw/brush.cpp diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp index 9f44181943..4fc8fb3b65 100644 --- a/src/msw/brush.cpp +++ b/src/msw/brush.cpp @@ -13,7 +13,7 @@ // declarations // ============================================================================ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "brush.h" #endif @@ -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 ) {