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

build fix (looking at buildbot)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-03-16 22:42:38 +00:00
parent 6cef0db280
commit 9d7a8e4ab4
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/brush.h
View File

@@ -15,6 +15,7 @@
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/object.h" #include "wx/object.h"
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
#include "wx/gdicmn.h" // for wxGDIObjListBase
// NOTE: these values cannot be combined together! // NOTE: these values cannot be combined together!
enum wxBrushStyle enum wxBrushStyle

1
include/wx/font.h
View File

@@ -19,6 +19,7 @@
#include "wx/defs.h" // for wxDEFAULT &c #include "wx/defs.h" // for wxDEFAULT &c
#include "wx/fontenc.h" // the font encoding constants #include "wx/fontenc.h" // the font encoding constants
#include "wx/gdiobj.h" // the base class #include "wx/gdiobj.h" // the base class
#include "wx/gdicmn.h" // for wxGDIObjListBase
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// forward declarations // forward declarations

4
src/mac/carbon/brush.cpp
View File

@@ -42,7 +42,7 @@ public:
protected: protected:
void DoSetStipple(const wxBitmap& stipple); void DoSetStipple(const wxBitmap& stipple);
wxBitmap m_stipple ; wxBitmap m_stipple;
wxColour m_colour; wxColour m_colour;
wxBrushStyle m_style; wxBrushStyle m_style;
}; };
@@ -140,7 +140,7 @@ const 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();
} }