Getting rid of platform.h and making sure VS versions newer than VS2008 will use the Windows 7 features by default

3 files changed, 3 insertions, 74 deletions

diff --git a/common/platform.cpp b/common/platform.cpp
deleted file mode 100644
index 03b61cd..0000000
--- a/common/platform.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// platform.cpp - Implementation of PlatformIsWindows9x()
-//
-// WinDirStat - Directory Statistics
-// Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2006, 2008 Oliver Schneider (assarbad.net)
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-// Author(s): - bseifert -> http://windirstat.info/contact/bernhard/
-//            - assarbad -> http://windirstat.info/contact/oliver/
-//
-
-#include "stdafx.h"
-#include "platform.h"
-
-bool PlatformIsWindows9x()
-{
-    OSVERSIONINFO osvi;
-    ZeroMemory(&osvi, sizeof(osvi));
-    osvi.dwOSVersionInfoSize = sizeof(osvi);
-
-    if(!GetVersionEx(&osvi))
-    {
-        VTRACE(_T("GetVersionEx() failed."));
-        return false;
-    }
-
-    return (VER_PLATFORM_WIN32_WINDOWS == osvi.dwPlatformId);
-}
diff --git a/common/platform.h b/common/platform.h
deleted file mode 100644
index 43c7e5f..0000000
--- a/common/platform.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// platform.h - Declaration of PlatformIsWindows9x()
-//
-// WinDirStat - Directory Statistics
-// Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2006, 2008 Oliver Schneider (assarbad.net)
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-// Author(s): - bseifert -> http://windirstat.info/contact/bernhard/
-//            - assarbad -> http://windirstat.info/contact/oliver/
-//
-
-#ifndef __WDS_PLATFORM_H__
-#define __WDS_PLATFORM_H__
-#pragma once
-
-bool PlatformIsWindows9x();
-
-#endif // __WDS_PLATFORM_H__
diff --git a/windirstat/stdafx.h b/windirstat/stdafx.h
index 8c34010..b7e5c78 100644
--- a/windirstat/stdafx.h
+++ b/windirstat/stdafx.h
@@ -28,11 +28,13 @@
 #define __WDS_STDAFX_H__
 #pragma once
 
-#if defined(HAVE_WIN7_SDK) && HAVE_WIN7_SDK
+#if (defined(HAVE_WIN7_SDK) && HAVE_WIN7_SDK) || (_MSC_VER >= 1600)
 #   define SUPPORT_W7_TASKBAR 1
 #   define SUPPORT_ELEVATION  1
 #endif // HAVE_WIN7_SDK
 
+#define _WIN32_WINNT _WIN32_WINNT_WINXP
+
 #ifndef VC_EXTRALEAN
 #define VC_EXTRALEAN        // Exclude rarely-used stuff from Windows headers
 #endif
@@ -62,7 +64,6 @@
 #include <common/mdexceptions.h>
 #include <common/cotaskmem.h>
 #include <common/commonhelpers.h>
-#include <common/platform.h>
 #include <common/tracer.h>
 #include <common/wds_constants.h>