From 48d129c8460d56d2f0152fa546b737bffda750e2 Mon Sep 17 00:00:00 2001
From: tombo <tombo@lazarus-ide.org>
Date: Sun, 24 Aug 2008 08:37:23 +0000
Subject: [PATCH] LCL Carbon - fixed #0011947: IDE's find dialog crashes

git-svn-id: trunk@16203 -
---
 lcl/interfaces/carbon/carbonedits.pp   | 4 +++-
 lcl/interfaces/carbon/carbonprivate.pp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lcl/interfaces/carbon/carbonedits.pp b/lcl/interfaces/carbon/carbonedits.pp
index 80add84c28..162a26913f 100644
--- a/lcl/interfaces/carbon/carbonedits.pp
+++ b/lcl/interfaces/carbon/carbonedits.pp
@@ -643,7 +643,7 @@ begin
     end;
     
     FreeAndNil(FTimer);
-    FTimer := TTimer.Create(LCLObject);
+    FTimer := TTimer.Create(nil);
     FTimer.Interval := 200;
     FTimer.OnTimer := @DropDownTimer;
   end;
@@ -662,6 +662,8 @@ end;
 procedure TCarbonComboBox.DestroyWidget;
 begin
   if FReadOnly then DisposeMenu(FPopupMenu);
+  if FTimer.Enabled then DropDownTimer(nil);
+  FTimer.Free;
 
   inherited DestroyWidget;
 end;
diff --git a/lcl/interfaces/carbon/carbonprivate.pp b/lcl/interfaces/carbon/carbonprivate.pp
index 6254fe06a6..b72bfc0c1c 100644
--- a/lcl/interfaces/carbon/carbonprivate.pp
+++ b/lcl/interfaces/carbon/carbonprivate.pp
@@ -1233,7 +1233,7 @@ begin
     begin
       if I >= FPanels.Count then // create new panel
       begin
-        Panel := TPanel.Create(LCLObject);
+        Panel := TPanel.Create(nil);
         Panel.Visible := False;
         
         Panel.Height := LCLObject.Height;