Fixed bug: wxPGProperty::SetName() crashed if it was called before property was added...

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

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 14d14a31befcec7da1037e0f720123cf70aed846..d5c27517a6a9341c92daf2fc1c4875cf48594815 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -9,105 +9,132 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _MSC_VER
+    #error "This file should only be included when using Microsoft Visual C++"
+#endif
+

 // 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!
+
+#include "wx/version.h"
+#include "wx/cpp.h"

 
 

-#ifdef _MSC_VER
+// notice that wxSUFFIX_DEBUG is a string but wxSUFFIX itself must be an
+// identifier as string concatenation is not done inside #include where we
+// need it
+#ifdef _DEBUG
+    #define wxSUFFIX_DEBUG "d"

     #ifdef _UNICODE
     #ifdef _UNICODE

-        #ifdef WXUSINGDLL
-            #ifdef _DEBUG
-                #include "../../../lib/vc_dll/mswud/wx/setup.h"
-            #else
-                #include "../../../lib/vc_dll/mswu/wx/setup.h"
-            #endif
-        #else
-            #ifdef _DEBUG
-                #include "../../../lib/vc_lib/mswud/wx/setup.h"
-            #else
-                #include "../../../lib/vc_lib/mswu/wx/setup.h"
-            #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_qa")
-            #pragma comment(lib,"wxmsw25ud_xrc")
-        #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_qa")
-            #pragma comment(lib,"wxmsw25u_xrc")
-        #endif // debug/release
+        #define wxSUFFIX ud

     #else // !_UNICODE
     #else // !_UNICODE

-        #ifdef WXUSINGDLL
-            #ifdef _DEBUG
-                #include "../../../lib/vc_dll/mswd/wx/setup.h"
-            #else
-                #include "../../../lib/vc_dll/msw/wx/setup.h"
-            #endif
-        #else // static lib
-            #ifdef _DEBUG
-                #include "../../../lib/vc_lib/mswd/wx/setup.h"
-            #else
-                #include "../../../lib/vc_lib/msw/wx/setup.h"
-            #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_qa")
-            #pragma comment(lib,"wxmsw25d_xrc")
-        #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_qa")
-            #pragma comment(lib,"wxmsw25_xrc")
-        #endif // debug/release
+        #define wxSUFFIX d

     #endif // _UNICODE/!_UNICODE
 #else
     #endif // _UNICODE/!_UNICODE
 #else

-    #error "This file should only be included when using Microsoft Visual C++"
+    #define wxSUFFIX_DEBUG ""
+    #ifdef _UNICODE
+        #define wxSUFFIX u
+    #else // !_UNICODE
+        #define wxSUFFIX
+    #endif // _UNICODE/!_UNICODE
+#endif
+
+#ifdef WXUSINGDLL
+    #define wxLIB_SUBDIR vc_dll
+#else // !DLL
+    #define wxLIB_SUBDIR vc_lib
+#endif // DLL/!DLL
+
+
+// the real setup.h header file we need is in the build-specific directory,
+// construct the path to it
+#define wxSETUPH_PATH \
+    wxCONCAT5(../../../lib/, wxLIB_SUBDIR, /msw, wxSUFFIX, /wx/setup.h)
+#define wxSETUPH_PATH_STR wxSTRINGIZE(wxSETUPH_PATH)
+
+#include wxSETUPH_PATH_STR
+
+
+// the library names depend on the build, these macro builds the correct
+// library name for the given base name
+#define wxSUFFIX_STR wxSTRINGIZE(wxSUFFIX)
+#define wxSHORT_VERSION_STRING \
+    wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)
+
+#define wxWX_LIB_NAME(name, subname) \
+    "wx" name wxSHORT_VERSION_STRING wxSUFFIX_STR subname
+
+#define wxBASE_LIB_NAME(name) wxWX_LIB_NAME("base", "_" name)
+#define wxMSW_LIB_NAME(name) wxWX_LIB_NAME("msw", "_" name)
+
+// this one is for 3rd party libraries: they don't have the version number
+// in their names and usually exist in ANSI version only (except for regex)
+#define wx3RD_PARTY_LIB_NAME(name) "wx" name wxSUFFIX_DEBUG
+
+// special version for regex as it does have a Unicode version
+#define wx3RD_PARTY_LIB_NAME_U(name) "wx" name wxSUFFIX_STR
+
+#pragma comment(lib, wxWX_LIB_NAME("base", ""))
+
+#ifndef wxNO_NET_LIB
+    #pragma comment(lib, wxBASE_LIB_NAME("net"))
+#endif
+#ifndef wxNO_XML_LIB
+    #pragma comment(lib, wxBASE_LIB_NAME("xml"))
+#endif
+#if wxUSE_REGEX && !defined(wxNO_REGEX_LIB)
+    #pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex"))

 #endif
 
 #endif
 

+#if wxUSE_GUI
+    #if wxUSE_XML && !defined(wxNO_EXPAT_LIB)
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
+    #endif
+    #if wxUSE_LIBJPEG && !defined(wxNO_JPEG_LIB)
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("jpeg"))
+    #endif
+    #if wxUSE_LIBPNG && !defined(wxNO_PNG_LIB)
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("png"))
+    #endif
+    #if wxUSE_LIBTIFF && !defined(wxNO_TIFF_LIB)
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff"))
+    #endif
+    #if wxUSE_ZLIB && !defined(wxNO_ZLIB_LIB)
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("zlib"))
+    #endif
+
+    #pragma comment(lib, wxMSW_LIB_NAME("core"))
+
+    #ifndef wxNO_ADV_LIB
+        #pragma comment(lib, wxMSW_LIB_NAME("adv"))
+    #endif
+
+    #ifndef wxNO_HTML_LIB
+        #pragma comment(lib, wxMSW_LIB_NAME("html"))
+    #endif
+    #if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB)
+        #pragma comment(lib, wxMSW_LIB_NAME("gl"))
+    #endif
+    #if wxUSE_DEBUGREPORT && !defined(wxNO_QA_LIB)
+        #pragma comment(lib, wxMSW_LIB_NAME("qa"))
+    #endif
+    #if wxUSE_XRC && !defined(wxNO_XRC_LIB)
+        #pragma comment(lib, wxMSW_LIB_NAME("xrc"))
+    #endif
+    #if wxUSE_AUI && !defined(wxNO_AUI_LIB)
+        #pragma comment(lib, wxMSW_LIB_NAME("aui"))
+    #endif
+    #if wxUSE_PROPGRID && !defined(wxNO_PROPGRID_LIB)
+        #pragma comment(lib, wxMSW_LIB_NAME("propgrid"))
+    #endif
+    #if wxUSE_RICHTEXT && !defined(wxNO_RICHTEXT_LIB)
+        #pragma comment(lib, wxMSW_LIB_NAME("richtext"))
+    #endif
+    #if wxUSE_MEDIACTRL && !defined(wxNO_MEDIA_LIB)
+        #pragma comment(lib, wxMSW_LIB_NAME("media"))
+    #endif
+    #if wxUSE_STC && !defined(wxNO_STC_LIB)
+        #pragma comment(lib, wxMSW_LIB_NAME("stc"))
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
+    #endif
+#endif // wxUSE_GUI