added more files (unchanged) from wxUniv branch

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

diff --git a/include/wx/version.h b/include/wx/version.h
index d300d9655ecfffe6d547fe8755acbf5130a270c2..87208936d06f6c13816fc9a23ca0a210fe22a3a1 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -9,14 +9,22 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_VERSIONH__
-#define _WX_VERSIONH__
+#ifndef _WX_VERSION_H_
+#define _WX_VERSION_H_
 
 // Bump-up with each new version
 #define wxMAJOR_VERSION    2
-#define wxMINOR_VERSION    2
+#define wxMINOR_VERSION    3
 #define wxRELEASE_NUMBER   1
-#define wxVERSION_STRING   _T("wxWindows 2.2.1")
+#define wxVERSION_STRING   _T("wxWindows 2.3.1")
+
+// These are used by src/msw/version.rc and should always be ASCII, not Unicode
+// and must be updated manually as well each time the version above changes
+#define wxVERSION_NUM_DOT_STRING   "2.3.1"
+#define wxVERSION_NUM_STRING       "231"
+
+// nothing should be updated below this line when updating the version
+
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
 #define wxBETA_NUMBER      0
 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
@@ -27,5 +35,5 @@
     (wxMAJOR_VERSION == (major) && wxMINOR_VERSION > (minor)) || \
     (wxMAJOR_VERSION == (major) && wxMINOR_VERSION == (minor) && wxRELEASE_NUMBER >= (release)))
 
-#endif
-// _WX_VERSIONH__
+#endif // _WX_VERSION_H_
+