From 9d7a8e4ab4592ca9fac2fc3e931eb7b5ef7fcf89 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Sun, 16 Mar 2008 22:42:38 +0000 Subject: [PATCH] build fix (looking at buildbot) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/brush.h | 1 + include/wx/font.h | 1 + src/mac/carbon/brush.cpp | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/wx/brush.h b/include/wx/brush.h index 201e53e91a..d55ed5c3af 100644 --- a/include/wx/brush.h +++ b/include/wx/brush.h @@ -15,6 +15,7 @@ #include "wx/defs.h" #include "wx/object.h" #include "wx/gdiobj.h" +#include "wx/gdicmn.h" // for wxGDIObjListBase // NOTE: these values cannot be combined together! enum wxBrushStyle diff --git a/include/wx/font.h b/include/wx/font.h index e79e04e91c..744e4fefeb 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -19,6 +19,7 @@ #include "wx/defs.h" // for wxDEFAULT &c #include "wx/fontenc.h" // the font encoding constants #include "wx/gdiobj.h" // the base class +#include "wx/gdicmn.h" // for wxGDIObjListBase // ---------------------------------------------------------------------------- // forward declarations diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp index 5de190f1a5..14a75ca37e 100644 --- a/src/mac/carbon/brush.cpp +++ b/src/mac/carbon/brush.cpp @@ -42,7 +42,7 @@ public: protected: void DoSetStipple(const wxBitmap& stipple); - wxBitmap m_stipple ; + wxBitmap m_stipple; wxColour m_colour; wxBrushStyle m_style; }; @@ -140,7 +140,7 @@ const 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