diff options
author | George Hazan <george.hazan@gmail.com> | 2015-06-14 13:17:26 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-06-14 13:17:26 +0000 |
commit | 02ed4455c23e3562d71bfc80a0e2c4fede8708f1 (patch) | |
tree | 115a3d24e4a3877cd28bd4ff2d9d4011b790cc5f /plugins/BasicHistory | |
parent | c72584d6b934b37dbd18d5f15ffb24a140e1e3f2 (diff) |
- 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
Diffstat (limited to 'plugins/BasicHistory')
-rw-r--r-- | plugins/BasicHistory/src/BasicHistory.cpp | 2 | ||||
-rw-r--r-- | plugins/BasicHistory/src/HistoryWindow.cpp | 16 | ||||
-rw-r--r-- | plugins/BasicHistory/src/RichHtmlExport.cpp | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index b6958e13e2..d38915caec 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -189,7 +189,7 @@ HICON LoadIconEx(int iconId, int big) {
for (int i=0; i < SIZEOF(iconList); i++)
if ( iconList[i].defIconID == iconId)
- return Skin_GetIconByHandle(iconList[i].hIcolib, big);
+ return IcoLib_GetIconByHandle(iconList[i].hIcolib, big);
return 0;
}
diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp index 5c18fcf4a5..2b3a9bd1b4 100644 --- a/plugins/BasicHistory/src/HistoryWindow.cpp +++ b/plugins/BasicHistory/src/HistoryWindow.cpp @@ -82,22 +82,22 @@ HistoryWindow::~HistoryWindow() {
for (int i = 0; i < iconsNum; ++i)
if (eventIcons[i] != NULL)
- Skin_ReleaseIcon(eventIcons[i]);
+ IcoLib_ReleaseIcon(eventIcons[i]);
delete[] eventIcons;
}
if (plusIco != NULL)
- Skin_ReleaseIcon(plusIco);
+ IcoLib_ReleaseIcon(plusIco);
if (minusIco != NULL)
- Skin_ReleaseIcon(minusIco);
+ IcoLib_ReleaseIcon(minusIco);
if (findNextIco != NULL)
- Skin_ReleaseIcon(findNextIco);
+ IcoLib_ReleaseIcon(findNextIco);
if (findPrevIco != NULL)
- Skin_ReleaseIcon(findPrevIco);
+ IcoLib_ReleaseIcon(findPrevIco);
if (himlSmall != NULL)
ImageList_Destroy(himlSmall);
@@ -1117,7 +1117,7 @@ void HistoryWindow::Initialise() allIconNumber = iconsNum + 3;
eventIcons = new HICON[allIconNumber];
for (int i = 0; i < iconsNum; ++i) {
- eventIcons[i] = Skin_GetIconByHandle( iconList[i].hIcolib );
+ eventIcons[i] = IcoLib_GetIconByHandle( iconList[i].hIcolib );
ImageList_AddIcon(himlSmall, eventIcons[i]);
}
@@ -1198,10 +1198,10 @@ void HistoryWindow::Initialise() void HistoryWindow::Destroy()
{
HICON hIcon = (HICON)SendMessage(hWnd, WM_SETICON, ICON_BIG, 0);
- Skin_ReleaseIcon(hIcon);
+ IcoLib_ReleaseIcon(hIcon);
hIcon = (HICON)SendMessage(hWnd, WM_SETICON, ICON_SMALL, 0);
- Skin_ReleaseIcon(hIcon);
+ IcoLib_ReleaseIcon(hIcon);
isDestroyed = true;
HistoryWindow::Close(this);
diff --git a/plugins/BasicHistory/src/RichHtmlExport.cpp b/plugins/BasicHistory/src/RichHtmlExport.cpp index c3c0cefbc2..2ffda4d7e3 100644 --- a/plugins/BasicHistory/src/RichHtmlExport.cpp +++ b/plugins/BasicHistory/src/RichHtmlExport.cpp @@ -299,19 +299,19 @@ void RichHtmlExport::WriteHeader(const std::wstring &fileName, const std::wstrin HICON ico = LoadIconEx(IDI_PLUSEX);
IcoSave(folder + _T("\\pnode.ico"), ico);
- Skin_ReleaseIcon(ico);
+ IcoLib_ReleaseIcon(ico);
ico = LoadIconEx(IDI_MINUSEX);
IcoSave(folder + _T("\\mnode.ico"), ico);
- Skin_ReleaseIcon(ico);
+ IcoLib_ReleaseIcon(ico);
ico = LoadIconEx(IDI_INM);
IcoSave(folder + _T("\\event0.ico"), ico);
- Skin_ReleaseIcon(ico);
+ IcoLib_ReleaseIcon(ico);
ico = LoadIconEx(IDI_OUTM);
IcoSave(folder + _T("\\event1.ico"), ico);
- Skin_ReleaseIcon(ico);
+ IcoLib_ReleaseIcon(ico);
EXP_FILE << _T("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n");
EXP_FILE << _T("<html><head>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=") << encoding << _T("\">\n");
|