Explicit casting/instantiation to resolve ambiguous overload.

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

diff --git a/include/wx/version.h b/include/wx/version.h
index deafa618a14900959200e6c1bf62d7514703abc0..93baaf6b8f0b49941b137eafcb7bdaca7186e27c 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -14,11 +14,11 @@
 
 /* Bump-up with each new version */
 #define wxMAJOR_VERSION    2
 
 /* Bump-up with each new version */
 #define wxMAJOR_VERSION    2

-#define wxMINOR_VERSION    0
+#define wxMINOR_VERSION    1

 #define wxRELEASE_NUMBER   0
 #define wxRELEASE_NUMBER   0

-#define wxVERSION_STRING "wxWindows 2.0"
+#define wxVERSION_STRING "wxWindows 2.1.0"

 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER

-#define wxBETA_NUMBER      17
+#define wxBETA_NUMBER      6

 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
 
 #endif
 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
 
 #endif