paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

richmemo: adding RMLCLTRUNK define

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7278 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
skalogryz 2020-01-13 14:25:57 +00:00
parent 1718de4281
commit 19aca57b5e
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/richmemo/gtk2/gtk2richmemo.pas
View File

@ -786,7 +786,11 @@ begin
BorderStyleShadowMap[TCustomMemo(AWinControl).BorderStyle]); BorderStyleShadowMap[TCustomMemo(AWinControl).BorderStyle]);
SetMainWidget(Widget, TempWidget); SetMainWidget(Widget, TempWidget);
{$ifdef RMLCLTRUNK}
GetWidgetInfo(Widget)^.CoreWidget := TempWidget;
{$else}
GetWidgetInfo(Widget, True)^.CoreWidget := TempWidget; GetWidgetInfo(Widget, True)^.CoreWidget := TempWidget;
{$endif}
gtk_text_view_set_editable(PGtkTextView(TempWidget), not TCustomMemo(AWinControl).ReadOnly); gtk_text_view_set_editable(PGtkTextView(TempWidget), not TCustomMemo(AWinControl).ReadOnly);
gtk_text_view_set_justification(PGtkTextView(TempWidget), aGtkJustification[TCustomMemo(AWinControl).Alignment]); gtk_text_view_set_justification(PGtkTextView(TempWidget), aGtkJustification[TCustomMemo(AWinControl).Alignment]);
@ -867,7 +871,11 @@ class function TGtk2WSCustomRichMemo.GetStrings(const ACustomMemo: TCustomMemo
var var
TextView: PGtkTextView; TextView: PGtkTextView;
begin begin
{$ifdef RMLCLTRUNK}
TextView := PGtkTextView(GetWidgetInfo({%H-}Pointer(ACustomMemo.Handle))^.CoreWidget);
{$else}
TextView := PGtkTextView(GetWidgetInfo({%H-}Pointer(ACustomMemo.Handle), False)^.CoreWidget); TextView := PGtkTextView(GetWidgetInfo({%H-}Pointer(ACustomMemo.Handle), False)^.CoreWidget);
{$endif}
Result := TGtk2RichMemoStrings.Create(TextView, ACustomMemo); Result := TGtk2RichMemoStrings.Create(TextView, ACustomMemo);
end; end;