build fix (looking at buildbot)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
6cef0db280
commit
9d7a8e4ab4
@ -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
|
||||
|
@ -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
|
||||
|
@ -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();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user