- all icolib services removed;

- IcoLib_* functions are bound directly to the code

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

3 files changed, 9 insertions, 11 deletions

diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
index dbb57e0ad3..29ce01d5f1 100644
--- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp
+++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"

 

-INT_PTR APIChangeLayout(WPARAM wParam, LPARAM lParam)

+INT_PTR APIChangeLayout(WPARAM wParam, LPARAM)

 {

 	BOOL CurrentWord = moOptions.CurrentWordLayout;

 	return ChangeLayout((HWND)wParam, TOT_Layout, CurrentWord);

 }

 

-INT_PTR APIGetLayoutOfText(WPARAM wParam, LPARAM lParam)

+INT_PTR APIGetLayoutOfText(WPARAM, LPARAM lParam)

 {

 	LPTSTR ptszInText = (TCHAR*)lParam;

 	return (INT_PTR)GetLayoutOfText(ptszInText);

@@ -85,15 +85,15 @@ void RegPopupActions()
 	}

 }

 

-int OnIconsChanged(WPARAM wParam, LPARAM lParam)

+int OnIconsChanged(WPARAM, LPARAM)

 {

-	hPopupIcon = Skin_GetIcon("ckl_popup_icon");

-	hCopyIcon = Skin_GetIcon("ckl_copy_icon");

+	hPopupIcon = IcoLib_GetIcon("ckl_popup_icon");

+	hCopyIcon = IcoLib_GetIcon("ckl_copy_icon");

 	RegPopupActions();

 	return 0;

 }

 

-int ModulesLoaded(WPARAM wParam, LPARAM lParam)

+int ModulesLoaded(WPARAM, LPARAM)

 {

 	LPCTSTR ptszEmptySting = _T("");

 

@@ -138,7 +138,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-int OnOptionsInitialise(WPARAM wParam, LPARAM lParam)

+int OnOptionsInitialise(WPARAM wParam, LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = hInst;

diff --git a/plugins/ChangeKeyboardLayout/src/main.cpp b/plugins/ChangeKeyboardLayout/src/main.cpp
index d3b73da55f..4f7c7d452a 100644
--- a/plugins/ChangeKeyboardLayout/src/main.cpp
+++ b/plugins/ChangeKeyboardLayout/src/main.cpp
@@ -32,13 +32,13 @@ LPCTSTR ptszSeparators = _T(" \t\n\r");
 

 HANDLE hOptionsInitialize;

 

-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)

 {

 	hInst = hinstDLL;

 	return TRUE;

 }

 

-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)

 {

 	return &pluginInfoEx;

 }

diff --git a/plugins/ChangeKeyboardLayout/src/stdafx.h b/plugins/ChangeKeyboardLayout/src/stdafx.h
index 1160595f75..6eb9e0fadf 100644
--- a/plugins/ChangeKeyboardLayout/src/stdafx.h
+++ b/plugins/ChangeKeyboardLayout/src/stdafx.h
@@ -1,7 +1,5 @@
 #ifndef M_CKL_COMMONHEADERS_H

 #define M_CKL_COMMONHEADERS_H

-#define _CRT_SECURE_NO_WARNINGS

-#define _CRT_NONSTDC_NO_DEPRECATE

 

 #include <windows.h>

 #include <commctrl.h>