Renameing funktions to prevent name clashes

[wxWidgets.git] / include / wx / serbase.h

diff --git a/include/wx/serbase.h b/include/wx/serbase.h
index f4c3be113e0685589977cf503d19f8f3fe1b18cc..1ec7b6a52d6febf44724d9ccf365d32d6aa191eb 100644 (file)
--- a/include/wx/serbase.h
+++ b/include/wx/serbase.h
@@ -11,10 +11,12 @@
 #ifndef _WX_WX_SERBASEH_H__
 #define _WX_WX_SERBASEH_H__
 
 #ifndef _WX_WX_SERBASEH_H__
 #define _WX_WX_SERBASEH_H__
 

-#include <wx/dynlib.h>
+#include "wx/setup.h"
+#include "wx/dynlib.h"

 
 #define WXSERIAL(classname) classname##_Serialize
 
 
 #define WXSERIAL(classname) classname##_Serialize
 

+#if wxUSE_SERIAL

 class wxObject_Serialize : public wxObject {
   DECLARE_DYNAMIC_CLASS(wxObject_Serialize)
  public:
 class wxObject_Serialize : public wxObject {
   DECLARE_DYNAMIC_CLASS(wxObject_Serialize)
  public:


@@ -27,6 +29,8 @@ class wxObject_Serialize : public wxObject {
  protected:
   wxObject *m_object;
 };
  protected:
   wxObject *m_object;
 };

+#endif
+  // wxUSE_SERIAL

 
 
 #define DECLARE_SERIAL_CLASS(classname, parent) \
 
 
 #define DECLARE_SERIAL_CLASS(classname, parent) \


@@ -54,4 +58,10 @@ IMPLEMENT_DYNAMIC_CLASS(classname##_Serialize, parent##_Serialize)
 #define IMPLEMENT_ALIAS_SERIAL_CLASS(classname, parent) \
 IMPLEMENT_DYNAMIC_CLASS(classname##_Serialize, parent##_Serialize)
 
 #define IMPLEMENT_ALIAS_SERIAL_CLASS(classname, parent) \
 IMPLEMENT_DYNAMIC_CLASS(classname##_Serialize, parent##_Serialize)
 

+#if wxUSE_SERIAL
+DECLARE_SERIAL_CLASS(wxList, wxObject)
+DECLARE_SERIAL_CLASS(wxHashTable, wxObject)
+#endif
+ // wxUSE_SERIAL
+

 #endif
 #endif