Changed order of #ifdefs to get native version on OS/2, even if

[wxWidgets.git] / src / wxWin.icc

diff --git a/src/wxWin.icc b/src/wxWin.icc
index b3605290dccae6a873c0d0e5e5ba6924c837b400..e421e38adc23b43c2d223b8ebcb57546f92d8641 100644 (file)
--- a/src/wxWin.icc
+++ b/src/wxWin.icc
@@ -8,9 +8,9 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
                         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(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
@@ -26,7 +26,6 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\config.cpp"
       source "COMMON\\ctrlcmn.cpp"
       source "COMMON\\ctrlsub.cpp"
-      source "COMMON\\date.cpp"
       source "COMMON\\datstrm.cpp"
       source "COMMON\\dcbase.cpp"
       source "COMMON\\dlgcmn.cpp"
@@ -35,6 +34,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\docview.cpp"
       source "COMMON\\dynarray.cpp"
       source "COMMON\\dynlib.cpp"
+      source "COMMON\\encconv.cpp"
       source "COMMON\\event.cpp"
       option report(level, "W")
       {
@@ -64,7 +64,6 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\imagpcx.cpp"
       source "COMMON\\imagpng.cpp"
       source "COMMON\\imagpnm.cpp"
-      source "COMMON\\init.cpp"
       source "COMMON\\intl.cpp"
       source "COMMON\\ipcbase.cpp"
       source "COMMON\\layout.cpp"
@@ -74,7 +73,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       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"
@@ -97,7 +96,6 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       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"
@@ -122,6 +120,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "COMMON\\zipstrm.cpp"
       source "COMMON\\zstream.cpp"
       source "GENERIC\\busyinfo.cpp"
+      source "GENERIC\\calctrl.cpp"
       source "GENERIC\\caret.cpp"
       source "GENERIC\\choicdgg.cpp"
       source "GENERIC\\colrdlgg.cpp"
@@ -139,6 +138,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       source "GENERIC\\msgdlgg.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"
@@ -198,6 +198,8 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       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"
@@ -216,6 +218,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"),  gen(mangl
       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"