Split src/os2/utils.cpp in two to support non-monolithic builds.

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 8732dfc01b6f7aa1a0905a8b572ae7e478b572fc..ebf1ede895f43df592d911f9e9c500d06a3c189c 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -38,16 +38,6 @@
 #   define wxUSE_GUI 1
 #endif /* !defined(wxUSE_GUI) */
 
 #   define wxUSE_GUI 1
 #endif /* !defined(wxUSE_GUI) */
 

-/* wxBase doesn't need compatibility settings as it's a new port */
-#if !wxUSE_GUI
-#   undef WXWIN_COMPATIBILITY
-#   undef WXWIN_COMPATIBILITY_2
-#   undef WXWIN_COMPATIBILITY_2_2
-#   define WXWIN_COMPATIBILITY 0
-#   define WXWIN_COMPATIBILITY_2 0
-#   define WXWIN_COMPATIBILITY_2_2 0
-#endif /* !wxUSE_GUI */
-

 /*
    tests for non GUI features
  */
 /*
    tests for non GUI features
  */


@@ -1177,15 +1167,6 @@
 #           define wxUSE_COMBOBOX 1
 #       endif
 #   endif
 #           define wxUSE_COMBOBOX 1
 #       endif
 #   endif

-
-#   if !wxUSE_DOC_VIEW_ARCHITECTURE
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "Print architecture requires wxUSE_DOC_VIEW_ARCHITECTURE"
-#       else
-#           undef wxUSE_DOC_VIEW_ARCHITECTURE
-#           define wxUSE_DOC_VIEW_ARCHITECTURE 1
-#       endif
-#   endif

 #endif /* wxUSE_PRINTING_ARCHITECTURE */
 
 #if wxUSE_MDI_ARCHITECTURE
 #endif /* wxUSE_PRINTING_ARCHITECTURE */
 
 #if wxUSE_MDI_ARCHITECTURE