diff options
author | Alexey Kulakov <panda75@bk.ru> | 2012-07-15 06:57:07 +0000 |
---|---|---|
committer | Alexey Kulakov <panda75@bk.ru> | 2012-07-15 06:57:07 +0000 |
commit | 43691e8134fab2a55243607b2047c2fb3f3ee04b (patch) | |
tree | e9b7d336d85eae7190b800cbd93b261e558a49cc /include/delphi | |
parent | dab02845fea8031dd3d7864dc1efc211a434f969 (diff) |
Delphi7 adaptation
git-svn-id: http://svn.miranda-ng.org/main/trunk@976 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include/delphi')
-rw-r--r-- | include/delphi/m_api.pas | 11 | ||||
-rw-r--r-- | include/delphi/m_clistint.inc | 70 | ||||
-rw-r--r-- | include/delphi/testdll.dpr | 1 |
3 files changed, 79 insertions, 3 deletions
diff --git a/include/delphi/m_api.pas b/include/delphi/m_api.pas index 9d04c30ff1..df0069a7ff 100644 --- a/include/delphi/m_api.pas +++ b/include/delphi/m_api.pas @@ -24,11 +24,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. {$IFDEF WIN32}{$A4}{$ENDIF}
{$IFDEF WIN64}{$A8}{$ENDIF}
{$ENDIF}
+{$UNDEF AllowInline}
{$IFDEF FPC}
{$DEFINE AllowInline}
{$ELSE}
- {$IFDEF NativeCode} // Delphi.NET+
- {$DEFINE AllowInline}
+ {$IFDEF ConditionalExpressions}
+ {$IF System.ComiplerVersion >= 22.0}
+ {$DEFINE AllowInline}
+ {$IFEND}
{$ENDIF}
{$ENDIF}
@@ -66,6 +69,10 @@ type {$ENDIF}
long = longint;
plong = ^long;
+ {$IFDEF VER150}
+ UnicodeString = WideString;
+ ULONG_PTR = LongWord;
+ {$ENDIF}
DWORD_PTR = ULONG_PTR;
size_t = ULONG_PTR;
{$ENDIF}
diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc index 4bc4b97e37..8d312d31e6 100644 --- a/include/delphi/m_clistint.inc +++ b/include/delphi/m_clistint.inc @@ -127,6 +127,76 @@ type colour : COLORREF;
end;
+type
+ tCLCCB = record
+ case boolean of
+ false: (
+ iImage:word;
+ hContact:THANDLE);
+ true : (
+ groupId:word;
+ group :pClcGroup;);
+ end;
+ pClcContactBase = ^tClcContactBase;
+ tClcContactBase = record
+ _type :byte;
+ flags :byte;
+ data :tCLCCB;
+ iExtraImage:array [0..MAXEXTRACOLUMNS-1] of byte;
+ szText :array [0..120-MAXEXTRACOLUMNS-1] of WideChar;
+ proto :pAnsiChar; // MS_PROTO_GETBASEPROTO
+ end;
+
+type
+ pClcDataBase = ^tClcDataBase;
+ tClcDataBase = record
+ list :ClcGroup;
+ rowHeight :int;
+ yScroll :int;
+ selection :int;
+ fontInfo :array [0..FONTID_MAX] of ClcFontInfo;
+ scrollTime :int;
+ himlHighlight :THANDLE; // HIMAGELIST in CommCtrl
+ groupIndent :int;
+ szQuickSearch :array [0..127] of WideChar;
+ iconXSpace :int;
+ hwndRenameEdit :HWND;
+ bkColour,
+ selBkColour,
+ selTextColour,
+ hotTextColour,
+ quickSearchColour :TCOLORREF;
+ iDragItem,
+ iInsertionMark :int;
+ dragStage :int;
+ ptDragStart :TPOINT;
+ dragAutoScrolling :int;
+ dragAutoScrollHeight :int;
+ leftMargin :int;
+ insertionMarkHitHeight:int;
+ hBmpBackground :HBITMAP;
+ backgroundBmpUse,
+ bkChanged :int;
+ iHotTrack :int;
+ gammaCorrection :int;
+ greyoutFlags :dword; // see m_clc.h
+ offlineModes :dword;
+ exStyle :dword;
+ ptInfoTip :TPOINT;
+ infoTipTimeout :int;
+ hInfoTipItem :THANDLE;
+ himlExtraColumns :THANDLE; // HIMAGELIST in CommCtrl
+ extraColumnsCount :int;
+ extraColumnSpacing :int;
+ checkboxSize :int;
+ showSelAlways :int;
+ showIdle :int;
+ noVScrollbar :int;
+ useWindowsColours :int;
+ needsResort :int;
+ filterSearch :int;
+ end;
+
PtrayIconInfo_t = ^trayIconInfo_t;
trayIconInfo_t = record
id : int;
diff --git a/include/delphi/testdll.dpr b/include/delphi/testdll.dpr index f30da207ec..972442dced 100644 --- a/include/delphi/testdll.dpr +++ b/include/delphi/testdll.dpr @@ -18,7 +18,6 @@ begin PluginInfo.copyright :='(c) 2003 J. Random Hacker';
PluginInfo.homepage :='http://miranda-icq.sourceforge.net/';
PluginInfo.flags :=UNICODE_AWARE;
- PluginInfo.replacesDefaultModule:=0;
PluginInfo.uuid :=MIID_TESTPLUGIN;//'{08B86253-EC6E-4d09-B7A9-64ACDF0627B8}';
end;
|