fixed incorrect computation of window's visible area: window's position was added...

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

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index f17b174132c09d11277abaedbf5d5671a6053c40..e5a51551729162bc5c21a1683eb147db64e49fd2 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -30,35 +30,79 @@
         #endif
 
         #ifdef _DEBUG
-            #pragma comment(lib,"wxexpatd")
-            #pragma comment(lib,"wxjpegd")
-            #pragma comment(lib,"wxpngd")
-            #pragma comment(lib,"wxregexud")
-            #pragma comment(lib,"wxtiffd")
-            #pragma comment(lib,"wxzlibd")
-            #pragma comment(lib,"wxbase26ud")
-            #pragma comment(lib,"wxbase26ud_net")
-            #pragma comment(lib,"wxbase26ud_xml")
-            #pragma comment(lib,"wxmsw26ud_adv")
-            #pragma comment(lib,"wxmsw26ud_core")
-            #pragma comment(lib,"wxmsw26ud_html")
-            #pragma comment(lib,"wxmsw26ud_qa")
-            #pragma comment(lib,"wxmsw26ud_xrc")
+            #if wxUSE_XML
+                #pragma comment(lib,"wxexpatd")
+            #endif
+            #if wxUSE_LIBJPEG
+                #pragma comment(lib,"wxjpegd")
+            #endif
+            #if wxUSE_LIBPNG
+                #pragma comment(lib,"wxpngd")
+            #endif
+            #if wxUSE_REGEX
+                #pragma comment(lib,"wxregexud")
+            #endif
+            #if wxUSE_LIBTIFF
+                #pragma comment(lib,"wxtiffd")
+            #endif
+            #if wxUSE_ZLIB
+                #pragma comment(lib,"wxzlibd")
+            #endif
+            #pragma comment(lib,"wxbase27ud")
+            #pragma comment(lib,"wxbase27ud_net")
+            #pragma comment(lib,"wxbase27ud_xml")
+            #pragma comment(lib,"wxmsw27ud_adv")
+            #pragma comment(lib,"wxmsw27ud_core")
+            #pragma comment(lib,"wxmsw27ud_html")
+            #if wxUSE_DEBUGREPORT
+            #pragma comment(lib,"wxmsw27ud_qa")
+            #endif
+            #pragma comment(lib,"wxmsw27ud_xrc")
+            #pragma comment(lib,"wxmsw27ud_aui")
+            #pragma comment(lib,"wxmsw27ud_richtext")
+            #if wxUSE_MEDIACTRL
+                #pragma comment(lib,"wxmsw27ud_media")
+            #endif
+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27ud_odbc")
+            #endif
         #else // release
-            #pragma comment(lib,"wxexpat")
-            #pragma comment(lib,"wxjpeg")
-            #pragma comment(lib,"wxpng")
-            #pragma comment(lib,"wxregexu")
-            #pragma comment(lib,"wxtiff")
-            #pragma comment(lib,"wxzlib")
-            #pragma comment(lib,"wxbase26u")
-            #pragma comment(lib,"wxbase26u_net")
-            #pragma comment(lib,"wxbase26u_xml")
-            #pragma comment(lib,"wxmsw26u_adv")
-            #pragma comment(lib,"wxmsw26u_core")
-            #pragma comment(lib,"wxmsw26u_html")
-            #pragma comment(lib,"wxmsw26u_qa")
-            #pragma comment(lib,"wxmsw26u_xrc")
+            #if wxUSE_XML
+                #pragma comment(lib,"wxexpat")
+            #endif
+            #if wxUSE_LIBJPEG
+                #pragma comment(lib,"wxjpeg")
+            #endif
+            #if wxUSE_LIBPNG
+                #pragma comment(lib,"wxpng")
+            #endif
+            #if wxUSE_REGEX
+                #pragma comment(lib,"wxregexu")
+            #endif
+            #if wxUSE_LIBTIFF
+                #pragma comment(lib,"wxtiff")
+            #endif
+            #if wxUSE_ZLIB
+                #pragma comment(lib,"wxzlib")
+            #endif
+            #pragma comment(lib,"wxbase27u")
+            #pragma comment(lib,"wxbase27u_net")
+            #pragma comment(lib,"wxbase27u_xml")
+            #pragma comment(lib,"wxmsw27u_adv")
+            #pragma comment(lib,"wxmsw27u_core")
+            #pragma comment(lib,"wxmsw27u_html")
+            #if wxUSE_DEBUGREPORT
+            #pragma comment(lib,"wxmsw27u_qa")
+            #endif
+            #pragma comment(lib,"wxmsw27u_xrc")
+            #pragma comment(lib,"wxmsw27u_aui")
+            #pragma comment(lib,"wxmsw27u_richtext")
+            #if wxUSE_MEDIACTRL
+                #pragma comment(lib,"wxmsw27u_media")
+            #endif
+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27u_odbc")
+            #endif
         #endif // debug/release
     #else // !_UNICODE
         #ifdef WXUSINGDLL
@@ -76,35 +120,79 @@
         #endif // shared/static
 
         #ifdef _DEBUG
-            #pragma comment(lib,"wxexpatd")
-            #pragma comment(lib,"wxjpegd")
-            #pragma comment(lib,"wxpngd")
-            #pragma comment(lib,"wxregexd")
-            #pragma comment(lib,"wxtiffd")
-            #pragma comment(lib,"wxzlibd")
-            #pragma comment(lib,"wxbase26d")
-            #pragma comment(lib,"wxbase26d_net")
-            #pragma comment(lib,"wxbase26d_xml")
-            #pragma comment(lib,"wxmsw26d_adv")
-            #pragma comment(lib,"wxmsw26d_core")
-            #pragma comment(lib,"wxmsw26d_html")
-            #pragma comment(lib,"wxmsw26d_qa")
-            #pragma comment(lib,"wxmsw26d_xrc")
+            #if wxUSE_XML
+                #pragma comment(lib,"wxexpatd")
+            #endif
+            #if wxUSE_LIBJPEG
+                #pragma comment(lib,"wxjpegd")
+            #endif
+            #if wxUSE_LIBPNG
+                #pragma comment(lib,"wxpngd")
+            #endif
+            #if wxUSE_REGEX
+                #pragma comment(lib,"wxregexd")
+            #endif
+            #if wxUSE_LIBTIFF
+                #pragma comment(lib,"wxtiffd")
+            #endif
+            #if wxUSE_ZLIB
+                #pragma comment(lib,"wxzlibd")
+            #endif
+            #pragma comment(lib,"wxbase27d")
+            #pragma comment(lib,"wxbase27d_net")
+            #pragma comment(lib,"wxbase27d_xml")
+            #pragma comment(lib,"wxmsw27d_adv")
+            #pragma comment(lib,"wxmsw27d_core")
+            #pragma comment(lib,"wxmsw27d_html")
+            #if wxUSE_DEBUGREPORT
+            #pragma comment(lib,"wxmsw27d_qa")
+            #endif
+            #pragma comment(lib,"wxmsw27d_xrc")
+            #pragma comment(lib,"wxmsw27d_aui")
+            #pragma comment(lib,"wxmsw27d_richtext")
+            #if wxUSE_MEDIACTRL
+                #pragma comment(lib,"wxmsw27d_media")
+            #endif
+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27d_odbc")
+            #endif
         #else // release
-            #pragma comment(lib,"wxexpat")
-            #pragma comment(lib,"wxjpeg")
-            #pragma comment(lib,"wxpng")
-            #pragma comment(lib,"wxregex")
-            #pragma comment(lib,"wxtiff")
-            #pragma comment(lib,"wxzlib")
-            #pragma comment(lib,"wxbase26")
-            #pragma comment(lib,"wxbase26_net")
-            #pragma comment(lib,"wxbase26_xml")
-            #pragma comment(lib,"wxmsw26_adv")
-            #pragma comment(lib,"wxmsw26_core")
-            #pragma comment(lib,"wxmsw26_html")
-            #pragma comment(lib,"wxmsw26_qa")
-            #pragma comment(lib,"wxmsw26_xrc")
+            #if wxUSE_XML
+                #pragma comment(lib,"wxexpat")
+            #endif
+            #if wxUSE_LIBJPEG
+                #pragma comment(lib,"wxjpeg")
+            #endif
+            #if wxUSE_LIBPNG
+                #pragma comment(lib,"wxpng")
+            #endif
+            #if wxUSE_REGEX
+                #pragma comment(lib,"wxregex")
+            #endif
+            #if wxUSE_LIBTIFF
+                #pragma comment(lib,"wxtiff")
+            #endif
+            #if wxUSE_ZLIB
+                #pragma comment(lib,"wxzlib")
+            #endif
+            #pragma comment(lib,"wxbase27")
+            #pragma comment(lib,"wxbase27_net")
+            #pragma comment(lib,"wxbase27_xml")
+            #pragma comment(lib,"wxmsw27_adv")
+            #pragma comment(lib,"wxmsw27_core")
+            #pragma comment(lib,"wxmsw27_html")
+            #if wxUSE_DEBUGREPORT
+            #pragma comment(lib,"wxmsw27_qa")
+            #endif
+            #pragma comment(lib,"wxmsw27_xrc")
+            #pragma comment(lib,"wxmsw27_aui")
+            #pragma comment(lib,"wxmsw27_richtext")
+            #if wxUSE_MEDIACTRL
+                #pragma comment(lib,"wxmsw27_media")
+            #endif
+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27_odbc")
+            #endif
         #endif // debug/release
     #endif // _UNICODE/!_UNICODE
 #else