reduced debugging output and extended debugging of lcl

git-svn-id: trunk@8565 -

components/codetools/eventcodetool.pas

@@ -35,7 +35,7 @@ interface
 
 {$I codetools.inc}
 
-{$DEFINE CTDEBUG}
+{ $DEFINE CTDEBUG}
 { $DEFINE ShowAllProcs}
 
 uses

components/rtticontrols/rttictrls.pas

@@ -1999,6 +1999,7 @@ var
 begin
   Result:=false;
   if not GetSetTypeData(CompData,TypeData) then exit;
+  if (CompData=nil) or (TypeData=nil) then ;
   i:=GetIndexOfSetElement(AliasName);
   if i>=0 then begin
     Integer(IntegerSet) := Editor.GetOrdValue;
@@ -2015,6 +2016,7 @@ var
   IntegerSet: TIntegerSet;
 begin
   if not GetSetTypeData(CompData,TypeData) then exit;
+  if (CompData=nil) or (TypeData=nil) then ;
   i:=GetIndexOfSetElement(AliasName);
   if i>=0 then begin
     Integer(IntegerSet) := Editor.GetOrdValue;

components/rtticontrols/rttigrids.pas

@@ -889,6 +889,7 @@ begin
   Canvas.FillRect(aRect);
   //debugln('TTICustomGrid.DefaultDrawCell A Col=',dbgs(aCol),' Row=',dbgs(aRow));
   MapCell(aCol,aRow,ObjectIndex,PropertyIndex,CellType);
+  if (PropertyIndex=0) then ;
   if CellType in [tgctValue,tgctPropName] then begin
     // fetch a property editor and draw cell
     PropEditor:=nil;
@@ -1147,6 +1148,7 @@ var
 begin
   Result:=nil;
   MapCell(Col,Row,ObjectIndex,PropertyIndex,CellType);
+  if (ObjectIndex=0) or (PropertyIndex=0) then ;
   if CellType=tgctValue then
     Result:=Properties[PropertyIndex];
 end;

ide/main.pp

@@ -1779,6 +1779,7 @@ begin
   SetupEnvironmentMenu;
   SetupWindowsMenu;
   SetupHelpMenu;
+  mnuMain.MenuItem:=MainIDEBar.mnuMainMenu.Items;
 end;
 
 procedure TMainIDE.SetupStandardIDEMenuItems;

ide/mainbase.pas

@@ -316,7 +316,7 @@ procedure TMainIDEBase.SetupMainMenu;
 begin
   MainIDEBar.mnuMainMenu := TMainMenu.Create(MainIDEBar);
   with MainIDEBar do begin
-    mnuMain:=RegisterIDEMenuRoot('IDEMainMenu',mnuMainMenu.Items);
+    mnuMain:=RegisterIDEMenuRoot('IDEMainMenu',nil);
     CreateMainMenuItem(mnuFile,'File',lisMenuFile);
     CreateMainMenuItem(mnuEdit,'Edit',lisMenuEdit);
     CreateMainMenuItem(mnuSearch,'Search',lisMenuSearch);

lcl/include/menuitem.inc

@@ -116,6 +116,7 @@ end;
 procedure TMenuItem.CreateHandle;
 var i: Integer;
 begin
+  //DebugLn('TMenuItem.CreateHandle ',dbgsName(Self),' ',dbgs(Self));
   //DebugLn('TMenuItem.CreateHandle START ',Name,':',ClassName);
   if not FVisible then RaiseGDBException('');
   Handle := TWSMenuItemClass(WidgetSetClass).CreateHandle(Self);
@@ -562,6 +563,7 @@ procedure TMenuItem.DestroyHandle;
 var i: integer;
 begin
   if not HandleAllocated then exit;
+  //DebugLn('TMenuItem.DestroyHandle ',dbgsName(Self),' ',dbgs(Self));
   if assigned (FItems) then begin
     i := FItems.Count-1;
     while i>=0 do begin

lcl/interfaces/gtk/gtklistsl.inc

@@ -759,6 +759,9 @@ var
 begin
   UpdateItemCache;
   RemoveItemCallbacks(Index);
+  {$IFDEF DebugLCLComponents}
+  DebugGtkWidgets.MarkDestroyed(FCachedItems[Index]);
+  {$ENDIF}
   // remove item from cache
   if (Index<FCachedCount-1) then begin
     System.Move(FCachedItems[Index+1],FCachedItems[Index],
@@ -778,14 +781,16 @@ begin
     { Work round gtk bug - crashes if deleting first item in list
       and item has focus and there are remaining items }
     if (Index = 0) and (PGTKContainer(FGtkList)^.focus_child <> nil)
-       and (gtk_list_child_position(FGtkList,PGTKContainer(FGtkList)^.focus_child) = 0) then begin
+       and (gtk_list_child_position(FGtkList,PGTKContainer(FGtkList)^.focus_child) = 0)
+    then begin
       Next := FGtkList^.children^.next;
       if Next <> nil then
-       gtk_widget_grab_focus(Next^.data);
+        gtk_widget_grab_focus(Next^.data);
     end;
     {$ENDIF}
   end;
   gtk_list_clear_items(FGtkList, Index, Index + 1);
+  Include(FStates,glsItemCacheNeedsUpdate);
   {$IFDEF CheckGtkList}
   ConsistencyCheck;
   {$ENDIF}
@@ -871,6 +876,9 @@ begin
     else begin
       li:=gtk_list_item_new_with_label(PChar(S));
     end;
+    {$IFDEF DebugLCLComponents}
+    DebugGtkWidgets.MarkCreated(li,dbgsName(Owner)+' Index='+dbgs(Index)+' Count='+dbgs(Count));
+    {$ENDIF}
     ConnectItemCallbacks(PGtkListItem(li));
     // grow capacity
     UpdateItemCache;

lcl/interfaces/gtk/gtkobject.inc

@@ -5466,6 +5466,9 @@ begin
   end; //end case
   StrDispose(StrTemp);
   FinishComponentCreate(Sender, P, SetupProps);
+  {$IFDEF DebugLCLComponents}
+  DebugGtkWidgets.MarkCreated(P,dbgsName(Sender));
+  {$ENDIF}
   Result := THandle(P);
 end;
 

lcl/interfaces/gtk/gtkwscontrols.pp

@@ -774,7 +774,8 @@ begin
   Result := (DeliverMessage(AInfo^.LCLObject, Msg) <> 0) xor CallBackDefaultReturn;
 end;
 
-function TGtkWSBaseScrollingWinControl.CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): HWND;
+function TGtkWSBaseScrollingWinControl.CreateHandle(
+  const AWinControl: TWinControl; const AParams: TCreateParams): HWND;
 var
   Widget: PGtkWidget;
   WidgetInfo: PWidgetInfo;
@@ -782,6 +783,10 @@ var
   Allocation: TGTKAllocation;
 begin
   Widget := gtk_scrolled_window_new(nil, nil);
+  {$IFDEF DebugLCLComponents}
+  DebugGtkWidgets.MarkCreated(Widget,dbgsName(AWinControl));
+  {$ENDIF}
+
   Result := THandle(Widget);
   if Result = 0 then Exit;
 

lcl/lclproc.pas

@@ -91,7 +91,7 @@ type
     Info: string;
   end;
   PLineInfoCacheItem = ^TLineInfoCacheItem;
-  
+
 {$IFDEF DebugLCLComponents}
 var
   DebugLCLComponents: TDebugLCLItems = nil;

packager/pkgmanager.pas

@@ -1998,13 +1998,13 @@ begin
       DebugLn('WARNING: TPkgManager.MacroFunctionPkgSrcPath unknown package id: ',FuncData^.Param);
     end;
     //if AnsiCompareText(APackage.IDAsString,'uni_avglvltree')=0 then begin
-    debugln('TPkgManager.MacroFunctionPkgSrcPath PkgID=',FuncData^.Param,' ',dbgs(APackage<>nil),' FuncData^.Result="',FuncData^.Result,'"');
-    if APackage<>nil then begin
+    //debugln('TPkgManager.MacroFunctionPkgSrcPath PkgID=',FuncData^.Param,' ',dbgs(APackage<>nil),' FuncData^.Result="',FuncData^.Result,'"');
+    {if APackage<>nil then begin
       with APackage.SourceDirectories.CreateFileList do begin
         debugln(Text);
         Free;
       end;
-    end;
+    end;}
     //end;
   end else begin
     DebugLn('WARNING: TPkgManager.MacroFunctionPkgSrcPath invalid package id: ',FuncData^.Param);

tools/install/cross_unix/build_linux_cross_win32_rpm.sh

@@ -63,6 +63,7 @@ Targets='i386-win32'
 
 #===============================================================================
 # download and build binutils and fpc
+set -x
 Params=""
 if [ $DownloadBinutils = "yes" ]; then
   Params="$Params downloadbinutils"
@@ -79,7 +80,8 @@ fi
 if [ $BuildCrossFPC = "yes" ]; then
   Params="$Params buildcrossfpc"
 fi
-if [ "x$Params" == "x" ]; then
+
+if [ "x$Params" != "x" ]; then
   Params="$Params targets=i386-win32"
   echo "calling update_cross_fpc.sh $Params ..."
   ./update_cross_fpc.sh $Params