restored previously removed inline

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

diff --git a/include/wx/version.h b/include/wx/version.h
index 9e1a8e5728bb51d08dd40e7d5367b9ca83518af7..7fbe4a4c8d82dd59935f1d9c8ae8727c799b10ac 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -1,25 +1,31 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        version.h
+// Name:        wx/version.h
 // Purpose:     wxWindows version numbers
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __VERSIONH__
-#define __VERSIONH__
+#ifndef _WX_VERSIONH__
+#define _WX_VERSIONH__
 
-/* Bump-up with each new version */
+// Bump-up with each new version
 #define wxMAJOR_VERSION    2
-#define wxMINOR_VERSION    0
+#define wxMINOR_VERSION    3
 #define wxRELEASE_NUMBER   0
-#define wxVERSION_STRING "wxWindows 2.0"
+#define wxVERSION_STRING   _T("wxWindows 2.3.0")
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
-#define wxBETA_NUMBER      12
-#define wxVERSION_FLOAT float(wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0))
+#define wxBETA_NUMBER      0
+#define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
+
+// check if the current version is at least major.minor.release
+#define wxCHECK_VERSION(major,minor,release) \
+    (wxMAJOR_VERSION > (major) || \
+    (wxMAJOR_VERSION == (major) && wxMINOR_VERSION > (minor)) || \
+    (wxMAJOR_VERSION == (major) && wxMINOR_VERSION == (minor) && wxRELEASE_NUMBER >= (release)))
 
 #endif
-       // __VERSIONH__
+// _WX_VERSIONH__