Rather use the "obvious" implementation of wxStaticText::DoGetLabel().

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

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 2407b18b61e4b0a11c5181c15823a9e5e6067925..02205ee33a43344e205ab553763dd03a7a800ddd 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -30,97 +30,103 @@
         #endif
 
         #ifdef _DEBUG
-            #if wxUSE_XML
-                #pragma comment(lib,"wxexpatd")
-            #endif
-            #if wxUSE_LIBJPEG
-                #pragma comment(lib,"wxjpegd")
-            #endif
-            #if wxUSE_LIBPNG
-                #pragma comment(lib,"wxpngd")
-            #endif
+            #pragma comment(lib,"wxbase29ud")
+            #pragma comment(lib,"wxbase29ud_net")
+            #pragma comment(lib,"wxbase29ud_xml")
             #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,"wxbase28ud")
-            #pragma comment(lib,"wxbase28ud_net")
-            #pragma comment(lib,"wxbase28ud_xml")
-            #pragma comment(lib,"wxmsw28ud_adv")
-            #pragma comment(lib,"wxmsw28ud_core")
-            #pragma comment(lib,"wxmsw28ud_html")
-            #if wxUSE_GLCANVAS
-                #pragma comment(lib,"wxmsw28ud_gl")
-            #endif
-            #if wxUSE_DEBUGREPORT
-                #pragma comment(lib,"wxmsw28ud_qa")
-            #endif
-            #if wxUSE_XRC
-                #pragma comment(lib,"wxmsw28ud_xrc")
-            #endif
-            #if wxUSE_AUI
-                #pragma comment(lib,"wxmsw28ud_aui")
-            #endif
-            #if wxUSE_RICHTEXT
-                #pragma comment(lib,"wxmsw28ud_richtext")
-            #endif
-            #if wxUSE_MEDIACTRL
-                #pragma comment(lib,"wxmsw28ud_media")
-            #endif
-            #if wxUSE_ODBC
-                #pragma comment(lib,"wxbase28ud_odbc")
-            #endif
+
+            #if wxUSE_GUI
+                #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_LIBTIFF
+                    #pragma comment(lib,"wxtiffd")
+                #endif
+                #if wxUSE_ZLIB
+                    #pragma comment(lib,"wxzlibd")
+                #endif
+                #pragma comment(lib,"wxmsw29ud_adv")
+                #pragma comment(lib,"wxmsw29ud_core")
+                #pragma comment(lib,"wxmsw29ud_html")
+                #if wxUSE_GLCANVAS
+                    #pragma comment(lib,"wxmsw29ud_gl")
+                #endif
+                #if wxUSE_DEBUGREPORT
+                    #pragma comment(lib,"wxmsw29ud_qa")
+                #endif
+                #if wxUSE_XRC
+                    #pragma comment(lib,"wxmsw29ud_xrc")
+                #endif
+                #if wxUSE_AUI
+                    #pragma comment(lib,"wxmsw29ud_aui")
+                #endif
+                #if wxUSE_RICHTEXT
+                    #pragma comment(lib,"wxmsw29ud_richtext")
+                #endif
+                #if wxUSE_MEDIACTRL
+                    #pragma comment(lib,"wxmsw29ud_media")
+                #endif
+                #if wxUSE_ODBC
+                    #pragma comment(lib,"wxbase29ud_odbc")
+                #endif
+            #endif // wxUSE_GUI
         #else // release
-            #if wxUSE_XML
-                #pragma comment(lib,"wxexpat")
-            #endif
-            #if wxUSE_LIBJPEG
-                #pragma comment(lib,"wxjpeg")
-            #endif
-            #if wxUSE_LIBPNG
-                #pragma comment(lib,"wxpng")
-            #endif
+            #pragma comment(lib,"wxbase29u")
+            #pragma comment(lib,"wxbase29u_net")
+            #pragma comment(lib,"wxbase29u_xml")
             #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,"wxbase28u")
-            #pragma comment(lib,"wxbase28u_net")
-            #pragma comment(lib,"wxbase28u_xml")
-            #pragma comment(lib,"wxmsw28u_adv")
-            #pragma comment(lib,"wxmsw28u_core")
-            #pragma comment(lib,"wxmsw28u_html")
-            #if wxUSE_GLCANVAS
-                #pragma comment(lib,"wxmsw28u_gl")
-            #endif
-            #if wxUSE_DEBUGREPORT
-                #pragma comment(lib,"wxmsw28u_qa")
-            #endif
-            #if wxUSE_XRC
-                #pragma comment(lib,"wxmsw28u_xrc")
-            #endif
-            #if wxUSE_AUI
-                #pragma comment(lib,"wxmsw28u_aui")
-            #endif
-            #if wxUSE_RICHTEXT
-                #pragma comment(lib,"wxmsw28u_richtext")
-            #endif
-            #if wxUSE_MEDIACTRL
-                #pragma comment(lib,"wxmsw28u_media")
-            #endif
-            #if wxUSE_ODBC
-                #pragma comment(lib,"wxbase28u_odbc")
-            #endif
+
+            #if wxUSE_GUI
+                #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_LIBTIFF
+                    #pragma comment(lib,"wxtiff")
+                #endif
+                #if wxUSE_ZLIB
+                    #pragma comment(lib,"wxzlib")
+                #endif
+                #pragma comment(lib,"wxmsw29u_adv")
+                #pragma comment(lib,"wxmsw29u_core")
+                #pragma comment(lib,"wxmsw29u_html")
+                #if wxUSE_GLCANVAS
+                    #pragma comment(lib,"wxmsw29u_gl")
+                #endif
+                #if wxUSE_DEBUGREPORT
+                    #pragma comment(lib,"wxmsw29u_qa")
+                #endif
+                #if wxUSE_XRC
+                    #pragma comment(lib,"wxmsw29u_xrc")
+                #endif
+                #if wxUSE_AUI
+                    #pragma comment(lib,"wxmsw29u_aui")
+                #endif
+                #if wxUSE_RICHTEXT
+                    #pragma comment(lib,"wxmsw29u_richtext")
+                #endif
+                #if wxUSE_MEDIACTRL
+                    #pragma comment(lib,"wxmsw29u_media")
+                #endif
+                #if wxUSE_ODBC
+                    #pragma comment(lib,"wxbase29u_odbc")
+                #endif
+            #endif // wxUSE_GUI
         #endif // debug/release
     #else // !_UNICODE
         #ifdef WXUSINGDLL
@@ -138,97 +144,103 @@
         #endif // shared/static
 
         #ifdef _DEBUG
-            #if wxUSE_XML
-                #pragma comment(lib,"wxexpatd")
-            #endif
-            #if wxUSE_LIBJPEG
-                #pragma comment(lib,"wxjpegd")
-            #endif
-            #if wxUSE_LIBPNG
-                #pragma comment(lib,"wxpngd")
-            #endif
+            #pragma comment(lib,"wxbase29d")
+            #pragma comment(lib,"wxbase29d_net")
+            #pragma comment(lib,"wxbase29d_xml")
             #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,"wxbase28d")
-            #pragma comment(lib,"wxbase28d_net")
-            #pragma comment(lib,"wxbase28d_xml")
-            #pragma comment(lib,"wxmsw28d_adv")
-            #pragma comment(lib,"wxmsw28d_core")
-            #pragma comment(lib,"wxmsw28d_html")
-            #if wxUSE_GLCANVAS
-                #pragma comment(lib,"wxmsw28d_gl")
-            #endif
-            #if wxUSE_DEBUGREPORT
-                #pragma comment(lib,"wxmsw28d_qa")
-            #endif
-            #if wxUSE_XRC
-                #pragma comment(lib,"wxmsw28d_xrc")
-            #endif
-            #if wxUSE_AUI
-                #pragma comment(lib,"wxmsw28d_aui")
-            #endif
-            #if wxUSE_RICHTEXT
-                #pragma comment(lib,"wxmsw28d_richtext")
-            #endif
-            #if wxUSE_MEDIACTRL
-                #pragma comment(lib,"wxmsw28d_media")
-            #endif
-            #if wxUSE_ODBC
-                #pragma comment(lib,"wxbase28d_odbc")
-            #endif
+
+            #if wxUSE_GUI
+                #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_LIBTIFF
+                    #pragma comment(lib,"wxtiffd")
+                #endif
+                #if wxUSE_ZLIB
+                    #pragma comment(lib,"wxzlibd")
+                #endif
+                #pragma comment(lib,"wxmsw29d_adv")
+                #pragma comment(lib,"wxmsw29d_core")
+                #pragma comment(lib,"wxmsw29d_html")
+                #if wxUSE_GLCANVAS
+                    #pragma comment(lib,"wxmsw29d_gl")
+                #endif
+                #if wxUSE_DEBUGREPORT
+                    #pragma comment(lib,"wxmsw29d_qa")
+                #endif
+                #if wxUSE_XRC
+                    #pragma comment(lib,"wxmsw29d_xrc")
+                #endif
+                #if wxUSE_AUI
+                    #pragma comment(lib,"wxmsw29d_aui")
+                #endif
+                #if wxUSE_RICHTEXT
+                    #pragma comment(lib,"wxmsw29d_richtext")
+                #endif
+                #if wxUSE_MEDIACTRL
+                    #pragma comment(lib,"wxmsw29d_media")
+                #endif
+                #if wxUSE_ODBC
+                    #pragma comment(lib,"wxbase29d_odbc")
+                #endif
+            #endif // wxUSE_GUI
         #else // release
-            #if wxUSE_XML
-                #pragma comment(lib,"wxexpat")
-            #endif
-            #if wxUSE_LIBJPEG
-                #pragma comment(lib,"wxjpeg")
-            #endif
-            #if wxUSE_LIBPNG
-                #pragma comment(lib,"wxpng")
-            #endif
+            #pragma comment(lib,"wxbase29")
+            #pragma comment(lib,"wxbase29_net")
+            #pragma comment(lib,"wxbase29_xml")
             #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,"wxbase28")
-            #pragma comment(lib,"wxbase28_net")
-            #pragma comment(lib,"wxbase28_xml")
-            #pragma comment(lib,"wxmsw28_adv")
-            #pragma comment(lib,"wxmsw28_core")
-            #pragma comment(lib,"wxmsw28_html")
-            #if wxUSE_GLCANVAS
-                #pragma comment(lib,"wxmsw28_gl")
-            #endif
-            #if wxUSE_DEBUGREPORT
-                #pragma comment(lib,"wxmsw28_qa")
-            #endif
-            #if wxUSE_XRC
-                #pragma comment(lib,"wxmsw28_xrc")
-            #endif
-            #if wxUSE_AUI
-                #pragma comment(lib,"wxmsw28_aui")
-            #endif
-            #if wxUSE_RICHTEXT
-                #pragma comment(lib,"wxmsw28_richtext")
-            #endif
-            #if wxUSE_MEDIACTRL
-                #pragma comment(lib,"wxmsw28_media")
-            #endif
-            #if wxUSE_ODBC
-                #pragma comment(lib,"wxbase28_odbc")
-            #endif
+
+            #if wxUSE_GUI
+                #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_LIBTIFF
+                    #pragma comment(lib,"wxtiff")
+                #endif
+                #if wxUSE_ZLIB
+                    #pragma comment(lib,"wxzlib")
+                #endif
+                #pragma comment(lib,"wxmsw29_adv")
+                #pragma comment(lib,"wxmsw29_core")
+                #pragma comment(lib,"wxmsw29_html")
+                #if wxUSE_GLCANVAS
+                    #pragma comment(lib,"wxmsw29_gl")
+                #endif
+                #if wxUSE_DEBUGREPORT
+                    #pragma comment(lib,"wxmsw29_qa")
+                #endif
+                #if wxUSE_XRC
+                    #pragma comment(lib,"wxmsw29_xrc")
+                #endif
+                #if wxUSE_AUI
+                    #pragma comment(lib,"wxmsw29_aui")
+                #endif
+                #if wxUSE_RICHTEXT
+                    #pragma comment(lib,"wxmsw29_richtext")
+                #endif
+                #if wxUSE_MEDIACTRL
+                    #pragma comment(lib,"wxmsw29_media")
+                #endif
+                #if wxUSE_ODBC
+                    #pragma comment(lib,"wxbase29_odbc")
+                #endif
+            #endif // wxUSE_GUI
         #endif // debug/release
     #endif // _UNICODE/!_UNICODE
 #else