X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..d10e22fe8ad283f37b1809349028ffc282e393ce:/src/common/xtixml.cpp

diff --git a/src/common/xtixml.cpp b/src/common/xtixml.cpp
index 79e77061fc..91b094d6eb 100644
--- a/src/common/xtixml.cpp
+++ b/src/common/xtixml.cpp
@@ -1,39 +1,36 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/xtistrm.cpp
+// Name:        src/common/xtixml.cpp
 // Purpose:     streaming runtime metadata information
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xtistrm.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_EXTENDED_RTTI
+
+#include "wx/xtixml.h"
+
 #ifndef WX_PRECOMP
-#include "wx/hash.h"
-#include "wx/object.h"
+    #include "wx/object.h"
+    #include "wx/hash.h"
+    #include "wx/event.h"
 #endif
 
 #include "wx/xml/xml.h"
 #include "wx/tokenzr.h"
 #include "wx/txtstrm.h"
-#include "wx/event.h"
-
-#if wxUSE_EXTENDED_RTTI
 
 #include "wx/xtistrm.h"
-#include "wx/xtixml.h"
 
 #include "wx/beforestd.h"
 #include <map>
@@ -233,7 +230,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
             else
             {
                 wxLogError( _("Forward hrefs are not supported") ) ;
-                return wxInvalidObjectID ;                
+                return wxInvalidObjectID ;
             }
         }
         if ( !node->GetPropVal(wxT("id") , &ObjectIdString ) )
@@ -255,7 +252,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
 
     if ( children != NULL && children->GetType() == wxXML_TEXT_NODE )
     {
-        wxLogError(_("objects cannot have XML Text Nodes") ) ; 
+        wxLogError(_("objects cannot have XML Text Nodes") ) ;
         return wxInvalidObjectID;
     }
     if (!node->GetPropVal(wxT("id"), &ObjectIdString))
@@ -268,7 +265,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
     // is this object already has been streamed in, return it here
     if ( HasObjectClassInfo( objectID ) )
     {
-        wxLogError ( wxString::Format(_("Doubly used id : %d"), objectID ) ) ; 
+        wxLogError ( wxString::Format(_("Doubly used id : %d"), objectID ) ) ;
         return wxInvalidObjectID ;
     }
 
@@ -538,4 +535,4 @@ int wxXmlReader::ReadObject( const wxString &name , wxDepersister *callbacks)
     return wxInvalidObjectID ;
 }
 
-#endif
+#endif // wxUSE_EXTENDED_RTTI