From e3179c1ef509482ff9b4c7d4fb89d0b208e84000 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 27 May 2019 16:05:30 +0300
Subject: obsolete calls of GetVersion() removed & replaced with
 IsWinVer*Plus() calls

---
 plugins/TooltipNotify/src/TooltipNotify.cpp | 15 ++++++---------
 plugins/TooltipNotify/src/TooltipNotify.h   |  2 --
 plugins/TooltipNotify/src/Utils.cpp         |  7 -------
 plugins/TooltipNotify/src/Utils.h           |  1 -
 4 files changed, 6 insertions(+), 19 deletions(-)

(limited to 'plugins/TooltipNotify/src')

diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp
index 591d200892..503aebfa5c 100644
--- a/plugins/TooltipNotify/src/TooltipNotify.cpp
+++ b/plugins/TooltipNotify/src/TooltipNotify.cpp
@@ -52,8 +52,7 @@ const char *CTooltipNotify::s_szModuleNameOld = "ttntfmod";
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-CTooltipNotify::CTooltipNotify() :
-	m_bNt50(IsNt50())
+CTooltipNotify::CTooltipNotify()
 {
 	if (s_pInstance != nullptr)
 		throw EAlreadyExists();
@@ -281,9 +280,9 @@ CTooltip *CTooltipNotify::BeginNotify(STooltipData *pTooltipData)
 	pTooltip->set_Font(lf);
 	pTooltip->set_BgColor(bgColor);
 	pTooltip->set_TextColor(textColor);
-	if (m_bNt50 && m_sOptions.bTransp)
+	if (m_sOptions.bTransp)
 		pTooltip->set_Translucency(m_sOptions.bAlpha);
-	pTooltip->set_TransparentInput(m_bNt50 && m_sOptions.bTransp && m_sOptions.bTranspInput);
+	pTooltip->set_TransparentInput(m_sOptions.bTransp && m_sOptions.bTranspInput);
 	pTooltip->Validate();
 
 	RECT TooltipRect, WorkAreaRect;
@@ -491,11 +490,9 @@ void CTooltipNotify::WriteSettingsToDlg(HWND hDlg)
 	default:		CheckDlgButton(hDlg, IDC_RB_CLIST, BST_CHECKED);	break;
 	}
 
-	EnableWindow(GetDlgItem(hDlg, IDC_GB_TRANSP), m_bNt50);
-	EnableWindow(GetDlgItem(hDlg, IDC_TRANSPARENCY), m_bNt50);
-	EnableWindow(GetDlgItem(hDlg, IDC_TRANSPARENCY_SLIDER), m_sOptions.bTransp && m_bNt50);
-	EnableWindow(GetDlgItem(hDlg, IDC_TRANSPERC), m_sOptions.bTransp && m_bNt50);
-	EnableWindow(GetDlgItem(hDlg, IDC_TRANSP_INPUT), m_sOptions.bTransp && m_bNt50);
+	EnableWindow(GetDlgItem(hDlg, IDC_TRANSPARENCY_SLIDER), m_sOptions.bTransp);
+	EnableWindow(GetDlgItem(hDlg, IDC_TRANSPERC), m_sOptions.bTransp);
+	EnableWindow(GetDlgItem(hDlg, IDC_TRANSP_INPUT), m_sOptions.bTransp);
 	EnableWindow(GetDlgItem(hDlg, IDC_RB_CLIST), !m_sOptions.bTranspInput);
 	EnableWindow(GetDlgItem(hDlg, IDC_RB_MSGDLG), !m_sOptions.bTranspInput);
 
diff --git a/plugins/TooltipNotify/src/TooltipNotify.h b/plugins/TooltipNotify/src/TooltipNotify.h
index 9a0e36b17d..149eacc870 100644
--- a/plugins/TooltipNotify/src/TooltipNotify.h
+++ b/plugins/TooltipNotify/src/TooltipNotify.h
@@ -36,8 +36,6 @@ private:
 	static CTooltipNotify *s_pInstance;
 	static const char *s_szModuleNameOld;
 	
-	const BOOL m_bNt50;
-
 	struct SOptions {
 		BYTE  bFirstRun;
 		BYTE  bOffline;
diff --git a/plugins/TooltipNotify/src/Utils.cpp b/plugins/TooltipNotify/src/Utils.cpp
index 9338efebbe..229257d6a9 100644
--- a/plugins/TooltipNotify/src/Utils.cpp
+++ b/plugins/TooltipNotify/src/Utils.cpp
@@ -4,13 +4,6 @@
 
 #include "stdafx.h"
 
-BOOL IsNt50()
-{
-	WORD wOsVersion = LOWORD(GetVersion());
-	BYTE bMajorVer = LOBYTE(wOsVersion);
-	return (bMajorVer>=5);
-}
-
 void TruncateWithDots(wchar_t* szString, size_t iNewLen)
 {
 	size_t iOrigLen = mir_wstrlen(szString);
diff --git a/plugins/TooltipNotify/src/Utils.h b/plugins/TooltipNotify/src/Utils.h
index 19afbab838..c9f8369dd3 100644
--- a/plugins/TooltipNotify/src/Utils.h
+++ b/plugins/TooltipNotify/src/Utils.h
@@ -4,5 +4,4 @@
 
 #pragma once
 
-BOOL IsNt50();
 void TruncateWithDots(wchar_t* szString, size_t iNewLen);
-- 
cgit v1.2.3