- 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

4 files changed, 10 insertions, 10 deletions

diff --git a/protocols/Tox/src/tox_icons.cpp b/protocols/Tox/src/tox_icons.cpp
index 10a228c626..7a56fce4c8 100644
--- a/protocols/Tox/src/tox_icons.cpp
+++ b/protocols/Tox/src/tox_icons.cpp
@@ -30,7 +30,7 @@ void CToxProto::InitIcons()
 

 		sid.description.t = Icons[i].Description;

 		sid.iDefaultIndex = -Icons[i].IconId;

-		Icons[i].Handle = Skin_AddIcon(&sid);

+		Icons[i].Handle = IcoLib_AddIcon(&sid);

 	}

 }

 

@@ -38,7 +38,7 @@ HICON CToxProto::GetIcon(const char *name, int size)
 {

 	for (size_t i = 0; i < SIZEOF(Icons); i++)

 		if (mir_strcmpi(Icons[i].Name, name) == 0)

-			return Skin_GetIconByHandle(Icons[i].Handle, size);

+			return IcoLib_GetIconByHandle(Icons[i].Handle, size);

 

 	return NULL;

 }

@@ -56,7 +56,7 @@ HANDLE CToxProto::GetSkinIconHandle(const char *name)
 {

 	char iconName[100];

 	mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, name);

-	HANDLE hIcon = Skin_GetIconHandle(iconName);

+	HANDLE hIcon = IcoLib_GetIconHandle(iconName);

 	if (hIcon == NULL)

 		hIcon = GetIconHandle(name);

 

@@ -66,5 +66,5 @@ HANDLE CToxProto::GetSkinIconHandle(const char *name)
 void CToxProto::UninitIcons()

 {

 	for (size_t i = 0; i < SIZEOF(Icons); i++)

-		Skin_RemoveIcon(Icons[i].Name);

+		IcoLib_RemoveIcon(Icons[i].Name);

 }
\ No newline at end of file
diff --git a/protocols/Tox/src/tox_multimedia.cpp b/protocols/Tox/src/tox_multimedia.cpp
index ff55177d1a..c9c9eb8246 100644
--- a/protocols/Tox/src/tox_multimedia.cpp
+++ b/protocols/Tox/src/tox_multimedia.cpp
@@ -28,8 +28,8 @@ void CToxCallDlgBase::SetIcon(const char *name)
 {

 	char iconName[100];

 	mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, name);

-	SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIcon(iconName, 16));

-	SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIcon(iconName, 32));

+	SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIcon(iconName, 16));

+	SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon(iconName, 32));

 }

 

 void CToxCallDlgBase::SetTitle(const TCHAR *title)

@@ -314,7 +314,7 @@ INT_PTR CToxProto::OnRecvAudioCall(WPARAM hContact, LPARAM lParam)
 	cle.hContact = hContact;

 	cle.hDbEvent = hEvent;

 	cle.lParam = DB_EVENT_CALL;

-	cle.hIcon = Skin_GetIconByHandle(GetIconHandle("audio_ring"));

+	cle.hIcon = IcoLib_GetIconByHandle(GetIconHandle("audio_ring"));

 

 	TCHAR szTooltip[MAX_PATH];

 	mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("Incoming call from %s"), pcli->pfnGetContactDisplayName(hContact, 0));

diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp
index 1e5d270231..85af8ca960 100644
--- a/protocols/Tox/src/tox_options.cpp
+++ b/protocols/Tox/src/tox_options.cpp
@@ -376,9 +376,9 @@ void CToxOptionsNodeList::OnInitDialog()
 

 	HIMAGELIST hImageList = m_nodes.CreateImageList(LVSIL_SMALL);

 	HICON icon = LoadSkinnedIcon(SKINICON_OTHER_TYPING);

-	ImageList_AddIcon(hImageList, icon); Skin_ReleaseIcon(icon);

+	ImageList_AddIcon(hImageList, icon); IcoLib_ReleaseIcon(icon);

 	icon = LoadSkinnedIcon(SKINICON_OTHER_DELETE);

-	ImageList_AddIcon(hImageList, icon); Skin_ReleaseIcon(icon);

+	ImageList_AddIcon(hImageList, icon); IcoLib_ReleaseIcon(icon);

 

 	m_nodes.AddColumn(0, _T("IPv4"), 100);

 	m_nodes.AddColumn(1, _T("IPv6"), 100);

diff --git a/protocols/Tox/src/tox_utils.cpp b/protocols/Tox/src/tox_utils.cpp
index ccacbc0422..b0f2b46b18 100644
--- a/protocols/Tox/src/tox_utils.cpp
+++ b/protocols/Tox/src/tox_utils.cpp
@@ -46,7 +46,7 @@ void CToxProto::ShowNotification(const TCHAR *caption, const TCHAR *message, int
 		ppd.lchContact = hContact;

 		wcsncpy(ppd.lpwzContactName, caption, MAX_CONTACTNAME);

 		wcsncpy(ppd.lpwzText, message, MAX_SECONDLINE);

-		ppd.lchIcon = Skin_GetIcon("Tox_main");

+		ppd.lchIcon = IcoLib_GetIcon("Tox_main");

 

 		if (!PUAddPopupT(&ppd))

 			return;