paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 13:39:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup.

Browse Source 
git-svn-id: trunk@14171 -
This commit is contained in:
sekelsenmat 2008-02-17 17:13:43 +00:00
parent 6c1332e65d
commit 08df08f15d
7 changed files with 77 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lcl/interfaces/wince/wincememostrings.inc
View File

@ -34,25 +34,22 @@ TWinCEMemoStrings = class(TStrings)
function TWinCEMemoStrings.GetLineLength(Index: Integer): Integer; function TWinCEMemoStrings.GetLineLength(Index: Integer): Integer;
begin begin
Result := SendMessage(fHandle, EM_LINELENGTH, SendMessage(fHandle, EM_LINEINDEX, Index, 0),0); Result := SendMessageW(fHandle, EM_LINELENGTH, SendMessage(fHandle, EM_LINEINDEX, Index, 0),0);
end; end;
function TWinCEMemoStrings.GetLineStart(Index: Integer): Integer; function TWinCEMemoStrings.GetLineStart(Index: Integer): Integer;
begin begin
Result := SendMessage(fHandle, EM_LINEINDEX, Index, 0); Result := SendMessageW(fHandle, EM_LINEINDEX, Index, 0);
end; end;
function TWinCEMemoStrings.GetTextStr: string; function TWinCEMemoStrings.GetTextStr: string;
var
CapLen: dword;
Caption: PChar;
begin begin
Result := GetControlText(fHandle); Result := GetControlText(fHandle);
end; end;
function TWinCEMemoStrings.GetRealCount: integer; function TWinCEMemoStrings.GetRealCount: integer;
begin begin
Result := SendMessage(fHandle, EM_GETLINECOUNT, 0, 0); Result := SendMessageW(fHandle, EM_GETLINECOUNT, 0, 0);
end; end;
function TWinCEMemoStrings.GetCount: integer; function TWinCEMemoStrings.GetCount: integer;
@ -63,16 +60,17 @@ end;
function TWinCEMemoStrings.Get(Index: Integer): string; function TWinCEMemoStrings.Get(Index: Integer): string;
var var
textbuf: PWideChar; textbuf: PWideChar;
fLength: Integer; fLength: Integer;
begin begin
fLength := GetLineLength(Index); fLength := GetLineLength(Index);
if fLength = 0 then Result := '' if fLength = 0 then Result := ''
else begin else
begin
textbuf := PWideChar(SysAllocStringLen(nil,fLength+1)); textbuf := PWideChar(SysAllocStringLen(nil,fLength+1));
PWord(textbuf)^ := Word(fLength+1); PWord(textbuf)^ := Word(fLength+1);
SendMessage(fHandle, EM_GETLINE, Index, lparam(textbuf)); SendMessageW(fHandle, EM_GETLINE, Index, lparam(textbuf));
Result := WideStringToString(WideString(textbuf)); Result := UTF8Encode(WideString(textbuf));
SysFreeString(textbuf); SysFreeString(textbuf);
end; end;
end; end;

52
lcl/interfaces/wince/winceproc.pp
View File

@ -43,8 +43,6 @@ Type
); );
end; end;
function LCLStringToPWideChar(inString: string): PWideChar;
function WideStringToString(inWideString : WideString) : String;
function WM_To_String(WM_Message: Integer): string; function WM_To_String(WM_Message: Integer): string;
function WindowPosFlagsToString(Flags: UINT): string; function WindowPosFlagsToString(Flags: UINT): string;
procedure EventTrace(Message: String; Data: TObject); procedure EventTrace(Message: String; Data: TObject);
@ -114,45 +112,6 @@ uses
SysUtils, LCLStrConsts, Dialogs, StdCtrls, ExtCtrls, SysUtils, LCLStrConsts, Dialogs, StdCtrls, ExtCtrls,
LCLIntf; //remove this unit when GetWindowSize is moved to TWSWinControl LCLIntf; //remove this unit when GetWindowSize is moved to TWSWinControl
{ Converts a LCL string into a PWideChar.
With Unicode support activated the input string must be in
UTF-8 encoding.
Note that this function will alloc a new PWideChar
and the caller is responsible for freeing it with FreeMem
}
function LCLStringToPWideChar(inString: string): PWideChar;
var
WideBuffer: widestring;
begin
{ Converts to a buffer }
WideBuffer := Utf8Decode(inString);
{ Allocates memory for the string }
Result := GetMem(Length(WideBuffer) * 2 + 2);
{ Copies to the final destination }
WideStrLCopy(PWideChar(WideBuffer), Result, Length(WideBuffer));
end;
{ well this is different from normal string(widestring)
or other rtl functions because it uses windows local codepage
better name for this?! }
function WideStringToString(inWideString : WideString) : String;
var
tmpStr : PChar;
inStrLen: integer;
begin
inStrLen := Length(inWideString);
tmpStr := StrAlloc(inStrLen+1);
WideCharToMultiByte(CP_ACP, 0, PWideChar(inWideString), -1, tmpStr, inStrLen,nil,nil);
char((tmpStr+inStrLen)^) := #0;
Result := string(tmpStr);
StrDispose(tmpStr);
end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
Function: WM_To_String Function: WM_To_String
Params: WM_Message - a WinDows message Params: WM_Message - a WinDows message
@ -1139,22 +1098,21 @@ var
buf: pointer; buf: pointer;
lenBuf: dword; lenBuf: dword;
fixedInfo: ^VS_FIXEDFILEINFO; fixedInfo: ^VS_FIXEDFILEINFO;
tmpText : PWideChar; WideBuffer: widestring;
begin begin
Result := $FFFFFFFF; Result := $FFFFFFFF;
tmpText := LCLStringToPWideChar(FileName); WideBuffer := UTF8Decode(FileName);
lenBuf := GetFileVersionInfoSizeW(tmpText, lenBuf); lenBuf := GetFileVersionInfoSizeW(PWideChar(WideBuffer), lenBuf);
if lenBuf > 0 then if lenBuf > 0 then
begin begin
GetMem(buf, lenBuf); GetMem(buf, lenBuf);
if GetFileVersionInfoW(tmpText, 0, lenBuf, buf) then if GetFileVersionInfoW(PWideChar(WideBuffer), 0, lenBuf, buf) then
begin begin
VerQueryValue(buf, '\', pointer(fixedInfo), lenBuf); VerQueryValue(buf, '\', pointer(fixedInfo), lenBuf);
Result := fixedInfo^.dwFileVersionMS; Result := fixedInfo^.dwFileVersionMS;
end; end;
FreeMem(buf); FreeMem(buf);
end; end;
FreeMem(tmpText);
end; end;
function AllocWindowInfo(Window: HWND): PWindowInfo; function AllocWindowInfo(Window: HWND): PWindowInfo;
@ -1284,7 +1242,7 @@ begin
TextLen := GetWindowTextLength(AHandle); TextLen := GetWindowTextLength(AHandle);
tmpWideStr := PWideChar(SysAllocStringLen(nil,TextLen + 1)); tmpWideStr := PWideChar(SysAllocStringLen(nil,TextLen + 1));
GetWindowTextW(AHandle, tmpWideStr, TextLen + 1); GetWindowTextW(AHandle, tmpWideStr, TextLen + 1);
Result := WideStringToString(widestring(tmpWideStr)); Result := UTF8Encode(widestring(tmpWideStr));
SysFreeString(tmpWideStr); SysFreeString(tmpWideStr);
end; end;

89
lcl/interfaces/wince/wincewinapi.inc
View File

@ -1252,57 +1252,57 @@ function TWinCEWidgetSet.CreateDIBitmap(DC: HDC; var InfoHeader: TBitmapInfoHead
dwUsage: DWORD; InitBits: PChar; var InitInfo: TBitmapInfo; dwUsage: DWORD; InitBits: PChar; var InitInfo: TBitmapInfo;
wUsage: UINT): HBITMAP; wUsage: UINT): HBITMAP;
var var
hbit,htargetbit : HBITMAP; hbit,htargetbit : HBITMAP;
lpDestBits : PChar; lpDestBits : PChar;
dwLen : longint; dwLen : longint;
lpH:TBitmapInfoHeader; lpH:TBitmapInfoHeader;
orig_bitcount,nPadWidth,pad:integer; orig_bitcount,nPadWidth,pad:integer;
i,dwError:longint; i,dwError:longint;
d:PByte; d:PByte;
s,s0:PWord; s,s0:PWord;
pixel:word; pixel:word;
dc2:HDC; dc2:HDC;
begin begin
nPadWidth := 4; nPadWidth := 4;
lpH := InfoHeader; lpH := InfoHeader;
lpH.biSize:=sizeof(TBitmapInfoHeader); lpH.biSize:=sizeof(TBitmapInfoHeader);
if lpH.biWidth mod nPadWidth <> 0 then if lpH.biWidth mod nPadWidth <> 0 then
pad := nPadWidth - lpH.biWidth mod nPadWidth; pad := nPadWidth - lpH.biWidth mod nPadWidth;
// there are problems with padding. i dont know the rules // there are problems with padding. i dont know the rules
// anymore... // anymore...
pad := 0; pad := 0;
// This is wrong when the infoheader is followed by color data... // This is wrong when the infoheader is followed by color data...
// We hope that biSizeImage is set then... // We hope that biSizeImage is set then...
dwLen := ((lpH.biWidth+pad) * abs(lpH.biHeight) * lpH.biBitCount) div 8; dwLen := ((lpH.biWidth+pad) * abs(lpH.biHeight) * lpH.biBitCount) div 8;
// includes colordata, if any... // includes colordata, if any...
if lpH.biSizeImage <> 0 then if lpH.biSizeImage <> 0 then
dwLen := lpH.biSizeImage; dwLen := lpH.biSizeImage;
orig_bitcount := lpH.biBitCount; orig_bitcount := lpH.biBitCount;
{if unaligned(InitInfo.bmiHeader.biBitCount) = 16 then {if unaligned(InitInfo.bmiHeader.biBitCount) = 16 then
unaligned(InitInfo.bmiHeader.biBitCount) := 24;} unaligned(InitInfo.bmiHeader.biBitCount) := 24;}
{hbit := windows.CreateDIBSection( dc, windows.PBITMAPINFO(@lph)^, {hbit := windows.CreateDIBSection( dc, windows.PBITMAPINFO(@lph)^,
DIB_RGB_COLORS, lpDestBits, 0, 0);} DIB_RGB_COLORS, lpDestBits, 0, 0);}
//getmem(lpDestBits,dwLen); //getmem(lpDestBits,dwLen);
hbit := Windows.CreateBitmap( lpH.biWidth, abs(lpH.biHeight),1,InitInfo.bmiHeader.biBitCount,InitBits); hbit := Windows.CreateBitmap( lpH.biWidth, abs(lpH.biHeight),1,InitInfo.bmiHeader.biBitCount,InitBits);
//dc2:=windows.getdc(0); //dc2:=windows.getdc(0);
//htargetbit := Windows.CreateCompatibleBitmap( dc2,lpH.biWidth, abs(lpH.biHeight)); //htargetbit := Windows.CreateCompatibleBitmap( dc2,lpH.biWidth, abs(lpH.biHeight));
//SelectObject(dc,hbit); //SelectObject(dc,hbit);
//SelectObject(dc2,htargetbit); //SelectObject(dc2,htargetbit);
//BitBlt(dc2,0, 0, lpH.biWidth, abs(lpH.biHeight), Dc, 0, 0, SRCPAINT); //BitBlt(dc2,0, 0, lpH.biWidth, abs(lpH.biHeight), Dc, 0, 0, SRCPAINT);
result := hbit; result := hbit;
//DeleteObject(dc2); //DeleteObject(dc2);
//DeleteObject(hbit); //DeleteObject(hbit);
exit; exit;
//hbit := CreateDIBSection(dc, InitInfo, DIB_RGB_COLORS, lpDestBits, 0, 0); //hbit := CreateDIBSection(dc, InitInfo, DIB_RGB_COLORS, lpDestBits, 0, 0);
//if (hbit <> 0) then //if (hbit <> 0) then
begin begin
if (orig_bitcount = 16) then if (orig_bitcount = 16) then
begin begin
@ -1360,7 +1360,6 @@ end;
The GetFocus function retrieves the handle of the window that has the focus. The GetFocus function retrieves the handle of the window that has the focus.
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function TWinCEWidgetSet.GetFocus: HWND; function TWinCEWidgetSet.GetFocus: HWND;
begin begin
Result := Windows.GetFocus; Result := Windows.GetFocus;
@ -1592,7 +1591,7 @@ end;
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function TWinCEWidgetSet.GetTextMetrics(DC: HDC; var TM: TTextMetric): Boolean; function TWinCEWidgetSet.GetTextMetrics(DC: HDC; var TM: TTextMetric): Boolean;
var var
tmw: TTextMetricW; tmw: TTextMetricW;
begin begin
Assert(False, Format('Trace:> TODO FINISH[TWinCEWidgetSet.GetTextMetrics] DC: 0x%x', [DC])); Assert(False, Format('Trace:> TODO FINISH[TWinCEWidgetSet.GetTextMetrics] DC: 0x%x', [DC]));
Result := Boolean(Windows.GetTextMetrics(DC, @TMw)); Result := Boolean(Windows.GetTextMetrics(DC, @TMw));

3
lcl/interfaces/wince/wincewsbuttons.pp
View File

@ -160,7 +160,7 @@ begin
// DFCS_ADJUSTRECT doesnot work // DFCS_ADJUSTRECT doesnot work
InflateRect(DrawRect, -4, -4); InflateRect(DrawRect, -4, -4);
ButtonCaption := LCLStringToPWideChar(BitBtn.Caption); ButtonCaption := PWideChar(UTF8Decode(BitBtn.Caption));
// gather info about bitbtn // gather info about bitbtn
if BitBtn.Glyph.Empty then if BitBtn.Glyph.Empty then
begin begin
@ -234,7 +234,6 @@ begin
DrawBitmap; DrawBitmap;
SelectObject(DrawStruct^._hDC, OldFontHandle); SelectObject(DrawStruct^._hDC, OldFontHandle);
FreeMem(ButtonCaption);
end; end;

99
lcl/interfaces/wince/wincewscomctrls.pp
View File

@ -188,13 +188,6 @@ type
private private
protected protected
public public
{$ifdef OldToolbar}
class function CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): HWND; override;
class function GetButtonCount(const AToolBar: TToolBar): integer; override;
class procedure InsertToolButton(const AToolBar: TToolbar; const AControl: TControl); override;
class procedure DeleteToolButton(const AToolBar: TToolbar; const AControl: TControl); override;
{$endif}
end; end;
{ TWinCEWSTrackBar } { TWinCEWSTrackBar }
@ -347,15 +340,12 @@ begin
end; end;
class procedure TWinCEWSStatusBar.SetPanelText(const AStatusBar: TStatusBar; PanelIndex: integer); class procedure TWinCEWSStatusBar.SetPanelText(const AStatusBar: TStatusBar; PanelIndex: integer);
var
tmpSimpleText : PWideChar;
begin begin
if AStatusBar.SimplePanel then if AStatusBar.SimplePanel then
begin begin
tmpSimpleText := LCLStringToPWideChar(AStatusBar.SimpleText); Windows.SendMessageW(AStatusBar.Handle, SB_SETTEXT, 255,
Windows.SendMessageW(AStatusBar.Handle, SB_SETTEXT, 255, LPARAM(PWideChar(tmpSimpleText))); LPARAM(PWideChar(UTF8Decode(AStatusBar.SimpleText))));
FreeMem(tmpSimpleText); end
end
else else
UpdateStatusBarPanel(AStatusBar.Panels[PanelIndex]); UpdateStatusBarPanel(AStatusBar.Panels[PanelIndex]);
end; end;
@ -442,84 +432,6 @@ begin
Windows.SendMessage(AProgressBar.Handle, PBM_SETPOS, Windows.WPARAM(NewPosition), 0); Windows.SendMessage(AProgressBar.Handle, PBM_SETPOS, Windows.WPARAM(NewPosition), 0);
end; end;
{ TWinCEWSToolbar}
{$IFDEF OldToolbar}
class function TWinCEWSToolBar.CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): HWND;
var
Params: TCreateWindowExParams;
init : TINITCOMMONCONTROLSEX;
begin
init.dwSize := Sizeof(TINITCOMMONCONTROLSEX);
init.dwICC := ICC_BAR_CLASSES;
InitCommonControlsEx(@init);
// general initialization of Params
PrepareCreateWindow(AWinControl, Params);
// customization of Params
with Params do
begin
FlagsEx := WS_EX_TOPMOST;
pClassName := TOOLBARCLASSNAME;
Flags := WS_CHILD or TBSTYLE_FLAT or TBSTYLE_LIST or WS_VISIBLE or TBS_HORZ or TBS_BOTH or TBS_NOTICKS or TBS_FIXEDLENGTH;//Flags {or CCS_ADJUSTABLE};
end;
// create window
FinishCreateWindow(AWinControl, Params, false);
Result := Params.Window;
end;
class function TWinCEWSToolbar.GetButtonCount(const AToolBar: TToolBar): integer;
begin
Result := SendMessage(AToolbar.Handle, TB_BUTTONCOUNT, 0, 0)
end;
class procedure TWinCEWSToolbar.InsertToolButton(const AToolBar: TToolbar; const AControl: TControl);
var
PStr, PStr2: PWideChar;
Num: Integer;
TBB: TBBUTTON;
begin
// TODO: check correctness / clean up
Assert(False, 'Trace:!!!!!!!!!!!!!!!!!!!!!!!!!');
Assert(False, 'Trace:Toolbutton being inserted');
Assert(False, 'Trace:!!!!!!!!!!!!!!!!!!!!!!!!!');
If (AControl is TWinControl) Then
Begin
PStr := StringToPWideChar(TToolButton(AControl).Caption);
End
Else
Begin
Raise Exception.Create('Can not assign this control to the toolbar');
Exit;
End;
Num := TToolbar(TWinControl(AControl).Parent).Buttonlist.IndexOf(TControl(AControl));
If Num < 0 Then
Num := TToolbar(TWinControl(AControl).Parent).Buttonlist.Count + 1;
Assert(False, Format('Trace:Num = %d in LM_INSERTTOOLBUTTON', [Num]));
With tbb Do
Begin
iBitmap := Num;
idCommand := Num;
fsState := TBSTATE_ENABLED;
fsStyle := TBSTYLE_BUTTON;
iString := Integer(PStr);
End;
SendMessage(TWinControl(AControl).Parent.Handle, TB_BUTTONSTRUCTSIZE, SizeOf(TBBUTTON), 0);
SendMessage(TWinControl(AControl).Parent.Handle, TB_ADDBUTTONS, 1, LParam(LPTBButton(@tbb)));
FreeMem(PStr);
Assert(False, 'Trace:!!!!!!!!!!!!!!!!!!!!!!!!!');
end;
class procedure TWinCEWSToolbar.DeleteToolButton(const AToolBar: TToolbar; const AControl: TControl);
begin
// TODO: code buggy, Index of button to delete ?!
SendMessage(AToolBar.Handle, TB_DELETEBUTTON, 0, 0);
end;
{$ENDIF}
{ TWinCEWSTrackBar } { TWinCEWSTrackBar }
class function TWinCEWSTrackBar.CreateHandle(const AWinControl: TWinControl; class function TWinCEWSTrackBar.CreateHandle(const AWinControl: TWinControl;
@ -600,9 +512,6 @@ initialization
// RegisterWSComponent(TCustomUpDown, TWinCEWSCustomUpDown); // RegisterWSComponent(TCustomUpDown, TWinCEWSCustomUpDown);
// RegisterWSComponent(TCustomUpDown, TWinCEWSUpDown); // RegisterWSComponent(TCustomUpDown, TWinCEWSUpDown);
// RegisterWSComponent(TCustomToolButton, TWinCEWSToolButton); // RegisterWSComponent(TCustomToolButton, TWinCEWSToolButton);
{$ifdef OldToolbar}
RegisterWSComponent(TToolBar, TWinCEWSToolBar);
{$endif}
RegisterWSComponent(TCustomTrackBar, TWinCEWSTrackBar); RegisterWSComponent(TCustomTrackBar, TWinCEWSTrackBar);
// RegisterWSComponent(TCustomTreeView, TWinCEWSCustomTreeView); // RegisterWSComponent(TCustomTreeView, TWinCEWSCustomTreeView);
// RegisterWSComponent(TCustomTreeView, TWinCEWSTreeView); // RegisterWSComponent(TCustomTreeView, TWinCEWSTreeView);

22
lcl/interfaces/wince/wincewscustomlistview.inc
View File

@ -114,13 +114,12 @@ begin
lvc.Mask := LVCF_TEXT; lvc.Mask := LVCF_TEXT;
{$ifdef Win32} {$ifdef Win32}
lvc.pszText := PChar(LCLStringToPWideChar(AColumn.Caption)); lvc.pszText := PChar(PWideChar(UTF8Decode(AColumn.Caption)));
SendMessage(ALV.Handle, LVM_INSERTCOLUMNW, WPARAM(AIndex), LPARAM(@lvc)); SendMessage(ALV.Handle, LVM_INSERTCOLUMNW, WPARAM(AIndex), LPARAM(@lvc));
{$else} {$else}
lvc.pszText := LCLStringToPWideChar(AColumn.Caption); lvc.pszText := PWideChar(UTF8Decode(AColumn.Caption));
ListView_InsertColumn(ALV.Handle, AIndex, lvc); ListView_InsertColumn(ALV.Handle, AIndex, lvc);
{$endif} {$endif}
FreeMem(lvc.pszText);
end; end;
class procedure TWinCEWSCustomListView.ColumnMove(const ALV: TCustomListView; const AOldIndex, ANewIndex: Integer; const AColumn: TListColumn); class procedure TWinCEWSCustomListView.ColumnMove(const ALV: TCustomListView; const AOldIndex, ANewIndex: Integer; const AColumn: TListColumn);
@ -204,13 +203,12 @@ begin
lvc.Mask := LVCF_TEXT; lvc.Mask := LVCF_TEXT;
{$ifdef Win32} {$ifdef Win32}
lvc.pszText := PChar(LCLStringToPWideChar(ACaption)); lvc.pszText := PChar(PWideChar(UTF8Decode(ACaption)));
SendMessageW(ALV.Handle, LVM_SETCOLUMNW, WPARAM(AIndex), LPARAM(@lvc)); SendMessageW(ALV.Handle, LVM_SETCOLUMNW, WPARAM(AIndex), LPARAM(@lvc));
{$else} {$else}
lvc.pszText := LCLStringToPWideChar(ACaption); lvc.pszText := PWideChar(UTF8Decode(ACaption));
ListView_SetColumn(ALV.Handle, AIndex, lvc); ListView_SetColumn(ALV.Handle, AIndex, lvc);
{$endif} {$endif}
FreeMem(lvc.pszText);
end; end;
class procedure TWinCEWSCustomListView.ColumnSetImage(const ALV: TCustomListView; const AIndex: Integer; const AColumn: TListColumn; const AImageIndex: Integer); class procedure TWinCEWSCustomListView.ColumnSetImage(const ALV: TCustomListView; const AIndex: Integer; const AColumn: TListColumn; const AImageIndex: Integer);
@ -316,13 +314,12 @@ begin
lvi.iSubItem := 0; lvi.iSubItem := 0;
{$ifdef Win32} {$ifdef Win32}
lvi.pszText := PChar(LCLStringToPWideChar(AItem.Caption)); lvi.pszText := PChar(PWideChar(UTF8Decode(AItem.Caption)));
SendMessageW(ALV.Handle, LVM_INSERTITEMW, 0, LPARAM(@lvi)); SendMessageW(ALV.Handle, LVM_INSERTITEMW, 0, LPARAM(@lvi));
{$else} {$else}
lvi.pszText := LCLStringToPWideChar(AItem.Caption); lvi.pszText := PWideChar(UTF8Decode(AItem.Caption));
ListView_InsertItem(ALV.Handle, lvi); ListView_InsertItem(ALV.Handle, lvi);
{$endif} {$endif}
FreeMem(lvi.pszText);
end; end;
class procedure TWinCEWSCustomListView.ItemSetImage(const ALV: TCustomListView; const AIndex: Integer; const AItem: TListItem; const ASubIndex, AImageIndex: Integer); class procedure TWinCEWSCustomListView.ItemSetImage(const ALV: TCustomListView; const AIndex: Integer; const AItem: TListItem; const ASubIndex, AImageIndex: Integer);
@ -356,9 +353,8 @@ begin
end; end;
class procedure TWinCEWSCustomListView.ItemSetText(const ALV: TCustomListView; const AIndex: Integer; const AItem: TListItem; const ASubIndex: Integer; const AText: String); class procedure TWinCEWSCustomListView.ItemSetText(const ALV: TCustomListView; const AIndex: Integer; const AItem: TListItem; const ASubIndex: Integer; const AText: String);
var
tmpAText : PWideChar;
{$ifdef Win32} {$ifdef Win32}
var
_gnu_lvi : LV_ITEM; _gnu_lvi : LV_ITEM;
{$endif} {$endif}
begin begin
@ -371,9 +367,7 @@ begin
SendMessageW(ALV.Handle, LVM_SETITEMTEXTW, WPARAM(AIndex), LPARAM(@_gnu_lvi)); SendMessageW(ALV.Handle, LVM_SETITEMTEXTW, WPARAM(AIndex), LPARAM(@_gnu_lvi));
{$else} {$else}
tmpAText := LCLStringToPWideChar(AText); ListView_SetItemText(ALV.Handle, AIndex, ASubIndex, PWideChar(UTF8Decode(AText)));
ListView_SetItemText(ALV.Handle, AIndex, ASubIndex, tmpAText);
FreeMem(tmpAText);
{$endif} {$endif}
end; end;

17
lcl/interfaces/wince/wincewsforms.pp
View File

@ -94,23 +94,18 @@ type
TWinCEWSCustomForm = class(TWSCustomForm) TWinCEWSCustomForm = class(TWSCustomForm)
private private
// class procedure SetSlots(const QtCustomForm: TQtCustomForm);
protected protected
public public
class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): HWND; override; class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): HWND; override;
class procedure SetBounds(const AWinControl: TWinControl;
{ class procedure DestroyHandle(const AWinControl: TWinControl); override;} const ALeft, ATop, AWidth, AHeight: Integer); override;
class procedure SetBorderIcons(const AForm: TCustomForm;
procedure SetBounds(const AWinControl: TWinControl; const ABorderIcons: TBorderIcons); override;
const ALeft, ATop, AWidth, AHeight: Integer);
class procedure SetFormBorderStyle(const AForm: TCustomForm; class procedure SetFormBorderStyle(const AForm: TCustomForm;
const AFormBorderStyle: TFormBorderStyle); override; const AFormBorderStyle: TFormBorderStyle); override;
class procedure SetIcon(const AForm: TCustomForm; const AIcon: HICON); override; class procedure SetIcon(const AForm: TCustomForm; const AIcon: HICON); override;
class procedure SetShowInTaskbar(const AForm: TCustomForm; const AValue: TShowInTaskbar); override; class procedure SetShowInTaskbar(const AForm: TCustomForm; const AValue: TShowInTaskbar); override;
class procedure ShowModal(const ACustomForm: TCustomForm); override; class procedure ShowModal(const ACustomForm: TCustomForm); override;
class procedure SetBorderIcons(const AForm: TCustomForm;
const ABorderIcons: TBorderIcons); override;
end; end;
{ TWinCEWSForm } { TWinCEWSForm }
@ -305,7 +300,7 @@ begin
RecreateWnd(AForm); RecreateWnd(AForm);
end; end;
procedure TWinCEWSCustomForm.SetBounds(const AWinControl: TWinControl; class procedure TWinCEWSCustomForm.SetBounds(const AWinControl: TWinControl;
const ALeft, ATop, AWidth, AHeight: Integer); const ALeft, ATop, AWidth, AHeight: Integer);
var var
SizeRect: Windows.RECT; SizeRect: Windows.RECT;