fixing 'id' objc.h collisions, listbox rewrite

[wxWidgets.git] / include / wx / mgl / private.h

diff --git a/include/wx/mgl/private.h b/include/wx/mgl/private.h
index d263eb64511dd336be244a7b8f3492e0bc8ae399..6b56a9d0b10a495a23a10c16541681ce3bcf75c7 100644 (file)
--- a/include/wx/mgl/private.h
+++ b/include/wx/mgl/private.h
@@ -7,15 +7,20 @@
 // Created:     2001/04/07
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWidgets 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"
 
+// 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_