Removed error-prone ColumnList::Serialize (and old one is now SerializeSettings to avoid confusion)

git-svn-id: svn://ultimatepp.org/upp/trunk@1111 f0d560ea-af0d-0410-9eb7-867de7ffcac7

uppsrc/CtrlLib/ColumnList.cpp

@@ -1013,16 +1013,16 @@ void ColumnList::SerializeSettings(Stream& s) {
 	SyncInfo();
 }
 
+/* Error-prone!
 void ColumnList::Serialize(Stream& s) {
 	int version = 1;
 	s / version / ncl;
 	if(version >= 1) {
-		int cnt;
+		int cnt = item.GetCount();
 		s.Magic();
 		s / cnt;
-		if (s.IsLoading())
-			item.SetCount(cnt);
-		for (int i = 0; i < item.GetCount(); i++) {
+		item.SetCount(cnt);
+		for(int i = 0; i < cnt; i++) {
 			Item &q = item[i];
 			s % q.key % q.value % q.canselect;
 			if (s.IsLoading()) {
@@ -1035,6 +1035,7 @@ void ColumnList::Serialize(Stream& s) {
 	Refresh();
 	SyncInfo();
 }
+*/
 
 ColumnList::ColumnList() {
 	clickkill = false;

uppsrc/CtrlLib/ColumnList.h

@@ -1,6 +1,5 @@
 class ColumnList : public Ctrl, private CtrlFrame {
 public:
-	virtual void  Serialize(Stream& s);
 	virtual void  Paint(Draw& w);
 	virtual void  Layout();
 	virtual Image CursorImage(Point p, dword);

uppsrc/CtrlLib/FileSel.cpp

@@ -1211,7 +1211,7 @@ void FileSel::Serialize(Stream& s) {
 	}
 	if(version >= 2) {
 		SerializePlacement(s);
-		s % list;
+		list.SerializeSettings(s);
 	}
 	if(version >= 3) {
 		s % lastsby;

uppsrc/ide/Browser/TopicWin.cpp

@@ -58,7 +58,7 @@ void TopicEditor::Serialize(Stream& s)
 	s / version;
 	editor.SerializeSettings(s);
 	s % left_right;
-	topic.Serialize(s);
+	topic.SerializeSettings(s);
 	s % allfonts;
 	SyncFonts();
 }

uppsrc/ide/idewin.cpp

@@ -90,8 +90,8 @@ void Ide::Serialize(Stream& s) {
 	s % AnyPackageFs();
 	s % pfsplit;
 	s % wesplit;
-	s % package;
-	s % filelist;
+	package.SerializeSettings(s);
+	filelist.SerializeSettings(s);
 	s % editorfont;
 	if(version >= 6)
 		s % tfont;