don't draw borders for bitmap buttons with wxBORDER_NONE style

[wxWidgets.git] / include / msvc / wx / setup.h

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 5a42e004eed57cb9d6bc68f5531d8d1b0117e0f1..3dfe0eea0ae9a2f471f71ff557b78006bc61632c 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -72,53 +72,64 @@
     #define wx3RD_PARTY_LIB_NAME_U(name) "wx" name wxSUFFIX_STR
 
     #pragma comment(lib, wxWX_LIB_NAME("base", ""))
-    #pragma comment(lib, wxBASE_LIB_NAME("net"))
-    #pragma comment(lib, wxBASE_LIB_NAME("xml"))
-    #if wxUSE_REGEX
+
+    #ifndef wxNO_NET_LIB
+        #pragma comment(lib, wxBASE_LIB_NAME("net"))
+    #endif
+    #ifndef wxNO_XML_LIB
+        #pragma comment(lib, wxBASE_LIB_NAME("xml"))
+    #endif
+    #if wxUSE_REGEX && !defined(wxNO_REGEX_LIB)
         #pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex"))
     #endif
 
     #if wxUSE_GUI
-        #if wxUSE_XML
+        #if wxUSE_XML && !defined(wxNO_EXPAT_LIB)
             #pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
         #endif
-        #if wxUSE_LIBJPEG
+        #if wxUSE_LIBJPEG && !defined(wxNO_JPEG_LIB)
             #pragma comment(lib, wx3RD_PARTY_LIB_NAME("jpeg"))
         #endif
-        #if wxUSE_LIBPNG
+        #if wxUSE_LIBPNG && !defined(wxNO_PNG_LIB)
             #pragma comment(lib, wx3RD_PARTY_LIB_NAME("png"))
         #endif
-        #if wxUSE_LIBTIFF
+        #if wxUSE_LIBTIFF && !defined(wxNO_TIFF_LIB)
             #pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff"))
         #endif
-        #if wxUSE_ZLIB
+        #if wxUSE_ZLIB && !defined(wxNO_ZLIB_LIB)
             #pragma comment(lib, wx3RD_PARTY_LIB_NAME("zlib"))
         #endif
 
-        #pragma comment(lib, wxMSW_LIB_NAME("adv"))
         #pragma comment(lib, wxMSW_LIB_NAME("core"))
-        #pragma comment(lib, wxMSW_LIB_NAME("html"))
-        #if wxUSE_GLCANVAS
+
+        #ifndef wxNO_ADV_LIB
+            #pragma comment(lib, wxMSW_LIB_NAME("adv"))
+        #endif
+
+        #ifndef wxNO_HTML_LIB
+            #pragma comment(lib, wxMSW_LIB_NAME("html"))
+        #endif
+        #if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB)
             #pragma comment(lib, wxMSW_LIB_NAME("gl"))
         #endif
-        #if wxUSE_DEBUGREPORT
+        #if wxUSE_DEBUGREPORT && !defined(wxNO_QA_LIB)
             #pragma comment(lib, wxMSW_LIB_NAME("qa"))
         #endif
-        #if wxUSE_XRC
+        #if wxUSE_XRC && !defined(wxNO_XRC_LIB)
             #pragma comment(lib, wxMSW_LIB_NAME("xrc"))
         #endif
-        #if wxUSE_AUI
+        #if wxUSE_AUI && !defined(wxNO_AUI_LIB)
             #pragma comment(lib, wxMSW_LIB_NAME("aui"))
         #endif
-        #if wxUSE_RICHTEXT
+        #if wxUSE_PROPGRID && !defined(wxNO_PROPGRID_LIB)
+            #pragma comment(lib, wxMSW_LIB_NAME("propgrid"))
+        #endif
+        #if wxUSE_RICHTEXT && !defined(wxNO_RICHTEXT_LIB)
             #pragma comment(lib, wxMSW_LIB_NAME("richtext"))
         #endif
-        #if wxUSE_MEDIACTRL
+        #if wxUSE_MEDIACTRL && !defined(wxNO_MEDIA_LIB)
             #pragma comment(lib, wxMSW_LIB_NAME("media"))
         #endif
-        #if wxUSE_ODBC
-            #pragma comment(lib, wxMSW_LIB_NAME("odbc"))
-        #endif
     #endif // wxUSE_GUI
 #else
     #error "This file should only be included when using Microsoft Visual C++"