From 0964208853d65bce610e30eb2665d7c4b0bb49dd Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 12 Jun 2016 06:11:03 +0000
Subject: [PATCH] .examples

git-svn-id: svn://ultimatepp.org/upp/trunk@9924 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 examples/CompDir/CompDir.lay                     |  4 ----
 examples/CompDir/CompDir.upp                     |  2 +-
 examples/CompDir/main.cpp                        | 11 ++++++-----
 examples/ScatterCtrl_Demo/tab14_UserEquation.cpp |  2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/examples/CompDir/CompDir.lay b/examples/CompDir/CompDir.lay
index c6655a7b5..d68efdd80 100644
--- a/examples/CompDir/CompDir.lay
+++ b/examples/CompDir/CompDir.lay
@@ -1,5 +1,3 @@
-#ifdef LAYOUTFILE
-
 LAYOUT(CompareDirLayout, 496, 492)
 	ITEM(Label, dv___0, SetLabel(t_("Folder &A:")).LeftPosZ(4, 52).TopPosZ(4, 19))
 	ITEM(EditField, path_a, HSizePosZ(56, 4).TopPosZ(4, 19))
@@ -11,5 +9,3 @@ LAYOUT(CompareDirLayout, 496, 492)
 	ITEM(Splitter, splitter, HSizePosZ(4, 4).VSizePosZ(70, 4))
 END_LAYOUT
 
-#endif
-
diff --git a/examples/CompDir/CompDir.upp b/examples/CompDir/CompDir.upp
index cb5a27857..5835033c6 100644
--- a/examples/CompDir/CompDir.upp
+++ b/examples/CompDir/CompDir.upp
@@ -1,4 +1,4 @@
-description "Compares directory contents";
+description "Compares directory contents\377";
 
 uses
 	CtrlLib;
diff --git a/examples/CompDir/main.cpp b/examples/CompDir/main.cpp
index f161f2c01..66a6a2bd9 100644
--- a/examples/CompDir/main.cpp
+++ b/examples/CompDir/main.cpp
@@ -109,9 +109,9 @@ void DlgCompareDir::Serialize(Stream& stream)
 
 void DlgCompareDir::CmdRefresh()
 {
-	pa = path_a;
-	pb = path_b;
-	fm = file_mask;
+	pa = ~path_a;
+	pb = ~path_b;
+	fm = ~file_mask;
 	tree.Clear();
 	Image icon;
 	switch(Refresh(Null, 0)) {
@@ -204,7 +204,7 @@ String DlgCompareDir::GetTreePath() const
 	int f = s.Find(':');
 	if(f >= 0)
 		s.Trim(f);
-	while(i = tree.GetParent(i))
+	while((i = tree.GetParent(i)) != 0)
 		s = AppendFileName(String(tree.Get(i)), s);
 	return s;
 }
@@ -216,7 +216,7 @@ void DlgCompareDir::DoTreeCursor()
 		return;
 	String fa = AppendFileName(pa, s), fb = AppendFileName(pb, s);
 	String da = LoadFile(fa), db = LoadFile(fb);
-	if(!IsNull(da) || !IsNull(db))
+	if(!IsNull(da) || !IsNull(db)) {
 		if(IsNull(da) || IsNull(db)) {
 			qtf.Hide();
 			lineedit.Show();
@@ -261,6 +261,7 @@ void DlgCompareDir::DoTreeCursor()
 			}
 			qtf.SetQTF(comptext);
 		}
+	}
 }
 
 void DlgCompareDir::DoBrowse(Ctrl *field)
diff --git a/examples/ScatterCtrl_Demo/tab14_UserEquation.cpp b/examples/ScatterCtrl_Demo/tab14_UserEquation.cpp
index 6055f3915..5c0ac8716 100644
--- a/examples/ScatterCtrl_Demo/tab14_UserEquation.cpp
+++ b/examples/ScatterCtrl_Demo/tab14_UserEquation.cpp
@@ -24,7 +24,7 @@ void TabUserEquation::OnUpdate()
 		return;	
 	}
 	
-	userEquation.Init("User equation", equation);
+	userEquation.Init("User equation", ~equation);
 	
 	scatter.RemoveAllSeries();
 	scatter.AddSeries(userEquation).Legend(userEquation.GetFullName()).NoMark().Stroke(2);