From 8dc11afcc55fe32c3042fe41091dae639fd90bc5 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Dec 2012 15:13:43 +0000 Subject: reverted styles back to DWORD due to VCL restrictions git-svn-id: http://svn.miranda-ng.org/main/trunk@2713 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/HistoryPlusPlus/HistoryGrid.pas | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/HistoryPlusPlus') diff --git a/plugins/HistoryPlusPlus/HistoryGrid.pas b/plugins/HistoryPlusPlus/HistoryGrid.pas index 9eb53aa851..3cc5cee89c 100644 --- a/plugins/HistoryPlusPlus/HistoryGrid.pas +++ b/plugins/HistoryPlusPlus/HistoryGrid.pas @@ -5192,7 +5192,7 @@ end; procedure THistoryGrid.SetRichRTL(RTL: Boolean; RichEdit: THPPRichEdit; ProcessTag: Boolean = True); var pf: PARAFORMAT2; - ExStyle: uint_ptr; + ExStyle: DWORD; begin // we use RichEdit.Tag here to save previous RTL state to prevent from // reapplying same state, because SetRichRTL is called VERY OFTEN @@ -5202,7 +5202,7 @@ begin ZeroMemory(@pf, SizeOf(pf)); pf.cbSize := SizeOf(pf); pf.dwMask := PFM_RTLPARA; - ExStyle := uint_ptr(GetWindowLongPtr(RichEdit.Handle, GWL_EXSTYLE)) and + ExStyle := DWORD(GetWindowLongPtr(RichEdit.Handle, GWL_EXSTYLE)) and not(WS_EX_RTLREADING or WS_EX_LEFTSCROLLBAR or WS_EX_RIGHT or WS_EX_LEFT); if RTL then begin @@ -5864,15 +5864,15 @@ end; procedure THistoryGrid.SetBorderStyle(Value: TBorderStyle); var - Style, ExStyle: uint_ptr; + Style, ExStyle: DWORD; begin if FBorderStyle = Value then exit; FBorderStyle := Value; if HandleAllocated then begin - Style := uint_ptr(GetWindowLongPtr(Handle, GWL_STYLE)) and WS_BORDER; - ExStyle := uint_ptr(GetWindowLongPtr(Handle, GWL_EXSTYLE)) and not WS_EX_CLIENTEDGE; + Style := DWORD(GetWindowLongPtr(Handle, GWL_STYLE)) and WS_BORDER; + ExStyle := DWORD(GetWindowLongPtr(Handle, GWL_EXSTYLE)) and not WS_EX_CLIENTEDGE; if Ctl3D and NewStyleControls and (FBorderStyle = bsSingle) then begin Style := Style and not WS_BORDER; @@ -5885,12 +5885,12 @@ end; procedure THistoryGrid.CMBiDiModeChanged(var Message: TMessage); var - ExStyle: uint_ptr; + ExStyle: DWORD; begin // inherited; if HandleAllocated then begin - ExStyle := uint_ptr(GetWindowLongPtr(Handle, GWL_EXSTYLE)) and + ExStyle := DWORD(GetWindowLongPtr(Handle, GWL_EXSTYLE)) and not(WS_EX_RTLREADING or WS_EX_LEFTSCROLLBAR or WS_EX_RIGHT or WS_EX_LEFT); AddBiDiModeExStyle(ExStyle); SetWindowLongPtr(Handle, GWL_EXSTYLE, ExStyle); @@ -5899,12 +5899,12 @@ end; procedure THistoryGrid.CMCtl3DChanged(var Message: TMessage); var - Style, ExStyle: uint_ptr; + Style, ExStyle: DWORD; begin if HandleAllocated then begin - Style := uint_ptr(GetWindowLongPtr(Handle, GWL_STYLE)) and WS_BORDER; - ExStyle := uint_ptr(GetWindowLongPtr(Handle, GWL_EXSTYLE)) and not WS_EX_CLIENTEDGE; + Style := DWORD(GetWindowLongPtr(Handle, GWL_STYLE)) and WS_BORDER; + ExStyle := DWORD(GetWindowLongPtr(Handle, GWL_EXSTYLE)) and not WS_EX_CLIENTEDGE; if Ctl3D and NewStyleControls and (FBorderStyle = bsSingle) then begin Style := Style and not WS_BORDER; -- cgit v1.2.3