diff options
author | Dan Gudmundsson <[email protected]> | 2011-09-21 11:59:57 +0200 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2011-09-21 11:59:57 +0200 |
commit | 41f5777aea48b2eec358c342b7fd8610bf13601c (patch) | |
tree | 4c7aebfe02c240043e5a3eb9a25e22f3117d5080 /lib/wx/api_gen/wxapi.conf | |
parent | 0cc4d4d12020310c98f9583e612074e26821163c (diff) | |
parent | 30283e3136c22444a2ecb1263a77654e6f1bd48d (diff) | |
download | otp-41f5777aea48b2eec358c342b7fd8610bf13601c.tar.gz otp-41f5777aea48b2eec358c342b7fd8610bf13601c.tar.bz2 otp-41f5777aea48b2eec358c342b7fd8610bf13601c.zip |
Merge branch 'dgud/wx/virtual-listctrl/OTP-9415' into dev
* dgud/wx/virtual-listctrl/OTP-9415:
Handle overloading callbacks the same as events
Fix documentation and callback options in wxListCtrl:create/3
Add example and testcase
Add wxListItemAttr
Generated code of previous commit
Add support for virtual listctrls
Re-generated with new doxygen
Diffstat (limited to 'lib/wx/api_gen/wxapi.conf')
-rw-r--r-- | lib/wx/api_gen/wxapi.conf | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf index aec8a4944a..8ee4451057 100644 --- a/lib/wx/api_gen/wxapi.conf +++ b/lib/wx/api_gen/wxapi.conf @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -756,7 +756,9 @@ 'SetFirstItem']}. {class, wxListCtrl, wxControl, [], - ['wxListCtrl','~wxListCtrl','Arrange','AssignImageList','ClearAll','Create', + [{'wxListCtrl', [{where, taylormade}]}, + '~wxListCtrl','Arrange','AssignImageList','ClearAll', + {'Create',[{where, taylormade}]}, 'DeleteAllItems','DeleteColumn','DeleteItem', {'EditLabel',[{"textControlClass",nowhere}]}, 'EnsureVisible', @@ -788,6 +790,13 @@ 'SetFont','SetId','SetImage','SetMask','SetState', 'SetStateMask','SetText','SetTextColour','SetWidth']}. +{class, wxListItemAttr, root, [], + ['wxListItemAttr','~wxListItemAttr', + 'GetBackgroundColour', 'GetFont', + 'GetTextColour', 'HasBackgroundColour', 'HasFont', + 'HasTextColour', 'SetBackgroundColour', 'SetFont', 'SetTextColour' + ]}. + {class, wxImageList, object, [{skip, [{'Create',1}]}], %% No create/0 on windows ['wxImageList','~wxImageList','Add','Create','Draw','GetBitmap','GetIcon','GetImageCount', 'GetSize','Remove','RemoveAll','Replace']}. |