[tekui-devel] tekui: Image class now descends from Gadget, VectorImage descend...

[Timm S. Mueller]

details:   http://hg.teklib.org/tekui/rev/08785d4cd7c5
changeset: 374:08785d4cd7c5
user:      Timm S. Mueller <tmueller at neoscientists.org>
date:      Wed Mar 19 23:05:04 2008 +0100
description:
Image class now descends from Gadget, VectorImage descends from Object,
removed ImageArea; cleanup in many tests; removed remaining occurrances of
getBgPen(); Gadget:checkFocus() now considers Mode="inert", removed many
occurrances of checkFocus(); CheckMark now descends from Text; Text:setState()
no longer needed; Arrow buttons in ScrollGroup now descend from Image

diffs (truncated from 727 to 100 lines):

diff -r bbc900334215 -r 08785d4cd7c5 TODO
--- a/TODO	Wed Mar 19 17:17:55 2008 +0100
+++ b/TODO	Wed Mar 19 23:05:04 2008 +0100
@@ -14,6 +14,8 @@
  * Radiobutton [ok]
 
 === General ===
+
+ * Alignment paramters: "left", "right", ...
 
  * Change theme, Application.ThemeName
  * Caption vs. Label
diff -r bbc900334215 -r 08785d4cd7c5 tek/app/ui/imagetest.lua
--- a/tek/app/ui/imagetest.lua	Wed Mar 19 17:17:55 2008 +0100
+++ b/tek/app/ui/imagetest.lua	Wed Mar 19 23:05:04 2008 +0100
@@ -1,10 +1,6 @@
 #!/usr/bin/env lua
 
-require "tek.lib.debug".level = 4
--- require "tek.lib"
 local ui = require "tek.lib.ui"
-
--------------------------------------------------------------------------------
 
 image = ui.vectorimage:new
 {
@@ -26,16 +22,16 @@ image = ui.vectorimage:new
 		{
 			{
 				0x1000,	-- format code / primitive type
-				3, -- anzahl punkte
-				Points = { 1,2,3 },
+				3, -- number of vertices
+				Points = { 1, 2, 3 },
 				Pen = ui.PEN_HALFSHINE,
 			},
 			{
 				0x1001,	-- format code / primitive type
-				4, -- anzahl punkte
-				Points = { 4,5,6,7 },
-				-- pen = ui.PEN_HALFSHADOW,
-				Pens = { ui.PEN_HALFSHINE, ui.PEN_HALFSHADOW, ui.PEN_HALFSHADOW, ui.PEN_HALFSHINE }
+				4, -- number of vertices
+				Points = { 4, 5, 6, 7 },
+				Pens = { ui.PEN_HALFSHINE,
+					ui.PEN_HALFSHADOW, ui.PEN_HALFSHADOW, ui.PEN_HALFSHINE }
 			},
 		},
 
@@ -46,91 +42,13 @@ image = ui.vectorimage:new
 	},
 }
 
--------------------------------------------------------------------------------
-
-imgbutton = ui.button:newClass()
-
-function imgbutton.new(class, self)
-	self = self or { }
-	self = ui.button.new(class, self)
-	self.img = ui.imagearea:new { Image = image }
-	return self
-end
-
-function imgbutton:connectGlobal(app, window)
-	ui.button.connectGlobal(self, app, window)
-	ui.button.connectGlobal(self.img, app, window)
-end
-
-function imgbutton:disconnectGlobal()
-	ui.button.disconnectGlobal(self.img)
-	ui.button.disconnectGlobal(self)
-end
-
-function imgbutton:setupDisplay(display, drawable)
-	ui.button.setupDisplay(self, display, drawable)
-	ui.button.setupDisplay(self.img, display, drawable)
-	return true
-end
-
-function imgbutton:cleanupDisplay()
-	ui.button.cleanupDisplay(self.img)
-	ui.button.cleanupDisplay(self)
-	return true
-end
-
-function imgbutton:askMinMax()
-	local m1, m2 = self.img:askMinMax()
-	m1 = m1 + self.img.MarginAndBorder[1] + self.img.MarginAndBorder[3] +
-		self.PaddingAndBorder[1] + self.PaddingAndBorder[3]
-	m2 = m2 + self.img.MarginAndBorder[2] + self.img.MarginAndBorder[4] +
-		self.PaddingAndBorder[2] + self.PaddingAndBorder[4]
-	local m3 = self.HMax == true and ui.HUGE or self.HMax == false and m1
-	local m4 = self.VMax == true and ui.HUGE or self.VMax == false and m2
-	return m1, m2, m3, m4
-end
-
-function imgbutton:draw()
-
-	local d = self.Drawable