Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / version.h

diff --git a/include/wx/version.h b/include/wx/version.h
index f712c34695ee44230b0a5062478271e514996931..5dd396cc2af3830db52880c154b5dabca5bf1be1 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -27,10 +27,10 @@
 
 /*  NB: this file is parsed by automatic tools so don't change its format! */
 #define wxMAJOR_VERSION      2
 
 /*  NB: this file is parsed by automatic tools so don't change its format! */
 #define wxMAJOR_VERSION      2

-#define wxMINOR_VERSION      7
-#define wxRELEASE_NUMBER     0
-#define wxSUBRELEASE_NUMBER  1
-#define wxVERSION_STRING   _T("wxWidgets 2.7.0")
+#define wxMINOR_VERSION      9
+#define wxRELEASE_NUMBER     5
+#define wxSUBRELEASE_NUMBER  0
+#define wxVERSION_STRING   wxT("wxWidgets 2.9.5")

 
 /*  nothing to update below this line when updating the version */
 /*  ---------------------------------------------------------------------------- */
 
 /*  nothing to update below this line when updating the version */
 /*  ---------------------------------------------------------------------------- */


@@ -54,7 +54,7 @@
 #define wxMAKE_VERSION_STRING_T(x, y, z) \
     wxSTRINGIZE_T(x) wxSTRINGIZE_T(y) wxSTRINGIZE_T(z)
 #define wxMAKE_VERSION_DOT_STRING_T(x, y, z) \
 #define wxMAKE_VERSION_STRING_T(x, y, z) \
     wxSTRINGIZE_T(x) wxSTRINGIZE_T(y) wxSTRINGIZE_T(z)
 #define wxMAKE_VERSION_DOT_STRING_T(x, y, z) \

-    wxSTRINGIZE_T(x) _T(".") wxSTRINGIZE_T(y) _T(".") wxSTRINGIZE_T(z)
+    wxSTRINGIZE_T(x) wxT(".") wxSTRINGIZE_T(y) wxT(".") wxSTRINGIZE_T(z)

 
 /*  these are used by src/msw/version.rc and should always be ASCII, not Unicode */
 #define wxVERSION_NUM_STRING \
 
 /*  these are used by src/msw/version.rc and should always be ASCII, not Unicode */
 #define wxVERSION_NUM_STRING \