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 ca9d84487a6035cbc2aeb72fcc98d6690518b348..02205ee33a43344e205ab553763dd03a7a800ddd 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -30,65 +30,103 @@
         #endif
 
         #ifdef _DEBUG
         #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_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,"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_MEDIACTRL
-                #pragma comment(lib,"wxmsw26ud_media")
-            #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
         #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_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,"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_MEDIACTRL
-                #pragma comment(lib,"wxmsw26u_media")
-            #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
         #endif // debug/release
     #else // !_UNICODE
         #ifdef WXUSINGDLL


@@ -106,65 +144,103 @@
         #endif // shared/static
 
         #ifdef _DEBUG
         #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_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,"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_MEDIACTRL
-                #pragma comment(lib,"wxmsw26d_media")
-            #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
         #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_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,"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_MEDIACTRL
-                #pragma comment(lib,"wxmsw26_media")
-            #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
         #endif // debug/release
     #endif // _UNICODE/!_UNICODE
 #else