paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-31 18:12:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove usage of FCompStyle in GetText using splitup

Browse Source 
git-svn-id: trunk@6185 -
This commit is contained in:
micha 2004-11-01 18:48:43 +00:00
parent f34ec6eeb5
commit d4ce99fba2
2 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lcl/interfaces/win32/win32wscontrols.pp
View File

@ -280,37 +280,9 @@ begin
end;
function TWin32WSWinControl.GetText(const AWinControl: TWinControl; var AText: String): Boolean;
var
CapLen: Cardinal;
Caption: PChar;
Handle: HWND;
begin
Result := AWinControl.HandleAllocated;
if not Result then
exit;
AText := '';
Handle := AWinControl.Handle;
case AWinControl.FCompStyle of
csComboBox:
begin
// + 1 = terminating null character
CapLen := Windows.SendMessage(Handle, WM_GETTEXTLENGTH, 0, 0) + 1;
Caption := StrAlloc(CapLen);
Windows.SendMessage(Handle, WM_GETTEXT, CapLen, LPARAM(Caption));
AText := StrPas(Caption);
StrDispose(Caption);
end;
csEdit, csMemo:
begin
CapLen := GetWindowTextLength(Handle);
Caption := StrAlloc(CapLen + 1);
GetWindowText(Handle, Caption, CapLen + 1);
AText := StrPas(Caption);
StrDispose(Caption);
end;
else
Result := false;
end;
Result := false;
end;
procedure TWin32WSWinControl.SetBorderStyle(const AWinControl: TWinControl; const ABorderStyle: TBorderStyle);

43
lcl/interfaces/win32/win32wsstdctrls.pp
View File

@ -33,7 +33,7 @@ uses
// To get as little as posible circles,
// uncomment only when needed for registration
////////////////////////////////////////////////////
Classes, StdCtrls, Controls, Graphics, Forms,
Classes, StdCtrls, Controls, Graphics, Forms, SysUtils,
////////////////////////////////////////////////////
WSStdCtrls, WSLCLClasses, Windows, LCLType,
Win32Int, Win32Proc, InterfaceBase, Win32WSControls;
@ -81,6 +81,7 @@ type
class function GetSelLength(const ACustomComboBox: TCustomComboBox): integer; override;
class function GetItemIndex(const ACustomComboBox: TCustomComboBox): integer; override;
class function GetMaxLength(const ACustomComboBox: TCustomComboBox): integer; override;
class function GetText(const AWinControl: TWinControl; var AText: string): boolean; override;
class procedure SetArrowKeysTraverseList(const ACustomComboBox: TCustomComboBox;
NewTraverseList: boolean); override;
@ -144,6 +145,7 @@ type
class function GetSelStart(const ACustomEdit: TCustomEdit): integer; override;
class function GetSelLength(const ACustomEdit: TCustomEdit): integer; override;
class function GetMaxLength(const ACustomEdit: TCustomEdit): integer; {override;}
class function GetText(const AWinControl: TWinControl; var AText: string): boolean; override;
class procedure SetCharCase(const ACustomEdit: TCustomEdit; NewCase: TEditCharCase); override;
class procedure SetEchoMode(const ACustomEdit: TCustomEdit; NewMode: TEchoMode); override;
@ -627,6 +629,26 @@ begin
Result := GetWindowInfo(ACustomComboBox.Handle)^.MaxLength;
end;
function TWin32WSCustomComboBox.GetText(const AWinControl: TWinControl; var AText: string): boolean;
var
Handle: HWND;
CapLen: dword;
Caption: PChar;
begin
Result := AWinControl.HandleAllocated;
if not Result then
exit;
AText := '';
Handle := AWinControl.Handle;
// TODO: this can be made shorter probably, using SetLength(AText, ...)
// + 1 = terminating null character
CapLen := Windows.SendMessage(Handle, WM_GETTEXTLENGTH, 0, 0) + 1;
Caption := StrAlloc(CapLen);
Windows.SendMessage(Handle, WM_GETTEXT, CapLen, LPARAM(Caption));
AText := StrPas(Caption);
StrDispose(Caption);
end;
procedure TWin32WSCustomComboBox.SetArrowKeysTraverseList(const ACustomComboBox: TCustomComboBox;
NewTraverseList: boolean);
begin
@ -743,6 +765,25 @@ begin
Result := GetWindowInfo(ACustomEdit.Handle)^.MaxLength;
end;
function TWin32WSCustomEdit.GetText(const AWinControl: TWinControl; var AText: string): boolean;
var
CapLen: dword;
Caption: PChar;
Handle: HWND;
begin
Result := AWinControl.HandleAllocated;
if not Result then
exit;
AText := '';
Handle := AWinControl.Handle;
// TODO: this can be made shorter probably, using SetLength(AText, ...)
CapLen := GetWindowTextLength(Handle);
Caption := StrAlloc(CapLen + 1);
GetWindowText(Handle, Caption, CapLen + 1);
AText := StrPas(Caption);
StrDispose(Caption);
end;
procedure TWin32WSCustomEdit.SetCharCase(const ACustomEdit: TCustomEdit; NewCase: TEditCharCase);
const
EditStyles: array[TEditCharCase] of integer = (0, ES_UPPERCASE, ES_LOWERCASE);