Generated code of previous commit

1 files changed, 49 insertions, 28 deletions

diff --git a/lib/wx/src/gen/wxListCtrl.erl b/lib/wx/src/gen/wxListCtrl.erl
index 9c4ba1e5a3..bf5f4ae20d 100644
--- a/lib/wx/src/gen/wxListCtrl.erl
+++ b/lib/wx/src/gen/wxListCtrl.erl
@@ -1,7 +1,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
@@ -29,17 +29,17 @@
 
 -module(wxListCtrl).
 -include("wxe.hrl").
--export([ sortItems/2 ,arrange/1,arrange/2,assignImageList/3,clearAll/1,create/2,
-  create/3,deleteAllItems/1,deleteColumn/2,deleteItem/2,destroy/1,editLabel/2,
-  ensureVisible/2,findItem/3,findItem/4,getColumn/3,getColumnCount/1,
-  getColumnWidth/2,getCountPerPage/1,getEditControl/1,getImageList/2,
-  getItem/2,getItemBackgroundColour/2,getItemCount/1,getItemData/2,
-  getItemFont/2,getItemPosition/3,getItemRect/3,getItemRect/4,getItemSpacing/1,
-  getItemState/3,getItemText/2,getItemTextColour/2,getNextItem/2,getNextItem/3,
-  getSelectedItemCount/1,getTextColour/1,getTopItem/1,getViewRect/1,
-  hitTest/2,insertColumn/3,insertColumn/4,insertItem/2,insertItem/3,
-  insertItem/4,new/0,new/1,new/2,refreshItem/2,refreshItems/3,scrollList/3,
-  setBackgroundColour/2,setColumn/3,setColumnWidth/3,setImageList/3,
+-export([ new/0, new/1, new/2 , sortItems/2 ,arrange/1,arrange/2,assignImageList/3,
+  clearAll/1,create/2,create/3,deleteAllItems/1,deleteColumn/2,deleteItem/2,
+  destroy/1,editLabel/2,ensureVisible/2,findItem/3,findItem/4,getColumn/3,
+  getColumnCount/1,getColumnWidth/2,getCountPerPage/1,getEditControl/1,
+  getImageList/2,getItem/2,getItemBackgroundColour/2,getItemCount/1,
+  getItemData/2,getItemFont/2,getItemPosition/3,getItemRect/3,getItemRect/4,
+  getItemSpacing/1,getItemState/3,getItemText/2,getItemTextColour/2,
+  getNextItem/2,getNextItem/3,getSelectedItemCount/1,getTextColour/1,
+  getTopItem/1,getViewRect/1,hitTest/2,insertColumn/3,insertColumn/4,
+  insertItem/2,insertItem/3,insertItem/4,refreshItem/2,refreshItems/3,
+  scrollList/3,setBackgroundColour/2,setColumn/3,setColumnWidth/3,setImageList/3,
   setItem/2,setItem/4,setItem/5,setItemBackgroundColour/3,setItemColumnImage/4,
   setItemCount/2,setItemData/3,setItemFont/3,setItemImage/3,setItemImage/4,
   setItemPosition/3,setItemState/4,setItemText/3,setItemTextColour/3,
@@ -89,11 +89,11 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+
 %% @spec () -> wxListCtrl()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlwxlistctrl">external documentation</a>.
 new() ->
-  wxe_util:construct(?wxListCtrl_new_0,
-  <<>>).
+    wxe_util:construct(?wxListCtrl_new_0, <<>>).
 
 %% @spec (Parent::wxWindow:wxWindow()) -> wxListCtrl()
 %% @equiv new(Parent, [])
@@ -102,20 +102,41 @@ new(Parent)
   new(Parent, []).
 
 %% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxListCtrl()
-%% Option = {winid, integer()} | {pos, {X::integer(),Y::integer()}} | {size, {W::integer(),H::integer()}} | {style, integer()} | {validator, wx:wx()}
+%% Option = {winid, integer()} |
+%%          {pos, {X::integer(),Y::integer()}} |
+%%          {size, {W::integer(),H::integer()}} |
+%%          {style, integer()} | {validator, wx:wx()}
+%%          {VirtualCallback, Callback::function()}
+%%
+%% VirtualCallback = onGetItemText | onGetItemAttr | onGetItemImage | onGetItemColumnImage
+%% Callback = fun OnGetItemText(This, Item, Column) -> wxString() |
+%%            fun OnGetItemAttr(This, Item) -> wxListItemAttr() |
+%%            fun OnGetItemColumnImage(This, Item, Column) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlwxlistctrl">external documentation</a>.
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
- when is_list(Options) ->
-  ?CLASS(ParentT,wxWindow),
-  MOpts = fun({winid, Winid}, Acc) -> [<<1:32/?UI,Winid:32/?UI>>|Acc];
-          ({pos, {PosX,PosY}}, Acc) -> [<<2:32/?UI,PosX:32/?UI,PosY:32/?UI,0:32>>|Acc];
-          ({size, {SizeW,SizeH}}, Acc) -> [<<3:32/?UI,SizeW:32/?UI,SizeH:32/?UI,0:32>>|Acc];
-          ({style, Style}, Acc) -> [<<4:32/?UI,Style:32/?UI>>|Acc];
-          ({validator, #wx_ref{type=ValidatorT,ref=ValidatorRef}}, Acc) ->   ?CLASS(ValidatorT,wx),[<<5:32/?UI,ValidatorRef:32/?UI>>|Acc];
-          (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
-  BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
-  wxe_util:construct(?wxListCtrl_new_2,
-  <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
+  when is_list(Options)->
+    ?CLASS(ParentT,wxWindow),
+    MOpts = fun({winid, Winid}, Acc) -> [<<1:32/?UI,Winid:32/?UI>>|Acc];
+	       ({pos, {PosX,PosY}}, Acc) -> [<<2:32/?UI,PosX:32/?UI,PosY:32/?UI,0:32>>|Acc];
+	       ({size, {SizeW,SizeH}}, Acc) -> [<<3:32/?UI,SizeW:32/?UI,SizeH:32/?UI,0:32>>|Acc];
+	       ({style, Style}, Acc) -> [<<4:32/?UI,Style:32/?UI>>|Acc];
+	       ({validator, #wx_ref{type=ValidatorT,ref=ValidatorRef}}, Acc) ->
+		    ?CLASS(ValidatorT,wx),[<<5:32/?UI,ValidatorRef:32/?UI>>|Acc];
+	       ({onGetItemText, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item,Col]) -> unicode:characters_to_binary([F(This,Item,Col),0]) end,
+		    [<<6:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       ({onGetItemAttr, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item]) ->
+				  #wx_ref{type=wxListItemAttr,ref=ThisRef} = F(This,Item),
+				  <<ThisRef:32/?UI>>
+			  end,
+		    [<<7:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       ({onGetItemColumnImage, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item, Col]) -> <<(F(This,Item,Col)):32/?I>> end,
+		    [<<8:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
+    BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
+    wxe_util:construct(?wxListCtrl_new_2, <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
 %% @spec (This::wxListCtrl()) -> bool()
 %% @equiv arrange(This, [])
@@ -726,12 +747,12 @@ setWindowStyleFlag(#wx_ref{type=ThisT,ref=ThisRef},Style)
 
 %% @spec (This::wxListCtrl(), SortCallBack::function()) -> boolean()
 %% @doc Sort the items in the list control<br />
-%%   <pre>SortCalBack(Item1,Item2) -> integer()</pre>
+%%   <pre>SortCallBack(Item1,Item2) -> integer()</pre>
 %%  <br /> SortCallBack receives the client data associated with two items
 %%         to compare, and should return 0 if the items are equal, a negative
 %%         value if the first item is less than the second one and a positive
 %%         value if the first item is greater than the second one.
-%%  <br /> NOTE: The callback may not call other processes.
+%%  <br /> NOTE: The callback may not call other (wx) processes.
 sortItems(#wx_ref{type=ThisT,ref=ThisRef}, SortCallBack)
   when is_function(SortCallBack, 2) ->
 	?CLASS(ThisT,wxListCtrl),