Implement wxIcon::LoadFile by defering to wxBitmap implementation instead of creating...

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

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index 8913296008d502e398d82342cd1c7d464bccb098..e8badf123ba7fb5c8fcf1e568cd679e7bdc6d641 100644 (file)
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -1,17 +1,51 @@
+#if defined(_WIN32) || defined(__OS2__)
+#include "jconfig.vc"
+#else
+

 /* jconfig.h.  Generated automatically by configure.  */
 /* jconfig.cfg --- source file edited by configure script */
 /* see jconfig.doc for explanations */
 
 /* jconfig.h.  Generated automatically by configure.  */
 /* jconfig.cfg --- source file edited by configure script */
 /* see jconfig.doc for explanations */
 

-/* use wxWindows' 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__ )
+#   ifndef __WXMAC__
+#       define __WWXMAC__
+#   endif
+#endif
+#endif
+
+/* use wxWidgets' configure */

 #include "wx/setup.h"
 
 #include "wx/setup.h"
 

-#define HAVE_PROTOTYPES 
-#define HAVE_UNSIGNED_CHAR 
-#define HAVE_UNSIGNED_SHORT 
+/* 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
+
+#define HAVE_PROTOTYPES
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT

 #undef void
 #undef const
 
 #undef void
 #undef const
 

-/* use wxWindows' configure */
+/* use wxWidgets' configure */

 /* #undef CHAR_IS_UNSIGNED */
 #ifdef __CHAR_UNSIGNED__
   #ifndef CHAR_IS_UNSIGNED
 /* #undef CHAR_IS_UNSIGNED */
 #ifdef __CHAR_UNSIGNED__
   #ifndef CHAR_IS_UNSIGNED


@@ -21,8 +55,8 @@
   #undef CHAR_IS_UNSIGNED
 #endif
 
   #undef CHAR_IS_UNSIGNED
 #endif
 

-#define HAVE_STDDEF_H 
-#define HAVE_STDLIB_H 
+#define HAVE_STDDEF_H
+#define HAVE_STDLIB_H

 #undef NEED_BSD_STRINGS
 #undef NEED_SYS_TYPES_H
 #undef NEED_FAR_POINTERS
 #undef NEED_BSD_STRINGS
 #undef NEED_SYS_TYPES_H
 #undef NEED_FAR_POINTERS


@@ -34,9 +68,15 @@
 
 #undef RIGHT_SHIFT_IS_UNSIGNED
 
 
 #undef RIGHT_SHIFT_IS_UNSIGNED
 

-/* use wxWindows' configure */
+/* use wxWidgets' configure */

 /* #define INLINE __inline__ */
 /* #define INLINE __inline__ */

+#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400)
+#define INLINE
+#elif defined(__WATCOMC__)
+#define INLINE
+#else

 #define INLINE inline
 #define INLINE inline

+#endif

 
 /* These are for configuring the JPEG memory manager. */
 #undef DEFAULT_MAX_MEM
 
 /* These are for configuring the JPEG memory manager. */
 #undef DEFAULT_MAX_MEM


@@ -60,3 +100,6 @@
 #undef PROGRESS_REPORT
 
 #endif /* JPEG_CJPEG_DJPEG */
 #undef PROGRESS_REPORT
 
 #endif /* JPEG_CJPEG_DJPEG */

+#endif
+    /* _MSC_VER */
+