Not needed version checks removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@6172 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 1 insertions, 15 deletions

diff --git a/plugins/Popup/res/resource.rc b/plugins/Popup/res/resource.rc
index 1291172eaa..38abb74c67 100644
--- a/plugins/Popup/res/resource.rc
+++ b/plugins/Popup/res/resource.rc
@@ -103,7 +103,6 @@ BEGIN
     CONTROL         "Miranda's window",IDC_MIRANDAWND,"Button",BS_AUTORADIOBUTTON,21,172,115,10

     CONTROL         "the active window",IDC_ACTIVEWND,"Button",BS_AUTORADIOBUTTON,21,183,115,10

     GROUPBOX        "Transparency",IDC_STATIC,151,3,146,56

-    CONTROL         "Enable Win 9x/Me transparency",IDC_TRANS_9X,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,15,136,8

     CONTROL         "Use transparency",IDC_TRANS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,157,15,136,8

     RTEXT           "opacity:",IDC_TRANS_TXT1,157,25,59,12,SS_CENTERIMAGE

     CONTROL         "",IDC_TRANS_SLIDER,"msctls_trackbar32",WS_TABSTOP,218,25,56,12

diff --git a/plugins/Popup/src/config.h b/plugins/Popup/src/config.h
index 673b1e086e..f6a0635b18 100644
--- a/plugins/Popup/src/config.h
+++ b/plugins/Popup/src/config.h
@@ -80,7 +80,6 @@ typedef struct tagPOPUPOPTIONS {
 	//Monitor

 	BYTE Monitor;

 	//Transparency

-	BYTE Enable9xTransparency;

 	BYTE UseTransparency;

 	BYTE Alpha;

 	BYTE OpaqueOnHover;

diff --git a/plugins/Popup/src/opt_adv.cpp b/plugins/Popup/src/opt_adv.cpp
index 6df45bf210..47afc3933f 100644
--- a/plugins/Popup/src/opt_adv.cpp
+++ b/plugins/Popup/src/opt_adv.cpp
@@ -61,7 +61,6 @@ void LoadOption_AdvOpts()
 	PopupOptions.Monitor = db_get_b(NULL, MODULNAME, "Monitor", SETTING_MONITOR_DEFAULT);

 

 	//Transparency

-	PopupOptions.Enable9xTransparency = db_get_b(NULL, MODULNAME, "EnableRegionTransparency", TRUE);

 	PopupOptions.UseTransparency = db_get_b(NULL, MODULNAME, "UseTransparency", TRUE);

 	PopupOptions.Alpha = db_get_b(NULL, MODULNAME, "Alpha", SETTING_ALPHA_DEFAULT);

 	PopupOptions.OpaqueOnHover = db_get_b(NULL, MODULNAME, "OpaqueOnHover", TRUE);

@@ -154,10 +153,6 @@ INT_PTR CALLBACK DlgProcPopupAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 		}

 		//Group: Transparency

 		{

-			//9x/ME

-			CheckDlgButton(hwnd, IDC_TRANS_9X, PopupOptions.Enable9xTransparency);

-			//EnableWindow(GetDlgItem(hwnd, IDC_TRANS_9X), !IsWinVer2000Plus());

-			ShowWindow(GetDlgItem(hwnd, IDC_TRANS_9X), IsWinVer2000Plus() ? SW_HIDE : SW_SHOW);

 			//win2k+

 			CheckDlgButton(hwnd, IDC_TRANS, PopupOptions.UseTransparency);

 			SendDlgItemMessage(hwnd, IDC_TRANS_SLIDER, TBM_SETRANGE, FALSE, MAKELONG(1,255));

@@ -175,7 +170,7 @@ INT_PTR CALLBACK DlgProcPopupAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 				EnableWindow(GetDlgItem(hwnd, IDC_TRANS_PERCENT), how && PopupOptions.UseTransparency);

 				EnableWindow(GetDlgItem(hwnd, IDC_TRANS_OPAQUEONHOVER), how && PopupOptions.UseTransparency);

 			}

-			ShowWindow(GetDlgItem(hwnd, IDC_TRANS), IsWinVer2000Plus() ? SW_SHOW : SW_HIDE);

+			ShowWindow(GetDlgItem(hwnd, IDC_TRANS), SW_SHOW);

 		}

 		//Group: Effects

 		{

@@ -296,11 +291,6 @@ INT_PTR CALLBACK DlgProcPopupAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 				SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);

 				break;

 

-			case IDC_TRANS_9X:

-				PopupOptions.Enable9xTransparency = !PopupOptions.Enable9xTransparency;

-				SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);

-				break;

-

 			case IDC_TRANS:

 				PopupOptions.UseTransparency = !PopupOptions.UseTransparency;

 				{

@@ -515,7 +505,6 @@ INT_PTR CALLBACK DlgProcPopupAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 				//Monitor

 				db_set_b(NULL, MODULNAME, "Monitor", PopupOptions.Monitor);

 				//Transparency

-				db_set_b(NULL, MODULNAME, "EnableRegionTransparency", PopupOptions.Enable9xTransparency);

 				db_set_b(NULL, MODULNAME, "UseTransparency", PopupOptions.UseTransparency);

 				db_set_b(NULL, MODULNAME, "Alpha", PopupOptions.Alpha);

 				db_set_b(NULL, MODULNAME, "OpaqueOnHover", PopupOptions.OpaqueOnHover);

diff --git a/plugins/Popup/src/resource.h b/plugins/Popup/src/resource.h
index 9585f9e793..a2f81a2aec 100644
--- a/plugins/Popup/src/resource.h
+++ b/plugins/Popup/src/resource.h
@@ -66,7 +66,6 @@
 #define IDC_AVT_SIZE_SLIDE              1057

 #define IDC_AVT_SIZE                    1058

 #define IDC_AVT_REQUEST                 1059

-#define IDC_TRANS_9X                    1062

 #define IDC_TRANS                       1063

 #define IDC_TRANS_TXT1                  1064

 #define IDC_TRANS_SLIDER                1065