--- a\np2src\src\Helpers.c	Sun Jun 21 00:00:00 2009
+++ b\np2src\src\Helpers.c	Mon Jun 22 20:00:04 2009
@@ -159,75 +159,8 @@ void EndWaitCursor()
 
 
 //=============================================================================
 //
-//  Is2k()
-//
-BOOL Is2k()
-{
-  static BOOL bIs2k;
-  static BOOL bCachedResult;
-  if (bCachedResult)
-    return(bIs2k);
-  else {
-    OSVERSIONINFO osvi;
-    osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    GetVersionEx(&osvi);
-    bIs2k =
-       (osvi.dwMajorVersion >= 5);
-    bCachedResult = TRUE;
-    return(bIs2k);
-  }
-}
-
-
-//=============================================================================
-//
-//  IsXP()
-//
-//BOOL IsXP()
-//{
-//  static BOOL bIsXP;
-//  static BOOL bCachedResult;
-//  if (bCachedResult)
-//    return(bIsXP);
-//  else {
-//    OSVERSIONINFO osvi;
-//    osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-//    GetVersionEx(&osvi);
-//    bIsXP =
-//       ((osvi.dwMajorVersion > 5) ||
-//       ((osvi.dwMajorVersion == 5) && (osvi.dwMinorVersion >= 1)));
-//    bCachedResult = TRUE;
-//    return(bIsXP);
-//  }
-//}
-
-
-//=============================================================================
-//
-//  IsVista()
-//
-BOOL IsVista()
-{
-  static BOOL bIsVista;
-  static BOOL bCachedResult;
-  if (bCachedResult)
-    return(bIsVista);
-  else {
-    OSVERSIONINFO osvi;
-    osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    GetVersionEx(&osvi);
-    bIsVista =
-       (osvi.dwMajorVersion >= 6);
-    bCachedResult = TRUE;
-    return(bIsVista);
-  }
-}
-
-
-//=============================================================================
-//
 //  PrivateIsAppThemed()
 //
 extern HMODULE hModUxTheme;
 BOOL PrivateIsAppThemed()
--- a\np2src\src\Helpers.h	Sun Jun 21 00:00:00 2009
+++ b\np2src\src\Helpers.h	Mon Jun 22 20:01:37 2009
@@ -20,8 +20,12 @@
 
 
 
 extern HINSTANCE g_hInstance;
+extern UINT16 g_uWinVer;
+
+
+#define SWAP16(a) MAKEWORD(HIBYTE(a), LOBYTE(a))
 
 
 #define COUNTOF(ar) (sizeof(ar)/sizeof(ar[0]))
 
@@ -56,11 +60,14 @@ void EndWaitCursor();
 
 //void KeepWindowsAlive();
 
 
-BOOL Is2k();
-//BOOL IsXP();
-BOOL IsVista();
+#define Is2k()    (g_uWinVer >= 0x0500)
+#define IsXP()    (g_uWinVer >= 0x0501)
+#define IsVista() (g_uWinVer >= 0x0600)
+#define IsW7()    (g_uWinVer >= 0x0601)
+
+
 BOOL PrivateIsAppThemed();
 //BOOL SetExplorerTheme(HWND);
 
 
--- a\np2src\src\Notepad2.c	Mon Jun 22 19:57:57 2009
+++ b\np2src\src\Notepad2.c	Mon Jun 22 19:48:19 2009
@@ -254,8 +254,9 @@ WCHAR wchAppendLines[256] = L"";
 int   iSortOptions = 0;
 
 LPMALLOC  g_lpMalloc;
 HINSTANCE g_hInstance;
+UINT16    g_uWinVer;
 
 
 
 //=============================================================================
@@ -304,8 +305,12 @@ int WINAPI WinMain(HINSTANCE hInstance,H
   //HMODULE hSciLexer;
 
   // Set global variable g_hInstance
   g_hInstance = hInstance;
+
+  // Set the Windows version global variable
+  g_uWinVer = LOWORD(GetVersion());
+  g_uWinVer = SWAP16(g_uWinVer);
 
   SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);
 
   // check if running at least on Windows 2000