Move wxCocoa's wxFontRefData from the header to the implementation file.

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

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index ce2d51845901244a20f2501f725acf49ff61e8de..e8badf123ba7fb5c8fcf1e568cd679e7bdc6d641 100644 (file)
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -1,8 +1,4 @@
-/* This test added by JACS as a quick fix. What should we do
- * to make it work with configure?
- */
-
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__DMC__)
+#if defined(_WIN32) || defined(__OS2__)

 #include "jconfig.vc"
 #else
 
 #include "jconfig.vc"
 #else
 


@@ -10,12 +6,22 @@
 /* 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__ )
 #   ifndef __WXMAC__
 #       define __WWXMAC__
 #   endif
 #ifdef __MWERKS__
 #if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
 #   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
 
 
 #   define USE_MAC_MEMMGR
 


@@ -27,14 +33,12 @@
 #       include <machine/ansi.h>
 #   endif
 
 #       include <machine/ansi.h>
 #   endif
 

-// automatically includes MacHeaders
+/* automatically includes MacHeaders */

 #elif (__MWERKS__ >= 0x0900) && __INTEL__
     #define __WXMSW__
 #endif
 #endif
 
 #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