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 06ba8b4e19681be535bf9e0cd439f533fe630f83..e5a51551729162bc5c21a1683eb147db64e49fd2 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -54,13 +54,18 @@
             #pragma comment(lib,"wxmsw27ud_adv")
             #pragma comment(lib,"wxmsw27ud_core")
             #pragma comment(lib,"wxmsw27ud_html")
             #pragma comment(lib,"wxmsw27ud_adv")
             #pragma comment(lib,"wxmsw27ud_core")
             #pragma comment(lib,"wxmsw27ud_html")

-            #ifdef USE_QA
+            #if wxUSE_DEBUGREPORT

             #pragma comment(lib,"wxmsw27ud_qa")
             #endif
             #pragma comment(lib,"wxmsw27ud_xrc")
             #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_MEDIACTRL
                 #pragma comment(lib,"wxmsw27ud_media")
             #endif

+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27ud_odbc")
+            #endif

         #else // release
             #if wxUSE_XML
                 #pragma comment(lib,"wxexpat")
         #else // release
             #if wxUSE_XML
                 #pragma comment(lib,"wxexpat")


@@ -86,13 +91,18 @@
             #pragma comment(lib,"wxmsw27u_adv")
             #pragma comment(lib,"wxmsw27u_core")
             #pragma comment(lib,"wxmsw27u_html")
             #pragma comment(lib,"wxmsw27u_adv")
             #pragma comment(lib,"wxmsw27u_core")
             #pragma comment(lib,"wxmsw27u_html")

-            #ifdef USE_QA
+            #if wxUSE_DEBUGREPORT

             #pragma comment(lib,"wxmsw27u_qa")
             #endif
             #pragma comment(lib,"wxmsw27u_xrc")
             #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_MEDIACTRL
                 #pragma comment(lib,"wxmsw27u_media")
             #endif

+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27u_odbc")
+            #endif

         #endif // debug/release
     #else // !_UNICODE
         #ifdef WXUSINGDLL
         #endif // debug/release
     #else // !_UNICODE
         #ifdef WXUSINGDLL


@@ -134,13 +144,18 @@
             #pragma comment(lib,"wxmsw27d_adv")
             #pragma comment(lib,"wxmsw27d_core")
             #pragma comment(lib,"wxmsw27d_html")
             #pragma comment(lib,"wxmsw27d_adv")
             #pragma comment(lib,"wxmsw27d_core")
             #pragma comment(lib,"wxmsw27d_html")

-            #ifdef USE_QA
+            #if wxUSE_DEBUGREPORT

             #pragma comment(lib,"wxmsw27d_qa")
             #endif
             #pragma comment(lib,"wxmsw27d_xrc")
             #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_MEDIACTRL
                 #pragma comment(lib,"wxmsw27d_media")
             #endif

+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27d_odbc")
+            #endif

         #else // release
             #if wxUSE_XML
                 #pragma comment(lib,"wxexpat")
         #else // release
             #if wxUSE_XML
                 #pragma comment(lib,"wxexpat")


@@ -166,13 +181,18 @@
             #pragma comment(lib,"wxmsw27_adv")
             #pragma comment(lib,"wxmsw27_core")
             #pragma comment(lib,"wxmsw27_html")
             #pragma comment(lib,"wxmsw27_adv")
             #pragma comment(lib,"wxmsw27_core")
             #pragma comment(lib,"wxmsw27_html")

-            #ifdef USE_QA
+            #if wxUSE_DEBUGREPORT

             #pragma comment(lib,"wxmsw27_qa")
             #endif
             #pragma comment(lib,"wxmsw27_xrc")
             #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_MEDIACTRL
                 #pragma comment(lib,"wxmsw27_media")
             #endif

+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27_odbc")
+            #endif

         #endif // debug/release
     #endif // _UNICODE/!_UNICODE
 #else
         #endif // debug/release
     #endif // _UNICODE/!_UNICODE
 #else