Carbon defines {Get,Set}ControlDataHandle, so unfortunately our variants on {Get...

diff --git a/Mac/Demo/PICTbrowse/ICONbrowse.py b/Mac/Demo/PICTbrowse/ICONbrowse.py
index fe28564bf98dc99e5298df2f8f3c65c6c1e0518f..c827fac0e233d25ec0776f53cdcc629dbe02d3f0 100644 (file)
--- 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 07719918f7ec826e7acc6bc517f95644924b7be4..04d321c057f6b62429245276c42e2b37c3a58c55 100644 (file)
--- 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 c78960cc29b0c2ce469852f6ebf82d09f29e9e95..903fd9be8abb44834d4abd4e750643f4d3139aef 100644 (file)
--- 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 b56cd134298d5e72b22d385fef6494ca28e8a66b..47cd472bef4de42ba4b89eece740e9c2b2f846b5 100644 (file)
--- 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 e24bc8b94041f873251363b4675e98c2794507c8..cfd55a16cbb4a7d0a64063706c4b3f363bf598a7 100644 (file)
--- 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)