diff --git a/Mac/Demo/PICTbrowse/PICTbrowse2.py b/Mac/Demo/PICTbrowse/PICTbrowse2.py
new file mode 100644
index 00000000000..deffba693c1
--- /dev/null
+++ b/Mac/Demo/PICTbrowse/PICTbrowse2.py
@@ -0,0 +1,187 @@
+"""browsepict - Display all "PICT" resources found"""
+
+import FrameWork
+import EasyDialogs
+import Res
+import Qd
+import Win
+import List
+import sys
+import struct
+
+#
+# Resource definitions
+ID_MAIN=512
+MAIN_LIST=1
+MAIN_SHOW=2
+
+# Where is the picture window?
+LEFT=200
+TOP=64
+MINWIDTH=64
+MINHEIGHT=64
+MAXWIDTH=320
+MAXHEIGHT=320
+
+def main():
+	try:
+		dummy = Res.GetResource('DLOG', ID_MAIN)
+	except Res.Error:
+		try:
+			Res.OpenResFile("PICTbrowse.rsrc")
+		except Res.Error, arg:
+			EasyDialogs.Message("Cannot open PICTbrowse.rsrc: "+arg[1])
+			sys.exit(1)	
+	PICTbrowse()
+
+class PICTbrowse(FrameWork.Application):
+	def __init__(self):
+		# First init menus, etc.
+		FrameWork.Application.__init__(self)
+		# Next create our dialog
+		self.main_dialog = MyDialog(self)
+		# Now open the dialog
+		contents = self.findPICTresources()
+		self.main_dialog.open(ID_MAIN, contents)
+		# Finally, go into the event loop
+		self.mainloop()
+	
+	def makeusermenus(self):
+		self.filemenu = m = FrameWork.Menu(self.menubar, "File")
+		self.quititem = FrameWork.MenuItem(m, "Quit", "Q", self.quit)
+	
+	def quit(self, *args):
+		raise self
+		
+	def showPICT(self, resid):
+		w = PICTwindow(self)
+		w.open(resid)
+		#EasyDialogs.Message('Show PICT '+`resid`)
+		
+	def findPICTresources(self):
+		num = Res.CountResources('PICT')
+		rv = []
+		for i in range(1, num+1):
+			Res.SetResLoad(0)
+			try:
+				r = Res.GetIndResource('PICT', i)
+			finally:
+				Res.SetResLoad(1)
+			id, type, name = r.GetResInfo()
+			rv.append(id, name)
+		return rv
+		
+class PICTwindow(FrameWork.Window):
+	def open(self, (resid, resname)):
+		if not resname:
+			resname = '#'+`resid`
+		self.resid = resid
+		self.picture = Qd.GetPicture(self.resid)
+		# Get rect for picture
+		sz, t, l, b, r = struct.unpack('hhhhh', self.picture.data[:10])
+		self.pictrect = (l, t, r, b)
+		width = r-l
+		height = b-t
+		if width < MINWIDTH: width = MINWIDTH
+		elif width > MAXWIDTH: width = MAXWIDTH
+		if height < MINHEIGHT: height = MINHEIGHT
+		elif height > MAXHEIGHT: height = MAXHEIGHT
+		bounds = (LEFT, TOP, LEFT+width, TOP+height)
+		
+		self.wid = Win.NewWindow(bounds, resname, 1, 0, -1, 1, 0)
+		self.do_postopen()
+		
+	def do_update(self, *args):
+		currect = self.fitrect()
+		Qd.DrawPicture(self.picture, currect)
+		
+	def fitrect(self):
+		"""Return self.pictrect scaled to fit in window"""
+		graf = self.wid.GetWindowPort()
+		screenrect = graf.portRect
+		picwidth = self.pictrect[2] - self.pictrect[0]
+		picheight = self.pictrect[3] - self.pictrect[1]
+		if picwidth > screenrect[2] - screenrect[0]:
+			factor = float(picwidth) / float(screenrect[2]-screenrect[0])
+			picwidth = picwidth / factor
+			picheight = picheight / factor
+		if picheight > screenrect[3] - screenrect[1]:
+			factor = float(picheight) / float(screenrect[3]-screenrect[1])
+			picwidth = picwidth / factor
+			picheight = picheight / factor
+		return (screenrect[0], screenrect[1], screenrect[0]+int(picwidth),
+				screenrect[1]+int(picheight))
+		
+class MyDialog(FrameWork.DialogWindow):
+	"Main dialog window for PICTbrowse"
+
+	def open(self, id, contents):
+		self.id = id
+		FrameWork.DialogWindow.open(self, ID_MAIN)
+		self.wid.SetDialogDefaultItem(MAIN_SHOW)
+		tp, h, rect = self.wid.GetDialogItem(MAIN_LIST)
+		rect2 = rect[0]+1, rect[1]+1, rect[2]-17, rect[3]-17	# Scroll bar space
+		self.list = List.LNew(rect2, (0, 0, 1, len(contents)), (0,0), 0, self.wid,
+				0, 1, 1, 1)
+		self.contents = contents
+		self.setlist()
+
+	def setlist(self):
+		self.list.LDelRow(0, 0)
+		self.list.LSetDrawingMode(0)
+		if self.contents:
+			self.list.LAddRow(len(self.contents), 0)
+			for i in range(len(self.contents)):
+				v = `self.contents[i][0]`
+				if self.contents[i][1]:
+					v = v + '"' + self.contents[i][1] + '"'
+				self.list.LSetCell(v, (0, i))
+		self.list.LSetDrawingMode(1)
+		self.list.LUpdate()
+		
+	def do_listhit(self, event):
+		(what, message, when, where, modifiers) = event
+		Qd.SetPort(self.wid)
+		where = Qd.GlobalToLocal(where)
+		print 'LISTHIT', where
+		if self.list.LClick(where, modifiers):
+			self.do_show()
+		
+	def getselection(self):
+		items = []
+		point = (0,0)
+		while 1:
+			ok, point = self.list.LGetSelect(1, point)
+			if not ok:
+				break
+			items.append(point[1])
+			point = point[0], point[1]+1
+		values = []
+		for i in items:
+			values.append(self.contents[i])
+		return values
+		
+	def do_show(self, *args):
+		selection = self.getselection()
+		for resid in selection:
+			self.parent.showPICT(resid)
+		
+	def do_rawupdate(self, window, event):
+		tp, h, rect = self.wid.GetDialogItem(MAIN_LIST)
+		Qd.SetPort(self.wid)
+		Qd.FrameRect(rect)
+		self.list.LUpdate()
+		
+	def do_activate(self, activate, event):
+		self.list.LActivate(activate)
+		
+	def do_close(self):
+		self.close()
+		
+	def do_itemhit(self, item, event):
+		if item == MAIN_LIST:
+			self.do_listhit(event)
+		if item == MAIN_SHOW:
+			self.do_show()
+
+main()