Added support for tab controls and initial (incomplete) support
for DataBrowser controls.
diff --git a/Mac/Modules/ctl/ctlscan.py b/Mac/Modules/ctl/ctlscan.py
index b2a17d1..70b2866 100644
--- a/Mac/Modules/ctl/ctlscan.py
+++ b/Mac/Modules/ctl/ctlscan.py
@@ -87,7 +87,9 @@
'SetControlProperty',
'GetControlPropertySize',
'SendControlMessage', # Parameter changed from long to void* from UH3.3 to UH3.4
- # unavailable in Just's CW6 + UH 3.4 libs
+ 'CreateTabsControl', # wrote manually
+ # these are part of Carbon, yet not in CarbonLib; OSX-only
+ 'CreateRoundButtonControl',
'CreateDisclosureButtonControl',
'CreateRelevanceBarControl',
'DisableControl',
@@ -95,6 +97,10 @@
'IsControlEnabled',
'CreateEditUnicodeTextControl',
'CopyDataBrowserEditText',
+
+ # too lazy for now
+ 'GetImageWellContentInfo',
+ 'GetBevelButtonContentInfo',
]
def makegreylist(self):
@@ -127,6 +133,16 @@
'HandleControlSetCursor',
'GetControlClickActivation',
'HandleControlContextualMenuClick',
+
+ "CreateBevelButtonControl",
+ "CreateImageWellControl",
+ "CreatePictureControl",
+ "CreateIconControl",
+ "CreatePushButtonWithIconControl",
+ "SetBevelButtonContentInfo",
+ "SetImageWellContentInfo",
+ "AddDataBrowserListViewColumn",
+
"CreateDataBrowserControl",
"CreateScrollingTextBoxControl",
"CreateRadioGroupControl",
@@ -242,7 +258,6 @@
return [
'ProcPtr',
'ControlActionUPP',
- 'ControlButtonContentInfoPtr',
'Ptr',
'ControlDefSpec', # Don't know how to do this yet
'ControlDefSpec_ptr', # ditto
@@ -250,9 +265,10 @@
# not-yet-supported stuff in Universal Headers 3.4:
'ControlColorUPP',
'ControlKind', # XXX easy: 2-tuple containing 2 OSType's
- 'ControlTabEntry_ptr', # XXX needed for tabs
- 'ControlButtonContentInfo', # XXX ugh: a union
- 'ControlButtonContentInfo_ptr', # XXX ugh: a union
+# 'ControlTabEntry_ptr', # XXX needed for tabs
+# 'ControlButtonContentInfoPtr',
+# 'ControlButtonContentInfo', # XXX ugh: a union
+# 'ControlButtonContentInfo_ptr', # XXX ugh: a union
'ListDefSpec_ptr', # XXX see _Listmodule.c, tricky but possible
'DataBrowserItemID_ptr', # XXX array of UInt32, for BrowserView
'DataBrowserItemUPP',
@@ -261,8 +277,8 @@
'DataBrowserCallbacks_ptr',
'DataBrowserCustomCallbacks',
'DataBrowserCustomCallbacks_ptr',
- 'DataBrowserTableViewColumnDesc',
- 'DataBrowserListViewColumnDesc',
+## 'DataBrowserTableViewColumnDesc',
+## 'DataBrowserListViewColumnDesc',
'CFDataRef',
]
@@ -292,6 +308,15 @@
([("Rect_ptr", "*", "ReturnMode")], # GetControlBounds
[("void", "*", "ReturnMode")]),
+
+ ([("DataBrowserListViewColumnDesc", "*", "OutMode")],
+ [("DataBrowserListViewColumnDesc", "*", "InMode")]),
+
+ ([("ControlButtonContentInfoPtr", 'outContent', "InMode")],
+ [("ControlButtonContentInfoPtr", '*', "OutMode")]),
+
+ ([("ControlButtonContentInfo", '*', "OutMode")],
+ [("ControlButtonContentInfo", '*', "InMode")]),
]
if __name__ == "__main__":