Skip to content

Commit f1775eb

Browse files
committed
refactor: replace deprecated SynEdit line color API
Lazarus deprecates OnSpecialLineColors. Use OnSpecialLineMarkup while preserving query error and SQL log colors.
1 parent d4a57c3 commit f1775eb

2 files changed

Lines changed: 21 additions & 21 deletions

File tree

source/main.lfm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ object MainForm: TMainForm
726726
MouseLinkColor.Foreground = clBlue
727727
LineHighlightColor.Background = clNone
728728
LineHighlightColor.Foreground = clNone
729-
OnSpecialLineColors = SynMemoSQLLogSpecialLineColors
729+
OnSpecialLineMarkup = SynMemoSQLLogSpecialLineMarkup
730730
inline SynLeftGutterPartList1: TSynGutterPartList
731731
object SynGutterLineNumber1: TSynGutterLineNumber
732732
Width = 13
@@ -3446,7 +3446,7 @@ object MainForm: TMainForm
34463446
OnProcessCommand = SynMemoQueryProcessCommand
34473447
OnReplaceText = SynMemoQueryReplaceText
34483448
OnShowHint = SynMemoQueryShowHint
3449-
OnSpecialLineColors = SynMemoQuerySpecialLineColors
3449+
OnSpecialLineMarkup = SynMemoQuerySpecialLineMarkup
34503450
OnStatusChange = SynMemoQueryStatusChange
34513451
inline SynLeftGutterPartList1: TSynGutterPartList
34523452
object SynGutterMarks1: TSynGutterMarks

source/main.pas

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,10 +1234,10 @@ TMainForm = class(TExtForm)
12341234
procedure menuCopyColumnNamesClick(Sender: TObject);
12351235
procedure menuCloseTabOnDblClickClick(Sender: TObject);
12361236
procedure TimerRefreshTimer(Sender: TObject);
1237-
procedure SynMemoQuerySpecialLineColors(Sender: TObject; Line: Integer;
1238-
var Special: Boolean; var FG, BG: TColor);
1239-
procedure SynMemoSQLLogSpecialLineColors(Sender: TObject; Line: Integer;
1240-
var Special: Boolean; var FG, BG: TColor);
1237+
procedure SynMemoQuerySpecialLineMarkup(Sender: TObject; Line: Integer;
1238+
var Special: Boolean; Markup: TSynSelectedColor);
1239+
procedure SynMemoSQLLogSpecialLineMarkup(Sender: TObject; Line: Integer;
1240+
var Special: Boolean; Markup: TSynSelectedColor);
12411241
procedure actSequalSuggestExecute(Sender: TObject);
12421242
procedure menuQueryExactRowCountClick(Sender: TObject);
12431243
procedure menuCloseTabOnMiddleClickClick(Sender: TObject);
@@ -7403,8 +7403,8 @@ procedure TMainForm.TimerProposalPopupTimer(Sender: TObject);
74037403
end;}
74047404

74057405

7406-
procedure TMainForm.SynMemoQuerySpecialLineColors(Sender: TObject;
7407-
Line: Integer; var Special: Boolean; var FG, BG: TColor);
7406+
procedure TMainForm.SynMemoQuerySpecialLineMarkup(Sender: TObject;
7407+
Line: Integer; var Special: Boolean; Markup: TSynSelectedColor);
74087408
var
74097409
Edit: TSynMemo;
74107410
Tab: TQueryTab;
@@ -7416,14 +7416,14 @@ procedure TMainForm.SynMemoQuerySpecialLineColors(Sender: TObject;
74167416
Exit;
74177417
if Line = Tab.ErrorLine then begin
74187418
Special := True;
7419-
FG := ErrorLineForeground;
7420-
BG := ErrorLineBackground;
7419+
Markup.Foreground := ErrorLineForeground;
7420+
Markup.Background := ErrorLineBackground;
74217421
end;
74227422
end;
74237423

74247424

7425-
procedure TMainForm.SynMemoSQLLogSpecialLineColors(Sender: TObject;
7426-
Line: Integer; var Special: Boolean; var FG, BG: TColor);
7425+
procedure TMainForm.SynMemoSQLLogSpecialLineMarkup(Sender: TObject;
7426+
Line: Integer; var Special: Boolean; Markup: TSynSelectedColor);
74277427
var
74287428
Edit: TSynMemo;
74297429
LineText, Search: String;
@@ -7436,23 +7436,23 @@ procedure TMainForm.SynMemoSQLLogSpecialLineColors(Sender: TObject;
74367436
//Logsql(LineText+' ::: '+Search);
74377437
if LineText.Contains(Search) then begin
74387438
Special := True;
7439-
FG := ErrorLineForeground;
7440-
BG := ErrorLineBackground;
7439+
Markup.Foreground := ErrorLineForeground;
7440+
Markup.Background := ErrorLineBackground;
74417441
end
74427442
else if LineText.Contains(_(SLogPrefixWarning)+':') then begin
74437443
Special := True;
7444-
FG := WarningLineForeground;
7445-
BG := WarningLineBackground;
7444+
Markup.Foreground := WarningLineForeground;
7445+
Markup.Background := WarningLineBackground;
74467446
end
74477447
else if LineText.Contains(_(SLogPrefixNote)+':') then begin
74487448
Special := True;
7449-
FG := NoteLineForeground;
7450-
BG := NoteLineBackground;
7449+
Markup.Foreground := NoteLineForeground;
7450+
Markup.Background := NoteLineBackground;
74517451
end
74527452
else if LineText.Contains(_(SLogPrefixInfo)+':') then begin
74537453
Special := True;
7454-
FG := InfoLineForeground;
7455-
BG := InfoLineBackground;
7454+
Markup.Foreground := InfoLineForeground;
7455+
Markup.Background := InfoLineBackground;
74567456
end;
74577457
end;
74587458

@@ -12658,7 +12658,7 @@ procedure TMainForm.actNewQueryTabExecute(Sender: TObject);
1265812658
QueryTab.Memo.Font.Assign(SynMemoQuery.Font);
1265912659
QueryTab.Memo.LineHighlightColor.Background := SynMemoQuery.LineHighlightColor.Background;
1266012660
QueryTab.Memo.OnStatusChange := SynMemoQuery.OnStatusChange;
12661-
QueryTab.Memo.OnSpecialLineColors := SynMemoQuery.OnSpecialLineColors;
12661+
QueryTab.Memo.OnSpecialLineMarkup := SynMemoQuery.OnSpecialLineMarkup;
1266212662
QueryTab.Memo.OnDragDrop := SynMemoQuery.OnDragDrop;
1266312663
QueryTab.Memo.OnDragOver := SynMemoQuery.OnDragOver;
1266412664
QueryTab.Memo.OnDropFiles := SynMemoQuery.OnDropFiles;

0 commit comments

Comments
 (0)