diff options
author | Jack Jansen <jack.jansen@cwi.nl> | 2001-08-03 13:31:36 (GMT) |
---|---|---|
committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-08-03 13:31:36 (GMT) |
commit | cbed91b4db6817b7bbbb12ede40bfb5d26a9bf14 (patch) | |
tree | 1995f01bd8828ae9647ad407e40dd8584ca843da /Mac/Demo/PICTbrowse | |
parent | cb60dae6a1a7841138421866ea15870f6297cf8b (diff) | |
download | cpython-cbed91b4db6817b7bbbb12ede40bfb5d26a9bf14.zip cpython-cbed91b4db6817b7bbbb12ede40bfb5d26a9bf14.tar.gz cpython-cbed91b4db6817b7bbbb12ede40bfb5d26a9bf14.tar.bz2 |
Merging appropriate 2.1.1 fixes back into the main trunk.
Diffstat (limited to 'Mac/Demo/PICTbrowse')
-rw-r--r-- | Mac/Demo/PICTbrowse/ICONbrowse.py | 4 | ||||
-rw-r--r-- | Mac/Demo/PICTbrowse/PICTbrowse.py | 4 | ||||
-rw-r--r-- | Mac/Demo/PICTbrowse/PICTbrowse2.py | 6 | ||||
-rw-r--r-- | Mac/Demo/PICTbrowse/oldPICTbrowse.py | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Mac/Demo/PICTbrowse/ICONbrowse.py b/Mac/Demo/PICTbrowse/ICONbrowse.py index c827fac..865ff9e 100644 --- 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 04d321c..da32b50 100644 --- 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 903fd9b..56440f2 100644 --- 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 72a29de..0012958 100644 --- 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) |