Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox

[wxWidgets.git] / include / wx / palmos / chkconf.h

diff --git a/include/wx/palmos/chkconf.h b/include/wx/palmos/chkconf.h
index 3f274cee63a4b5cda50758540e94f7856ebbd28c..121f45d40742cd9624fd1f895dd21de484dfe974 100644 (file)
--- a/include/wx/palmos/chkconf.h
+++ b/include/wx/palmos/chkconf.h
@@ -1,10 +1,10 @@
 /*
  * Name:        wx/palmos/chkconf.h
  * Purpose:     Compiler-specific configuration checking
 /*
  * Name:        wx/palmos/chkconf.h
  * Purpose:     Compiler-specific configuration checking

- * Author:      William Osborne
+ * Author:      William Osborne - minimal working wxPalmOS port

  * Modified by:
  * Created:     10/13/04
  * Modified by:
  * Created:     10/13/04

- * RCS-ID:      $Id: 
+ * RCS-ID:      $Id$

  * Copyright:   (c) William Osborne
  * Licence:     wxWindows licence
  */
  * Copyright:   (c) William Osborne
  * Licence:     wxWindows licence
  */


@@ -14,6 +14,15 @@
 #ifndef _WX_PALMOS_CHKCONF_H_
 #define _WX_PALMOS_CHKCONF_H_
 
 #ifndef _WX_PALMOS_CHKCONF_H_
 #define _WX_PALMOS_CHKCONF_H_
 

+#if WXWIN_COMPATIBILITY_2_4
+    #error "wxPalmOS port was introduced after 2.4.X"
+#endif
+
+#ifdef wxUSE_FILECONFIG
+    #undef wxUSE_FILECONFIG
+#endif
+#define wxUSE_FILECONFIG 0
+

 /*
  * disable the settings which don't work for some compilers
  */
 /*
  * disable the settings which don't work for some compilers
  */


@@ -21,7 +30,6 @@
 /*
  * If using PostScript-in-MSW in Univ, must enable PostScript
  */
 /*
  * If using PostScript-in-MSW in Univ, must enable PostScript
  */

-

 #if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
 #undef wxUSE_POSTSCRIPT
 #define wxUSE_POSTSCRIPT 1
 #if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
 #undef wxUSE_POSTSCRIPT
 #define wxUSE_POSTSCRIPT 1


@@ -96,23 +104,6 @@
 #define wxUSE_CHECKLISTBOX 0
 #endif
 
 #define wxUSE_CHECKLISTBOX 0
 #endif
 

-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
-/* BC++ 4.0 can't compile JPEG library */
-#undef wxUSE_LIBJPEG
-#define wxUSE_LIBJPEG 0
-#endif
-
-/* wxUSE_DEBUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode */
-#if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL))
-#undef wxUSE_DEBUG_NEW_ALWAYS
-#define wxUSE_DEBUG_NEW_ALWAYS 0
-#endif
-
-#if defined(__WXMSW__) && (defined(__WATCOMC__) && __WATCOMC__ < 1200)
-#undef wxUSE_WCHAR_T
-#define wxUSE_WCHAR_T 0
-#endif
-

 #endif
     /* _WX_PALMOS_CHKCONF_H_ */
 
 #endif
     /* _WX_PALMOS_CHKCONF_H_ */