Commit e7bfc915 authored by Jack Jansen's avatar Jack Jansen

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

Carbon defines {Get,Set}ControlDataHandle, so unfortunately our variants on {Get,Set}ControlData have gotten an underscore: GetControlData_Handle, etc.
parent a9e3db35
...@@ -122,7 +122,7 @@ class MyDialog(FrameWork.DialogWindow): ...@@ -122,7 +122,7 @@ class MyDialog(FrameWork.DialogWindow):
self.wid.SetDialogDefaultItem(MAIN_SHOW) self.wid.SetDialogDefaultItem(MAIN_SHOW)
self.contents = contents self.contents = contents
self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST) self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST)
h = self.ctl.GetControlDataHandle(Controls.kControlListBoxPart, h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart,
Controls.kControlListBoxListHandleTag) Controls.kControlListBoxListHandleTag)
self.list = List.as_List(h) self.list = List.as_List(h)
self.setlist() self.setlist()
......
...@@ -100,7 +100,7 @@ class MyDialog(FrameWork.DialogWindow): ...@@ -100,7 +100,7 @@ class MyDialog(FrameWork.DialogWindow):
self.wid.SetDialogDefaultItem(MAIN_SHOW) self.wid.SetDialogDefaultItem(MAIN_SHOW)
self.contents = contents self.contents = contents
self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST) self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST)
h = self.ctl.GetControlDataHandle(Controls.kControlListBoxPart, h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart,
Controls.kControlListBoxListHandleTag) Controls.kControlListBoxListHandleTag)
self.list = List.as_List(h) self.list = List.as_List(h)
self.setlist() self.setlist()
......
...@@ -122,7 +122,7 @@ class MyDialog(FrameWork.DialogWindow): ...@@ -122,7 +122,7 @@ class MyDialog(FrameWork.DialogWindow):
self.wid.SetDialogDefaultItem(MAIN_SHOW) self.wid.SetDialogDefaultItem(MAIN_SHOW)
self.contents = contents self.contents = contents
self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST) self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST)
h = self.ctl.GetControlDataHandle(Controls.kControlListBoxPart, h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart,
Controls.kControlListBoxListHandleTag) Controls.kControlListBoxListHandleTag)
self.list = List.as_List(h) self.list = List.as_List(h)
self.setlist() self.setlist()
......
...@@ -122,7 +122,7 @@ class MyDialog(FrameWork.DialogWindow): ...@@ -122,7 +122,7 @@ class MyDialog(FrameWork.DialogWindow):
self.wid.SetDialogDefaultItem(MAIN_SHOW) self.wid.SetDialogDefaultItem(MAIN_SHOW)
self.contents = contents self.contents = contents
self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST) self.ctl = self.wid.GetDialogItemAsControl(MAIN_LIST)
h = self.ctl.GetControlDataHandle(Controls.kControlListBoxPart, h = self.ctl.GetControlData_Handle(Controls.kControlListBoxPart,
Controls.kControlListBoxListHandleTag) Controls.kControlListBoxListHandleTag)
self.list = List.as_List(h) self.list = List.as_List(h)
self.setlist() self.setlist()
......
...@@ -326,7 +326,7 @@ ARGV_CMDLINE_DATA=14 ...@@ -326,7 +326,7 @@ ARGV_CMDLINE_DATA=14
## MacOS.HandleEvent(ev) ## MacOS.HandleEvent(ev)
## ##
def _setmenu(control, items): def _setmenu(control, items):
mhandle = control.GetControlDataHandle(Controls.kControlMenuPart, mhandle = control.GetControlData_Handle(Controls.kControlMenuPart,
Controls.kControlPopupButtonMenuHandleTag) Controls.kControlPopupButtonMenuHandleTag)
menu = Menu.as_Menu(mhandle) menu = Menu.as_Menu(mhandle)
for item in items: for item in items:
...@@ -338,7 +338,7 @@ def _setmenu(control, items): ...@@ -338,7 +338,7 @@ def _setmenu(control, items):
label = label[:-1] label = label[:-1]
menu.AppendMenu(label) menu.AppendMenu(label)
## mhandle, mid = menu.getpopupinfo() ## mhandle, mid = menu.getpopupinfo()
## control.SetControlDataHandle(Controls.kControlMenuPart, ## control.SetControlData_Handle(Controls.kControlMenuPart,
## Controls.kControlPopupButtonMenuHandleTag, mhandle) ## Controls.kControlPopupButtonMenuHandleTag, mhandle)
control.SetControlMinimum(1) control.SetControlMinimum(1)
control.SetControlMaximum(len(items)+1) control.SetControlMaximum(len(items)+1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment