cosmetic fixes to font encoding names

[wxWidgets.git] / src / wxWin.icc

diff --git a/src/wxWin.icc b/src/wxWin.icc
index e0441d2ecaab92673df6fdbd165109e2b99eb9e5..e36799abd63f650052ce235766740177ccb891f9 100644 (file)
--- a/src/wxWin.icc
+++ b/src/wxWin.icc
@@ -1,35 +1,47 @@
-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"), 
+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"),

                         file(genobject, "..\\src\\common\\dbgos240\\"),
                         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"), 
+                        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
    {
        run before '-mkdir ' '..\\src\\common\\dbgos240'
                         info(use, "yes")
 {
    perform
    {
        run before '-mkdir ' '..\\src\\common\\dbgos240'

+       run before 'copy ' '..\\src\common\\dosyacc.c ' '..\\src\\common\\y_tab.c'
+       run before 'copy ' '..\\src\common\\doslex.c ' '..\\src\\common\\lex_yy.c'

    }
    target type("lib") "..\\LIB\\wx40.lib"
    {
       source "COMMON\\appcmn.cpp"
       source "COMMON\\choiccmn.cpp"
       source "COMMON\\clipcmn.cpp"
    }
    target type("lib") "..\\LIB\\wx40.lib"
    {
       source "COMMON\\appcmn.cpp"
       source "COMMON\\choiccmn.cpp"
       source "COMMON\\clipcmn.cpp"

+      source "COMMON\\cmdline.cpp"

       source "COMMON\\cmndata.cpp"
       source "COMMON\\config.cpp"
       source "COMMON\\ctrlcmn.cpp"
       source "COMMON\\ctrlsub.cpp"
       source "COMMON\\cmndata.cpp"
       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\\datstrm.cpp"

+      source "COMMON\\db.cpp"
+      source "COMMON\\dbtable.cpp"

       source "COMMON\\dcbase.cpp"
       source "COMMON\\dlgcmn.cpp"
       source "COMMON\\dcbase.cpp"
       source "COMMON\\dlgcmn.cpp"

+      source "COMMON\\dndcmn.cpp"

       source "COMMON\\dobjcmn.cpp"
       source "COMMON\\docmdi.cpp"
       source "COMMON\\docview.cpp"
       source "COMMON\\dynarray.cpp"
       source "COMMON\\dynlib.cpp"
       source "COMMON\\dobjcmn.cpp"
       source "COMMON\\docmdi.cpp"
       source "COMMON\\docview.cpp"
       source "COMMON\\dynarray.cpp"
       source "COMMON\\dynlib.cpp"

+      source "COMMON\\encconv.cpp"

       source "COMMON\\event.cpp"
       option report(level, "W")
       {
       source "COMMON\\event.cpp"
       option report(level, "W")
       {


@@ -44,9 +56,11 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail
       source "COMMON\\fontmap.cpp"
       source "COMMON\\framecmn.cpp"
       source "COMMON\\fs_inet.cpp"
       source "COMMON\\fontmap.cpp"
       source "COMMON\\framecmn.cpp"
       source "COMMON\\fs_inet.cpp"

+      source "COMMON\\fs_mem.cpp"

       source "COMMON\\fs_zip.cpp"
       source "COMMON\\ftp.cpp"
       source "COMMON\\gdicmn.cpp"
       source "COMMON\\fs_zip.cpp"
       source "COMMON\\ftp.cpp"
       source "COMMON\\gdicmn.cpp"

+      source "COMMON\\geometry.cpp"

       source "COMMON\\gifdecod.cpp"
       source "COMMON\\hash.cpp"
       source "COMMON\\helpbase.cpp"
       source "COMMON\\gifdecod.cpp"
       source "COMMON\\hash.cpp"
       source "COMMON\\helpbase.cpp"


@@ -59,7 +73,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail
       source "COMMON\\imagpcx.cpp"
       source "COMMON\\imagpng.cpp"
       source "COMMON\\imagpnm.cpp"
       source "COMMON\\imagpcx.cpp"
       source "COMMON\\imagpng.cpp"
       source "COMMON\\imagpnm.cpp"

-      source "COMMON\\init.cpp"
+      source "COMMON\\imagtiff.cpp"

       source "COMMON\\intl.cpp"
       source "COMMON\\ipcbase.cpp"
       source "COMMON\\layout.cpp"
       source "COMMON\\intl.cpp"
       source "COMMON\\ipcbase.cpp"
       source "COMMON\\layout.cpp"


@@ -69,15 +83,17 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail
       source "COMMON\\matrix.cpp"
       source "COMMON\\memory.cpp"
       source "COMMON\\menucmn.cpp"
       source "COMMON\\matrix.cpp"
       source "COMMON\\memory.cpp"
       source "COMMON\\menucmn.cpp"

-      source "COMMON\\mimetype.cpp"
+      source "COMMON\\mimecmn.cpp"

       source "COMMON\\module.cpp"
       source "COMMON\\mstream.cpp"
       source "COMMON\\object.cpp"
       source "COMMON\\objstrm.cpp"
       source "COMMON\\module.cpp"
       source "COMMON\\mstream.cpp"
       source "COMMON\\object.cpp"
       source "COMMON\\objstrm.cpp"

+      source "COMMON\\odbc.cpp"

       source "COMMON\\paper.cpp"
       source "COMMON\\prntbase.cpp"
       source "COMMON\\process.cpp"
       source "COMMON\\protocol.cpp"
       source "COMMON\\paper.cpp"
       source "COMMON\\prntbase.cpp"
       source "COMMON\\process.cpp"
       source "COMMON\\protocol.cpp"

+      source "COMMON\\quantize.cpp"

       source "COMMON\\resource.cpp"
       source "COMMON\\sckaddr.cpp"
       source "COMMON\\sckfile.cpp"
       source "COMMON\\resource.cpp"
       source "COMMON\\sckaddr.cpp"
       source "COMMON\\sckfile.cpp"


@@ -90,12 +106,11 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail
       source "COMMON\\stream.cpp"
       source "COMMON\\string.cpp"
       source "COMMON\\tbarbase.cpp"
       source "COMMON\\stream.cpp"
       source "COMMON\\string.cpp"
       source "COMMON\\tbarbase.cpp"

-      source "COMMON\\tbarsmpl.cpp"

       source "COMMON\\textcmn.cpp"
       source "COMMON\\textfile.cpp"
       source "COMMON\\textcmn.cpp"
       source "COMMON\\textfile.cpp"

-      source "COMMON\\time.cpp"

       source "COMMON\\timercmn.cpp"
       source "COMMON\\tokenzr.cpp"
       source "COMMON\\timercmn.cpp"
       source "COMMON\\tokenzr.cpp"

+      source "COMMON\\treelist.cpp"

       source "COMMON\\txtstrm.cpp"
       option report(level, "E")
       {
       source "COMMON\\txtstrm.cpp"
       option report(level, "E")
       {


@@ -117,38 +132,44 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail
       }
       source "COMMON\\zipstrm.cpp"
       source "COMMON\\zstream.cpp"
       }
       source "COMMON\\zipstrm.cpp"
       source "COMMON\\zstream.cpp"

-      source "GENERIC\\busyinfo.cpp"
-      source "GENERIC\\caret.cpp"
-      source "GENERIC\\choicdgg.cpp"
-      source "GENERIC\\colrdlgg.cpp"
-      source "GENERIC\\dcpsg.cpp"
-      source "GENERIC\\fontdlgg.cpp"
-      source "GENERIC\\grid.cpp"
-      source "GENERIC\\helpext.cpp"
-      source "GENERIC\\helphtml.cpp"
-      source "GENERIC\\helpwxht.cpp"
-      source "GENERIC\\helpxlp.cpp"
-      source "GENERIC\\imaglist.cpp"
-      source "GENERIC\\laywin.cpp"
-      source "GENERIC\\listctrl.cpp"
-      source "GENERIC\\logg.cpp"
-      source "GENERIC\\msgdlgg.cpp"
-      source "GENERIC\\numdlgg.cpp"
-      source "GENERIC\\panelg.cpp"
-      source "GENERIC\\printps.cpp"
-      source "GENERIC\\prntdlgg.cpp"
-      source "GENERIC\\progdlgg.cpp"
-      source "GENERIC\\prop.cpp"
-      source "GENERIC\\propform.cpp"
-      source "GENERIC\\proplist.cpp"
-      source "GENERIC\\sashwin.cpp"
-      source "GENERIC\\scrolwin.cpp"
-      source "GENERIC\\splitter.cpp"
-      source "GENERIC\\statusbr.cpp"
-      source "GENERIC\\tabg.cpp"
-      source "GENERIC\\textdlgg.cpp"
-      source "GENERIC\\tipdlg.cpp"
-      source "GENERIC\\treectrl.cpp"
+      source "GENERIC\\BUSYINFO.CPP"
+      source "GENERIC\\CALCTRL.CPP"
+      source "GENERIC\\CARET.CPP"
+      source "GENERIC\\CHOICDGG.CPP"
+      source "GENERIC\\COLRDLGG.CPP"
+      source "GENERIC\\DCPSG.CPP"
+      source "GENERIC\\DRAGIMGG.CPP"
+      source "GENERIC\\FONTDLGG.CPP"
+      source "GENERIC\\GRID.CPP"
+      source "GENERIC\\GRIDSEL.CPP"
+      source "GENERIC\\HELPEXT.CPP"
+      source "GENERIC\\HELPHTML.CPP"
+      source "GENERIC\\HELPWXHT.CPP"
+      source "GENERIC\\HELPXLP.CPP"
+      source "GENERIC\\IMAGLIST.CPP"
+      source "GENERIC\\LAYWIN.CPP"
+      source "GENERIC\\LISTCTRL.CPP"
+      source "GENERIC\\LOGG.CPP"
+      source "GENERIC\\NUMDLGG.CPP"
+      source "GENERIC\\PANELG.CPP"
+      source "GENERIC\\PLOT.CPP"
+      source "GENERIC\\PRINTPS.CPP"
+      source "GENERIC\\PRNTDLGG.CPP"
+      source "GENERIC\\PROGDLGG.CPP"
+      source "GENERIC\\PROP.CPP"
+      source "GENERIC\\PROPFORM.CPP"
+      source "GENERIC\\PROPLIST.CPP"
+      source "GENERIC\\SASHWIN.CPP"
+      source "GENERIC\\SCROLWIN.CPP"
+      source "GENERIC\\SPLITTER.CPP"
+      source "GENERIC\\STATUSBR.CPP"
+      source "GENERIC\\TABG.CPP"
+      source "GENERIC\\TBARSMPL.CPP"
+      source "GENERIC\\TEXTDLGG.CPP"
+      source "GENERIC\\TIPDLG.CPP"
+      source "GENERIC\\TREECTRL.CPP"
+      source "GENERIC\\TREELAY.CPP"
+      source "GENERIC\\WIZARD.CPP"

       source "HTML\\helpctrl.cpp"
       source "HTML\\helpdata.cpp"
       source "HTML\\helpfrm.cpp"
       source "HTML\\helpctrl.cpp"
       source "HTML\\helpdata.cpp"
       source "HTML\\helpfrm.cpp"


@@ -158,12 +179,14 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail
       source "HTML\\htmltag.cpp"
       source "HTML\\htmlwin.cpp"
       source "HTML\\htmprint.cpp"
       source "HTML\\htmltag.cpp"
       source "HTML\\htmlwin.cpp"
       source "HTML\\htmprint.cpp"

+      source "HTML\\m_dflist.cpp"

       source "HTML\\m_fonts.cpp"
       source "HTML\\m_hline.cpp"
       source "HTML\\m_image.cpp"
       source "HTML\\m_layout.cpp"
       source "HTML\\m_links.cpp"
       source "HTML\\m_list.cpp"
       source "HTML\\m_fonts.cpp"
       source "HTML\\m_hline.cpp"
       source "HTML\\m_image.cpp"
       source "HTML\\m_layout.cpp"
       source "HTML\\m_links.cpp"
       source "HTML\\m_list.cpp"

+      source "HTML\\m_meta.cpp"

       source "HTML\\m_pre.cpp"
       source "HTML\\m_tables.cpp"
       source "HTML\\winpars.cpp"
       source "HTML\\m_pre.cpp"
       source "HTML\\m_tables.cpp"
       source "HTML\\winpars.cpp"


@@ -194,13 +217,15 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail
       source "OS2\\FILEDLG.CPP"
       source "OS2\\FONT.CPP"
       source "OS2\\FONTDLG.CPP"
       source "OS2\\FILEDLG.CPP"
       source "OS2\\FONT.CPP"
       source "OS2\\FONTDLG.CPP"

+      source "OS2\\FONTENUM.CPP"
+      source "OS2\\FONTUTIL.CPP"

       source "OS2\\FRAME.CPP"
       source "OS2\\GAUGE.CPP"
       source "OS2\\GDIIMAGE.CPP"
       source "OS2\\GDIOBJ.CPP"
       option report(level, "E")
       {
       source "OS2\\FRAME.CPP"
       source "OS2\\GAUGE.CPP"
       source "OS2\\GDIIMAGE.CPP"
       source "OS2\\GDIOBJ.CPP"
       option report(level, "E")
       {

-         source "OS2\\GSOCKET.C"
+         source type("c") "OS2\\GSOCKET.C"

       }
       source "OS2\\HELPWIN.CPP"
       source "OS2\\ICON.CPP"
       }
       source "OS2\\HELPWIN.CPP"
       source "OS2\\ICON.CPP"


@@ -212,6 +237,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), lang(trail
       source "OS2\\MENU.CPP"
       source "OS2\\MENUITEM.CPP"
       source "OS2\\METAFILE.CPP"
       source "OS2\\MENU.CPP"
       source "OS2\\MENUITEM.CPP"
       source "OS2\\METAFILE.CPP"

+      source "OS2\\MIMETYPE.CPP"

       source "OS2\\MINIFRAM.CPP"
       source "OS2\\MSGDLG.CPP"
       source "OS2\\NATIVDLG.CPP"
       source "OS2\\MINIFRAM.CPP"
       source "OS2\\MSGDLG.CPP"
       source "OS2\\NATIVDLG.CPP"