X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..3a4abf80552dce71c27568d849c677671c752043:/include/wx/mgl/private.h diff --git a/include/wx/mgl/private.h b/include/wx/mgl/private.h index 1d86262a13..6b56a9d0b1 100644 --- a/include/wx/mgl/private.h +++ b/include/wx/mgl/private.h @@ -10,12 +10,17 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_PRIVATE_H_ -#define _WX_PRIVATE_H_ +#ifndef _WX_MGL_PRIVATE_H_ +#define _WX_MGL_PRIVATE_H_ +#include "wx/ioswrap.h" #include #include "pmapi.h" +// the scitech headers define true and false +#undef true +#undef false + class WXDLLEXPORT wxBitmap; @@ -34,9 +39,9 @@ extern winmng_t *g_winMng; // This function converts wxBitmap into pixpattern24_t representation // (used by wxBrush and wxPen) -extern void wxBitmapToPixPattern(const wxBitmap& bitmap, +extern void wxBitmapToPixPattern(const wxBitmap& bitmap, pixpattern24_t *pix, pattern_t *mask); - + // Sets current DC and restores previous one upon destruction: class wxCurrentDCSwitcher @@ -50,4 +55,4 @@ public: }; -#endif // _WX_PRIVATE_H_ +#endif // _WX_MGL_PRIVATE_H_