Have GetDescBoxHeight() return value consistent with one given to SetDescBoxHeight...

[wxWidgets.git] / src / wxWin.icc

diff --git a/src/wxWin.icc b/src/wxWin.icc
index 011b8eb501c07273b5873bb4b8d89fc153262c0d..a2deca02f6d8c8d8efda01850eb9a85696abe5e5 100644 (file)
--- a/src/wxWin.icc
+++ b/src/wxWin.icc
@@ -16,6 +16,8 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
    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"
    {
@@ -32,6 +34,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\db.cpp"
       source "COMMON\\dbtable.cpp"
       source "COMMON\\dcbase.cpp"
+      source "COMMON\\dircmn.cpp"
       source "COMMON\\dlgcmn.cpp"
       source "COMMON\\dndcmn.cpp"
       source "COMMON\\dobjcmn.cpp"
@@ -49,6 +52,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\file.cpp"
       source "COMMON\\fileconf.cpp"
       source "COMMON\\filefn.cpp"
+      source "COMMON\\filename.cpp"
       source "COMMON\\filesys.cpp"
       source "COMMON\\fontcmn.cpp"
       source "COMMON\\fontmap.cpp"
@@ -72,6 +76,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\imagpng.cpp"
       source "COMMON\\imagpnm.cpp"
       source "COMMON\\imagtiff.cpp"
+      source "COMMON\\imagxpm.cpp"
       source "COMMON\\intl.cpp"
       source "COMMON\\ipcbase.cpp"
       source "COMMON\\layout.cpp"
@@ -91,6 +96,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       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"
@@ -107,6 +113,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\textfile.cpp"
       source "COMMON\\timercmn.cpp"
       source "COMMON\\tokenzr.cpp"
+      source "COMMON\\treelist.cpp"
       source "COMMON\\txtstrm.cpp"
       option report(level, "E")
       {
@@ -137,6 +144,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "GENERIC\\DRAGIMGG.CPP"
       source "GENERIC\\FONTDLGG.CPP"
       source "GENERIC\\GRID.CPP"
+      source "GENERIC\\GRIDCTRL.CPP"
       source "GENERIC\\GRIDSEL.CPP"
       source "GENERIC\\HELPEXT.CPP"
       source "GENERIC\\HELPHTML.CPP"
@@ -223,6 +231,10 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       {
          source type("c") "OS2\\GSOCKET.C"
       }
+      option report(level, "E")
+      {
+         source type("c") "OS2\\GSOCKPM.C"
+      }
       source "OS2\\HELPWIN.CPP"
       source "OS2\\ICON.CPP"
       source "OS2\\INICONF.CPP"
@@ -241,7 +253,6 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "OS2\\OWNERDRW.CPP"
       source "OS2\\PALETTE.CPP"
       source "OS2\\PEN.CPP"
-      source "OS2\\PNGHAND.CPP"
       source "OS2\\PRINT.CPP"
       source "OS2\\RADIOBOX.CPP"
       source "OS2\\RADIOBUT.CPP"