[Fxruby-commits] CVS: FXRuby/ext/fox markfuncs.cpp,1.13.2.1,1.13.2.2

[Lyle J. <ly...@us...>]

Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv16391

Modified Files:
      Tag: release10
	markfuncs.cpp 
Log Message:
Commented out what are (I think) some unnecessary calls to FXRbGcMark()
for things like tree items and the like (see SourceForge Bug #534365).
But I'm not sure this fixes Gilles' problem with stack overflow (if that
is indeed the problem).


Index: markfuncs.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/markfuncs.cpp,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -d -r1.13.2.1 -r1.13.2.2
*** markfuncs.cpp	25 Apr 2002 02:44:26 -0000	1.13.2.1
--- markfuncs.cpp	6 May 2002 20:16:40 -0000	1.13.2.2
***************
*** 304,316 ****
    FXRbObject::markfunc(self);
    if(self){
!     FXRbGcMark(self->getParent());
!     FXRbGcMark(self->getNext());
!     FXRbGcMark(self->getPrev());
      for(FXTreeItem* item=self->getFirst(); item; item=item->getNext()){
!       FXRbGcMark(item);
        FXRbTreeItem::markfunc(item);
        }
!     FXRbGcMark(self->getBelow());
!     FXRbGcMark(self->getAbove());
      FXRbGcMark(self->getOpenIcon());
      FXRbGcMark(self->getClosedIcon());
--- 304,316 ----
    FXRbObject::markfunc(self);
    if(self){
!     // FXRbGcMark(self->getParent());
!     // FXRbGcMark(self->getNext());
!     // FXRbGcMark(self->getPrev());
      for(FXTreeItem* item=self->getFirst(); item; item=item->getNext()){
!       // FXRbGcMark(item);
        FXRbTreeItem::markfunc(item);
        }
!     // FXRbGcMark(self->getBelow());
!     // FXRbGcMark(self->getAbove());
      FXRbGcMark(self->getOpenIcon());
      FXRbGcMark(self->getClosedIcon());
***************
*** 332,336 ****
    if(self){
      for(FXTreeItem* item=self->getFirstItem(); item; item=item->getNext()){
!       FXRbGcMark(item);
        FXRbTreeItem::markfunc(item);
        }
--- 332,336 ----
    if(self){
      for(FXTreeItem* item=self->getFirstItem(); item; item=item->getNext()){
!       // FXRbGcMark(item);
        FXRbTreeItem::markfunc(item);
        }
***************
*** 363,367 ****
      for(FXint i=0;i<self->getNumItems();i++){
        FXListItem* item=self->retrieveItem(i);
!       FXRbGcMark(item);
        FXRbListItem::markfunc(item);
        if(self->getItemData(i))
--- 363,367 ----
      for(FXint i=0;i<self->getNumItems();i++){
        FXListItem* item=self->retrieveItem(i);
!       // FXRbGcMark(item);
        FXRbListItem::markfunc(item);
        if(self->getItemData(i))
***************
*** 429,433 ****
      for(FXint i=0;i<self->getNumItems();i++){
        FXHeaderItem* item=self->retrieveItem(i);
!       FXRbGcMark(item);
        FXRbHeaderItem::markfunc(item);
        if(item->getData())
--- 429,433 ----
      for(FXint i=0;i<self->getNumItems();i++){
        FXHeaderItem* item=self->retrieveItem(i);
!       // FXRbGcMark(item);
        FXRbHeaderItem::markfunc(item);
        if(item->getData())
***************
*** 464,468 ****
      for(FXint i=0;i<self->getNumItems();i++){
        FXIconItem* item=self->retrieveItem(i);
!       FXRbGcMark(item);
        FXRbIconItem::markfunc(item);
        if(self->getItemData(i))
--- 464,468 ----
      for(FXint i=0;i<self->getNumItems();i++){
        FXIconItem* item=self->retrieveItem(i);
!       // FXRbGcMark(item);
        FXRbIconItem::markfunc(item);
        if(self->getItemData(i))
***************
*** 763,767 ****
      FXRbGcMark(self->getFont());
      for(FXTreeItem* item=self->getFirstItem();item!=0;item=item->getNext()){
!       FXRbGcMark(item);
        FXRbTreeItem::markfunc(item);
        }
--- 763,767 ----
      FXRbGcMark(self->getFont());
      for(FXTreeItem* item=self->getFirstItem();item!=0;item=item->getNext()){
!       // FXRbGcMark(item);
        FXRbTreeItem::markfunc(item);
        }