Carbon defines {Get,Set}ControlDataHandle, so unfortunately our variants on {Get,Set}ControlData have gotten an underscore: GetControlData_Handle, etc.
diff --git a/Mac/Demo/PICTbrowse/ICONbrowse.py b/Mac/Demo/PICTbrowse/ICONbrowse.py
index fe28564..c827fac 100644
--- a/Mac/Demo/PICTbrowse/ICONbrowse.py
+++ b/Mac/Demo/PICTbrowse/ICONbrowse.py
@@ -122,7 +122,7 @@
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 0771991..04d321c 100644
--- a/Mac/Demo/PICTbrowse/PICTbrowse.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse.py
@@ -100,7 +100,7 @@
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 c78960c..903fd9b 100644
--- a/Mac/Demo/PICTbrowse/PICTbrowse2.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse2.py
@@ -122,7 +122,7 @@
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 b56cd13..47cd472 100644
--- a/Mac/Demo/PICTbrowse/cicnbrowse.py
+++ b/Mac/Demo/PICTbrowse/cicnbrowse.py
@@ -122,7 +122,7 @@
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 e24bc8b..cfd55a1 100644
--- a/Mac/Lib/EasyDialogs.py
+++ b/Mac/Lib/EasyDialogs.py
@@ -326,7 +326,7 @@
## 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 @@
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)