fix for assert when setting tooltip for a readonly combo

[wxWidgets.git] / src / Wxwindll.icc

diff --git a/src/Wxwindll.icc b/src/Wxwindll.icc
index 863beb0467c0a04c91900456b8c3703b4e1837b5..fd8bc0dbb5e096c97035110e797c7d5347a1c761 100644 (file)
--- a/src/Wxwindll.icc
+++ b/src/Wxwindll.icc
@@ -5,13 +5,16 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
                         lang(trailingenumcommas, "no"), lang(universalcharacternames, "no"),
                         link(debug, "yes"), link(linkwithmultithreadlib, "yes"), link(exportAll, "yes"),
                         link(linkwithsharedlib, "yes"), link(defaultlibs, "yes"), link(extdictionary, "no"),
-                        link(defaultlibsname, "..\\lib\\png.lib"),
-                        link(defaultlibsname, "..\\lib\\xpm.lib"),
-                        link(defaultlibsname, "..\\lib\\jpeg.lib"),
-                        link(defaultlibsname, "..\\lib\\zlib.lib"),
-                        link(defaultlibsname, "..\\lib\\tiff.lib"),
+                        link(defaultlibsname, "..\\lib\\os2png.lib"),
+                        link(defaultlibsname, "..\\lib\\os2xpm.lib"),
+                        link(defaultlibsname, "..\\lib\\os2jpeg.lib"),
+                        link(defaultlibsname, "..\\lib\\os2zlib.lib"),
+                        link(defaultlibsname, "..\\lib\\os2tiff.lib"),
                         link(defaultlibsname, "NETAPI32.LIB"),
                         link(defaultlibsname, "UPM32.LIB"),
+                        link(defaultlibsname, "TCP32DLL.LIB"),
+                        link(defaultlibsname, "SO32DLL.LIB"),
+                        link(defaultlibsname, "TCPIP32.LIB"),
                         link(defaultlibsname, "..\\..\\LIB\\dummy.obj"),
                         link(extdictionary, "no"),link(pmtype, "pm"),
                         define("__VISAGECPP__", ), define("__WXPM__", ),
@@ -19,11 +22,19 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
                         incl(searchpath, "..\\src\\zlib"), incl(searchpath, "..\\src\\tiff"),
                         incl(searchpath, "..\\src\\xpm"), incl(searchpath, "..\\src\\png"),
                         macros(redefine, "yes"),
+                        file(genobject, "..\\src\\common\\dbgos240dll\\"),
                         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\\dbgos240dll'
+       run before '-mkdir ' '..\\samples\\minimal\\dbgos240dll'
+       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("dll") "..\\lib\\Wxwindll.dll"
    {
       source type(cpp) "COMMON\\APPCMN.CPP"
@@ -111,6 +122,7 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "COMMON\\TEXTFILE.CPP"
       source type(cpp) "COMMON\\TIMERCMN.CPP"
       source type(cpp) "COMMON\\TOKENZR.CPP"
+      source type(cpp) "COMMON\\TREEBASE.CPP"
       source type(cpp) "COMMON\\TXTSTRM.CPP"
       option report(level, "E")
       {
@@ -137,6 +149,7 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "GENERIC\\CARET.CPP"
       source type(cpp) "GENERIC\\CHOICDGG.CPP"
       source type(cpp) "GENERIC\\COLRDLGG.CPP"
+      source type(cpp) "GENERIC\\CSHELP.CPP"
       source type(cpp) "GENERIC\\DCPSG.CPP"
       source type(cpp) "GENERIC\\DRAGIMGG.CPP"
       source type(cpp) "GENERIC\\FONTDLGG.CPP"
@@ -167,7 +180,8 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "GENERIC\\TBARSMPL.CPP"
       source type(cpp) "GENERIC\\TEXTDLGG.CPP"
       source type(cpp) "GENERIC\\TIPDLG.CPP"
-      source type(cpp) "GENERIC\\TREECTRL.CPP"
+      source type(cpp) "GENERIC\\TIPWIN.CPP"
+      source type(cpp) "GENERIC\\TREECTLG.CPP"
       source type(cpp) "GENERIC\\TREELAY.CPP"
       source type(cpp) "GENERIC\\WIZARD.CPP"
       source type(cpp) "HTML\\HELPCTRL.CPP"
@@ -272,4 +286,9 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "OS2\\WAVE.CPP"
       source type(cpp) "OS2\\WINDOW.CPP"
    }
+   target "..\\samples\\minimal\\dbgos240dll\\Minimal.exe"
+   {
+      source type(cpp) "..\\SAMPLES\\MINIMAL\\MINIMAL.CPP"
+      source type(rc) "..\\SAMPLES\\MINIMAL\\MINIMAL.RC4"
+   }
 }