From 9e0debc328d0889fb852da5fd3e6250f6188afe9 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 26 May 2011 08:01:42 +0000
Subject: [PATCH] SqlCtrl: new SqlNOption similar to SqlOption, but returns
 Null on flase (instead of ''0'')

git-svn-id: svn://ultimatepp.org/upp/trunk@3458 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/SqlCtrl/SqlCtrl.cpp | 6 ++++++
 uppsrc/SqlCtrl/SqlCtrl.h   | 4 ++++
 uppsrc/SqlCtrl/SqlCtrl.usc | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/uppsrc/SqlCtrl/SqlCtrl.cpp b/uppsrc/SqlCtrl/SqlCtrl.cpp
index 79142d2d3..11530b187 100644
--- a/uppsrc/SqlCtrl/SqlCtrl.cpp
+++ b/uppsrc/SqlCtrl/SqlCtrl.cpp
@@ -54,6 +54,12 @@ Value SqlOption::GetData() const {
 	return Get() ? "1" : "0";
 }
 
+Value SqlNOption::GetData() const
+{
+	if(Get()) return "1";
+	return Null;
+}
+
 void SqlCtrls::Add(SqlId id, Ctrl& ctrl) {
 	Item& m = item.Add();
 	m.id = id;
diff --git a/uppsrc/SqlCtrl/SqlCtrl.h b/uppsrc/SqlCtrl/SqlCtrl.h
index 522ab93c7..efc822ed9 100644
--- a/uppsrc/SqlCtrl/SqlCtrl.h
+++ b/uppsrc/SqlCtrl/SqlCtrl.h
@@ -52,6 +52,10 @@ public:
 	virtual Value  GetData() const;
 };
 
+class SqlNOption : public SqlOption {
+	virtual Value  GetData() const;
+};
+
 class SqlArray : public ArrayCtrl {
 public:
 	virtual void  SetData(const Value& v);
diff --git a/uppsrc/SqlCtrl/SqlCtrl.usc b/uppsrc/SqlCtrl/SqlCtrl.usc
index d3d82ccfa..effb7c262 100644
--- a/uppsrc/SqlCtrl/SqlCtrl.usc
+++ b/uppsrc/SqlCtrl/SqlCtrl.usc
@@ -8,3 +8,9 @@ ctrl SqlOption {
 	>Option;
 	GetStdSize() { sz = GetMinSize(); sz.cx *= 8; sz.cy = max(16, sz.cy); return sz; }
 }
+
+ctrl SqlNOption {
+	group "Push";
+	>Option;
+	GetStdSize() { sz = GetMinSize(); sz.cx *= 8; sz.cy = max(16, sz.cy); return sz; }
+}