document column reordering in wxListCtrl; fix confusion between GetColumnOrder()...

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

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 3dfde0d6dd59efa63f2289d7115c9440664c3469..930edc47a48832395dcc15db8dca2a86fbf2a444 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -15,6 +15,22 @@
 #define _WX_MSW_CHKCONF_H_
 
 /* ensure that MSW-specific settings are defined */
 #define _WX_MSW_CHKCONF_H_
 
 /* ensure that MSW-specific settings are defined */

+#ifndef wxUSE_ACTIVEX
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_ACTIVEX must be defined."
+#    else
+#        define wxUSE_ACTIVEX 0
+#    endif
+#endif /* !defined(wxUSE_ACTIVEX) */
+
+#ifndef wxUSE_CRASHREPORT
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_CRASHREPORT must be defined."
+#   else
+#       define wxUSE_CRASHREPORT 0
+#   endif
+#endif /* !defined(wxUSE_CRASHREPORT) */
+

 #ifndef wxUSE_DC_CACHEING
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DC_CACHEING must be defined"
 #ifndef wxUSE_DC_CACHEING
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DC_CACHEING must be defined"


@@ -23,18 +39,86 @@
 #   endif
 #endif /* wxUSE_DC_CACHEING */
 
 #   endif
 #endif /* wxUSE_DC_CACHEING */
 

+#ifndef wxUSE_DIALUP_MANAGER
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_DIALUP_MANAGER must be defined."
+#    else
+#        define wxUSE_DIALUP_MANAGER 0
+#    endif
+#endif /* !defined(wxUSE_DIALUP_MANAGER) */
+
+#ifndef wxUSE_MS_HTML_HELP
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_MS_HTML_HELP must be defined."
+#    else
+#        define wxUSE_MS_HTML_HELP 0
+#    endif
+#endif /* !defined(wxUSE_MS_HTML_HELP) */
+
+#ifndef wxUSE_INICONF
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_INICONF must be defined."
+#    else
+#        define wxUSE_INICONF 0
+#    endif
+#endif /* !defined(wxUSE_INICONF) */
+
+#ifndef wxUSE_OLE
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_OLE must be defined."
+#    else
+#        define wxUSE_OLE 0
+#    endif
+#endif /* !defined(wxUSE_OLE) */
+
+#ifndef wxUSE_OLE_AUTOMATION
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_OLE_AUTOMATION must be defined."
+#    else
+#        define wxUSE_OLE_AUTOMATION 0
+#    endif
+#endif /* !defined(wxUSE_OLE_AUTOMATION) */
+
+#ifndef wxUSE_TASKBARICON_BALLOONS
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TASKBARICON_BALLOONS must be defined."
+#   else
+#       define wxUSE_TASKBARICON_BALLOONS 0
+#   endif
+#endif /* wxUSE_TASKBARICON_BALLOONS */
+
+#ifndef wxUSE_UNICODE_MSLU
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_UNICODE_MSLU must be defined."
+#    else
+#        define wxUSE_UNICODE_MSLU 0
+#    endif
+#endif  /* wxUSE_UNICODE_MSLU */
+
+#ifndef wxUSE_UXTHEME
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_UXTHEME must be defined."
+#    else
+#        define wxUSE_UXTHEME 0
+#    endif
+#endif  /* wxUSE_UXTHEME */

 
 /*
 
 /*

- * disable the settings which don't work for some compilers
+ * We don't want to give an error if wxUSE_UNICODE_MSLU is enabled but
+ * wxUSE_UNICODE is not as this would make it impossible to simply set the
+ * former in wx/setup.h as then the library wouldn't compile in non-Unicode
+ * configurations, so instead simply unset it silently when it doesn't make
+ * sense.

  */
  */

+#if wxUSE_UNICODE_MSLU && !wxUSE_UNICODE
+#   undef wxUSE_UNICODE_MSLU
+#   define wxUSE_UNICODE_MSLU 0
+#endif
+

 
 /*
 
 /*

- * If using PostScript-in-MSW in Univ, must enable PostScript
+ * disable the settings which don't work for some compilers

  */
  */

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

 
 #ifndef wxUSE_NORLANDER_HEADERS
 #   if ( wxCHECK_WATCOM_VERSION(1,0) || defined(__WINE__) ) || \
 
 #ifndef wxUSE_NORLANDER_HEADERS
 #   if ( wxCHECK_WATCOM_VERSION(1,0) || defined(__WINE__) ) || \


@@ -46,15 +130,13 @@
 #endif
 
 /*
 #endif
 
 /*

- * We don't want to give an error if wxUSE_UNICODE_MSLU is enabled but
- * wxUSE_UNICODE is not as this would make it impossible to simply set the
- * former in wx/setup.h as then the library wouldn't compile in non-Unicode
- * configurations, so instead simply unset it silently when it doesn't make
- * sense.
+ * See WINVER definition in wx/msw/wrapwin.h for the explanation of this test
+ * logic.

  */
  */

-#if wxUSE_UNICODE_MSLU && !wxUSE_UNICODE
-#   undef wxUSE_UNICODE_MSLU
-#   define wxUSE_UNICODE_MSLU 0
+#if (defined(__VISUALC__) && (__VISUALC__ < 1300)) && \
+        (!defined(WINVER) || WINVER < 0x0500)
+#   undef wxUSE_TASKBARICON_BALLOONS
+#   define wxUSE_TASKBARICON_BALLOONS 0

 #endif
 
 /*
 #endif
 
 /*


@@ -180,86 +262,34 @@
 #endif
 
 
 #endif
 
 

-/* check that MSW-specific options are defined too */
-#ifndef wxUSE_ACTIVEX
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_ACTIVEX must be defined."
-#    else
-#        define wxUSE_ACTIVEX 0
-#    endif
-#endif /* !defined(wxUSE_ACTIVEX) */
-
-#ifndef wxUSE_DIALUP_MANAGER
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_DIALUP_MANAGER must be defined."
-#    else
-#        define wxUSE_DIALUP_MANAGER 0
-#    endif
-#endif /* !defined(wxUSE_DIALUP_MANAGER) */
-
-#ifndef wxUSE_MS_HTML_HELP
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_MS_HTML_HELP must be defined."
-#    else
-#        define wxUSE_MS_HTML_HELP 0
-#    endif
-#endif /* !defined(wxUSE_MS_HTML_HELP) */
-
-#ifndef wxUSE_OLE
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_OLE must be defined."
-#    else
-#        define wxUSE_OLE 0
-#    endif
-#endif /* !defined(wxUSE_OLE) */
-
-#ifndef wxUSE_OLE_AUTOMATION
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_OLE_AUTOMATION must be defined."
-#    else
-#        define wxUSE_OLE_AUTOMATION 0
-#    endif
-#endif /* !defined(wxUSE_OLE_AUTOMATION) */
-
-#ifndef wxUSE_UNICODE_MSLU
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_UNICODE_MSLU must be defined."
-#    else
-#        define wxUSE_UNICODE_MSLU 0
-#    endif
-#endif  /* wxUSE_UNICODE_MSLU */
-
-#ifndef wxUSE_UXTHEME
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_UXTHEME must be defined."
-#    else
-#        define wxUSE_UXTHEME 0
-#    endif
-#endif  /* wxUSE_UXTHEME */
-
-#ifndef wxUSE_UXTHEME_AUTO
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_UXTHEME_AUTO must be defined."
-#    else
-#        define wxUSE_UXTHEME_AUTO 0
-#    endif
-#endif  /* wxUSE_UXTHEME_AUTO */
-

 
 /*
    un/redefine the options which we can't compile (after checking that they're
    defined
  */
 #ifdef __WINE__
 
 /*
    un/redefine the options which we can't compile (after checking that they're
    defined
  */
 #ifdef __WINE__

-    /* apparently it doesn't compile under Wine, remove it/when it does */
-    #if wxUSE_ACTIVEX
-        #undef wxUSE_ACTIVEX
-        #define wxUSE_ACTIVEX 0
-    #endif // wxUSE_ACTIVEX
-#endif // __WINE__
+#   if wxUSE_ACTIVEX
+#       undef wxUSE_ACTIVEX
+#       define wxUSE_ACTIVEX 0
+#   endif /* wxUSE_ACTIVEX */
+
+#   if wxUSE_UNICODE_MSLU
+#       undef wxUSE_UNICODE_MSLU
+#       define wxUSE_UNICODE_MSLU 0
+#   endif /* wxUSE_UNICODE_MSLU */
+#endif /* __WINE__ */

 
 
 /* check settings consistency for MSW-specific ones */
 
 
 /* check settings consistency for MSW-specific ones */

+#if wxUSE_CRASHREPORT && !wxUSE_ON_FATAL_EXCEPTION
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_CRASHREPORT requires wxUSE_ON_FATAL_EXCEPTION"
+#   else
+#       undef wxUSE_CRASHREPORT
+#       define wxUSE_CRASHREPORT 0
+#   endif
+#endif /* wxUSE_CRASHREPORT */
+

 #if !wxUSE_VARIANT
 #   if wxUSE_ACTIVEX
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #if !wxUSE_VARIANT
 #   if wxUSE_ACTIVEX
 #       ifdef wxABORT_ON_CONFIG_ERROR


@@ -366,4 +396,9 @@
 #   endif
 #endif /* !wxUSE_ACTIVEX */
 
 #   endif
 #endif /* !wxUSE_ACTIVEX */
 

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

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