From 3bd4030d1aeb2614e2646f619edafe6409ed3b36 Mon Sep 17 00:00:00 2001 From: blikblum Date: Sat, 24 Dec 2011 20:58:37 +0000 Subject: [PATCH] gtk2: remove unecessary checks git-svn-id: trunk@34395 - --- lcl/interfaces/gtk2/gtk2callback.inc | 2 -- lcl/interfaces/gtk2/gtk2proc.inc | 4 ---- lcl/interfaces/gtk2/gtk2widgetset.inc | 2 -- 3 files changed, 8 deletions(-) diff --git a/lcl/interfaces/gtk2/gtk2callback.inc b/lcl/interfaces/gtk2/gtk2callback.inc index c439925a9a..dd4f3dd14c 100644 --- a/lcl/interfaces/gtk2/gtk2callback.inc +++ b/lcl/interfaces/gtk2/gtk2callback.inc @@ -242,8 +242,6 @@ begin // this is a normal lcl wigdet MainWidget:=GetMainWidget(Widget); - if MainWidget=nil then - MainWidget:=Widget; WinWidgetInfo:=GetWidgetInfo(MainWidget,true); LCLObject:=GetLCLObject(MainWidget); if (LCLObject<>nil) and (WinWidgetInfo<>nil) then begin diff --git a/lcl/interfaces/gtk2/gtk2proc.inc b/lcl/interfaces/gtk2/gtk2proc.inc index 8b68d4d543..15c780cc58 100644 --- a/lcl/interfaces/gtk2/gtk2proc.inc +++ b/lcl/interfaces/gtk2/gtk2proc.inc @@ -4851,8 +4851,6 @@ begin if (csfUpdateSignalMask in ASFlags) and (AReqSignalMask <> 0) then begin MainWidget := GetMainWidget(PGtkWidget(AnObject)); - if MainWidget=nil - then MainWidget := PGtkWidget(AnObject); WinWidgetInfo := GetWidgetInfo(MainWidget,true); WinWidgetInfo^.EventMask := WinWidgetInfo^.EventMask or AReqSignalMask; end; @@ -4982,8 +4980,6 @@ procedure ConnectInternalWidgetsSignals(AWidget: PGtkWidget; DesignFlags: TConnectSignalFlags; begin //if AWinControl is TListView then DebugLn('ConnectSignals A ',DbgS(TheWidget)); - if TheWidget=nil then exit; - // check if TheWidget belongs to another LCL object LCLObject:=GetLCLObject(TheWidget); HiddenLCLObject:=GetHiddenLCLObject(TheWidget); diff --git a/lcl/interfaces/gtk2/gtk2widgetset.inc b/lcl/interfaces/gtk2/gtk2widgetset.inc index 61c34d84f0..b672b55632 100644 --- a/lcl/interfaces/gtk2/gtk2widgetset.inc +++ b/lcl/interfaces/gtk2/gtk2widgetset.inc @@ -477,8 +477,6 @@ begin // gCore is the working widget (e.g. TListBox has a scrolling widget (=main widget) and a tree widget (=core widget)) gCore:=PGtkObject(Info^.CoreWidget); gMain:=GetMainWidget(gObject); - if (gMain=nil) then - gMain:=gObject; if (gMain<>gObject) then DebugLn(['TGtkWidgetSet.SetCallback WARNING: gObject<>MainWidget ',DbgSName(ALCLObject)]);