From e7bfc915dab99ee8f3869a99637be42f89c1c70b Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Tue, 9 Jan 2001 22:22:58 +0000 Subject: [PATCH] Carbon defines {Get,Set}ControlDataHandle, so unfortunately our variants on {Get,Set}ControlData have gotten an underscore: GetControlData_Handle, etc. --- Mac/Demo/PICTbrowse/ICONbrowse.py | 2 +- Mac/Demo/PICTbrowse/PICTbrowse.py | 2 +- Mac/Demo/PICTbrowse/PICTbrowse2.py | 2 +- Mac/Demo/PICTbrowse/cicnbrowse.py | 2 +- Mac/Lib/EasyDialogs.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Mac/Demo/PICTbrowse/ICONbrowse.py b/Mac/Demo/PICTbrowse/ICONbrowse.py index fe28564bf9..c827fac0e2 100644 --- a/Mac/Demo/PICTbrowse/ICONbrowse.py +++ b/Mac/Demo/PICTbrowse/ICONbrowse.py @@ -122,7 +122,7 @@ class MyDialog(FrameWork.DialogWindow): self.wid.SetDialogDefaultItem(MAIN_SHOW) self.contents = contents self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST) - h = self.ctl.GetControlDataHandle(Controls.kControlListBoxPart, + h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart, Controls.kControlListBoxListHandleTag) self.list = List.as_List(h) self.setlist() diff --git a/Mac/Demo/PICTbrowse/PICTbrowse.py b/Mac/Demo/PICTbrowse/PICTbrowse.py index 07719918f7..04d321c057 100644 --- a/Mac/Demo/PICTbrowse/PICTbrowse.py +++ b/Mac/Demo/PICTbrowse/PICTbrowse.py @@ -100,7 +100,7 @@ class MyDialog(FrameWork.DialogWindow): self.wid.SetDialogDefaultItem(MAIN_SHOW) self.contents = contents self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST) - h = self.ctl.GetControlDataHandle(Controls.kControlListBoxPart, + h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart, Controls.kControlListBoxListHandleTag) self.list = List.as_List(h) self.setlist() diff --git a/Mac/Demo/PICTbrowse/PICTbrowse2.py b/Mac/Demo/PICTbrowse/PICTbrowse2.py index c78960cc29..903fd9be8a 100644 --- a/Mac/Demo/PICTbrowse/PICTbrowse2.py +++ b/Mac/Demo/PICTbrowse/PICTbrowse2.py @@ -122,7 +122,7 @@ class MyDialog(FrameWork.DialogWindow): self.wid.SetDialogDefaultItem(MAIN_SHOW) self.contents = contents self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST) - h = self.ctl.GetControlDataHandle(Controls.kControlListBoxPart, + h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart, Controls.kControlListBoxListHandleTag) self.list = List.as_List(h) self.setlist() diff --git a/Mac/Demo/PICTbrowse/cicnbrowse.py b/Mac/Demo/PICTbrowse/cicnbrowse.py index b56cd13429..47cd472bef 100644 --- a/Mac/Demo/PICTbrowse/cicnbrowse.py +++ b/Mac/Demo/PICTbrowse/cicnbrowse.py @@ -122,7 +122,7 @@ class MyDialog(FrameWork.DialogWindow): self.wid.SetDialogDefaultItem(MAIN_SHOW) self.contents = contents self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST) - h = self.ctl.GetControlDataHandle(Controls.kControlListBoxPart, + h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart, Controls.kControlListBoxListHandleTag) self.list = List.as_List(h) self.setlist() diff --git a/Mac/Lib/EasyDialogs.py b/Mac/Lib/EasyDialogs.py index e24bc8b940..cfd55a16cb 100644 --- a/Mac/Lib/EasyDialogs.py +++ b/Mac/Lib/EasyDialogs.py @@ -326,7 +326,7 @@ ARGV_CMDLINE_DATA=14 ## MacOS.HandleEvent(ev) ## def _setmenu(control, items): - mhandle = control.GetControlDataHandle(Controls.kControlMenuPart, + mhandle = control.GetControlData_Handle(Controls.kControlMenuPart, Controls.kControlPopupButtonMenuHandleTag) menu = Menu.as_Menu(mhandle) for item in items: @@ -338,7 +338,7 @@ def _setmenu(control, items): label = label[:-1] menu.AppendMenu(label) ## mhandle, mid = menu.getpopupinfo() -## control.SetControlDataHandle(Controls.kControlMenuPart, +## control.SetControlData_Handle(Controls.kControlMenuPart, ## Controls.kControlPopupButtonMenuHandleTag, mhandle) control.SetControlMinimum(1) control.SetControlMaximum(len(items)+1) -- 2.50.1