Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix wxMSW build after wxBrush changes: return wxBRUSHSTYLE_MAX instead of zero; fix include loop in MSW headers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-03-16 17:00:39 +00:00
parent 3e6858cdcb
commit 6ffb03bec3
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/msw/brush.h
View File

@@ -12,11 +12,9 @@
#ifndef _WX_BRUSH_H_ #ifndef _WX_BRUSH_H_
#define _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 wxBrush;
class WXDLLIMPEXP_FWD_CORE wxColour;
class WXDLLIMPEXP_FWD_CORE wxBitmap;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxBrush // wxBrush

2
src/msw/brush.cpp
View File

@@ -275,7 +275,7 @@ wxColour wxBrush::GetColour() const
wxBrushStyle wxBrush::GetStyle() const wxBrushStyle wxBrush::GetStyle() const
{ {
wxCHECK_MSG( Ok(), 0, _T("invalid brush") ); wxCHECK_MSG( Ok(), wxBRUSHSTYLE_MAX, _T("invalid brush") );
return M_BRUSHDATA->GetStyle(); return M_BRUSHDATA->GetStyle();
} }