Update of /cvsroot/plib/plib/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv22314
Modified Files:
pu.cxx
Log Message:
John F. Fay: Undo of rev. 1.53 => 1.54 changes
Index: pu.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.cxx,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- pu.cxx 17 Sep 2002 22:45:38 -0000 1.59
+++ pu.cxx 19 Sep 2002 22:33:51 -0000 1.60
@@ -193,41 +193,27 @@
puGroup *parent = ob->getParent () ;
- /*if ( !ob->IsItSubWidget() )
- {*/
- /* Add object to linked list to be deleted */
- if ( objects_to_delete == NULL )
- objects_to_delete = ob ;
- else
- {
- /* Ensure that objects are deleted in the order of puDeleteObject calls */
+ /* Add object to linked list to be deleted */
+ if ( objects_to_delete == NULL )
+ objects_to_delete = ob ;
+ else
+ {
+ /* Ensure that objects are deleted in the order of puDeleteObject calls */
- puObject *last ;
+ puObject *last ;
- for ( last = objects_to_delete ;
- last -> getNextObject() != NULL ;
- last = last -> getNextObject() )
- /* Find last object. */ ;
+ for ( last = objects_to_delete ;
+ last -> getNextObject() != NULL ;
+ last = last -> getNextObject() )
+ /* Find last object. */ ;
- last -> setNextObject ( ob ) ;
- }
- /* Remove from parent interface */
-
- if ( parent != ob && parent != NULL )
- parent -> remove ( ob ) ; /* Sets object's next and previous pointers to null as well */
+ last -> setNextObject ( ob ) ;
+ }
- /* If it is a group, then delete all child objects as well */
- if ( ob->getType () & PUCLASS_GROUP )
- {
- puObject *child = ((puGroup *)ob)->getFirstChild () ;
- while ( child )
- {
- puObject *next = child->getNextObject () ;
- puDeleteObject ( child ) ;
- child = next ;
- }
- }
- /*}*/
+ /* Remove from parent interface */
+
+ if ( parent != ob && parent != NULL )
+ parent -> remove ( ob ) ; /* Sets object's next and previous pointers to null as well */
}
|
