These demos didn't know the difference between dialogs and windows yet. Fixed.

diff --git a/Mac/Demo/PICTbrowse/ICONbrowse.py b/Mac/Demo/PICTbrowse/ICONbrowse.py
index c827fac0e233d25ec0776f53cdcc629dbe02d3f0..865ff9e7012af746d8458a410011c546f301452d 100644 (file)
--- a/Mac/Demo/PICTbrowse/ICONbrowse.py
+++ b/Mac/Demo/PICTbrowse/ICONbrowse.py
@@ -119,9 +119,9 @@ class MyDialog(FrameWork.DialogWindow):
        def open(self, id, contents):
                self.id = id
                FrameWork.DialogWindow.open(self, ID_MAIN)
-               self.wid.SetDialogDefaultItem(MAIN_SHOW)
+               self.dlg.SetDialogDefaultItem(MAIN_SHOW)
                self.contents = contents
-               self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST)
+               self.ctl = self.dlg.GetDialogItemAsControl(MAIN_LIST)
                h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart, 
                                Controls.kControlListBoxListHandleTag)
                self.list = List.as_List(h)

diff --git a/Mac/Demo/PICTbrowse/PICTbrowse.py b/Mac/Demo/PICTbrowse/PICTbrowse.py
index 04d321c057f6b62429245276c42e2b37c3a58c55..da32b50ec09e640ebceb80d638288711f3bb5de9 100644 (file)
--- a/Mac/Demo/PICTbrowse/PICTbrowse.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse.py
@@ -97,9 +97,9 @@ class MyDialog(FrameWork.DialogWindow):
        def open(self, id, contents):
                self.id = id
                FrameWork.DialogWindow.open(self, ID_MAIN)
-               self.wid.SetDialogDefaultItem(MAIN_SHOW)
+               self.dlg.SetDialogDefaultItem(MAIN_SHOW)
                self.contents = contents
-               self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST)
+               self.ctl = self.dlg.GetDialogItemAsControl(MAIN_LIST)
                h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart, 
                                Controls.kControlListBoxListHandleTag)
                self.list = List.as_List(h)

diff --git a/Mac/Demo/PICTbrowse/PICTbrowse2.py b/Mac/Demo/PICTbrowse/PICTbrowse2.py
index 903fd9be8abb44834d4abd4e750643f4d3139aef..56440f20a25c024e01b2f16ed8f581ce12db9739 100644 (file)
--- a/Mac/Demo/PICTbrowse/PICTbrowse2.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse2.py
@@ -98,7 +98,7 @@ class PICTwindow(FrameWork.Window):
                
        def fitrect(self):
                """Return self.pictrect scaled to fit in window"""
-               graf = self.wid.GetWindowPort()
+               graf = self.dlg.GetWindowPort()
                screenrect = graf.portRect
                picwidth = self.pictrect[2] - self.pictrect[0]
                picheight = self.pictrect[3] - self.pictrect[1]
@@ -119,9 +119,9 @@ class MyDialog(FrameWork.DialogWindow):
        def open(self, id, contents):
                self.id = id
                FrameWork.DialogWindow.open(self, ID_MAIN)
-               self.wid.SetDialogDefaultItem(MAIN_SHOW)
+               self.dlg.SetDialogDefaultItem(MAIN_SHOW)
                self.contents = contents
-               self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST)
+               self.ctl = self.dlg.GetDialogItemAsControl(MAIN_LIST)
                h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart, 
                                Controls.kControlListBoxListHandleTag)
                self.list = List.as_List(h)

diff --git a/Mac/Demo/PICTbrowse/oldPICTbrowse.py b/Mac/Demo/PICTbrowse/oldPICTbrowse.py
index 72a29def63f2bcc1b0412c2e939fef7cbb88f171..0012958c16b27b51927ae30990e99dfaeff793e9 100644 (file)
--- a/Mac/Demo/PICTbrowse/oldPICTbrowse.py
+++ b/Mac/Demo/PICTbrowse/oldPICTbrowse.py
@@ -96,8 +96,8 @@ class MyDialog(FrameWork.DialogWindow):
        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)
+               self.dlg.SetDialogDefaultItem(MAIN_SHOW)
+               tp, h, rect = self.dlg.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)
@@ -145,7 +145,7 @@ class MyDialog(FrameWork.DialogWindow):
                        self.parent.showPICT(resid)
                
        def do_rawupdate(self, window, event):
-               tp, h, rect = self.wid.GetDialogItem(MAIN_LIST)
+               tp, h, rect = self.dlg.GetDialogItem(MAIN_LIST)
                Qd.SetPort(self.wid)
                Qd.FrameRect(rect)
                self.list.LUpdate(self.wid.GetWindowPort().visRgn)