wxPickerBase derives from wxControl, not wxWindow

[wxWidgets.git] / src / common / xtixml.cpp

diff --git a/src/common/xtixml.cpp b/src/common/xtixml.cpp
index 3bd916c1902644d134aab7732924a2634c8bbde5..91b094d6ebb9657cd68b142564c7df13c727b7f2 100644 (file)
--- a/src/common/xtixml.cpp
+++ b/src/common/xtixml.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/common/xtistrm.cpp
+// Name:        src/common/xtixml.cpp

 // Purpose:     streaming runtime metadata information
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     streaming runtime metadata information
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,31 +9,28 @@
 // Licence:     wxWindows 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__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_EXTENDED_RTTI
+
+#include "wx/xtixml.h"
+

 #ifndef WX_PRECOMP
 #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"
 #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/xtistrm.h"

-#include "wx/xtixml.h"

 
 #include "wx/beforestd.h"
 #include <map>
 
 #include "wx/beforestd.h"
 #include <map>


@@ -233,7 +230,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
             else
             {
                 wxLogError( _("Forward hrefs are not supported") ) ;
             else
             {
                 wxLogError( _("Forward hrefs are not supported") ) ;

-                return wxInvalidObjectID ;                
+                return wxInvalidObjectID ;

             }
         }
         if ( !node->GetPropVal(wxT("id") , &ObjectIdString ) )
             }
         }
         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 )
     {
 
     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))
         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 ) )
     {
     // 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 ;
     }
 
         return wxInvalidObjectID ;
     }
 


@@ -538,4 +535,4 @@ int wxXmlReader::ReadObject( const wxString &name , wxDepersister *callbacks)
     return wxInvalidObjectID ;
 }
 
     return wxInvalidObjectID ;
 }
 

-#endif
+#endif // wxUSE_EXTENDED_RTTI