A fix for attribrute sorting, but it's still broken if there are

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

diff --git a/utils/serialize/serwnd.h b/utils/serialize/serwnd.h
index b195ec300ab136d50688248449cf982aab1e675a..38cdb657c19e9669e278ec946f3704f0fbe5f0cc 100644 (file)
--- a/utils/serialize/serwnd.h
+++ b/utils/serialize/serwnd.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     July 1998
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     July 1998
 // RCS-ID:      $Id$

-// Copyright:   (c) Guilhem Lavaux
+// Copyright:   (c) 1998 Guilhem Lavaux

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -35,16 +35,23 @@ class WXSERIAL(wxWindow) : public WXSERIAL(wxObject)
   wxWindowID m_id;
   wxString m_name, m_title, m_label;
   wxWindow *m_parent;
   wxWindowID m_id;
   wxString m_name, m_title, m_label;
   wxWindow *m_parent;

+  wxValidator *m_validator;
+  wxColour m_bg_colour, m_fg_colour;

   long m_style;
   long m_style;

+  int m_number;

 };
 
 DECLARE_SERIAL_CLASS(wxIndividualLayoutConstraint, wxObject)
 DECLARE_SERIAL_CLASS(wxLayoutConstraints, wxObject)
 };
 
 DECLARE_SERIAL_CLASS(wxIndividualLayoutConstraint, wxObject)
 DECLARE_SERIAL_CLASS(wxLayoutConstraints, wxObject)

+DECLARE_ALIAS_SERIAL_CLASS(wxValidator, wxObject)

 DECLARE_SERIAL_CLASS(wxFrame, wxWindow)
 DECLARE_SERIAL_CLASS(wxFrame, wxWindow)

-//DECLARE_SERIAL_CLASS(wxPanel, wxWindow)
-//DECLARE_SERIAL_CLASS(wxDialog, wxWindow)
+DECLARE_SERIAL_CLASS(wxPanel, wxWindow)
+DECLARE_SERIAL_CLASS(wxDialog, wxWindow)

 DECLARE_SERIAL_CLASS(wxMenuBar, wxWindow)
 DECLARE_SERIAL_CLASS(wxMenuItem, wxObject)
 DECLARE_SERIAL_CLASS(wxMenu, wxObject)
 DECLARE_SERIAL_CLASS(wxMenuBar, wxWindow)
 DECLARE_SERIAL_CLASS(wxMenuItem, wxObject)
 DECLARE_SERIAL_CLASS(wxMenu, wxObject)

+DECLARE_SERIAL_CLASS(wxMDIParentFrame, wxFrame)
+DECLARE_SERIAL_CLASS(wxMDIChildFrame, wxFrame)
+DECLARE_SERIAL_CLASS(wxMDIClientWindow, wxFrame)

 
 #endif
 
 #endif