From 157414909316322bf5cd25d59581f395b40d147c Mon Sep 17 00:00:00 2001
From: Juha <juha@lazarus-ide.org>
Date: Wed, 19 Jul 2023 11:16:27 +0300
Subject: [PATCH] Customdrawn: Cleanup. Issues #40387 and #40388.

---
 lcl/customdrawncontrols.pas                          | 2 +-
 lcl/interfaces/customdrawn/customdrawnobject_x11.inc | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lcl/customdrawncontrols.pas b/lcl/customdrawncontrols.pas
index d9b6bb2035..2b852abf5c 100644
--- a/lcl/customdrawncontrols.pas
+++ b/lcl/customdrawncontrols.pas
@@ -2044,8 +2044,8 @@ end;
 
 destructor TCDEdit.Destroy;
 begin
-  inherited Destroy;
   FLines.Free;
+  inherited Destroy;
   //FCaretTimer.Free; Don't free here because it is assigned with a owner
 end;
 
diff --git a/lcl/interfaces/customdrawn/customdrawnobject_x11.inc b/lcl/interfaces/customdrawn/customdrawnobject_x11.inc
index 9ea9b65f5a..d2bec3a01b 100644
--- a/lcl/interfaces/customdrawn/customdrawnobject_x11.inc
+++ b/lcl/interfaces/customdrawn/customdrawnobject_x11.inc
@@ -13,10 +13,6 @@
 }
 
 
-// The version from FreePascal crash except in FPC 2.7.1+ from 10 Dec 2011 +
-function XOpenIM(para1: PDisplay; para2: PXrmHashBucketRec; para3: Pchar; para4: Pchar): PXIM; cdecl; external;
-function XCreateIC(para1: PXIM; para2: array of const): PXIC; cdecl; external;
-
 procedure MyXConnectionWatchProc(display: PDisplay; client_data: TXPointer;
   fd: cint; opening: XLib.TBool; watch_data: PXPointer); cdecl;
 begin