added a few more composite functions

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

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index fa45a332ebfd79d5c0c05cf8132b75a791de63cd..31ded4713bbc022b0329cee7f3dc23530d4baef7 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -6,7 +6,7 @@
  * Created:     01/02/97
  * RCS-ID:      $Id$
  * Copyright:   (c) Julian Smart
  * Created:     01/02/97
  * RCS-ID:      $Id$
  * Copyright:   (c) Julian Smart

- * Licence:     wxWidgets licence
+ * Licence:     wxWindows licence

  */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
  */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */


@@ -96,6 +96,17 @@
 #define wxUSE_CHECKLISTBOX 0
 #endif
 
 #define wxUSE_CHECKLISTBOX 0
 #endif
 

+#if wxUSE_SPINCTRL
+#   if !wxUSE_SPINBTN
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxSpinCtrl requires wxSpinButton on MSW"
+#       else
+#           undef wxUSE_SPINBTN
+#           define wxUSE_SPINBTN 1
+#       endif
+#   endif
+#endif
+

 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
 /* BC++ 4.0 can't compile JPEG library */
 #undef wxUSE_LIBJPEG
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
 /* BC++ 4.0 can't compile JPEG library */
 #undef wxUSE_LIBJPEG


@@ -113,6 +124,16 @@
 #define wxUSE_WCHAR_T 0
 #endif
 
 #define wxUSE_WCHAR_T 0
 #endif
 

+/* Media not supported in eVC3 */
+#if defined(_WIN32_WCE)
+    #if (_WIN32_WCE < 400)
+        #undef wxUSE_DIRECTSHOW
+        #undef wxUSE_MEDIACTRL
+        #define wxUSE_DIRECTSHOW 0
+        #define wxUSE_MEDIACTRL 0
+    #endif
+#endif
+

 #endif
     /* _WX_MSW_CHKCONF_H_ */
 
 #endif
     /* _WX_MSW_CHKCONF_H_ */