Fix recreating of wxBitmapComboBox using untyped client data.

[wxWidgets.git] / build / msw / config.vc

diff --git a/build/msw/config.vc b/build/msw/config.vc
index bd4f64f857a0786d5fc7e75cabede688e86b246d..c254e8e0d4dda03eff03e398a9c577a637a40ff2 100644 (file)
--- a/build/msw/config.vc
+++ b/build/msw/config.vc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This configuration file was generated by\r
 # =========================================================================\r
 #     This configuration file was generated by\r

-#     Bakefile 0.2.6 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r

 #     Beware that all changes made to this file will be overwritten next\r
 #     time you run Bakefile!\r
 # =========================================================================\r
 #     Beware that all changes made to this file will be overwritten next\r
 #     time you run Bakefile!\r
 # =========================================================================\r


@@ -34,6 +34,9 @@ CPP = $(CC) /EP /nologo
 # What type of library to build? [0,1]\r
 SHARED = 0\r
 \r
 # What type of library to build? [0,1]\r
 SHARED = 0\r
 \r

+# GTK+ toolkit version [,2]\r
+TOOLKIT_VERSION = \r
+\r

 # Build wxUniversal instead of native port? [0,1]\r
 WXUNIV = 0\r
 \r
 # Build wxUniversal instead of native port? [0,1]\r
 WXUNIV = 0\r
 \r


@@ -52,7 +55,8 @@ BUILD = debug
 # PATH. Rather it affects some options passed to some of the common build\r
 # utilities such as the resource compiler and the linker.\r
 # \r
 # PATH. Rather it affects some options passed to some of the common build\r
 # utilities such as the resource compiler and the linker.\r
 # \r

-# Accepted values: AMD64, IA64. \r
+# Accepted values: IA64, X64\r
+# (AMD64 accepted as synonym for X64 but should not be used any more). \r

 TARGET_CPU = $(CPU)\r
 \r
 # Should debugging info be included in the executables? The default value\r
 TARGET_CPU = $(CPU)\r
 \r
 # Should debugging info be included in the executables? The default value\r


@@ -78,6 +82,9 @@ USE_GUI = 1
 # Build wxHTML library (USE_GUI must be 1)? [0,1]\r
 USE_HTML = 1\r
 \r
 # Build wxHTML library (USE_GUI must be 1)? [0,1]\r
 USE_HTML = 1\r
 \r

+# Build wxWebView library (USE_GUI must be 1)? [0,1]\r
+USE_WEBVIEW = 1\r
+\r

 # Build multimedia library (USE_GUI must be 1)? [0,1]\r
 USE_MEDIA = 1\r
 \r
 # Build multimedia library (USE_GUI must be 1)? [0,1]\r
 USE_MEDIA = 1\r
 \r


@@ -114,8 +121,8 @@ USE_RTTI = 1
 # Enable threading in compiled code. [0,1]\r
 USE_THREADS = 1\r
 \r
 # Enable threading in compiled code. [0,1]\r
 USE_THREADS = 1\r
 \r

-# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]\r
-USE_GDIPLUS = 0\r
+# Enable wxCairoContext for platforms other than Linux/GTK. [0,1]\r
+USE_CAIRO = 0\r

 \r
 # Is this official build by wxWidgets developers? [0,1]\r
 OFFICIAL_BUILD = 0\r
 \r
 # Is this official build by wxWidgets developers? [0,1]\r
 OFFICIAL_BUILD = 0\r