merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
--- a/wx-config.in
+++ b/wx-config.in
@@ -48,7 +48,7 @@ while test $# -gt 0; do
        fi
      fi
      includes="$includes -I@libdir@/wx/include"
-      echo $includes @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@
+      echo $includes -D__USE_WXCONFIG__ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @WXCONFIG_INCLUDE@
      ;;
    --libs)
      if test @libdir@ != /usr/lib ; then