fix wxMSW build after wxBrush changes: return wxBRUSHSTYLE_MAX instead of zero; fix...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index 8554818c23a785d34ec918420fb3a42e33902e32..621b0c28c7de0f7f4692a90b0124b0beb7833dae 100644 (file)
--- 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 b8e881b81fbd5cbf5c24e21656b39797e9e88700..287ed0c02704fb7d9e48d5a4ae03832caa40524a 100644 (file)
--- 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();
 }