Fix recreating of wxBitmapComboBox using untyped client data.

[wxWidgets.git] / build / msw / wx_dll.dsw

diff --git a/build/msw/wx_dll.dsw b/build/msw/wx_dll.dsw
index 89afb0684537df83fb20f4bf77c9116c53232838..a42dbbe7a4ac615586e37dff1a98ff8d8ec7611e 100644 (file)
--- a/build/msw/wx_dll.dsw
+++ b/build/msw/wx_dll.dsw
@@ -1,353 +1,503 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "adv"=.\wx_adv.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name core
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxjpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxpng
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxtiff
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxzlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=.\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxzlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "core"=.\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxzlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxjpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxpng
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxtiff
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dbgrid"=.\wx_dbgrid.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name adv
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name odbc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name core
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxjpeg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxpng
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxregex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxtiff
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxzlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gl"=.\wx_gl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name core
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "html"=.\wx_html.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name core
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "net"=.\wx_net.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "odbc"=.\wx_odbc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "qa"=.\wx_qa.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name xml
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name core
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "wxexpat"=.\wx_wxexpat.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxjpeg"=.\wx_wxjpeg.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxpng"=.\wx_wxpng.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxregex"=.\wx_wxregex.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxtiff"=.\wx_wxtiff.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "wxzlib"=.\wx_wxzlib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "xml"=.\wx_xml.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name wxexpat
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xrc"=.\wx_xrc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name xml
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name adv
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name base
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name core
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name html
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00\r
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
+\r
+###############################################################################\r
+\r
+Project: "adv"=.\wx_adv.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxtiff\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxjpeg\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxpng\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxregex\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxexpat\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name core\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "aui"=.\wx_aui.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxtiff\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxjpeg\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxpng\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxregex\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxexpat\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name adv\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "base"=.\wx_base.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxzlib\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxregex\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxexpat\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "core"=.\wx_core.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxtiff\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxjpeg\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxpng\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name base\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "gl"=.\wx_gl.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxtiff\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxjpeg\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxpng\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxregex\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxexpat\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name core\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "html"=.\wx_html.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxtiff\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxjpeg\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxpng\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxregex\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxexpat\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name core\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "media"=.\wx_media.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxtiff\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxjpeg\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxpng\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxregex\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxexpat\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name core\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "net"=.\wx_net.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxzlib\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxregex\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxexpat\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name base\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "propgrid"=.\wx_propgrid.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxtiff\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxjpeg\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxpng\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxregex\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxexpat\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name adv\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "qa"=.\wx_qa.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxtiff\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxjpeg\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxpng\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxexpat\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxregex\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name core\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name base\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name xml\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "ribbon"=.\wx_ribbon.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name core\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "richtext"=.\wx_richtext.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxtiff\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxjpeg\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxpng\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxregex\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxexpat\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name adv\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name html\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name xml\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "stc"=wx_stc.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxscintilla\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name core\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "wxexpat"=.\wx_wxexpat.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "wxjpeg"=.\wx_wxjpeg.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "wxpng"=.\wx_wxpng.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxzlib\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "wxregex"=.\wx_wxregex.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "wxscintilla"=wx_wxscintilla.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "wxtiff"=.\wx_wxtiff.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "wxzlib"=.\wx_wxzlib.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "xml"=.\wx_xml.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxzlib\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxregex\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name wxexpat\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name base\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "xrc"=.\wx_xrc.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name xml\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name html\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name adv\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Global:\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<3>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r