Added sys/types.h needed for Solaris.

[wxWidgets.git] / utils / serialize / serctrl.h

diff --git a/utils/serialize/serctrl.h b/utils/serialize/serctrl.h
index d2eeb8244993d988e44c2fc6f6d7d35762a73e8a..8d7e89a8ff9ce50de2de175d4f7f55c5e1dc7e62 100644 (file)
--- a/utils/serialize/serctrl.h
+++ b/utils/serialize/serctrl.h
@@ -21,14 +21,32 @@
 
 DECLARE_ALIAS_SERIAL_CLASS(wxControl, wxWindow)
 DECLARE_SERIAL_CLASS(wxButton, wxControl)
 
 DECLARE_ALIAS_SERIAL_CLASS(wxControl, wxWindow)
 DECLARE_SERIAL_CLASS(wxButton, wxControl)

+#ifdef __WINDOWS__
+DECLARE_SERIAL_CLASS(wxSlider95, wxControl)
+DECLARE_SERIAL_CLASS(wxGauge95, wxControl)
+#else

 DECLARE_SERIAL_CLASS(wxSlider, wxControl)
 DECLARE_SERIAL_CLASS(wxSlider, wxControl)

+DECLARE_SERIAL_CLASS(wxGauge, wxControl)
+#endif

 DECLARE_SERIAL_CLASS(wxCheckBox, wxControl)
 DECLARE_SERIAL_CLASS(wxChoice, wxControl)
 DECLARE_SERIAL_CLASS(wxComboBox, wxControl)
 DECLARE_SERIAL_CLASS(wxCheckBox, wxControl)
 DECLARE_SERIAL_CLASS(wxChoice, wxControl)
 DECLARE_SERIAL_CLASS(wxComboBox, wxControl)

-DECLARE_SERIAL_CLASS(wxGauge, wxControl)

 DECLARE_SERIAL_CLASS(wxListBox, wxControl)
 DECLARE_SERIAL_CLASS(wxListBox, wxControl)

-DECLARE_SERIAL_CLASS(wxNotebook, wxControl)

 DECLARE_SERIAL_CLASS(wxRadioBox, wxControl)
 DECLARE_SERIAL_CLASS(wxRadioBox, wxControl)

+DECLARE_SERIAL_CLASS(wxRadioButton, wxControl)

 DECLARE_SERIAL_CLASS(wxStaticText, wxControl)
 DECLARE_SERIAL_CLASS(wxStaticText, wxControl)

+DECLARE_SERIAL_CLASS(wxStaticBox, wxControl)
+
+
+class WXSERIAL(wxNotebook) : public WXSERIAL(wxControl) {
+  DECLARE_DYNAMIC_CLASS( wxNotebook_Serialize )
+public:
+  void StoreObject(wxObjectOutputStream& s);
+  void LoadObject(wxObjectInputStream& s);
+
+protected:
+  int m_pcount;
+  wxArrayString m_stringlist;
+};

 
 #endif
 
 #endif