From 37abeb0106b66b8216cff41390c42b2d25bbe22c Mon Sep 17 00:00:00 2001 From: vincents Date: Fri, 31 Aug 2007 22:35:11 +0000 Subject: [PATCH] gtk2 interface: removed workaround for calling inherited (bug #9415) git-svn-id: trunk@11895 - --- lcl/interfaces/gtk2/gtk2wsstdctrls.pp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lcl/interfaces/gtk2/gtk2wsstdctrls.pp b/lcl/interfaces/gtk2/gtk2wsstdctrls.pp index bc9968d200..fcc439a12b 100644 --- a/lcl/interfaces/gtk2/gtk2wsstdctrls.pp +++ b/lcl/interfaces/gtk2/gtk2wsstdctrls.pp @@ -37,8 +37,8 @@ uses StdCtrls, LMessages, //////////////////////////////////////////////////// glib2, gdk2, gtk2, Pango, - WSStdCtrls, WSLCLClasses, GtkWSStdCtrls, Gtk2Int, LCLType, GtkDef, LCLProc, - Gtk2CellRenderer, GTKWinApiWindow, gtkglobals, gtkproc, InterfaceBase; + WSControls, WSStdCtrls, WSLCLClasses, GtkWSStdCtrls, Gtk2Int, LCLType, GtkDef, + LCLProc, Gtk2CellRenderer, GTKWinApiWindow, gtkglobals, gtkproc, InterfaceBase; type @@ -1327,9 +1327,9 @@ begin //DebugLn(['TGtk2WSCustomComboBox.DestroyHandle ',dbgsName(AWinControl),' ClassParent=',ClassParent.ClassName]); - {$NOTE TGtk2WSCustomComboBox.DestroyHandle: fixme: calling inherited does not call TGtkWSWinControl.DestroyHandle} - //inherited DestroyHandle(AWinControl); - TGtk2WidgetSet(WidgetSet).DestroyLCLComponent(AWinControl); + // inherited DestroyHandle doesn't work, because that is determined at + // compile time, while the WS class hierarchy is created at runtime + TWSWinControlClass(TGtk2WSCustomComboBox.Classparent).DestroyHandle(AWinControl); end; { TGtk2WSCustomGroupBox }