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

+ More optimizations on TCustomMemo.

Browse Source 
* Cleared all warnings.

git-svn-id: trunk@11538 -
This commit is contained in:
zeljko 2007-07-17 07:36:09 +00:00
parent 8960c22b37
commit 71b1f100e6
3 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lcl/interfaces/qt/qtprivate.pp
View File

@ -400,7 +400,6 @@ constructor TQtMemoStrings.Create(TextEdit: QTextEditH; TheOwner: TWinControl);
var var
Method: TMethod; Method: TMethod;
Hook : QTextEdit_hookH; Hook : QTextEdit_hookH;
Astr: WideString;
begin begin
inherited Create; inherited Create;
@ -411,8 +410,7 @@ begin
FStringList := TStringList.Create; FStringList := TStringList.Create;
FQtTextEdit := TextEdit; FQtTextEdit := TextEdit;
QTextEdit_toPlainText(TextEdit,@Astr); // get the memo content QTextEdit_clear(FQtTextEdit);
FStringList.Text := UTF8Encode(AStr);
FOwner:=TheOwner; FOwner:=TheOwner;
// Callback Event // Callback Event
@ -447,19 +445,15 @@ end;
function TQtMemoStrings.TextChangedHandler(Sender: QObjectH; Event: QEventH): Boolean; cdecl; function TQtMemoStrings.TextChangedHandler(Sender: QObjectH; Event: QEventH): Boolean; cdecl;
var var
Mess: TLMessage; Mess: TLMessage;
// just for debugging
SenderView: QObjectH;
EventView: QEventH;
begin begin
if not FUpdating then begin if not FUpdating then
SenderView := Sender; begin
EventView := Event;
FTextChanged := True; FTextChanged := True;
FillChar(Mess, SizeOf(Mess), #0); FillChar(Mess, SizeOf(Mess), #0);
Mess.Msg := CM_TEXTCHANGED; Mess.Msg := CM_TEXTCHANGED;
//(FOwner as TCustomMemo).Modified := True; //(FOwner as TCustomMemo).Modified := True;
FOwner.Dispatch(TLMessage(Mess)); FOwner.Dispatch(TLMessage(Mess));
end; end;
Result := True; Result := True;
end; end;
@ -474,8 +468,11 @@ procedure TQtMemoStrings.Assign(Source: TPersistent);
var var
Astr: WideString; Astr: WideString;
begin begin
if (Source=Self) or (Source=nil) then exit; if (Source=Self) or (Source=nil)
if Source is TStrings then begin then
exit;
if Source is TStrings then
begin
FStringList.Clear; FStringList.Clear;
FStringList.Text := TStrings(Source).Text; FStringList.Text := TStrings(Source).Text;
Astr := FStringList.Text; Astr := FStringList.Text;

3
lcl/interfaces/qt/qtwidgets.pas
View File

@ -3595,7 +3595,6 @@ end;
function TQtTextEdit.CreateWidget(const AParams: TCreateParams): QWidgetH; function TQtTextEdit.CreateWidget(const AParams: TCreateParams): QWidgetH;
var var
Parent: QWidgetH; Parent: QWidgetH;
Str: WideString;
begin begin
// Creates the widget // Creates the widget
{$ifdef VerboseQt} {$ifdef VerboseQt}
@ -3603,10 +3602,8 @@ begin
{$endif} {$endif}
Parent := TQtWidget(LCLObject.Parent.Handle).GetContainerWidget; Parent := TQtWidget(LCLObject.Parent.Handle).GetContainerWidget;
Str := UTF8Decode((LCLObject as TCustomMemo).Text);
Result := QTextEdit_create(Parent); Result := QTextEdit_create(Parent);
QTextEdit_setAlignment(QTextEditH(Result), AlignmentMap[(LCLObject as TCustomMemo).Alignment]); QTextEdit_setAlignment(QTextEditH(Result), AlignmentMap[(LCLObject as TCustomMemo).Alignment]);
QTextEdit_setPlainText(QTextEditH(Result), @Str);
QTextEdit_setReadOnly(QTextEditH(Result), (LCLObject as TCustomMemo).ReadOnly); QTextEdit_setReadOnly(QTextEditH(Result), (LCLObject as TCustomMemo).ReadOnly);

9
lcl/interfaces/qt/qtwinapi.inc
View File

@ -36,8 +36,6 @@
Returns: Boolean Returns: Boolean
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function TQtWidgetSet.Arc(DC: HDC; Left,Top,Right,Bottom,angle1,angle2 : Integer): Boolean; function TQtWidgetSet.Arc(DC: HDC; Left,Top,Right,Bottom,angle1,angle2 : Integer): Boolean;
var
ADC : TQtDeviceContext;
begin begin
{$ifdef VerboseQtWinAPI} {$ifdef VerboseQtWinAPI}
WriteLn('[WinAPI Arc] DC: ', dbghex(DC)); WriteLn('[WinAPI Arc] DC: ', dbghex(DC));
@ -54,8 +52,6 @@ end;
Returns: Boolean Returns: Boolean
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function TQtWidgetSet.AngleChord(DC: HDC; x1, y1, x2, y2, angle1, angle2: Integer): Boolean; function TQtWidgetSet.AngleChord(DC: HDC; x1, y1, x2, y2, angle1, angle2: Integer): Boolean;
var
ADC : TQtDeviceContext;
begin begin
{$ifdef VerboseQtWinAPI} {$ifdef VerboseQtWinAPI}
WriteLn('[WinAPI AngleChord] DC: ', dbghex(DC)); WriteLn('[WinAPI AngleChord] DC: ', dbghex(DC));
@ -2444,9 +2440,6 @@ end;
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function TQtWidgetSet.Polygon(DC: HDC; Points: PPoint; NumPts: Integer; function TQtWidgetSet.Polygon(DC: HDC; Points: PPoint; NumPts: Integer;
Winding: Boolean): boolean; Winding: Boolean): boolean;
var
ARect: TRect;
ADC : TQtDeviceContext;
begin begin
{$ifdef VerboseQtWinAPI} {$ifdef VerboseQtWinAPI}
WriteLn('[WinAPI Polygon] DC: ', dbghex(DC)); WriteLn('[WinAPI Polygon] DC: ', dbghex(DC));
@ -2977,7 +2970,7 @@ begin
if GetScrollInfo(Handle, SBStyle, FScrollInfo) then if GetScrollInfo(Handle, SBStyle, FScrollInfo) then
begin begin
{impossible cases} {impossible cases}
if (ScrollInfo.nPage > ScrollInfo.nMax) then exit; if (Integer(ScrollInfo.nPage) > ScrollInfo.nMax) then exit;
if (ScrollInfo.FMask or SIF_RANGE) = ScrollInfo.FMask then if (ScrollInfo.FMask or SIF_RANGE) = ScrollInfo.FMask then
begin begin