- 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, 19 insertions, 19 deletions

diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp
index 7799f7a0c4..a19ad4f3da 100644
--- a/plugins/NotesAndReminders/src/main.cpp
+++ b/plugins/NotesAndReminders/src/main.cpp
@@ -279,7 +279,7 @@ extern "C" __declspec(dllexport) int Unload(void)
 

 	UnhookEvent(hkOptInit);

 

-	Skin_ReleaseIcon(g_hReminderIcon);

+	IcoLib_ReleaseIcon(g_hReminderIcon);

 	DeleteObject(hBodyFont);

 	DeleteObject(hCaptionFont);

 

diff --git a/plugins/NotesAndReminders/src/notes.cpp b/plugins/NotesAndReminders/src/notes.cpp
index c01e247659..5b9500ced6 100644
--- a/plugins/NotesAndReminders/src/notes.cpp
+++ b/plugins/NotesAndReminders/src/notes.cpp
@@ -1296,19 +1296,19 @@ INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM l
 			if (g_ShowNoteButtons) {
 				HICON hcIcon;
 				if (SN->OnTop)
-					hcIcon = Skin_GetIconByHandle(iconList[4].hIcolib);
+					hcIcon = IcoLib_GetIconByHandle(iconList[4].hIcolib);
 				else
-					hcIcon = Skin_GetIconByHandle(iconList[7].hIcolib);
+					hcIcon = IcoLib_GetIconByHandle(iconList[7].hIcolib);
 				DrawIcon(hdc, wr.right - wr.left - 16, 0 + 3, hcIcon);
-				Skin_ReleaseIcon(hcIcon);
+				IcoLib_ReleaseIcon(hcIcon);
 
-				hcIcon = Skin_GetIconByHandle(iconList[9].hIcolib);
+				hcIcon = IcoLib_GetIconByHandle(iconList[9].hIcolib);
 				DrawIcon(hdc, wr.right - wr.left - 32, 1 + 3, hcIcon);
-				Skin_ReleaseIcon(hcIcon);
+				IcoLib_ReleaseIcon(hcIcon);
 
-				hcIcon = Skin_GetIconByHandle(iconList[8].hIcolib);
+				hcIcon = IcoLib_GetIconByHandle(iconList[8].hIcolib);
 				DrawIcon(hdc, wr.right - wr.left - 48, 1 + 3, hcIcon);
-				Skin_ReleaseIcon(hcIcon);
+				IcoLib_ReleaseIcon(hcIcon);
 			}
 
 			if (wParam && wParam != 1)
@@ -1926,9 +1926,9 @@ INT_PTR CALLBACK DlgProcViewNotes(HWND Dialog,UINT Message,WPARAM wParam,LPARAM
 		{
 			HWND H;
 
-			HICON hIcon = Skin_GetIconByHandle(iconList[13].hIcolib, ICON_SMALL);
+			HICON hIcon = IcoLib_GetIconByHandle(iconList[13].hIcolib, ICON_SMALL);
 			SendMessage(Dialog, WM_SETICON, (WPARAM)ICON_SMALL, (LPARAM)hIcon);
-			hIcon = Skin_GetIconByHandle(iconList[13].hIcolib, ICON_BIG);
+			hIcon = IcoLib_GetIconByHandle(iconList[13].hIcolib, ICON_BIG);
 			SendMessage(Dialog, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hIcon);
 
 			SetWindowText(Dialog, LPGENT("Notes"));
@@ -1987,8 +1987,8 @@ INT_PTR CALLBACK DlgProcViewNotes(HWND Dialog,UINT Message,WPARAM wParam,LPARAM
 
 	case WM_DESTROY:
 		ListNotesVisible = FALSE;
-		Skin_ReleaseIcon((HICON)SendMessage(Dialog, WM_SETICON, ICON_BIG, 0));
-		Skin_ReleaseIcon((HICON)SendMessage(Dialog, WM_SETICON, ICON_SMALL, 0));
+		IcoLib_ReleaseIcon((HICON)SendMessage(Dialog, WM_SETICON, ICON_BIG, 0));
+		IcoLib_ReleaseIcon((HICON)SendMessage(Dialog, WM_SETICON, ICON_SMALL, 0));
 		return TRUE;
 
 	case WM_NOTIFY:
diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp
index f80376d434..71c6e76902 100644
--- a/plugins/NotesAndReminders/src/options.cpp
+++ b/plugins/NotesAndReminders/src/options.cpp
@@ -582,7 +582,7 @@ void InitSettings(void)
 

 	InitFonts();

 

-	g_hReminderIcon = Skin_GetIconByHandle(iconList[10].hIcolib);

+	g_hReminderIcon = IcoLib_GetIconByHandle(iconList[10].hIcolib);

 

 	if (g_Transparency < MIN_ALPHA)

 		g_Transparency = MIN_ALPHA;

diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp
index 7f743492cd..28ca688fe7 100644
--- a/plugins/NotesAndReminders/src/reminders.cpp
+++ b/plugins/NotesAndReminders/src/reminders.cpp
@@ -2024,7 +2024,7 @@ INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARA
 				}

 			}

 

-			hIcon = Skin_GetIconByHandle(iconList[12].hIcolib);

+			hIcon = IcoLib_GetIconByHandle(iconList[12].hIcolib);

 			SendDlgItemMessage(Dialog,IDC_BTN_PLAYSOUND,BM_SETIMAGE,(WPARAM)IMAGE_ICON,(LPARAM)hIcon);

 

 			if (NewReminderVisible == 2 && pEditReminder->SoundSel)

@@ -2214,7 +2214,7 @@ INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARA
 		}

 	case WM_DESTROY:

 		{

-			Skin_ReleaseIcon(hIcon);

+			IcoLib_ReleaseIcon(hIcon);

 			break;

 		}

 	}

@@ -2412,9 +2412,9 @@ INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPA
 		break;

 	case WM_INITDIALOG:

 		{

-			HICON hIcon = Skin_GetIconByHandle(iconList[6].hIcolib, ICON_SMALL);

+			HICON hIcon = IcoLib_GetIconByHandle(iconList[6].hIcolib, ICON_SMALL);

 			SendMessage(Dialog, WM_SETICON, (WPARAM)ICON_SMALL, (LPARAM)hIcon);

-			hIcon = Skin_GetIconByHandle(iconList[6].hIcolib, ICON_BIG);

+			hIcon = IcoLib_GetIconByHandle(iconList[6].hIcolib, ICON_BIG);

 			SendMessage(Dialog, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hIcon);

 

 			TranslateDialogDefault(Dialog);

@@ -2556,8 +2556,8 @@ INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPA
 			}

 		}

 	case WM_DESTROY:

-		Skin_ReleaseIcon((HICON)SendMessage(Dialog, WM_SETICON, ICON_BIG, 0));

-		Skin_ReleaseIcon((HICON)SendMessage(Dialog, WM_SETICON, ICON_SMALL, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(Dialog, WM_SETICON, ICON_BIG, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(Dialog, WM_SETICON, ICON_SMALL, 0));

 		break;

 	}

 	return FALSE;