summaryrefslogtreecommitdiff
path: root/include/delphi/m_clistint.inc
diff options
context:
space:
mode:
Diffstat (limited to 'include/delphi/m_clistint.inc')
-rw-r--r--include/delphi/m_clistint.inc84
1 files changed, 17 insertions, 67 deletions
diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 5645c0e45d..0615f9d7d9 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -20,7 +20,8 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
}
-{$IFDEF M_API_UNIT}
+{$IFNDEF M_CLISTINT}
+{$DEFINE M_CLISTINT}
{Type
P_menuProto = ^_menuProto;
@@ -46,10 +47,6 @@ const
MAX_TIP_SIZE = 2048;
EXTRA_ICON_COUNT = 10;
-function IsHContactGroup (h:TMCONTACT):bool;
-function IsHContactInfo (h:TMCONTACT):bool;
-function IsHContactContact(h:TMCONTACT):bool;
-
const
INTM_NAMECHANGED = WM_USER+10;
INTM_ICONCHANGED = WM_USER+11;
@@ -264,12 +261,6 @@ const
TIM_CALLBACK = WM_USER+1857;
TIM_CREATE = WM_USER+1858;
-function CLCDEFAULT_BKCOLOUR:dword;
-function CLCDEFAULT_TEXTCOLOUR:dword;
-function CLCDEFAULT_SELBKCOLOUR:dword;
-function CLCDEFAULT_SELTEXTCOLOUR:dword;
-function CLCDEFAULT_HOTTEXTCOLOUR:dword;
-
const
{
Miranda 0.4.3.0+
@@ -520,9 +511,10 @@ type
pfnTrayIconRemove : procedure (hwnd:HWND; szProto:PAnsiChar); cdecl;
pfnTrayIconSetBaseInfo : function (hIcon:HICON; szPreferredProto:PAnsiChar):int; cdecl;
pfnTrayIconTaskbarCreated : procedure (hwnd:HWND); cdecl;
- pfnTrayIconUpdate : function (hNewIcon:HICON; szNewTip:TChar; szPreferredProto:PAnsiChar; isBase:int):int; cdecl;
+ pfnTrayIconUpdate : function (hNewIcon:HICON; szNewTip:TChar;
+ szPreferredProto:PAnsiChar; isBase:int):int; cdecl;
- pfnTrayCycleTimerProc : procedure(hwnd:HWND; message:uint; idEvent:uint_ptr; dwTime:dword); stdcall;
+ pfnTrayCycleTimerProc : procedure(hwnd:HWND;message:uint;idEvent:uint_ptr;dwTime:dword); stdcall;
(*************************************************************************************
* version 6 additions (0.8.0.x) - accounts
@@ -530,19 +522,21 @@ type
pfnGetAccountIndexByPos : function (pos:int):int; cdecl;
pfnConvertMenu: function( clitem:PCLISTMENUITEM; moitem:PMO_MenuItem):int; cdecl;
- (*************************************************************************************
- * version 7 additions (0.11.0.x) - extra images
- *************************************************************************************)
+ (*************************************************************************************
+ * version 7 additions (0.11.0.x) - extra images
+ *************************************************************************************)
pfnReloadExtraIcons: procedure; cdecl;
pfnSetAllExtraIcons: procedure(hContact:TMCONTACT); cdecl;
- (*************************************************************************************
- * Miranda NG additions
- *************************************************************************************)
- pfnGetContactIcon: function(hContact:TMCONTACT):int; cdecl;
- pfnTrayCalcChanged:function(szChangedProto:PAnsiChar; averageMode:int; iProtoCount:int):int; cdecl;
- pfnGetAverageMode:function(pNetProtoCount:pint):int; cdecl;
- pfnInitAutoRebuild:procedure(hwnd:HWND); cdecl;
+ (*************************************************************************************
+ * Miranda NG additions
+ *************************************************************************************)
+
+ pfnGetContactIcon :function (hContact:TMCONTACT):int; cdecl;
+ pfnTrayCalcChanged :function (szChangedProto:PAnsiChar; averageMode:int; iProtoCount:int):int; cdecl;
+ pfnGetAverageMode :function (pNetProtoCount:pint):int; cdecl;
+ pfnInitAutoRebuild :procedure(hwnd:HWND); cdecl;
+ pfnSetContactCheckboxes:procedure(cc:PClcContact; checked:int); cdecl;
end;
{
@@ -550,48 +544,4 @@ var
cli : CLIST_INTERFACE;cvar;external;
}
-{$ELSE}
-
-function IsHContactGroup(h:TMCONTACT):bool;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=(h xor HCONTACT_ISGROUP)<(HCONTACT_ISGROUP xor HCONTACT_ISINFO);
-end;
-function IsHContactInfo(h:TMCONTACT):bool;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=(h and HCONTACT_ISINFO)=HCONTACT_ISINFO;
-end;
-function IsHContactContact(h:TMCONTACT):bool;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=(h and HCONTACT_ISGROUP)=0;
-end;
-
-function CLCDEFAULT_BKCOLOUR:dword;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=GetSysColor(COLOR_3DFACE);
-end;
-function CLCDEFAULT_TEXTCOLOUR:dword;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=GetSysColor(COLOR_WINDOWTEXT);
-end;
-function CLCDEFAULT_SELBKCOLOUR:dword;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=GetSysColor(COLOR_HIGHLIGHT);
-end;
-function CLCDEFAULT_SELTEXTCOLOUR:dword;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=GetSysColor(COLOR_HIGHLIGHTTEXT);
-end;
-function CLCDEFAULT_HOTTEXTCOLOUR:dword;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=RGB(0,0,255);
-end;
-
{$ENDIF}