tried to correct the colour problems

[wxWidgets.git] / src / wxCommon.icc

diff --git a/src/wxCommon.icc b/src/wxCommon.icc
index 7671140dd86b4c0deae89d18120b3c5d2ddd6955..fc2f60942b8748392da70f5c8416df8ee212dab0 100644 (file)
--- a/src/wxCommon.icc
+++ b/src/wxCommon.icc
@@ -1,12 +1,15 @@
-option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trailingenumcommas, "no"), link(debug, "yes"), 
-                        link(defaultlibs, "no"), link(version, 2, 11), opt(inline, "yes"), opt(tune, "pentium2"), define("__WXPM__", ), define("__VISAGECPP__", ), 
-                        incl(searchpath, "..\\src\\png"), incl(searchpath, "..\\src\\jpeg"), incl(searchpath, "..\\src\\xpm"), 
-                        incl(searchpath, "..\\src\\zlib"), incl(searchpath, "..\\Include"), gen(debug, "yes"), 
-                        file(genobject, "..\\src\\common\\dbgos240\\"),
-                        file(usepch, "No"), debug(maxerrors, 100), info(cmp, "yes"), info(cnd, "yes"), info(cns, "yes"), info(cnv, "yes"), 
-                        info(cpy, "yes"), info(dcl, "yes"), info(eff, "yes"), info(enu, "yes"), info(ext, "yes"), info(ini, "yes"), 
-                        info(ord, "yes"), info(par, "yes"), info(rea, "yes"), info(trd, "yes"), info(tru, "yes"), info(uni, "yes"), 
-                        info(use, "yes")
+option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfuncs, "no"), lang(allowtypedefasclassname, "yes"),
+                        opt(tune, "pentium2"), define("__WXPM__", ), define("__VISAGECPP__", ), incl(searchpath, "..\\src\\png"), incl(searchpath, "..\\src\\jpeg"),
+                        lang(templatedefimpls, "dontparse"), lang(compatmath, "yes"),
+                        lang(nokeyword, "const_cast"), lang(nokeyword, "explicit"), lang(nokeyword, "export"), lang(nokeyword, "false"),
+                        lang(nokeyword, "mutable"),
+                        lang(nokeyword, "true"), lang(nokeyword, "typename"),
+                        lang(trailingenumcommas, "no"), lang(universalcharacternames, "no"), link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
+                        link(linkwithsharedlib, "yes"), link(defaultlibs, "no"), link(extdictionary, "no"), opt(inline, "yes"),
+                        incl(searchpath, "..\\src\\xpm"), incl(searchpath, "..\\src\\zlib"), incl(searchpath, "..\\Include"), macros(redefine, "yes"),
+                        gen(debug, "yes"), file(genobject, "..\\SRC\\COMMON\\DBGOS240\\"), file(usepch, "No"), debug(maxerrors, 100), info(cmp, "yes"),
+                        info(cnd, "yes"), info(cns, "yes"), info(cnv, "yes"), info(cpy, "yes"), info(dcl, "yes"), info(eff, "yes"), info(enu, "yes"), info(ext, "yes"),
+                        info(ini, "yes"), info(ord, "yes"), info(par, "yes"), info(rea, "yes"), info(trd, "yes"), info(tru, "yes"), info(uni, "yes"), info(use, "yes")
 {
    perform
    {
@@ -21,7 +24,6 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail
       source "COMMON\\config.cpp"
       source "COMMON\\ctrlcmn.cpp"
       source "COMMON\\ctrlsub.cpp"
-      source "COMMON\\date.cpp"
       source "COMMON\\datetime.cpp"
       source "COMMON\\datstrm.cpp"
       source "COMMON\\dcbase.cpp"
@@ -31,6 +33,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail
       source "COMMON\\docview.cpp"
       source "COMMON\\dynarray.cpp"
       source "COMMON\\dynlib.cpp"
+      source "COMMON\\encconv.cpp"
       source "COMMON\\event.cpp"
       option report(level, "W")
       {
@@ -93,7 +96,6 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail
       source "COMMON\\tbarbase.cpp"
       source "COMMON\\textcmn.cpp"
       source "COMMON\\textfile.cpp"
-      source "COMMON\\time.cpp"
       source "COMMON\\timercmn.cpp"
       source "COMMON\\tokenzr.cpp"
       source "COMMON\\txtstrm.cpp"