projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)
[wxWidgets.git]
/
include
/
wx
/
mgl
/
private.h
diff --git
a/include/wx/mgl/private.h
b/include/wx/mgl/private.h
index 1d86262a13202e3509014afa2f1c58952a4f4ff3..6b56a9d0b10a495a23a10c16541681ce3bcf75c7 100644
(file)
--- a/
include/wx/mgl/private.h
+++ b/
include/wx/mgl/private.h
@@
-10,12
+10,17
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// 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 <mgraph.hpp>
#include "pmapi.h"
#include <mgraph.hpp>
#include "pmapi.h"
+// the scitech headers define true and false
+#undef true
+#undef false
+
class WXDLLEXPORT wxBitmap;
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)
// 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);
pixpattern24_t *pix, pattern_t *mask);
-
+
// Sets current DC and restores previous one upon destruction:
class wxCurrentDCSwitcher
// 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_