ifdef out some wxGTK specific code

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

diff --git a/include/wx/objstrm.h b/include/wx/objstrm.h
index a2fe96082cea9ed1fc3261cb1194a104a712c2e9..fbe79e4503378bd5efaf4d71f6ab3ea3db3b61a2 100644 (file)
--- a/include/wx/objstrm.h
+++ b/include/wx/objstrm.h
@@ -8,8 +8,8 @@
 // Copyright:   (c) 1998 Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
-#ifndef __WXOBJSTRM_H__
-#define __WXOBJSTRM_H__
+#ifndef _WX_WXOBJSTRM_H__
+#define _WX_WXOBJSTRM_H__
 
 #ifdef __GNUG__
 #pragma interface
@@ -23,9 +23,9 @@
 class wxObjectStreamInfo : public wxObject {
  public:
   wxString object_name;
-  int n_children;
+  int n_children, children_removed;
   wxList children;
-  wxObject *parent;
+  wxObjectStreamInfo *parent;
   wxObject *object;
 };
 
@@ -33,7 +33,7 @@ class wxObjectOutputStream : public wxFilterOutputStream {
  public:
   wxObjectOutputStream(wxOutputStream& s);
 
-  void AddChildren(wxObject *obj);
+  void AddChild(wxObject *obj);
   bool SaveObject(wxObject& obj);
 
   bool FirstStage() const { return m_stage == 0; }
@@ -56,7 +56,9 @@ class wxObjectInputStream : public wxFilterInputStream {
   wxObjectInputStream(wxInputStream& s);
 
   wxObject *GetChild(int no) const;
-  wxObject *GetParent() const { return m_current_info->parent; }
+  int NumberOfChildren() const { return m_current_info->n_children; }
+  void RemoveChildren(int nb);
+  wxObject *GetParent() const;
   wxObject *LoadObject();
 
   wxObject *SolveName(const wxString& objName) const;