#included log.h

[wxWidgets.git] / utils / ogl / src / mfutils.h

diff --git a/utils/ogl/src/mfutils.h b/utils/ogl/src/mfutils.h
index e4b1c2c4fe9bfbc676436c590bcef470d157cc68..b070e1781db683d0afe1e9172fe89818d7f0c05d 100644 (file)
--- a/utils/ogl/src/mfutils.h
+++ b/utils/ogl/src/mfutils.h
@@ -19,7 +19,7 @@
 
 #include <wx/metafile.h>
 
 
 #include <wx/metafile.h>
 

-#ifndef __WXMSW__
+#ifndef GetRValue

 #define GetRValue(rgb)     ((unsigned char)(rgb))
 #define GetGValue(rgb)      ((unsigned char)(((int)(rgb)) >> 8))
 #define GetBValue(rgb)     ((unsigned char)((rgb)>>16))
 #define GetRValue(rgb)     ((unsigned char)(rgb))
 #define GetGValue(rgb)      ((unsigned char)(((int)(rgb)) >> 8))
 #define GetBValue(rgb)     ((unsigned char)((rgb)>>16))


@@ -27,7 +27,7 @@
 
 /* Metafile Functions */
 /* Win32s/Borland need these macros, although META_SETBKCOLOR is defined */
 
 /* Metafile Functions */
 /* Win32s/Borland need these macros, although META_SETBKCOLOR is defined */

-#if !defined(META_SETBKCOLOR) || defined(WIN32)
+#if 1 // !defined(META_SETBKCOLOR) // || defined(WIN32)

 
 #define META_SETBKCOLOR                     0x0201
 #define META_SETBKMODE              0x0102
 
 #define META_SETBKCOLOR                     0x0201
 #define META_SETBKMODE              0x0102


@@ -129,7 +129,7 @@
 
 /* PitchAndFamily family values (high 4 bits) */
 /* Win32s/Borland don't need this */
 
 /* PitchAndFamily family values (high 4 bits) */
 /* Win32s/Borland don't need this */

-#if !defined(__BORLANDC__) && !defined(WIN32)
+#ifndef FF_DONTCARE // !defined(__BORLANDC__) && !defined(WIN32)

 #define FF_DONTCARE         0x00
 #define FF_ROMAN            0x10
 #define FF_SWISS            0x20
 #define FF_DONTCARE         0x00
 #define FF_ROMAN            0x10
 #define FF_SWISS            0x20