Corrected font calculation (use screen resolution now); and check for mask in m_image.cpp

[wxWidgets.git] / src / wxWin.icc

diff --git a/src/wxWin.icc b/src/wxWin.icc
index 4a91e6c25fa68a0ecaaef78ca6d2b2944b98a0d7..e421e38adc23b43c2d223b8ebcb57546f92d8641 100644 (file)
--- a/src/wxWin.icc
+++ b/src/wxWin.icc
@@ -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"
@@ -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"
@@ -218,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"