From 6ffb03bec35bb766bc468c08e0f495746f4585ad Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Sun, 16 Mar 2008 17:00:39 +0000 Subject: [PATCH] fix wxMSW build after wxBrush changes: return wxBRUSHSTYLE_MAX instead of zero; fix include loop in MSW headers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/brush.h | 6 ++---- src/msw/brush.cpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index 8554818c23..621b0c28c7 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -12,11 +12,9 @@ #ifndef _WX_BRUSH_H_ #define _WX_BRUSH_H_ -#include "wx/gdicmn.h" -#include "wx/gdiobj.h" -#include "wx/bitmap.h" - class WXDLLIMPEXP_FWD_CORE wxBrush; +class WXDLLIMPEXP_FWD_CORE wxColour; +class WXDLLIMPEXP_FWD_CORE wxBitmap; // ---------------------------------------------------------------------------- // wxBrush diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp index b8e881b81f..287ed0c027 100644 --- a/src/msw/brush.cpp +++ b/src/msw/brush.cpp @@ -275,7 +275,7 @@ wxColour wxBrush::GetColour() const wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), 0, _T("invalid brush") ); + wxCHECK_MSG( Ok(), wxBRUSHSTYLE_MAX, _T("invalid brush") ); return M_BRUSHDATA->GetStyle(); } -- 2.45.2