added support for leaving out <embedded objects> that are created during their parent...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp
index 10dacef13f8507ccbc96cda84023bc24301d8763..e8267575867e4ad1dd45cfea56f0ec211079df04 100644 (file)
--- a/src/common/xtistrm.cpp
+++ b/src/common/xtistrm.cpp
@@ -78,6 +78,13 @@ void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo
 
 void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , bool isEmbedded)
 {
 
 void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , bool isEmbedded)
 {

+    // hack to avoid writing out embedded windows, these are windows that are constructed as part of other windows, they would
+    // doubly constructed afterwards
+
+    const wxWindow * win = dynamic_cast<const wxWindow*>(object) ;
+    if ( win && win->GetId() < 0 )
+        return ;
+

     if ( persister->BeforeWriteObject( this , object , classInfo ) )
     {
         if ( object == NULL )
     if ( persister->BeforeWriteObject( this , object , classInfo ) )
     {
         if ( object == NULL )


@@ -578,25 +585,28 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
                     {
                         wxASSERT_MSG(prop->GetName() == wxT("element") , wxT("A non empty collection must consist of 'element' nodes")) ;
                         wxXmlNode* elementContent = prop->GetChildren() ;
                     {
                         wxASSERT_MSG(prop->GetName() == wxT("element") , wxT("A non empty collection must consist of 'element' nodes")) ;
                         wxXmlNode* elementContent = prop->GetChildren() ;

-                        wxASSERT_MSG(elementContent, wxT("An element node cannot be empty")) ;
-                        if ( elementType->IsObjectType() )
+                        if ( elementContent )

                         {
                         {

-                            int valueId = ReadComponent( elementContent , callbacks ) ;
-                            if ( valueId != wxInvalidObjectID )
+                            // we skip empty elements
+                            if ( elementType->IsObjectType() )
+                            {
+                                int valueId = ReadComponent( elementContent , callbacks ) ;
+                                if ( valueId != wxInvalidObjectID )
+                                {
+                                    if ( pi->GetAccessor()->HasAdder() )
+                                        callbacks->AddToPropertyCollectionAsObject( objectID , classInfo , pi , valueId ) ;
+                                    // TODO for collections we must have a notation on taking over ownership or not 
+                                    if ( elementType->GetKind() == wxT_OBJECT && valueId != wxNullObjectID )
+                                        callbacks->DestroyObject( valueId , GetObjectClassInfo( valueId ) ) ;
+                                }
+                            }
+                            else

                             {
                             {

+                                wxxVariant elementValue = ReadValue( elementContent , elementType ) ;

                                 if ( pi->GetAccessor()->HasAdder() )
                                 if ( pi->GetAccessor()->HasAdder() )

-                                    callbacks->AddToPropertyCollectionAsObject( objectID , classInfo , pi , valueId ) ;
-                                // TODO for collections we must have a notation on taking over ownership or not 
-                                if ( elementType->GetKind() == wxT_OBJECT && valueId != wxNullObjectID )
-                                    callbacks->DestroyObject( valueId , GetObjectClassInfo( valueId ) ) ;
+                                    callbacks->AddToPropertyCollection( objectID , classInfo ,pi , elementValue ) ;

                             }
                         }
                             }
                         }

-                        else
-                        {
-                            wxxVariant elementValue = ReadValue( elementContent , elementType ) ;
-                            if ( pi->GetAccessor()->HasAdder() )
-                                callbacks->AddToPropertyCollection( objectID , classInfo ,pi , elementValue ) ;
-                        }

                         prop = prop->GetNext() ;
                     }
                 }
                         prop = prop->GetNext() ;
                     }
                 }