From 402a9893b490b7865ab8bdc63791019a04993a23 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 12 Apr 2019 11:25:11 +0300 Subject: strange unused shit removed --- include/delphi/m_api.pas | 1 - include/delphi/m_helpers.inc | 31 ---------------- include/delphi/m_iconheader.inc | 54 ---------------------------- include/m_iconheader.h | 79 ----------------------------------------- 4 files changed, 165 deletions(-) delete mode 100644 include/delphi/m_iconheader.inc delete mode 100644 include/m_iconheader.h (limited to 'include') diff --git a/include/delphi/m_api.pas b/include/delphi/m_api.pas index 66cefac276..5500263fca 100644 --- a/include/delphi/m_api.pas +++ b/include/delphi/m_api.pas @@ -219,7 +219,6 @@ var {$include m_history.inc} {$include m_hotkeys.inc} {$include m_icolib.inc} - {$include m_iconheader.inc} {$include m_ignore.inc} {$include m_imgsrvc.inc} {$include m_json.inc} diff --git a/include/delphi/m_helpers.inc b/include/delphi/m_helpers.inc index 1b1d95c378..d240073501 100644 --- a/include/delphi/m_helpers.inc +++ b/include/delphi/m_helpers.inc @@ -57,9 +57,6 @@ function TopToolbar_AddButton(pButton:PTTBButton):THANDLE; function Options_Open(group,page,tab:PWideChar):int_ptr; -procedure MIcoTab_AddItem (hwnd:HWND; lptzName:PAnsiChar; hIcon:HICON; data:LPARAM; bSharedIcon:bool); -procedure MIcoTab_AddItemW(hwnd:HWND; lptzName:PWideChar; hIcon:HICON; data:LPARAM; bSharedIcon:bool); - {$ELSE} function _Srmm_AddButton(bbdi:pBBButton; pPlugin:Pointer) : integer; stdcall; @@ -335,34 +332,6 @@ begin result:=_Options_Open(group,page,tab,@g_plugin); end; -procedure MIcoTab_AddItem(hwnd:HWND; lptzName:PAnsiChar; hIcon:HICON; data:LPARAM; bSharedIcon:bool); -var - mit:tMIcoTab; -begin - if bSharedIcon then - mit.flag := MITCF_SHAREDICON - else - mit.flag := 0; - mit.hIcon := hIcon; - mit.szName.a := lptzName; - mit.data := data; - SendMessage(hwnd, ITCM_ADDITEM, WPARAM(@mit), 0); -end; - -procedure MIcoTab_AddItemW(hwnd:HWND; lptzName:PWideChar; hIcon:HICON; data:LPARAM; bSharedIcon:bool); -var - mit:tMIcoTab; -begin - if bSharedIcon then - mit.flag := MITCF_SHAREDICON or MITCF_UNICODE - else - mit.flag := MITCF_UNICODE; - mit.hIcon := hIcon; - mit.szName.w := lptzName; - mit.data := data; - SendMessage(hwnd, ITCM_ADDITEM, WPARAM(@mit), 0); -end; - procedure Srmm_AddButton(bbdi:pBBButton); begin _Srmm_AddButton(bbdi,@g_plugin); diff --git a/include/delphi/m_iconheader.inc b/include/delphi/m_iconheader.inc deleted file mode 100644 index ad1633d6b6..0000000000 --- a/include/delphi/m_iconheader.inc +++ /dev/null @@ -1,54 +0,0 @@ -{ -Miranda IM: the free IM client for Microsoft* Windows* - -Copyright 2007 Artem Shpynov -Copyright 2000-2007 Miranda ICQ/IM project, - -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -} - -{$IFNDEF M_ICONHEADER} -{$DEFINE M_ICONHEADER} - -const - MIRANDAICOTABCLASS = 'MirandaIcoTabClass'; - - MITCF_SHAREDICON = $01; - MITCF_UNICODE = $02; - - ITCM_FIRST = (WM_USER+1024); - ITCM_LAST = (ITCM_FIRST+64); - - ITCM_SETBACKGROUND = (ITCM_FIRST+1); //LPARAM is HBITMAP - ITCM_ADDITEM = (ITCM_FIRST+2); //LPARAM is pointer to MIcoTab - ITCM_SETSEL = (ITCM_FIRST+3); //WPARAM is new selected index - ITCM_GETSEL = (ITCM_FIRST+4); //result is selected item index - ITCM_GETITEMDATA = (ITCM_FIRST+5); //WPARAM is item index, result is custom data - - ITCN_SELCHANGED = 1; - ITCN_SELCHANGEDKBD = 2; -// structure is used for storing info about single tab -type - TMIcoTab = record - hIcon :HICON; - szName:TChar; - flag :dword; - data :LPARAM; - end; - -{$ENDIF} diff --git a/include/m_iconheader.h b/include/m_iconheader.h deleted file mode 100644 index 48355c2ef5..0000000000 --- a/include/m_iconheader.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - -Miranda NG: the free IM client for Microsoft* Windows* - -Copyright (C) 2012-19 Miranda NG team (https://miranda-ng.org) -Copyright (c) 2000-2007 Miranda ICQ/IM project, -Copyright (c) 2007 Artem Shpynov - -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#ifndef M_ICONHEADER_H__ -#define M_ICONHEADER_H__ 1 - -#define MIRANDAICOTABCLASS L"MirandaIcoTabClass" - -#define MITCF_SHAREDICON 0x01 -#define MITCF_UNICODE 0x02 - -#define ITCM_FIRST (WM_USER+1024) -#define ITCM_LAST (ITCM_FIRST+64) - -#define ITCM_SETBACKGROUND (ITCM_FIRST+1) //LPARAM is HBITMAP -#define ITCM_ADDITEM (ITCM_FIRST+2) //LPARAM is pointer to MIcoTab -#define ITCM_SETSEL (ITCM_FIRST+3) //WPARAM is new selected index -#define ITCM_GETSEL (ITCM_FIRST+4) //result is selected item index -#define ITCM_GETITEMDATA (ITCM_FIRST+5) //WPARAM is item index, result is custom data - -#define ITCN_SELCHANGED 1 -#define ITCN_SELCHANGEDKBD 2 - -// structure is used for storing info about single tab -typedef struct { - HICON hIcon; - union { - wchar_t *tcsName; - wchar_t *lptzName; - char *lpzName; - wchar_t *lpwzName; - }; - DWORD flag; - LPARAM data; -} MIcoTab; - -#define MIcoTab_SetBackground(hwnd, hBmp) \ - (SendMessage((hwnd), ITCM_SETBACKGROUND, 0, (LPARAM)(hBmp))) -#define MIcoTab_SetSel(hwnd, idx) \ - (SendMessage((hwnd), ITCM_SETSEL, (idx), 0)) -#define MIcoTab_GetSel(hwnd) \ - (SendMessage((hwnd), ITCM_GETSEL, 0, 0)) -#define MIcoTab_GetItemData(hwnd, idx) \ - (SendMessage((hwnd), ITCM_GETITEMDATA, (idx), 0)) - -static __forceinline void MIcoTab_AddItem(HWND hwnd, wchar_t *lptzName, HICON hIcon, LPARAM data, BOOL bSharedIcon) -{ - MIcoTab mit = {0}; - mit.flag = (bSharedIcon?MITCF_SHAREDICON:0)| MITCF_UNICODE; - mit.hIcon = hIcon; - mit.tcsName = lptzName; - mit.data = data; - SendMessage(hwnd, ITCM_ADDITEM, (WPARAM)&mit, 0); -} - -#endif // M_ICONHEADER_H__ -- cgit v1.2.3