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 b4f006ae2e039fb7bc12227bbf0fbba4e1b76e8e..e5a51551729162bc5c21a1683eb147db64e49fd2 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -11,96 +11,188 @@
 
 // VC++ IDE predefines _DEBUG and _UNICODE for the new projects itself, but
 // the other symbols (WXUSINGDLL, __WXUNIVERSAL__, ...) should be defined
 
 // VC++ IDE predefines _DEBUG and _UNICODE for the new projects itself, but
 // the other symbols (WXUSINGDLL, __WXUNIVERSAL__, ...) should be defined

-// explicitely!
+// explicitly!

 
 #ifdef _MSC_VER
     #ifdef _UNICODE
         #ifdef WXUSINGDLL
             #ifdef _DEBUG
 
 #ifdef _MSC_VER
     #ifdef _UNICODE
         #ifdef WXUSINGDLL
             #ifdef _DEBUG

-                #include "../../lib/vc_dll/mswud/wx/setup.h"
+                #include "../../../lib/vc_dll/mswud/wx/setup.h"

             #else
             #else

-                #include "../../lib/vc_dll/mswu/wx/setup.h"
+                #include "../../../lib/vc_dll/mswu/wx/setup.h"

             #endif
         #else
             #ifdef _DEBUG
             #endif
         #else
             #ifdef _DEBUG

-                #include "../../lib/vc_lib/mswud/wx/setup.h"
+                #include "../../../lib/vc_lib/mswud/wx/setup.h"

             #else
             #else

-                #include "../../lib/vc_lib/mswu/wx/setup.h"
+                #include "../../../lib/vc_lib/mswu/wx/setup.h"

             #endif
         #endif
 
         #ifdef _DEBUG
             #endif
         #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,"wxbase25ud")
-            #pragma comment(lib,"wxbase25ud_net")
-            #pragma comment(lib,"wxbase25ud_xml")
-            #pragma comment(lib,"wxmsw25ud_adv")
-            #pragma comment(lib,"wxmsw25ud_core")
-            #pragma comment(lib,"wxmsw25ud_html")
-            #pragma comment(lib,"wxmsw25ud_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
         #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,"wxbase25u")
-            #pragma comment(lib,"wxbase25u_net")
-            #pragma comment(lib,"wxbase25u_xml")
-            #pragma comment(lib,"wxmsw25u_adv")
-            #pragma comment(lib,"wxmsw25u_core")
-            #pragma comment(lib,"wxmsw25u_html")
-            #pragma comment(lib,"wxmsw25u_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
             #ifdef _DEBUG
         #endif // debug/release
     #else // !_UNICODE
         #ifdef WXUSINGDLL
             #ifdef _DEBUG

-                #include "../../lib/vc_dll/mswd/wx/setup.h"
+                #include "../../../lib/vc_dll/mswd/wx/setup.h"

             #else
             #else

-                #include "../../lib/vc_dll/msw/wx/setup.h"
+                #include "../../../lib/vc_dll/msw/wx/setup.h"

             #endif
         #else // static lib
             #ifdef _DEBUG
             #endif
         #else // static lib
             #ifdef _DEBUG

-                #include "../../lib/vc_lib/mswd/wx/setup.h"
+                #include "../../../lib/vc_lib/mswd/wx/setup.h"

             #else
             #else

-                #include "../../lib/vc_lib/msw/wx/setup.h"
+                #include "../../../lib/vc_lib/msw/wx/setup.h"

             #endif
         #endif // shared/static
 
         #ifdef _DEBUG
             #endif
         #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,"wxbase25d")
-            #pragma comment(lib,"wxbase25d_net")
-            #pragma comment(lib,"wxbase25d_xml")
-            #pragma comment(lib,"wxmsw25d_adv")
-            #pragma comment(lib,"wxmsw25d_core")
-            #pragma comment(lib,"wxmsw25d_html")
-            #pragma comment(lib,"wxmsw25d_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
         #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,"wxbase25")
-            #pragma comment(lib,"wxbase25_net")
-            #pragma comment(lib,"wxbase25_xml")
-            #pragma comment(lib,"wxmsw25_adv")
-            #pragma comment(lib,"wxmsw25_core")
-            #pragma comment(lib,"wxmsw25_html")
-            #pragma comment(lib,"wxmsw25_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
         #endif // debug/release
     #endif // _UNICODE/!_UNICODE
 #else