X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52750c2e106113bc8d1c46289474adfd405d5ade..e4c37d10dd8f5aa28de2afd022b49a3f53a86d47:/include/wx/mgl/private.h diff --git a/include/wx/mgl/private.h b/include/wx/mgl/private.h index 5406f24752..6b56a9d0b1 100644 --- a/include/wx/mgl/private.h +++ b/include/wx/mgl/private.h @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// // Name: private.h // Purpose: Private declarations: as this header is only included by -// wxWindows itself, it may contain identifiers which don't start +// wxWidgets itself, it may contain identifiers which don't start // with "wx". // Author: Vaclav Slavik // Created: 2001/04/07 @@ -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_