Added XPM ctor

[wxWidgets.git] / src / jpeg / jconfig.h

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index e76403adc2963b0f8802c7102fc5c852538c20df..d1aeb622a661b8f2283f4937bfc21a246d8efcb9 100644 (file)
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -10,26 +10,39 @@
 /* jconfig.cfg --- source file edited by configure script */
 /* see jconfig.doc for explanations */
 
 /* jconfig.cfg --- source file edited by configure script */
 /* see jconfig.doc for explanations */
 

-/* use wxWidgets' configure */
+/* If using MetroWerks on Mac define __WXMAC__ if it isn't already
+   FIXME: Is this necessary any longer? */

 #ifdef __MWERKS__
 #if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
 #ifdef __MWERKS__
 #if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )

-    #define __WXMAC__
-               #define USE_MAC_MEMMGR
-       #ifdef __MACH__
-         #include <ansi_prefix.mach.h>
-         #include <msl_c_version.h>
-         #include <stdint.h>
-         #undef WCHAR_MAX
-         #include <machine/ansi.h>
-       #endif
+#   ifndef __WXMAC__
+#       define __WWXMAC__
+#   endif
+#endif
+#endif
+
+/* use wxWidgets' configure */
+#include "wx/setup.h"
+
+// If using Metrowerks and not using configure-generated setup
+#if defined(__MWERKS__) && !defined(__WX_SETUP_H__)
+#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
+
+#   define USE_MAC_MEMMGR
+
+#   ifdef __MACH__
+#       include <ansi_prefix.mach.h>
+#       include <msl_c_version.h>
+#       include <stdint.h>
+#       undef WCHAR_MAX
+#       include <machine/ansi.h>
+#   endif
+

 // automatically includes MacHeaders
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __WXMSW__
 #endif
 #endif
 
 // automatically includes MacHeaders
 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __WXMSW__
 #endif
 #endif
 

-#include "wx/setup.h"
-

 #define HAVE_PROTOTYPES
 #define HAVE_UNSIGNED_CHAR
 #define HAVE_UNSIGNED_SHORT
 #define HAVE_PROTOTYPES
 #define HAVE_UNSIGNED_CHAR
 #define HAVE_UNSIGNED_SHORT