From d83baeb842ea828eaee90a0cd6575872a95240e8 Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Sat, 8 Mar 2014 13:10:05 +0000 Subject: Pascal-style type correction Letter case correction small fixes Actman UA part dialog slightly changed git-svn-id: http://svn.miranda-ng.org/main/trunk@8473 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Watrack/kolframe/frm_dlg1.inc | 5 +++-- plugins/Watrack/kolframe/frm_dlg2.inc | 2 +- plugins/Watrack/kolframe/frm_frame.inc | 2 +- plugins/Watrack/kolframe/frm_trackbar.inc | 4 ++-- plugins/Watrack/kolframe/i_bitmap.inc | 2 +- plugins/Watrack/kolframe/kolframe.pas | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) (limited to 'plugins/Watrack/kolframe') diff --git a/plugins/Watrack/kolframe/frm_dlg1.inc b/plugins/Watrack/kolframe/frm_dlg1.inc index 401e04536d..8759ac059c 100644 --- a/plugins/Watrack/kolframe/frm_dlg1.inc +++ b/plugins/Watrack/kolframe/frm_dlg1.inc @@ -19,7 +19,7 @@ begin move(buf,result^,size); end; -procedure SwitchBk(Dialog:hwnd); +procedure SwitchBk(Dialog:HWND); var en:boolean; begin @@ -38,7 +38,7 @@ begin EnableWindow(GetDlgItem(Dialog,IDC_USECOVER ),en); end; -function FrameViewDlg(Dialog:HWnd; hMessage,wParam,lParam:DWord):integer; stdcall; +function FrameViewDlg(Dialog:HWND; hMessage:uint; wParam:WPARAM; lParam:LPARAM):LRESULT; stdcall; const DlgInited:boolean=false; var @@ -201,6 +201,7 @@ begin buf1^:=#0; buf:=GetDlgText(Dialog,IDC_FRMBKPIC,true); PathToRelative(buf,buf1); +// CallService(MS_UTILS_PATHTORELATIVE,twparam(buf),tlparam(buf1)); if StrCmp(buf1,D.BkDefFile)<>0 then begin mFreeMem(D.BkDefFile); diff --git a/plugins/Watrack/kolframe/frm_dlg2.inc b/plugins/Watrack/kolframe/frm_dlg2.inc index 6325e05fcd..8f539c9dcb 100644 --- a/plugins/Watrack/kolframe/frm_dlg2.inc +++ b/plugins/Watrack/kolframe/frm_dlg2.inc @@ -2,7 +2,7 @@ const MaxTxtScrollSpeed = 20; -function FrameTextDlg(Dialog:HWnd; hMessage,wParam,lParam:DWord):integer; stdcall; +function FrameTextDlg(Dialog:HWND; hMessage:uint; wParam:WPARAM; lParam:LPARAM):LRESULT; stdcall; const DlgInited :boolean=false; TemplateChanged:Boolean=false; diff --git a/plugins/Watrack/kolframe/frm_frame.inc b/plugins/Watrack/kolframe/frm_frame.inc index 8911f868c4..b1e6d9e262 100644 --- a/plugins/Watrack/kolframe/frm_frame.inc +++ b/plugins/Watrack/kolframe/frm_frame.inc @@ -3,7 +3,7 @@ const WS_EX_LAYERED = $00080000; -function SetLayeredWindowAttributes(Hwnd: THandle; crKey: COLORREF; bAlpha: Byte; dwFlags: DWORD): Boolean; stdcall; +function SetLayeredWindowAttributes(Hwnd: THANDLE; crKey: COLORREF; bAlpha: byte; dwFlags: dword): Boolean; stdcall; external user32 name 'SetLayeredWindowAttributes'; const diff --git a/plugins/Watrack/kolframe/frm_trackbar.inc b/plugins/Watrack/kolframe/frm_trackbar.inc index eb9ad5c285..0f24c83c54 100644 --- a/plugins/Watrack/kolframe/frm_trackbar.inc +++ b/plugins/Watrack/kolframe/frm_trackbar.inc @@ -10,7 +10,7 @@ type procedure CtrlResize(Sender: PObj); procedure Erase(Sender: PControl; DC: HDC); procedure Paint(Sender: PControl; DC: HDC); - procedure Scroll(Sender:PTrackbar; Code:Integer); + procedure Scroll(Sender:PTrackbar; Code:integer); procedure PressButton (Sender: PControl;var Mouse: TMouseEventData); procedure UnPressButton(Sender: PControl;var Mouse: TMouseEventData); procedure DragButton (Sender: PControl;var Mouse: TMouseEventData); @@ -129,7 +129,7 @@ begin end; end; -procedure tAWKTrackbar.Scroll(Sender:PTrackbar; Code:Integer); +procedure tAWKTrackbar.Scroll(Sender:PTrackbar; Code:integer); begin if code=TB_ENDTRACK then begin diff --git a/plugins/Watrack/kolframe/i_bitmap.inc b/plugins/Watrack/kolframe/i_bitmap.inc index bee15fdda7..a34d897fbd 100644 --- a/plugins/Watrack/kolframe/i_bitmap.inc +++ b/plugins/Watrack/kolframe/i_bitmap.inc @@ -121,7 +121,7 @@ end; procedure PreMultiplyChanells(hbmp:HBITMAP); type - tPixel=array [0..3] of Byte; + tPixel=array [0..3] of byte; var bmp:windows.TBITMAP; flag:bool; diff --git a/plugins/Watrack/kolframe/kolframe.pas b/plugins/Watrack/kolframe/kolframe.pas index 27fe7dde26..8120e34f0e 100644 --- a/plugins/Watrack/kolframe/kolframe.pas +++ b/plugins/Watrack/kolframe/kolframe.pas @@ -105,7 +105,7 @@ begin case wParam of WAT_EVENT_PLAYERSTATUS: begin - case Integer(loword(lParam)) of + case integer(loword(lParam)) of WAT_PLS_NORMAL : exit; WAT_PLS_NOMUSIC : begin if D.HideNoMusic then @@ -231,7 +231,7 @@ end; procedure DestroyFrame; var - id:Integer; + id:integer; begin if (FrameCtrl<>nil) and (PWATFrameData(FrameCtrl.CustomData).FrameId>=0) then begin -- cgit v1.2.3