[tekui-devel] tekui: Element: corrected initialization of access to private data;

[Timm S. Mueller]

details:   http://hg.teklib.org/tekui/rev/76a695f31d7f
changeset: 396:76a695f31d7f
user:      Timm S. Mueller <tmueller at neoscientists.org>
date:      Sun Mar 30 17:44:05 2008 +0200
description:
Element: corrected initialization of access to private data;
Region:checkOverlap() now always returns a boolean

diffs (81 lines):

diff -r b213860da69a -r 76a695f31d7f tek/class/ui/element.lua
--- a/tek/class/ui/element.lua	Sun Mar 30 17:15:07 2008 +0200
+++ b/tek/class/ui/element.lua	Sun Mar 30 17:44:05 2008 +0200
@@ -27,7 +27,7 @@ local type = type
 local type = type
 
 module("tek.class.ui.element", tek.class.ui.object)
-_VERSION = "Element 4.0"
+_VERSION = "Element 4.1"
 local Element = _M
 
 -------------------------------------------------------------------------------
@@ -38,6 +38,21 @@ NOTIFY_WINDOW = function(val, self) retu
 NOTIFY_WINDOW = function(val, self) return self.Window end
 -- denotes/implements insertion of the application object:
 NOTIFY_APPLICATION = function(val, self) return self.Application end
+
+-------------------------------------------------------------------------------
+--	private = element:getPrivate(): Gets an element's private data.
+-------------------------------------------------------------------------------
+
+local function havePrivate(self)
+	return self.PrivateData
+end
+
+local function getPrivate(self)
+	self.getPrivate = havePrivate
+	local priv = { }
+	self.PrivateData = priv
+	return priv
+end
 
 -------------------------------------------------------------------------------
 --	Class implementation:
@@ -51,22 +66,8 @@ function Element.new(class, self)
 	self.Children = self.Children or false
 	self.Id = self.Id or false
 	self.PrivateData = false
+	self.getPrivate = getPrivate
 	return Object.new(class, self)
-end
-
--------------------------------------------------------------------------------
---	private = element:getPrivate(): Gets an element's private data.
--------------------------------------------------------------------------------
-
-local function havePrivate(self)
-	return self.PrivateData
-end
-
-function Element:getPrivate()
-	self.getPrivate = havePrivate
-	local priv = { }
-	self.PrivateData = priv
-	return priv
 end
 
 -------------------------------------------------------------------------------
diff -r b213860da69a -r 76a695f31d7f tek/class/ui/region.c
--- a/tek/class/ui/region.c	Sun Mar 30 17:15:07 2008 +0200
+++ b/tek/class/ui/region.c	Sun Mar 30 17:44:05 2008 +0200
@@ -585,7 +585,8 @@ static int region_checkoverlap(lua_State
 			return 1;
 		}
 	}
-	return 0;
+	lua_pushboolean(L, 1);
+	return 1;
 }
 
 /*****************************************************************************/
diff -r b213860da69a -r 76a695f31d7f tek/class/ui/region.lua
--- a/tek/class/ui/region.lua	Sun Mar 30 17:15:07 2008 +0200
+++ b/tek/class/ui/region.lua	Sun Mar 30 17:44:05 2008 +0200
@@ -250,4 +250,5 @@ function Region:checkOverlap(s1, s2, s3,
 			return true
 		end
 	end
-end
+	return false
+end