Merge branch 'dgud/wx/fix-wx-2.9-compat/OTP-10407'

* dgud/wx/fix-wx-2.9-compat/OTP-10407: (26 commits) wx: Fix comments wx: Workaround wx-2.9 bugs wx: Mac fixes wx: Fix demo and tests wx: Allow 64 bits compilation on mac, requires wxWidgets-2.9 appmon: Move runtime part to runtime_tools app reltool: fix wxWidgets-2.9 compability debugger: Fix 2.9 compat observer: Fix check for graphics contexts Observer: Fix distribution dialog observer: Fix font sizes wx: Fix the demo wx: Fix loading icons and cursors in Windows wx: Remove unnecessary casts wx: Fix changed getfunctions wx: Depricate wxCursor new functions wx: Fix int to enum wx: Include correct m4 file in 2.9 wx: Update examples so they work with both wxWidgets 2.8 and 2.9 wx: Modify tests so they work on wxWidgets-2.9 ...
author: Dan Gudmundsson <[email protected]> 2013-01-15 09:18:49 +0100
committer: Dan Gudmundsson <[email protected]> 2013-01-15 09:18:49 +0100
commit: 0e044f3525d22de4c4c471f601de50ad3acda304 (patch)
tree: dfbbcc31814b0890fcb7774a48cf43322b29ac94 /lib/wx
parent: fdd0b38e2c85d897a240e5f8f79e268c6540dbfd (diff)
parent: c384a91846f7d0aff189fb51d1d502330d7abef4 (diff)
download: otp-0e044f3525d22de4c4c471f601de50ad3acda304.tar.gz
otp-0e044f3525d22de4c4c471f601de50ad3acda304.tar.bz2
otp-0e044f3525d22de4c4c471f601de50ad3acda304.zip
83 files changed, 4033 insertions, 2494 deletions
diff --git a/lib/wx/.gitignore b/lib/wx/.gitignore
index 0fa427bfe5..960c76a779 100644
--- a/lib/wx/.gitignore
+++ b/lib/wx/.gitignore
@@ -1,4 +1,5 @@
 test_log_*
 wx_test_case_info
-api_gen/gl_man?
-doc/html/*
-\ No newline at end of file
+doc/html/*
+%% Don't delete links to man src when git clean -dfX
+%% api_gen/gl_man?
diff --git a/lib/wx/api_gen/gen_util.erl b/lib/wx/api_gen/gen_util.erl
index 4638d4c7ea..2ba1c6e16f 100644
--- a/lib/wx/api_gen/gen_util.erl
+++ b/lib/wx/api_gen/gen_util.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. 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
@@ -49,8 +49,10 @@ get_taylor_made(Str, Name) ->
 	   [dotall, {capture, all_but_first, list}]).
 
 open_write(File) ->
+    open_write(File, []).
+open_write(File, Opts) ->
     %% io:format("Generating ~s~n",[File]),
-    {ok, Fd} = file:open(File++".temp", [write]),
+    {ok, Fd} = file:open(File++".temp", [write|Opts]),
     put(current_file, {Fd,File}).
 
 
@@ -187,6 +189,8 @@ replace_and_remove([$| | R], Acc) ->
     replace_and_remove(R, ["|"|Acc]);
 replace_and_remove([$* | R], Acc) ->
     replace_and_remove(R, ["*"|Acc]);
+replace_and_remove([$+ | R], Acc) ->
+    replace_and_remove(R, ["+"|Acc]);
 replace_and_remove([$& | R], Acc) ->
     replace_and_remove(R, [$&|Acc]);
 replace_and_remove([$<,$< | R], Acc) ->
@@ -221,7 +225,7 @@ erl_copyright() ->
     w("%%~n",[]),
     w("%% %CopyrightBegin%~n",[]),
     w("%%~n",[]),
-    w("%% Copyright Ericsson AB ~p-2012. All Rights Reserved.~n",
+    w("%% Copyright Ericsson AB ~p-2013. All Rights Reserved.~n",
       [StartYear]),
     w("%%~n",[]),
     w("%% The contents of this file are subject to the Erlang Public License,~n",[]),
@@ -241,7 +245,7 @@ c_copyright() ->
     w("/*~n",[]),
     w(" * %CopyrightBegin%~n",[]),
     w(" *~n",[]),
-    w(" * Copyright Ericsson AB 2008-2012. All Rights Reserved.~n",[]),
+    w(" * Copyright Ericsson AB 2008-2013. All Rights Reserved.~n",[]),
     w(" *~n",[]),
     w(" * The contents of this file are subject to the Erlang Public License,~n",[]),
     w(" * Version 1.1, (the \"License\"); you may not use this file except in~n",[]),
diff --git a/lib/wx/api_gen/gl_gen.erl b/lib/wx/api_gen/gl_gen.erl
index 331ba32ba4..ea967c958f 100644
--- a/lib/wx/api_gen/gl_gen.erl
+++ b/lib/wx/api_gen/gl_gen.erl
@@ -185,11 +185,11 @@ parse_define([#xmlElement{name=name,content=[#xmlText{value="WINGDIAPI"++_}]}|_]
     throw(skip);
 parse_define([#xmlElement{name=name,content=[#xmlText{value=Name}]}|R], Def, Os) ->
     parse_define(R, Def#def{name=Name}, Os);
-parse_define([#xmlElement{name=initializer,content=[#xmlText{value=V}]}|_],Def,_Os) ->
-    Val0 = string:strip(V),
-    try 
+parse_define([#xmlElement{name=initializer,content=Contents}|_R],Def,_Os) ->
+    Val0 = extract_def2(Contents),
+    try
 	case Val0 of
-	    "0x" ++ Val1 -> 
+	    "0x" ++ Val1 ->
 		_ = http_util:hexlist_to_integer(Val1),
 		Def#def{val=Val1, type=hex};
 	    _ ->
@@ -207,6 +207,23 @@ parse_define([_|R], D, Opts) ->
 parse_define([], D, _Opts) ->
     D.
 
+extract_def2([#xmlText{value=Val}|R]) ->
+    strip_comment(string:strip(Val)) ++ extract_def2(R);
+extract_def2([#xmlElement{content=Cs}|R]) ->
+    extract_def2(Cs) ++ extract_def2(R);
+extract_def2([]) -> [].
+
+strip_comment("/*" ++ Rest) ->
+    strip_comment_until_end(Rest);
+strip_comment("//" ++ _) -> [];
+strip_comment([H|R]) -> [H | strip_comment(R)];
+strip_comment([]) -> [].
+
+strip_comment_until_end("*/" ++ Rest) ->
+    strip_comment(Rest);
+strip_comment_until_end([_|R]) ->
+    strip_comment_until_end(R).
+
 parse_func(Xml, Opts) ->
     {Func,_} = foldl(fun(X,Acc) -> parse_func(X,Acc,Opts) end, {#func{},1}, Xml),
     put(current_func, Func#func.name),
diff --git a/lib/wx/api_gen/gl_gen_erl.erl b/lib/wx/api_gen/gl_gen_erl.erl
index 25f89e4ad4..446521098e 100644
--- a/lib/wx/api_gen/gl_gen_erl.erl
+++ b/lib/wx/api_gen/gl_gen_erl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. 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
@@ -31,7 +31,7 @@
 
 -import(lists, [foldl/3,foldr/3,reverse/1, keysearch/3, map/2, filter/2, max/1]).
 -import(gen_util, [lowercase/1, lowercase_all/1, uppercase/1, uppercase_all/1,
-		   open_write/1, close/0, erl_copyright/0, w/2,
+		   open_write/1, open_write/2, close/0, erl_copyright/0, w/2,
 		   args/3, args/4, strip_name/2]).
 
 gl_defines(Defs) ->
@@ -90,7 +90,8 @@ types() ->
     ].
 
 gl_api(Fs) ->
-    open_write("../src/gen/gl.erl"),
+    open_write("../src/gen/gl.erl", [{encoding,utf8}]),
+    w("%% -*- coding: utf-8 -*-~n~n", []),
     erl_copyright(),
     w("~n%% OPENGL API~n~n", []),
     w("%% This file is generated DO NOT EDIT~n~n", []),
@@ -148,7 +149,8 @@ gl_api(Fs) ->
     ok.
 
 glu_api(Fs) ->
-    open_write("../src/gen/glu.erl"),
+    open_write("../src/gen/glu.erl", [{encoding,utf8}]),
+    w("%% -*- coding: utf-8 -*-~n~n", []),
     erl_copyright(),
     w("~n%% OPENGL UTILITY API~n~n", []),
     w("%% This file is generated DO NOT EDIT~n~n", []),
@@ -330,7 +332,7 @@ format_doc([{constant, Const}|Rest], Count) ->
     w("`?~s'", [Const]),
     format_doc(Rest, Count-length(Const)-8);
 format_doc([{emphasis, Const}|Rest], Count) ->
-    w("`~s'", [Const]),
+    w("`~ts'", [Const]),
     format_doc(Rest, Count-length(Const)-7);
 format_doc([{function, Func}|Rest], Count) ->
     case Func of
@@ -377,7 +379,7 @@ format_doc([{fenced, Open, Close, Eq}|Rest], Count) ->
     format_doc(Rest, Count);
 
 format_doc([{code, Code}|Rest], Count) ->
-    w("``~s''", [Code]),
+    w("``~ts''", [Code]),
     format_doc(Rest, Count-length(Code)-7);
 
 format_doc([para|Rest], _Count) ->
@@ -387,10 +389,10 @@ format_doc([break|Rest], _Count) ->
     w("<br />~n%% ", []),
     format_doc(Rest, ?LINE_LEN);
 format_doc([{purpose, Purpose}, para | Doc], _Count) ->
-    w("%% @doc ~s~n%%~n%% ", [uppercase(Purpose)]),
+    w("%% @doc ~ts~n%%~n%% ", [uppercase(Purpose)]),
     format_doc(Doc, ?LINE_LEN);
 format_doc([{purpose, Purpose} | Doc], _Count) ->
-    w("%% @doc ~s~n%%~n%% ", [Purpose]),
+    w("%% @doc ~ts~n%%~n%% ", [Purpose]),
     format_doc(Doc, ?LINE_LEN);
 format_doc([listentry|Rest], _Count) ->
     w("~n%%~n%% ", []),
@@ -398,11 +400,11 @@ format_doc([listentry|Rest], _Count) ->
 format_doc([Str|Rest], Count) ->
     case length(Str) of
 	Len when Len < Count ->
-	    w("~s", [Str]),
+	    w("~ts", [Str]),
 	    format_doc(Rest, Count-Len);
 	_ ->
 	    {Str1, Str2} = split(Str, Count, []),
-	    w("~s~n%% ", [Str1]),
+	    w("~ts~n%% ", [Str1]),
 	    format_doc([Str2|Rest], ?LINE_LEN)
     end;
 format_doc([], _) -> ok.
diff --git a/lib/wx/api_gen/gl_scan_doc.erl b/lib/wx/api_gen/gl_scan_doc.erl
index fc7b7cf275..80b4826a30 100644
--- a/lib/wx/api_gen/gl_scan_doc.erl
+++ b/lib/wx/api_gen/gl_scan_doc.erl
@@ -2,7 +2,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2013. 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
@@ -56,8 +56,10 @@ gen_output({characters, String0}, #state{gen_output=true, type=Type, str=Str} =
 		      mi -> case hd(Str) of
 				"/" -> String;
 				"*" -> String;
+				[215] -> String;
 				"+" -> String;
 				"-" -> String;
+				"=" -> String;
 				{fenced,_,_} -> String;
 				_ ->
 				    [$ |String]
@@ -268,7 +270,9 @@ fix_str([$<|Str]) ->
 fix_str([$>|Str]) ->
     [$&,$g,$t,$;|fix_str(Str)];
 fix_str("&times;"++Str) ->
-    [$*|fix_str(Str)];
+    [215|fix_str(Str)];
+%% fix_str([215|Str]) ->
+%%     [$*|fix_str(Str)];
 fix_str("&Prime;"++Str) ->
     [$"|fix_str(Str)];
 fix_str("&CenterDot;"++Str) ->
@@ -277,10 +281,12 @@ fix_str("&af;"++Str) ->
     fix_str(Str);
 fix_str("&it;"++Str) ->
     [$ |fix_str(Str)];
+fix_str("&nbsp;"++Str) ->
+    [$ |fix_str(Str)];
 fix_str([$&|Str]) ->
     [$&,$a,$m,$p,$; |fix_str(Str)];
-fix_str([C|Str]) when C > 255 ->
-    fix_str(Str);
+%% fix_str([C|Str]) when C > 255 ->
+%%     fix_str(Str);
 fix_str([C|Str]) ->
     [C|fix_str(Str)];
 fix_str([]) -> [].
diff --git a/lib/wx/api_gen/wx_extra/wxPrintout.erl b/lib/wx/api_gen/wx_extra/wxPrintout.erl
index be8f2e2fa5..1dfd86ec62 100644
--- a/lib/wx/api_gen/wx_extra/wxPrintout.erl
+++ b/lib/wx/api_gen/wx_extra/wxPrintout.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. 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
@@ -40,7 +40,8 @@ new(Title, OnPrintPage) ->
 %%   <pre>OnBeginDocument(This,StartPage,EndPage) -> boolean()  </pre>
 %%   <pre>OnEndDocument(This) -> term()  </pre>
 %%   <pre>HasPage(This,Page)} -> boolean()   </pre>
-%%   <pre>GetPageInfo(This) -> {MinPage:.integer(), MaxPage::integer(), PageFrom::integer(), PageTo::integer()}  </pre>
+%%   <pre>GetPageInfo(This) -> {MinPage::integer(), MaxPage::integer(),
+%%                              PageFrom::integer(), PageTo::integer()}  </pre>
 %%  The <b>This</b> argument is the wxPrintout object reference to this object
 %%  <br /> NOTE: The callbacks may not call other processes. 
 new(Title, OnPrintPage, Opts) when is_list(Title), is_function(OnPrintPage), is_list(Opts) ->
diff --git a/lib/wx/api_gen/wx_gen.erl b/lib/wx/api_gen/wx_gen.erl
index 7f85151d03..2eb9d9d33d 100644
--- a/lib/wx/api_gen/wx_gen.erl
+++ b/lib/wx/api_gen/wx_gen.erl
@@ -103,7 +103,12 @@ mangle_info({class,CN,P,O,FL}) ->
     Event  = get_value(event,O, false),
     Acc    = get_value(acc, O, []),
     {Fs,Fopts} = foldr(fun(FWO={F,FO},{Fl,Fopt}) when is_list(FO) ->
-			       {[F|Fl],[FWO|Fopt]};
+			       Opt = case F of
+					 {Name, ArgLen} when is_integer(ArgLen) ->
+					     {Name, FO};
+					 _ -> FWO
+				     end,
+			       {[F|Fl],[Opt|Fopt]};
 			  (F,{Fl,Fopt}) ->
 			       {[F|Fl], Fopt}
 		       end, {[],[]}, FL),
@@ -421,22 +426,30 @@ select_member(Several, #class{name=Class,file=Orig}, Defs0, Opts) ->
 
 parse_member(Data,MType,Virtual,Opts = #hs{fopt=Fopts}) ->
     Parse  = fun(Con,A) -> parse_member2(Con,Opts,A) end,
-    Method = #method{name=MName,params=PS0} = 
+    Method = #method{name=MName,params=PS0} =
 	foldl(Parse, #method{method_type=MType, virtual=Virtual}, Data),
     %% Skip motif name's if it's last and optional
     PS2 = case PS0 of %% Backward order..
-	      [#param{name="name",def=Def,type=#type{name="wxString"}}|PS1] 
-	      when Def =/= none -> 
+	      [#param{name="name",def=Def,type=#type{name="wxString"}}|PS1]
+	      when Def =/= none ->
 		  PS1;
 	      _ ->
 		  PS0
 	  end,
     Sz = length(PS2),
-    PS = map(fun(P=#param{name=PName}) -> 
+    PS = map(fun(P=#param{name=PName}) ->
 		     patch_param(MName,{Sz,PName},P,Fopts)
 	     end, PS2),
-    Alias = find_erl_alias_name(MName,PS,Fopts),	    
-    Method#method{params=PS, alias=Alias}.
+    Alias = find_erl_alias_name(MName,PS,Fopts),
+    FOpts = case gb_trees:lookup(MName, Fopts) of
+		{value, FuncO} when is_list(FuncO) ->
+		    case lists:keyfind({func,Sz}, 1, FuncO) of
+			false -> FuncO;
+			{_, FuncNO} -> FuncNO
+		    end;
+		_ -> []
+	    end,
+    Method#method{params=PS, alias=Alias, opts=FOpts}.
 
 find_erl_alias_name(MName,Ps,Fopts) ->
     case gb_trees:lookup(MName, Fopts) of
@@ -527,7 +540,7 @@ add_param2(P=#param{name=Name},#hs{fopt=FOpt},M0=#method{name=MName,params=Ps})
 	    M0#method{params=[Patched|Ps]}
     end.
 
-patch_param(Method, Name, P, Opt) ->    
+patch_param(Method, Name, P, Opt) ->
     case gb_trees:lookup(Method,Opt) of
 	none -> P;
 	{value,NoArg} when is_integer(NoArg) -> P;
@@ -560,11 +573,14 @@ handle_param_opt(both, P) -> P#param{in=both};
 handle_param_opt({def,Def},P) -> P#param{def=Def};
 handle_param_opt({type,Type}, P=#param{type=T})  ->  P#param{type=T#type{name=Type}};
 handle_param_opt({single,Opt}, P=#param{type=T}) ->  P#param{type=T#type{single=Opt}};
+handle_param_opt({base,Enum={enum,Type}},  P=#param{type=T}) ->   P#param{type=T#type{base=Enum, name=Type}};
 handle_param_opt({base,Opt},  P=#param{type=T}) ->   P#param{type=T#type{base=Opt}};
 handle_param_opt({c_only,Opt},P) -> P#param{where=c, alt=Opt};
-handle_param_opt({ref, pointer}, P=#param{type=T}) ->   
+handle_param_opt({ref, pointer}, P=#param{type=T}) ->
     P#param{type=T#type{by_val=false,ref={pointer, 1}}};
-handle_param_opt({mod,Mods}, P=#param{type=T=#type{mod=Mods0}}) ->  
+handle_param_opt({by_val, true}, P=#param{type=T}) ->
+    P#param{type=T#type{by_val=true}};
+handle_param_opt({mod,Mods}, P=#param{type=T=#type{mod=Mods0}}) ->
     P#param{type=T#type{mod=Mods++Mods0}}.
 
 get_opt(Opt, Method, Sz, Opts) -> 
@@ -654,6 +670,12 @@ extract_type_info(#xmlElement{name=ref,attributes=As,content=[#xmlText{value=V}]
     {value, #xmlAttribute{value = Kind}} = keysearch(kindref,#xmlAttribute.name,As),
     {reverse(foldl(fun extract_type_info2/2, [], string:tokens(V, " "))) ++ Acc,
      {Kind,Refid}};
+extract_type_info(#xmlElement{name=ref,attributes=As,content=[#xmlText{value=V}]},
+		  {Acc,_}) ->
+    {value, #xmlAttribute{value = Refid}} = keysearch(refid,#xmlAttribute.name,As),
+    {value, #xmlAttribute{value = Kind}} = keysearch(kindref,#xmlAttribute.name,As),
+    {reverse(foldl(fun extract_type_info2/2, [], string:tokens(V, " "))) ++ Acc,
+     {Kind,Refid}};
 extract_type_info(What,Acc) ->
     ?error({parse_error,What,Acc}).
 
@@ -704,11 +726,9 @@ parse_type2([N="wxTextPos"|R],Info,Opts,T) ->        %%long
     parse_type2(R,Info,Opts,T#type{name=N,base=int});
 parse_type2([N="wxPrintQuality"|R],Info,Opts,T) ->
     parse_type2(R,Info,Opts,T#type{name=N,base=int});
-parse_type2([N="wxPaperSize"|R],Info,Opts,T) ->
-    parse_type2(R,Info,Opts,T#type{name=N,base=int});
 parse_type2(["wxDataFormat"|_R],_Info,_Opts,T) ->
     %% Hack Hack
-    T#type{name="wxDataFormatId",base=int};
+    T#type{name="wxDataFormatId",base={enum,"wxDataFormatId"}};
 parse_type2([N="wxArrayInt"|R],Info,Opts,T) -> 
     parse_type2(R,Info,Opts,T#type{name=N,base=int,single=array});
 parse_type2([N="wxArrayDouble"|R],Info,Opts,T) -> 
@@ -1251,7 +1271,7 @@ parse_enums([File|Files], Parsed) ->
     case gb_sets:is_member(File,Parsed) of
 	false ->
 	    FileName = filename:join(["wx_xml",File ++ "_8h.xml"]),
-%%	    io:format("Parse Enums in ~s ~n", [FileName]),
+	    %%io:format("Parse Enums in ~s ~n", [FileName]),
 	    case xmerl_scan:file(FileName, [{space, normalize}]) of 
 		{error, enoent} ->
 		    parse_enums(Files, gb_sets:add(File,Parsed));
@@ -1318,41 +1338,37 @@ extract_enum2([], N, _Id, Acc) ->
 
 extract_enum3([#xmlElement{name=name,content=[#xmlText{value=Name}]}|R], Id, Acc) ->
     case lists:keymember(Name, 1, Acc) of
-	true ->  %% Doxygen double includes some defs. 
+	true ->  %% Doxygen double includes some defs.
 	    {Acc,Id};
 	false ->
 	    case Id of
-		This = {Str,Num} -> 
+		This = {Str,Num} ->
 		    extract_enum3(R, {Str, Num+1}, [{Name,This}|Acc]);
 		Val ->
 		    extract_enum3(R, Val+1, [{Name,Val}|Acc])
 	    end
     end;
 
-extract_enum3([#xmlElement{name=initializer,
-			   content=Cs=[#xmlText{}|_]}|_],_Id,[{Name,_}|Acc]) ->
-
-    String = lists:append([string:strip(C#xmlText.value) || C <- Cs]),
-    
+extract_enum3([#xmlElement{name=initializer,content=Cs}|_],_Id,[{Name,_}|Acc]) ->
+    String = extract_def2(Cs),
     Val0 = gen_util:tokens(String,"<& "),
-            
-    try 
+    try
 	case Val0 of
-	    ["0x" ++ Val1] -> 
+	    ["0x" ++ Val1] ->
 		Val = http_util:hexlist_to_integer(Val1),
 		{[{Name, Val}|Acc], Val+1};
-	    [Single] ->
-		Val = list_to_integer(Single),
-		{[{Name, Val}|Acc], Val+1};
 	    ["1", "<<", Shift] ->
 		Val = 1 bsl list_to_integer(Shift),
 		{[{Name, Val}|Acc], Val+1};
-	    [_Str, "+", _What] ->
-		Val = lists:append(Val0),
-		{[{Name, {Val, 0}}|Acc], {Val,1}};	    
-	    _What ->
-		%% io:format("~p Name ~p ~p~n",[?LINE, Name, Val0]),
-		throw(below)		
+	    [Str, "+", What] ->
+		Val = list_to_integer(What),
+		{[{Name, {Str, Val}}|Acc], {Str,Val+1}};
+	    [Single] ->
+		Val = list_to_integer(Single),
+		{[{Name, Val}|Acc], Val+1};
+	    _ ->
+		%% io:format("~p Name ~p ~p ~p~n",[?LINE, Name, Val0, String]),
+		throw(below)
 	end
     catch _:_ ->
 	    {[{Name,{String,0}}|Acc], {String,1}}
@@ -1372,7 +1388,7 @@ extract_defs(Defs, File) ->
     end.
 
 extract_defs2(#xmlElement{name=memberdef,content=C},{Acc,Skip}) ->
-    try 
+    try
 	Res = {Name,_} = extract_def(C,undefined,Skip),
 	case gb_sets:is_member(Name,Skip) orelse lists:keymember(Name, 1, Acc) of
 	    true -> {Acc,Skip};
@@ -1380,30 +1396,31 @@ extract_defs2(#xmlElement{name=memberdef,content=C},{Acc,Skip}) ->
 	end
     catch throw:SkipName -> {Acc, gb_sets:add(SkipName,Skip)}
     end.
-	     
+
 extract_def([#xmlElement{name=name,content=[#xmlText{value=Name}]}|R], _N, Skip) ->
     case Name of
 	"wxUSE" ++ _ ->
 	    throw(Name);
 	"wx" ++ _ ->
 	    extract_def(R, Name, Skip);
-	_ -> 
+	_ ->
 	    throw(Name)
     end;
 extract_def([#xmlElement{name=param}|_],Name,_) ->
     throw(Name);
-extract_def([#xmlElement{name=initializer,content=[#xmlText{value=Val0}]}|_],N,Skip) ->
+extract_def([#xmlElement{name=initializer,content=Cs}|_R],N,Skip) ->
+    Val0 = extract_def2(Cs),
     case Val0 of
 	"0x" ++ Val1 -> {N, http_util:hexlist_to_integer(Val1)};
 	_ ->
 	    try
 		Val = list_to_integer(Val0),
 		{N, Val}
-	    catch _:_ ->  
+	    catch _:_ ->
 		    case def_is_ok(Val0, Skip) of
 			false ->
 			    throw(N);
-			NVal when is_integer(NVal) -> 
+			NVal when is_integer(NVal) ->
 			    {N, NVal};
 			NVal ->
 			    {N, {NVal,0}}
@@ -1414,7 +1431,24 @@ extract_def([_|R],N,Skip) ->
     extract_def(R,N,Skip);
 extract_def(_,N,_) ->
     throw(N).
-		     
+
+extract_def2([#xmlText{value=Val}|R]) ->
+    strip_comment(string:strip(Val)) ++ extract_def2(R);
+extract_def2([#xmlElement{content=Cs}|R]) ->
+    extract_def2(Cs) ++ extract_def2(R);
+extract_def2([]) -> [].
+
+strip_comment("/*" ++ Rest) ->
+    strip_comment_until_end(Rest);
+strip_comment("//" ++ _) -> [];
+strip_comment([H|R]) -> [H | strip_comment(R)];
+strip_comment([]) -> [].
+
+strip_comment_until_end("*/" ++ Rest) ->
+    strip_comment(Rest);
+strip_comment_until_end([_|R]) ->
+    strip_comment_until_end(R).
+
 def_is_ok(Name, Skip) ->
     Toks = gen_util:tokens(Name,"()| \\:"),
     R = def_is_ok(Toks, Skip, []),
diff --git a/lib/wx/api_gen/wx_gen.hrl b/lib/wx/api_gen/wx_gen.hrl
index 426e3adfae..89577b9707 100644
--- a/lib/wx/api_gen/wx_gen.hrl
+++ b/lib/wx/api_gen/wx_gen.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -44,7 +44,8 @@
 	  doc,                     % Extra documentation
 	  virtual,                 % Is virtual?
 	  pre_hook    = [],        % Pre hook  before call in c-code
-	  post_hook   = []         % Post hook after call in c-code
+	  post_hook   = [],        % Post hook after call in c-code
+	  opts        = []         % Options
 	}
        ).
 
diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl
index 2209e4a53b..293c97507e 100644
--- a/lib/wx/api_gen/wx_gen_cpp.erl
+++ b/lib/wx/api_gen/wx_gen_cpp.erl
@@ -118,12 +118,18 @@ gen_constructors(#class{name=Class, methods=Ms0}) ->
 
 gen_constructor(_Class, #method{where=merged_c}) -> ok;
 gen_constructor(_Class, #method{where=erl_no_opt}) -> ok;
-gen_constructor(Class, _M=#method{params=Ps}) ->
+gen_constructor(Class, _M=#method{params=Ps, opts=FOpts}) ->
     Gen1  = fun(#param{name=N, type=T}) -> gen_type(T,1) ++ N end,
     Gen2  = fun(#param{name=N, type=T}) -> gen_type(T,2) ++ N end,
     CallA = fun(#param{name=N}) -> N end,
     HaveMergedType = fun(#param{type={merged,_,_,_,_,_,_}}) -> true; (_) -> false end,
     ?WTC("gen_constructor"),
+    Endif = case lists:keysearch(deprecated, 1, FOpts) of
+		{value, {deprecated, IfDef}} ->
+		    w("#if ~s~n", [IfDef]),
+		    true;
+		_ -> false
+	    end,
     case lists:any(HaveMergedType, Ps) of
 	false ->
 	    w(" E~s(~s) : ~s(~s) {};~n",
@@ -133,7 +139,9 @@ gen_constructor(Class, _M=#method{params=Ps}) ->
 	      [Class,args(Gen1,",",Ps),Class,args(CallA,",",Ps)]),
 	    w(" E~s(~s) : ~s(~s) {};~n",
 	      [Class,args(Gen2,",",Ps),Class,args(CallA,",",Ps)])
-    end.
+    end,
+    Endif andalso w("#endif~n", []),
+    ok.
 
 gen_type(#type{name=Type, ref={pointer,1}, mod=Mod},_) ->
     mods(Mod) ++ to_string(Type) ++ " * ";
@@ -162,6 +170,14 @@ gen_funcs(Defs) ->
     w("#include \"wxe_macros.h\"~n"),
     w("#include \"wxe_derived_dest.h\"~n~n"),
 
+    w("#if !wxCHECK_VERSION(2,9,0)~n", []),
+    [w("#define ~p int~n", [Enum]) ||
+	Enum <- [wxPenJoin, wxPenCap, wxImageResizeQuality, %%wxBitmapType,
+		 wxPolygonFillMode, wxMappingMode, wxRasterOperationMode,
+		 wxFloodFillStyle
+		]],
+    w("#endif~n",[]),
+
     w("void WxeApp::wxe_dispatch(wxeCommand& Ecmd)~n{~n"),
     w(" char * bp = Ecmd.buffer;~n"),
     w(" wxeMemEnv *memenv = getMemEnv(Ecmd.port);~n"),
@@ -292,10 +308,16 @@ gen_method(CName, M=#method{name=N,params=[Ps],method_type=destructor,id=MethodI
 	    ignore
     end,
     M;
-gen_method(CName,  M=#method{name=N,params=Ps0,type=T,method_type=MT,id=MethodId}) ->
+gen_method(CName,  M=#method{name=N,params=Ps0,type=T,method_type=MT,id=MethodId, opts=FOpts}) ->
     put(current_func, N),
     put(bin_count,-1),
     ?WTC("gen_method"),
+    Endif = case lists:keysearch(deprecated, 1, FOpts) of
+		{value, {deprecated, IfDef}} ->
+		    w("#if ~s~n", [IfDef]),
+		    true;
+		_ -> false
+	    end,
     w("case ~s: { // ~s::~s~n", [wx_gen_erl:get_unique_name(MethodId),CName,N]),
     Ps1 = declare_variables(void, Ps0),
     {Ps2,Align} = decode_arguments(Ps1),
@@ -314,6 +336,7 @@ gen_method(CName,  M=#method{name=N,params=Ps0,type=T,method_type=MT,id=MethodId
     free_args(),
     build_return_vals(T,Ps3),
     w(" break;~n}~n", []),
+    Endif andalso w("#endif~n", []),
     erase(current_func),
     M.
 
@@ -746,7 +769,7 @@ return_res1(#type{name=Type,ref={pointer,_}, base={term,_}}) ->
     {Type ++ " * Result = (" ++ Type ++ "*)", ""};
 return_res1(#type{name=Type,ref={pointer,_}}) ->
     {Type ++ " * Result = (" ++ Type ++ "*)", ""};
-return_res1(#type{name=Type,single=true,ref=reference}) ->
+return_res1(#type{name=Type,single=true,by_val=false,ref=reference}) ->
     {Type ++ " * Result = &", ""};
 return_res1(#type{name=Type,single=true,by_val=true})
   when is_atom(Type) ->
@@ -758,7 +781,7 @@ return_res1(#type{name=Type,base={class,_},single=list,ref=reference}) ->
 return_res1(#type{name=Type,base={comp,_,_},single=array,by_val=true}) ->
     {Type ++ " Result = ", ""};
 return_res1(#type{name=Type,single=true,by_val=true, base={class, _}}) ->
-    %% Memory leak !!!!!!   XXXX BUGBUG FIXME or doument!!
+    %% Temporary memory leak !!!!!!
     case Type of
 	"wxImage" ->  ok;
 	"wxFont"  ->  ok;
@@ -769,7 +792,6 @@ return_res1(#type{name=Type,single=true,by_val=true, base={class, _}}) ->
 	    io:format("~s::~s Building return value of temp ~s~n",
 		      [get(current_class),get(current_func),Type])
     end,
-    %% #class{id=Id} = get({class,Type}),
     {Type ++ " * Result = new " ++ Type ++ "(", "); newPtr((void *) Result,"
      ++ "3, memenv);"};
 return_res1(#type{base={enum,_Type},single=true,by_val=true}) ->
@@ -794,15 +816,14 @@ call_arg(#param{where=c, alt={length,Alt}}) when is_list(Alt) ->
 call_arg(#param{where=c, alt={size,Id}}) when is_integer(Id) ->
     %% It's a binary
     "Ecmd.bin["++ integer_to_list(Id) ++ "]->size";
-call_arg(#param{name=N,def=Def,type=#type{name=Type,by_val=true,single=true,base=Base}})
+call_arg(#param{name=N,def=Def,type=#type{by_val=true,single=true,base=Base}})
   when Base =:= int; Base =:= long; Base =:= float; Base =:= double; Base =:= bool ->
     case Def of
-	none -> "(" ++ to_string(Type) ++ ") *" ++ N;
+	none -> "*" ++ N;
 	_ ->  N
     end;
-
-call_arg(#param{name=N,type=#type{base={enum,Type}, by_val=true,single=true}}) ->
-    "(" ++ enum_type(Type) ++") " ++ N;
+call_arg(#param{name=N,type=#type{base={enum,_Type}, by_val=true,single=true}}) ->
+    N;
 call_arg(#param{name=N,type=#type{base={class,_},by_val=true,single=true}}) -> "*" ++ N;
 call_arg(#param{name=N,type=#type{base={class,_},ref=reference,single=true}}) -> "*" ++ N;
 call_arg(#param{name=N,type=#type{base=eventType}}) ->
@@ -823,8 +844,8 @@ call_arg(#param{name=N,type={merged,_,#type{base={class,_},single=true,
 					    ref=Ref},_,_,_,_}})
   when ByVal =:= true; Ref =:= reference ->
     "*" ++ N;
-call_arg(#param{def=Def, type=void}) when Def =/= none -> Def;
-call_arg(#param{def=Def, type=voidp}) when Def =/= none -> Def;
+call_arg(#param{def=Def, type=void}) when Def =/= none  -> Def;
+call_arg(#param{def=Def, type=voidp}) when Def =/= none -> "(void **) " ++ Def;
 call_arg(#param{name=N,type=#type{base={ref,_},by_val=true,single=true}}) -> N;
 call_arg(#param{name=N,type={merged,_,_,_,_,_,_}}) -> N.
 
@@ -932,10 +953,18 @@ build_ret(Name,_,#type{base={enum,_Type},single=true}) ->
     w(" rt.addInt(~s);~n",[Name]);
 build_ret(Name,_,#type{base={comp,_,{record, _}},single=true}) ->
     w(" rt.add(~s);~n", [Name]);
+build_ret(Name,{ret,_},#type{base={comp,_,_},single=true, by_val=true}) ->
+    w(" rt.add(~s);~n",[Name]);
 build_ret(Name,{ret,_},#type{base={comp,_,_},single=true, ref=reference}) ->
     w(" rt.add((*~s));~n",[Name]);
 build_ret(Name,_,#type{base={comp,_,_},single=true}) ->
     w(" rt.add(~s);~n",[Name]);
+build_ret(Name = "ev->m_scanCode",_,#type{base=bool,single=true,by_val=true}) ->
+    %% Hardcoded workaround for 2.9 and later
+    w("#if !wxCHECK_VERSION(2,9,0)~n", []),
+    w(" rt.addBool(~s);~n",[Name]),
+    w("#else~n rt.addBool(false);~n",[]),
+    w("#endif~n",[]);
 build_ret(Name,_,#type{base=bool,single=true,by_val=true}) ->
     w(" rt.addBool(~s);~n",[Name]);
 build_ret(Name,{arg, both},#type{base=int,single=true,mod=M}) ->
diff --git a/lib/wx/api_gen/wx_gen_erl.erl b/lib/wx/api_gen/wx_gen_erl.erl
index a8f23575f3..a999a869e6 100644
--- a/lib/wx/api_gen/wx_gen_erl.erl
+++ b/lib/wx/api_gen/wx_gen_erl.erl
@@ -70,8 +70,7 @@ gen_class1(C=#class{name=Name,parent="static",methods=Ms,options=_Opts}) ->
 
     Exp = fun(M) -> gen_export(C,M) end,
     ExportList = lists:usort(lists:append(lists:map(Exp,reverse(Ms)))),
-    w("-export([~s]).~n~n", [args(fun(EF) -> EF end, ",", ExportList, 60)]),
-
+    w("-export([~s]).~n~n", [args(fun({EF,_}) -> EF end, ",", ExportList, 60)]),
 
     Gen = fun(M) -> gen_method(Name,M) end,
     NewMs = lists:map(Gen,reverse(Ms)),
@@ -134,7 +133,7 @@ gen_class1(C=#class{name=Name,parent=Parent,methods=Ms,options=Opts}) ->
 	    w("-include(\"wxe.hrl\").~n",[]),
 	    Exp = fun(M) -> gen_export(C,M) end,
 	    ExportList = lists:usort(lists:append(lists:map(Exp,reverse(Ms)))),
-	    w("-export([~s]).~n~n", [args(fun(EF) -> EF end, ",", ExportList, 60)]),
+	    w("-export([~s]).~n~n", [args(fun({EF,_}) -> EF end, ",", ExportList, 60)]),
 	    w("%% inherited exports~n",[]),
 	    Done0 = ["Destroy", "New", "Create", "destroy", "new", "create"],
 	    Done  = gb_sets:from_list(Done0 ++ [M|| #method{name=M} <- lists:append(Ms)]),
@@ -143,6 +142,10 @@ gen_class1(C=#class{name=Name,parent=Parent,methods=Ms,options=Opts}) ->
 					  lists:usort(["parent_class/1"|InExported]),
 					  60)]),
 	    w("-export_type([~s/0]).~n", [Name]),
+	    case lists:filter(fun({_F,Depr}) -> Depr end, ExportList) of
+		[] -> ok;
+		Depr -> w("-deprecated([~s]).~n~n", [args(fun({EF,_}) -> EF end, ",", Depr, 60)])
+	    end,
 	    w("%% @hidden~n", []),
 	    parents_check(Parents),
 	    w("-type ~s() :: wx:wx_object().~n", [Name]),
@@ -218,33 +221,40 @@ gen_export(#class{name=Class,abstract=Abs},Ms0) ->
     case Res of
 	[] -> [];
 	[M=#method{where=taylormade}|_] ->
-	    [taylormade_export(Class, M)];
+	    [deprecated(M, taylormade_export(Class, M))];
 	Ms ->
-	    GetF = fun(#method{method_type=constructor,where=W,params=Ps}) ->
+	    GetF = fun(M=#method{method_type=constructor,where=W,params=Ps}) ->
 			   {Args,Opts} = split_optional(Ps),
 			   OptLen = case Opts of
 					[] -> 0;
 					_ when W =:= erl_no_opt -> 0;
 					_ -> 1
 				    end,
-			   "new/" ++ integer_to_list(length(Args)+OptLen);
-		      (#method{method_type=destructor}) ->
+			   deprecated(M, "new" ++ "/" ++ integer_to_list(length(Args)+OptLen));
+		      (M=#method{method_type=destructor}) ->
 			   case Abs of
 			       true -> [];
-			       _ -> "destroy/1"
+			       _ -> deprecated(M, "destroy/1")
 			   end;
-		      (#method{name=N,alias=A,where=W, params=Ps}) ->
+		      (M=#method{name=N,alias=A,where=W, params=Ps}) ->
 			   {Args,Opts} = split_optional(Ps),
 			   OptLen = case Opts of
 					[] -> 0;
 					_ when W =:= erl_no_opt -> 0;
 					_ -> 1
 				    end,
-			   erl_func_name(N,A) ++ "/" ++ integer_to_list(length(Args) + OptLen)
+			   deprecated(M, erl_func_name(N,A) ++ "/" ++ integer_to_list(length(Args) + OptLen))
 		   end,
 	    lists:map(GetF, Ms)
     end.
 
+deprecated(#method{opts=FOpts}, FA) ->
+    case lists:keysearch(deprecated, 1, FOpts) of
+	{value, {deprecated, _}} ->
+	    {FA,true};
+	_ ->
+	    {FA,false}
+    end.
 
 gen_method(Class,Ms0) ->
     RemoveC = fun(#method{where=merged_c}) -> false;(_Other) -> true end,
@@ -832,15 +842,20 @@ doc_enum(_,Ps) ->
     [doc_enum_type(Type,Name) || #param{name=Name, type=#type{base={enum,Type}}} <- Ps].
 
 doc_enum_type(Type, Name) ->
-    {Enum0, #enum{vals=Vals}} = wx_gen:get_enum(Type),
-    Enum = case Enum0 of {_, E} -> E; E -> E end,
-    Consts = get(consts),
-    Format = fun({N,_What}) ->
-		     #const{name=N} = gb_trees:get(N, Consts),
-		     "?" ++ enum_name(N)
-	     end,
-    Vs = args(Format, " | ", Vals),
-    {uppercase(Enum),Name, Vs}.
+    try
+	{Enum0, #enum{vals=Vals}} = wx_gen:get_enum(Type),
+	Enum = case Enum0 of {_, E} -> E; E -> E end,
+	Consts = get(consts),
+	Format = fun({N,_What}) ->
+			 #const{name=N} = gb_trees:get(N, Consts),
+			 "?" ++ enum_name(N)
+		 end,
+	Vs = args(Format, " | ", Vals),
+	{uppercase(Enum),Name, Vs}
+    catch _:_ ->
+	    io:format("Warning missing enum type ~p~n", [Type]),
+	    {uppercase(Type),Name,"integer"}
+    end.
 
 doc_enum_desc([]) -> ok;
 doc_enum_desc([{_Enum,Name,Vs}|R]) ->
@@ -1014,11 +1029,23 @@ align(64, 1, Str) -> {"0:32," ++ Str,0};
 align(Sz, W, Str) -> align(Sz, W rem 2, Str).
 
 enum_name(Name) ->
+    case enum_split(Name) of
+	{undefined, _} -> Name;
+	{_C, ErlName} -> ErlName
+    end.
+
+enum_split(Name) ->
     case string:tokens(Name, ":") of
-	[Name] -> Name;
-	[C,N] ->  C ++ "_" ++ N
+	[Name] -> {undefined, Name};
+	[C,N] ->  {C, enum_name(C,N)}
     end.
 
+enum_name(undefined, Name) -> Name;
+enum_name(Enum, Name) -> Enum ++ "_" ++ Name.
+
+enum_name_c(undefined, Name) -> Name;
+enum_name_c(Enum, Name) -> Enum ++ "::" ++ Name.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 gen_enums_ints() ->
@@ -1058,6 +1085,14 @@ build_enum_ints(#enum{from=From, vals=Vals},Done) ->
 	    w("% From class ~s::~s~n",[Class, Name])
     end,
 
+    Consts = get(consts),
+    Ignore = fun(Name) ->
+		     case gb_trees:lookup(Name, Consts) of
+			 {value, Const} -> Const;
+			 none -> true
+		     end
+	     end,
+
     Format = fun(#const{name="wxEVT_" ++ _}) ->
 		     ignore; %% Ignore event macros they are not valid in our event model
 		(#const{name=Name,val=Value,is_const=true}) when is_number(Value) ->
@@ -1065,44 +1100,57 @@ build_enum_ints(#enum{from=From, vals=Vals},Done) ->
 		(#const{name=Name,val=Value,is_const=false}) when is_number(Value) ->
 		     w("-define(~s, wxe_util:get_const(~s)).~n", [enum_name(Name),enum_name(Name)]);
 		(#const{name=Name,val={Str,0}}) ->
+		     {EnumClass, EnumName} = enum_split(Name),
 		     case string:tokens(Str, " |()") of
 			 [Token] ->
-			     w("-define(~s, ~s).~n", [enum_name(Name),const_value(Token)]);
+			     w("-define(~s, ~s).~n", [EnumName,const_value(Token, EnumClass, Ignore)]);
 			 Tokens ->
-			     Def = args(fun(T) -> const_value(T) end, " bor ", Tokens),
-			     w("-define(~s, (~s)).~n", [enum_name(Name),Def])
+			     Def = args(fun(T) -> const_value(T, EnumClass, Ignore) end, " bor ", Tokens),
+			     w("-define(~s, (~s)).~n", [EnumName, Def])
 		     end;
 		(#const{name=Name,val={Str,N}}) ->
+		     {EnumClass, EnumName} = enum_split(Name),
 		     case string:tokens(Str, " |()") of
 			 [Token] ->
-			     w("-define(~s, (?~s+~p)).~n", [enum_name(Name),Token,N])
+			     w("-define(~s, (~s+~p)).~n", [EnumName,const_value(Token, EnumClass, Ignore),N])
 		     end
 	     end,
-    Consts = get(consts),
+
     Write = fun({Name,_What}, Skip) ->
-		    case gb_sets:is_member(Name,Skip) of
-			true ->
-			    Skip;
-			false ->
-			    case gb_trees:lookup(Name, Consts) of
-				{value, Const} ->
-				    Format(Const),
-				    gb_sets:add(Name,Skip);
-				none -> Skip
-			    end
+		    case gb_sets:is_member(Name,Skip) orelse Ignore(Name) of
+			true -> Skip;
+			Const ->
+			    try Format(Const)
+			    catch {unknown_value, _Error} ->
+				    %% io:format("Const ~s uses unknown define ~p ignoring~n", [Name, _Error]),
+				    ok
+			    end,
+			    gb_sets:add(Name,Skip)
 		    end
 	    end,
     lists:foldl(Write, Done, Vals).
 
-const_value(V) when is_integer(V) -> integer_to_list(V);
-const_value(V = "16#" ++ IntList) ->
+const_value(V,_,_) when is_integer(V) -> integer_to_list(V);
+const_value(V = "16#" ++ IntList,_,_) ->
     _ = http_util:hexlist_to_integer(IntList), %% ASSERT
     V;
-const_value(V0) ->
+const_value(V0, EnumClass, Ignore) ->
     try
 	_ = list_to_integer(V0),
 	V0
-    catch _:_ -> [$?|V0]
+    catch _:_ ->
+	    EEnum = enum_name(EnumClass, V0),
+	    CEnum = enum_name_c(EnumClass, V0),
+	    case Ignore(CEnum) of
+		true when CEnum == V0 ->
+		    throw({unknown_value, EEnum});
+		true ->
+		    case Ignore(V0) of
+			true -> throw({unknown_value, EEnum});
+			_ -> [$?|V0]
+		    end;
+		_ -> [$?|EEnum]
+	    end
     end.
 
 gen_event_recs() ->
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index 1f6225ce60..94142ff6ba 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -148,7 +148,8 @@
 
 {class, wxTopLevelWindowGTK, wxWindow, 
  [{alias, [{wxTopLevelWindowGTK, wxTopLevelWindow}]}],
- ['GetIcon','GetIcons','GetTitle','IsActive','Iconize',
+ [{'GetIcon', [{return, {by_val, true}}]},
+  'GetIcons','GetTitle','IsActive','Iconize',
   'IsFullScreen','IsIconized','IsMaximized','Maximize',
   'RequestUserAttention','SetIcon','SetIcons',
   'CenterOnScreen', 'CentreOnScreen',
@@ -279,8 +280,11 @@
 {class, wxGridCellEditor,   root, [], 
  ['Create',
   'IsCreated', 'SetSize', 'Show',
-  'PaintBackground', 'BeginEdit', 'EndEdit', 'Reset', 'StartingKey',
-  'StartingClick', 'HandleReturn' 						
+  {'PaintBackground', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  'BeginEdit',
+  {'EndEdit', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  'Reset', 'StartingKey',
+  'StartingClick', 'HandleReturn'
   %'Destroy','Clone','~wxGridCellEditor',
  ]}.
 
@@ -319,17 +323,25 @@
 {class, wxDC, object, 
  [{skip, [{'DrawEllipse',5},{'DrawRectangle',5},
 	  {'DrawRoundedRectangle',6},{'SetClippingRegion',5}]}],
- [{'Blit',7},'CalcBoundingBox','Clear','ComputeScaleAndOrigin',{'CrossHair',1},
+ [{{'Blit',7},[{"rop", [{base, {enum, "wxRasterOperationMode"}}]}]},
+  'CalcBoundingBox','Clear',
+  {'ComputeScaleAndOrigin',[{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  {'CrossHair',1},
   'DestroyClippingRegion','DeviceToLogicalX','DeviceToLogicalXRel',
   'DeviceToLogicalY','DeviceToLogicalYRel',{'DrawArc',3},{'DrawBitmap',3},
   {'DrawCheckMark',1},{'DrawCircle',2},'DrawEllipse',{'DrawEllipticArc',4},
   {'DrawIcon',2},{'DrawLabel',4},{'DrawLine',2},
   {'DrawLines', [{"n",{c_only,{length,"points"}}}]},
-  {'DrawPolygon', [{"n",{c_only,{length,"points"}}}]}, %'DrawPolyPolygon',
+  {'DrawPolygon', [{"n",{c_only,{length,"points"}}},
+		   {"fillStyle", [{base, {enum, "wxPolygonFillMode"}}]}
+		  ]},
+  %%'DrawPolyPolygon',
   {'DrawPoint',1},'DrawRectangle',
   {'DrawRotatedText',3}, 'DrawRoundedRectangle',%'DrawSpline',
   {'DrawText',2},
-  'EndDoc','EndPage',{'FloodFill',3},'GetBackground','GetBackgroundMode',
+  'EndDoc','EndPage',
+  {{'FloodFill',3},[{"style", [{base, {enum, "wxFloodFillStyle"}}]}]},
+  'GetBackground','GetBackgroundMode',
   'GetBrush','GetCharHeight','GetCharWidth',{'GetClippingBox',[{"rect", skip_member}]},
   'GetFont','GetLayoutDirection','GetLogicalFunction','GetMapMode','GetMultiLineTextExtent',
   {'GetPartialTextExtents', [{"widths", out}]},
@@ -340,21 +352,33 @@
   'LogicalToDeviceX','LogicalToDeviceXRel','LogicalToDeviceY','LogicalToDeviceYRel',
   'MaxX','MaxY','MinX','MinY','IsOk','ResetBoundingBox','SetAxisOrientation',
   'SetBackground','SetBackgroundMode','SetBrush','SetClippingRegion','SetDeviceOrigin',
-  'SetFont','SetLayoutDirection','SetLogicalFunction','SetMapMode', 'SetPalette',
+  'SetFont','SetLayoutDirection',
+  {'SetLogicalFunction', [{"function", [{base, {enum, "wxRasterOperationMode"}}]}]},
+  {'SetMapMode', [{"mode", [{base, {enum, "wxMappingMode"}}]}]},
+  'SetPalette',
   'SetPen','SetTextBackground','SetTextForeground','SetUserScale','StartDoc','StartPage']}.
 
 {class,wxMirrorDC, wxDC, [], ['wxMirrorDC', '~wxMirrorDC']}.
 {class,wxScreenDC, wxDC, [], ['wxScreenDC', '~wxScreenDC']}.
-{class,wxPostScriptDC,wxDC,[],['wxPostScriptDC','~wxPostScriptDC','SetResolution','GetResolution']}.
-{class,wxWindowDC, wxDC, [], ['wxWindowDC', '~wxWindowDC']}.
-{class,wxClientDC,wxWindowDC,[],['wxClientDC', '~wxClientDC']}.
-{class,wxPaintDC, wxWindowDC, [], ['wxPaintDC', '~wxPaintDC']}.
+{class,wxPostScriptDC,wxDC,[],
+ ['wxPostScriptDC','~wxPostScriptDC',
+  {'SetResolution', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  {'GetResolution', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}]}.
+{class,wxWindowDC, wxDC, [],
+ [{'wxWindowDC', [{{func, 0}, [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}]},
+  '~wxWindowDC']}.
+{class,wxClientDC,wxWindowDC,[],
+ [{'wxClientDC', [{{func, 0}, [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}]},
+  '~wxClientDC']}.
+{class,wxPaintDC, wxWindowDC, [],
+ [{'wxPaintDC', [{{func, 0}, [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}]},
+  '~wxPaintDC']}.
 %%{class,wxPrinterDC, wxDC, [], ['wxPrinterDC','GetPaperRect']}. Not in GTK
 {class,wxMemoryDC, wxDC, [], ['wxMemoryDC', '~wxMemoryDC','SelectObject','SelectObjectAsSource']}.
 {class,wxBufferedDC,wxMemoryDC,[],['wxBufferedDC','~wxBufferedDC','Init']}.
 {class,wxBufferedPaintDC,wxBufferedDC,[],['wxBufferedPaintDC', '~wxBufferedPaintDC']}.
 %% Only a typedef!
-%%{class,wxAutoBufferedPaintDC,wxBufferedPaintDC,[],['wxAutoBufferedPaintDC']}. 
+%%{class,wxAutoBufferedPaintDC,wxBufferedPaintDC,[],['wxAutoBufferedPaintDC']}.
 
 {class, wxGraphicsObject, object, [{ifdef, wxUSE_GRAPHICS_CONTEXT}],
  ['~wxGraphicsObject', 'GetRenderer','IsNull']}.
@@ -362,13 +386,17 @@
  [{ifdef, wxUSE_GRAPHICS_CONTEXT}, {skip, [{'StrokeLines',4}]}],
  ['~wxGraphicsContext',
   'Create', %%CreateFromNative CreateFromNativeWindow
-  'CreatePen','CreateBrush','CreateRadialGradientBrush',
-  'CreateLinearGradientBrush','CreateFont','CreateMatrix',
+  'CreatePen','CreateBrush',
+  {'CreateRadialGradientBrush', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  {'CreateLinearGradientBrush', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  'CreateFont','CreateMatrix',
   'CreatePath','Clip','ResetClip',
   'DrawBitmap','DrawEllipse','DrawIcon',
-  {'DrawLines', [{"n",{c_only,{length,"points"}}}, {"points", {single,array}}]},
-  'DrawPath',
-  'DrawRectangle','DrawRoundedRectangle','DrawText','FillPath',
+  {'DrawLines', [{"n",{c_only,{length,"points"}}}, {"points", {single,array}},
+		 {"fillStyle", [{base, {enum, "wxPolygonFillMode"}}]}]},
+  {'DrawPath',[{"fillStyle", [{base, {enum, "wxPolygonFillMode"}}]}]},
+  'DrawRectangle','DrawRoundedRectangle','DrawText',
+  {'FillPath',[{"fillStyle", [{base, {enum, "wxPolygonFillMode"}}]}]},
   'StrokePath', %% 'GetNativeContext',
   {'GetPartialTextExtents', [{"widths", out}]},
   'GetTextExtent','Rotate','Scale','Translate',
@@ -383,15 +411,18 @@
 {class, wxGraphicsPath, wxGraphicsObject, [{ifdef, wxUSE_GRAPHICS_CONTEXT}],
  ['MoveToPoint','AddArc','AddArcToPoint','AddCircle','AddCurveToPoint',
   'AddEllipse','AddLineToPoint','AddPath','AddQuadCurveToPoint',
-  'AddRectangle','AddRoundedRectangle','CloseSubpath','Contains',
-  'GetBox','GetCurrentPoint','Transform' 
+  'AddRectangle','AddRoundedRectangle','CloseSubpath',
+  {'Contains', [{"fillStyle", [{base, {enum, "wxPolygonFillMode"}}]}]},
+  'GetBox','GetCurrentPoint','Transform'
   %'GetNativePath','UnGetNativePath'
  ]}.
 {class, wxGraphicsRenderer, object, [{ifdef, wxUSE_GRAPHICS_CONTEXT}],
  ['GetDefaultRenderer','CreateContext',
   %%'CreateContextFromNativeContext', 'CreateContextFromNativeWindow',
   'CreatePen','CreateBrush',
-  'CreateLinearGradientBrush','CreateRadialGradientBrush','CreateFont',
+  {'CreateLinearGradientBrush', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  {'CreateRadialGradientBrush', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  'CreateFont',
   'CreateMatrix','CreatePath']}.
 
 {class, wxGraphicsPen,  wxGraphicsObject,[{ifdef, wxUSE_GRAPHICS_CONTEXT}], []}.
@@ -501,10 +532,12 @@
   'CopyFromBitmap','~wxIcon']}.
 
 {class, wxIconBundle, root, [],
- ['wxIconBundle','~wxIconBundle','AddIcon','GetIcon']}.
+ ['wxIconBundle','~wxIconBundle','AddIcon',
+ {'GetIcon', [{return, {by_val, true}}]}]}.
 
 {class, wxCursor, wxBitmap,[], 
- [{'wxCursor',[{"bits",[in,{base,binary},{single,true}]},
+ [{'wxCursor',[{{func, 5}, [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+	       {"bits",[in,{base,binary},{single,true}]},
 	       {"maskBits",nowhere},{"fg",nowhere},{"bg",nowhere}]},
   '~wxCursor','Ok']}.
 
@@ -549,16 +582,22 @@
   {'GetAlpha',[{{0,return},{base,{binary,"(This->GetWidth()*This->GetHeight())"}}}]},
   'GetBlue',
   {'GetData', [{return,{base,{binary,"(This->GetWidth()*This->GetHeight()*3)"}}}]},
-  'GetGreen', 'GetImageCount', %'GetHandlers',
+  'GetGreen',
+  {'GetImageCount', [{"type", [{base, {enum, "wxBitmapType"}}]}]},
+  %%'GetHandlers',
   'GetHeight','GetMaskBlue','GetMaskGreen',
   'GetMaskRed','GetOrFindMaskColour','GetPalette',
   'GetRed','GetSubImage', 'GetWidth',%%':HSVValue', 'HSVtoRGB',
   'HasAlpha','HasMask','GetOption','GetOptionInt','HasOption',
   'InitAlpha','InitStandardHandlers',%'InsertHandler',
   'IsTransparent', 'LoadFile','Ok',%%RGBValue 'RGBtoHSV',
-  'RemoveHandler','Mirror','Replace','Rescale','Resize',
+  'RemoveHandler','Mirror','Replace',
+  {'Rescale', [{"quality", [{base, {enum, "wxImageResizeQuality"}}]}]},
+  'Resize',
   'Rotate', 'RotateHue',
-  'Rotate90','SaveFile','Scale','Size',
+  'Rotate90','SaveFile',
+  {'Scale', [{"quality", [{base, {enum, "wxImageResizeQuality"}}]}]},
+  'Size',
   {'SetAlpha', [{{2,"alpha"},[in,{base,binary}, {def, none}]},
 		{{2,pre_hook}, 
 		 [{c, "if(!static_data) {"
@@ -576,15 +615,20 @@
   'SetRGB']}.
 
 {class, wxBrush, object, [],
- ['wxBrush','~wxBrush','GetColour','GetStipple','GetStyle',
+ ['wxBrush','~wxBrush',
+  {'GetColour', [{return, {by_val, true}}]},
+  'GetStipple','GetStyle',
   'IsHatch','IsOk','SetColour','SetStipple','SetStyle']}.
 
 {class, wxPen, object, [],
- ['wxPen','~wxPen','GetCap','GetColour',
+ ['wxPen','~wxPen','GetCap',
+  {'GetColour', [{return, {by_val, true}}]},
   %%'GetDashes', %'GetStipple',
-  'GetJoin', 'GetStyle','GetWidth','IsOk','SetCap','SetColour',
+  'GetJoin', 'GetStyle','GetWidth','IsOk',
+  {'SetCap', [{"capStyle", [{base, {enum, "wxPenCap"}}]}]},
+  'SetColour',
   %%'SetDashes',  %'SetStipple',
-  'SetJoin', 'SetStyle','SetWidth']}.
+  {'SetJoin', [{"joinStyle", [{base, {enum, "wxPenJoin"}}]}]}, 'SetStyle','SetWidth']}.
 
 {enum, wxRegionContain, "wx"}.
 
@@ -683,8 +727,11 @@
  ['wxButton','~wxButton','Create',%'GetLabel',
   'GetDefaultSize', 'SetDefault','SetLabel']}.
 {class, wxBitmapButton, wxButton, [], 
- ['wxBitmapButton','~wxBitmapButton','Create','GetBitmapDisabled',
-  'GetBitmapFocus','GetBitmapLabel','GetBitmapSelected',
+ ['wxBitmapButton','~wxBitmapButton','Create',
+  {'GetBitmapDisabled', [{return, {by_val, true}}]},
+  {'GetBitmapFocus', [{return, {by_val, true}}]},
+  {'GetBitmapLabel', [{return, {by_val, true}}]},
+  {'GetBitmapSelected', [{return, {by_val, true}}]},
   'SetBitmapDisabled','SetBitmapFocus','SetBitmapLabel','SetBitmapSelected']}.
 {class, wxToggleButton, wxControl, [], 
  ['wxToggleButton','~wxToggleButton','Create','GetValue','SetValue']}.
@@ -693,8 +740,10 @@
 {class, wxDateTime, root, [ignore], []}.  %% Only for ifdefs and enums
 
 {class, wxCalendarCtrl, wxControl, [], 
- ['wxCalendarCtrl','Create','~wxCalendarCtrl','SetDate','GetDate',
-  'EnableYearChange','EnableMonthChange','EnableHolidayDisplay',
+ ['wxCalendarCtrl','Create','~wxCalendarCtrl','SetDate',
+  {'GetDate', [{return, {by_val, true}}]},
+  {'EnableYearChange', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}, %% Temp bug in wx I assume
+  'EnableMonthChange','EnableHolidayDisplay',
   'SetHeaderColours','GetHeaderColourFg','GetHeaderColourBg',
   'SetHighlightColours','GetHighlightColourFg','GetHighlightColourBg',
   'SetHolidayColours','GetHolidayColourFg','GetHolidayColourBg',
@@ -816,8 +865,9 @@
 {enum, wxTextAttrAlignment, "wxTEXT_ALIGNMENT_"}.
 
 {class, wxTextAttr, root, [], 
- ['wxTextAttr','GetAlignment','GetBackgroundColour','GetFont','GetLeftIndent',
-  'GetLeftSubIndent','GetRightIndent','GetTabs','GetTextColour',
+ ['wxTextAttr','GetAlignment','GetBackgroundColour',
+  {'GetFont', [{return, {by_val, true}}]},
+  'GetLeftIndent','GetLeftSubIndent','GetRightIndent','GetTabs','GetTextColour',
   'HasBackgroundColour','HasFont','HasTextColour','GetFlags','IsDefault',
   'SetAlignment','SetBackgroundColour','SetFlags','SetFont','SetLeftIndent',
   'SetRightIndent','SetTabs','SetTextColour']}.
@@ -1233,7 +1283,8 @@
 
 {class, wxMDIParentFrame, wxFrame, [], 
  [
- 'wxMDIParentFrame', '~wxMDIParentFrame', 'ActivateNext', 'ActivatePrevious', 
+  'wxMDIParentFrame',
+  '~wxMDIParentFrame', 'ActivateNext', 'ActivatePrevious',
   'ArrangeIcons', 'Cascade', 'Create', 
   %%'GetClientSize', 'GetToolBar', 'SetToolBar',  defined in parent
   'GetActiveChild', 'GetClientWindow', 
@@ -1244,8 +1295,9 @@
 {class, wxMDIChildFrame, wxFrame, [], 
  ['wxMDIChildFrame','~wxMDIChildFrame','Activate','Create','Maximize','Restore']}.
 
-{class, wxMDIClientWindow, wxWindow, [], 
- ['wxMDIClientWindow','~wxMDIClientWindow','CreateClient']}.
+{class, wxMDIClientWindow, wxWindow, [],
+ [{'wxMDIClientWindow', [{{func, 2}, [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}]},
+  '~wxMDIClientWindow','CreateClient']}.
 
 {class, wxLayoutAlgorithm, object, [],
  ['wxLayoutAlgorithm', '~wxLayoutAlgorithm', 
@@ -1310,12 +1362,7 @@
    [wxEVT_LEFT_DOWN,wxEVT_LEFT_UP,wxEVT_MIDDLE_DOWN,wxEVT_MIDDLE_UP,
     wxEVT_RIGHT_DOWN,wxEVT_RIGHT_UP,wxEVT_MOTION,wxEVT_ENTER_WINDOW,
     wxEVT_LEAVE_WINDOW,wxEVT_LEFT_DCLICK,wxEVT_MIDDLE_DCLICK,
-    wxEVT_RIGHT_DCLICK,wxEVT_MOUSEWHEEL,
-    wxEVT_NC_LEFT_DOWN,wxEVT_NC_LEFT_UP,
-    wxEVT_NC_MIDDLE_DOWN,wxEVT_NC_MIDDLE_UP,wxEVT_NC_RIGHT_DOWN,
-    wxEVT_NC_RIGHT_UP,wxEVT_NC_MOTION,wxEVT_NC_ENTER_WINDOW,
-    wxEVT_NC_LEAVE_WINDOW,wxEVT_NC_LEFT_DCLICK,wxEVT_NC_MIDDLE_DCLICK,
-    wxEVT_NC_RIGHT_DCLICK]}],
+    wxEVT_RIGHT_DCLICK,wxEVT_MOUSEWHEEL]}],
  ['AltDown','Button','ButtonDClick','ButtonDown','ButtonUp','CmdDown','ControlDown',
   'Dragging',  'Entering',  'GetButton',  'GetPosition',  'GetLogicalPosition',
   'GetLinesPerAction',  'GetWheelRotation',  'GetWheelDelta',  'GetX',  'GetY',
@@ -1345,8 +1392,8 @@
  ['GetSize']}.
 {class, wxMoveEvent, wxEvent, [{event,[wxEVT_MOVE]}],
  ['GetPosition']}.
-{class, wxPaintEvent, wxEvent, [{event,[wxEVT_PAINT,wxEVT_PAINT_ICON]}],[]}.
-{class, wxNcPaintEvent, wxEvent, [{event,[wxEVT_NC_PAINT]}],[]}.
+{class, wxPaintEvent, wxEvent, [{event,[wxEVT_PAINT]}],[]}.
+%%{class, wxNcPaintEvent, wxEvent, [{event,[wxEVT_NC_PAINT]}],[]}.
 {class, wxEraseEvent, wxEvent, 
  [{acc, [{m_dc, "GetDC()"}]},
   {event, [wxEVT_ERASE_BACKGROUND]}],
@@ -1415,7 +1462,8 @@
  ['GetPosition','SetPosition']}.
 {enum, wxIdleMode, "wxIDLE_"}.
 {class, wxIdleEvent, wxEvent, [{event,[wxEVT_IDLE]}],
- ['CanSend','GetMode','RequestMore','MoreRequested','SetMode']}.
+ [{'CanSend', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
+  'GetMode','RequestMore','MoreRequested','SetMode']}.
 {class, wxGridEvent, wxNotifyEvent, 
  [{acc, [{m_row, "GetRow()"}, {m_col, "GetCol()"}, {m_x, "GetPosition().x"},{m_y, "GetPosition().y"},
 	 {m_selecting, "Selecting()"},{m_control,"ControlDown()"},
@@ -1634,7 +1682,7 @@
   'StyleSetFont', 'StyleSetFontAttr', 'StyleSetCharacterSet', 'StyleSetFontEncoding', 
   'CmdKeyExecute', 
   'SetMargins', {'GetSelection', [{"startPos", [out]}, {"endPos",[out]}]}, 
-  'PointFromPosition', 'ScrollToLine', 'ScrollToColumn', 'SendMsg', 
+  'PointFromPosition', 'ScrollToLine', 'ScrollToColumn', %% 'SendMsg',
   'SetVScrollBar', 'SetHScrollBar', 'GetLastKeydownProcessed', 'SetLastKeydownProcessed', 
   'SaveFile', 'LoadFile', 'DoDragOver', 'DoDropText', 'GetUseAntiAliasing', 
   {'AddTextRaw', [{"text", [in, {base, binary}]}]},
diff --git a/lib/wx/c_src/gen/wxe_derived_dest.h b/lib/wx/c_src/gen/wxe_derived_dest.h
index 6b7a5378cb..5fdce27d4b 100644
--- a/lib/wx/c_src/gen/wxe_derived_dest.h
+++ b/lib/wx/c_src/gen/wxe_derived_dest.h
@@ -94,19 +94,25 @@ class EwxPostScriptDC : public wxPostScriptDC {
 class EwxWindowDC : public wxWindowDC {
  public: ~EwxWindowDC() {((WxeApp *)wxTheApp)->clearPtr(this);};
  EwxWindowDC(wxWindow * win) : wxWindowDC(win) {};
+#if !wxCHECK_VERSION(2,9,0)
  EwxWindowDC() : wxWindowDC() {};
+#endif
 };
 
 class EwxClientDC : public wxClientDC {
  public: ~EwxClientDC() {((WxeApp *)wxTheApp)->clearPtr(this);};
  EwxClientDC(wxWindow * win) : wxClientDC(win) {};
+#if !wxCHECK_VERSION(2,9,0)
  EwxClientDC() : wxClientDC() {};
+#endif
 };
 
 class EwxPaintDC : public wxPaintDC {
  public: ~EwxPaintDC() {((WxeApp *)wxTheApp)->clearPtr(this);};
  EwxPaintDC(wxWindow * win) : wxPaintDC(win) {};
+#if !wxCHECK_VERSION(2,9,0)
  EwxPaintDC() : wxPaintDC() {};
+#endif
 };
 
 class EwxMemoryDC : public wxMemoryDC {
@@ -182,7 +188,9 @@ class EwxIcon : public wxIcon {
 
 class EwxCursor : public wxCursor {
  public: ~EwxCursor() {((WxeApp *)wxTheApp)->clearPtr(this);};
+#if !wxCHECK_VERSION(2,9,0)
  EwxCursor(const char * bits,int width,int height,int hotSpotX,int hotSpotY) : wxCursor(bits,width,height,hotSpotX,hotSpotY) {};
+#endif
  EwxCursor(int cursorId) : wxCursor(cursorId) {};
  EwxCursor(const wxImage& image) : wxCursor(image) {};
  EwxCursor() : wxCursor() {};
@@ -286,7 +294,7 @@ class EwxStdDialogButtonSizer : public wxStdDialogButtonSizer {
 
 class EwxFont : public wxFont {
  public: ~EwxFont() {((WxeApp *)wxTheApp)->clearPtr(this);};
- EwxFont(int size,int family,int style,int weight,bool underlined,const wxString& face,wxFontEncoding encoding) : wxFont(size,family,style,weight,underlined,face,encoding) {};
+ EwxFont(int size,wxFontFamily family,wxFontStyle style,int weight,bool underlined,const wxString& face,wxFontEncoding encoding) : wxFont(size,family,style,weight,underlined,face,encoding) {};
  EwxFont(const wxString& fontname) : wxFont(fontname) {};
  EwxFont() : wxFont() {};
 };
@@ -712,7 +720,9 @@ class EwxMDIChildFrame : public wxMDIChildFrame {
 
 class EwxMDIClientWindow : public wxMDIClientWindow {
  public: ~EwxMDIClientWindow() {((WxeApp *)wxTheApp)->clearPtr(this);};
+#if !wxCHECK_VERSION(2,9,0)
  EwxMDIClientWindow(wxMDIParentFrame * parent,long style) : wxMDIClientWindow(parent,style) {};
+#endif
  EwxMDIClientWindow() : wxMDIClientWindow() {};
 };
 
diff --git a/lib/wx/c_src/gen/wxe_events.cpp b/lib/wx/c_src/gen/wxe_events.cpp
index 0afb02150a..7a3233a410 100644
--- a/lib/wx/c_src/gen/wxe_events.cpp
+++ b/lib/wx/c_src/gen/wxe_events.cpp
@@ -107,18 +107,6 @@ void initEventTable()
    {wxEVT_MIDDLE_DCLICK, 167, "middle_dclick"},
    {wxEVT_RIGHT_DCLICK, 167, "right_dclick"},
    {wxEVT_MOUSEWHEEL, 167, "mousewheel"},
-   {wxEVT_NC_LEFT_DOWN, 167, "nc_left_down"},
-   {wxEVT_NC_LEFT_UP, 167, "nc_left_up"},
-   {wxEVT_NC_MIDDLE_DOWN, 167, "nc_middle_down"},
-   {wxEVT_NC_MIDDLE_UP, 167, "nc_middle_up"},
-   {wxEVT_NC_RIGHT_DOWN, 167, "nc_right_down"},
-   {wxEVT_NC_RIGHT_UP, 167, "nc_right_up"},
-   {wxEVT_NC_MOTION, 167, "nc_motion"},
-   {wxEVT_NC_ENTER_WINDOW, 167, "nc_enter_window"},
-   {wxEVT_NC_LEAVE_WINDOW, 167, "nc_leave_window"},
-   {wxEVT_NC_LEFT_DCLICK, 167, "nc_left_dclick"},
-   {wxEVT_NC_MIDDLE_DCLICK, 167, "nc_middle_dclick"},
-   {wxEVT_NC_RIGHT_DCLICK, 167, "nc_right_dclick"},
    {wxEVT_SET_CURSOR, 168, "set_cursor"},
    {wxEVT_CHAR, 169, "char"},
    {wxEVT_CHAR_HOOK, 169, "char_hook"},
@@ -127,187 +115,185 @@ void initEventTable()
    {wxEVT_SIZE, 170, "size"},
    {wxEVT_MOVE, 171, "move"},
    {wxEVT_PAINT, 172, "paint"},
-   {wxEVT_PAINT_ICON, 172, "paint_icon"},
-   {wxEVT_NC_PAINT, 173, "nc_paint"},
-   {wxEVT_ERASE_BACKGROUND, 174, "erase_background"},
-   {wxEVT_SET_FOCUS, 175, "set_focus"},
-   {wxEVT_KILL_FOCUS, 175, "kill_focus"},
-   {wxEVT_CHILD_FOCUS, 176, "child_focus"},
-   {wxEVT_MENU_OPEN, 177, "menu_open"},
-   {wxEVT_MENU_CLOSE, 177, "menu_close"},
-   {wxEVT_MENU_HIGHLIGHT, 177, "menu_highlight"},
-   {wxEVT_CLOSE_WINDOW, 178, "close_window"},
-   {wxEVT_END_SESSION, 178, "end_session"},
-   {wxEVT_QUERY_END_SESSION, 178, "query_end_session"},
-   {wxEVT_SHOW, 179, "show"},
-   {wxEVT_ICONIZE, 180, "iconize"},
-   {wxEVT_MAXIMIZE, 181, "maximize"},
-   {wxEVT_JOY_BUTTON_DOWN, 182, "joy_button_down"},
-   {wxEVT_JOY_BUTTON_UP, 182, "joy_button_up"},
-   {wxEVT_JOY_MOVE, 182, "joy_move"},
-   {wxEVT_JOY_ZMOVE, 182, "joy_zmove"},
-   {wxEVT_UPDATE_UI, 183, "update_ui"},
-   {wxEVT_SYS_COLOUR_CHANGED, 184, "sys_colour_changed"},
-   {wxEVT_MOUSE_CAPTURE_CHANGED, 185, "mouse_capture_changed"},
-   {wxEVT_DISPLAY_CHANGED, 186, "display_changed"},
-   {wxEVT_PALETTE_CHANGED, 187, "palette_changed"},
-   {wxEVT_QUERY_NEW_PALETTE, 188, "query_new_palette"},
-   {wxEVT_NAVIGATION_KEY, 189, "navigation_key"},
-   {wxEVT_CREATE, 190, "create"},
-   {wxEVT_DESTROY, 191, "destroy"},
-   {wxEVT_HELP, 192, "help"},
-   {wxEVT_DETAILED_HELP, 192, "detailed_help"},
-   {wxEVT_CONTEXT_MENU, 193, "context_menu"},
-   {wxEVT_IDLE, 194, "idle"},
-   {wxEVT_GRID_CELL_LEFT_CLICK, 195, "grid_cell_left_click"},
-   {wxEVT_GRID_CELL_RIGHT_CLICK, 195, "grid_cell_right_click"},
-   {wxEVT_GRID_CELL_LEFT_DCLICK, 195, "grid_cell_left_dclick"},
-   {wxEVT_GRID_CELL_RIGHT_DCLICK, 195, "grid_cell_right_dclick"},
-   {wxEVT_GRID_LABEL_LEFT_CLICK, 195, "grid_label_left_click"},
-   {wxEVT_GRID_LABEL_RIGHT_CLICK, 195, "grid_label_right_click"},
-   {wxEVT_GRID_LABEL_LEFT_DCLICK, 195, "grid_label_left_dclick"},
-   {wxEVT_GRID_LABEL_RIGHT_DCLICK, 195, "grid_label_right_dclick"},
-   {wxEVT_GRID_ROW_SIZE, 195, "grid_row_size"},
-   {wxEVT_GRID_COL_SIZE, 195, "grid_col_size"},
-   {wxEVT_GRID_RANGE_SELECT, 195, "grid_range_select"},
-   {wxEVT_GRID_CELL_CHANGE, 195, "grid_cell_change"},
-   {wxEVT_GRID_SELECT_CELL, 195, "grid_select_cell"},
-   {wxEVT_GRID_EDITOR_SHOWN, 195, "grid_editor_shown"},
-   {wxEVT_GRID_EDITOR_HIDDEN, 195, "grid_editor_hidden"},
-   {wxEVT_GRID_EDITOR_CREATED, 195, "grid_editor_created"},
-   {wxEVT_GRID_CELL_BEGIN_DRAG, 195, "grid_cell_begin_drag"},
-   {wxEVT_SASH_DRAGGED, 197, "sash_dragged"},
-   {wxEVT_COMMAND_LIST_BEGIN_DRAG, 198, "command_list_begin_drag"},
-   {wxEVT_COMMAND_LIST_BEGIN_RDRAG, 198, "command_list_begin_rdrag"},
-   {wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, 198, "command_list_begin_label_edit"},
-   {wxEVT_COMMAND_LIST_END_LABEL_EDIT, 198, "command_list_end_label_edit"},
-   {wxEVT_COMMAND_LIST_DELETE_ITEM, 198, "command_list_delete_item"},
-   {wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, 198, "command_list_delete_all_items"},
-   {wxEVT_COMMAND_LIST_KEY_DOWN, 198, "command_list_key_down"},
-   {wxEVT_COMMAND_LIST_INSERT_ITEM, 198, "command_list_insert_item"},
-   {wxEVT_COMMAND_LIST_COL_CLICK, 198, "command_list_col_click"},
-   {wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, 198, "command_list_col_right_click"},
-   {wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, 198, "command_list_col_begin_drag"},
-   {wxEVT_COMMAND_LIST_COL_DRAGGING, 198, "command_list_col_dragging"},
-   {wxEVT_COMMAND_LIST_COL_END_DRAG, 198, "command_list_col_end_drag"},
-   {wxEVT_COMMAND_LIST_ITEM_SELECTED, 198, "command_list_item_selected"},
-   {wxEVT_COMMAND_LIST_ITEM_DESELECTED, 198, "command_list_item_deselected"},
-   {wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, 198, "command_list_item_right_click"},
-   {wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, 198, "command_list_item_middle_click"},
-   {wxEVT_COMMAND_LIST_ITEM_ACTIVATED, 198, "command_list_item_activated"},
-   {wxEVT_COMMAND_LIST_ITEM_FOCUSED, 198, "command_list_item_focused"},
-   {wxEVT_COMMAND_LIST_CACHE_HINT, 198, "command_list_cache_hint"},
-   {wxEVT_DATE_CHANGED, 199, "date_changed"},
-   {wxEVT_CALENDAR_SEL_CHANGED, 200, "calendar_sel_changed"},
-   {wxEVT_CALENDAR_DAY_CHANGED, 200, "calendar_day_changed"},
-   {wxEVT_CALENDAR_MONTH_CHANGED, 200, "calendar_month_changed"},
-   {wxEVT_CALENDAR_YEAR_CHANGED, 200, "calendar_year_changed"},
-   {wxEVT_CALENDAR_DOUBLECLICKED, 200, "calendar_doubleclicked"},
-   {wxEVT_CALENDAR_WEEKDAY_CLICKED, 200, "calendar_weekday_clicked"},
-   {wxEVT_COMMAND_FILEPICKER_CHANGED, 201, "command_filepicker_changed"},
-   {wxEVT_COMMAND_DIRPICKER_CHANGED, 201, "command_dirpicker_changed"},
-   {wxEVT_COMMAND_COLOURPICKER_CHANGED, 202, "command_colourpicker_changed"},
-   {wxEVT_COMMAND_FONTPICKER_CHANGED, 203, "command_fontpicker_changed"},
-   {wxEVT_STC_CHANGE, 204, "stc_change"},
-   {wxEVT_STC_STYLENEEDED, 204, "stc_styleneeded"},
-   {wxEVT_STC_CHARADDED, 204, "stc_charadded"},
-   {wxEVT_STC_SAVEPOINTREACHED, 204, "stc_savepointreached"},
-   {wxEVT_STC_SAVEPOINTLEFT, 204, "stc_savepointleft"},
-   {wxEVT_STC_ROMODIFYATTEMPT, 204, "stc_romodifyattempt"},
-   {wxEVT_STC_KEY, 204, "stc_key"},
-   {wxEVT_STC_DOUBLECLICK, 204, "stc_doubleclick"},
-   {wxEVT_STC_UPDATEUI, 204, "stc_updateui"},
-   {wxEVT_STC_MODIFIED, 204, "stc_modified"},
-   {wxEVT_STC_MACRORECORD, 204, "stc_macrorecord"},
-   {wxEVT_STC_MARGINCLICK, 204, "stc_marginclick"},
-   {wxEVT_STC_NEEDSHOWN, 204, "stc_needshown"},
-   {wxEVT_STC_PAINTED, 204, "stc_painted"},
-   {wxEVT_STC_USERLISTSELECTION, 204, "stc_userlistselection"},
-   {wxEVT_STC_URIDROPPED, 204, "stc_uridropped"},
-   {wxEVT_STC_DWELLSTART, 204, "stc_dwellstart"},
-   {wxEVT_STC_DWELLEND, 204, "stc_dwellend"},
-   {wxEVT_STC_START_DRAG, 204, "stc_start_drag"},
-   {wxEVT_STC_DRAG_OVER, 204, "stc_drag_over"},
-   {wxEVT_STC_DO_DROP, 204, "stc_do_drop"},
-   {wxEVT_STC_ZOOM, 204, "stc_zoom"},
-   {wxEVT_STC_HOTSPOT_CLICK, 204, "stc_hotspot_click"},
-   {wxEVT_STC_HOTSPOT_DCLICK, 204, "stc_hotspot_dclick"},
-   {wxEVT_STC_CALLTIP_CLICK, 204, "stc_calltip_click"},
-   {wxEVT_STC_AUTOCOMP_SELECTION, 204, "stc_autocomp_selection"},
-   {wxEVT_COMMAND_TREE_BEGIN_DRAG, 209, "command_tree_begin_drag"},
-   {wxEVT_COMMAND_TREE_BEGIN_RDRAG, 209, "command_tree_begin_rdrag"},
-   {wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, 209, "command_tree_begin_label_edit"},
-   {wxEVT_COMMAND_TREE_END_LABEL_EDIT, 209, "command_tree_end_label_edit"},
-   {wxEVT_COMMAND_TREE_DELETE_ITEM, 209, "command_tree_delete_item"},
-   {wxEVT_COMMAND_TREE_GET_INFO, 209, "command_tree_get_info"},
-   {wxEVT_COMMAND_TREE_SET_INFO, 209, "command_tree_set_info"},
-   {wxEVT_COMMAND_TREE_ITEM_EXPANDED, 209, "command_tree_item_expanded"},
-   {wxEVT_COMMAND_TREE_ITEM_EXPANDING, 209, "command_tree_item_expanding"},
-   {wxEVT_COMMAND_TREE_ITEM_COLLAPSED, 209, "command_tree_item_collapsed"},
-   {wxEVT_COMMAND_TREE_ITEM_COLLAPSING, 209, "command_tree_item_collapsing"},
-   {wxEVT_COMMAND_TREE_SEL_CHANGED, 209, "command_tree_sel_changed"},
-   {wxEVT_COMMAND_TREE_SEL_CHANGING, 209, "command_tree_sel_changing"},
-   {wxEVT_COMMAND_TREE_KEY_DOWN, 209, "command_tree_key_down"},
-   {wxEVT_COMMAND_TREE_ITEM_ACTIVATED, 209, "command_tree_item_activated"},
-   {wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, 209, "command_tree_item_right_click"},
-   {wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 209, "command_tree_item_middle_click"},
-   {wxEVT_COMMAND_TREE_END_DRAG, 209, "command_tree_end_drag"},
-   {wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 209, "command_tree_state_image_click"},
-   {wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, 209, "command_tree_item_gettooltip"},
-   {wxEVT_COMMAND_TREE_ITEM_MENU, 209, "command_tree_item_menu"},
-   {wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 210, "command_notebook_page_changed"},
-   {wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 210, "command_notebook_page_changing"},
-   {wxEVT_COMMAND_SPINCTRL_UPDATED, 216, "command_spinctrl_updated"},
+   {wxEVT_ERASE_BACKGROUND, 173, "erase_background"},
+   {wxEVT_SET_FOCUS, 174, "set_focus"},
+   {wxEVT_KILL_FOCUS, 174, "kill_focus"},
+   {wxEVT_CHILD_FOCUS, 175, "child_focus"},
+   {wxEVT_MENU_OPEN, 176, "menu_open"},
+   {wxEVT_MENU_CLOSE, 176, "menu_close"},
+   {wxEVT_MENU_HIGHLIGHT, 176, "menu_highlight"},
+   {wxEVT_CLOSE_WINDOW, 177, "close_window"},
+   {wxEVT_END_SESSION, 177, "end_session"},
+   {wxEVT_QUERY_END_SESSION, 177, "query_end_session"},
+   {wxEVT_SHOW, 178, "show"},
+   {wxEVT_ICONIZE, 179, "iconize"},
+   {wxEVT_MAXIMIZE, 180, "maximize"},
+   {wxEVT_JOY_BUTTON_DOWN, 181, "joy_button_down"},
+   {wxEVT_JOY_BUTTON_UP, 181, "joy_button_up"},
+   {wxEVT_JOY_MOVE, 181, "joy_move"},
+   {wxEVT_JOY_ZMOVE, 181, "joy_zmove"},
+   {wxEVT_UPDATE_UI, 182, "update_ui"},
+   {wxEVT_SYS_COLOUR_CHANGED, 183, "sys_colour_changed"},
+   {wxEVT_MOUSE_CAPTURE_CHANGED, 184, "mouse_capture_changed"},
+   {wxEVT_DISPLAY_CHANGED, 185, "display_changed"},
+   {wxEVT_PALETTE_CHANGED, 186, "palette_changed"},
+   {wxEVT_QUERY_NEW_PALETTE, 187, "query_new_palette"},
+   {wxEVT_NAVIGATION_KEY, 188, "navigation_key"},
+   {wxEVT_CREATE, 189, "create"},
+   {wxEVT_DESTROY, 190, "destroy"},
+   {wxEVT_HELP, 191, "help"},
+   {wxEVT_DETAILED_HELP, 191, "detailed_help"},
+   {wxEVT_CONTEXT_MENU, 192, "context_menu"},
+   {wxEVT_IDLE, 193, "idle"},
+   {wxEVT_GRID_CELL_LEFT_CLICK, 194, "grid_cell_left_click"},
+   {wxEVT_GRID_CELL_RIGHT_CLICK, 194, "grid_cell_right_click"},
+   {wxEVT_GRID_CELL_LEFT_DCLICK, 194, "grid_cell_left_dclick"},
+   {wxEVT_GRID_CELL_RIGHT_DCLICK, 194, "grid_cell_right_dclick"},
+   {wxEVT_GRID_LABEL_LEFT_CLICK, 194, "grid_label_left_click"},
+   {wxEVT_GRID_LABEL_RIGHT_CLICK, 194, "grid_label_right_click"},
+   {wxEVT_GRID_LABEL_LEFT_DCLICK, 194, "grid_label_left_dclick"},
+   {wxEVT_GRID_LABEL_RIGHT_DCLICK, 194, "grid_label_right_dclick"},
+   {wxEVT_GRID_ROW_SIZE, 194, "grid_row_size"},
+   {wxEVT_GRID_COL_SIZE, 194, "grid_col_size"},
+   {wxEVT_GRID_RANGE_SELECT, 194, "grid_range_select"},
+   {wxEVT_GRID_CELL_CHANGE, 194, "grid_cell_change"},
+   {wxEVT_GRID_SELECT_CELL, 194, "grid_select_cell"},
+   {wxEVT_GRID_EDITOR_SHOWN, 194, "grid_editor_shown"},
+   {wxEVT_GRID_EDITOR_HIDDEN, 194, "grid_editor_hidden"},
+   {wxEVT_GRID_EDITOR_CREATED, 194, "grid_editor_created"},
+   {wxEVT_GRID_CELL_BEGIN_DRAG, 194, "grid_cell_begin_drag"},
+   {wxEVT_SASH_DRAGGED, 196, "sash_dragged"},
+   {wxEVT_COMMAND_LIST_BEGIN_DRAG, 197, "command_list_begin_drag"},
+   {wxEVT_COMMAND_LIST_BEGIN_RDRAG, 197, "command_list_begin_rdrag"},
+   {wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, 197, "command_list_begin_label_edit"},
+   {wxEVT_COMMAND_LIST_END_LABEL_EDIT, 197, "command_list_end_label_edit"},
+   {wxEVT_COMMAND_LIST_DELETE_ITEM, 197, "command_list_delete_item"},
+   {wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, 197, "command_list_delete_all_items"},
+   {wxEVT_COMMAND_LIST_KEY_DOWN, 197, "command_list_key_down"},
+   {wxEVT_COMMAND_LIST_INSERT_ITEM, 197, "command_list_insert_item"},
+   {wxEVT_COMMAND_LIST_COL_CLICK, 197, "command_list_col_click"},
+   {wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, 197, "command_list_col_right_click"},
+   {wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, 197, "command_list_col_begin_drag"},
+   {wxEVT_COMMAND_LIST_COL_DRAGGING, 197, "command_list_col_dragging"},
+   {wxEVT_COMMAND_LIST_COL_END_DRAG, 197, "command_list_col_end_drag"},
+   {wxEVT_COMMAND_LIST_ITEM_SELECTED, 197, "command_list_item_selected"},
+   {wxEVT_COMMAND_LIST_ITEM_DESELECTED, 197, "command_list_item_deselected"},
+   {wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, 197, "command_list_item_right_click"},
+   {wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, 197, "command_list_item_middle_click"},
+   {wxEVT_COMMAND_LIST_ITEM_ACTIVATED, 197, "command_list_item_activated"},
+   {wxEVT_COMMAND_LIST_ITEM_FOCUSED, 197, "command_list_item_focused"},
+   {wxEVT_COMMAND_LIST_CACHE_HINT, 197, "command_list_cache_hint"},
+   {wxEVT_DATE_CHANGED, 198, "date_changed"},
+   {wxEVT_CALENDAR_SEL_CHANGED, 199, "calendar_sel_changed"},
+   {wxEVT_CALENDAR_DAY_CHANGED, 199, "calendar_day_changed"},
+   {wxEVT_CALENDAR_MONTH_CHANGED, 199, "calendar_month_changed"},
+   {wxEVT_CALENDAR_YEAR_CHANGED, 199, "calendar_year_changed"},
+   {wxEVT_CALENDAR_DOUBLECLICKED, 199, "calendar_doubleclicked"},
+   {wxEVT_CALENDAR_WEEKDAY_CLICKED, 199, "calendar_weekday_clicked"},
+   {wxEVT_COMMAND_FILEPICKER_CHANGED, 200, "command_filepicker_changed"},
+   {wxEVT_COMMAND_DIRPICKER_CHANGED, 200, "command_dirpicker_changed"},
+   {wxEVT_COMMAND_COLOURPICKER_CHANGED, 201, "command_colourpicker_changed"},
+   {wxEVT_COMMAND_FONTPICKER_CHANGED, 202, "command_fontpicker_changed"},
+   {wxEVT_STC_CHANGE, 203, "stc_change"},
+   {wxEVT_STC_STYLENEEDED, 203, "stc_styleneeded"},
+   {wxEVT_STC_CHARADDED, 203, "stc_charadded"},
+   {wxEVT_STC_SAVEPOINTREACHED, 203, "stc_savepointreached"},
+   {wxEVT_STC_SAVEPOINTLEFT, 203, "stc_savepointleft"},
+   {wxEVT_STC_ROMODIFYATTEMPT, 203, "stc_romodifyattempt"},
+   {wxEVT_STC_KEY, 203, "stc_key"},
+   {wxEVT_STC_DOUBLECLICK, 203, "stc_doubleclick"},
+   {wxEVT_STC_UPDATEUI, 203, "stc_updateui"},
+   {wxEVT_STC_MODIFIED, 203, "stc_modified"},
+   {wxEVT_STC_MACRORECORD, 203, "stc_macrorecord"},
+   {wxEVT_STC_MARGINCLICK, 203, "stc_marginclick"},
+   {wxEVT_STC_NEEDSHOWN, 203, "stc_needshown"},
+   {wxEVT_STC_PAINTED, 203, "stc_painted"},
+   {wxEVT_STC_USERLISTSELECTION, 203, "stc_userlistselection"},
+   {wxEVT_STC_URIDROPPED, 203, "stc_uridropped"},
+   {wxEVT_STC_DWELLSTART, 203, "stc_dwellstart"},
+   {wxEVT_STC_DWELLEND, 203, "stc_dwellend"},
+   {wxEVT_STC_START_DRAG, 203, "stc_start_drag"},
+   {wxEVT_STC_DRAG_OVER, 203, "stc_drag_over"},
+   {wxEVT_STC_DO_DROP, 203, "stc_do_drop"},
+   {wxEVT_STC_ZOOM, 203, "stc_zoom"},
+   {wxEVT_STC_HOTSPOT_CLICK, 203, "stc_hotspot_click"},
+   {wxEVT_STC_HOTSPOT_DCLICK, 203, "stc_hotspot_dclick"},
+   {wxEVT_STC_CALLTIP_CLICK, 203, "stc_calltip_click"},
+   {wxEVT_STC_AUTOCOMP_SELECTION, 203, "stc_autocomp_selection"},
+   {wxEVT_COMMAND_TREE_BEGIN_DRAG, 208, "command_tree_begin_drag"},
+   {wxEVT_COMMAND_TREE_BEGIN_RDRAG, 208, "command_tree_begin_rdrag"},
+   {wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, 208, "command_tree_begin_label_edit"},
+   {wxEVT_COMMAND_TREE_END_LABEL_EDIT, 208, "command_tree_end_label_edit"},
+   {wxEVT_COMMAND_TREE_DELETE_ITEM, 208, "command_tree_delete_item"},
+   {wxEVT_COMMAND_TREE_GET_INFO, 208, "command_tree_get_info"},
+   {wxEVT_COMMAND_TREE_SET_INFO, 208, "command_tree_set_info"},
+   {wxEVT_COMMAND_TREE_ITEM_EXPANDED, 208, "command_tree_item_expanded"},
+   {wxEVT_COMMAND_TREE_ITEM_EXPANDING, 208, "command_tree_item_expanding"},
+   {wxEVT_COMMAND_TREE_ITEM_COLLAPSED, 208, "command_tree_item_collapsed"},
+   {wxEVT_COMMAND_TREE_ITEM_COLLAPSING, 208, "command_tree_item_collapsing"},
+   {wxEVT_COMMAND_TREE_SEL_CHANGED, 208, "command_tree_sel_changed"},
+   {wxEVT_COMMAND_TREE_SEL_CHANGING, 208, "command_tree_sel_changing"},
+   {wxEVT_COMMAND_TREE_KEY_DOWN, 208, "command_tree_key_down"},
+   {wxEVT_COMMAND_TREE_ITEM_ACTIVATED, 208, "command_tree_item_activated"},
+   {wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, 208, "command_tree_item_right_click"},
+   {wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 208, "command_tree_item_middle_click"},
+   {wxEVT_COMMAND_TREE_END_DRAG, 208, "command_tree_end_drag"},
+   {wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 208, "command_tree_state_image_click"},
+   {wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, 208, "command_tree_item_gettooltip"},
+   {wxEVT_COMMAND_TREE_ITEM_MENU, 208, "command_tree_item_menu"},
+   {wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 209, "command_notebook_page_changed"},
+   {wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 209, "command_notebook_page_changing"},
+   {wxEVT_COMMAND_SPINCTRL_UPDATED, 215, "command_spinctrl_updated"},
    {wxEVT_SCROLL_LINEUP + wxEVT_USER_FIRST, 165, "spin_up"},
    {wxEVT_SCROLL_LINEDOWN + wxEVT_USER_FIRST, 165, "spin_down"},
    {wxEVT_SCROLL_THUMBTRACK + wxEVT_USER_FIRST, 165, "spin"},
-   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 218, "command_splitter_sash_pos_changed"},
-   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 218, "command_splitter_sash_pos_changing"},
-   {wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 218, "command_splitter_doubleclicked"},
-   {wxEVT_COMMAND_SPLITTER_UNSPLIT, 218, "command_splitter_unsplit"},
-   {wxEVT_COMMAND_HTML_LINK_CLICKED, 220, "command_html_link_clicked"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 223, "command_auinotebook_page_close"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 223, "command_auinotebook_page_changed"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 223, "command_auinotebook_page_changing"},
-   {wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 223, "command_auinotebook_button"},
-   {wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 223, "command_auinotebook_begin_drag"},
-   {wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 223, "command_auinotebook_end_drag"},
-   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 223, "command_auinotebook_drag_motion"},
-   {wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 223, "command_auinotebook_allow_dnd"},
+   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 217, "command_splitter_sash_pos_changed"},
+   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 217, "command_splitter_sash_pos_changing"},
+   {wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 217, "command_splitter_doubleclicked"},
+   {wxEVT_COMMAND_SPLITTER_UNSPLIT, 217, "command_splitter_unsplit"},
+   {wxEVT_COMMAND_HTML_LINK_CLICKED, 219, "command_html_link_clicked"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 222, "command_auinotebook_page_close"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 222, "command_auinotebook_page_changed"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 222, "command_auinotebook_page_changing"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 222, "command_auinotebook_button"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 222, "command_auinotebook_begin_drag"},
+   {wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 222, "command_auinotebook_end_drag"},
+   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 222, "command_auinotebook_drag_motion"},
+   {wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 222, "command_auinotebook_allow_dnd"},
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, 223, "command_auinotebook_tab_middle_down"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, 222, "command_auinotebook_tab_middle_down"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, 223, "command_auinotebook_tab_middle_up"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, 222, "command_auinotebook_tab_middle_up"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, 223, "command_auinotebook_tab_right_down"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, 222, "command_auinotebook_tab_right_down"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, 223, "command_auinotebook_tab_right_up"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, 222, "command_auinotebook_tab_right_up"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, 223, "command_auinotebook_page_closed"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, 222, "command_auinotebook_page_closed"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, 223, "command_auinotebook_drag_done"},
+   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, 222, "command_auinotebook_drag_done"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, 223, "command_auinotebook_bg_dclick"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, 222, "command_auinotebook_bg_dclick"},
 #endif
-   {wxEVT_AUI_PANE_BUTTON, 224, "aui_pane_button"},
-   {wxEVT_AUI_PANE_CLOSE, 224, "aui_pane_close"},
-   {wxEVT_AUI_PANE_MAXIMIZE, 224, "aui_pane_maximize"},
-   {wxEVT_AUI_PANE_RESTORE, 224, "aui_pane_restore"},
-   {wxEVT_AUI_RENDER, 224, "aui_render"},
-   {wxEVT_AUI_FIND_MANAGER, 224, "aui_find_manager"},
-   {wxEVT_TASKBAR_MOVE, 227, "taskbar_move"},
-   {wxEVT_TASKBAR_LEFT_DOWN, 227, "taskbar_left_down"},
-   {wxEVT_TASKBAR_LEFT_UP, 227, "taskbar_left_up"},
-   {wxEVT_TASKBAR_RIGHT_DOWN, 227, "taskbar_right_down"},
-   {wxEVT_TASKBAR_RIGHT_UP, 227, "taskbar_right_up"},
-   {wxEVT_TASKBAR_LEFT_DCLICK, 227, "taskbar_left_dclick"},
-   {wxEVT_TASKBAR_RIGHT_DCLICK, 227, "taskbar_right_dclick"},
+   {wxEVT_AUI_PANE_BUTTON, 223, "aui_pane_button"},
+   {wxEVT_AUI_PANE_CLOSE, 223, "aui_pane_close"},
+   {wxEVT_AUI_PANE_MAXIMIZE, 223, "aui_pane_maximize"},
+   {wxEVT_AUI_PANE_RESTORE, 223, "aui_pane_restore"},
+   {wxEVT_AUI_RENDER, 223, "aui_render"},
+   {wxEVT_AUI_FIND_MANAGER, 223, "aui_find_manager"},
+   {wxEVT_TASKBAR_MOVE, 226, "taskbar_move"},
+   {wxEVT_TASKBAR_LEFT_DOWN, 226, "taskbar_left_down"},
+   {wxEVT_TASKBAR_LEFT_UP, 226, "taskbar_left_up"},
+   {wxEVT_TASKBAR_RIGHT_DOWN, 226, "taskbar_right_down"},
+   {wxEVT_TASKBAR_RIGHT_UP, 226, "taskbar_right_up"},
+   {wxEVT_TASKBAR_LEFT_DCLICK, 226, "taskbar_left_dclick"},
+   {wxEVT_TASKBAR_RIGHT_DCLICK, 226, "taskbar_right_dclick"},
    {-1, 0, }
   };
   for(int i=0; event_types[i].ev_type != -1; i++) {
@@ -437,7 +423,11 @@ case 169: {// wxKeyEvent
  rt.addBool(ev->m_shiftDown);
  rt.addBool(ev->m_altDown);
  rt.addBool(ev->m_metaDown);
+#if !wxCHECK_VERSION(2,9,0)
  rt.addBool(ev->m_scanCode);
+#else
+ rt.addBool(false);
+#endif
  rt.addInt(ev->m_uniChar);
  rt.addUint(ev->m_rawCode);
  rt.addUint(ev->m_rawFlags);
@@ -468,14 +458,7 @@ case 172: {// wxPaintEvent
     rt.addTupleCount(2);
   break;
 }
-case 173: {// wxNcPaintEvent
-    evClass = (char*)"wxNcPaintEvent";
-    rt.addAtom((char*)"wxNcPaint");
-    rt.addAtom(Etype->eName);
-    rt.addTupleCount(2);
-  break;
-}
-case 174: {// wxEraseEvent
+case 173: {// wxEraseEvent
  wxEraseEvent * ev = (wxEraseEvent *) event;
  wxDC * GetDC = ev->GetDC();
     evClass = (char*)"wxEraseEvent";
@@ -485,105 +468,105 @@ case 174: {// wxEraseEvent
     rt.addTupleCount(3);
   break;
 }
-case 175: {// wxFocusEvent
+case 174: {// wxFocusEvent
     evClass = (char*)"wxFocusEvent";
     rt.addAtom((char*)"wxFocus");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 176: {// wxChildFocusEvent
+case 175: {// wxChildFocusEvent
     evClass = (char*)"wxChildFocusEvent";
     rt.addAtom((char*)"wxChildFocus");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 177: {// wxMenuEvent
+case 176: {// wxMenuEvent
     evClass = (char*)"wxMenuEvent";
     rt.addAtom((char*)"wxMenu");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 178: {// wxCloseEvent
+case 177: {// wxCloseEvent
     evClass = (char*)"wxCloseEvent";
     rt.addAtom((char*)"wxClose");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 179: {// wxShowEvent
+case 178: {// wxShowEvent
     evClass = (char*)"wxShowEvent";
     rt.addAtom((char*)"wxShow");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 180: {// wxIconizeEvent
+case 179: {// wxIconizeEvent
     evClass = (char*)"wxIconizeEvent";
     rt.addAtom((char*)"wxIconize");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 181: {// wxMaximizeEvent
+case 180: {// wxMaximizeEvent
     evClass = (char*)"wxMaximizeEvent";
     rt.addAtom((char*)"wxMaximize");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 182: {// wxJoystickEvent
+case 181: {// wxJoystickEvent
     evClass = (char*)"wxJoystickEvent";
     rt.addAtom((char*)"wxJoystick");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 183: {// wxUpdateUIEvent
+case 182: {// wxUpdateUIEvent
     evClass = (char*)"wxUpdateUIEvent";
     rt.addAtom((char*)"wxUpdateUI");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 184: {// wxSysColourChangedEvent
+case 183: {// wxSysColourChangedEvent
     evClass = (char*)"wxSysColourChangedEvent";
     rt.addAtom((char*)"wxSysColourChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 185: {// wxMouseCaptureChangedEvent
+case 184: {// wxMouseCaptureChangedEvent
     evClass = (char*)"wxMouseCaptureChangedEvent";
     rt.addAtom((char*)"wxMouseCaptureChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 186: {// wxDisplayChangedEvent
+case 185: {// wxDisplayChangedEvent
     evClass = (char*)"wxDisplayChangedEvent";
     rt.addAtom((char*)"wxDisplayChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 187: {// wxPaletteChangedEvent
+case 186: {// wxPaletteChangedEvent
     evClass = (char*)"wxPaletteChangedEvent";
     rt.addAtom((char*)"wxPaletteChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 188: {// wxQueryNewPaletteEvent
+case 187: {// wxQueryNewPaletteEvent
     evClass = (char*)"wxQueryNewPaletteEvent";
     rt.addAtom((char*)"wxQueryNewPalette");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 189: {// wxNavigationKeyEvent
+case 188: {// wxNavigationKeyEvent
  wxNavigationKeyEvent * ev = (wxNavigationKeyEvent *) event;
     evClass = (char*)"wxNavigationKeyEvent";
     rt.addAtom((char*)"wxNavigationKey");
@@ -593,42 +576,42 @@ case 189: {// wxNavigationKeyEvent
     rt.addTupleCount(4);
   break;
 }
-case 190: {// wxWindowCreateEvent
+case 189: {// wxWindowCreateEvent
     evClass = (char*)"wxWindowCreateEvent";
     rt.addAtom((char*)"wxWindowCreate");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 191: {// wxWindowDestroyEvent
+case 190: {// wxWindowDestroyEvent
     evClass = (char*)"wxWindowDestroyEvent";
     rt.addAtom((char*)"wxWindowDestroy");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 192: {// wxHelpEvent
+case 191: {// wxHelpEvent
     evClass = (char*)"wxHelpEvent";
     rt.addAtom((char*)"wxHelp");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 193: {// wxContextMenuEvent
+case 192: {// wxContextMenuEvent
     evClass = (char*)"wxContextMenuEvent";
     rt.addAtom((char*)"wxContextMenu");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 194: {// wxIdleEvent
+case 193: {// wxIdleEvent
     evClass = (char*)"wxIdleEvent";
     rt.addAtom((char*)"wxIdle");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 195: {// wxGridEvent
+case 194: {// wxGridEvent
  wxGridEvent * ev = (wxGridEvent *) event;
     evClass = (char*)"wxGridEvent";
     rt.addAtom((char*)"wxGrid");
@@ -645,7 +628,7 @@ case 195: {// wxGridEvent
     rt.addTupleCount(11);
   break;
 }
-case 197: {// wxSashEvent
+case 196: {// wxSashEvent
  wxSashEvent * ev = (wxSashEvent *) event;
     evClass = (char*)"wxSashEvent";
     rt.addAtom((char*)"wxSash");
@@ -656,7 +639,7 @@ case 197: {// wxSashEvent
     rt.addTupleCount(5);
   break;
 }
-case 198: {// wxListEvent
+case 197: {// wxListEvent
  wxListEvent * ev = (wxListEvent *) event;
     evClass = (char*)"wxListEvent";
     rt.addAtom((char*)"wxList");
@@ -669,7 +652,7 @@ case 198: {// wxListEvent
     rt.addTupleCount(7);
   break;
 }
-case 199: {// wxDateEvent
+case 198: {// wxDateEvent
  wxDateEvent * ev = (wxDateEvent *) event;
     evClass = (char*)"wxDateEvent";
     rt.addAtom((char*)"wxDate");
@@ -678,14 +661,14 @@ case 199: {// wxDateEvent
     rt.addTupleCount(3);
   break;
 }
-case 200: {// wxCalendarEvent
+case 199: {// wxCalendarEvent
     evClass = (char*)"wxCalendarEvent";
     rt.addAtom((char*)"wxCalendar");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 201: {// wxFileDirPickerEvent
+case 200: {// wxFileDirPickerEvent
  wxFileDirPickerEvent * ev = (wxFileDirPickerEvent *) event;
     evClass = (char*)"wxFileDirPickerEvent";
     rt.addAtom((char*)"wxFileDirPicker");
@@ -694,7 +677,7 @@ case 201: {// wxFileDirPickerEvent
     rt.addTupleCount(3);
   break;
 }
-case 202: {// wxColourPickerEvent
+case 201: {// wxColourPickerEvent
  wxColourPickerEvent * ev = (wxColourPickerEvent *) event;
     evClass = (char*)"wxColourPickerEvent";
     rt.addAtom((char*)"wxColourPicker");
@@ -703,7 +686,7 @@ case 202: {// wxColourPickerEvent
     rt.addTupleCount(3);
   break;
 }
-case 203: {// wxFontPickerEvent
+case 202: {// wxFontPickerEvent
  wxFontPickerEvent * ev = (wxFontPickerEvent *) event;
  wxFont * GetFont = new wxFont(ev->GetFont());
  app->newPtr((void *) GetFont,3, memenv);
@@ -714,7 +697,7 @@ case 203: {// wxFontPickerEvent
     rt.addTupleCount(3);
   break;
 }
-case 204: {// wxStyledTextEvent
+case 203: {// wxStyledTextEvent
  wxStyledTextEvent * ev = (wxStyledTextEvent *) event;
     evClass = (char*)"wxStyledTextEvent";
     rt.addAtom((char*)"wxStyledText");
@@ -742,7 +725,7 @@ case 204: {// wxStyledTextEvent
     rt.addTupleCount(22);
   break;
 }
-case 209: {// wxTreeEvent
+case 208: {// wxTreeEvent
  wxTreeEvent * ev = (wxTreeEvent *) event;
     evClass = (char*)"wxTreeEvent";
     rt.addAtom((char*)"wxTree");
@@ -753,14 +736,14 @@ case 209: {// wxTreeEvent
     rt.addTupleCount(5);
   break;
 }
-case 210: {// wxNotebookEvent
+case 209: {// wxNotebookEvent
     evClass = (char*)"wxNotebookEvent";
     rt.addAtom((char*)"wxNotebook");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 216: {// wxSpinEvent
+case 215: {// wxSpinEvent
  wxSpinEvent * ev = (wxSpinEvent *) event;
     evClass = (char*)"wxSpinEvent";
     rt.addAtom((char*)"wxSpin");
@@ -769,14 +752,14 @@ case 216: {// wxSpinEvent
     rt.addTupleCount(3);
   break;
 }
-case 218: {// wxSplitterEvent
+case 217: {// wxSplitterEvent
     evClass = (char*)"wxSplitterEvent";
     rt.addAtom((char*)"wxSplitter");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 220: {// wxHtmlLinkEvent
+case 219: {// wxHtmlLinkEvent
  wxHtmlLinkEvent * ev = (wxHtmlLinkEvent *) event;
     evClass = (char*)"wxHtmlLinkEvent";
     rt.addAtom((char*)"wxHtmlLink");
@@ -785,7 +768,7 @@ case 220: {// wxHtmlLinkEvent
     rt.addTupleCount(3);
   break;
 }
-case 223: {// wxAuiNotebookEvent
+case 222: {// wxAuiNotebookEvent
  wxAuiNotebookEvent * ev = (wxAuiNotebookEvent *) event;
  wxAuiNotebook * GetDragSource = ev->GetDragSource();
     evClass = (char*)"wxAuiNotebookEvent";
@@ -797,7 +780,7 @@ case 223: {// wxAuiNotebookEvent
     rt.addTupleCount(5);
   break;
 }
-case 224: {// wxAuiManagerEvent
+case 223: {// wxAuiManagerEvent
  wxAuiManagerEvent * ev = (wxAuiManagerEvent *) event;
  wxAuiManager * GetManager = ev->GetManager();
  wxAuiPaneInfo * GetPane = ev->GetPane();
@@ -814,7 +797,7 @@ case 224: {// wxAuiManagerEvent
     rt.addTupleCount(8);
   break;
 }
-case 227: {// wxTaskBarIconEvent
+case 226: {// wxTaskBarIconEvent
     evClass = (char*)"wxTaskBarIconEvent";
     rt.addAtom((char*)"wxTaskBarIcon");
     rt.addAtom(Etype->eName);
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp
index 15012011ed..5fbe8a2a9e 100644
--- a/lib/wx/c_src/gen/wxe_funcs.cpp
+++ b/lib/wx/c_src/gen/wxe_funcs.cpp
@@ -27,6 +27,15 @@
 #include "wxe_macros.h"
 #include "wxe_derived_dest.h"
 
+#if !wxCHECK_VERSION(2,9,0)
+#define wxPenJoin int
+#define wxPenCap int
+#define wxImageResizeQuality int
+#define wxPolygonFillMode int
+#define wxMappingMode int
+#define wxRasterOperationMode int
+#define wxFloodFillStyle int
+#endif
 void WxeApp::wxe_dispatch(wxeCommand& Ecmd)
 {
  char * bp = Ecmd.buffer;
@@ -149,7 +158,7 @@ case wxWindow_new_3: { // wxWindow::wxWindow
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxWindow * Result = new EwxWindow(parent,(wxWindowID) *id,pos,size,style);
+ wxWindow * Result = new EwxWindow(parent,*id,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
@@ -326,7 +335,7 @@ case wxWindow_FindWindow_1_0: { // wxWindow::FindWindow
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * winid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxWindow * Result = (wxWindow*)This->FindWindow((long) *winid);
+ wxWindow * Result = (wxWindow*)This->FindWindow(*winid);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -349,7 +358,7 @@ case wxWindow_FindWindowById: { // wxWindow::FindWindowById
 parent = (wxWindow *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxWindow * Result = (wxWindow*)wxWindow::FindWindowById((long) *winid,parent);
+ wxWindow * Result = (wxWindow*)wxWindow::FindWindowById(*winid,parent);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -615,7 +624,7 @@ case wxWindow_GetScrollPos: { // wxWindow::GetScrollPos
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * orient = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetScrollPos((int) *orient);
+ int Result = This->GetScrollPos(*orient);
  rt.addInt(Result);
  break;
 }
@@ -623,7 +632,7 @@ case wxWindow_GetScrollRange: { // wxWindow::GetScrollRange
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * orient = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetScrollRange((int) *orient);
+ int Result = This->GetScrollRange(*orient);
  rt.addInt(Result);
  break;
 }
@@ -631,7 +640,7 @@ case wxWindow_GetScrollThumb: { // wxWindow::GetScrollThumb
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * orient = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetScrollThumb((int) *orient);
+ int Result = This->GetScrollThumb(*orient);
  rt.addInt(Result);
  break;
 }
@@ -719,7 +728,7 @@ case wxWindow_HasScrollbar: { // wxWindow::HasScrollbar
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * orient = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->HasScrollbar((int) *orient);
+ bool Result = This->HasScrollbar(*orient);
  rt.addBool(Result);
  break;
 }
@@ -767,7 +776,7 @@ case wxWindow_IsExposed_2: { // wxWindow::IsExposed
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsExposed((int) *x,(int) *y);
+ bool Result = This->IsExposed(*x,*y);
  rt.addBool(Result);
  break;
 }
@@ -778,7 +787,7 @@ case wxWindow_IsExposed_4: { // wxWindow::IsExposed
  int * w = (int *) bp; bp += 4;
  int * h = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsExposed((int) *x,(int) *y,(int) *w,(int) *h);
+ bool Result = This->IsExposed(*x,*y,*w,*h);
  rt.addBool(Result);
  break;
 }
@@ -877,7 +886,7 @@ case wxWindow_Move_3: { // wxWindow::Move
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->Move((int) *x,(int) *y,flags);
+ This->Move(*x,*y,flags);
  break;
 }
 case wxWindow_Move_2: { // wxWindow::Move
@@ -975,7 +984,7 @@ case wxWindow_PopupMenu_3: { // wxWindow::PopupMenu
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->PopupMenu(menu,(int) *x,(int) *y);
+ bool Result = This->PopupMenu(menu,*x,*y);
  rt.addBool(Result);
  break;
 }
@@ -1071,7 +1080,7 @@ case wxWindow_ScrollLines: { // wxWindow::ScrollLines
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * lines = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->ScrollLines((int) *lines);
+ bool Result = This->ScrollLines(*lines);
  rt.addBool(Result);
  break;
 }
@@ -1079,7 +1088,7 @@ case wxWindow_ScrollPages: { // wxWindow::ScrollPages
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * pages = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->ScrollPages((int) *pages);
+ bool Result = This->ScrollPages(*pages);
  rt.addBool(Result);
  break;
 }
@@ -1100,7 +1109,7 @@ case wxWindow_ScrollWindow: { // wxWindow::ScrollWindow
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->ScrollWindow((int) *dx,(int) *dy,rect);
+ This->ScrollWindow(*dx,*dy,rect);
  break;
 }
 case wxWindow_SetAcceleratorTable: { // wxWindow::SetAcceleratorTable
@@ -1114,7 +1123,7 @@ case wxWindow_SetAutoLayout: { // wxWindow::SetAutoLayout
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  bool * autoLayout = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAutoLayout((bool) *autoLayout);
+ This->SetAutoLayout(*autoLayout);
  break;
 }
 case wxWindow_SetBackgroundColour: { // wxWindow::SetBackgroundColour
@@ -1133,7 +1142,7 @@ case wxWindow_SetBackgroundStyle: { // wxWindow::SetBackgroundStyle
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  wxBackgroundStyle style = *(wxBackgroundStyle *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetBackgroundStyle((wxBackgroundStyle) style);
+ bool Result = This->SetBackgroundStyle(style);
  rt.addBool(Result);
  break;
 }
@@ -1149,7 +1158,7 @@ case wxWindow_SetClientSize_2: { // wxWindow::SetClientSize
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetClientSize((int) *width,(int) *height);
+ This->SetClientSize(*width,*height);
  break;
 }
 case wxWindow_SetClientSize_1_0: { // wxWindow::SetClientSize
@@ -1245,7 +1254,7 @@ case wxWindow_SetExtraStyle: { // wxWindow::SetExtraStyle
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * exStyle = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetExtraStyle((long) *exStyle);
+ This->SetExtraStyle(*exStyle);
  break;
 }
 case wxWindow_SetFocus: { // wxWindow::SetFocus
@@ -1293,7 +1302,7 @@ case wxWindow_SetId: { // wxWindow::SetId
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * winid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetId((wxWindowID) *winid);
+ This->SetId(*winid);
  break;
 }
 case wxWindow_SetLabel: { // wxWindow::SetLabel
@@ -1335,7 +1344,7 @@ case wxWindow_SetScrollbar: { // wxWindow::SetScrollbar
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetScrollbar((int) *orient,(int) *pos,(int) *thumbVisible,(int) *range,refresh);
+ This->SetScrollbar(*orient,*pos,*thumbVisible,*range,refresh);
  break;
 }
 case wxWindow_SetScrollPos: { // wxWindow::SetScrollPos
@@ -1350,7 +1359,7 @@ case wxWindow_SetScrollPos: { // wxWindow::SetScrollPos
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetScrollPos((int) *orient,(int) *pos,refresh);
+ This->SetScrollPos(*orient,*pos,refresh);
  break;
 }
 case wxWindow_SetSize_5: { // wxWindow::SetSize
@@ -1367,7 +1376,7 @@ case wxWindow_SetSize_5: { // wxWindow::SetSize
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetSize((int) *x,(int) *y,(int) *width,(int) *height,sizeFlags);
+ This->SetSize(*x,*y,*width,*height,sizeFlags);
  break;
 }
 case wxWindow_SetSize_2_0: { // wxWindow::SetSize
@@ -1375,7 +1384,7 @@ case wxWindow_SetSize_2_0: { // wxWindow::SetSize
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSize((int) *width,(int) *height);
+ This->SetSize(*width,*height);
  break;
 }
 case wxWindow_SetSize_1: { // wxWindow::SetSize
@@ -1429,7 +1438,7 @@ case wxWindow_SetSizeHints_3: { // wxWindow::SetSizeHints
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetSizeHints((int) *minW,(int) *minH,maxW,maxH,incW,incH);
+ This->SetSizeHints(*minW,*minH,maxW,maxH,incW,incH);
  break;
 }
 case wxWindow_SetSizeHints_2: { // wxWindow::SetSizeHints
@@ -1488,7 +1497,7 @@ case wxWindow_SetThemeEnabled: { // wxWindow::SetThemeEnabled
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  bool * enableTheme = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetThemeEnabled((bool) *enableTheme);
+ This->SetThemeEnabled(*enableTheme);
  break;
 }
 case wxWindow_SetToolTip_1_0: { // wxWindow::SetToolTip
@@ -1521,7 +1530,7 @@ case wxWindow_SetVirtualSize_2: { // wxWindow::SetVirtualSize
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetVirtualSize((int) *x,(int) *y);
+ This->SetVirtualSize(*x,*y);
  break;
 }
 case wxWindow_SetVirtualSizeHints_3: { // wxWindow::SetVirtualSizeHints
@@ -1540,7 +1549,7 @@ case wxWindow_SetVirtualSizeHints_3: { // wxWindow::SetVirtualSizeHints
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetVirtualSizeHints((int) *minW,(int) *minH,maxW,maxH);
+ This->SetVirtualSizeHints(*minW,*minH,maxW,maxH);
  break;
 }
 case wxWindow_SetVirtualSizeHints_2: { // wxWindow::SetVirtualSizeHints
@@ -1566,21 +1575,21 @@ case wxWindow_SetWindowStyle: { // wxWindow::SetWindowStyle
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * style = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWindowStyle((long) *style);
+ This->SetWindowStyle(*style);
  break;
 }
 case wxWindow_SetWindowStyleFlag: { // wxWindow::SetWindowStyleFlag
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * style = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWindowStyleFlag((long) *style);
+ This->SetWindowStyleFlag(*style);
  break;
 }
 case wxWindow_SetWindowVariant: { // wxWindow::SetWindowVariant
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  wxWindowVariant variant = *(wxWindowVariant *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetWindowVariant((wxWindowVariant) variant);
+ This->SetWindowVariant(variant);
  break;
 }
 case wxWindow_ShouldInheritColours: { // wxWindow::ShouldInheritColours
@@ -1655,13 +1664,13 @@ case wxWindow_WarpPointer: { // wxWindow::WarpPointer
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->WarpPointer((int) *x,(int) *y);
+ This->WarpPointer(*x,*y);
  break;
 }
 case wxTopLevelWindow_GetIcon: { // wxTopLevelWindow::GetIcon
  wxTopLevelWindow *This = (wxTopLevelWindow *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxIcon * Result = &This->GetIcon();
+ const wxIcon * Result = new wxIcon(This->GetIcon()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
 }
@@ -1813,7 +1822,7 @@ case wxTopLevelWindow_ShowFullScreen: { // wxTopLevelWindow::ShowFullScreen
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->ShowFullScreen((bool) *show,style);
+ bool Result = This->ShowFullScreen(*show,style);
  rt.addBool(Result);
  break;
 }
@@ -1843,7 +1852,7 @@ case wxFrame_new_4: { // wxFrame::wxFrame
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxFrame * Result = new EwxFrame(parent,(wxWindowID) *id,title,pos,size,style);
+ wxFrame * Result = new EwxFrame(parent,*id,title,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFrame");
  break;
@@ -1882,7 +1891,7 @@ case wxFrame_Create: { // wxFrame::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,title,pos,size,style);
+ bool Result = This->Create(parent,*id,title,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -1965,7 +1974,7 @@ case wxFrame_ProcessCommand: { // wxFrame::ProcessCommand
  wxFrame *This = (wxFrame *) getPtr(bp,memenv); bp += 4;
  int * winid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->ProcessCommand((int) *winid);
+ bool Result = This->ProcessCommand(*winid);
  rt.addBool(Result);
  break;
 }
@@ -1993,7 +2002,7 @@ case wxFrame_SetStatusBarPane: { // wxFrame::SetStatusBarPane
  wxFrame *This = (wxFrame *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetStatusBarPane((int) *n);
+ This->SetStatusBarPane(*n);
  break;
 }
 case wxFrame_SetStatusText: { // wxFrame::SetStatusText
@@ -2058,7 +2067,7 @@ case wxMiniFrame_new_4: { // wxMiniFrame::wxMiniFrame
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxMiniFrame * Result = new EwxMiniFrame(parent,(wxWindowID) *id,title,pos,size,style);
+ wxMiniFrame * Result = new EwxMiniFrame(parent,*id,title,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxMiniFrame");
  break;
@@ -2091,7 +2100,7 @@ case wxMiniFrame_Create: { // wxMiniFrame::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,title,pos,size,style);
+ bool Result = This->Create(parent,*id,title,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -2128,7 +2137,7 @@ case wxSplashScreen_new_6: { // wxSplashScreen::wxSplashScreen
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxSplashScreen * Result = new EwxSplashScreen(*bitmap,(long) *splashStyle,(int) *milliseconds,parent,(wxWindowID) *id,pos,size,style);
+ wxSplashScreen * Result = new EwxSplashScreen(*bitmap,*splashStyle,*milliseconds,parent,*id,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxSplashScreen");
  break;
@@ -2166,7 +2175,7 @@ case wxPanel_new_6: { // wxPanel::wxPanel
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxPanel * Result = new EwxPanel(parent,(int) *x,(int) *y,(int) *width,(int) *height,style);
+ wxPanel * Result = new EwxPanel(parent,*x,*y,*width,*height,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxPanel");
  break;
@@ -2254,7 +2263,7 @@ case wxScrolledWindow_CalcScrolledPosition_4: { // wxScrolledWindow::CalcScrolle
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CalcScrolledPosition((int) *x,(int) *y,&xx,&yy);
+ This->CalcScrolledPosition(*x,*y,&xx,&yy);
  rt.addInt(xx);
  rt.addInt(yy);
  rt.addTupleCount(2);
@@ -2277,7 +2286,7 @@ case wxScrolledWindow_CalcUnscrolledPosition_4: { // wxScrolledWindow::CalcUnscr
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CalcUnscrolledPosition((int) *x,(int) *y,&xx,&yy);
+ This->CalcUnscrolledPosition(*x,*y,&xx,&yy);
  rt.addInt(xx);
  rt.addInt(yy);
  rt.addTupleCount(2);
@@ -2298,7 +2307,7 @@ case wxScrolledWindow_EnableScrolling: { // wxScrolledWindow::EnableScrolling
  bool * x_scrolling = (bool *) bp; bp += 4;
  bool * y_scrolling = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableScrolling((bool) *x_scrolling,(bool) *y_scrolling);
+ This->EnableScrolling(*x_scrolling,*y_scrolling);
  break;
 }
 case wxScrolledWindow_GetScrollPixelsPerUnit: { // wxScrolledWindow::GetScrollPixelsPerUnit
@@ -2342,7 +2351,7 @@ case wxScrolledWindow_Scroll: { // wxScrolledWindow::Scroll
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Scroll((int) *x,(int) *y);
+ This->Scroll(*x,*y);
  break;
 }
 case wxScrolledWindow_SetScrollbars: { // wxScrolledWindow::SetScrollbars
@@ -2367,7 +2376,7 @@ case wxScrolledWindow_SetScrollbars: { // wxScrolledWindow::SetScrollbars
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetScrollbars((int) *pixelsPerUnitX,(int) *pixelsPerUnitY,(int) *noUnitsX,(int) *noUnitsY,xPos,yPos,noRefresh);
+ This->SetScrollbars(*pixelsPerUnitX,*pixelsPerUnitY,*noUnitsX,*noUnitsY,xPos,yPos,noRefresh);
  break;
 }
 case wxScrolledWindow_SetScrollRate: { // wxScrolledWindow::SetScrollRate
@@ -2375,7 +2384,7 @@ case wxScrolledWindow_SetScrollRate: { // wxScrolledWindow::SetScrollRate
  int * xstep = (int *) bp; bp += 4;
  int * ystep = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetScrollRate((int) *xstep,(int) *ystep);
+ This->SetScrollRate(*xstep,*ystep);
  break;
 }
 case wxScrolledWindow_SetTargetWindow: { // wxScrolledWindow::SetTargetWindow
@@ -2427,7 +2436,7 @@ case wxSashWindow_GetSashVisible: { // wxSashWindow::GetSashVisible
  wxSashWindow *This = (wxSashWindow *) getPtr(bp,memenv); bp += 4;
  wxSashEdgePosition edge = *(wxSashEdgePosition *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetSashVisible((wxSashEdgePosition) edge);
+ bool Result = This->GetSashVisible(edge);
  rt.addBool(Result);
  break;
 }
@@ -2463,28 +2472,28 @@ case wxSashWindow_SetMaximumSizeX: { // wxSashWindow::SetMaximumSizeX
  wxSashWindow *This = (wxSashWindow *) getPtr(bp,memenv); bp += 4;
  int * max = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMaximumSizeX((int) *max);
+ This->SetMaximumSizeX(*max);
  break;
 }
 case wxSashWindow_SetMaximumSizeY: { // wxSashWindow::SetMaximumSizeY
  wxSashWindow *This = (wxSashWindow *) getPtr(bp,memenv); bp += 4;
  int * max = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMaximumSizeY((int) *max);
+ This->SetMaximumSizeY(*max);
  break;
 }
 case wxSashWindow_SetMinimumSizeX: { // wxSashWindow::SetMinimumSizeX
  wxSashWindow *This = (wxSashWindow *) getPtr(bp,memenv); bp += 4;
  int * min = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMinimumSizeX((int) *min);
+ This->SetMinimumSizeX(*min);
  break;
 }
 case wxSashWindow_SetMinimumSizeY: { // wxSashWindow::SetMinimumSizeY
  wxSashWindow *This = (wxSashWindow *) getPtr(bp,memenv); bp += 4;
  int * min = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMinimumSizeY((int) *min);
+ This->SetMinimumSizeY(*min);
  break;
 }
 case wxSashWindow_SetSashVisible: { // wxSashWindow::SetSashVisible
@@ -2492,7 +2501,7 @@ case wxSashWindow_SetSashVisible: { // wxSashWindow::SetSashVisible
  wxSashEdgePosition edge = *(wxSashEdgePosition *) bp; bp += 4;;
  bool * sash = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSashVisible((wxSashEdgePosition) edge,(bool) *sash);
+ This->SetSashVisible(edge,*sash);
  break;
 }
 case wxSashLayoutWindow_new_0: { // wxSashLayoutWindow::wxSashLayoutWindow
@@ -2583,7 +2592,7 @@ case wxSashLayoutWindow_SetAlignment: { // wxSashLayoutWindow::SetAlignment
  wxSashLayoutWindow *This = (wxSashLayoutWindow *) getPtr(bp,memenv); bp += 4;
  wxLayoutAlignment align = *(wxLayoutAlignment *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetAlignment((wxLayoutAlignment) align);
+ This->SetAlignment(align);
  break;
 }
 case wxSashLayoutWindow_SetDefaultSize: { // wxSashLayoutWindow::SetDefaultSize
@@ -2599,7 +2608,7 @@ case wxSashLayoutWindow_SetOrientation: { // wxSashLayoutWindow::SetOrientation
  wxSashLayoutWindow *This = (wxSashLayoutWindow *) getPtr(bp,memenv); bp += 4;
  wxLayoutOrientation orient = *(wxLayoutOrientation *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetOrientation((wxLayoutOrientation) orient);
+ This->SetOrientation(orient);
  break;
 }
 case wxGrid_new_0: { // wxGrid::wxGrid
@@ -2631,7 +2640,7 @@ case wxGrid_new_3: { // wxGrid::wxGrid
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxGrid * Result = new EwxGrid(parent,(wxWindowID) *id,pos,size,style);
+ wxGrid * Result = new EwxGrid(parent,*id,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxGrid");
  break;
@@ -2655,7 +2664,7 @@ case wxGrid_new_4: { // wxGrid::wxGrid
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxGrid * Result = new EwxGrid(parent,(int) *x,(int) *y,w,h,style);
+ wxGrid * Result = new EwxGrid(parent,*x,*y,w,h,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxGrid");
  break;
@@ -2712,7 +2721,7 @@ case wxGrid_AutoSizeColumn: { // wxGrid::AutoSizeColumn
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->AutoSizeColumn((int) *col,setAsMin);
+ This->AutoSizeColumn(*col,setAsMin);
  break;
 }
 case wxGrid_AutoSizeColumns: { // wxGrid::AutoSizeColumns
@@ -2738,7 +2747,7 @@ case wxGrid_AutoSizeRow: { // wxGrid::AutoSizeRow
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->AutoSizeRow((int) *row,setAsMin);
+ This->AutoSizeRow(*row,setAsMin);
  break;
 }
 case wxGrid_AutoSizeRows: { // wxGrid::AutoSizeRows
@@ -2806,7 +2815,7 @@ case wxGrid_CellToRect_2: { // wxGrid::CellToRect
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxRect Result = This->CellToRect((int) *row,(int) *col);
+ wxRect Result = This->CellToRect(*row,*col);
  rt.add(Result);
  break;
 }
@@ -2844,7 +2853,7 @@ selmode = *(wxGrid::wxGridSelectionModes *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->CreateGrid((int) *numRows,(int) *numCols,(wxGrid::wxGridSelectionModes) selmode);
+ bool Result = This->CreateGrid(*numRows,*numCols,selmode);
  rt.addBool(Result);
  break;
 }
@@ -2972,7 +2981,7 @@ case wxGrid_EnableEditing: { // wxGrid::EnableEditing
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * edit = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableEditing((bool) *edit);
+ This->EnableEditing(*edit);
  break;
 }
 case wxGrid_EnableGridLines: { // wxGrid::EnableGridLines
@@ -3020,7 +3029,7 @@ case wxGrid_GetCellAlignment: { // wxGrid::GetCellAlignment
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->GetCellAlignment((int) *row,(int) *col,&horiz,&vert);
+ This->GetCellAlignment(*row,*col,&horiz,&vert);
  rt.addInt(horiz);
  rt.addInt(vert);
  rt.addTupleCount(2);
@@ -3031,7 +3040,7 @@ case wxGrid_GetCellBackgroundColour: { // wxGrid::GetCellBackgroundColour
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour Result = This->GetCellBackgroundColour((int) *row,(int) *col);
+ wxColour Result = This->GetCellBackgroundColour(*row,*col);
  rt.add(Result);
  break;
 }
@@ -3040,7 +3049,7 @@ case wxGrid_GetCellEditor: { // wxGrid::GetCellEditor
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGridCellEditor * Result = (wxGridCellEditor*)This->GetCellEditor((int) *row,(int) *col);
+ wxGridCellEditor * Result = (wxGridCellEditor*)This->GetCellEditor(*row,*col);
  rt.addRef(getRef((void *)Result,memenv), "wxGridCellEditor");
  break;
 }
@@ -3049,7 +3058,7 @@ case wxGrid_GetCellFont: { // wxGrid::GetCellFont
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetCellFont((int) *row,(int) *col)); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new wxFont(This->GetCellFont(*row,*col)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -3058,7 +3067,7 @@ case wxGrid_GetCellRenderer: { // wxGrid::GetCellRenderer
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGridCellRenderer * Result = (wxGridCellRenderer*)This->GetCellRenderer((int) *row,(int) *col);
+ wxGridCellRenderer * Result = (wxGridCellRenderer*)This->GetCellRenderer(*row,*col);
  rt.addRef(getRef((void *)Result,memenv), "wxGridCellRenderer");
  break;
 }
@@ -3067,7 +3076,7 @@ case wxGrid_GetCellTextColour: { // wxGrid::GetCellTextColour
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour Result = This->GetCellTextColour((int) *row,(int) *col);
+ wxColour Result = This->GetCellTextColour(*row,*col);
  rt.add(Result);
  break;
 }
@@ -3076,7 +3085,7 @@ case wxGrid_GetCellValue_2: { // wxGrid::GetCellValue
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetCellValue((int) *row,(int) *col);
+ wxString Result = This->GetCellValue(*row,*col);
  rt.add(Result);
  break;
 }
@@ -3112,7 +3121,7 @@ case wxGrid_GetColLabelValue: { // wxGrid::GetColLabelValue
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetColLabelValue((int) *col);
+ wxString Result = This->GetColLabelValue(*col);
  rt.add(Result);
  break;
 }
@@ -3181,7 +3190,7 @@ case wxGrid_GetDefaultEditorForCell_2: { // wxGrid::GetDefaultEditorForCell
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGridCellEditor * Result = (wxGridCellEditor*)This->GetDefaultEditorForCell((int) *row,(int) *col);
+ wxGridCellEditor * Result = (wxGridCellEditor*)This->GetDefaultEditorForCell(*row,*col);
  rt.addRef(getRef((void *)Result,memenv), "wxGridCellEditor");
  break;
 }
@@ -3217,7 +3226,7 @@ case wxGrid_GetDefaultRendererForCell: { // wxGrid::GetDefaultRendererForCell
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGridCellRenderer * Result = (wxGridCellRenderer*)This->GetDefaultRendererForCell((int) *row,(int) *col);
+ wxGridCellRenderer * Result = (wxGridCellRenderer*)This->GetDefaultRendererForCell(*row,*col);
  rt.addRef(getRef((void *)Result,memenv), "wxGridCellRenderer");
  break;
 }
@@ -3313,7 +3322,7 @@ case wxGrid_GetOrCreateCellAttr: { // wxGrid::GetOrCreateCellAttr
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGridCellAttr * Result = (wxGridCellAttr*)This->GetOrCreateCellAttr((int) *row,(int) *col);
+ wxGridCellAttr * Result = (wxGridCellAttr*)This->GetOrCreateCellAttr(*row,*col);
  rt.addRef(getRef((void *)Result,memenv), "wxGridCellAttr");
  break;
 }
@@ -3346,7 +3355,7 @@ case wxGrid_GetRowLabelValue: { // wxGrid::GetRowLabelValue
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * row = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetRowLabelValue((int) *row);
+ wxString Result = This->GetRowLabelValue(*row);
  rt.add(Result);
  break;
 }
@@ -3354,7 +3363,7 @@ case wxGrid_GetRowSize: { // wxGrid::GetRowSize
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * row = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetRowSize((int) *row);
+ int Result = This->GetRowSize(*row);
  rt.addInt(Result);
  break;
 }
@@ -3541,7 +3550,7 @@ case wxGrid_IsInSelection_2: { // wxGrid::IsInSelection
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsInSelection((int) *row,(int) *col);
+ bool Result = This->IsInSelection(*row,*col);
  rt.addBool(Result);
  break;
 }
@@ -3560,7 +3569,7 @@ case wxGrid_IsReadOnly: { // wxGrid::IsReadOnly
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsReadOnly((int) *row,(int) *col);
+ bool Result = This->IsReadOnly(*row,*col);
  rt.addBool(Result);
  break;
 }
@@ -3583,7 +3592,7 @@ case wxGrid_IsVisible_3: { // wxGrid::IsVisible
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsVisible((int) *row,(int) *col,wholeCellVisible);
+ bool Result = This->IsVisible(*row,*col,wholeCellVisible);
  rt.addBool(Result);
  break;
 }
@@ -3609,7 +3618,7 @@ case wxGrid_MakeCellVisible_2: { // wxGrid::MakeCellVisible
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->MakeCellVisible((int) *row,(int) *col);
+ This->MakeCellVisible(*row,*col);
  break;
 }
 case wxGrid_MakeCellVisible_1: { // wxGrid::MakeCellVisible
@@ -3625,7 +3634,7 @@ case wxGrid_MoveCursorDown: { // wxGrid::MoveCursorDown
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorDown((bool) *expandSelection);
+ bool Result = This->MoveCursorDown(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3633,7 +3642,7 @@ case wxGrid_MoveCursorLeft: { // wxGrid::MoveCursorLeft
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorLeft((bool) *expandSelection);
+ bool Result = This->MoveCursorLeft(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3641,7 +3650,7 @@ case wxGrid_MoveCursorRight: { // wxGrid::MoveCursorRight
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorRight((bool) *expandSelection);
+ bool Result = This->MoveCursorRight(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3649,7 +3658,7 @@ case wxGrid_MoveCursorUp: { // wxGrid::MoveCursorUp
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorUp((bool) *expandSelection);
+ bool Result = This->MoveCursorUp(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3657,7 +3666,7 @@ case wxGrid_MoveCursorDownBlock: { // wxGrid::MoveCursorDownBlock
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorDownBlock((bool) *expandSelection);
+ bool Result = This->MoveCursorDownBlock(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3665,7 +3674,7 @@ case wxGrid_MoveCursorLeftBlock: { // wxGrid::MoveCursorLeftBlock
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorLeftBlock((bool) *expandSelection);
+ bool Result = This->MoveCursorLeftBlock(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3673,7 +3682,7 @@ case wxGrid_MoveCursorRightBlock: { // wxGrid::MoveCursorRightBlock
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorRightBlock((bool) *expandSelection);
+ bool Result = This->MoveCursorRightBlock(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3681,7 +3690,7 @@ case wxGrid_MoveCursorUpBlock: { // wxGrid::MoveCursorUpBlock
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  bool * expandSelection = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->MoveCursorUpBlock((bool) *expandSelection);
+ bool Result = This->MoveCursorUpBlock(*expandSelection);
  rt.addBool(Result);
  break;
 }
@@ -3736,7 +3745,7 @@ case wxGrid_SelectBlock_5: { // wxGrid::SelectBlock
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SelectBlock((int) *topRow,(int) *leftCol,(int) *bottomRow,(int) *rightCol,addToSelected);
+ This->SelectBlock(*topRow,*leftCol,*bottomRow,*rightCol,addToSelected);
  break;
 }
 case wxGrid_SelectBlock_3: { // wxGrid::SelectBlock
@@ -3768,7 +3777,7 @@ case wxGrid_SelectCol: { // wxGrid::SelectCol
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SelectCol((int) *col,addToSelected);
+ This->SelectCol(*col,addToSelected);
  break;
 }
 case wxGrid_SelectRow: { // wxGrid::SelectRow
@@ -3781,7 +3790,7 @@ case wxGrid_SelectRow: { // wxGrid::SelectRow
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SelectRow((int) *row,addToSelected);
+ This->SelectRow(*row,addToSelected);
  break;
 }
 case wxGrid_SetCellAlignment_4: { // wxGrid::SetCellAlignment
@@ -3791,7 +3800,7 @@ case wxGrid_SetCellAlignment_4: { // wxGrid::SetCellAlignment
  int * horiz = (int *) bp; bp += 4;
  int * vert = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellAlignment((int) *row,(int) *col,(int) *horiz,(int) *vert);
+ This->SetCellAlignment(*row,*col,*horiz,*vert);
  break;
 }
 case wxGrid_SetCellAlignment_3: { // wxGrid::SetCellAlignment
@@ -3800,14 +3809,14 @@ case wxGrid_SetCellAlignment_3: { // wxGrid::SetCellAlignment
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellAlignment((int) *align,(int) *row,(int) *col);
+ This->SetCellAlignment(*align,*row,*col);
  break;
 }
 case wxGrid_SetCellAlignment_1: { // wxGrid::SetCellAlignment
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * align = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellAlignment((int) *align);
+ This->SetCellAlignment(*align);
  break;
 }
 case wxGrid_SetCellBackgroundColour_3_0: { // wxGrid::SetCellBackgroundColour
@@ -3820,7 +3829,7 @@ case wxGrid_SetCellBackgroundColour_3_0: { // wxGrid::SetCellBackgroundColour
  int * valA = (int *) bp; bp += 4;
  wxColour val = wxColour(*valR,*valG,*valB,*valA);
  if(!This) throw wxe_badarg(0);
- This->SetCellBackgroundColour((int) *row,(int) *col,val);
+ This->SetCellBackgroundColour(*row,*col,val);
  break;
 }
 case wxGrid_SetCellBackgroundColour_1: { // wxGrid::SetCellBackgroundColour
@@ -3844,7 +3853,7 @@ case wxGrid_SetCellBackgroundColour_3_1: { // wxGrid::SetCellBackgroundColour
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellBackgroundColour(colour,(int) *row,(int) *col);
+ This->SetCellBackgroundColour(colour,*row,*col);
  break;
 }
 case wxGrid_SetCellEditor: { // wxGrid::SetCellEditor
@@ -3853,7 +3862,7 @@ case wxGrid_SetCellEditor: { // wxGrid::SetCellEditor
  int * col = (int *) bp; bp += 4;
  wxGridCellEditor *editor = (wxGridCellEditor *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellEditor((int) *row,(int) *col,editor);
+ This->SetCellEditor(*row,*col,editor);
  break;
 }
 case wxGrid_SetCellFont: { // wxGrid::SetCellFont
@@ -3862,7 +3871,7 @@ case wxGrid_SetCellFont: { // wxGrid::SetCellFont
  int * col = (int *) bp; bp += 4;
  wxFont *val = (wxFont *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellFont((int) *row,(int) *col,*val);
+ This->SetCellFont(*row,*col,*val);
  break;
 }
 case wxGrid_SetCellRenderer: { // wxGrid::SetCellRenderer
@@ -3871,7 +3880,7 @@ case wxGrid_SetCellRenderer: { // wxGrid::SetCellRenderer
  int * col = (int *) bp; bp += 4;
  wxGridCellRenderer *renderer = (wxGridCellRenderer *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellRenderer((int) *row,(int) *col,renderer);
+ This->SetCellRenderer(*row,*col,renderer);
  break;
 }
 case wxGrid_SetCellTextColour_3_0: { // wxGrid::SetCellTextColour
@@ -3884,7 +3893,7 @@ case wxGrid_SetCellTextColour_3_0: { // wxGrid::SetCellTextColour
  int * valA = (int *) bp; bp += 4;
  wxColour val = wxColour(*valR,*valG,*valB,*valA);
  if(!This) throw wxe_badarg(0);
- This->SetCellTextColour((int) *row,(int) *col,val);
+ This->SetCellTextColour(*row,*col,val);
  break;
 }
 case wxGrid_SetCellTextColour_3_1: { // wxGrid::SetCellTextColour
@@ -3897,7 +3906,7 @@ case wxGrid_SetCellTextColour_3_1: { // wxGrid::SetCellTextColour
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellTextColour(val,(int) *row,(int) *col);
+ This->SetCellTextColour(val,*row,*col);
  break;
 }
 case wxGrid_SetCellTextColour_1: { // wxGrid::SetCellTextColour
@@ -3919,7 +3928,7 @@ case wxGrid_SetCellValue_3_0: { // wxGrid::SetCellValue
  wxString s = wxString(bp, wxConvUTF8);
  bp += *sLen+((8-((0+ *sLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetCellValue((int) *row,(int) *col,s);
+ This->SetCellValue(*row,*col,s);
  break;
 }
 case wxGrid_SetCellValue_2: { // wxGrid::SetCellValue
@@ -3942,7 +3951,7 @@ case wxGrid_SetCellValue_3_1: { // wxGrid::SetCellValue
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCellValue(val,(int) *row,(int) *col);
+ This->SetCellValue(val,*row,*col);
  break;
 }
 case wxGrid_SetColAttr: { // wxGrid::SetColAttr
@@ -3950,21 +3959,21 @@ case wxGrid_SetColAttr: { // wxGrid::SetColAttr
  int * col = (int *) bp; bp += 4;
  wxGridCellAttr *attr = (wxGridCellAttr *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColAttr((int) *col,attr);
+ This->SetColAttr(*col,attr);
  break;
 }
 case wxGrid_SetColFormatBool: { // wxGrid::SetColFormatBool
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColFormatBool((int) *col);
+ This->SetColFormatBool(*col);
  break;
 }
 case wxGrid_SetColFormatNumber: { // wxGrid::SetColFormatNumber
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColFormatNumber((int) *col);
+ This->SetColFormatNumber(*col);
  break;
 }
 case wxGrid_SetColFormatFloat: { // wxGrid::SetColFormatFloat
@@ -3981,7 +3990,7 @@ case wxGrid_SetColFormatFloat: { // wxGrid::SetColFormatFloat
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetColFormatFloat((int) *col,width,precision);
+ This->SetColFormatFloat(*col,width,precision);
  break;
 }
 case wxGrid_SetColFormatCustom: { // wxGrid::SetColFormatCustom
@@ -3991,7 +4000,7 @@ case wxGrid_SetColFormatCustom: { // wxGrid::SetColFormatCustom
  wxString typeName = wxString(bp, wxConvUTF8);
  bp += *typeNameLen+((8-((4+ *typeNameLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetColFormatCustom((int) *col,typeName);
+ This->SetColFormatCustom(*col,typeName);
  break;
 }
 case wxGrid_SetColLabelAlignment: { // wxGrid::SetColLabelAlignment
@@ -3999,14 +4008,14 @@ case wxGrid_SetColLabelAlignment: { // wxGrid::SetColLabelAlignment
  int * horiz = (int *) bp; bp += 4;
  int * vert = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColLabelAlignment((int) *horiz,(int) *vert);
+ This->SetColLabelAlignment(*horiz,*vert);
  break;
 }
 case wxGrid_SetColLabelSize: { // wxGrid::SetColLabelSize
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColLabelSize((int) *height);
+ This->SetColLabelSize(*height);
  break;
 }
 case wxGrid_SetColLabelValue: { // wxGrid::SetColLabelValue
@@ -4016,7 +4025,7 @@ case wxGrid_SetColLabelValue: { // wxGrid::SetColLabelValue
  wxString val = wxString(bp, wxConvUTF8);
  bp += *valLen+((8-((4+ *valLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetColLabelValue((int) *col,val);
+ This->SetColLabelValue(*col,val);
  break;
 }
 case wxGrid_SetColMinimalWidth: { // wxGrid::SetColMinimalWidth
@@ -4024,14 +4033,14 @@ case wxGrid_SetColMinimalWidth: { // wxGrid::SetColMinimalWidth
  int * col = (int *) bp; bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColMinimalWidth((int) *col,(int) *width);
+ This->SetColMinimalWidth(*col,*width);
  break;
 }
 case wxGrid_SetColMinimalAcceptableWidth: { // wxGrid::SetColMinimalAcceptableWidth
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColMinimalAcceptableWidth((int) *width);
+ This->SetColMinimalAcceptableWidth(*width);
  break;
 }
 case wxGrid_SetColSize: { // wxGrid::SetColSize
@@ -4039,7 +4048,7 @@ case wxGrid_SetColSize: { // wxGrid::SetColSize
  int * col = (int *) bp; bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColSize((int) *col,(int) *width);
+ This->SetColSize(*col,*width);
  break;
 }
 case wxGrid_SetDefaultCellAlignment: { // wxGrid::SetDefaultCellAlignment
@@ -4047,7 +4056,7 @@ case wxGrid_SetDefaultCellAlignment: { // wxGrid::SetDefaultCellAlignment
  int * horiz = (int *) bp; bp += 4;
  int * vert = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetDefaultCellAlignment((int) *horiz,(int) *vert);
+ This->SetDefaultCellAlignment(*horiz,*vert);
  break;
 }
 case wxGrid_SetDefaultCellBackgroundColour: { // wxGrid::SetDefaultCellBackgroundColour
@@ -4103,7 +4112,7 @@ case wxGrid_SetDefaultColSize: { // wxGrid::SetDefaultColSize
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetDefaultColSize((int) *width,resizeExistingCols);
+ This->SetDefaultColSize(*width,resizeExistingCols);
  break;
 }
 case wxGrid_SetDefaultRowSize: { // wxGrid::SetDefaultRowSize
@@ -4116,7 +4125,7 @@ case wxGrid_SetDefaultRowSize: { // wxGrid::SetDefaultRowSize
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetDefaultRowSize((int) *height,resizeExistingRows);
+ This->SetDefaultRowSize(*height,resizeExistingRows);
  break;
 }
 case wxGrid_SetGridCursor: { // wxGrid::SetGridCursor
@@ -4124,7 +4133,7 @@ case wxGrid_SetGridCursor: { // wxGrid::SetGridCursor
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetGridCursor((int) *row,(int) *col);
+ This->SetGridCursor(*row,*col);
  break;
 }
 case wxGrid_SetGridLineColour: { // wxGrid::SetGridLineColour
@@ -4172,7 +4181,7 @@ case wxGrid_SetMargins: { // wxGrid::SetMargins
  int * extraWidth = (int *) bp; bp += 4;
  int * extraHeight = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMargins((int) *extraWidth,(int) *extraHeight);
+ This->SetMargins(*extraWidth,*extraHeight);
  break;
 }
 case wxGrid_SetReadOnly: { // wxGrid::SetReadOnly
@@ -4187,7 +4196,7 @@ case wxGrid_SetReadOnly: { // wxGrid::SetReadOnly
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetReadOnly((int) *row,(int) *col,isReadOnly);
+ This->SetReadOnly(*row,*col,isReadOnly);
  break;
 }
 case wxGrid_SetRowAttr: { // wxGrid::SetRowAttr
@@ -4195,7 +4204,7 @@ case wxGrid_SetRowAttr: { // wxGrid::SetRowAttr
  int * row = (int *) bp; bp += 4;
  wxGridCellAttr *attr = (wxGridCellAttr *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRowAttr((int) *row,attr);
+ This->SetRowAttr(*row,attr);
  break;
 }
 case wxGrid_SetRowLabelAlignment: { // wxGrid::SetRowLabelAlignment
@@ -4203,14 +4212,14 @@ case wxGrid_SetRowLabelAlignment: { // wxGrid::SetRowLabelAlignment
  int * horiz = (int *) bp; bp += 4;
  int * vert = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRowLabelAlignment((int) *horiz,(int) *vert);
+ This->SetRowLabelAlignment(*horiz,*vert);
  break;
 }
 case wxGrid_SetRowLabelSize: { // wxGrid::SetRowLabelSize
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRowLabelSize((int) *width);
+ This->SetRowLabelSize(*width);
  break;
 }
 case wxGrid_SetRowLabelValue: { // wxGrid::SetRowLabelValue
@@ -4220,7 +4229,7 @@ case wxGrid_SetRowLabelValue: { // wxGrid::SetRowLabelValue
  wxString val = wxString(bp, wxConvUTF8);
  bp += *valLen+((8-((4+ *valLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetRowLabelValue((int) *row,val);
+ This->SetRowLabelValue(*row,val);
  break;
 }
 case wxGrid_SetRowMinimalHeight: { // wxGrid::SetRowMinimalHeight
@@ -4228,14 +4237,14 @@ case wxGrid_SetRowMinimalHeight: { // wxGrid::SetRowMinimalHeight
  int * row = (int *) bp; bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRowMinimalHeight((int) *row,(int) *width);
+ This->SetRowMinimalHeight(*row,*width);
  break;
 }
 case wxGrid_SetRowMinimalAcceptableHeight: { // wxGrid::SetRowMinimalAcceptableHeight
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRowMinimalAcceptableHeight((int) *width);
+ This->SetRowMinimalAcceptableHeight(*width);
  break;
 }
 case wxGrid_SetRowSize: { // wxGrid::SetRowSize
@@ -4243,21 +4252,21 @@ case wxGrid_SetRowSize: { // wxGrid::SetRowSize
  int * row = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRowSize((int) *row,(int) *height);
+ This->SetRowSize(*row,*height);
  break;
 }
 case wxGrid_SetScrollLineX: { // wxGrid::SetScrollLineX
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * x = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetScrollLineX((int) *x);
+ This->SetScrollLineX(*x);
  break;
 }
 case wxGrid_SetScrollLineY: { // wxGrid::SetScrollLineY
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetScrollLineY((int) *y);
+ This->SetScrollLineY(*y);
  break;
 }
 case wxGrid_SetSelectionBackground: { // wxGrid::SetSelectionBackground
@@ -4286,7 +4295,7 @@ case wxGrid_SetSelectionMode: { // wxGrid::SetSelectionMode
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  wxGrid::wxGridSelectionModes selmode = *(wxGrid::wxGridSelectionModes *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetSelectionMode((wxGrid::wxGridSelectionModes) selmode);
+ This->SetSelectionMode(selmode);
  break;
 }
 case wxGrid_ShowCellEditControl: { // wxGrid::ShowCellEditControl
@@ -4305,7 +4314,7 @@ case wxGrid_XToCol: { // wxGrid::XToCol
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- int Result = This->XToCol((int) *x,clipToMinMax);
+ int Result = This->XToCol(*x,clipToMinMax);
  rt.addInt(Result);
  break;
 }
@@ -4313,7 +4322,7 @@ case wxGrid_XToEdgeOfCol: { // wxGrid::XToEdgeOfCol
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * x = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->XToEdgeOfCol((int) *x);
+ int Result = This->XToEdgeOfCol(*x);
  rt.addInt(Result);
  break;
 }
@@ -4321,7 +4330,7 @@ case wxGrid_YToEdgeOfRow: { // wxGrid::YToEdgeOfRow
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->YToEdgeOfRow((int) *y);
+ int Result = This->YToEdgeOfRow(*y);
  rt.addInt(Result);
  break;
 }
@@ -4329,7 +4338,7 @@ case wxGrid_YToRow: { // wxGrid::YToRow
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->YToRow((int) *y);
+ int Result = This->YToRow(*y);
  rt.addInt(Result);
  break;
 }
@@ -4347,7 +4356,7 @@ case wxGridCellRenderer_Draw: { // wxGridCellRenderer::Draw
  int * col = (int *) bp; bp += 4;
  bool * isSelected = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Draw(*grid,*attr,*dc,rect,(int) *row,(int) *col,(bool) *isSelected);
+ This->Draw(*grid,*attr,*dc,rect,*row,*col,*isSelected);
  break;
 }
 case wxGridCellRenderer_GetBestSize: { // wxGridCellRenderer::GetBestSize
@@ -4358,7 +4367,7 @@ case wxGridCellRenderer_GetBestSize: { // wxGridCellRenderer::GetBestSize
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSize Result = This->GetBestSize(*grid,*attr,*dc,(int) *row,(int) *col);
+ wxSize Result = This->GetBestSize(*grid,*attr,*dc,*row,*col);
  rt.add(Result);
  break;
 }
@@ -4368,7 +4377,7 @@ case wxGridCellEditor_Create: { // wxGridCellEditor::Create
  int * id = (int *) bp; bp += 4;
  wxEvtHandler *evtHandler = (wxEvtHandler *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Create(parent,(wxWindowID) *id,evtHandler);
+ This->Create(parent,*id,evtHandler);
  break;
 }
 case wxGridCellEditor_IsCreated: { // wxGridCellEditor::IsCreated
@@ -4399,9 +4408,10 @@ attr = (wxGridCellAttr *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->Show((bool) *show,attr);
+ This->Show(*show,attr);
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxGridCellEditor_PaintBackground: { // wxGridCellEditor::PaintBackground
  wxGridCellEditor *This = (wxGridCellEditor *) getPtr(bp,memenv); bp += 4;
  int * rectCellX = (int *) bp; bp += 4;
@@ -4414,25 +4424,28 @@ case wxGridCellEditor_PaintBackground: { // wxGridCellEditor::PaintBackground
  This->PaintBackground(rectCell,attr);
  break;
 }
+#endif
 case wxGridCellEditor_BeginEdit: { // wxGridCellEditor::BeginEdit
  wxGridCellEditor *This = (wxGridCellEditor *) getPtr(bp,memenv); bp += 4;
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  wxGrid *grid = (wxGrid *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->BeginEdit((int) *row,(int) *col,grid);
+ This->BeginEdit(*row,*col,grid);
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxGridCellEditor_EndEdit: { // wxGridCellEditor::EndEdit
  wxGridCellEditor *This = (wxGridCellEditor *) getPtr(bp,memenv); bp += 4;
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  wxGrid *grid = (wxGrid *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->EndEdit((int) *row,(int) *col,grid);
+ bool Result = This->EndEdit(*row,*col,grid);
  rt.addBool(Result);
  break;
 }
+#endif
 case wxGridCellEditor_Reset: { // wxGridCellEditor::Reset
  wxGridCellEditor *This = (wxGridCellEditor *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
@@ -4552,14 +4565,14 @@ case wxGridCellFloatRenderer_SetPrecision: { // wxGridCellFloatRenderer::SetPrec
  wxGridCellFloatRenderer *This = (wxGridCellFloatRenderer *) getPtr(bp,memenv); bp += 4;
  int * precision = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPrecision((int) *precision);
+ This->SetPrecision(*precision);
  break;
 }
 case wxGridCellFloatRenderer_SetWidth: { // wxGridCellFloatRenderer::SetWidth
  wxGridCellFloatRenderer *This = (wxGridCellFloatRenderer *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWidth((int) *width);
+ This->SetWidth(*width);
  break;
 }
 case wxGridCellFloatRenderer_destroy: { // wxGridCellFloatRenderer::destroy
@@ -4753,7 +4766,7 @@ case wxGridCellAttr_SetAlignment: { // wxGridCellAttr::SetAlignment
  int * hAlign = (int *) bp; bp += 4;
  int * vAlign = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAlignment((int) *hAlign,(int) *vAlign);
+ This->SetAlignment(*hAlign,*vAlign);
  break;
 }
 case wxGridCellAttr_SetReadOnly: { // wxGridCellAttr::SetReadOnly
@@ -4863,7 +4876,7 @@ case wxGridCellAttr_GetRenderer: { // wxGridCellAttr::GetRenderer
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGridCellRenderer * Result = (wxGridCellRenderer*)This->GetRenderer(grid,(int) *row,(int) *col);
+ wxGridCellRenderer * Result = (wxGridCellRenderer*)This->GetRenderer(grid,*row,*col);
  rt.addRef(getRef((void *)Result,memenv), "wxGridCellRenderer");
  break;
 }
@@ -4873,7 +4886,7 @@ case wxGridCellAttr_GetEditor: { // wxGridCellAttr::GetEditor
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGridCellEditor * Result = (wxGridCellEditor*)This->GetEditor(grid,(int) *row,(int) *col);
+ wxGridCellEditor * Result = (wxGridCellEditor*)This->GetEditor(grid,*row,*col);
  rt.addRef(getRef((void *)Result,memenv), "wxGridCellEditor");
  break;
 }
@@ -4892,7 +4905,7 @@ case wxGridCellAttr_SetDefAttr: { // wxGridCellAttr::SetDefAttr
  break;
 }
 case wxDC_Blit: { // wxDC::Blit
- int rop=wxCOPY;
+ wxRasterOperationMode rop=wxCOPY;
  bool useMask=false;
  wxPoint srcPtMask= wxDefaultPosition;
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
@@ -4908,7 +4921,7 @@ case wxDC_Blit: { // wxDC::Blit
  wxPoint srcPt = wxPoint(*srcPtX,*srcPtY);
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- rop = (int)*(int *) bp; bp += 4;
+rop = *(wxRasterOperationMode *) bp; bp += 4;;
   } break;
   case 2: {bp += 4;
  useMask = *(bool *) bp; bp += 4;
@@ -4930,7 +4943,7 @@ case wxDC_CalcBoundingBox: { // wxDC::CalcBoundingBox
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CalcBoundingBox((wxCoord) *x,(wxCoord) *y);
+ This->CalcBoundingBox(*x,*y);
  break;
 }
 case wxDC_Clear: { // wxDC::Clear
@@ -4939,12 +4952,14 @@ case wxDC_Clear: { // wxDC::Clear
  This->Clear();
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxDC_ComputeScaleAndOrigin: { // wxDC::ComputeScaleAndOrigin
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
  This->ComputeScaleAndOrigin();
  break;
 }
+#endif
 case wxDC_CrossHair: { // wxDC::CrossHair
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * ptX = (int *) bp; bp += 4;
@@ -4964,7 +4979,7 @@ case wxDC_DeviceToLogicalX: { // wxDC::DeviceToLogicalX
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * x = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->DeviceToLogicalX((wxCoord) *x);
+ wxCoord Result = This->DeviceToLogicalX(*x);
  rt.addInt(Result);
  break;
 }
@@ -4972,7 +4987,7 @@ case wxDC_DeviceToLogicalXRel: { // wxDC::DeviceToLogicalXRel
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * x = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->DeviceToLogicalXRel((wxCoord) *x);
+ wxCoord Result = This->DeviceToLogicalXRel(*x);
  rt.addInt(Result);
  break;
 }
@@ -4980,7 +4995,7 @@ case wxDC_DeviceToLogicalY: { // wxDC::DeviceToLogicalY
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->DeviceToLogicalY((wxCoord) *y);
+ wxCoord Result = This->DeviceToLogicalY(*y);
  rt.addInt(Result);
  break;
 }
@@ -4988,7 +5003,7 @@ case wxDC_DeviceToLogicalYRel: { // wxDC::DeviceToLogicalYRel
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->DeviceToLogicalYRel((wxCoord) *y);
+ wxCoord Result = This->DeviceToLogicalYRel(*y);
  rt.addInt(Result);
  break;
 }
@@ -5041,7 +5056,7 @@ case wxDC_DrawCircle: { // wxDC::DrawCircle
  wxPoint pt = wxPoint(*ptX,*ptY);
  int * radius = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->DrawCircle(pt,(wxCoord) *radius);
+ This->DrawCircle(pt,*radius);
  break;
 }
 case wxDC_DrawEllipse_2: { // wxDC::DrawEllipse
@@ -5079,7 +5094,7 @@ case wxDC_DrawEllipticArc: { // wxDC::DrawEllipticArc
  double * sa = (double *) bp; bp += 8;
  double * ea = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawEllipticArc(pt,sz,(double) *sa,(double) *ea);
+ This->DrawEllipticArc(pt,sz,*sa,*ea);
  break;
 }
 case wxDC_DrawIcon: { // wxDC::DrawIcon
@@ -5155,7 +5170,7 @@ case wxDC_DrawLines: { // wxDC::DrawLines
 case wxDC_DrawPolygon: { // wxDC::DrawPolygon
  wxCoord xoffset=0;
  wxCoord yoffset=0;
- int fillStyle=wxODDEVEN_RULE;
+ wxPolygonFillMode fillStyle=wxODDEVEN_RULE;
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * pointsLen = (int *) bp; bp += 4;
  wxPoint *points;
@@ -5172,7 +5187,7 @@ case wxDC_DrawPolygon: { // wxDC::DrawPolygon
  yoffset = (wxCoord)*(int *) bp; bp += 4;
   } break;
   case 3: {bp += 4;
- fillStyle = (int)*(int *) bp; bp += 4;
+fillStyle = *(wxPolygonFillMode *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
@@ -5222,7 +5237,7 @@ case wxDC_DrawRotatedText: { // wxDC::DrawRotatedText
  wxPoint pt = wxPoint(*ptX,*ptY);
  double * angle = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawRotatedText(text,pt,(double) *angle);
+ This->DrawRotatedText(text,pt,*angle);
  break;
 }
 case wxDC_DrawRoundedRectangle_3: { // wxDC::DrawRoundedRectangle
@@ -5236,7 +5251,7 @@ case wxDC_DrawRoundedRectangle_3: { // wxDC::DrawRoundedRectangle
  bp += 4; /* Align */
  double * radius = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawRoundedRectangle(pt,sz,(double) *radius);
+ This->DrawRoundedRectangle(pt,sz,*radius);
  break;
 }
 case wxDC_DrawRoundedRectangle_2: { // wxDC::DrawRoundedRectangle
@@ -5249,7 +5264,7 @@ case wxDC_DrawRoundedRectangle_2: { // wxDC::DrawRoundedRectangle
  bp += 4; /* Align */
  double * radius = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawRoundedRectangle(r,(double) *radius);
+ This->DrawRoundedRectangle(r,*radius);
  break;
 }
 case wxDC_DrawText: { // wxDC::DrawText
@@ -5277,7 +5292,7 @@ case wxDC_EndPage: { // wxDC::EndPage
  break;
 }
 case wxDC_FloodFill: { // wxDC::FloodFill
- int style=wxFLOOD_SURFACE;
+ wxFloodFillStyle style=wxFLOOD_SURFACE;
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * ptX = (int *) bp; bp += 4;
  int * ptY = (int *) bp; bp += 4;
@@ -5290,7 +5305,7 @@ case wxDC_FloodFill: { // wxDC::FloodFill
  bp += 4; /* Align */
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- style = (int)*(int *) bp; bp += 4;
+style = *(wxFloodFillStyle *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
@@ -5591,14 +5606,14 @@ nDirection = *(wxDirection *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->GradientFillLinear(rect,initialColour,destColour,(wxDirection) nDirection);
+ This->GradientFillLinear(rect,initialColour,destColour,nDirection);
  break;
 }
 case wxDC_LogicalToDeviceX: { // wxDC::LogicalToDeviceX
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * x = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->LogicalToDeviceX((wxCoord) *x);
+ wxCoord Result = This->LogicalToDeviceX(*x);
  rt.addInt(Result);
  break;
 }
@@ -5606,7 +5621,7 @@ case wxDC_LogicalToDeviceXRel: { // wxDC::LogicalToDeviceXRel
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * x = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->LogicalToDeviceXRel((wxCoord) *x);
+ wxCoord Result = This->LogicalToDeviceXRel(*x);
  rt.addInt(Result);
  break;
 }
@@ -5614,7 +5629,7 @@ case wxDC_LogicalToDeviceY: { // wxDC::LogicalToDeviceY
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->LogicalToDeviceY((wxCoord) *y);
+ wxCoord Result = This->LogicalToDeviceY(*y);
  rt.addInt(Result);
  break;
 }
@@ -5622,7 +5637,7 @@ case wxDC_LogicalToDeviceYRel: { // wxDC::LogicalToDeviceYRel
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCoord Result = This->LogicalToDeviceYRel((wxCoord) *y);
+ wxCoord Result = This->LogicalToDeviceYRel(*y);
  rt.addInt(Result);
  break;
 }
@@ -5672,7 +5687,7 @@ case wxDC_SetAxisOrientation: { // wxDC::SetAxisOrientation
  bool * xLeftRight = (bool *) bp; bp += 4;
  bool * yBottomUp = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAxisOrientation((bool) *xLeftRight,(bool) *yBottomUp);
+ This->SetAxisOrientation(*xLeftRight,*yBottomUp);
  break;
 }
 case wxDC_SetBackground: { // wxDC::SetBackground
@@ -5686,7 +5701,7 @@ case wxDC_SetBackgroundMode: { // wxDC::SetBackgroundMode
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  int * mode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetBackgroundMode((int) *mode);
+ This->SetBackgroundMode(*mode);
  break;
 }
 case wxDC_SetBrush: { // wxDC::SetBrush
@@ -5731,7 +5746,7 @@ case wxDC_SetDeviceOrigin: { // wxDC::SetDeviceOrigin
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetDeviceOrigin((wxCoord) *x,(wxCoord) *y);
+ This->SetDeviceOrigin(*x,*y);
  break;
 }
 case wxDC_SetFont: { // wxDC::SetFont
@@ -5745,21 +5760,21 @@ case wxDC_SetLayoutDirection: { // wxDC::SetLayoutDirection
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
  wxLayoutDirection dir = *(wxLayoutDirection *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetLayoutDirection((wxLayoutDirection) dir);
+ This->SetLayoutDirection(dir);
  break;
 }
 case wxDC_SetLogicalFunction: { // wxDC::SetLogicalFunction
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
- int * function = (int *) bp; bp += 4;
+ wxRasterOperationMode function = *(wxRasterOperationMode *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetLogicalFunction((int) *function);
+ This->SetLogicalFunction(function);
  break;
 }
 case wxDC_SetMapMode: { // wxDC::SetMapMode
  wxDC *This = (wxDC *) getPtr(bp,memenv); bp += 4;
- int * mode = (int *) bp; bp += 4;
+ wxMappingMode mode = *(wxMappingMode *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetMapMode((int) *mode);
+ This->SetMapMode(mode);
  break;
 }
 case wxDC_SetPalette: { // wxDC::SetPalette
@@ -5804,7 +5819,7 @@ case wxDC_SetUserScale: { // wxDC::SetUserScale
  double * x = (double *) bp; bp += 8;
  double * y = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->SetUserScale((double) *x,(double) *y);
+ This->SetUserScale(*x,*y);
  break;
 }
 case wxDC_StartDoc: { // wxDC::StartDoc
@@ -5826,7 +5841,7 @@ case wxDC_StartPage: { // wxDC::StartPage
 case wxMirrorDC_new: { // wxMirrorDC::wxMirrorDC
  wxDC *dc = (wxDC *) getPtr(bp,memenv); bp += 4;
  bool * mirror = (bool *) bp; bp += 4;
- wxMirrorDC * Result = new EwxMirrorDC(*dc,(bool) *mirror);
+ wxMirrorDC * Result = new EwxMirrorDC(*dc,*mirror);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxMirrorDC");
  break;
@@ -5850,22 +5865,28 @@ case wxPostScriptDC_new_1: { // wxPostScriptDC::wxPostScriptDC
  rt.addRef(getRef((void *)Result,memenv), "wxPostScriptDC");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxPostScriptDC_SetResolution: { // wxPostScriptDC::SetResolution
  int * ppi = (int *) bp; bp += 4;
- wxPostScriptDC::SetResolution((int) *ppi);
+ wxPostScriptDC::SetResolution(*ppi);
  break;
 }
+#endif
+#if !wxCHECK_VERSION(2,9,0)
 case wxPostScriptDC_GetResolution: { // wxPostScriptDC::GetResolution
  int Result = wxPostScriptDC::GetResolution();
  rt.addInt(Result);
  break;
 }
+#endif
+#if !wxCHECK_VERSION(2,9,0)
 case wxWindowDC_new_0: { // wxWindowDC::wxWindowDC
  wxWindowDC * Result = new EwxWindowDC();
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxWindowDC");
  break;
 }
+#endif
 case wxWindowDC_new_1: { // wxWindowDC::wxWindowDC
  wxWindow *win = (wxWindow *) getPtr(bp,memenv); bp += 4;
  wxWindowDC * Result = new EwxWindowDC(win);
@@ -5873,12 +5894,14 @@ case wxWindowDC_new_1: { // wxWindowDC::wxWindowDC
  rt.addRef(getRef((void *)Result,memenv), "wxWindowDC");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxClientDC_new_0: { // wxClientDC::wxClientDC
  wxClientDC * Result = new EwxClientDC();
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxClientDC");
  break;
 }
+#endif
 case wxClientDC_new_1: { // wxClientDC::wxClientDC
  wxWindow *win = (wxWindow *) getPtr(bp,memenv); bp += 4;
  wxClientDC * Result = new EwxClientDC(win);
@@ -5886,12 +5909,14 @@ case wxClientDC_new_1: { // wxClientDC::wxClientDC
  rt.addRef(getRef((void *)Result,memenv), "wxClientDC");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxPaintDC_new_0: { // wxPaintDC::wxPaintDC
  wxPaintDC * Result = new EwxPaintDC();
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxPaintDC");
  break;
 }
+#endif
 case wxPaintDC_new_1: { // wxPaintDC::wxPaintDC
  wxWindow *win = (wxWindow *) getPtr(bp,memenv); bp += 4;
  wxPaintDC * Result = new EwxPaintDC(win);
@@ -6085,6 +6110,7 @@ case wxGraphicsContext_CreateBrush: { // wxGraphicsContext::CreateBrush
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxGraphicsContext_CreateRadialGradientBrush: { // wxGraphicsContext::CreateRadialGradientBrush
  wxGraphicsContext *This = (wxGraphicsContext *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
@@ -6104,10 +6130,12 @@ case wxGraphicsContext_CreateRadialGradientBrush: { // wxGraphicsContext::Create
  int * cColorA = (int *) bp; bp += 4;
  wxColour cColor = wxColour(*cColorR,*cColorG,*cColorB,*cColorA);
  if(!This) throw wxe_badarg(0);
- wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateRadialGradientBrush((wxDouble) *xo,(wxDouble) *yo,(wxDouble) *xc,(wxDouble) *yc,(wxDouble) *radius,oColor,cColor)); newPtr((void *) Result,3, memenv);;
+ wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateRadialGradientBrush(*xo,*yo,*xc,*yc,*radius,oColor,cColor)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#endif
+#if !wxCHECK_VERSION(2,9,0)
 case wxGraphicsContext_CreateLinearGradientBrush: { // wxGraphicsContext::CreateLinearGradientBrush
  wxGraphicsContext *This = (wxGraphicsContext *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
@@ -6126,10 +6154,11 @@ case wxGraphicsContext_CreateLinearGradientBrush: { // wxGraphicsContext::Create
  int * c2A = (int *) bp; bp += 4;
  wxColour c2 = wxColour(*c2R,*c2G,*c2B,*c2A);
  if(!This) throw wxe_badarg(0);
- wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateLinearGradientBrush((wxDouble) *x1,(wxDouble) *y1,(wxDouble) *x2,(wxDouble) *y2,c1,c2)); newPtr((void *) Result,3, memenv);;
+ wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateLinearGradientBrush(*x1,*y1,*x2,*y2,c1,c2)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#endif
 case wxGraphicsContext_CreateFont: { // wxGraphicsContext::CreateFont
  wxColour col= *wxBLACK;
  wxGraphicsContext *This = (wxGraphicsContext *) getPtr(bp,memenv); bp += 4;
@@ -6211,7 +6240,7 @@ case wxGraphicsContext_Clip_4: { // wxGraphicsContext::Clip
  wxDouble * w = (wxDouble *) bp; bp += 8;
  wxDouble * h = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->Clip((wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h);
+ This->Clip(*x,*y,*w,*h);
  break;
 }
 case wxGraphicsContext_ResetClip: { // wxGraphicsContext::ResetClip
@@ -6228,7 +6257,7 @@ case wxGraphicsContext_DrawBitmap: { // wxGraphicsContext::DrawBitmap
  wxDouble * w = (wxDouble *) bp; bp += 8;
  wxDouble * h = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawBitmap(*bmp,(wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h);
+ This->DrawBitmap(*bmp,*x,*y,*w,*h);
  break;
 }
 case wxGraphicsContext_DrawEllipse: { // wxGraphicsContext::DrawEllipse
@@ -6239,7 +6268,7 @@ case wxGraphicsContext_DrawEllipse: { // wxGraphicsContext::DrawEllipse
  wxDouble * w = (wxDouble *) bp; bp += 8;
  wxDouble * h = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawEllipse((wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h);
+ This->DrawEllipse(*x,*y,*w,*h);
  break;
 }
 case wxGraphicsContext_DrawIcon: { // wxGraphicsContext::DrawIcon
@@ -6250,11 +6279,11 @@ case wxGraphicsContext_DrawIcon: { // wxGraphicsContext::DrawIcon
  wxDouble * w = (wxDouble *) bp; bp += 8;
  wxDouble * h = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawIcon(*icon,(wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h);
+ This->DrawIcon(*icon,*x,*y,*w,*h);
  break;
 }
 case wxGraphicsContext_DrawLines: { // wxGraphicsContext::DrawLines
- int fillStyle=wxODDEVEN_RULE;
+ wxPolygonFillMode fillStyle=wxODDEVEN_RULE;
  wxGraphicsContext *This = (wxGraphicsContext *) getPtr(bp,memenv); bp += 4;
  int * pointsLen = (int *) bp; bp += 4;
  wxPoint2DDouble *points;
@@ -6265,7 +6294,7 @@ case wxGraphicsContext_DrawLines: { // wxGraphicsContext::DrawLines
    points[i] = wxPoint2DDouble(x,y);}
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- fillStyle = (int)*(int *) bp; bp += 4;
+fillStyle = *(wxPolygonFillMode *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
@@ -6274,12 +6303,12 @@ case wxGraphicsContext_DrawLines: { // wxGraphicsContext::DrawLines
  break;
 }
 case wxGraphicsContext_DrawPath: { // wxGraphicsContext::DrawPath
- int fillStyle=wxODDEVEN_RULE;
+ wxPolygonFillMode fillStyle=wxODDEVEN_RULE;
  wxGraphicsContext *This = (wxGraphicsContext *) getPtr(bp,memenv); bp += 4;
  wxGraphicsPath *path = (wxGraphicsPath *) getPtr(bp,memenv); bp += 4;
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- fillStyle = (int)*(int *) bp; bp += 4;
+fillStyle = *(wxPolygonFillMode *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
@@ -6294,7 +6323,7 @@ case wxGraphicsContext_DrawRectangle: { // wxGraphicsContext::DrawRectangle
  wxDouble * w = (wxDouble *) bp; bp += 8;
  wxDouble * h = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawRectangle((wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h);
+ This->DrawRectangle(*x,*y,*w,*h);
  break;
 }
 case wxGraphicsContext_DrawRoundedRectangle: { // wxGraphicsContext::DrawRoundedRectangle
@@ -6306,7 +6335,7 @@ case wxGraphicsContext_DrawRoundedRectangle: { // wxGraphicsContext::DrawRounded
  wxDouble * h = (wxDouble *) bp; bp += 8;
  wxDouble * radius = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawRoundedRectangle((wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h,(wxDouble) *radius);
+ This->DrawRoundedRectangle(*x,*y,*w,*h,*radius);
  break;
 }
 case wxGraphicsContext_DrawText_3: { // wxGraphicsContext::DrawText
@@ -6317,7 +6346,7 @@ case wxGraphicsContext_DrawText_3: { // wxGraphicsContext::DrawText
  wxDouble * x = (wxDouble *) bp; bp += 8;
  wxDouble * y = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawText(str,(wxDouble) *x,(wxDouble) *y);
+ This->DrawText(str,*x,*y);
  break;
 }
 case wxGraphicsContext_DrawText_4_0: { // wxGraphicsContext::DrawText
@@ -6329,7 +6358,7 @@ case wxGraphicsContext_DrawText_4_0: { // wxGraphicsContext::DrawText
  wxDouble * y = (wxDouble *) bp; bp += 8;
  wxDouble * angle = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->DrawText(str,(wxDouble) *x,(wxDouble) *y,(wxDouble) *angle);
+ This->DrawText(str,*x,*y,*angle);
  break;
 }
 case wxGraphicsContext_DrawText_4_1: { // wxGraphicsContext::DrawText
@@ -6341,7 +6370,7 @@ case wxGraphicsContext_DrawText_4_1: { // wxGraphicsContext::DrawText
  wxDouble * y = (wxDouble *) bp; bp += 8;
  wxGraphicsBrush *backgroundBrush = (wxGraphicsBrush *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->DrawText(str,(wxDouble) *x,(wxDouble) *y,*backgroundBrush);
+ This->DrawText(str,*x,*y,*backgroundBrush);
  break;
 }
 case wxGraphicsContext_DrawText_5: { // wxGraphicsContext::DrawText
@@ -6354,16 +6383,16 @@ case wxGraphicsContext_DrawText_5: { // wxGraphicsContext::DrawText
  wxDouble * angle = (wxDouble *) bp; bp += 8;
  wxGraphicsBrush *backgroundBrush = (wxGraphicsBrush *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->DrawText(str,(wxDouble) *x,(wxDouble) *y,(wxDouble) *angle,*backgroundBrush);
+ This->DrawText(str,*x,*y,*angle,*backgroundBrush);
  break;
 }
 case wxGraphicsContext_FillPath: { // wxGraphicsContext::FillPath
- int fillStyle=wxODDEVEN_RULE;
+ wxPolygonFillMode fillStyle=wxODDEVEN_RULE;
  wxGraphicsContext *This = (wxGraphicsContext *) getPtr(bp,memenv); bp += 4;
  wxGraphicsPath *path = (wxGraphicsPath *) getPtr(bp,memenv); bp += 4;
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- fillStyle = (int)*(int *) bp; bp += 4;
+fillStyle = *(wxPolygonFillMode *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
@@ -6411,7 +6440,7 @@ case wxGraphicsContext_Rotate: { // wxGraphicsContext::Rotate
  bp += 4; /* Align */
  wxDouble * angle = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->Rotate((wxDouble) *angle);
+ This->Rotate(*angle);
  break;
 }
 case wxGraphicsContext_Scale: { // wxGraphicsContext::Scale
@@ -6420,7 +6449,7 @@ case wxGraphicsContext_Scale: { // wxGraphicsContext::Scale
  wxDouble * xScale = (wxDouble *) bp; bp += 8;
  wxDouble * yScale = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->Scale((wxDouble) *xScale,(wxDouble) *yScale);
+ This->Scale(*xScale,*yScale);
  break;
 }
 case wxGraphicsContext_Translate: { // wxGraphicsContext::Translate
@@ -6429,7 +6458,7 @@ case wxGraphicsContext_Translate: { // wxGraphicsContext::Translate
  wxDouble * dx = (wxDouble *) bp; bp += 8;
  wxDouble * dy = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->Translate((wxDouble) *dx,(wxDouble) *dy);
+ This->Translate(*dx,*dy);
  break;
 }
 case wxGraphicsContext_GetTransform: { // wxGraphicsContext::GetTransform
@@ -6508,7 +6537,7 @@ case wxGraphicsContext_StrokeLine: { // wxGraphicsContext::StrokeLine
  wxDouble * x2 = (wxDouble *) bp; bp += 8;
  wxDouble * y2 = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->StrokeLine((wxDouble) *x1,(wxDouble) *y1,(wxDouble) *x2,(wxDouble) *y2);
+ This->StrokeLine(*x1,*y1,*x2,*y2);
  break;
 }
 case wxGraphicsContext_StrokeLines: { // wxGraphicsContext::StrokeLines
@@ -6579,7 +6608,7 @@ case wxGraphicsMatrix_Rotate: { // wxGraphicsMatrix::Rotate
  bp += 4; /* Align */
  wxDouble * angle = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->Rotate((wxDouble) *angle);
+ This->Rotate(*angle);
  break;
 }
 case wxGraphicsMatrix_Scale: { // wxGraphicsMatrix::Scale
@@ -6588,7 +6617,7 @@ case wxGraphicsMatrix_Scale: { // wxGraphicsMatrix::Scale
  wxDouble * xScale = (wxDouble *) bp; bp += 8;
  wxDouble * yScale = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->Scale((wxDouble) *xScale,(wxDouble) *yScale);
+ This->Scale(*xScale,*yScale);
  break;
 }
 case wxGraphicsMatrix_Translate: { // wxGraphicsMatrix::Translate
@@ -6597,7 +6626,7 @@ case wxGraphicsMatrix_Translate: { // wxGraphicsMatrix::Translate
  wxDouble * dx = (wxDouble *) bp; bp += 8;
  wxDouble * dy = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->Translate((wxDouble) *dx,(wxDouble) *dy);
+ This->Translate(*dx,*dy);
  break;
 }
 case wxGraphicsMatrix_Set: { // wxGraphicsMatrix::Set
@@ -6669,7 +6698,7 @@ case wxGraphicsPath_MoveToPoint_2: { // wxGraphicsPath::MoveToPoint
  wxDouble * x = (wxDouble *) bp; bp += 8;
  wxDouble * y = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->MoveToPoint((wxDouble) *x,(wxDouble) *y);
+ This->MoveToPoint(*x,*y);
  break;
 }
 case wxGraphicsPath_MoveToPoint_1: { // wxGraphicsPath::MoveToPoint
@@ -6692,7 +6721,7 @@ case wxGraphicsPath_AddArc_6: { // wxGraphicsPath::AddArc
  wxDouble * endAngle = (wxDouble *) bp; bp += 8;
  bool * clockwise = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AddArc((wxDouble) *x,(wxDouble) *y,(wxDouble) *r,(wxDouble) *startAngle,(wxDouble) *endAngle,(bool) *clockwise);
+ This->AddArc(*x,*y,*r,*startAngle,*endAngle,*clockwise);
  break;
 }
 case wxGraphicsPath_AddArc_5: { // wxGraphicsPath::AddArc
@@ -6706,7 +6735,7 @@ case wxGraphicsPath_AddArc_5: { // wxGraphicsPath::AddArc
  wxDouble * endAngle = (wxDouble *) bp; bp += 8;
  bool * clockwise = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AddArc(c,(wxDouble) *r,(wxDouble) *startAngle,(wxDouble) *endAngle,(bool) *clockwise);
+ This->AddArc(c,*r,*startAngle,*endAngle,*clockwise);
  break;
 }
 case wxGraphicsPath_AddArcToPoint: { // wxGraphicsPath::AddArcToPoint
@@ -6718,7 +6747,7 @@ case wxGraphicsPath_AddArcToPoint: { // wxGraphicsPath::AddArcToPoint
  wxDouble * y2 = (wxDouble *) bp; bp += 8;
  wxDouble * r = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddArcToPoint((wxDouble) *x1,(wxDouble) *y1,(wxDouble) *x2,(wxDouble) *y2,(wxDouble) *r);
+ This->AddArcToPoint(*x1,*y1,*x2,*y2,*r);
  break;
 }
 case wxGraphicsPath_AddCircle: { // wxGraphicsPath::AddCircle
@@ -6728,7 +6757,7 @@ case wxGraphicsPath_AddCircle: { // wxGraphicsPath::AddCircle
  wxDouble * y = (wxDouble *) bp; bp += 8;
  wxDouble * r = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddCircle((wxDouble) *x,(wxDouble) *y,(wxDouble) *r);
+ This->AddCircle(*x,*y,*r);
  break;
 }
 case wxGraphicsPath_AddCurveToPoint_6: { // wxGraphicsPath::AddCurveToPoint
@@ -6741,7 +6770,7 @@ case wxGraphicsPath_AddCurveToPoint_6: { // wxGraphicsPath::AddCurveToPoint
  wxDouble * x = (wxDouble *) bp; bp += 8;
  wxDouble * y = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddCurveToPoint((wxDouble) *cx1,(wxDouble) *cy1,(wxDouble) *cx2,(wxDouble) *cy2,(wxDouble) *x,(wxDouble) *y);
+ This->AddCurveToPoint(*cx1,*cy1,*cx2,*cy2,*x,*y);
  break;
 }
 case wxGraphicsPath_AddCurveToPoint_3: { // wxGraphicsPath::AddCurveToPoint
@@ -6768,7 +6797,7 @@ case wxGraphicsPath_AddEllipse: { // wxGraphicsPath::AddEllipse
  wxDouble * w = (wxDouble *) bp; bp += 8;
  wxDouble * h = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddEllipse((wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h);
+ This->AddEllipse(*x,*y,*w,*h);
  break;
 }
 case wxGraphicsPath_AddLineToPoint_2: { // wxGraphicsPath::AddLineToPoint
@@ -6777,7 +6806,7 @@ case wxGraphicsPath_AddLineToPoint_2: { // wxGraphicsPath::AddLineToPoint
  wxDouble * x = (wxDouble *) bp; bp += 8;
  wxDouble * y = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddLineToPoint((wxDouble) *x,(wxDouble) *y);
+ This->AddLineToPoint(*x,*y);
  break;
 }
 case wxGraphicsPath_AddLineToPoint_1: { // wxGraphicsPath::AddLineToPoint
@@ -6805,7 +6834,7 @@ case wxGraphicsPath_AddQuadCurveToPoint: { // wxGraphicsPath::AddQuadCurveToPoin
  wxDouble * x = (wxDouble *) bp; bp += 8;
  wxDouble * y = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddQuadCurveToPoint((wxDouble) *cx,(wxDouble) *cy,(wxDouble) *x,(wxDouble) *y);
+ This->AddQuadCurveToPoint(*cx,*cy,*x,*y);
  break;
 }
 case wxGraphicsPath_AddRectangle: { // wxGraphicsPath::AddRectangle
@@ -6816,7 +6845,7 @@ case wxGraphicsPath_AddRectangle: { // wxGraphicsPath::AddRectangle
  wxDouble * w = (wxDouble *) bp; bp += 8;
  wxDouble * h = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddRectangle((wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h);
+ This->AddRectangle(*x,*y,*w,*h);
  break;
 }
 case wxGraphicsPath_AddRoundedRectangle: { // wxGraphicsPath::AddRoundedRectangle
@@ -6828,7 +6857,7 @@ case wxGraphicsPath_AddRoundedRectangle: { // wxGraphicsPath::AddRoundedRectangl
  wxDouble * h = (wxDouble *) bp; bp += 8;
  wxDouble * radius = (wxDouble *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->AddRoundedRectangle((wxDouble) *x,(wxDouble) *y,(wxDouble) *w,(wxDouble) *h,(wxDouble) *radius);
+ This->AddRoundedRectangle(*x,*y,*w,*h,*radius);
  break;
 }
 case wxGraphicsPath_CloseSubpath: { // wxGraphicsPath::CloseSubpath
@@ -6838,23 +6867,23 @@ case wxGraphicsPath_CloseSubpath: { // wxGraphicsPath::CloseSubpath
  break;
 }
 case wxGraphicsPath_Contains_3: { // wxGraphicsPath::Contains
- int fillStyle=wxODDEVEN_RULE;
+ wxPolygonFillMode fillStyle=wxODDEVEN_RULE;
  wxGraphicsPath *This = (wxGraphicsPath *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
  wxDouble * x = (wxDouble *) bp; bp += 8;
  wxDouble * y = (wxDouble *) bp; bp += 8;
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- fillStyle = (int)*(int *) bp; bp += 4;
+fillStyle = *(wxPolygonFillMode *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Contains((wxDouble) *x,(wxDouble) *y,fillStyle);
+ bool Result = This->Contains(*x,*y,fillStyle);
  rt.addBool(Result);
  break;
 }
 case wxGraphicsPath_Contains_2: { // wxGraphicsPath::Contains
- int fillStyle=wxODDEVEN_RULE;
+ wxPolygonFillMode fillStyle=wxODDEVEN_RULE;
  wxGraphicsPath *This = (wxGraphicsPath *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
  wxDouble * cX = (wxDouble *) bp; bp += 8;
@@ -6862,7 +6891,7 @@ case wxGraphicsPath_Contains_2: { // wxGraphicsPath::Contains
  wxPoint2DDouble c = wxPoint2DDouble(*cX,*cY);
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- fillStyle = (int)*(int *) bp; bp += 4;
+fillStyle = *(wxPolygonFillMode *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
@@ -6930,6 +6959,7 @@ case wxGraphicsRenderer_CreateBrush: { // wxGraphicsRenderer::CreateBrush
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxGraphicsRenderer_CreateLinearGradientBrush: { // wxGraphicsRenderer::CreateLinearGradientBrush
  wxGraphicsRenderer *This = (wxGraphicsRenderer *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
@@ -6948,10 +6978,12 @@ case wxGraphicsRenderer_CreateLinearGradientBrush: { // wxGraphicsRenderer::Crea
  int * c2A = (int *) bp; bp += 4;
  wxColour c2 = wxColour(*c2R,*c2G,*c2B,*c2A);
  if(!This) throw wxe_badarg(0);
- wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateLinearGradientBrush((wxDouble) *x1,(wxDouble) *y1,(wxDouble) *x2,(wxDouble) *y2,c1,c2)); newPtr((void *) Result,3, memenv);;
+ wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateLinearGradientBrush(*x1,*y1,*x2,*y2,c1,c2)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#endif
+#if !wxCHECK_VERSION(2,9,0)
 case wxGraphicsRenderer_CreateRadialGradientBrush: { // wxGraphicsRenderer::CreateRadialGradientBrush
  wxGraphicsRenderer *This = (wxGraphicsRenderer *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
@@ -6971,10 +7003,11 @@ case wxGraphicsRenderer_CreateRadialGradientBrush: { // wxGraphicsRenderer::Crea
  int * cColorA = (int *) bp; bp += 4;
  wxColour cColor = wxColour(*cColorR,*cColorG,*cColorB,*cColorA);
  if(!This) throw wxe_badarg(0);
- wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateRadialGradientBrush((wxDouble) *xo,(wxDouble) *yo,(wxDouble) *xc,(wxDouble) *yc,(wxDouble) *radius,oColor,cColor)); newPtr((void *) Result,3, memenv);;
+ wxGraphicsBrush * Result = new wxGraphicsBrush(This->CreateRadialGradientBrush(*xo,*yo,*xc,*yc,*radius,oColor,cColor)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#endif
 case wxGraphicsRenderer_CreateFont: { // wxGraphicsRenderer::CreateFont
  wxColour col= *wxBLACK;
  wxGraphicsRenderer *This = (wxGraphicsRenderer *) getPtr(bp,memenv); bp += 4;
@@ -7050,7 +7083,7 @@ case wxGraphicsRenderer_CreatePath: { // wxGraphicsRenderer::CreatePath
 #endif // wxUSE_GRAPHICS_CONTEXT
 case wxMenuBar_new_1: { // wxMenuBar::wxMenuBar
  int * style = (int *) bp; bp += 4;
- wxMenuBar * Result = new EwxMenuBar((long) *style);
+ wxMenuBar * Result = new EwxMenuBar(*style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuBar");
  break;
@@ -7077,7 +7110,7 @@ case wxMenuBar_Check: { // wxMenuBar::Check
  int * itemid = (int *) bp; bp += 4;
  bool * check = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Check((int) *itemid,(bool) *check);
+ This->Check(*itemid,*check);
  break;
 }
 case wxMenuBar_Enable_2: { // wxMenuBar::Enable
@@ -7085,7 +7118,7 @@ case wxMenuBar_Enable_2: { // wxMenuBar::Enable
  int * itemid = (int *) bp; bp += 4;
  bool * enable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Enable((int) *itemid,(bool) *enable);
+ This->Enable(*itemid,*enable);
  break;
 }
 case wxMenuBar_Enable_1: { // wxMenuBar::Enable
@@ -7107,7 +7140,7 @@ case wxMenuBar_EnableTop: { // wxMenuBar::EnableTop
  int * pos = (int *) bp; bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableTop((size_t) *pos,(bool) *flag);
+ This->EnableTop(*pos,*flag);
  break;
 }
 case wxMenuBar_FindMenu: { // wxMenuBar::FindMenu
@@ -7138,7 +7171,7 @@ case wxMenuBar_FindItem: { // wxMenuBar::FindItem
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * id = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->FindItem((int) *id,menu);
+ wxMenuItem * Result = (wxMenuItem*)This->FindItem(*id,menu);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7146,7 +7179,7 @@ case wxMenuBar_GetHelpString: { // wxMenuBar::GetHelpString
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetHelpString((int) *itemid);
+ wxString Result = This->GetHelpString(*itemid);
  rt.add(Result);
  break;
 }
@@ -7154,7 +7187,7 @@ case wxMenuBar_GetLabel_1: { // wxMenuBar::GetLabel
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetLabel((int) *itemid);
+ wxString Result = This->GetLabel(*itemid);
  rt.add(Result);
  break;
 }
@@ -7169,7 +7202,7 @@ case wxMenuBar_GetLabelTop: { // wxMenuBar::GetLabelTop
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetLabelTop((size_t) *pos);
+ wxString Result = This->GetLabelTop(*pos);
  rt.add(Result);
  break;
 }
@@ -7177,7 +7210,7 @@ case wxMenuBar_GetMenu: { // wxMenuBar::GetMenu
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenu * Result = (wxMenu*)This->GetMenu((size_t) *pos);
+ wxMenu * Result = (wxMenu*)This->GetMenu(*pos);
  rt.addRef(getRef((void *)Result,memenv), "wxMenu");
  break;
 }
@@ -7196,7 +7229,7 @@ case wxMenuBar_Insert: { // wxMenuBar::Insert
  wxString title = wxString(bp, wxConvUTF8);
  bp += *titleLen+((8-((0+ *titleLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->Insert((size_t) *pos,menu,title);
+ bool Result = This->Insert(*pos,menu,title);
  rt.addBool(Result);
  break;
 }
@@ -7204,7 +7237,7 @@ case wxMenuBar_IsChecked: { // wxMenuBar::IsChecked
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsChecked((int) *itemid);
+ bool Result = This->IsChecked(*itemid);
  rt.addBool(Result);
  break;
 }
@@ -7212,7 +7245,7 @@ case wxMenuBar_IsEnabled_1: { // wxMenuBar::IsEnabled
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsEnabled((int) *itemid);
+ bool Result = This->IsEnabled(*itemid);
  rt.addBool(Result);
  break;
 }
@@ -7227,7 +7260,7 @@ case wxMenuBar_Remove: { // wxMenuBar::Remove
  wxMenuBar *This = (wxMenuBar *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenu * Result = (wxMenu*)This->Remove((size_t) *pos);
+ wxMenu * Result = (wxMenu*)This->Remove(*pos);
  rt.addRef(getRef((void *)Result,memenv), "wxMenu");
  break;
 }
@@ -7239,7 +7272,7 @@ case wxMenuBar_Replace: { // wxMenuBar::Replace
  wxString title = wxString(bp, wxConvUTF8);
  bp += *titleLen+((8-((0+ *titleLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- wxMenu * Result = (wxMenu*)This->Replace((size_t) *pos,menu,title);
+ wxMenu * Result = (wxMenu*)This->Replace(*pos,menu,title);
  rt.addRef(getRef((void *)Result,memenv), "wxMenu");
  break;
 }
@@ -7250,7 +7283,7 @@ case wxMenuBar_SetHelpString: { // wxMenuBar::SetHelpString
  wxString helpString = wxString(bp, wxConvUTF8);
  bp += *helpStringLen+((8-((4+ *helpStringLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetHelpString((int) *itemid,helpString);
+ This->SetHelpString(*itemid,helpString);
  break;
 }
 case wxMenuBar_SetLabel_2: { // wxMenuBar::SetLabel
@@ -7260,7 +7293,7 @@ case wxMenuBar_SetLabel_2: { // wxMenuBar::SetLabel
  wxString label = wxString(bp, wxConvUTF8);
  bp += *labelLen+((8-((4+ *labelLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetLabel((int) *itemid,label);
+ This->SetLabel(*itemid,label);
  break;
 }
 case wxMenuBar_SetLabel_1: { // wxMenuBar::SetLabel
@@ -7279,7 +7312,7 @@ case wxMenuBar_SetLabelTop: { // wxMenuBar::SetLabelTop
  wxString label = wxString(bp, wxConvUTF8);
  bp += *labelLen+((8-((4+ *labelLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetLabelTop((size_t) *pos,label);
+ This->SetLabelTop(*pos,label);
  break;
 }
 case wxControl_GetLabel: { // wxControl::GetLabel
@@ -7345,7 +7378,7 @@ case wxControlWithItems_Delete: { // wxControlWithItems::Delete
  wxControlWithItems *This = (wxControlWithItems *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Delete((int) *n);
+ This->Delete(*n);
  break;
 }
 case wxControlWithItems_FindString: { // wxControlWithItems::FindString
@@ -7368,7 +7401,7 @@ case wxControlWithItems_getClientData: { // wxControlWithItems::GetClientObject
  wxControlWithItems *This = (wxControlWithItems *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxeErlTerm * Result = (wxeErlTerm*)This->GetClientObject((int) *n);
+ wxeErlTerm * Result = (wxeErlTerm*)This->GetClientObject(*n);
  rt.addExt2Term(Result);
  break;
 }
@@ -7377,7 +7410,7 @@ case wxControlWithItems_setClientData: { // wxControlWithItems::SetClientObject
  unsigned int * n = (unsigned int *) bp; bp += 4;
  wxeErlTerm * clientData =  new wxeErlTerm(Ecmd.bin[0]);
  if(!This) throw wxe_badarg(0);
- This->SetClientObject((int) *n,clientData);
+ This->SetClientObject(*n,clientData);
  break;
 }
 case wxControlWithItems_GetCount: { // wxControlWithItems::GetCount
@@ -7398,7 +7431,7 @@ case wxControlWithItems_GetString: { // wxControlWithItems::GetString
  wxControlWithItems *This = (wxControlWithItems *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetString((int) *n);
+ wxString Result = This->GetString(*n);
  rt.add(Result);
  break;
 }
@@ -7416,7 +7449,7 @@ case wxControlWithItems_Insert_2: { // wxControlWithItems::Insert
  bp += *itemLen+((8-((0+ *itemLen) & 7)) & 7);
  unsigned int * pos = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->Insert(item,(int) *pos);
+ int Result = This->Insert(item,*pos);
  rt.addInt(Result);
  break;
 }
@@ -7428,7 +7461,7 @@ case wxControlWithItems_Insert_3: { // wxControlWithItems::Insert
  unsigned int * pos = (unsigned int *) bp; bp += 4;
  wxeErlTerm * clientData =  new wxeErlTerm(Ecmd.bin[0]);
  if(!This) throw wxe_badarg(0);
- int Result = This->Insert(item,(int) *pos,clientData);
+ int Result = This->Insert(item,*pos,clientData);
  rt.addInt(Result);
  break;
 }
@@ -7443,14 +7476,14 @@ case wxControlWithItems_Select: { // wxControlWithItems::Select
  wxControlWithItems *This = (wxControlWithItems *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Select((int) *n);
+ This->Select(*n);
  break;
 }
 case wxControlWithItems_SetSelection: { // wxControlWithItems::SetSelection
  wxControlWithItems *This = (wxControlWithItems *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((int) *n);
+ This->SetSelection(*n);
  break;
 }
 case wxControlWithItems_SetString: { // wxControlWithItems::SetString
@@ -7460,7 +7493,7 @@ case wxControlWithItems_SetString: { // wxControlWithItems::SetString
  wxString s = wxString(bp, wxConvUTF8);
  bp += *sLen+((8-((4+ *sLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetString((int) *n,s);
+ This->SetString(*n,s);
  break;
 }
 case wxControlWithItems_SetStringSelection: { // wxControlWithItems::SetStringSelection
@@ -7519,7 +7552,7 @@ kind = *(wxItemKind *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Append((int) *itemid,text,help,(wxItemKind) kind);
+ wxMenuItem * Result = (wxMenuItem*)This->Append(*itemid,text,help,kind);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7542,7 +7575,7 @@ case wxMenu_Append_4_0: { // wxMenu::Append
  bp += *helpLen+((8-((4+ *helpLen) & 7)) & 7);
  bool * isCheckable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Append((int) *itemid,text,help,(bool) *isCheckable);
+ This->Append(*itemid,text,help,*isCheckable);
  break;
 }
 case wxMenu_Append_4_1: { // wxMenu::Append
@@ -7562,7 +7595,7 @@ case wxMenu_Append_4_1: { // wxMenu::Append
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Append((int) *itemid,text,submenu,help);
+ wxMenuItem * Result = (wxMenuItem*)This->Append(*itemid,text,submenu,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7581,7 +7614,7 @@ case wxMenu_AppendCheckItem: { // wxMenu::AppendCheckItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->AppendCheckItem((int) *itemid,text,help);
+ wxMenuItem * Result = (wxMenuItem*)This->AppendCheckItem(*itemid,text,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7600,7 +7633,7 @@ case wxMenu_AppendRadioItem: { // wxMenu::AppendRadioItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->AppendRadioItem((int) *itemid,text,help);
+ wxMenuItem * Result = (wxMenuItem*)This->AppendRadioItem(*itemid,text,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7622,14 +7655,14 @@ case wxMenu_Check: { // wxMenu::Check
  int * itemid = (int *) bp; bp += 4;
  bool * check = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Check((int) *itemid,(bool) *check);
+ This->Check(*itemid,*check);
  break;
 }
 case wxMenu_Delete_1_0: { // wxMenu::Delete
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Delete((int) *itemid);
+ bool Result = This->Delete(*itemid);
  rt.addBool(Result);
  break;
 }
@@ -7645,7 +7678,7 @@ case wxMenu_Destroy_1_0: { // wxMenu::Destroy
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Destroy((int) *itemid);
+ bool Result = This->Destroy(*itemid);
  rt.addBool(Result);
  break;
 }
@@ -7662,7 +7695,7 @@ case wxMenu_Enable: { // wxMenu::Enable
  int * itemid = (int *) bp; bp += 4;
  bool * enable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Enable((int) *itemid,(bool) *enable);
+ This->Enable(*itemid,*enable);
  break;
 }
 case wxMenu_FindItem_1: { // wxMenu::FindItem
@@ -7680,7 +7713,7 @@ case wxMenu_FindItem_2: { // wxMenu::FindItem
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->FindItem((int) *itemid,menu);
+ wxMenuItem * Result = (wxMenuItem*)This->FindItem(*itemid,menu);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7688,7 +7721,7 @@ case wxMenu_FindItemByPosition: { // wxMenu::FindItemByPosition
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * position = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->FindItemByPosition((size_t) *position);
+ wxMenuItem * Result = (wxMenuItem*)This->FindItemByPosition(*position);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7696,7 +7729,7 @@ case wxMenu_GetHelpString: { // wxMenu::GetHelpString
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetHelpString((int) *itemid);
+ wxString Result = This->GetHelpString(*itemid);
  rt.add(Result);
  break;
 }
@@ -7704,7 +7737,7 @@ case wxMenu_GetLabel: { // wxMenu::GetLabel
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetLabel((int) *itemid);
+ wxString Result = This->GetLabel(*itemid);
  rt.add(Result);
  break;
 }
@@ -7738,7 +7771,7 @@ case wxMenu_Insert_2: { // wxMenu::Insert
  int * pos = (int *) bp; bp += 4;
  wxMenuItem *item = (wxMenuItem *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Insert((size_t) *pos,item);
+ wxMenuItem * Result = (wxMenuItem*)This->Insert(*pos,item);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7766,7 +7799,7 @@ kind = *(wxItemKind *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Insert((size_t) *pos,(int) *itemid,text,help,(wxItemKind) kind);
+ wxMenuItem * Result = (wxMenuItem*)This->Insert(*pos,*itemid,text,help,kind);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7788,7 +7821,7 @@ case wxMenu_Insert_5_1: { // wxMenu::Insert
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Insert((size_t) *pos,(int) *itemid,text,submenu,help);
+ wxMenuItem * Result = (wxMenuItem*)This->Insert(*pos,*itemid,text,submenu,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7804,7 +7837,7 @@ case wxMenu_Insert_5_0: { // wxMenu::Insert
  bp += *helpLen+((8-((4+ *helpLen) & 7)) & 7);
  bool * isCheckable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Insert((size_t) *pos,(int) *itemid,text,help,(bool) *isCheckable);
+ This->Insert(*pos,*itemid,text,help,*isCheckable);
  break;
 }
 case wxMenu_InsertCheckItem: { // wxMenu::InsertCheckItem
@@ -7823,7 +7856,7 @@ case wxMenu_InsertCheckItem: { // wxMenu::InsertCheckItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->InsertCheckItem((size_t) *pos,(int) *itemid,text,help);
+ wxMenuItem * Result = (wxMenuItem*)This->InsertCheckItem(*pos,*itemid,text,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7843,7 +7876,7 @@ case wxMenu_InsertRadioItem: { // wxMenu::InsertRadioItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->InsertRadioItem((size_t) *pos,(int) *itemid,text,help);
+ wxMenuItem * Result = (wxMenuItem*)This->InsertRadioItem(*pos,*itemid,text,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7851,7 +7884,7 @@ case wxMenu_InsertSeparator: { // wxMenu::InsertSeparator
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->InsertSeparator((size_t) *pos);
+ wxMenuItem * Result = (wxMenuItem*)This->InsertSeparator(*pos);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7859,7 +7892,7 @@ case wxMenu_IsChecked: { // wxMenu::IsChecked
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsChecked((int) *itemid);
+ bool Result = This->IsChecked(*itemid);
  rt.addBool(Result);
  break;
 }
@@ -7867,7 +7900,7 @@ case wxMenu_IsEnabled: { // wxMenu::IsEnabled
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsEnabled((int) *itemid);
+ bool Result = This->IsEnabled(*itemid);
  rt.addBool(Result);
  break;
 }
@@ -7901,7 +7934,7 @@ kind = *(wxItemKind *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Prepend((int) *itemid,text,help,(wxItemKind) kind);
+ wxMenuItem * Result = (wxMenuItem*)This->Prepend(*itemid,text,help,kind);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7922,7 +7955,7 @@ case wxMenu_Prepend_4_1: { // wxMenu::Prepend
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Prepend((int) *itemid,text,submenu,help);
+ wxMenuItem * Result = (wxMenuItem*)This->Prepend(*itemid,text,submenu,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7937,7 +7970,7 @@ case wxMenu_Prepend_4_0: { // wxMenu::Prepend
  bp += *helpLen+((8-((4+ *helpLen) & 7)) & 7);
  bool * isCheckable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Prepend((int) *itemid,text,help,(bool) *isCheckable);
+ This->Prepend(*itemid,text,help,*isCheckable);
  break;
 }
 case wxMenu_PrependCheckItem: { // wxMenu::PrependCheckItem
@@ -7955,7 +7988,7 @@ case wxMenu_PrependCheckItem: { // wxMenu::PrependCheckItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->PrependCheckItem((int) *itemid,text,help);
+ wxMenuItem * Result = (wxMenuItem*)This->PrependCheckItem(*itemid,text,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7974,7 +8007,7 @@ case wxMenu_PrependRadioItem: { // wxMenu::PrependRadioItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->PrependRadioItem((int) *itemid,text,help);
+ wxMenuItem * Result = (wxMenuItem*)This->PrependRadioItem(*itemid,text,help);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -7989,7 +8022,7 @@ case wxMenu_Remove_1_0: { // wxMenu::Remove
  wxMenu *This = (wxMenu *) getPtr(bp,memenv); bp += 4;
  int * itemid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMenuItem * Result = (wxMenuItem*)This->Remove((int) *itemid);
+ wxMenuItem * Result = (wxMenuItem*)This->Remove(*itemid);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
 }
@@ -8008,7 +8041,7 @@ case wxMenu_SetHelpString: { // wxMenu::SetHelpString
  wxString helpString = wxString(bp, wxConvUTF8);
  bp += *helpStringLen+((8-((4+ *helpStringLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetHelpString((int) *itemid,helpString);
+ This->SetHelpString(*itemid,helpString);
  break;
 }
 case wxMenu_SetLabel: { // wxMenu::SetLabel
@@ -8018,7 +8051,7 @@ case wxMenu_SetLabel: { // wxMenu::SetLabel
  wxString label = wxString(bp, wxConvUTF8);
  bp += *labelLen+((8-((4+ *labelLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetLabel((int) *itemid,label);
+ This->SetLabel(*itemid,label);
  break;
 }
 case wxMenu_SetTitle: { // wxMenu::SetTitle
@@ -8061,7 +8094,7 @@ kind = *(wxItemKind *) bp; bp += 4;;
 subMenu = (wxMenu *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxMenuItem * Result = new EwxMenuItem(parentMenu,id,text,help,(wxItemKind) kind,subMenu);
+ wxMenuItem * Result = new EwxMenuItem(parentMenu,id,text,help,kind,subMenu);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxMenuItem");
  break;
@@ -8276,7 +8309,7 @@ data = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool((int) *toolid,label,*bitmap,*bmpDisabled,(wxItemKind) kind,shortHelp,longHelp,data);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool(*toolid,label,*bitmap,*bmpDisabled,kind,shortHelp,longHelp,data);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8301,7 +8334,7 @@ kind = *(wxItemKind *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool((int) *toolid,label,*bitmap,shortHelp,(wxItemKind) kind);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool(*toolid,label,*bitmap,shortHelp,kind);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8341,7 +8374,7 @@ clientData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool((int) *toolid,*bitmap,*bmpDisabled,toggle,clientData,shortHelpString,longHelpString);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool(*toolid,*bitmap,*bmpDisabled,toggle,clientData,shortHelpString,longHelpString);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8365,7 +8398,7 @@ case wxToolBar_AddTool_3: { // wxToolBar::AddTool
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool((int) *toolid,*bitmap,shortHelpString,longHelpString);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool(*toolid,*bitmap,shortHelpString,longHelpString);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8399,7 +8432,7 @@ clientData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool((int) *toolid,*bitmap,*bmpDisabled,(bool) *toggle,(wxCoord) *xPos,yPos,clientData,shortHelp,longHelp);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddTool(*toolid,*bitmap,*bmpDisabled,*toggle,*xPos,yPos,clientData,shortHelp,longHelp);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8434,7 +8467,7 @@ data = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddCheckTool((int) *toolid,label,*bitmap,*bmpDisabled,shortHelp,longHelp,data);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddCheckTool(*toolid,label,*bitmap,*bmpDisabled,shortHelp,longHelp,data);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8469,7 +8502,7 @@ data = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddRadioTool((int) *toolid,label,*bitmap,*bmpDisabled,shortHelp,longHelp,data);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->AddRadioTool(*toolid,label,*bitmap,*bmpDisabled,shortHelp,longHelp,data);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8477,7 +8510,7 @@ case wxToolBar_DeleteTool: { // wxToolBar::DeleteTool
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeleteTool((int) *toolid);
+ bool Result = This->DeleteTool(*toolid);
  rt.addBool(Result);
  break;
 }
@@ -8485,7 +8518,7 @@ case wxToolBar_DeleteToolByPos: { // wxToolBar::DeleteToolByPos
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeleteToolByPos((size_t) *pos);
+ bool Result = This->DeleteToolByPos(*pos);
  rt.addBool(Result);
  break;
 }
@@ -8494,14 +8527,14 @@ case wxToolBar_EnableTool: { // wxToolBar::EnableTool
  int * toolid = (int *) bp; bp += 4;
  bool * enable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableTool((int) *toolid,(bool) *enable);
+ This->EnableTool(*toolid,*enable);
  break;
 }
 case wxToolBar_FindById: { // wxToolBar::FindById
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->FindById((int) *toolid);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->FindById(*toolid);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8509,7 +8542,7 @@ case wxToolBar_FindControl: { // wxToolBar::FindControl
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxControl * Result = (wxControl*)This->FindControl((int) *toolid);
+ wxControl * Result = (wxControl*)This->FindControl(*toolid);
  rt.addRef(getRef((void *)Result,memenv), "wxControl");
  break;
 }
@@ -8518,7 +8551,7 @@ case wxToolBar_FindToolForPosition: { // wxToolBar::FindToolForPosition
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->FindToolForPosition((wxCoord) *x,(wxCoord) *y);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->FindToolForPosition(*x,*y);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8547,7 +8580,7 @@ case wxToolBar_GetToolEnabled: { // wxToolBar::GetToolEnabled
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetToolEnabled((int) *toolid);
+ bool Result = This->GetToolEnabled(*toolid);
  rt.addBool(Result);
  break;
 }
@@ -8555,7 +8588,7 @@ case wxToolBar_GetToolLongHelp: { // wxToolBar::GetToolLongHelp
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetToolLongHelp((int) *toolid);
+ wxString Result = This->GetToolLongHelp(*toolid);
  rt.add(Result);
  break;
 }
@@ -8570,7 +8603,7 @@ case wxToolBar_GetToolPos: { // wxToolBar::GetToolPos
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * id = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetToolPos((int) *id);
+ int Result = This->GetToolPos(*id);
  rt.addInt(Result);
  break;
 }
@@ -8585,7 +8618,7 @@ case wxToolBar_GetToolShortHelp: { // wxToolBar::GetToolShortHelp
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetToolShortHelp((int) *toolid);
+ wxString Result = This->GetToolShortHelp(*toolid);
  rt.add(Result);
  break;
 }
@@ -8593,7 +8626,7 @@ case wxToolBar_GetToolState: { // wxToolBar::GetToolState
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetToolState((int) *toolid);
+ bool Result = This->GetToolState(*toolid);
  rt.addBool(Result);
  break;
 }
@@ -8602,7 +8635,7 @@ case wxToolBar_InsertControl: { // wxToolBar::InsertControl
  int * pos = (int *) bp; bp += 4;
  wxControl *control = (wxControl *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertControl((size_t) *pos,control);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertControl(*pos,control);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8610,7 +8643,7 @@ case wxToolBar_InsertSeparator: { // wxToolBar::InsertSeparator
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertSeparator((size_t) *pos);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertSeparator(*pos);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8650,7 +8683,7 @@ clientData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertTool((size_t) *pos,(int) *toolid,label,*bitmap,*bmpDisabled,(wxItemKind) kind,shortHelp,longHelp,clientData);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertTool(*pos,*toolid,label,*bitmap,*bmpDisabled,kind,shortHelp,longHelp,clientData);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8659,7 +8692,7 @@ case wxToolBar_InsertTool_2: { // wxToolBar::InsertTool
  int * pos = (int *) bp; bp += 4;
  wxToolBarToolBase *tool = (wxToolBarToolBase *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertTool((size_t) *pos,tool);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertTool(*pos,tool);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8695,7 +8728,7 @@ clientData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertTool((size_t) *pos,(int) *toolid,*bitmap,*bmpDisabled,toggle,clientData,shortHelp,longHelp);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->InsertTool(*pos,*toolid,*bitmap,*bmpDisabled,toggle,clientData,shortHelp,longHelp);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8710,7 +8743,7 @@ case wxToolBar_RemoveTool: { // wxToolBar::RemoveTool
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * toolid = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxToolBarToolBase * Result = (wxToolBarToolBase*)This->RemoveTool((int) *toolid);
+ wxToolBarToolBase * Result = (wxToolBarToolBase*)This->RemoveTool(*toolid);
  rt.addRef(getRef((void *)Result,memenv), "wx");
  break;
 }
@@ -8719,7 +8752,7 @@ case wxToolBar_SetMargins: { // wxToolBar::SetMargins
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMargins((int) *x,(int) *y);
+ This->SetMargins(*x,*y);
  break;
 }
 case wxToolBar_SetToolBitmapSize: { // wxToolBar::SetToolBitmapSize
@@ -8738,14 +8771,14 @@ case wxToolBar_SetToolLongHelp: { // wxToolBar::SetToolLongHelp
  wxString helpString = wxString(bp, wxConvUTF8);
  bp += *helpStringLen+((8-((4+ *helpStringLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetToolLongHelp((int) *toolid,helpString);
+ This->SetToolLongHelp(*toolid,helpString);
  break;
 }
 case wxToolBar_SetToolPacking: { // wxToolBar::SetToolPacking
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * packing = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetToolPacking((int) *packing);
+ This->SetToolPacking(*packing);
  break;
 }
 case wxToolBar_SetToolShortHelp: { // wxToolBar::SetToolShortHelp
@@ -8755,14 +8788,14 @@ case wxToolBar_SetToolShortHelp: { // wxToolBar::SetToolShortHelp
  wxString helpString = wxString(bp, wxConvUTF8);
  bp += *helpStringLen+((8-((4+ *helpStringLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetToolShortHelp((int) *id,helpString);
+ This->SetToolShortHelp(*id,helpString);
  break;
 }
 case wxToolBar_SetToolSeparation: { // wxToolBar::SetToolSeparation
  wxToolBar *This = (wxToolBar *) getPtr(bp,memenv); bp += 4;
  int * separation = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetToolSeparation((int) *separation);
+ This->SetToolSeparation(*separation);
  break;
 }
 case wxToolBar_ToggleTool: { // wxToolBar::ToggleTool
@@ -8770,7 +8803,7 @@ case wxToolBar_ToggleTool: { // wxToolBar::ToggleTool
  int * toolid = (int *) bp; bp += 4;
  bool * toggle = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ToggleTool((int) *toolid,(bool) *toggle);
+ This->ToggleTool(*toolid,*toggle);
  break;
 }
 case wxStatusBar_new_0: { // wxStatusBar::wxStatusBar
@@ -8824,7 +8857,7 @@ case wxStatusBar_GetFieldRect: { // wxStatusBar::GetFieldRect
  int * rectH = (int *) bp; bp += 4;
  wxRect rect = wxRect(*rectX,*rectY,*rectW,*rectH);
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetFieldRect((int) *i,rect);
+ bool Result = This->GetFieldRect(*i,rect);
  rt.addBool(Result);
  break;
 }
@@ -8889,14 +8922,14 @@ case wxStatusBar_SetFieldsCount: { // wxStatusBar::SetFieldsCount
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetFieldsCount((int) *number,widths);
+ This->SetFieldsCount(*number,widths);
  break;
 }
 case wxStatusBar_SetMinHeight: { // wxStatusBar::SetMinHeight
  wxStatusBar *This = (wxStatusBar *) getPtr(bp,memenv); bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMinHeight((int) *height);
+ This->SetMinHeight(*height);
  break;
 }
 case wxStatusBar_SetStatusText: { // wxStatusBar::SetStatusText
@@ -8945,7 +8978,7 @@ case wxBitmap_new_3: { // wxBitmap::wxBitmap
  depth = (int)*(int *) bp; bp += 4;
   } break;
  }};
- wxBitmap * Result = new EwxBitmap((int) *width,(int) *height,depth);
+ wxBitmap * Result = new EwxBitmap(*width,*height,depth);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
@@ -8960,7 +8993,7 @@ case wxBitmap_new_4: { // wxBitmap::wxBitmap
  depth = (int)*(int *) bp; bp += 4;
   } break;
  }};
- wxBitmap * Result = new EwxBitmap(bits,(int) *width,(int) *height,depth);
+ wxBitmap * Result = new EwxBitmap(bits,*width,*height,depth);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
@@ -8975,7 +9008,7 @@ case wxBitmap_new_2_0: { // wxBitmap::wxBitmap
 type = *(wxBitmapType *) bp; bp += 4;;
   } break;
  }};
- wxBitmap * Result = new EwxBitmap(filename,(wxBitmapType) type);
+ wxBitmap * Result = new EwxBitmap(filename,type);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
@@ -9021,7 +9054,7 @@ case wxBitmap_Create: { // wxBitmap::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create((int) *width,(int) *height,depth);
+ bool Result = This->Create(*width,*height,depth);
  rt.addBool(Result);
  break;
 }
@@ -9084,7 +9117,7 @@ type = *(wxBitmapType *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->LoadFile(name,(wxBitmapType) type);
+ bool Result = This->LoadFile(name,type);
  rt.addBool(Result);
  break;
 }
@@ -9109,7 +9142,7 @@ palette = (wxPalette *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->SaveFile(name,(wxBitmapType) type,palette);
+ bool Result = This->SaveFile(name,type,palette);
  rt.addBool(Result);
  break;
 }
@@ -9117,14 +9150,14 @@ case wxBitmap_SetDepth: { // wxBitmap::SetDepth
  wxBitmap *This = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  int * depth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetDepth((int) *depth);
+ This->SetDepth(*depth);
  break;
 }
 case wxBitmap_SetHeight: { // wxBitmap::SetHeight
  wxBitmap *This = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetHeight((int) *height);
+ This->SetHeight(*height);
  break;
 }
 case wxBitmap_SetMask: { // wxBitmap::SetMask
@@ -9145,7 +9178,7 @@ case wxBitmap_SetWidth: { // wxBitmap::SetWidth
  wxBitmap *This = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWidth((int) *width);
+ This->SetWidth(*width);
  break;
 }
 case wxIcon_new_0: { // wxIcon::wxIcon
@@ -9172,7 +9205,7 @@ type = *(wxBitmapType *) bp; bp += 4;;
  desiredHeight = (int)*(int *) bp; bp += 4;
   } break;
  }};
- wxIcon * Result = new EwxIcon(filename,(wxBitmapType) type,desiredWidth,desiredHeight);
+ wxIcon * Result = new EwxIcon(filename,type,desiredWidth,desiredHeight);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
@@ -9202,7 +9235,7 @@ case wxIconBundle_new_2: { // wxIconBundle::wxIconBundle
  wxString file = wxString(bp, wxConvUTF8);
  bp += *fileLen+((8-((4+ *fileLen) & 7)) & 7);
  int * type = (int *) bp; bp += 4;
- wxIconBundle * Result = new wxIconBundle(file,(long) *type);
+ wxIconBundle * Result = new wxIconBundle(file,*type);
  newPtr((void *) Result, 61, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxIconBundle");
  break;
@@ -9234,7 +9267,7 @@ case wxIconBundle_AddIcon_2: { // wxIconBundle::AddIcon
  bp += *fileLen+((8-((0+ *fileLen) & 7)) & 7);
  int * type = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AddIcon(file,(long) *type);
+ This->AddIcon(file,*type);
  break;
 }
 case wxIconBundle_AddIcon_1: { // wxIconBundle::AddIcon
@@ -9250,7 +9283,7 @@ case wxIconBundle_GetIcon_1_1: { // wxIconBundle::GetIcon
  int * sizeH = (int *) bp; bp += 4;
  wxSize size = wxSize(*sizeW,*sizeH);
  if(!This) throw wxe_badarg(0);
- const wxIcon * Result = &This->GetIcon(size);
+ const wxIcon * Result = new wxIcon(This->GetIcon(size)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
 }
@@ -9264,7 +9297,7 @@ case wxIconBundle_GetIcon_1_0: { // wxIconBundle::GetIcon
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- const wxIcon * Result = &This->GetIcon(size);
+ const wxIcon * Result = new wxIcon(This->GetIcon(size)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
 }
@@ -9276,7 +9309,7 @@ case wxCursor_new_0: { // wxCursor::wxCursor
 }
 case wxCursor_new_1_0: { // wxCursor::wxCursor
  int * cursorId = (int *) bp; bp += 4;
- wxCursor * Result = new EwxCursor((int) *cursorId);
+ wxCursor * Result = new EwxCursor(*cursorId);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCursor");
  break;
@@ -9288,6 +9321,7 @@ case wxCursor_new_1_1: { // wxCursor::wxCursor
  rt.addRef(getRef((void *)Result,memenv), "wxCursor");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxCursor_new_4: { // wxCursor::wxCursor
  int hotSpotX=-1;
  int hotSpotY=-1;
@@ -9302,11 +9336,12 @@ case wxCursor_new_4: { // wxCursor::wxCursor
  hotSpotY = (int)*(int *) bp; bp += 4;
   } break;
  }};
- wxCursor * Result = new EwxCursor(bits,(int) *width,(int) *height,hotSpotX,hotSpotY);
+ wxCursor * Result = new EwxCursor(bits,*width,*height,hotSpotX,hotSpotY);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCursor");
  break;
 }
+#endif
 case wxCursor_Ok: { // wxCursor::Ok
  wxCursor *This = (wxCursor *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
@@ -9335,7 +9370,7 @@ case wxMask_new_2_1: { // wxMask::wxMask
 case wxMask_new_2_0: { // wxMask::wxMask
  wxBitmap *bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  int * paletteIndex = (int *) bp; bp += 4;
- wxMask * Result = new EwxMask(*bitmap,(int) *paletteIndex);
+ wxMask * Result = new EwxMask(*bitmap,*paletteIndex);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxMask");
  break;
@@ -9365,7 +9400,7 @@ case wxMask_Create_2_0: { // wxMask::Create
  wxBitmap *bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  int * paletteIndex = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(*bitmap,(int) *paletteIndex);
+ bool Result = This->Create(*bitmap,*paletteIndex);
  rt.addBool(Result);
  break;
 }
@@ -9392,7 +9427,7 @@ case wxImage_new_3_0: { // wxImage::wxImage
  clear = *(bool *) bp; bp += 4;
   } break;
  }};
- wxImage * Result = new EwxImage((int) *width,(int) *height,clear);
+ wxImage * Result = new EwxImage(*width,*height,clear);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
@@ -9408,7 +9443,7 @@ case wxImage_new_4: { // wxImage::wxImage
   } break;
  }};
  if(!static_data) {data = (unsigned char *) malloc(Ecmd.bin[0]->size);memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);};
- wxImage * Result = new EwxImage((int) *width,(int) *height,data,static_data);
+ wxImage * Result = new EwxImage(*width,*height,data,static_data);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
@@ -9425,7 +9460,7 @@ case wxImage_new_5: { // wxImage::wxImage
   } break;
  }};
  if(!static_data) { data = (unsigned char *) malloc(Ecmd.bin[0]->size); alpha = (unsigned char *) malloc(Ecmd.bin[1]->size); memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size); memcpy(alpha,Ecmd.bin[1]->base,Ecmd.bin[1]->size);};
- wxImage * Result = new EwxImage((int) *width,(int) *height,data,alpha,static_data);
+ wxImage * Result = new EwxImage(*width,*height,data,alpha,static_data);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
@@ -9471,7 +9506,7 @@ case wxImage_Blur: { // wxImage::Blur
  wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4;
  int * radius = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->Blur((int) *radius)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new wxImage(This->Blur(*radius)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9479,7 +9514,7 @@ case wxImage_BlurHorizontal: { // wxImage::BlurHorizontal
  wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4;
  int * radius = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->BlurHorizontal((int) *radius)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new wxImage(This->BlurHorizontal(*radius)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9487,7 +9522,7 @@ case wxImage_BlurVertical: { // wxImage::BlurVertical
  wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4;
  int * radius = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->BlurVertical((int) *radius)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new wxImage(This->BlurVertical(*radius)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9536,7 +9571,7 @@ case wxImage_ConvertToMono: { // wxImage::ConvertToMono
  unsigned int * g = (unsigned int *) bp; bp += 4;
  unsigned int * b = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->ConvertToMono((char) *r,(char) *g,(char) *b)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new wxImage(This->ConvertToMono(*r,*g,*b)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9559,7 +9594,7 @@ case wxImage_Create_3: { // wxImage::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create((int) *width,(int) *height,clear);
+ bool Result = This->Create(*width,*height,clear);
  rt.addBool(Result);
  break;
 }
@@ -9577,7 +9612,7 @@ case wxImage_Create_4: { // wxImage::Create
  }};
  if(!static_data) {data = (unsigned char *) malloc(Ecmd.bin[0]->size);memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create((int) *width,(int) *height,data,static_data);
+ bool Result = This->Create(*width,*height,data,static_data);
  rt.addBool(Result);
  break;
 }
@@ -9596,7 +9631,7 @@ case wxImage_Create_5: { // wxImage::Create
  }};
  if(!static_data) { data =  (unsigned char *) malloc(Ecmd.bin[0]->size); alpha = (unsigned char *) malloc(Ecmd.bin[1]->size); memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size); memcpy(alpha,Ecmd.bin[1]->base,Ecmd.bin[1]->size);};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create((int) *width,(int) *height,data,alpha,static_data);
+ bool Result = This->Create(*width,*height,data,alpha,static_data);
  rt.addBool(Result);
  break;
 }
@@ -9645,7 +9680,7 @@ case wxImage_GetAlpha_2: { // wxImage::GetAlpha
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- char Result = This->GetAlpha((int) *x,(int) *y);
+ char Result = This->GetAlpha(*x,*y);
  rt.addUint(Result);
  break;
 }
@@ -9663,7 +9698,7 @@ case wxImage_GetBlue: { // wxImage::GetBlue
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- char Result = This->GetBlue((int) *x,(int) *y);
+ char Result = This->GetBlue(*x,*y);
  rt.addUint(Result);
  break;
 }
@@ -9681,18 +9716,18 @@ case wxImage_GetGreen: { // wxImage::GetGreen
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- char Result = This->GetGreen((int) *x,(int) *y);
+ char Result = This->GetGreen(*x,*y);
  rt.addUint(Result);
  break;
 }
 case wxImage_GetImageCount: { // wxImage::GetImageCount
- long type=wxBITMAP_TYPE_ANY;
+ wxBitmapType type=wxBITMAP_TYPE_ANY;
  int * nameLen = (int *) bp; bp += 4;
  wxString name = wxString(bp, wxConvUTF8);
  bp += *nameLen+((8-((4+ *nameLen) & 7)) & 7);
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- type = (long)*(int *) bp; bp += 4;
+type = *(wxBitmapType *) bp; bp += 4;;
   } break;
  }};
  int Result = wxImage::GetImageCount(name,type);
@@ -9753,7 +9788,7 @@ case wxImage_GetRed: { // wxImage::GetRed
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- char Result = This->GetRed((int) *x,(int) *y);
+ char Result = This->GetRed(*x,*y);
  rt.addUint(Result);
  break;
 }
@@ -9842,7 +9877,7 @@ case wxImage_IsTransparent: { // wxImage::IsTransparent
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsTransparent((int) *x,(int) *y,threshold);
+ bool Result = This->IsTransparent(*x,*y,threshold);
  rt.addBool(Result);
  break;
 }
@@ -9923,22 +9958,22 @@ case wxImage_Replace: { // wxImage::Replace
  unsigned int * g2 = (unsigned int *) bp; bp += 4;
  unsigned int * b2 = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Replace((char) *r1,(char) *g1,(char) *b1,(char) *r2,(char) *g2,(char) *b2);
+ This->Replace(*r1,*g1,*b1,*r2,*g2,*b2);
  break;
 }
 case wxImage_Rescale: { // wxImage::Rescale
- int quality=wxIMAGE_QUALITY_NORMAL;
+ wxImageResizeQuality quality=wxIMAGE_QUALITY_NORMAL;
  wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  bp += 4; /* Align */
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- quality = (int)*(int *) bp; bp += 4;
+quality = *(wxImageResizeQuality *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxImage * Result = &This->Rescale((int) *width,(int) *height,quality);
+ wxImage * Result = &This->Rescale(*width,*height,quality);
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9991,7 +10026,7 @@ case wxImage_Rotate: { // wxImage::Rotate
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->Rotate((double) *angle,centre_of_rotation,interpolating,offset_after_rotation)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new wxImage(This->Rotate(*angle,centre_of_rotation,interpolating,offset_after_rotation)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -10000,7 +10035,7 @@ case wxImage_RotateHue: { // wxImage::RotateHue
  bp += 4; /* Align */
  double * angle = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->RotateHue((double) *angle);
+ This->RotateHue(*angle);
  break;
 }
 case wxImage_Rotate90: { // wxImage::Rotate90
@@ -10034,7 +10069,7 @@ case wxImage_SaveFile_2_0: { // wxImage::SaveFile
  bp += *nameLen+((8-((0+ *nameLen) & 7)) & 7);
  int * type = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SaveFile(name,(int) *type);
+ bool Result = This->SaveFile(name,*type);
  rt.addBool(Result);
  break;
 }
@@ -10052,18 +10087,18 @@ case wxImage_SaveFile_2_1: { // wxImage::SaveFile
  break;
 }
 case wxImage_Scale: { // wxImage::Scale
- int quality=wxIMAGE_QUALITY_NORMAL;
+ wxImageResizeQuality quality=wxIMAGE_QUALITY_NORMAL;
  wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  bp += 4; /* Align */
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
- quality = (int)*(int *) bp; bp += 4;
+quality = *(wxImageResizeQuality *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->Scale((int) *width,(int) *height,quality)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new wxImage(This->Scale(*width,*height,quality)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -10101,7 +10136,7 @@ case wxImage_SetAlpha_3: { // wxImage::SetAlpha
  int * y = (int *) bp; bp += 4;
  unsigned int * alpha = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAlpha((int) *x,(int) *y,(char) *alpha);
+ This->SetAlpha(*x,*y,*alpha);
  break;
 }
 case wxImage_SetAlpha_2: { // wxImage::SetAlpha
@@ -10148,7 +10183,7 @@ case wxImage_SetData_4: { // wxImage::SetData
  }};
  if(!static_data) {data = (unsigned char *) malloc(Ecmd.bin[0]->size);memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);};
  if(!This) throw wxe_badarg(0);
- This->SetData(data,(int) *new_width,(int) *new_height,static_data);
+ This->SetData(data,*new_width,*new_height,static_data);
  break;
 }
 case wxImage_SetMask: { // wxImage::SetMask
@@ -10170,7 +10205,7 @@ case wxImage_SetMaskColour: { // wxImage::SetMaskColour
  unsigned int * g = (unsigned int *) bp; bp += 4;
  unsigned int * b = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMaskColour((char) *r,(char) *g,(char) *b);
+ This->SetMaskColour(*r,*g,*b);
  break;
 }
 case wxImage_SetMaskFromImage: { // wxImage::SetMaskFromImage
@@ -10180,7 +10215,7 @@ case wxImage_SetMaskFromImage: { // wxImage::SetMaskFromImage
  unsigned int * mg = (unsigned int *) bp; bp += 4;
  unsigned int * mb = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetMaskFromImage(*mask,(char) *mr,(char) *mg,(char) *mb);
+ bool Result = This->SetMaskFromImage(*mask,*mr,*mg,*mb);
  rt.addBool(Result);
  break;
 }
@@ -10203,7 +10238,7 @@ case wxImage_SetOption_2_0: { // wxImage::SetOption
  bp += *nameLen+((8-((0+ *nameLen) & 7)) & 7);
  int * value = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetOption(name,(int) *value);
+ This->SetOption(name,*value);
  break;
 }
 case wxImage_SetPalette: { // wxImage::SetPalette
@@ -10221,7 +10256,7 @@ case wxImage_SetRGB_5: { // wxImage::SetRGB
  unsigned int * g = (unsigned int *) bp; bp += 4;
  unsigned int * b = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRGB((int) *x,(int) *y,(char) *r,(char) *g,(char) *b);
+ This->SetRGB(*x,*y,*r,*g,*b);
  break;
 }
 case wxImage_SetRGB_4: { // wxImage::SetRGB
@@ -10235,7 +10270,7 @@ case wxImage_SetRGB_4: { // wxImage::SetRGB
  unsigned int * g = (unsigned int *) bp; bp += 4;
  unsigned int * b = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRGB(rect,(char) *r,(char) *g,(char) *b);
+ This->SetRGB(rect,*r,*g,*b);
  break;
 }
 case wxBrush_new_0: { // wxBrush::wxBrush
@@ -10271,8 +10306,8 @@ case wxBrush_new_1: { // wxBrush::wxBrush
 case wxBrush_GetColour: { // wxBrush::GetColour
  wxBrush *This = (wxBrush *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour * Result = &This->GetColour();
- rt.add((*Result));
+ wxColour Result = This->GetColour();
+ rt.add(Result);
  break;
 }
 case wxBrush_GetStipple: { // wxBrush::GetStipple
@@ -10320,7 +10355,7 @@ case wxBrush_SetColour_3: { // wxBrush::SetColour
  unsigned int * g = (unsigned int *) bp; bp += 4;
  unsigned int * b = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColour((char) *r,(char) *g,(char) *b);
+ This->SetColour(*r,*g,*b);
  break;
 }
 case wxBrush_SetStipple: { // wxBrush::SetStipple
@@ -10334,7 +10369,7 @@ case wxBrush_SetStyle: { // wxBrush::SetStyle
  wxBrush *This = (wxBrush *) getPtr(bp,memenv); bp += 4;
  int * style = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetStyle((int) *style);
+ This->SetStyle(*style);
  break;
 }
 case wxPen_new_0: { // wxPen::wxPen
@@ -10374,8 +10409,8 @@ case wxPen_GetCap: { // wxPen::GetCap
 case wxPen_GetColour: { // wxPen::GetColour
  wxPen *This = (wxPen *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour * Result = &This->GetColour();
- rt.add((*Result));
+ wxColour Result = This->GetColour();
+ rt.add(Result);
  break;
 }
 case wxPen_GetJoin: { // wxPen::GetJoin
@@ -10408,9 +10443,9 @@ case wxPen_IsOk: { // wxPen::IsOk
 }
 case wxPen_SetCap: { // wxPen::SetCap
  wxPen *This = (wxPen *) getPtr(bp,memenv); bp += 4;
- int * capStyle = (int *) bp; bp += 4;
+ wxPenCap capStyle = *(wxPenCap *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetCap((int) *capStyle);
+ This->SetCap(capStyle);
  break;
 }
 case wxPen_SetColour_1: { // wxPen::SetColour
@@ -10430,28 +10465,28 @@ case wxPen_SetColour_3: { // wxPen::SetColour
  unsigned int * green = (unsigned int *) bp; bp += 4;
  unsigned int * blue = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColour((char) *red,(char) *green,(char) *blue);
+ This->SetColour(*red,*green,*blue);
  break;
 }
 case wxPen_SetJoin: { // wxPen::SetJoin
  wxPen *This = (wxPen *) getPtr(bp,memenv); bp += 4;
- int * joinStyle = (int *) bp; bp += 4;
+ wxPenJoin joinStyle = *(wxPenJoin *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetJoin((int) *joinStyle);
+ This->SetJoin(joinStyle);
  break;
 }
 case wxPen_SetStyle: { // wxPen::SetStyle
  wxPen *This = (wxPen *) getPtr(bp,memenv); bp += 4;
  int * style = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetStyle((int) *style);
+ This->SetStyle(*style);
  break;
 }
 case wxPen_SetWidth: { // wxPen::SetWidth
  wxPen *This = (wxPen *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWidth((int) *width);
+ This->SetWidth(*width);
  break;
 }
 case wxRegion_new_0: { // wxRegion::wxRegion
@@ -10465,7 +10500,7 @@ case wxRegion_new_4: { // wxRegion::wxRegion
  int * y = (int *) bp; bp += 4;
  int * w = (int *) bp; bp += 4;
  int * h = (int *) bp; bp += 4;
- wxRegion * Result = new EwxRegion((wxCoord) *x,(wxCoord) *y,(wxCoord) *w,(wxCoord) *h);
+ wxRegion * Result = new EwxRegion(*x,*y,*w,*h);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxRegion");
  break;
@@ -10511,7 +10546,7 @@ case wxRegion_Contains_2: { // wxRegion::Contains
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->Contains((wxCoord) *x,(wxCoord) *y);
+ int Result = This->Contains(*x,*y);
  rt.addInt(Result);
  break;
 }
@@ -10532,7 +10567,7 @@ case wxRegion_Contains_4: { // wxRegion::Contains
  int * w = (int *) bp; bp += 4;
  int * h = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->Contains((wxCoord) *x,(wxCoord) *y,(wxCoord) *w,(wxCoord) *h);
+ int Result = This->Contains(*x,*y,*w,*h);
  rt.addInt(Result);
  break;
 }
@@ -10569,7 +10604,7 @@ case wxRegion_Intersect_4: { // wxRegion::Intersect
  int * w = (int *) bp; bp += 4;
  int * h = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Intersect((wxCoord) *x,(wxCoord) *y,(wxCoord) *w,(wxCoord) *h);
+ bool Result = This->Intersect(*x,*y,*w,*h);
  rt.addBool(Result);
  break;
 }
@@ -10607,7 +10642,7 @@ case wxRegion_Subtract_4: { // wxRegion::Subtract
  int * w = (int *) bp; bp += 4;
  int * h = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Subtract((wxCoord) *x,(wxCoord) *y,(wxCoord) *w,(wxCoord) *h);
+ bool Result = This->Subtract(*x,*y,*w,*h);
  rt.addBool(Result);
  break;
 }
@@ -10636,7 +10671,7 @@ case wxRegion_Offset_2: { // wxRegion::Offset
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Offset((wxCoord) *x,(wxCoord) *y);
+ bool Result = This->Offset(*x,*y);
  rt.addBool(Result);
  break;
 }
@@ -10657,7 +10692,7 @@ case wxRegion_Union_4: { // wxRegion::Union
  int * w = (int *) bp; bp += 4;
  int * h = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Union((wxCoord) *x,(wxCoord) *y,(wxCoord) *w,(wxCoord) *h);
+ bool Result = This->Union(*x,*y,*w,*h);
  rt.addBool(Result);
  break;
 }
@@ -10715,7 +10750,7 @@ case wxRegion_Xor_4: { // wxRegion::Xor
  int * w = (int *) bp; bp += 4;
  int * h = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Xor((wxCoord) *x,(wxCoord) *y,(wxCoord) *w,(wxCoord) *h);
+ bool Result = This->Xor(*x,*y,*w,*h);
  rt.addBool(Result);
  break;
 }
@@ -10751,7 +10786,7 @@ case wxAcceleratorTable_new_2: { // wxAcceleratorTable::wxAcceleratorTable
  wxAcceleratorEntry *entries;
  entries = (wxAcceleratorEntry *) driver_alloc(sizeof(wxAcceleratorEntry) * *entriesLen); for(int i=0; i < *entriesLen; i++) { entries[i] = * (wxAcceleratorEntry *) getPtr(bp,memenv); bp += 4;}
  bp += ((0+ *entriesLen)%2 )*4;
- wxAcceleratorTable * Result = new EwxAcceleratorTable((int) *n,entries);
+ wxAcceleratorTable * Result = new EwxAcceleratorTable(*n,entries);
  newPtr((void *) Result, 1, memenv);
  driver_free(entries);
  rt.addRef(getRef((void *)Result,memenv), "wxAcceleratorTable");
@@ -10828,7 +10863,7 @@ item = (wxMenuItem *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->Set((int) *flags,(int) *keyCode,(int) *cmd,item);
+ This->Set(*flags,*keyCode,*cmd,item);
  break;
 }
 case wxAcceleratorEntry_destroy: { // wxAcceleratorEntry::destroy
@@ -10841,7 +10876,7 @@ case wxCaret_new_3: { // wxCaret::wxCaret
  wxWindow *window = (wxWindow *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
- wxCaret * Result = new EwxCaret(window,(int) *width,(int) *height);
+ wxCaret * Result = new EwxCaret(window,*width,*height);
  newPtr((void *) Result, 70, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCaret");
  break;
@@ -10868,7 +10903,7 @@ case wxCaret_Create_3: { // wxCaret::Create
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(window,(int) *width,(int) *height);
+ bool Result = This->Create(window,*width,*height);
  rt.addBool(Result);
  break;
 }
@@ -10934,7 +10969,7 @@ case wxCaret_Move_2: { // wxCaret::Move
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Move((int) *x,(int) *y);
+ This->Move(*x,*y);
  break;
 }
 case wxCaret_Move_1: { // wxCaret::Move
@@ -10948,7 +10983,7 @@ case wxCaret_Move_1: { // wxCaret::Move
 }
 case wxCaret_SetBlinkTime: { // wxCaret::SetBlinkTime
  int * milliseconds = (int *) bp; bp += 4;
- wxCaret::SetBlinkTime((int) *milliseconds);
+ wxCaret::SetBlinkTime(*milliseconds);
  break;
 }
 case wxCaret_SetSize_2: { // wxCaret::SetSize
@@ -10956,7 +10991,7 @@ case wxCaret_SetSize_2: { // wxCaret::SetSize
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSize((int) *width,(int) *height);
+ This->SetSize(*width,*height);
  break;
 }
 case wxCaret_SetSize_1: { // wxCaret::SetSize
@@ -11057,7 +11092,7 @@ userData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Add((int) *width,(int) *height,proportion,flag,border,userData);
+ wxSizerItem * Result = (wxSizerItem*)This->Add(*width,*height,proportion,flag,border,userData);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11083,7 +11118,7 @@ case wxSizer_AddSpacer: { // wxSizer::AddSpacer
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  int * size = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->AddSpacer((int) *size);
+ wxSizerItem * Result = (wxSizerItem*)This->AddSpacer(*size);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11141,7 +11176,7 @@ case wxSizer_Detach_1_0: { // wxSizer::Detach
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Detach((int) *index);
+ bool Result = This->Detach(*index);
  rt.addBool(Result);
  break;
 }
@@ -11203,7 +11238,7 @@ case wxSizer_GetItem_1: { // wxSizer::GetItem
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->GetItem((size_t) *index);
+ wxSizerItem * Result = (wxSizerItem*)This->GetItem(*index);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11260,7 +11295,7 @@ case wxSizer_Hide_1: { // wxSizer::Hide
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Hide((size_t) *index);
+ bool Result = This->Hide(*index);
  rt.addBool(Result);
  break;
 }
@@ -11288,7 +11323,7 @@ userData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Insert((size_t) *index,window,proportion,flag,border,userData);
+ wxSizerItem * Result = (wxSizerItem*)This->Insert(*index,window,proportion,flag,border,userData);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11316,7 +11351,7 @@ userData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Insert((size_t) *index,sizer,proportion,flag,border,userData);
+ wxSizerItem * Result = (wxSizerItem*)This->Insert(*index,sizer,proportion,flag,border,userData);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11344,7 +11379,7 @@ userData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Insert((size_t) *index,(int) *width,(int) *height,proportion,flag,border,userData);
+ wxSizerItem * Result = (wxSizerItem*)This->Insert(*index,*width,*height,proportion,flag,border,userData);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11354,7 +11389,7 @@ case wxSizer_Insert_3_3: { // wxSizer::Insert
  wxWindow * window = (wxWindow *) getPtr(bp,memenv); bp += 4;
  wxSizerFlags *flags = (wxSizerFlags *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Insert((size_t) *index,window,*flags);
+ wxSizerItem * Result = (wxSizerItem*)This->Insert(*index,window,*flags);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11364,7 +11399,7 @@ case wxSizer_Insert_3_2: { // wxSizer::Insert
  wxSizer *sizer = (wxSizer *) getPtr(bp,memenv); bp += 4;
  wxSizerFlags *flags = (wxSizerFlags *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Insert((size_t) *index,sizer,*flags);
+ wxSizerItem * Result = (wxSizerItem*)This->Insert(*index,sizer,*flags);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11373,7 +11408,7 @@ case wxSizer_Insert_2: { // wxSizer::Insert
  int * index = (int *) bp; bp += 4;
  wxSizerItem *item = (wxSizerItem *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Insert((size_t) *index,item);
+ wxSizerItem * Result = (wxSizerItem*)This->Insert(*index,item);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11382,7 +11417,7 @@ case wxSizer_InsertSpacer: { // wxSizer::InsertSpacer
  int * index = (int *) bp; bp += 4;
  int * size = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->InsertSpacer((size_t) *index,(int) *size);
+ wxSizerItem * Result = (wxSizerItem*)This->InsertSpacer(*index,*size);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11396,7 +11431,7 @@ case wxSizer_InsertStretchSpacer: { // wxSizer::InsertStretchSpacer
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->InsertStretchSpacer((size_t) *index,prop);
+ wxSizerItem * Result = (wxSizerItem*)This->InsertStretchSpacer(*index,prop);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11420,7 +11455,7 @@ case wxSizer_IsShown_1_0: { // wxSizer::IsShown
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsShown((size_t) *index);
+ bool Result = This->IsShown(*index);
  rt.addBool(Result);
  break;
 }
@@ -11506,7 +11541,7 @@ userData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Prepend((int) *width,(int) *height,proportion,flag,border,userData);
+ wxSizerItem * Result = (wxSizerItem*)This->Prepend(*width,*height,proportion,flag,border,userData);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11540,7 +11575,7 @@ case wxSizer_PrependSpacer: { // wxSizer::PrependSpacer
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  int * size = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->PrependSpacer((int) *size);
+ wxSizerItem * Result = (wxSizerItem*)This->PrependSpacer(*size);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -11576,7 +11611,7 @@ case wxSizer_Remove_1_0: { // wxSizer::Remove
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Remove((int) *index);
+ bool Result = This->Remove(*index);
  rt.addBool(Result);
  break;
 }
@@ -11617,7 +11652,7 @@ case wxSizer_Replace_2: { // wxSizer::Replace
  int * index = (int *) bp; bp += 4;
  wxSizerItem *newitem = (wxSizerItem *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Replace((size_t) *index,newitem);
+ bool Result = This->Replace(*index,newitem);
  rt.addBool(Result);
  break;
 }
@@ -11628,7 +11663,7 @@ case wxSizer_SetDimension: { // wxSizer::SetDimension
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetDimension((int) *x,(int) *y,(int) *width,(int) *height);
+ This->SetDimension(*x,*y,*width,*height);
  break;
 }
 case wxSizer_SetMinSize_2: { // wxSizer::SetMinSize
@@ -11636,7 +11671,7 @@ case wxSizer_SetMinSize_2: { // wxSizer::SetMinSize
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMinSize((int) *width,(int) *height);
+ This->SetMinSize(*width,*height);
  break;
 }
 case wxSizer_SetMinSize_1: { // wxSizer::SetMinSize
@@ -11654,7 +11689,7 @@ case wxSizer_SetItemMinSize_3_2: { // wxSizer::SetItemMinSize
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemMinSize(window,(int) *width,(int) *height);
+ bool Result = This->SetItemMinSize(window,*width,*height);
  rt.addBool(Result);
  break;
 }
@@ -11675,7 +11710,7 @@ case wxSizer_SetItemMinSize_3_1: { // wxSizer::SetItemMinSize
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemMinSize(sizer,(int) *width,(int) *height);
+ bool Result = This->SetItemMinSize(sizer,*width,*height);
  rt.addBool(Result);
  break;
 }
@@ -11696,7 +11731,7 @@ case wxSizer_SetItemMinSize_3_0: { // wxSizer::SetItemMinSize
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemMinSize((size_t) *index,(int) *width,(int) *height);
+ bool Result = This->SetItemMinSize(*index,*width,*height);
  rt.addBool(Result);
  break;
 }
@@ -11707,7 +11742,7 @@ case wxSizer_SetItemMinSize_2_0: { // wxSizer::SetItemMinSize
  int * sizeH = (int *) bp; bp += 4;
  wxSize size = wxSize(*sizeW,*sizeH);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemMinSize((size_t) *index,size);
+ bool Result = This->SetItemMinSize(*index,size);
  rt.addBool(Result);
  break;
 }
@@ -11771,7 +11806,7 @@ case wxSizer_Show_2_0: { // wxSizer::Show
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Show((size_t) *index,show);
+ bool Result = This->Show(*index,show);
  rt.addBool(Result);
  break;
 }
@@ -11779,7 +11814,7 @@ case wxSizer_Show_1: { // wxSizer::Show
  wxSizer *This = (wxSizer *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Show((bool) *show);
+ This->Show(*show);
  break;
 }
 case wxSizerFlags_new: { // wxSizerFlags::wxSizerFlags
@@ -11798,7 +11833,7 @@ case wxSizerFlags_Align: { // wxSizerFlags::Align
  wxSizerFlags *This = (wxSizerFlags *) getPtr(bp,memenv); bp += 4;
  int * alignment = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerFlags * Result = &This->Align((int) *alignment);
+ wxSizerFlags * Result = &This->Align(*alignment);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerFlags");
  break;
 }
@@ -11807,7 +11842,7 @@ case wxSizerFlags_Border_2: { // wxSizerFlags::Border
  int * direction = (int *) bp; bp += 4;
  int * borderInPixels = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerFlags * Result = &This->Border((int) *direction,(int) *borderInPixels);
+ wxSizerFlags * Result = &This->Border(*direction,*borderInPixels);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerFlags");
  break;
 }
@@ -11857,7 +11892,7 @@ case wxSizerFlags_Proportion: { // wxSizerFlags::Proportion
  wxSizerFlags *This = (wxSizerFlags *) getPtr(bp,memenv); bp += 4;
  int * proportion = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizerFlags * Result = &This->Proportion((int) *proportion);
+ wxSizerFlags * Result = &This->Proportion(*proportion);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerFlags");
  break;
 }
@@ -11880,7 +11915,7 @@ case wxSizerItem_new_5_1: { // wxSizerItem::wxSizerItem
  int * flag = (int *) bp; bp += 4;
  int * border = (int *) bp; bp += 4;
  wxObject *userData = (wxObject *) getPtr(bp,memenv); bp += 4;
- wxSizerItem * Result = new EwxSizerItem(window,(int) *proportion,(int) *flag,(int) *border,userData);
+ wxSizerItem * Result = new EwxSizerItem(window,*proportion,*flag,*border,userData);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
@@ -11899,7 +11934,7 @@ case wxSizerItem_new_5_0: { // wxSizerItem::wxSizerItem
  int * flag = (int *) bp; bp += 4;
  int * border = (int *) bp; bp += 4;
  wxObject *userData = (wxObject *) getPtr(bp,memenv); bp += 4;
- wxSizerItem * Result = new EwxSizerItem(sizer,(int) *proportion,(int) *flag,(int) *border,userData);
+ wxSizerItem * Result = new EwxSizerItem(sizer,*proportion,*flag,*border,userData);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
@@ -11919,7 +11954,7 @@ case wxSizerItem_new_6: { // wxSizerItem::wxSizerItem
  int * flag = (int *) bp; bp += 4;
  int * border = (int *) bp; bp += 4;
  wxObject *userData = (wxObject *) getPtr(bp,memenv); bp += 4;
- wxSizerItem * Result = new EwxSizerItem((int) *width,(int) *height,(int) *proportion,(int) *flag,(int) *border,userData);
+ wxSizerItem * Result = new EwxSizerItem(*width,*height,*proportion,*flag,*border,userData);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
@@ -11928,7 +11963,7 @@ case wxSizerItem_new_3: { // wxSizerItem::wxSizerItem
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  wxSizerFlags *flags = (wxSizerFlags *) getPtr(bp,memenv); bp += 4;
- wxSizerItem * Result = new EwxSizerItem((int) *width,(int) *height,*flags);
+ wxSizerItem * Result = new EwxSizerItem(*width,*height,*flags);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
@@ -12074,7 +12109,7 @@ case wxSizerItem_SetBorder: { // wxSizerItem::SetBorder
  wxSizerItem *This = (wxSizerItem *) getPtr(bp,memenv); bp += 4;
  int * border = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetBorder((int) *border);
+ This->SetBorder(*border);
  break;
 }
 case wxSizerItem_SetDimension: { // wxSizerItem::SetDimension
@@ -12093,7 +12128,7 @@ case wxSizerItem_SetFlag: { // wxSizerItem::SetFlag
  wxSizerItem *This = (wxSizerItem *) getPtr(bp,memenv); bp += 4;
  int * flag = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFlag((int) *flag);
+ This->SetFlag(*flag);
  break;
 }
 case wxSizerItem_SetInitSize: { // wxSizerItem::SetInitSize
@@ -12101,7 +12136,7 @@ case wxSizerItem_SetInitSize: { // wxSizerItem::SetInitSize
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetInitSize((int) *x,(int) *y);
+ This->SetInitSize(*x,*y);
  break;
 }
 case wxSizerItem_SetMinSize_1: { // wxSizerItem::SetMinSize
@@ -12118,14 +12153,14 @@ case wxSizerItem_SetMinSize_2: { // wxSizerItem::SetMinSize
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMinSize((int) *x,(int) *y);
+ This->SetMinSize(*x,*y);
  break;
 }
 case wxSizerItem_SetProportion: { // wxSizerItem::SetProportion
  wxSizerItem *This = (wxSizerItem *) getPtr(bp,memenv); bp += 4;
  int * proportion = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetProportion((int) *proportion);
+ This->SetProportion(*proportion);
  break;
 }
 case wxSizerItem_SetRatio_2: { // wxSizerItem::SetRatio
@@ -12133,7 +12168,7 @@ case wxSizerItem_SetRatio_2: { // wxSizerItem::SetRatio
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRatio((int) *width,(int) *height);
+ This->SetRatio(*width,*height);
  break;
 }
 case wxSizerItem_SetRatio_1_1: { // wxSizerItem::SetRatio
@@ -12149,7 +12184,7 @@ case wxSizerItem_SetRatio_1_0: { // wxSizerItem::SetRatio
  wxSizerItem *This = (wxSizerItem *) getPtr(bp,memenv); bp += 4;
  float * ratio = (float *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRatio((float) *ratio);
+ This->SetRatio(*ratio);
  break;
 }
 case wxSizerItem_SetSizer: { // wxSizerItem::SetSizer
@@ -12173,7 +12208,7 @@ case wxSizerItem_SetSpacer_2: { // wxSizerItem::SetSpacer
  int * width = (int *) bp; bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSpacer((int) *width,(int) *height);
+ This->SetSpacer(*width,*height);
  break;
 }
 case wxSizerItem_SetWindow: { // wxSizerItem::SetWindow
@@ -12187,12 +12222,12 @@ case wxSizerItem_Show: { // wxSizerItem::Show
  wxSizerItem *This = (wxSizerItem *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Show((bool) *show);
+ This->Show(*show);
  break;
 }
 case wxBoxSizer_new: { // wxBoxSizer::wxBoxSizer
  int * orient = (int *) bp; bp += 4;
- wxBoxSizer * Result = new EwxBoxSizer((int) *orient);
+ wxBoxSizer * Result = new EwxBoxSizer(*orient);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBoxSizer");
  break;
@@ -12207,7 +12242,7 @@ case wxBoxSizer_GetOrientation: { // wxBoxSizer::GetOrientation
 case wxStaticBoxSizer_new_2: { // wxStaticBoxSizer::wxStaticBoxSizer
  wxStaticBox *box = (wxStaticBox *) getPtr(bp,memenv); bp += 4;
  int * orient = (int *) bp; bp += 4;
- wxStaticBoxSizer * Result = new EwxStaticBoxSizer(box,(int) *orient);
+ wxStaticBoxSizer * Result = new EwxStaticBoxSizer(box,*orient);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxStaticBoxSizer");
  break;
@@ -12223,7 +12258,7 @@ case wxStaticBoxSizer_new_3: { // wxStaticBoxSizer::wxStaticBoxSizer
  bp += *labelLen+((8-((0+ *labelLen) & 7)) & 7);
   } break;
  }};
- wxStaticBoxSizer * Result = new EwxStaticBoxSizer((int) *orient,win,label);
+ wxStaticBoxSizer * Result = new EwxStaticBoxSizer(*orient,win,label);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxStaticBoxSizer");
  break;
@@ -12240,7 +12275,7 @@ case wxGridSizer_new_4: { // wxGridSizer::wxGridSizer
  int * cols = (int *) bp; bp += 4;
  int * vgap = (int *) bp; bp += 4;
  int * hgap = (int *) bp; bp += 4;
- wxGridSizer * Result = new EwxGridSizer((int) *rows,(int) *cols,(int) *vgap,(int) *hgap);
+ wxGridSizer * Result = new EwxGridSizer(*rows,*cols,*vgap,*hgap);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxGridSizer");
  break;
@@ -12258,7 +12293,7 @@ case wxGridSizer_new_2: { // wxGridSizer::wxGridSizer
  hgap = (int)*(int *) bp; bp += 4;
   } break;
  }};
- wxGridSizer * Result = new EwxGridSizer((int) *cols,vgap,hgap);
+ wxGridSizer * Result = new EwxGridSizer(*cols,vgap,hgap);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxGridSizer");
  break;
@@ -12295,28 +12330,28 @@ case wxGridSizer_SetCols: { // wxGridSizer::SetCols
  wxGridSizer *This = (wxGridSizer *) getPtr(bp,memenv); bp += 4;
  int * cols = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCols((int) *cols);
+ This->SetCols(*cols);
  break;
 }
 case wxGridSizer_SetHGap: { // wxGridSizer::SetHGap
  wxGridSizer *This = (wxGridSizer *) getPtr(bp,memenv); bp += 4;
  int * gap = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetHGap((int) *gap);
+ This->SetHGap(*gap);
  break;
 }
 case wxGridSizer_SetRows: { // wxGridSizer::SetRows
  wxGridSizer *This = (wxGridSizer *) getPtr(bp,memenv); bp += 4;
  int * rows = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRows((int) *rows);
+ This->SetRows(*rows);
  break;
 }
 case wxGridSizer_SetVGap: { // wxGridSizer::SetVGap
  wxGridSizer *This = (wxGridSizer *) getPtr(bp,memenv); bp += 4;
  int * gap = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetVGap((int) *gap);
+ This->SetVGap(*gap);
  break;
 }
 case wxFlexGridSizer_new_4: { // wxFlexGridSizer::wxFlexGridSizer
@@ -12324,7 +12359,7 @@ case wxFlexGridSizer_new_4: { // wxFlexGridSizer::wxFlexGridSizer
  int * cols = (int *) bp; bp += 4;
  int * vgap = (int *) bp; bp += 4;
  int * hgap = (int *) bp; bp += 4;
- wxFlexGridSizer * Result = new EwxFlexGridSizer((int) *rows,(int) *cols,(int) *vgap,(int) *hgap);
+ wxFlexGridSizer * Result = new EwxFlexGridSizer(*rows,*cols,*vgap,*hgap);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFlexGridSizer");
  break;
@@ -12342,7 +12377,7 @@ case wxFlexGridSizer_new_2: { // wxFlexGridSizer::wxFlexGridSizer
  hgap = (int)*(int *) bp; bp += 4;
   } break;
  }};
- wxFlexGridSizer * Result = new EwxFlexGridSizer((int) *cols,vgap,hgap);
+ wxFlexGridSizer * Result = new EwxFlexGridSizer(*cols,vgap,hgap);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFlexGridSizer");
  break;
@@ -12357,7 +12392,7 @@ case wxFlexGridSizer_AddGrowableCol: { // wxFlexGridSizer::AddGrowableCol
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->AddGrowableCol((size_t) *idx,proportion);
+ This->AddGrowableCol(*idx,proportion);
  break;
 }
 case wxFlexGridSizer_AddGrowableRow: { // wxFlexGridSizer::AddGrowableRow
@@ -12370,7 +12405,7 @@ case wxFlexGridSizer_AddGrowableRow: { // wxFlexGridSizer::AddGrowableRow
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->AddGrowableRow((size_t) *idx,proportion);
+ This->AddGrowableRow(*idx,proportion);
  break;
 }
 case wxFlexGridSizer_GetFlexibleDirection: { // wxFlexGridSizer::GetFlexibleDirection
@@ -12391,28 +12426,28 @@ case wxFlexGridSizer_RemoveGrowableCol: { // wxFlexGridSizer::RemoveGrowableCol
  wxFlexGridSizer *This = (wxFlexGridSizer *) getPtr(bp,memenv); bp += 4;
  int * idx = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->RemoveGrowableCol((size_t) *idx);
+ This->RemoveGrowableCol(*idx);
  break;
 }
 case wxFlexGridSizer_RemoveGrowableRow: { // wxFlexGridSizer::RemoveGrowableRow
  wxFlexGridSizer *This = (wxFlexGridSizer *) getPtr(bp,memenv); bp += 4;
  int * idx = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->RemoveGrowableRow((size_t) *idx);
+ This->RemoveGrowableRow(*idx);
  break;
 }
 case wxFlexGridSizer_SetFlexibleDirection: { // wxFlexGridSizer::SetFlexibleDirection
  wxFlexGridSizer *This = (wxFlexGridSizer *) getPtr(bp,memenv); bp += 4;
  int * direction = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFlexibleDirection((int) *direction);
+ This->SetFlexibleDirection(*direction);
  break;
 }
 case wxFlexGridSizer_SetNonFlexibleGrowMode: { // wxFlexGridSizer::SetNonFlexibleGrowMode
  wxFlexGridSizer *This = (wxFlexGridSizer *) getPtr(bp,memenv); bp += 4;
  wxFlexSizerGrowMode mode = *(wxFlexSizerGrowMode *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetNonFlexibleGrowMode((wxFlexSizerGrowMode) mode);
+ This->SetNonFlexibleGrowMode(mode);
  break;
 }
 case wxGridBagSizer_new: { // wxGridBagSizer::wxGridBagSizer
@@ -12525,7 +12560,7 @@ userData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Add((int) *width,(int) *height,pos,span,flag,border,userData);
+ wxSizerItem * Result = (wxSizerItem*)This->Add(*width,*height,pos,span,flag,border,userData);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -12613,7 +12648,7 @@ userData = (wxObject *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxSizerItem * Result = (wxSizerItem*)This->Add((int) *width,(int) *height,proportion,flag,border,userData);
+ wxSizerItem * Result = (wxSizerItem*)This->Add(*width,*height,proportion,flag,border,userData);
  rt.addRef(getRef((void *)Result,memenv), "wxSizerItem");
  break;
 }
@@ -12715,7 +12750,7 @@ case wxGridBagSizer_GetCellSize: { // wxGridBagSizer::GetCellSize
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSize Result = This->GetCellSize((int) *row,(int) *col);
+ wxSize Result = This->GetCellSize(*row,*col);
  rt.add(Result);
  break;
 }
@@ -12746,7 +12781,7 @@ case wxGridBagSizer_GetItemPosition_1_0: { // wxGridBagSizer::GetItemPosition
  wxGridBagSizer *This = (wxGridBagSizer *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGBPosition Result = This->GetItemPosition((size_t) *index);
+ wxGBPosition Result = This->GetItemPosition(*index);
  rt.add(Result);
  break;
 }
@@ -12770,7 +12805,7 @@ case wxGridBagSizer_GetItemSpan_1_0: { // wxGridBagSizer::GetItemSpan
  wxGridBagSizer *This = (wxGridBagSizer *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGBSpan Result = This->GetItemSpan((size_t) *index);
+ wxGBSpan Result = This->GetItemSpan(*index);
  rt.add(Result);
  break;
 }
@@ -12812,7 +12847,7 @@ case wxGridBagSizer_SetItemPosition_2_0: { // wxGridBagSizer::SetItemPosition
  int * posC = (int *) bp; bp += 4;
  wxGBPosition pos = wxGBPosition(*posR,*posC);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemPosition((size_t) *index,pos);
+ bool Result = This->SetItemPosition(*index,pos);
  rt.addBool(Result);
  break;
 }
@@ -12845,7 +12880,7 @@ case wxGridBagSizer_SetItemSpan_2_0: { // wxGridBagSizer::SetItemSpan
  int * spanCS = (int *) bp; bp += 4;
  wxGBSpan span = wxGBSpan(*spanRS,*spanCS);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemSpan((size_t) *index,span);
+ bool Result = This->SetItemSpan(*index,span);
  rt.addBool(Result);
  break;
 }
@@ -12925,7 +12960,7 @@ case wxFont_new_5: { // wxFont::wxFont
 encoding = *(wxFontEncoding *) bp; bp += 4;;
   } break;
  }};
- wxFont * Result = new EwxFont((int) *size,(wxFontFamily) family,(wxFontStyle) style,(int) *weight,underlined,face,(wxFontEncoding) encoding);
+ wxFont * Result = new EwxFont(*size,family,style,*weight,underlined,face,encoding);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
@@ -13007,7 +13042,7 @@ case wxFont_Ok: { // wxFont::Ok
 }
 case wxFont_SetDefaultEncoding: { // wxFont::SetDefaultEncoding
  wxFontEncoding encoding = *(wxFontEncoding *) bp; bp += 4;;
- wxFont::SetDefaultEncoding((wxFontEncoding) encoding);
+ wxFont::SetDefaultEncoding(encoding);
  break;
 }
 case wxFont_SetFaceName: { // wxFont::SetFaceName
@@ -13024,45 +13059,45 @@ case wxFont_SetFamily: { // wxFont::SetFamily
  wxFont *This = (wxFont *) getPtr(bp,memenv); bp += 4;
  wxFontFamily family = *(wxFontFamily *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetFamily((wxFontFamily) family);
+ This->SetFamily(family);
  break;
 }
 case wxFont_SetPointSize: { // wxFont::SetPointSize
  wxFont *This = (wxFont *) getPtr(bp,memenv); bp += 4;
  int * pointSize = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPointSize((int) *pointSize);
+ This->SetPointSize(*pointSize);
  break;
 }
 case wxFont_SetStyle: { // wxFont::SetStyle
  wxFont *This = (wxFont *) getPtr(bp,memenv); bp += 4;
  wxFontStyle style = *(wxFontStyle *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetStyle((wxFontStyle) style);
+ This->SetStyle(style);
  break;
 }
 case wxFont_SetUnderlined: { // wxFont::SetUnderlined
  wxFont *This = (wxFont *) getPtr(bp,memenv); bp += 4;
  bool * underlined = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetUnderlined((bool) *underlined);
+ This->SetUnderlined(*underlined);
  break;
 }
 case wxFont_SetWeight: { // wxFont::SetWeight
  wxFont *This = (wxFont *) getPtr(bp,memenv); bp += 4;
  int * weight = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWeight((int) *weight);
+ This->SetWeight(*weight);
  break;
 }
 case wxToolTip_Enable: { // wxToolTip::Enable
  bool * flag = (bool *) bp; bp += 4;
- wxToolTip::Enable((bool) *flag);
+ wxToolTip::Enable(*flag);
  break;
 }
 case wxToolTip_SetDelay: { // wxToolTip::SetDelay
  int * msecs = (int *) bp; bp += 4;
- wxToolTip::SetDelay((long) *msecs);
+ wxToolTip::SetDelay(*msecs);
  break;
 }
 case wxToolTip_new: { // wxToolTip::wxToolTip
@@ -13130,7 +13165,7 @@ case wxButton_new_3: { // wxButton::wxButton
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxButton * Result = new EwxButton(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ wxButton * Result = new EwxButton(parent,*id,label,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxButton");
  break;
@@ -13177,7 +13212,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,label,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -13230,7 +13265,7 @@ case wxBitmapButton_new_4: { // wxBitmapButton::wxBitmapButton
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxBitmapButton * Result = new EwxBitmapButton(parent,(wxWindowID) *id,*bitmap,pos,size,style,*validator);
+ wxBitmapButton * Result = new EwxBitmapButton(parent,*id,*bitmap,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmapButton");
  break;
@@ -13271,35 +13306,35 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,*bitmap,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,*bitmap,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
 case wxBitmapButton_GetBitmapDisabled: { // wxBitmapButton::GetBitmapDisabled
  wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxBitmap * Result = &This->GetBitmapDisabled();
+ const wxBitmap * Result = new wxBitmap(This->GetBitmapDisabled()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
 case wxBitmapButton_GetBitmapFocus: { // wxBitmapButton::GetBitmapFocus
  wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxBitmap * Result = &This->GetBitmapFocus();
+ const wxBitmap * Result = new wxBitmap(This->GetBitmapFocus()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
 case wxBitmapButton_GetBitmapLabel: { // wxBitmapButton::GetBitmapLabel
  wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxBitmap * Result = &This->GetBitmapLabel();
+ const wxBitmap * Result = new wxBitmap(This->GetBitmapLabel()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
 case wxBitmapButton_GetBitmapSelected: { // wxBitmapButton::GetBitmapSelected
  wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxBitmap * Result = &This->GetBitmapSelected();
+ const wxBitmap * Result = new wxBitmap(This->GetBitmapSelected()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -13367,7 +13402,7 @@ case wxToggleButton_new_4: { // wxToggleButton::wxToggleButton
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxToggleButton * Result = new EwxToggleButton(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ wxToggleButton * Result = new EwxToggleButton(parent,*id,label,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxToggleButton");
  break;
@@ -13404,7 +13439,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,label,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -13419,7 +13454,7 @@ case wxToggleButton_SetValue: { // wxToggleButton::SetValue
  wxToggleButton *This = (wxToggleButton *) getPtr(bp,memenv); bp += 4;
  bool * state = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetValue((bool) *state);
+ This->SetValue(*state);
  break;
 }
 case wxCalendarCtrl_new_0: { // wxCalendarCtrl::wxCalendarCtrl
@@ -13462,7 +13497,7 @@ case wxCalendarCtrl_new_3: { // wxCalendarCtrl::wxCalendarCtrl
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxCalendarCtrl * Result = new EwxCalendarCtrl(parent,(wxWindowID) *id,date,pos,size,style);
+ wxCalendarCtrl * Result = new EwxCalendarCtrl(parent,*id,date,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCalendarCtrl");
  break;
@@ -13504,7 +13539,7 @@ case wxCalendarCtrl_Create: { // wxCalendarCtrl::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,date,pos,size,style);
+ bool Result = This->Create(parent,*id,date,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -13525,10 +13560,11 @@ case wxCalendarCtrl_SetDate: { // wxCalendarCtrl::SetDate
 case wxCalendarCtrl_GetDate: { // wxCalendarCtrl::GetDate
  wxCalendarCtrl *This = (wxCalendarCtrl *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxDateTime * Result = &This->GetDate();
- rt.add((*Result));
+ const wxDateTime Result = This->GetDate();
+ rt.add(Result);
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxCalendarCtrl_EnableYearChange: { // wxCalendarCtrl::EnableYearChange
  bool enable=true;
  wxCalendarCtrl *This = (wxCalendarCtrl *) getPtr(bp,memenv); bp += 4;
@@ -13542,6 +13578,7 @@ case wxCalendarCtrl_EnableYearChange: { // wxCalendarCtrl::EnableYearChange
  This->EnableYearChange(enable);
  break;
 }
+#endif
 case wxCalendarCtrl_EnableMonthChange: { // wxCalendarCtrl::EnableMonthChange
  bool enable=true;
  wxCalendarCtrl *This = (wxCalendarCtrl *) getPtr(bp,memenv); bp += 4;
@@ -13662,7 +13699,7 @@ case wxCalendarCtrl_GetAttr: { // wxCalendarCtrl::GetAttr
  wxCalendarCtrl *This = (wxCalendarCtrl *) getPtr(bp,memenv); bp += 4;
  int * day = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxCalendarDateAttr * Result = (wxCalendarDateAttr*)This->GetAttr((size_t) *day);
+ wxCalendarDateAttr * Result = (wxCalendarDateAttr*)This->GetAttr(*day);
  rt.addRef(getRef((void *)Result,memenv), "wxCalendarDateAttr");
  break;
 }
@@ -13671,21 +13708,21 @@ case wxCalendarCtrl_SetAttr: { // wxCalendarCtrl::SetAttr
  int * day = (int *) bp; bp += 4;
  wxCalendarDateAttr *attr = (wxCalendarDateAttr *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAttr((size_t) *day,attr);
+ This->SetAttr(*day,attr);
  break;
 }
 case wxCalendarCtrl_SetHoliday: { // wxCalendarCtrl::SetHoliday
  wxCalendarCtrl *This = (wxCalendarCtrl *) getPtr(bp,memenv); bp += 4;
  int * day = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetHoliday((size_t) *day);
+ This->SetHoliday(*day);
  break;
 }
 case wxCalendarCtrl_ResetAttr: { // wxCalendarCtrl::ResetAttr
  wxCalendarCtrl *This = (wxCalendarCtrl *) getPtr(bp,memenv); bp += 4;
  int * day = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ResetAttr((size_t) *day);
+ This->ResetAttr(*day);
  break;
 }
 case wxCalendarCtrl_HitTest: { // wxCalendarCtrl::HitTest
@@ -13743,7 +13780,7 @@ font = (wxFont *) getPtr(bp,memenv); bp += 4;
 border = *(wxCalendarDateBorder *) bp; bp += 4;;
   } break;
  }};
- wxCalendarDateAttr * Result = new wxCalendarDateAttr(colText,colBack,colBorder,*font,(wxCalendarDateBorder) border);
+ wxCalendarDateAttr * Result = new wxCalendarDateAttr(colText,colBack,colBorder,*font,border);
  newPtr((void *) Result, 88, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCalendarDateAttr");
  break;
@@ -13762,7 +13799,7 @@ case wxCalendarDateAttr_new_2_0: { // wxCalendarDateAttr::wxCalendarDateAttr
  bp += 4; /* Align */
   } break;
  }};
- wxCalendarDateAttr * Result = new wxCalendarDateAttr((wxCalendarDateBorder) border,colBorder);
+ wxCalendarDateAttr * Result = new wxCalendarDateAttr(border,colBorder);
  newPtr((void *) Result, 88, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCalendarDateAttr");
  break;
@@ -13811,14 +13848,14 @@ case wxCalendarDateAttr_SetBorder: { // wxCalendarDateAttr::SetBorder
  wxCalendarDateAttr *This = (wxCalendarDateAttr *) getPtr(bp,memenv); bp += 4;
  wxCalendarDateBorder border = *(wxCalendarDateBorder *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetBorder((wxCalendarDateBorder) border);
+ This->SetBorder(border);
  break;
 }
 case wxCalendarDateAttr_SetHoliday: { // wxCalendarDateAttr::SetHoliday
  wxCalendarDateAttr *This = (wxCalendarDateAttr *) getPtr(bp,memenv); bp += 4;
  bool * holiday = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetHoliday((bool) *holiday);
+ This->SetHoliday(*holiday);
  break;
 }
 case wxCalendarDateAttr_HasTextColour: { // wxCalendarDateAttr::HasTextColour
@@ -13934,7 +13971,7 @@ case wxCheckBox_new_4: { // wxCheckBox::wxCheckBox
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxCheckBox * Result = new EwxCheckBox(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ wxCheckBox * Result = new EwxCheckBox(parent,*id,label,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCheckBox");
  break;
@@ -13977,7 +14014,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,label,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -14020,14 +14057,14 @@ case wxCheckBox_SetValue: { // wxCheckBox::SetValue
  wxCheckBox *This = (wxCheckBox *) getPtr(bp,memenv); bp += 4;
  bool * state = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetValue((bool) *state);
+ This->SetValue(*state);
  break;
 }
 case wxCheckBox_Set3StateValue: { // wxCheckBox::Set3StateValue
  wxCheckBox *This = (wxCheckBox *) getPtr(bp,memenv); bp += 4;
  wxCheckBoxState state = *(wxCheckBoxState *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->Set3StateValue((wxCheckBoxState) state);
+ This->Set3StateValue(state);
  break;
 }
 case wxCheckListBox_new_0: { // wxCheckListBox::wxCheckListBox
@@ -14075,7 +14112,7 @@ case wxCheckListBox_new_3: { // wxCheckListBox::wxCheckListBox
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxCheckListBox * Result = new EwxCheckListBox(parent,(wxWindowID) *id,pos,size,choices,style,*validator);
+ wxCheckListBox * Result = new EwxCheckListBox(parent,*id,pos,size,choices,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxCheckListBox");
  break;
@@ -14090,14 +14127,14 @@ case wxCheckListBox_Check: { // wxCheckListBox::Check
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->Check((int) *index,check);
+ This->Check(*index,check);
  break;
 }
 case wxCheckListBox_IsChecked: { // wxCheckListBox::IsChecked
  wxCheckListBox *This = (wxCheckListBox *) getPtr(bp,memenv); bp += 4;
  unsigned int * index = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsChecked((int) *index);
+ bool Result = This->IsChecked(*index);
  rt.addBool(Result);
  break;
 }
@@ -14140,7 +14177,7 @@ case wxChoice_new_3: { // wxChoice::wxChoice
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxChoice * Result = new EwxChoice(parent,(wxWindowID) *id,pos,size,choices,style,*validator);
+ wxChoice * Result = new EwxChoice(parent,*id,pos,size,choices,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxChoice");
  break;
@@ -14182,7 +14219,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,choices,style,*validator);
+ bool Result = This->Create(parent,*id,pos,size,choices,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -14190,7 +14227,7 @@ case wxChoice_Delete: { // wxChoice::Delete
  wxChoice *This = (wxChoice *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Delete((int) *n);
+ This->Delete(*n);
  break;
 }
 case wxChoice_GetColumns: { // wxChoice::GetColumns
@@ -14264,7 +14301,7 @@ case wxComboBox_new_3: { // wxComboBox::wxComboBox
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxComboBox * Result = new EwxComboBox(parent,(wxWindowID) *id,value,pos,size,choices,style,*validator);
+ wxComboBox * Result = new EwxComboBox(parent,*id,value,pos,size,choices,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxComboBox");
  break;
@@ -14303,7 +14340,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,value,pos,size,choices,style,*validator);
+ bool Result = This->Create(parent,*id,value,pos,size,choices,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -14395,7 +14432,7 @@ case wxComboBox_Replace: { // wxComboBox::Replace
  wxString value = wxString(bp, wxConvUTF8);
  bp += *valueLen+((8-((0+ *valueLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->Replace((long) *from,(long) *to,value);
+ This->Replace(*from,*to,value);
  break;
 }
 case wxComboBox_Remove: { // wxComboBox::Remove
@@ -14403,14 +14440,14 @@ case wxComboBox_Remove: { // wxComboBox::Remove
  int * from = (int *) bp; bp += 4;
  int * to = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Remove((long) *from,(long) *to);
+ This->Remove(*from,*to);
  break;
 }
 case wxComboBox_SetInsertionPoint: { // wxComboBox::SetInsertionPoint
  wxComboBox *This = (wxComboBox *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetInsertionPoint((long) *pos);
+ This->SetInsertionPoint(*pos);
  break;
 }
 case wxComboBox_SetInsertionPointEnd: { // wxComboBox::SetInsertionPointEnd
@@ -14423,7 +14460,7 @@ case wxComboBox_SetSelection_1: { // wxComboBox::SetSelection
  wxComboBox *This = (wxComboBox *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((int) *n);
+ This->SetSelection(*n);
  break;
 }
 case wxComboBox_SetSelection_2: { // wxComboBox::SetSelection
@@ -14431,7 +14468,7 @@ case wxComboBox_SetSelection_2: { // wxComboBox::SetSelection
  int * from = (int *) bp; bp += 4;
  int * to = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((long) *from,(long) *to);
+ This->SetSelection(*from,*to);
  break;
 }
 case wxComboBox_SetValue: { // wxComboBox::SetValue
@@ -14484,7 +14521,7 @@ case wxGauge_new_4: { // wxGauge::wxGauge
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxGauge * Result = new EwxGauge(parent,(wxWindowID) *id,(int) *range,pos,size,style,*validator);
+ wxGauge * Result = new EwxGauge(parent,*id,*range,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxGauge");
  break;
@@ -14519,7 +14556,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,(int) *range,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,*range,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -14562,28 +14599,28 @@ case wxGauge_SetBezelFace: { // wxGauge::SetBezelFace
  wxGauge *This = (wxGauge *) getPtr(bp,memenv); bp += 4;
  int * w = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetBezelFace((int) *w);
+ This->SetBezelFace(*w);
  break;
 }
 case wxGauge_SetRange: { // wxGauge::SetRange
  wxGauge *This = (wxGauge *) getPtr(bp,memenv); bp += 4;
  int * r = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRange((int) *r);
+ This->SetRange(*r);
  break;
 }
 case wxGauge_SetShadowWidth: { // wxGauge::SetShadowWidth
  wxGauge *This = (wxGauge *) getPtr(bp,memenv); bp += 4;
  int * w = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetShadowWidth((int) *w);
+ This->SetShadowWidth(*w);
  break;
 }
 case wxGauge_SetValue: { // wxGauge::SetValue
  wxGauge *This = (wxGauge *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetValue((int) *pos);
+ This->SetValue(*pos);
  break;
 }
 case wxGauge_Pulse: { // wxGauge::Pulse
@@ -14793,7 +14830,7 @@ case wxGenericDirCtrl_SetFilterIndex: { // wxGenericDirCtrl::SetFilterIndex
  wxGenericDirCtrl *This = (wxGenericDirCtrl *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFilterIndex((int) *n);
+ This->SetFilterIndex(*n);
  break;
 }
 case wxGenericDirCtrl_SetPath: { // wxGenericDirCtrl::SetPath
@@ -14831,7 +14868,7 @@ case wxStaticBox_new_4: { // wxStaticBox::wxStaticBox
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxStaticBox * Result = new EwxStaticBox(parent,(wxWindowID) *id,label,pos,size,style);
+ wxStaticBox * Result = new EwxStaticBox(parent,*id,label,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxStaticBox");
  break;
@@ -14870,7 +14907,7 @@ case wxStaticBox_Create: { // wxStaticBox::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,label,pos,size,style);
+ bool Result = This->Create(parent,*id,label,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -14995,7 +15032,7 @@ case wxListBox_new_3: { // wxListBox::wxListBox
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxListBox * Result = new EwxListBox(parent,(wxWindowID) *id,pos,size,choices,style,*validator);
+ wxListBox * Result = new EwxListBox(parent,*id,pos,size,choices,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxListBox");
  break;
@@ -15037,7 +15074,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,choices,style,*validator);
+ bool Result = This->Create(parent,*id,pos,size,choices,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -15045,7 +15082,7 @@ case wxListBox_Deselect: { // wxListBox::Deselect
  wxListBox *This = (wxListBox *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Deselect((int) *n);
+ This->Deselect(*n);
  break;
 }
 case wxListBox_GetSelections: { // wxListBox::GetSelections
@@ -15072,14 +15109,14 @@ case wxListBox_InsertItems: { // wxListBox::InsertItems
  bp += (8-((0+ itemsASz) & 7 )) & 7;
  unsigned int * pos = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->InsertItems(items,(int) *pos);
+ This->InsertItems(items,*pos);
  break;
 }
 case wxListBox_IsSelected: { // wxListBox::IsSelected
  wxListBox *This = (wxListBox *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsSelected((int) *n);
+ bool Result = This->IsSelected(*n);
  rt.addBool(Result);
  break;
 }
@@ -15096,7 +15133,7 @@ case wxListBox_Set: { // wxListBox::Set
  }
  bp += (8-((0+ itemsASz) & 7 )) & 7;
  if(!This) throw wxe_badarg(0);
- This->Set(items,NULL);
+ This->Set(items,(void **) NULL);
  break;
 }
 case wxListBox_HitTest: { // wxListBox::HitTest
@@ -15113,7 +15150,7 @@ case wxListBox_SetFirstItem_1_0: { // wxListBox::SetFirstItem
  wxListBox *This = (wxListBox *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFirstItem((int) *n);
+ This->SetFirstItem(*n);
  break;
 }
 case wxListBox_SetFirstItem_1_1: { // wxListBox::SetFirstItem
@@ -15203,7 +15240,7 @@ case wxListCtrl_AssignImageList: { // wxListCtrl::AssignImageList
  wxImageList *imageList = (wxImageList *) getPtr(bp,memenv); bp += 4;
  int * which = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AssignImageList(imageList,(int) *which);
+ This->AssignImageList(imageList,*which);
  break;
 }
 case wxListCtrl_ClearAll: { // wxListCtrl::ClearAll
@@ -15277,7 +15314,7 @@ case wxListCtrl_DeleteColumn: { // wxListCtrl::DeleteColumn
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeleteColumn((int) *col);
+ bool Result = This->DeleteColumn(*col);
  rt.addBool(Result);
  break;
 }
@@ -15285,7 +15322,7 @@ case wxListCtrl_DeleteItem: { // wxListCtrl::DeleteItem
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeleteItem((long) *item);
+ bool Result = This->DeleteItem(*item);
  rt.addBool(Result);
  break;
 }
@@ -15293,7 +15330,7 @@ case wxListCtrl_EditLabel: { // wxListCtrl::EditLabel
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxTextCtrl * Result = (wxTextCtrl*)This->EditLabel((long) *item);
+ wxTextCtrl * Result = (wxTextCtrl*)This->EditLabel(*item);
  rt.addRef(getRef((void *)Result,memenv), "wxTextCtrl");
  break;
 }
@@ -15301,7 +15338,7 @@ case wxListCtrl_EnsureVisible: { // wxListCtrl::EnsureVisible
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->EnsureVisible((long) *item);
+ bool Result = This->EnsureVisible(*item);
  rt.addBool(Result);
  break;
 }
@@ -15318,7 +15355,7 @@ case wxListCtrl_FindItem_3_0: { // wxListCtrl::FindItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- long Result = This->FindItem((long) *start,str,partial);
+ long Result = This->FindItem(*start,str,partial);
  rt.addInt(Result);
  break;
 }
@@ -15330,7 +15367,7 @@ case wxListCtrl_FindItem_3_1: { // wxListCtrl::FindItem
  wxPoint pt = wxPoint(*ptX,*ptY);
  int * direction = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- long Result = This->FindItem((long) *start,pt,(int) *direction);
+ long Result = This->FindItem(*start,pt,*direction);
  rt.addInt(Result);
  break;
 }
@@ -15339,7 +15376,7 @@ case wxListCtrl_GetColumn: { // wxListCtrl::GetColumn
  int * col = (int *) bp; bp += 4;
  wxListItem *item = (wxListItem *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetColumn((int) *col,*item);
+ bool Result = This->GetColumn(*col,*item);
  rt.addBool(Result);
  break;
 }
@@ -15354,7 +15391,7 @@ case wxListCtrl_GetColumnWidth: { // wxListCtrl::GetColumnWidth
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetColumnWidth((int) *col);
+ int Result = This->GetColumnWidth(*col);
  rt.addInt(Result);
  break;
 }
@@ -15376,7 +15413,7 @@ case wxListCtrl_GetImageList: { // wxListCtrl::GetImageList
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * which = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImageList * Result = (wxImageList*)This->GetImageList((int) *which);
+ wxImageList * Result = (wxImageList*)This->GetImageList(*which);
  rt.addRef(getRef((void *)Result,memenv), "wxImageList");
  break;
 }
@@ -15392,7 +15429,7 @@ case wxListCtrl_GetItemBackgroundColour: { // wxListCtrl::GetItemBackgroundColou
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour Result = This->GetItemBackgroundColour((long) *item);
+ wxColour Result = This->GetItemBackgroundColour(*item);
  rt.add(Result);
  break;
 }
@@ -15407,7 +15444,7 @@ case wxListCtrl_GetItemData: { // wxListCtrl::GetItemData
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxUIntPtr Result = This->GetItemData((long) *item);
+ wxUIntPtr Result = This->GetItemData(*item);
  rt.addInt(Result);
  break;
 }
@@ -15415,7 +15452,7 @@ case wxListCtrl_GetItemFont: { // wxListCtrl::GetItemFont
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetItemFont((long) *item)); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new wxFont(This->GetItemFont(*item)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -15424,7 +15461,7 @@ case wxListCtrl_GetItemPosition: { // wxListCtrl::GetItemPosition
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetItemPosition((long) *item,pos);
+ bool Result = This->GetItemPosition(*item,pos);
  rt.addBool(Result);
  rt.add(pos);
  rt.addTupleCount(2);
@@ -15441,7 +15478,7 @@ case wxListCtrl_GetItemRect: { // wxListCtrl::GetItemRect
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetItemRect((long) *item,rect,code);
+ bool Result = This->GetItemRect(*item,rect,code);
  rt.addBool(Result);
  rt.add(rect);
  rt.addTupleCount(2);
@@ -15459,7 +15496,7 @@ case wxListCtrl_GetItemState: { // wxListCtrl::GetItemState
  int * item = (int *) bp; bp += 4;
  int * stateMask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetItemState((long) *item,(long) *stateMask);
+ int Result = This->GetItemState(*item,*stateMask);
  rt.addInt(Result);
  break;
 }
@@ -15467,7 +15504,7 @@ case wxListCtrl_GetItemText: { // wxListCtrl::GetItemText
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetItemText((long) *item);
+ wxString Result = This->GetItemText(*item);
  rt.add(Result);
  break;
 }
@@ -15475,7 +15512,7 @@ case wxListCtrl_GetItemTextColour: { // wxListCtrl::GetItemTextColour
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour Result = This->GetItemTextColour((long) *item);
+ wxColour Result = This->GetItemTextColour(*item);
  rt.add(Result);
  break;
 }
@@ -15493,7 +15530,7 @@ case wxListCtrl_GetNextItem: { // wxListCtrl::GetNextItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- long Result = This->GetNextItem((long) *item,geometry,state);
+ long Result = This->GetNextItem(*item,geometry,state);
  rt.addInt(Result);
  break;
 }
@@ -15541,7 +15578,7 @@ case wxListCtrl_InsertColumn_2: { // wxListCtrl::InsertColumn
  int * col = (int *) bp; bp += 4;
  wxListItem *info = (wxListItem *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- long Result = This->InsertColumn((long) *col,*info);
+ long Result = This->InsertColumn(*col,*info);
  rt.addInt(Result);
  break;
 }
@@ -15562,7 +15599,7 @@ case wxListCtrl_InsertColumn_3: { // wxListCtrl::InsertColumn
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- long Result = This->InsertColumn((long) *col,heading,format,width);
+ long Result = This->InsertColumn(*col,heading,format,width);
  rt.addInt(Result);
  break;
 }
@@ -15581,7 +15618,7 @@ case wxListCtrl_InsertItem_2_1: { // wxListCtrl::InsertItem
  wxString label = wxString(bp, wxConvUTF8);
  bp += *labelLen+((8-((4+ *labelLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- long Result = This->InsertItem((long) *index,label);
+ long Result = This->InsertItem(*index,label);
  rt.addInt(Result);
  break;
 }
@@ -15590,7 +15627,7 @@ case wxListCtrl_InsertItem_2_0: { // wxListCtrl::InsertItem
  int * index = (int *) bp; bp += 4;
  int * imageIndex = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- long Result = This->InsertItem((long) *index,(int) *imageIndex);
+ long Result = This->InsertItem(*index,*imageIndex);
  rt.addInt(Result);
  break;
 }
@@ -15602,7 +15639,7 @@ case wxListCtrl_InsertItem_3: { // wxListCtrl::InsertItem
  bp += *labelLen+((8-((4+ *labelLen) & 7)) & 7);
  int * imageIndex = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- long Result = This->InsertItem((long) *index,label,(int) *imageIndex);
+ long Result = This->InsertItem(*index,label,*imageIndex);
  rt.addInt(Result);
  break;
 }
@@ -15610,7 +15647,7 @@ case wxListCtrl_RefreshItem: { // wxListCtrl::RefreshItem
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->RefreshItem((long) *item);
+ This->RefreshItem(*item);
  break;
 }
 case wxListCtrl_RefreshItems: { // wxListCtrl::RefreshItems
@@ -15618,7 +15655,7 @@ case wxListCtrl_RefreshItems: { // wxListCtrl::RefreshItems
  int * itemFrom = (int *) bp; bp += 4;
  int * itemTo = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->RefreshItems((long) *itemFrom,(long) *itemTo);
+ This->RefreshItems(*itemFrom,*itemTo);
  break;
 }
 case wxListCtrl_ScrollList: { // wxListCtrl::ScrollList
@@ -15626,7 +15663,7 @@ case wxListCtrl_ScrollList: { // wxListCtrl::ScrollList
  int * dx = (int *) bp; bp += 4;
  int * dy = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->ScrollList((int) *dx,(int) *dy);
+ bool Result = This->ScrollList(*dx,*dy);
  rt.addBool(Result);
  break;
 }
@@ -15647,7 +15684,7 @@ case wxListCtrl_SetColumn: { // wxListCtrl::SetColumn
  int * col = (int *) bp; bp += 4;
  wxListItem *item = (wxListItem *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetColumn((int) *col,*item);
+ bool Result = This->SetColumn(*col,*item);
  rt.addBool(Result);
  break;
 }
@@ -15656,7 +15693,7 @@ case wxListCtrl_SetColumnWidth: { // wxListCtrl::SetColumnWidth
  int * col = (int *) bp; bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetColumnWidth((int) *col,(int) *width);
+ bool Result = This->SetColumnWidth(*col,*width);
  rt.addBool(Result);
  break;
 }
@@ -15665,7 +15702,7 @@ case wxListCtrl_SetImageList: { // wxListCtrl::SetImageList
  wxImageList *imageList = (wxImageList *) getPtr(bp,memenv); bp += 4;
  int * which = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetImageList(imageList,(int) *which);
+ This->SetImageList(imageList,*which);
  break;
 }
 case wxListCtrl_SetItem_1: { // wxListCtrl::SetItem
@@ -15690,7 +15727,7 @@ case wxListCtrl_SetItem_4: { // wxListCtrl::SetItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- long Result = This->SetItem((long) *index,(int) *col,label,imageId);
+ long Result = This->SetItem(*index,*col,label,imageId);
  rt.addInt(Result);
  break;
 }
@@ -15703,14 +15740,14 @@ case wxListCtrl_SetItemBackgroundColour: { // wxListCtrl::SetItemBackgroundColou
  int * colA = (int *) bp; bp += 4;
  wxColour col = wxColour(*colR,*colG,*colB,*colA);
  if(!This) throw wxe_badarg(0);
- This->SetItemBackgroundColour((long) *item,col);
+ This->SetItemBackgroundColour(*item,col);
  break;
 }
 case wxListCtrl_SetItemCount: { // wxListCtrl::SetItemCount
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * count = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetItemCount((long) *count);
+ This->SetItemCount(*count);
  break;
 }
 case wxListCtrl_SetItemData: { // wxListCtrl::SetItemData
@@ -15718,7 +15755,7 @@ case wxListCtrl_SetItemData: { // wxListCtrl::SetItemData
  int * item = (int *) bp; bp += 4;
  int * data = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemData((long) *item,(long) *data);
+ bool Result = This->SetItemData(*item,*data);
  rt.addBool(Result);
  break;
 }
@@ -15727,7 +15764,7 @@ case wxListCtrl_SetItemFont: { // wxListCtrl::SetItemFont
  int * item = (int *) bp; bp += 4;
  wxFont *f = (wxFont *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetItemFont((long) *item,*f);
+ This->SetItemFont(*item,*f);
  break;
 }
 case wxListCtrl_SetItemImage: { // wxListCtrl::SetItemImage
@@ -15742,7 +15779,7 @@ case wxListCtrl_SetItemImage: { // wxListCtrl::SetItemImage
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemImage((long) *item,(int) *image,selImage);
+ bool Result = This->SetItemImage(*item,*image,selImage);
  rt.addBool(Result);
  break;
 }
@@ -15752,7 +15789,7 @@ case wxListCtrl_SetItemColumnImage: { // wxListCtrl::SetItemColumnImage
  int * column = (int *) bp; bp += 4;
  int * image = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemColumnImage((long) *item,(long) *column,(int) *image);
+ bool Result = This->SetItemColumnImage(*item,*column,*image);
  rt.addBool(Result);
  break;
 }
@@ -15763,7 +15800,7 @@ case wxListCtrl_SetItemPosition: { // wxListCtrl::SetItemPosition
  int * posY = (int *) bp; bp += 4;
  wxPoint pos = wxPoint(*posX,*posY);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemPosition((long) *item,pos);
+ bool Result = This->SetItemPosition(*item,pos);
  rt.addBool(Result);
  break;
 }
@@ -15773,7 +15810,7 @@ case wxListCtrl_SetItemState: { // wxListCtrl::SetItemState
  int * state = (int *) bp; bp += 4;
  int * stateMask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetItemState((long) *item,(long) *state,(long) *stateMask);
+ bool Result = This->SetItemState(*item,*state,*stateMask);
  rt.addBool(Result);
  break;
 }
@@ -15784,7 +15821,7 @@ case wxListCtrl_SetItemText: { // wxListCtrl::SetItemText
  wxString str = wxString(bp, wxConvUTF8);
  bp += *strLen+((8-((4+ *strLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetItemText((long) *item,str);
+ This->SetItemText(*item,str);
  break;
 }
 case wxListCtrl_SetItemTextColour: { // wxListCtrl::SetItemTextColour
@@ -15796,7 +15833,7 @@ case wxListCtrl_SetItemTextColour: { // wxListCtrl::SetItemTextColour
  int * colA = (int *) bp; bp += 4;
  wxColour col = wxColour(*colR,*colG,*colB,*colA);
  if(!This) throw wxe_badarg(0);
- This->SetItemTextColour((long) *item,col);
+ This->SetItemTextColour(*item,col);
  break;
 }
 case wxListCtrl_SetSingleStyle: { // wxListCtrl::SetSingleStyle
@@ -15809,7 +15846,7 @@ case wxListCtrl_SetSingleStyle: { // wxListCtrl::SetSingleStyle
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetSingleStyle((long) *style,add);
+ This->SetSingleStyle(*style,add);
  break;
 }
 case wxListCtrl_SetTextColour: { // wxListCtrl::SetTextColour
@@ -15827,7 +15864,7 @@ case wxListCtrl_SetWindowStyleFlag: { // wxListCtrl::SetWindowStyleFlag
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * style = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWindowStyleFlag((long) *style);
+ This->SetWindowStyleFlag(*style);
  break;
 }
 
@@ -15857,14 +15894,14 @@ case wxListView_ClearColumnImage: { // wxListView::ClearColumnImage
  wxListView *This = (wxListView *) getPtr(bp,memenv); bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ClearColumnImage((int) *col);
+ This->ClearColumnImage(*col);
  break;
 }
 case wxListView_Focus: { // wxListView::Focus
  wxListView *This = (wxListView *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Focus((long) *index);
+ This->Focus(*index);
  break;
 }
 case wxListView_GetFirstSelected: { // wxListView::GetFirstSelected
@@ -15885,7 +15922,7 @@ case wxListView_GetNextSelected: { // wxListView::GetNextSelected
  wxListView *This = (wxListView *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- long Result = This->GetNextSelected((long) *item);
+ long Result = This->GetNextSelected(*item);
  rt.addInt(Result);
  break;
 }
@@ -15893,7 +15930,7 @@ case wxListView_IsSelected: { // wxListView::IsSelected
  wxListView *This = (wxListView *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsSelected((long) *index);
+ bool Result = This->IsSelected(*index);
  rt.addBool(Result);
  break;
 }
@@ -15907,7 +15944,7 @@ case wxListView_Select: { // wxListView::Select
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->Select((long) *n,on);
+ This->Select(*n,on);
  break;
 }
 case wxListView_SetColumnImage: { // wxListView::SetColumnImage
@@ -15915,7 +15952,7 @@ case wxListView_SetColumnImage: { // wxListView::SetColumnImage
  int * col = (int *) bp; bp += 4;
  int * image = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColumnImage((int) *col,(int) *image);
+ This->SetColumnImage(*col,*image);
  break;
 }
 case wxListItem_new_0: { // wxListItem::wxListItem
@@ -16018,7 +16055,7 @@ case wxListItem_SetAlign: { // wxListItem::SetAlign
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  wxListColumnFormat align = *(wxListColumnFormat *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetAlign((wxListColumnFormat) align);
+ This->SetAlign(align);
  break;
 }
 case wxListItem_SetBackgroundColour: { // wxListItem::SetBackgroundColour
@@ -16036,7 +16073,7 @@ case wxListItem_SetColumn: { // wxListItem::SetColumn
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColumn((int) *col);
+ This->SetColumn(*col);
  break;
 }
 case wxListItem_SetFont: { // wxListItem::SetFont
@@ -16050,35 +16087,35 @@ case wxListItem_SetId: { // wxListItem::SetId
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  int * id = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetId((long) *id);
+ This->SetId(*id);
  break;
 }
 case wxListItem_SetImage: { // wxListItem::SetImage
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  int * image = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetImage((int) *image);
+ This->SetImage(*image);
  break;
 }
 case wxListItem_SetMask: { // wxListItem::SetMask
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  int * mask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMask((long) *mask);
+ This->SetMask(*mask);
  break;
 }
 case wxListItem_SetState: { // wxListItem::SetState
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  int * state = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetState((long) *state);
+ This->SetState(*state);
  break;
 }
 case wxListItem_SetStateMask: { // wxListItem::SetStateMask
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  int * stateMask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetStateMask((long) *stateMask);
+ This->SetStateMask(*stateMask);
  break;
 }
 case wxListItem_SetText: { // wxListItem::SetText
@@ -16105,7 +16142,7 @@ case wxListItem_SetWidth: { // wxListItem::SetWidth
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWidth((int) *width);
+ This->SetWidth(*width);
  break;
 }
 case wxListItemAttr_new_0: { // wxListItemAttr::wxListItemAttr
@@ -16227,7 +16264,7 @@ case wxImageList_new_3: { // wxImageList::wxImageList
  initialCount = (int)*(int *) bp; bp += 4;
   } break;
  }};
- wxImageList * Result = new EwxImageList((int) *width,(int) *height,mask,initialCount);
+ wxImageList * Result = new EwxImageList(*width,*height,mask,initialCount);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxImageList");
  break;
@@ -16278,7 +16315,7 @@ case wxImageList_Create: { // wxImageList::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create((int) *width,(int) *height,mask,initialCount);
+ bool Result = This->Create(*width,*height,mask,initialCount);
  rt.addBool(Result);
  break;
 }
@@ -16300,7 +16337,7 @@ case wxImageList_Draw: { // wxImageList::Draw
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Draw((int) *index,*dc,(int) *x,(int) *y,flags,solidBackground);
+ bool Result = This->Draw(*index,*dc,*x,*y,flags,solidBackground);
  rt.addBool(Result);
  break;
 }
@@ -16308,7 +16345,7 @@ case wxImageList_GetBitmap: { // wxImageList::GetBitmap
  wxImageList *This = (wxImageList *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxBitmap * Result = new wxBitmap(This->GetBitmap((int) *index)); newPtr((void *) Result,3, memenv);;
+ wxBitmap * Result = new wxBitmap(This->GetBitmap(*index)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -16316,7 +16353,7 @@ case wxImageList_GetIcon: { // wxImageList::GetIcon
  wxImageList *This = (wxImageList *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxIcon * Result = new wxIcon(This->GetIcon((int) *index)); newPtr((void *) Result,3, memenv);;
+ wxIcon * Result = new wxIcon(This->GetIcon(*index)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
 }
@@ -16333,7 +16370,7 @@ case wxImageList_GetSize: { // wxImageList::GetSize
  wxImageList *This = (wxImageList *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetSize((int) *index,width,height);
+ bool Result = This->GetSize(*index,width,height);
  rt.addBool(Result);
  rt.addInt(width);
  rt.addInt(height);
@@ -16344,7 +16381,7 @@ case wxImageList_Remove: { // wxImageList::Remove
  wxImageList *This = (wxImageList *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Remove((int) *index);
+ bool Result = This->Remove(*index);
  rt.addBool(Result);
  break;
 }
@@ -16360,7 +16397,7 @@ case wxImageList_Replace_2: { // wxImageList::Replace
  int * index = (int *) bp; bp += 4;
  wxBitmap *bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Replace((int) *index,*bitmap);
+ bool Result = This->Replace(*index,*bitmap);
  rt.addBool(Result);
  break;
 }
@@ -16370,7 +16407,7 @@ case wxImageList_Replace_3: { // wxImageList::Replace
  wxBitmap *bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  wxBitmap *mask = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Replace((int) *index,*bitmap,*mask);
+ bool Result = This->Replace(*index,*bitmap,*mask);
  rt.addBool(Result);
  break;
 }
@@ -16405,7 +16442,7 @@ font = (wxFont *) getPtr(bp,memenv); bp += 4;
 alignment = *(wxTextAttrAlignment *) bp; bp += 4;;
   } break;
  }};
- wxTextAttr * Result = new wxTextAttr(colText,colBack,*font,(wxTextAttrAlignment) alignment);
+ wxTextAttr * Result = new wxTextAttr(colText,colBack,*font,alignment);
  newPtr((void *) Result, 103, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxTextAttr");
  break;
@@ -16427,7 +16464,7 @@ case wxTextAttr_GetBackgroundColour: { // wxTextAttr::GetBackgroundColour
 case wxTextAttr_GetFont: { // wxTextAttr::GetFont
  wxTextAttr *This = (wxTextAttr *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxFont * Result = &This->GetFont();
+ const wxFont * Result = new wxFont(This->GetFont()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -16505,7 +16542,7 @@ case wxTextAttr_SetAlignment: { // wxTextAttr::SetAlignment
  wxTextAttr *This = (wxTextAttr *) getPtr(bp,memenv); bp += 4;
  wxTextAttrAlignment alignment = *(wxTextAttrAlignment *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetAlignment((wxTextAttrAlignment) alignment);
+ This->SetAlignment(alignment);
  break;
 }
 case wxTextAttr_SetBackgroundColour: { // wxTextAttr::SetBackgroundColour
@@ -16523,7 +16560,7 @@ case wxTextAttr_SetFlags: { // wxTextAttr::SetFlags
  wxTextAttr *This = (wxTextAttr *) getPtr(bp,memenv); bp += 4;
  int * flags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFlags((long) *flags);
+ This->SetFlags(*flags);
  break;
 }
 case wxTextAttr_SetFont: { // wxTextAttr::SetFont
@@ -16549,14 +16586,14 @@ case wxTextAttr_SetLeftIndent: { // wxTextAttr::SetLeftIndent
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetLeftIndent((int) *indent,subIndent);
+ This->SetLeftIndent(*indent,subIndent);
  break;
 }
 case wxTextAttr_SetRightIndent: { // wxTextAttr::SetRightIndent
  wxTextAttr *This = (wxTextAttr *) getPtr(bp,memenv); bp += 4;
  int * indent = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRightIndent((int) *indent);
+ This->SetRightIndent(*indent);
  break;
 }
 case wxTextAttr_SetTabs: { // wxTextAttr::SetTabs
@@ -16619,7 +16656,7 @@ case wxTextCtrl_new_3: { // wxTextCtrl::wxTextCtrl
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxTextCtrl * Result = new EwxTextCtrl(parent,(wxWindowID) *id,value,pos,size,style,*validator);
+ wxTextCtrl * Result = new EwxTextCtrl(parent,*id,value,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxTextCtrl");
  break;
@@ -16722,7 +16759,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,value,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,value,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -16771,7 +16808,7 @@ case wxTextCtrl_GetLineLength: { // wxTextCtrl::GetLineLength
  wxTextCtrl *This = (wxTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * lineNo = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetLineLength((long) *lineNo);
+ int Result = This->GetLineLength(*lineNo);
  rt.addInt(Result);
  break;
 }
@@ -16779,7 +16816,7 @@ case wxTextCtrl_GetLineText: { // wxTextCtrl::GetLineText
  wxTextCtrl *This = (wxTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * lineNo = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetLineText((long) *lineNo);
+ wxString Result = This->GetLineText(*lineNo);
  rt.add(Result);
  break;
 }
@@ -16795,7 +16832,7 @@ case wxTextCtrl_GetRange: { // wxTextCtrl::GetRange
  int * from = (int *) bp; bp += 4;
  int * to = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetRange((long) *from,(long) *to);
+ wxString Result = This->GetRange(*from,*to);
  rt.add(Result);
  break;
 }
@@ -16822,7 +16859,7 @@ case wxTextCtrl_GetStyle: { // wxTextCtrl::GetStyle
  int * position = (int *) bp; bp += 4;
  wxTextAttr *style = (wxTextAttr *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetStyle((long) *position,*style);
+ bool Result = This->GetStyle(*position,*style);
  rt.addBool(Result);
  break;
 }
@@ -16895,7 +16932,7 @@ case wxTextCtrl_PositionToXY: { // wxTextCtrl::PositionToXY
  wxTextCtrl *This = (wxTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->PositionToXY((long) *pos,&x,&y);
+ bool Result = This->PositionToXY(*pos,&x,&y);
  rt.addBool(Result);
  rt.addInt(x);
  rt.addInt(y);
@@ -16913,7 +16950,7 @@ case wxTextCtrl_Remove: { // wxTextCtrl::Remove
  int * from = (int *) bp; bp += 4;
  int * to = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Remove((long) *from,(long) *to);
+ This->Remove(*from,*to);
  break;
 }
 case wxTextCtrl_Replace: { // wxTextCtrl::Replace
@@ -16924,7 +16961,7 @@ case wxTextCtrl_Replace: { // wxTextCtrl::Replace
  wxString value = wxString(bp, wxConvUTF8);
  bp += *valueLen+((8-((0+ *valueLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->Replace((long) *from,(long) *to,value);
+ This->Replace(*from,*to,value);
  break;
 }
 case wxTextCtrl_SaveFile: { // wxTextCtrl::SaveFile
@@ -16959,14 +16996,14 @@ case wxTextCtrl_SetEditable: { // wxTextCtrl::SetEditable
  wxTextCtrl *This = (wxTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * editable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetEditable((bool) *editable);
+ This->SetEditable(*editable);
  break;
 }
 case wxTextCtrl_SetInsertionPoint: { // wxTextCtrl::SetInsertionPoint
  wxTextCtrl *This = (wxTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetInsertionPoint((long) *pos);
+ This->SetInsertionPoint(*pos);
  break;
 }
 case wxTextCtrl_SetInsertionPointEnd: { // wxTextCtrl::SetInsertionPointEnd
@@ -16979,7 +17016,7 @@ case wxTextCtrl_SetMaxLength: { // wxTextCtrl::SetMaxLength
  wxTextCtrl *This = (wxTextCtrl *) getPtr(bp,memenv); bp += 4;
  unsigned int * len = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMaxLength((long) *len);
+ This->SetMaxLength(*len);
  break;
 }
 case wxTextCtrl_SetSelection: { // wxTextCtrl::SetSelection
@@ -16987,7 +17024,7 @@ case wxTextCtrl_SetSelection: { // wxTextCtrl::SetSelection
  int * from = (int *) bp; bp += 4;
  int * to = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((long) *from,(long) *to);
+ This->SetSelection(*from,*to);
  break;
 }
 case wxTextCtrl_SetStyle: { // wxTextCtrl::SetStyle
@@ -16996,7 +17033,7 @@ case wxTextCtrl_SetStyle: { // wxTextCtrl::SetStyle
  int * end = (int *) bp; bp += 4;
  wxTextAttr *style = (wxTextAttr *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetStyle((long) *start,(long) *end,*style);
+ bool Result = This->SetStyle(*start,*end,*style);
  rt.addBool(Result);
  break;
 }
@@ -17013,7 +17050,7 @@ case wxTextCtrl_ShowPosition: { // wxTextCtrl::ShowPosition
  wxTextCtrl *This = (wxTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ShowPosition((long) *pos);
+ This->ShowPosition(*pos);
  break;
 }
 case wxTextCtrl_Undo: { // wxTextCtrl::Undo
@@ -17036,7 +17073,7 @@ case wxTextCtrl_XYToPosition: { // wxTextCtrl::XYToPosition
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- long Result = This->XYToPosition((long) *x,(long) *y);
+ long Result = This->XYToPosition(*x,*y);
  rt.addInt(Result);
  break;
 }
@@ -17069,7 +17106,7 @@ case wxNotebook_new_3: { // wxNotebook::wxNotebook
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxNotebook * Result = new EwxNotebook(parent,(wxWindowID) *winid,pos,size,style);
+ wxNotebook * Result = new EwxNotebook(parent,*winid,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxNotebook");
  break;
@@ -17141,7 +17178,7 @@ case wxNotebook_Create: { // wxNotebook::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,style);
+ bool Result = This->Create(parent,*id,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -17156,7 +17193,7 @@ case wxNotebook_DeletePage: { // wxNotebook::DeletePage
  wxNotebook *This = (wxNotebook *) getPtr(bp,memenv); bp += 4;
  int * nPage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeletePage((size_t) *nPage);
+ bool Result = This->DeletePage(*nPage);
  rt.addBool(Result);
  break;
 }
@@ -17164,7 +17201,7 @@ case wxNotebook_RemovePage: { // wxNotebook::RemovePage
  wxNotebook *This = (wxNotebook *) getPtr(bp,memenv); bp += 4;
  int * nPage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->RemovePage((size_t) *nPage);
+ bool Result = This->RemovePage(*nPage);
  rt.addBool(Result);
  break;
 }
@@ -17186,7 +17223,7 @@ case wxNotebook_GetPage: { // wxNotebook::GetPage
  wxNotebook *This = (wxNotebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxWindow * Result = (wxWindow*)This->GetPage((size_t) *n);
+ wxWindow * Result = (wxWindow*)This->GetPage(*n);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -17201,7 +17238,7 @@ case wxNotebook_GetPageImage: { // wxNotebook::GetPageImage
  wxNotebook *This = (wxNotebook *) getPtr(bp,memenv); bp += 4;
  int * nPage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetPageImage((size_t) *nPage);
+ int Result = This->GetPageImage(*nPage);
  rt.addInt(Result);
  break;
 }
@@ -17209,7 +17246,7 @@ case wxNotebook_GetPageText: { // wxNotebook::GetPageText
  wxNotebook *This = (wxNotebook *) getPtr(bp,memenv); bp += 4;
  int * nPage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetPageText((size_t) *nPage);
+ wxString Result = This->GetPageText(*nPage);
  rt.add(Result);
  break;
 }
@@ -17265,7 +17302,7 @@ case wxNotebook_InsertPage: { // wxNotebook::InsertPage
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->InsertPage((size_t) *position,win,strText,bSelect,imageId);
+ bool Result = This->InsertPage(*position,win,strText,bSelect,imageId);
  rt.addBool(Result);
  break;
 }
@@ -17299,7 +17336,7 @@ case wxNotebook_SetPageImage: { // wxNotebook::SetPageImage
  int * nPage = (int *) bp; bp += 4;
  int * nImage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageImage((size_t) *nPage,(int) *nImage);
+ bool Result = This->SetPageImage(*nPage,*nImage);
  rt.addBool(Result);
  break;
 }
@@ -17310,7 +17347,7 @@ case wxNotebook_SetPageText: { // wxNotebook::SetPageText
  wxString strText = wxString(bp, wxConvUTF8);
  bp += *strTextLen+((8-((4+ *strTextLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageText((size_t) *nPage,strText);
+ bool Result = This->SetPageText(*nPage,strText);
  rt.addBool(Result);
  break;
 }
@@ -17318,7 +17355,7 @@ case wxNotebook_SetSelection: { // wxNotebook::SetSelection
  wxNotebook *This = (wxNotebook *) getPtr(bp,memenv); bp += 4;
  int * nPage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->SetSelection((size_t) *nPage);
+ int Result = This->SetSelection(*nPage);
  rt.addInt(Result);
  break;
 }
@@ -17326,7 +17363,7 @@ case wxNotebook_ChangeSelection: { // wxNotebook::ChangeSelection
  wxNotebook *This = (wxNotebook *) getPtr(bp,memenv); bp += 4;
  int * nPage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->ChangeSelection((size_t) *nPage);
+ int Result = This->ChangeSelection(*nPage);
  rt.addInt(Result);
  break;
 }
@@ -17359,7 +17396,7 @@ case wxChoicebook_new_3: { // wxChoicebook::wxChoicebook
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxChoicebook * Result = new EwxChoicebook(parent,(wxWindowID) *id,pos,size,style);
+ wxChoicebook * Result = new EwxChoicebook(parent,*id,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxChoicebook");
  break;
@@ -17431,7 +17468,7 @@ case wxChoicebook_Create: { // wxChoicebook::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,style);
+ bool Result = This->Create(parent,*id,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -17446,7 +17483,7 @@ case wxChoicebook_DeletePage: { // wxChoicebook::DeletePage
  wxChoicebook *This = (wxChoicebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeletePage((size_t) *n);
+ bool Result = This->DeletePage(*n);
  rt.addBool(Result);
  break;
 }
@@ -17454,7 +17491,7 @@ case wxChoicebook_RemovePage: { // wxChoicebook::RemovePage
  wxChoicebook *This = (wxChoicebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->RemovePage((size_t) *n);
+ bool Result = This->RemovePage(*n);
  rt.addBool(Result);
  break;
 }
@@ -17476,7 +17513,7 @@ case wxChoicebook_GetPage: { // wxChoicebook::GetPage
  wxChoicebook *This = (wxChoicebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxWindow * Result = (wxWindow*)This->GetPage((size_t) *n);
+ wxWindow * Result = (wxWindow*)This->GetPage(*n);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -17491,7 +17528,7 @@ case wxChoicebook_GetPageImage: { // wxChoicebook::GetPageImage
  wxChoicebook *This = (wxChoicebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetPageImage((size_t) *n);
+ int Result = This->GetPageImage(*n);
  rt.addInt(Result);
  break;
 }
@@ -17499,7 +17536,7 @@ case wxChoicebook_GetPageText: { // wxChoicebook::GetPageText
  wxChoicebook *This = (wxChoicebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetPageText((size_t) *n);
+ wxString Result = This->GetPageText(*n);
  rt.add(Result);
  break;
 }
@@ -17541,7 +17578,7 @@ case wxChoicebook_InsertPage: { // wxChoicebook::InsertPage
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->InsertPage((size_t) *n,page,text,bSelect,imageId);
+ bool Result = This->InsertPage(*n,page,text,bSelect,imageId);
  rt.addBool(Result);
  break;
 }
@@ -17566,7 +17603,7 @@ case wxChoicebook_SetPageImage: { // wxChoicebook::SetPageImage
  int * n = (int *) bp; bp += 4;
  int * imageId = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageImage((size_t) *n,(int) *imageId);
+ bool Result = This->SetPageImage(*n,*imageId);
  rt.addBool(Result);
  break;
 }
@@ -17577,7 +17614,7 @@ case wxChoicebook_SetPageText: { // wxChoicebook::SetPageText
  wxString strText = wxString(bp, wxConvUTF8);
  bp += *strTextLen+((8-((4+ *strTextLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageText((size_t) *n,strText);
+ bool Result = This->SetPageText(*n,strText);
  rt.addBool(Result);
  break;
 }
@@ -17585,7 +17622,7 @@ case wxChoicebook_SetSelection: { // wxChoicebook::SetSelection
  wxChoicebook *This = (wxChoicebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->SetSelection((size_t) *n);
+ int Result = This->SetSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -17593,7 +17630,7 @@ case wxChoicebook_ChangeSelection: { // wxChoicebook::ChangeSelection
  wxChoicebook *This = (wxChoicebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->ChangeSelection((size_t) *n);
+ int Result = This->ChangeSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -17626,7 +17663,7 @@ case wxToolbook_new_3: { // wxToolbook::wxToolbook
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxToolbook * Result = new EwxToolbook(parent,(wxWindowID) *id,pos,size,style);
+ wxToolbook * Result = new EwxToolbook(parent,*id,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxToolbook");
  break;
@@ -17698,7 +17735,7 @@ case wxToolbook_Create: { // wxToolbook::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,style);
+ bool Result = This->Create(parent,*id,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -17713,7 +17750,7 @@ case wxToolbook_DeletePage: { // wxToolbook::DeletePage
  wxToolbook *This = (wxToolbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeletePage((size_t) *n);
+ bool Result = This->DeletePage(*n);
  rt.addBool(Result);
  break;
 }
@@ -17721,7 +17758,7 @@ case wxToolbook_RemovePage: { // wxToolbook::RemovePage
  wxToolbook *This = (wxToolbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->RemovePage((size_t) *n);
+ bool Result = This->RemovePage(*n);
  rt.addBool(Result);
  break;
 }
@@ -17743,7 +17780,7 @@ case wxToolbook_GetPage: { // wxToolbook::GetPage
  wxToolbook *This = (wxToolbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxWindow * Result = (wxWindow*)This->GetPage((size_t) *n);
+ wxWindow * Result = (wxWindow*)This->GetPage(*n);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -17758,7 +17795,7 @@ case wxToolbook_GetPageImage: { // wxToolbook::GetPageImage
  wxToolbook *This = (wxToolbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetPageImage((size_t) *n);
+ int Result = This->GetPageImage(*n);
  rt.addInt(Result);
  break;
 }
@@ -17766,7 +17803,7 @@ case wxToolbook_GetPageText: { // wxToolbook::GetPageText
  wxToolbook *This = (wxToolbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetPageText((size_t) *n);
+ wxString Result = This->GetPageText(*n);
  rt.add(Result);
  break;
 }
@@ -17808,7 +17845,7 @@ case wxToolbook_InsertPage: { // wxToolbook::InsertPage
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->InsertPage((size_t) *n,page,text,bSelect,imageId);
+ bool Result = This->InsertPage(*n,page,text,bSelect,imageId);
  rt.addBool(Result);
  break;
 }
@@ -17833,7 +17870,7 @@ case wxToolbook_SetPageImage: { // wxToolbook::SetPageImage
  int * n = (int *) bp; bp += 4;
  int * imageId = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageImage((size_t) *n,(int) *imageId);
+ bool Result = This->SetPageImage(*n,*imageId);
  rt.addBool(Result);
  break;
 }
@@ -17844,7 +17881,7 @@ case wxToolbook_SetPageText: { // wxToolbook::SetPageText
  wxString strText = wxString(bp, wxConvUTF8);
  bp += *strTextLen+((8-((4+ *strTextLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageText((size_t) *n,strText);
+ bool Result = This->SetPageText(*n,strText);
  rt.addBool(Result);
  break;
 }
@@ -17852,7 +17889,7 @@ case wxToolbook_SetSelection: { // wxToolbook::SetSelection
  wxToolbook *This = (wxToolbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->SetSelection((size_t) *n);
+ int Result = This->SetSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -17860,7 +17897,7 @@ case wxToolbook_ChangeSelection: { // wxToolbook::ChangeSelection
  wxToolbook *This = (wxToolbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->ChangeSelection((size_t) *n);
+ int Result = This->ChangeSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -17893,7 +17930,7 @@ case wxListbook_new_3: { // wxListbook::wxListbook
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxListbook * Result = new EwxListbook(parent,(wxWindowID) *id,pos,size,style);
+ wxListbook * Result = new EwxListbook(parent,*id,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxListbook");
  break;
@@ -17965,7 +18002,7 @@ case wxListbook_Create: { // wxListbook::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,style);
+ bool Result = This->Create(parent,*id,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -17980,7 +18017,7 @@ case wxListbook_DeletePage: { // wxListbook::DeletePage
  wxListbook *This = (wxListbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeletePage((size_t) *n);
+ bool Result = This->DeletePage(*n);
  rt.addBool(Result);
  break;
 }
@@ -17988,7 +18025,7 @@ case wxListbook_RemovePage: { // wxListbook::RemovePage
  wxListbook *This = (wxListbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->RemovePage((size_t) *n);
+ bool Result = This->RemovePage(*n);
  rt.addBool(Result);
  break;
 }
@@ -18010,7 +18047,7 @@ case wxListbook_GetPage: { // wxListbook::GetPage
  wxListbook *This = (wxListbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxWindow * Result = (wxWindow*)This->GetPage((size_t) *n);
+ wxWindow * Result = (wxWindow*)This->GetPage(*n);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -18025,7 +18062,7 @@ case wxListbook_GetPageImage: { // wxListbook::GetPageImage
  wxListbook *This = (wxListbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetPageImage((size_t) *n);
+ int Result = This->GetPageImage(*n);
  rt.addInt(Result);
  break;
 }
@@ -18033,7 +18070,7 @@ case wxListbook_GetPageText: { // wxListbook::GetPageText
  wxListbook *This = (wxListbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetPageText((size_t) *n);
+ wxString Result = This->GetPageText(*n);
  rt.add(Result);
  break;
 }
@@ -18075,7 +18112,7 @@ case wxListbook_InsertPage: { // wxListbook::InsertPage
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->InsertPage((size_t) *n,page,text,bSelect,imageId);
+ bool Result = This->InsertPage(*n,page,text,bSelect,imageId);
  rt.addBool(Result);
  break;
 }
@@ -18100,7 +18137,7 @@ case wxListbook_SetPageImage: { // wxListbook::SetPageImage
  int * n = (int *) bp; bp += 4;
  int * imageId = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageImage((size_t) *n,(int) *imageId);
+ bool Result = This->SetPageImage(*n,*imageId);
  rt.addBool(Result);
  break;
 }
@@ -18111,7 +18148,7 @@ case wxListbook_SetPageText: { // wxListbook::SetPageText
  wxString strText = wxString(bp, wxConvUTF8);
  bp += *strTextLen+((8-((4+ *strTextLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageText((size_t) *n,strText);
+ bool Result = This->SetPageText(*n,strText);
  rt.addBool(Result);
  break;
 }
@@ -18119,7 +18156,7 @@ case wxListbook_SetSelection: { // wxListbook::SetSelection
  wxListbook *This = (wxListbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->SetSelection((size_t) *n);
+ int Result = This->SetSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -18127,7 +18164,7 @@ case wxListbook_ChangeSelection: { // wxListbook::ChangeSelection
  wxListbook *This = (wxListbook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->ChangeSelection((size_t) *n);
+ int Result = This->ChangeSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -18160,7 +18197,7 @@ case wxTreebook_new_3: { // wxTreebook::wxTreebook
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxTreebook * Result = new EwxTreebook(parent,(wxWindowID) *id,pos,size,style);
+ wxTreebook * Result = new EwxTreebook(parent,*id,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxTreebook");
  break;
@@ -18232,7 +18269,7 @@ case wxTreebook_Create: { // wxTreebook::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,style);
+ bool Result = This->Create(parent,*id,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -18247,7 +18284,7 @@ case wxTreebook_DeletePage: { // wxTreebook::DeletePage
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeletePage((size_t) *pos);
+ bool Result = This->DeletePage(*pos);
  rt.addBool(Result);
  break;
 }
@@ -18255,7 +18292,7 @@ case wxTreebook_RemovePage: { // wxTreebook::RemovePage
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->RemovePage((size_t) *n);
+ bool Result = This->RemovePage(*n);
  rt.addBool(Result);
  break;
 }
@@ -18277,7 +18314,7 @@ case wxTreebook_GetPage: { // wxTreebook::GetPage
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxWindow * Result = (wxWindow*)This->GetPage((size_t) *n);
+ wxWindow * Result = (wxWindow*)This->GetPage(*n);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -18292,7 +18329,7 @@ case wxTreebook_GetPageImage: { // wxTreebook::GetPageImage
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetPageImage((size_t) *n);
+ int Result = This->GetPageImage(*n);
  rt.addInt(Result);
  break;
 }
@@ -18300,7 +18337,7 @@ case wxTreebook_GetPageText: { // wxTreebook::GetPageText
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetPageText((size_t) *n);
+ wxString Result = This->GetPageText(*n);
  rt.add(Result);
  break;
 }
@@ -18321,7 +18358,7 @@ case wxTreebook_ExpandNode: { // wxTreebook::ExpandNode
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->ExpandNode((size_t) *pos,expand);
+ bool Result = This->ExpandNode(*pos,expand);
  rt.addBool(Result);
  break;
 }
@@ -18329,7 +18366,7 @@ case wxTreebook_IsNodeExpanded: { // wxTreebook::IsNodeExpanded
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsNodeExpanded((size_t) *pos);
+ bool Result = This->IsNodeExpanded(*pos);
  rt.addBool(Result);
  break;
 }
@@ -18364,7 +18401,7 @@ case wxTreebook_InsertPage: { // wxTreebook::InsertPage
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->InsertPage((size_t) *pos,page,text,bSelect,imageId);
+ bool Result = This->InsertPage(*pos,page,text,bSelect,imageId);
  rt.addBool(Result);
  break;
 }
@@ -18386,7 +18423,7 @@ case wxTreebook_InsertSubPage: { // wxTreebook::InsertSubPage
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->InsertSubPage((size_t) *pos,page,text,bSelect,imageId);
+ bool Result = This->InsertSubPage(*pos,page,text,bSelect,imageId);
  rt.addBool(Result);
  break;
 }
@@ -18411,7 +18448,7 @@ case wxTreebook_SetPageImage: { // wxTreebook::SetPageImage
  int * n = (int *) bp; bp += 4;
  int * imageId = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageImage((size_t) *n,(int) *imageId);
+ bool Result = This->SetPageImage(*n,*imageId);
  rt.addBool(Result);
  break;
 }
@@ -18422,7 +18459,7 @@ case wxTreebook_SetPageText: { // wxTreebook::SetPageText
  wxString strText = wxString(bp, wxConvUTF8);
  bp += *strTextLen+((8-((4+ *strTextLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageText((size_t) *n,strText);
+ bool Result = This->SetPageText(*n,strText);
  rt.addBool(Result);
  break;
 }
@@ -18430,7 +18467,7 @@ case wxTreebook_SetSelection: { // wxTreebook::SetSelection
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->SetSelection((size_t) *n);
+ int Result = This->SetSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -18438,7 +18475,7 @@ case wxTreebook_ChangeSelection: { // wxTreebook::ChangeSelection
  wxTreebook *This = (wxTreebook *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->ChangeSelection((size_t) *n);
+ int Result = This->ChangeSelection(*n);
  rt.addInt(Result);
  break;
 }
@@ -18790,7 +18827,7 @@ which = *(wxTreeItemIcon *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- int Result = This->GetItemImage(item,(wxTreeItemIcon) which);
+ int Result = This->GetItemImage(item,which);
  rt.addInt(Result);
  break;
 }
@@ -18933,7 +18970,7 @@ case wxTreeCtrl_InsertItem: { // wxTreeCtrl::InsertItem
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxTreeItemId Result = This->InsertItem(parent,(size_t) *pos,text,image,selImage,data);
+ wxTreeItemId Result = This->InsertItem(parent,*pos,text,image,selImage,data);
  rt.add((wxUIntPtr *) Result.m_pItem);
  break;
 }
@@ -19043,7 +19080,7 @@ case wxTreeCtrl_SetIndent: { // wxTreeCtrl::SetIndent
  wxTreeCtrl *This = (wxTreeCtrl *) getPtr(bp,memenv); bp += 4;
  unsigned int * indent = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetIndent((int) *indent);
+ This->SetIndent(*indent);
  break;
 }
 case wxTreeCtrl_SetImageList: { // wxTreeCtrl::SetImageList
@@ -19132,7 +19169,7 @@ case wxTreeCtrl_SetItemImage_2: { // wxTreeCtrl::SetItemImage
  wxTreeItemId item = wxTreeItemId((void *) *(wxUint64 *) bp); bp += 8;
  int * image = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetItemImage(item,(int) *image);
+ This->SetItemImage(item,*image);
  break;
 }
 case wxTreeCtrl_SetItemImage_3: { // wxTreeCtrl::SetItemImage
@@ -19148,7 +19185,7 @@ which = *(wxTreeItemIcon *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetItemImage(item,(int) *image,(wxTreeItemIcon) which);
+ This->SetItemImage(item,*image,which);
  break;
 }
 case wxTreeCtrl_SetItemText: { // wxTreeCtrl::SetItemText
@@ -19186,7 +19223,7 @@ case wxTreeCtrl_SetWindowStyle: { // wxTreeCtrl::SetWindowStyle
  wxTreeCtrl *This = (wxTreeCtrl *) getPtr(bp,memenv); bp += 4;
  const int * styles = (const int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWindowStyle((long) *styles);
+ This->SetWindowStyle(*styles);
  break;
 }
 case wxTreeCtrl_SortChildren: { // wxTreeCtrl::SortChildren
@@ -19266,7 +19303,7 @@ case wxScrollBar_new_3: { // wxScrollBar::wxScrollBar
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxScrollBar * Result = new EwxScrollBar(parent,(wxWindowID) *id,pos,size,style,*validator);
+ wxScrollBar * Result = new EwxScrollBar(parent,*id,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxScrollBar");
  break;
@@ -19301,7 +19338,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -19337,7 +19374,7 @@ case wxScrollBar_SetThumbPosition: { // wxScrollBar::SetThumbPosition
  wxScrollBar *This = (wxScrollBar *) getPtr(bp,memenv); bp += 4;
  int * viewStart = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetThumbPosition((int) *viewStart);
+ This->SetThumbPosition(*viewStart);
  break;
 }
 case wxScrollBar_SetScrollbar: { // wxScrollBar::SetScrollbar
@@ -19354,7 +19391,7 @@ case wxScrollBar_SetScrollbar: { // wxScrollBar::SetScrollbar
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetScrollbar((int) *position,(int) *thumbSize,(int) *range,(int) *pageSize,refresh);
+ This->SetScrollbar(*position,*thumbSize,*range,*pageSize,refresh);
  break;
 }
 case wxSpinButton_new_2: { // wxSpinButton::wxSpinButton
@@ -19453,14 +19490,14 @@ case wxSpinButton_SetRange: { // wxSpinButton::SetRange
  int * minVal = (int *) bp; bp += 4;
  int * maxVal = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRange((int) *minVal,(int) *maxVal);
+ This->SetRange(*minVal,*maxVal);
  break;
 }
 case wxSpinButton_SetValue: { // wxSpinButton::SetValue
  wxSpinButton *This = (wxSpinButton *) getPtr(bp,memenv); bp += 4;
  int * value = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetValue((int) *value);
+ This->SetValue(*value);
  break;
 }
 case wxSpinCtrl_new_0: { // wxSpinCtrl::wxSpinCtrl
@@ -19582,7 +19619,7 @@ case wxSpinCtrl_SetValue_1_0: { // wxSpinCtrl::SetValue
  wxSpinCtrl *This = (wxSpinCtrl *) getPtr(bp,memenv); bp += 4;
  int * value = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetValue((int) *value);
+ This->SetValue(*value);
  break;
 }
 case wxSpinCtrl_GetValue: { // wxSpinCtrl::GetValue
@@ -19597,7 +19634,7 @@ case wxSpinCtrl_SetRange: { // wxSpinCtrl::SetRange
  int * minVal = (int *) bp; bp += 4;
  int * maxVal = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRange((int) *minVal,(int) *maxVal);
+ This->SetRange(*minVal,*maxVal);
  break;
 }
 case wxSpinCtrl_SetSelection: { // wxSpinCtrl::SetSelection
@@ -19605,7 +19642,7 @@ case wxSpinCtrl_SetSelection: { // wxSpinCtrl::SetSelection
  int * from = (int *) bp; bp += 4;
  int * to = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((long) *from,(long) *to);
+ This->SetSelection(*from,*to);
  break;
 }
 case wxSpinCtrl_GetMin: { // wxSpinCtrl::GetMin
@@ -19654,7 +19691,7 @@ case wxStaticText_new_4: { // wxStaticText::wxStaticText
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxStaticText * Result = new EwxStaticText(parent,(wxWindowID) *id,label,pos,size,style);
+ wxStaticText * Result = new EwxStaticText(parent,*id,label,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxStaticText");
  break;
@@ -19687,7 +19724,7 @@ case wxStaticText_Create: { // wxStaticText::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,label,pos,size,style);
+ bool Result = This->Create(parent,*id,label,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -19711,7 +19748,7 @@ case wxStaticText_Wrap: { // wxStaticText::Wrap
  wxStaticText *This = (wxStaticText *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Wrap((int) *width);
+ This->Wrap(*width);
  break;
 }
 case wxStaticBitmap_new_0: { // wxStaticBitmap::wxStaticBitmap
@@ -19745,7 +19782,7 @@ case wxStaticBitmap_new_4: { // wxStaticBitmap::wxStaticBitmap
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxStaticBitmap * Result = new EwxStaticBitmap(parent,(wxWindowID) *id,*label,pos,size,style);
+ wxStaticBitmap * Result = new EwxStaticBitmap(parent,*id,*label,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxStaticBitmap");
  break;
@@ -19776,7 +19813,7 @@ case wxStaticBitmap_Create: { // wxStaticBitmap::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,*label,pos,size,style);
+ bool Result = This->Create(parent,*id,*label,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -19830,7 +19867,7 @@ case wxRadioBox_new: { // wxRadioBox::wxRadioBox
 val = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxRadioBox * Result = new EwxRadioBox(parent,(wxWindowID) *id,title,pos,size,choices,majorDim,style,*val);
+ wxRadioBox * Result = new EwxRadioBox(parent,*id,title,pos,size,choices,majorDim,style,*val);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxRadioBox");
  break;
@@ -19873,7 +19910,7 @@ val = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,title,pos,size,choices,majorDim,style,*val);
+ bool Result = This->Create(parent,*id,title,pos,size,choices,majorDim,style,*val);
  rt.addBool(Result);
  break;
 }
@@ -19887,7 +19924,7 @@ case wxRadioBox_Enable_2: { // wxRadioBox::Enable
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Enable((int) *n,enable);
+ bool Result = This->Enable(*n,enable);
  rt.addBool(Result);
  break;
 }
@@ -19916,7 +19953,7 @@ case wxRadioBox_GetString: { // wxRadioBox::GetString
  wxRadioBox *This = (wxRadioBox *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetString((int) *n);
+ wxString Result = This->GetString(*n);
  rt.add(Result);
  break;
 }
@@ -19924,7 +19961,7 @@ case wxRadioBox_SetSelection: { // wxRadioBox::SetSelection
  wxRadioBox *This = (wxRadioBox *) getPtr(bp,memenv); bp += 4;
  int * n = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((int) *n);
+ This->SetSelection(*n);
  break;
 }
 case wxRadioBox_Show_2: { // wxRadioBox::Show
@@ -19937,7 +19974,7 @@ case wxRadioBox_Show_2: { // wxRadioBox::Show
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Show((int) *n,show);
+ bool Result = This->Show(*n,show);
  rt.addBool(Result);
  break;
 }
@@ -19966,7 +20003,7 @@ case wxRadioBox_GetItemHelpText: { // wxRadioBox::GetItemHelpText
  wxRadioBox *This = (wxRadioBox *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetItemHelpText((int) *n);
+ wxString Result = This->GetItemHelpText(*n);
  rt.add(Result);
  break;
 }
@@ -19974,7 +20011,7 @@ case wxRadioBox_GetItemToolTip: { // wxRadioBox::GetItemToolTip
  wxRadioBox *This = (wxRadioBox *) getPtr(bp,memenv); bp += 4;
  unsigned int * item = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxToolTip * Result = (wxToolTip*)This->GetItemToolTip((int) *item);
+ wxToolTip * Result = (wxToolTip*)This->GetItemToolTip(*item);
  rt.addRef(getRef((void *)Result,memenv), "wxToolTip");
  break;
 }
@@ -19999,7 +20036,7 @@ case wxRadioBox_IsItemEnabled: { // wxRadioBox::IsItemEnabled
  wxRadioBox *This = (wxRadioBox *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsItemEnabled((int) *n);
+ bool Result = This->IsItemEnabled(*n);
  rt.addBool(Result);
  break;
 }
@@ -20007,7 +20044,7 @@ case wxRadioBox_IsItemShown: { // wxRadioBox::IsItemShown
  wxRadioBox *This = (wxRadioBox *) getPtr(bp,memenv); bp += 4;
  unsigned int * n = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsItemShown((int) *n);
+ bool Result = This->IsItemShown(*n);
  rt.addBool(Result);
  break;
 }
@@ -20018,7 +20055,7 @@ case wxRadioBox_SetItemHelpText: { // wxRadioBox::SetItemHelpText
  wxString helpText = wxString(bp, wxConvUTF8);
  bp += *helpTextLen+((8-((4+ *helpTextLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetItemHelpText((int) *n,helpText);
+ This->SetItemHelpText(*n,helpText);
  break;
 }
 case wxRadioBox_SetItemToolTip: { // wxRadioBox::SetItemToolTip
@@ -20028,7 +20065,7 @@ case wxRadioBox_SetItemToolTip: { // wxRadioBox::SetItemToolTip
  wxString text = wxString(bp, wxConvUTF8);
  bp += *textLen+((8-((4+ *textLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetItemToolTip((int) *item,text);
+ This->SetItemToolTip(*item,text);
  break;
 }
 case wxRadioButton_new_0: { // wxRadioButton::wxRadioButton
@@ -20067,7 +20104,7 @@ case wxRadioButton_new_4: { // wxRadioButton::wxRadioButton
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxRadioButton * Result = new EwxRadioButton(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ wxRadioButton * Result = new EwxRadioButton(parent,*id,label,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxRadioButton");
  break;
@@ -20104,7 +20141,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,label,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,label,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -20119,7 +20156,7 @@ case wxRadioButton_SetValue: { // wxRadioButton::SetValue
  wxRadioButton *This = (wxRadioButton *) getPtr(bp,memenv); bp += 4;
  bool * val = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetValue((bool) *val);
+ This->SetValue(*val);
  break;
 }
 case wxSlider_new_6: { // wxSlider::wxSlider
@@ -20153,7 +20190,7 @@ case wxSlider_new_6: { // wxSlider::wxSlider
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxSlider * Result = new EwxSlider(parent,(wxWindowID) *id,(int) *value,(int) *minValue,(int) *maxValue,pos,size,style,*validator);
+ wxSlider * Result = new EwxSlider(parent,*id,*value,*minValue,*maxValue,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxSlider");
  break;
@@ -20196,7 +20233,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,(int) *value,(int) *minValue,(int) *maxValue,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,*value,*minValue,*maxValue,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -20246,14 +20283,14 @@ case wxSlider_SetLineSize: { // wxSlider::SetLineSize
  wxSlider *This = (wxSlider *) getPtr(bp,memenv); bp += 4;
  int * lineSize = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLineSize((int) *lineSize);
+ This->SetLineSize(*lineSize);
  break;
 }
 case wxSlider_SetPageSize: { // wxSlider::SetPageSize
  wxSlider *This = (wxSlider *) getPtr(bp,memenv); bp += 4;
  int * pageSize = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPageSize((int) *pageSize);
+ This->SetPageSize(*pageSize);
  break;
 }
 case wxSlider_SetRange: { // wxSlider::SetRange
@@ -20261,21 +20298,21 @@ case wxSlider_SetRange: { // wxSlider::SetRange
  int * minValue = (int *) bp; bp += 4;
  int * maxValue = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRange((int) *minValue,(int) *maxValue);
+ This->SetRange(*minValue,*maxValue);
  break;
 }
 case wxSlider_SetThumbLength: { // wxSlider::SetThumbLength
  wxSlider *This = (wxSlider *) getPtr(bp,memenv); bp += 4;
  int * lenPixels = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetThumbLength((int) *lenPixels);
+ This->SetThumbLength(*lenPixels);
  break;
 }
 case wxSlider_SetValue: { // wxSlider::SetValue
  wxSlider *This = (wxSlider *) getPtr(bp,memenv); bp += 4;
  int * value = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetValue((int) *value);
+ This->SetValue(*value);
  break;
 }
 case wxDialog_new_4: { // wxDialog::wxDialog
@@ -20304,7 +20341,7 @@ case wxDialog_new_4: { // wxDialog::wxDialog
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxDialog * Result = new EwxDialog(parent,(wxWindowID) *id,title,pos,size,style);
+ wxDialog * Result = new EwxDialog(parent,*id,title,pos,size,style);
  newPtr((void *) Result, 2, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxDialog");
  break;
@@ -20343,7 +20380,7 @@ case wxDialog_Create: { // wxDialog::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,title,pos,size,style);
+ bool Result = This->Create(parent,*id,title,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -20351,7 +20388,7 @@ case wxDialog_CreateButtonSizer: { // wxDialog::CreateButtonSizer
  wxDialog *This = (wxDialog *) getPtr(bp,memenv); bp += 4;
  int * flags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxSizer * Result = (wxSizer*)This->CreateButtonSizer((long) *flags);
+ wxSizer * Result = (wxSizer*)This->CreateButtonSizer(*flags);
  rt.addRef(getRef((void *)Result,memenv), "wxSizer");
  break;
 }
@@ -20359,7 +20396,7 @@ case wxDialog_CreateStdDialogButtonSizer: { // wxDialog::CreateStdDialogButtonSi
  wxDialog *This = (wxDialog *) getPtr(bp,memenv); bp += 4;
  int * flags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxStdDialogButtonSizer * Result = (wxStdDialogButtonSizer*)This->CreateStdDialogButtonSizer((long) *flags);
+ wxStdDialogButtonSizer * Result = (wxStdDialogButtonSizer*)This->CreateStdDialogButtonSizer(*flags);
  rt.addRef(getRef((void *)Result,memenv), "wxStdDialogButtonSizer");
  break;
 }
@@ -20367,7 +20404,7 @@ case wxDialog_EndModal: { // wxDialog::EndModal
  wxDialog *This = (wxDialog *) getPtr(bp,memenv); bp += 4;
  int * retCode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EndModal((int) *retCode);
+ This->EndModal(*retCode);
  break;
 }
 case wxDialog_GetAffirmativeId: { // wxDialog::GetAffirmativeId
@@ -20395,14 +20432,14 @@ case wxDialog_SetAffirmativeId: { // wxDialog::SetAffirmativeId
  wxDialog *This = (wxDialog *) getPtr(bp,memenv); bp += 4;
  int * affirmativeId = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAffirmativeId((int) *affirmativeId);
+ This->SetAffirmativeId(*affirmativeId);
  break;
 }
 case wxDialog_SetReturnCode: { // wxDialog::SetReturnCode
  wxDialog *This = (wxDialog *) getPtr(bp,memenv); bp += 4;
  int * returnCode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetReturnCode((int) *returnCode);
+ This->SetReturnCode(*returnCode);
  break;
 }
 case wxDialog_Show: { // wxDialog::Show
@@ -20498,7 +20535,7 @@ case wxColourData_GetCustomColour: { // wxColourData::GetCustomColour
  wxColourData *This = (wxColourData *) getPtr(bp,memenv); bp += 4;
  int * i = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour Result = This->GetCustomColour((int) *i);
+ wxColour Result = This->GetCustomColour(*i);
  rt.add(Result);
  break;
 }
@@ -20506,7 +20543,7 @@ case wxColourData_SetChooseFull: { // wxColourData::SetChooseFull
  wxColourData *This = (wxColourData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetChooseFull((bool) *flag);
+ This->SetChooseFull(*flag);
  break;
 }
 case wxColourData_SetColour: { // wxColourData::SetColour
@@ -20529,7 +20566,7 @@ case wxColourData_SetCustomColour: { // wxColourData::SetCustomColour
  int * colourA = (int *) bp; bp += 4;
  wxColour colour = wxColour(*colourR,*colourG,*colourB,*colourA);
  if(!This) throw wxe_badarg(0);
- This->SetCustomColour((int) *i,colour);
+ This->SetCustomColour(*i,colour);
  break;
 }
 case wxPalette_new_0: { // wxPalette::wxPalette
@@ -20570,7 +20607,7 @@ case wxPalette_GetPixel: { // wxPalette::GetPixel
  unsigned int * green = (unsigned int *) bp; bp += 4;
  unsigned int * blue = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetPixel((char) *red,(char) *green,(char) *blue);
+ int Result = This->GetPixel(*red,*green,*blue);
  rt.addInt(Result);
  break;
 }
@@ -20581,7 +20618,7 @@ case wxPalette_GetRGB: { // wxPalette::GetRGB
  wxPalette *This = (wxPalette *) getPtr(bp,memenv); bp += 4;
  int * pixel = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetRGB((int) *pixel,&red,&green,&blue);
+ bool Result = This->GetRGB(*pixel,&red,&green,&blue);
  rt.addBool(Result);
  rt.addUint(red);
  rt.addUint(green);
@@ -20800,7 +20837,7 @@ case wxFileDialog_SetFilterIndex: { // wxFileDialog::SetFilterIndex
  wxFileDialog *This = (wxFileDialog *) getPtr(bp,memenv); bp += 4;
  int * filterIndex = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFilterIndex((int) *filterIndex);
+ This->SetFilterIndex(*filterIndex);
  break;
 }
 case wxFileDialog_SetMessage: { // wxFileDialog::SetMessage
@@ -20834,7 +20871,7 @@ case wxPickerBase_SetInternalMargin: { // wxPickerBase::SetInternalMargin
  wxPickerBase *This = (wxPickerBase *) getPtr(bp,memenv); bp += 4;
  int * newmargin = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetInternalMargin((int) *newmargin);
+ This->SetInternalMargin(*newmargin);
  break;
 }
 case wxPickerBase_GetInternalMargin: { // wxPickerBase::GetInternalMargin
@@ -20848,14 +20885,14 @@ case wxPickerBase_SetTextCtrlProportion: { // wxPickerBase::SetTextCtrlProportio
  wxPickerBase *This = (wxPickerBase *) getPtr(bp,memenv); bp += 4;
  int * prop = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetTextCtrlProportion((int) *prop);
+ This->SetTextCtrlProportion(*prop);
  break;
 }
 case wxPickerBase_SetPickerCtrlProportion: { // wxPickerBase::SetPickerCtrlProportion
  wxPickerBase *This = (wxPickerBase *) getPtr(bp,memenv); bp += 4;
  int * prop = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPickerCtrlProportion((int) *prop);
+ This->SetPickerCtrlProportion(*prop);
  break;
 }
 case wxPickerBase_GetTextCtrlProportion: { // wxPickerBase::GetTextCtrlProportion
@@ -20977,7 +21014,7 @@ case wxFilePickerCtrl_new_3: { // wxFilePickerCtrl::wxFilePickerCtrl
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxFilePickerCtrl * Result = new EwxFilePickerCtrl(parent,(wxWindowID) *id,path,message,wildcard,pos,size,style,*validator);
+ wxFilePickerCtrl * Result = new EwxFilePickerCtrl(parent,*id,path,message,wildcard,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFilePickerCtrl");
  break;
@@ -21030,7 +21067,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,path,message,wildcard,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,path,message,wildcard,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -21095,7 +21132,7 @@ case wxDirPickerCtrl_new_3: { // wxDirPickerCtrl::wxDirPickerCtrl
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxDirPickerCtrl * Result = new EwxDirPickerCtrl(parent,(wxWindowID) *id,path,message,pos,size,style,*validator);
+ wxDirPickerCtrl * Result = new EwxDirPickerCtrl(parent,*id,path,message,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxDirPickerCtrl");
  break;
@@ -21142,7 +21179,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,path,message,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,path,message,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -21204,7 +21241,7 @@ case wxColourPickerCtrl_new_3: { // wxColourPickerCtrl::wxColourPickerCtrl
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxColourPickerCtrl * Result = new EwxColourPickerCtrl(parent,(wxWindowID) *id,col,pos,size,style,*validator);
+ wxColourPickerCtrl * Result = new EwxColourPickerCtrl(parent,*id,col,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxColourPickerCtrl");
  break;
@@ -21248,7 +21285,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,col,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,col,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -21324,7 +21361,7 @@ case wxDatePickerCtrl_new_3: { // wxDatePickerCtrl::wxDatePickerCtrl
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxDatePickerCtrl * Result = new EwxDatePickerCtrl(parent,(wxWindowID) *id,date,pos,size,style,*validator);
+ wxDatePickerCtrl * Result = new EwxDatePickerCtrl(parent,*id,date,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxDatePickerCtrl");
  break;
@@ -21427,7 +21464,7 @@ initial = (wxFont *) getPtr(bp,memenv); bp += 4;
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- wxFontPickerCtrl * Result = new EwxFontPickerCtrl(parent,(wxWindowID) *id,*initial,pos,size,style,*validator);
+ wxFontPickerCtrl * Result = new EwxFontPickerCtrl(parent,*id,*initial,pos,size,style,*validator);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFontPickerCtrl");
  break;
@@ -21466,7 +21503,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,*initial,pos,size,style,*validator);
+ bool Result = This->Create(parent,*id,*initial,pos,size,style,*validator);
  rt.addBool(Result);
  break;
 }
@@ -21495,7 +21532,7 @@ case wxFontPickerCtrl_SetMaxPointSize: { // wxFontPickerCtrl::SetMaxPointSize
  wxFontPickerCtrl *This = (wxFontPickerCtrl *) getPtr(bp,memenv); bp += 4;
  unsigned int * max = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMaxPointSize((int) *max);
+ This->SetMaxPointSize(*max);
  break;
 }
 case wxFindReplaceDialog_new_0: { // wxFindReplaceDialog::wxFindReplaceDialog
@@ -21554,7 +21591,7 @@ case wxFindReplaceData_new_0: { // wxFindReplaceData::wxFindReplaceData
 }
 case wxFindReplaceData_new_1: { // wxFindReplaceData::wxFindReplaceData
  unsigned int * flags = (unsigned int *) bp; bp += 4;
- wxFindReplaceData * Result = new EwxFindReplaceData((int) *flags);
+ wxFindReplaceData * Result = new EwxFindReplaceData(*flags);
  newPtr((void *) Result, 1, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFindReplaceData");
  break;
@@ -21584,7 +21621,7 @@ case wxFindReplaceData_SetFlags: { // wxFindReplaceData::SetFlags
  wxFindReplaceData *This = (wxFindReplaceData *) getPtr(bp,memenv); bp += 4;
  unsigned int * flags = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFlags((int) *flags);
+ This->SetFlags(*flags);
  break;
 }
 case wxFindReplaceData_SetFindString: { // wxFindReplaceData::SetFindString
@@ -21725,7 +21762,7 @@ case wxSingleChoiceDialog_SetSelection: { // wxSingleChoiceDialog::SetSelection
  wxSingleChoiceDialog *This = (wxSingleChoiceDialog *) getPtr(bp,memenv); bp += 4;
  int * sel = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((int) *sel);
+ This->SetSelection(*sel);
  break;
 }
 case wxTextEntryDialog_new: { // wxTextEntryDialog::wxTextEntryDialog
@@ -21831,7 +21868,7 @@ case wxFontData_EnableEffects: { // wxFontData::EnableEffects
  wxFontData *This = (wxFontData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableEffects((bool) *flag);
+ This->EnableEffects(*flag);
  break;
 }
 case wxFontData_GetAllowSymbols: { // wxFontData::GetAllowSymbols
@@ -21880,7 +21917,7 @@ case wxFontData_SetAllowSymbols: { // wxFontData::SetAllowSymbols
  wxFontData *This = (wxFontData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAllowSymbols((bool) *flag);
+ This->SetAllowSymbols(*flag);
  break;
 }
 case wxFontData_SetChosenFont: { // wxFontData::SetChosenFont
@@ -21913,14 +21950,14 @@ case wxFontData_SetRange: { // wxFontData::SetRange
  int * minRange = (int *) bp; bp += 4;
  int * maxRange = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRange((int) *minRange,(int) *maxRange);
+ This->SetRange(*minRange,*maxRange);
  break;
 }
 case wxFontData_SetShowHelp: { // wxFontData::SetShowHelp
  wxFontData *This = (wxFontData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetShowHelp((bool) *flag);
+ This->SetShowHelp(*flag);
  break;
 }
 case wxFontDialog_new_0: { // wxFontDialog::wxFontDialog
@@ -21997,7 +22034,7 @@ case wxProgressDialog_Update_2: { // wxProgressDialog::Update
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Update((int) *value,newmsg);
+ bool Result = This->Update(*value,newmsg);
  rt.addBool(Result);
  break;
 }
@@ -22088,35 +22125,35 @@ case wxPageSetupDialogData_EnableHelp: { // wxPageSetupDialogData::EnableHelp
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableHelp((bool) *flag);
+ This->EnableHelp(*flag);
  break;
 }
 case wxPageSetupDialogData_EnableMargins: { // wxPageSetupDialogData::EnableMargins
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableMargins((bool) *flag);
+ This->EnableMargins(*flag);
  break;
 }
 case wxPageSetupDialogData_EnableOrientation: { // wxPageSetupDialogData::EnableOrientation
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableOrientation((bool) *flag);
+ This->EnableOrientation(*flag);
  break;
 }
 case wxPageSetupDialogData_EnablePaper: { // wxPageSetupDialogData::EnablePaper
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnablePaper((bool) *flag);
+ This->EnablePaper(*flag);
  break;
 }
 case wxPageSetupDialogData_EnablePrinter: { // wxPageSetupDialogData::EnablePrinter
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnablePrinter((bool) *flag);
+ This->EnablePrinter(*flag);
  break;
 }
 case wxPageSetupDialogData_GetDefaultMinMargins: { // wxPageSetupDialogData::GetDefaultMinMargins
@@ -22199,7 +22236,7 @@ case wxPageSetupDialogData_GetMinMarginBottomRight: { // wxPageSetupDialogData::
 case wxPageSetupDialogData_GetPaperId: { // wxPageSetupDialogData::GetPaperId
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxPaperSize Result = This->GetPaperId();
+ int Result = This->GetPaperId();
  rt.addInt(Result);
  break;
 }
@@ -22228,14 +22265,14 @@ case wxPageSetupDialogData_SetDefaultInfo: { // wxPageSetupDialogData::SetDefaul
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetDefaultInfo((bool) *flag);
+ This->SetDefaultInfo(*flag);
  break;
 }
 case wxPageSetupDialogData_SetDefaultMinMargins: { // wxPageSetupDialogData::SetDefaultMinMargins
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetDefaultMinMargins((bool) *flag);
+ This->SetDefaultMinMargins(*flag);
  break;
 }
 case wxPageSetupDialogData_SetMarginTopLeft: { // wxPageSetupDialogData::SetMarginTopLeft
@@ -22276,9 +22313,9 @@ case wxPageSetupDialogData_SetMinMarginBottomRight: { // wxPageSetupDialogData::
 }
 case wxPageSetupDialogData_SetPaperId: { // wxPageSetupDialogData::SetPaperId
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
- int * id = (int *) bp; bp += 4;
+ wxPaperSize id = *(wxPaperSize *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetPaperId((wxPaperSize) *id);
+ This->SetPaperId(id);
  break;
 }
 case wxPageSetupDialogData_SetPaperSize_1_1: { // wxPageSetupDialogData::SetPaperSize
@@ -22292,9 +22329,9 @@ case wxPageSetupDialogData_SetPaperSize_1_1: { // wxPageSetupDialogData::SetPape
 }
 case wxPageSetupDialogData_SetPaperSize_1_0: { // wxPageSetupDialogData::SetPaperSize
  wxPageSetupDialogData *This = (wxPageSetupDialogData *) getPtr(bp,memenv); bp += 4;
- int * id = (int *) bp; bp += 4;
+ wxPaperSize id = *(wxPaperSize *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetPaperSize((wxPaperSize) *id);
+ This->SetPaperSize(id);
  break;
 }
 case wxPageSetupDialogData_SetPrintData: { // wxPageSetupDialogData::SetPrintData
@@ -22364,28 +22401,28 @@ case wxPrintDialogData_EnableHelp: { // wxPrintDialogData::EnableHelp
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableHelp((bool) *flag);
+ This->EnableHelp(*flag);
  break;
 }
 case wxPrintDialogData_EnablePageNumbers: { // wxPrintDialogData::EnablePageNumbers
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnablePageNumbers((bool) *flag);
+ This->EnablePageNumbers(*flag);
  break;
 }
 case wxPrintDialogData_EnablePrintToFile: { // wxPrintDialogData::EnablePrintToFile
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnablePrintToFile((bool) *flag);
+ This->EnablePrintToFile(*flag);
  break;
 }
 case wxPrintDialogData_EnableSelection: { // wxPrintDialogData::EnableSelection
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnableSelection((bool) *flag);
+ This->EnableSelection(*flag);
  break;
 }
 case wxPrintDialogData_GetAllPages: { // wxPrintDialogData::GetAllPages
@@ -22469,35 +22506,35 @@ case wxPrintDialogData_SetCollate: { // wxPrintDialogData::SetCollate
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCollate((bool) *flag);
+ This->SetCollate(*flag);
  break;
 }
 case wxPrintDialogData_SetFromPage: { // wxPrintDialogData::SetFromPage
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  int * v = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFromPage((int) *v);
+ This->SetFromPage(*v);
  break;
 }
 case wxPrintDialogData_SetMaxPage: { // wxPrintDialogData::SetMaxPage
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  int * v = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMaxPage((int) *v);
+ This->SetMaxPage(*v);
  break;
 }
 case wxPrintDialogData_SetMinPage: { // wxPrintDialogData::SetMinPage
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  int * v = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMinPage((int) *v);
+ This->SetMinPage(*v);
  break;
 }
 case wxPrintDialogData_SetNoCopies: { // wxPrintDialogData::SetNoCopies
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  int * v = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetNoCopies((int) *v);
+ This->SetNoCopies(*v);
  break;
 }
 case wxPrintDialogData_SetPrintData: { // wxPrintDialogData::SetPrintData
@@ -22511,21 +22548,21 @@ case wxPrintDialogData_SetPrintToFile: { // wxPrintDialogData::SetPrintToFile
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPrintToFile((bool) *flag);
+ This->SetPrintToFile(*flag);
  break;
 }
 case wxPrintDialogData_SetSelection: { // wxPrintDialogData::SetSelection
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((bool) *flag);
+ This->SetSelection(*flag);
  break;
 }
 case wxPrintDialogData_SetToPage: { // wxPrintDialogData::SetToPage
  wxPrintDialogData *This = (wxPrintDialogData *) getPtr(bp,memenv); bp += 4;
  int * v = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetToPage((int) *v);
+ This->SetToPage(*v);
  break;
 }
 case wxPrintData_new_0: { // wxPrintData::wxPrintData
@@ -22586,7 +22623,7 @@ case wxPrintData_GetOrientation: { // wxPrintData::GetOrientation
 case wxPrintData_GetPaperId: { // wxPrintData::GetPaperId
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxPaperSize Result = This->GetPaperId();
+ int Result = This->GetPaperId();
  rt.addInt(Result);
  break;
 }
@@ -22615,49 +22652,49 @@ case wxPrintData_SetBin: { // wxPrintData::SetBin
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  wxPrintBin bin = *(wxPrintBin *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetBin((wxPrintBin) bin);
+ This->SetBin(bin);
  break;
 }
 case wxPrintData_SetCollate: { // wxPrintData::SetCollate
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  bool * flag = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCollate((bool) *flag);
+ This->SetCollate(*flag);
  break;
 }
 case wxPrintData_SetColour: { // wxPrintData::SetColour
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  bool * colour = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetColour((bool) *colour);
+ This->SetColour(*colour);
  break;
 }
 case wxPrintData_SetDuplex: { // wxPrintData::SetDuplex
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  wxDuplexMode duplex = *(wxDuplexMode *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetDuplex((wxDuplexMode) duplex);
+ This->SetDuplex(duplex);
  break;
 }
 case wxPrintData_SetNoCopies: { // wxPrintData::SetNoCopies
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  int * v = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetNoCopies((int) *v);
+ This->SetNoCopies(*v);
  break;
 }
 case wxPrintData_SetOrientation: { // wxPrintData::SetOrientation
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  int * orient = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetOrientation((int) *orient);
+ This->SetOrientation(*orient);
  break;
 }
 case wxPrintData_SetPaperId: { // wxPrintData::SetPaperId
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
- int * sizeId = (int *) bp; bp += 4;
+ wxPaperSize sizeId = *(wxPaperSize *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetPaperId((wxPaperSize) *sizeId);
+ This->SetPaperId(sizeId);
  break;
 }
 case wxPrintData_SetPrinterName: { // wxPrintData::SetPrinterName
@@ -22673,7 +22710,7 @@ case wxPrintData_SetQuality: { // wxPrintData::SetQuality
  wxPrintData *This = (wxPrintData *) getPtr(bp,memenv); bp += 4;
  int * quality = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetQuality((wxPrintQuality) *quality);
+ This->SetQuality(*quality);
  break;
 }
 case wxPrintPreview_new_2: { // wxPrintPreview::wxPrintPreview
@@ -22772,7 +22809,7 @@ case wxPrintPreview_Print: { // wxPrintPreview::Print
  wxPrintPreview *This = (wxPrintPreview *) getPtr(bp,memenv); bp += 4;
  bool * interactive = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Print((bool) *interactive);
+ bool Result = This->Print(*interactive);
  rt.addBool(Result);
  break;
 }
@@ -22780,7 +22817,7 @@ case wxPrintPreview_RenderPage: { // wxPrintPreview::RenderPage
  wxPrintPreview *This = (wxPrintPreview *) getPtr(bp,memenv); bp += 4;
  int * pageNum = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->RenderPage((int) *pageNum);
+ bool Result = This->RenderPage(*pageNum);
  rt.addBool(Result);
  break;
 }
@@ -22795,7 +22832,7 @@ case wxPrintPreview_SetCurrentPage: { // wxPrintPreview::SetCurrentPage
  wxPrintPreview *This = (wxPrintPreview *) getPtr(bp,memenv); bp += 4;
  int * pageNum = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetCurrentPage((int) *pageNum);
+ bool Result = This->SetCurrentPage(*pageNum);
  rt.addBool(Result);
  break;
 }
@@ -22817,7 +22854,7 @@ case wxPrintPreview_SetZoom: { // wxPrintPreview::SetZoom
  wxPrintPreview *This = (wxPrintPreview *) getPtr(bp,memenv); bp += 4;
  int * percent = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetZoom((int) *percent);
+ This->SetZoom(*percent);
  break;
 }
 case wxPreviewFrame_new: { // wxPreviewFrame::wxPreviewFrame
@@ -22904,7 +22941,7 @@ case wxPreviewControlBar_new: { // wxPreviewControlBar::wxPreviewControlBar
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxPreviewControlBar * Result = new EwxPreviewControlBar(preview,(long) *buttons,parent,pos,size,style);
+ wxPreviewControlBar * Result = new EwxPreviewControlBar(preview,*buttons,parent,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxPreviewControlBar");
  break;
@@ -22933,7 +22970,7 @@ case wxPreviewControlBar_SetZoomControl: { // wxPreviewControlBar::SetZoomContro
  wxPreviewControlBar *This = (wxPreviewControlBar *) getPtr(bp,memenv); bp += 4;
  int * zoom = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetZoomControl((int) *zoom);
+ This->SetZoomControl(*zoom);
  break;
 }
 case wxPrinter_new: { // wxPrinter::wxPrinter
@@ -23089,7 +23126,7 @@ case wxXmlResource_CompareVersion: { // wxXmlResource::CompareVersion
  int * release = (int *) bp; bp += 4;
  int * revision = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->CompareVersion((int) *major,(int) *minor,(int) *release,(int) *revision);
+ int Result = This->CompareVersion(*major,*minor,*release,*revision);
  rt.addInt(Result);
  break;
 }
@@ -23283,7 +23320,7 @@ case wxXmlResource_SetFlags: { // wxXmlResource::SetFlags
  wxXmlResource *This = (wxXmlResource *) getPtr(bp,memenv); bp += 4;
  int * flags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFlags((int) *flags);
+ This->SetFlags(*flags);
  break;
 }
 case wxXmlResource_Unload: { // wxXmlResource::Unload
@@ -23811,14 +23848,14 @@ case wxAuiManager_SetDockSizeConstraint: { // wxAuiManager::SetDockSizeConstrain
  double * width_pct = (double *) bp; bp += 8;
  double * height_pct = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->SetDockSizeConstraint((double) *width_pct,(double) *height_pct);
+ This->SetDockSizeConstraint(*width_pct,*height_pct);
  break;
 }
 case wxAuiManager_SetFlags: { // wxAuiManager::SetFlags
  wxAuiManager *This = (wxAuiManager *) getPtr(bp,memenv); bp += 4;
  unsigned int * flags = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFlags((int) *flags);
+ This->SetFlags(*flags);
  break;
 }
 case wxAuiManager_SetManagedWindow: { // wxAuiManager::SetManagedWindow
@@ -23887,7 +23924,7 @@ case wxAuiPaneInfo_BestSize_2: { // wxAuiPaneInfo::BestSize
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->BestSize((int) *x,(int) *y);
+ wxAuiPaneInfo * Result = &This->BestSize(*x,*y);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -23989,7 +24026,7 @@ case wxAuiPaneInfo_Direction: { // wxAuiPaneInfo::Direction
  wxAuiPaneInfo *This = (wxAuiPaneInfo *) getPtr(bp,memenv); bp += 4;
  int * direction = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->Direction((int) *direction);
+ wxAuiPaneInfo * Result = &This->Direction(*direction);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24057,7 +24094,7 @@ case wxAuiPaneInfo_FloatingPosition_2: { // wxAuiPaneInfo::FloatingPosition
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->FloatingPosition((int) *x,(int) *y);
+ wxAuiPaneInfo * Result = &This->FloatingPosition(*x,*y);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24076,7 +24113,7 @@ case wxAuiPaneInfo_FloatingSize_2: { // wxAuiPaneInfo::FloatingSize
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->FloatingSize((int) *x,(int) *y);
+ wxAuiPaneInfo * Result = &This->FloatingSize(*x,*y);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24133,7 +24170,7 @@ case wxAuiPaneInfo_HasFlag: { // wxAuiPaneInfo::HasFlag
  wxAuiPaneInfo *This = (wxAuiPaneInfo *) getPtr(bp,memenv); bp += 4;
  unsigned int * flag = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->HasFlag((int) *flag);
+ bool Result = This->HasFlag(*flag);
  rt.addBool(Result);
  break;
 }
@@ -24274,7 +24311,7 @@ case wxAuiPaneInfo_Layer: { // wxAuiPaneInfo::Layer
  wxAuiPaneInfo *This = (wxAuiPaneInfo *) getPtr(bp,memenv); bp += 4;
  int * layer = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->Layer((int) *layer);
+ wxAuiPaneInfo * Result = &This->Layer(*layer);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24314,7 +24351,7 @@ case wxAuiPaneInfo_MaxSize_2: { // wxAuiPaneInfo::MaxSize
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->MaxSize((int) *x,(int) *y);
+ wxAuiPaneInfo * Result = &This->MaxSize(*x,*y);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24347,7 +24384,7 @@ case wxAuiPaneInfo_MinSize_2: { // wxAuiPaneInfo::MinSize
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->MinSize((int) *x,(int) *y);
+ wxAuiPaneInfo * Result = &This->MinSize(*x,*y);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24421,7 +24458,7 @@ case wxAuiPaneInfo_Position: { // wxAuiPaneInfo::Position
  wxAuiPaneInfo *This = (wxAuiPaneInfo *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->Position((int) *pos);
+ wxAuiPaneInfo * Result = &This->Position(*pos);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24464,7 +24501,7 @@ case wxAuiPaneInfo_Row: { // wxAuiPaneInfo::Row
  wxAuiPaneInfo *This = (wxAuiPaneInfo *) getPtr(bp,memenv); bp += 4;
  int * row = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->Row((int) *row);
+ wxAuiPaneInfo * Result = &This->Row(*row);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24480,7 +24517,7 @@ case wxAuiPaneInfo_SetFlag: { // wxAuiPaneInfo::SetFlag
  unsigned int * flag = (unsigned int *) bp; bp += 4;
  bool * option_state = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxAuiPaneInfo * Result = &This->SetFlag((int) *flag,(bool) *option_state);
+ wxAuiPaneInfo * Result = &This->SetFlag(*flag,*option_state);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -24631,7 +24668,7 @@ case wxAuiNotebook_DeletePage: { // wxAuiNotebook::DeletePage
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * page = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->DeletePage((size_t) *page);
+ bool Result = This->DeletePage(*page);
  rt.addBool(Result);
  break;
 }
@@ -24646,7 +24683,7 @@ case wxAuiNotebook_GetPage: { // wxAuiNotebook::GetPage
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * page_idx = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxWindow * Result = (wxWindow*)This->GetPage((size_t) *page_idx);
+ wxWindow * Result = (wxWindow*)This->GetPage(*page_idx);
  rt.addRef(getRef((void *)Result,memenv), "wxWindow");
  break;
 }
@@ -24654,7 +24691,7 @@ case wxAuiNotebook_GetPageBitmap: { // wxAuiNotebook::GetPageBitmap
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * page_idx = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxBitmap * Result = new wxBitmap(This->GetPageBitmap((size_t) *page_idx)); newPtr((void *) Result,3, memenv);;
+ wxBitmap * Result = new wxBitmap(This->GetPageBitmap(*page_idx)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -24677,7 +24714,7 @@ case wxAuiNotebook_GetPageText: { // wxAuiNotebook::GetPageText
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * page_idx = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetPageText((size_t) *page_idx);
+ wxString Result = This->GetPageText(*page_idx);
  rt.add(Result);
  break;
 }
@@ -24706,7 +24743,7 @@ bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->InsertPage((size_t) *page_idx,page,caption,select,*bitmap);
+ bool Result = This->InsertPage(*page_idx,page,caption,select,*bitmap);
  rt.addBool(Result);
  break;
 }
@@ -24714,7 +24751,7 @@ case wxAuiNotebook_RemovePage: { // wxAuiNotebook::RemovePage
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * page = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->RemovePage((size_t) *page);
+ bool Result = This->RemovePage(*page);
  rt.addBool(Result);
  break;
 }
@@ -24738,7 +24775,7 @@ case wxAuiNotebook_SetPageBitmap: { // wxAuiNotebook::SetPageBitmap
  int * page = (int *) bp; bp += 4;
  wxBitmap *bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageBitmap((size_t) *page,*bitmap);
+ bool Result = This->SetPageBitmap(*page,*bitmap);
  rt.addBool(Result);
  break;
 }
@@ -24749,7 +24786,7 @@ case wxAuiNotebook_SetPageText: { // wxAuiNotebook::SetPageText
  wxString text = wxString(bp, wxConvUTF8);
  bp += *textLen+((8-((4+ *textLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->SetPageText((size_t) *page,text);
+ bool Result = This->SetPageText(*page,text);
  rt.addBool(Result);
  break;
 }
@@ -24757,7 +24794,7 @@ case wxAuiNotebook_SetSelection: { // wxAuiNotebook::SetSelection
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * new_page = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- size_t Result = This->SetSelection((size_t) *new_page);
+ size_t Result = This->SetSelection(*new_page);
  rt.addInt(Result);
  break;
 }
@@ -24765,7 +24802,7 @@ case wxAuiNotebook_SetTabCtrlHeight: { // wxAuiNotebook::SetTabCtrlHeight
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * height = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetTabCtrlHeight((int) *height);
+ This->SetTabCtrlHeight(*height);
  break;
 }
 case wxAuiNotebook_SetUniformBitmapSize: { // wxAuiNotebook::SetUniformBitmapSize
@@ -24814,7 +24851,7 @@ case wxMDIParentFrame_new_4: { // wxMDIParentFrame::wxMDIParentFrame
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxMDIParentFrame * Result = new EwxMDIParentFrame(parent,(wxWindowID) *id,title,pos,size,style);
+ wxMDIParentFrame * Result = new EwxMDIParentFrame(parent,*id,title,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxMDIParentFrame");
  break;
@@ -24871,7 +24908,7 @@ case wxMDIParentFrame_Create: { // wxMDIParentFrame::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,title,pos,size,style);
+ bool Result = This->Create(parent,*id,title,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -24899,7 +24936,7 @@ orient = *(wxOrientation *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->Tile((wxOrientation) orient);
+ This->Tile(orient);
  break;
 }
 case wxMDIChildFrame_new_0: { // wxMDIChildFrame::wxMDIChildFrame
@@ -24934,7 +24971,7 @@ case wxMDIChildFrame_new_4: { // wxMDIChildFrame::wxMDIChildFrame
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxMDIChildFrame * Result = new EwxMDIChildFrame(parent,(wxWindowID) *id,title,pos,size,style);
+ wxMDIChildFrame * Result = new EwxMDIChildFrame(parent,*id,title,pos,size,style);
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxMDIChildFrame");
  break;
@@ -24973,7 +25010,7 @@ case wxMDIChildFrame_Create: { // wxMDIChildFrame::Create
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- bool Result = This->Create(parent,(wxWindowID) *id,title,pos,size,style);
+ bool Result = This->Create(parent,*id,title,pos,size,style);
  rt.addBool(Result);
  break;
 }
@@ -25002,6 +25039,7 @@ case wxMDIClientWindow_new_0: { // wxMDIClientWindow::wxMDIClientWindow
  rt.addRef(getRef((void *)Result,memenv), "wxMDIClientWindow");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxMDIClientWindow_new_2: { // wxMDIClientWindow::wxMDIClientWindow
  long style=0;
  wxMDIParentFrame *parent = (wxMDIParentFrame *) getPtr(bp,memenv); bp += 4;
@@ -25016,6 +25054,7 @@ case wxMDIClientWindow_new_2: { // wxMDIClientWindow::wxMDIClientWindow
  rt.addRef(getRef((void *)Result,memenv), "wxMDIClientWindow");
  break;
 }
+#endif
 case wxMDIClientWindow_CreateClient: { // wxMDIClientWindow::CreateClient
  long style=wxVSCROLL|wxHSCROLL;
  wxMDIClientWindow *This = (wxMDIClientWindow *) getPtr(bp,memenv); bp += 4;
@@ -25115,7 +25154,7 @@ case wxEvent_ResumePropagation: { // wxEvent::ResumePropagation
  wxEvent *This = (wxEvent *) getPtr(bp,memenv); bp += 4;
  int * propagationLevel = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ResumePropagation((int) *propagationLevel);
+ This->ResumePropagation(*propagationLevel);
  break;
 }
 case wxEvent_ShouldPropagate: { // wxEvent::ShouldPropagate
@@ -25198,7 +25237,7 @@ case wxCommandEvent_SetInt: { // wxCommandEvent::SetInt
  wxCommandEvent *This = (wxCommandEvent *) getPtr(bp,memenv); bp += 4;
  int * i = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetInt((int) *i);
+ This->SetInt(*i);
  break;
 }
 case wxCommandEvent_SetString: { // wxCommandEvent::SetString
@@ -25249,7 +25288,7 @@ case wxMouseEvent_Button: { // wxMouseEvent::Button
  wxMouseEvent *This = (wxMouseEvent *) getPtr(bp,memenv); bp += 4;
  int * but = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->Button((int) *but);
+ bool Result = This->Button(*but);
  rt.addBool(Result);
  break;
 }
@@ -25713,14 +25752,14 @@ case wxCloseEvent_SetCanVeto: { // wxCloseEvent::SetCanVeto
  wxCloseEvent *This = (wxCloseEvent *) getPtr(bp,memenv); bp += 4;
  bool * canVeto = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCanVeto((bool) *canVeto);
+ This->SetCanVeto(*canVeto);
  break;
 }
 case wxCloseEvent_SetLoggingOff: { // wxCloseEvent::SetLoggingOff
  wxCloseEvent *This = (wxCloseEvent *) getPtr(bp,memenv); bp += 4;
  bool * logOff = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLoggingOff((bool) *logOff);
+ This->SetLoggingOff(*logOff);
  break;
 }
 case wxCloseEvent_Veto: { // wxCloseEvent::Veto
@@ -25740,7 +25779,7 @@ case wxShowEvent_SetShow: { // wxShowEvent::SetShow
  wxShowEvent *This = (wxShowEvent *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetShow((bool) *show);
+ This->SetShow(*show);
  break;
 }
 case wxShowEvent_GetShow: { // wxShowEvent::GetShow
@@ -25865,21 +25904,21 @@ case wxUpdateUIEvent_Check: { // wxUpdateUIEvent::Check
  wxUpdateUIEvent *This = (wxUpdateUIEvent *) getPtr(bp,memenv); bp += 4;
  bool * check = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Check((bool) *check);
+ This->Check(*check);
  break;
 }
 case wxUpdateUIEvent_Enable: { // wxUpdateUIEvent::Enable
  wxUpdateUIEvent *This = (wxUpdateUIEvent *) getPtr(bp,memenv); bp += 4;
  bool * enable = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Enable((bool) *enable);
+ This->Enable(*enable);
  break;
 }
 case wxUpdateUIEvent_Show: { // wxUpdateUIEvent::Show
  wxUpdateUIEvent *This = (wxUpdateUIEvent *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Show((bool) *show);
+ This->Show(*show);
  break;
 }
 case wxUpdateUIEvent_GetChecked: { // wxUpdateUIEvent::GetChecked
@@ -25954,7 +25993,7 @@ case wxUpdateUIEvent_ResetUpdateTime: { // wxUpdateUIEvent::ResetUpdateTime
 }
 case wxUpdateUIEvent_SetMode: { // wxUpdateUIEvent::SetMode
  wxUpdateUIMode mode = *(wxUpdateUIMode *) bp; bp += 4;;
- wxUpdateUIEvent::SetMode((wxUpdateUIMode) mode);
+ wxUpdateUIEvent::SetMode(mode);
  break;
 }
 case wxUpdateUIEvent_SetText: { // wxUpdateUIEvent::SetText
@@ -25968,7 +26007,7 @@ case wxUpdateUIEvent_SetText: { // wxUpdateUIEvent::SetText
 }
 case wxUpdateUIEvent_SetUpdateInterval: { // wxUpdateUIEvent::SetUpdateInterval
  int * updateInterval = (int *) bp; bp += 4;
- wxUpdateUIEvent::SetUpdateInterval((long) *updateInterval);
+ wxUpdateUIEvent::SetUpdateInterval(*updateInterval);
  break;
 }
 case wxMouseCaptureChangedEvent_GetCapturedWindow: { // wxMouseCaptureChangedEvent::GetCapturedWindow
@@ -25996,7 +26035,7 @@ case wxQueryNewPaletteEvent_SetPaletteRealized: { // wxQueryNewPaletteEvent::Set
  wxQueryNewPaletteEvent *This = (wxQueryNewPaletteEvent *) getPtr(bp,memenv); bp += 4;
  bool * realized = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPaletteRealized((bool) *realized);
+ This->SetPaletteRealized(*realized);
  break;
 }
 case wxQueryNewPaletteEvent_GetPaletteRealized: { // wxQueryNewPaletteEvent::GetPaletteRealized
@@ -26017,7 +26056,7 @@ case wxNavigationKeyEvent_SetDirection: { // wxNavigationKeyEvent::SetDirection
  wxNavigationKeyEvent *This = (wxNavigationKeyEvent *) getPtr(bp,memenv); bp += 4;
  bool * bForward = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetDirection((bool) *bForward);
+ This->SetDirection(*bForward);
  break;
 }
 case wxNavigationKeyEvent_IsWindowChange: { // wxNavigationKeyEvent::IsWindowChange
@@ -26031,7 +26070,7 @@ case wxNavigationKeyEvent_SetWindowChange: { // wxNavigationKeyEvent::SetWindowC
  wxNavigationKeyEvent *This = (wxNavigationKeyEvent *) getPtr(bp,memenv); bp += 4;
  bool * bIs = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWindowChange((bool) *bIs);
+ This->SetWindowChange(*bIs);
  break;
 }
 case wxNavigationKeyEvent_IsFromTab: { // wxNavigationKeyEvent::IsFromTab
@@ -26045,7 +26084,7 @@ case wxNavigationKeyEvent_SetFromTab: { // wxNavigationKeyEvent::SetFromTab
  wxNavigationKeyEvent *This = (wxNavigationKeyEvent *) getPtr(bp,memenv); bp += 4;
  bool * bIs = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFromTab((bool) *bIs);
+ This->SetFromTab(*bIs);
  break;
 }
 case wxNavigationKeyEvent_GetCurrentFocus: { // wxNavigationKeyEvent::GetCurrentFocus
@@ -26080,7 +26119,7 @@ case wxHelpEvent_SetOrigin: { // wxHelpEvent::SetOrigin
  wxHelpEvent *This = (wxHelpEvent *) getPtr(bp,memenv); bp += 4;
  wxHelpEvent::Origin origin = *(wxHelpEvent::Origin *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->SetOrigin((wxHelpEvent::Origin) origin);
+ This->SetOrigin(origin);
  break;
 }
 case wxHelpEvent_SetPosition: { // wxHelpEvent::SetPosition
@@ -26108,12 +26147,14 @@ case wxContextMenuEvent_SetPosition: { // wxContextMenuEvent::SetPosition
  This->SetPosition(pos);
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxIdleEvent_CanSend: { // wxIdleEvent::CanSend
  wxWindow *win = (wxWindow *) getPtr(bp,memenv); bp += 4;
  bool Result = wxIdleEvent::CanSend(win);
  rt.addBool(Result);
  break;
 }
+#endif
 case wxIdleEvent_GetMode: { // wxIdleEvent::GetMode
  int Result = wxIdleEvent::GetMode();
  rt.addInt(Result);
@@ -26141,7 +26182,7 @@ case wxIdleEvent_MoreRequested: { // wxIdleEvent::MoreRequested
 }
 case wxIdleEvent_SetMode: { // wxIdleEvent::SetMode
  wxIdleMode mode = *(wxIdleMode *) bp; bp += 4;;
- wxIdleEvent::SetMode((wxIdleMode) mode);
+ wxIdleEvent::SetMode(mode);
  break;
 }
 case wxGridEvent_AltDown: { // wxGridEvent::AltDown
@@ -26529,7 +26570,7 @@ case wxStyledTextEvent_GetAlt: { // wxStyledTextEvent::GetAlt
 }
 case utils_wxGetKeyState: { // utils::wxGetKeyState
  wxKeyCode key = *(wxKeyCode *) bp; bp += 4;;
- bool Result = ::wxGetKeyState((wxKeyCode) key);
+ bool Result = ::wxGetKeyState(key);
  rt.addBool(Result);
  break;
 }
@@ -26549,7 +26590,7 @@ case utils_wxGetMouseState: { // utils::wxGetMouseState
 }
 case utils_wxSetDetectableAutoRepeat: { // utils::wxSetDetectableAutoRepeat
  bool * flag = (bool *) bp; bp += 4;
- bool Result = ::wxSetDetectableAutoRepeat((bool) *flag);
+ bool Result = ::wxSetDetectableAutoRepeat(*flag);
  rt.addBool(Result);
  break;
 }
@@ -26606,7 +26647,7 @@ case utils_wxIsBusy: { // utils::wxIsBusy
 }
 case utils_wxShutdown: { // utils::wxShutdown
  wxShutdownFlags wFlags = *(wxShutdownFlags *) bp; bp += 4;;
- bool Result = ::wxShutdown((wxShutdownFlags) wFlags);
+ bool Result = ::wxShutdown(wFlags);
  rt.addBool(Result);
  break;
 }
@@ -26659,7 +26700,7 @@ case utils_wxNewId: { // utils::wxNewId
 }
 case utils_wxRegisterId: { // utils::wxRegisterId
  int * id = (int *) bp; bp += 4;
- ::wxRegisterId((long) *id);
+ ::wxRegisterId(*id);
  break;
 }
 case utils_wxGetCurrentId: { // utils::wxGetCurrentId
@@ -26862,7 +26903,7 @@ case wxPrintout_SetLogicalOrigin: { // wxPrintout::SetLogicalOrigin
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLogicalOrigin((wxCoord) *x,(wxCoord) *y);
+ This->SetLogicalOrigin(*x,*y);
  break;
 }
 case wxPrintout_OffsetLogicalOrigin: { // wxPrintout::OffsetLogicalOrigin
@@ -26870,7 +26911,7 @@ case wxPrintout_OffsetLogicalOrigin: { // wxPrintout::OffsetLogicalOrigin
  int * xoff = (int *) bp; bp += 4;
  int * yoff = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->OffsetLogicalOrigin((wxCoord) *xoff,(wxCoord) *yoff);
+ This->OffsetLogicalOrigin(*xoff,*yoff);
  break;
 }
 case wxStyledTextCtrl_new_2: { // wxStyledTextCtrl::wxStyledTextCtrl
@@ -26966,7 +27007,7 @@ case wxStyledTextCtrl_InsertText: { // wxStyledTextCtrl::InsertText
  wxString text = wxString(bp, wxConvUTF8);
  bp += *textLen+((8-((4+ *textLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->InsertText((int) *pos,text);
+ This->InsertText(*pos,text);
  break;
 }
 case wxStyledTextCtrl_ClearAll: { // wxStyledTextCtrl::ClearAll
@@ -26992,7 +27033,7 @@ case wxStyledTextCtrl_GetCharAt: { // wxStyledTextCtrl::GetCharAt
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetCharAt((int) *pos);
+ int Result = This->GetCharAt(*pos);
  rt.addInt(Result);
  break;
 }
@@ -27014,7 +27055,7 @@ case wxStyledTextCtrl_GetStyleAt: { // wxStyledTextCtrl::GetStyleAt
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetStyleAt((int) *pos);
+ int Result = This->GetStyleAt(*pos);
  rt.addInt(Result);
  break;
 }
@@ -27028,7 +27069,7 @@ case wxStyledTextCtrl_SetUndoCollection: { // wxStyledTextCtrl::SetUndoCollectio
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * collectUndo = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetUndoCollection((bool) *collectUndo);
+ This->SetUndoCollection(*collectUndo);
  break;
 }
 case wxStyledTextCtrl_SelectAll: { // wxStyledTextCtrl::SelectAll
@@ -27048,7 +27089,7 @@ case wxStyledTextCtrl_GetStyledText: { // wxStyledTextCtrl::GetStyledText
  int * startPos = (int *) bp; bp += 4;
  int * endPos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxMemoryBuffer * Result = new wxMemoryBuffer(This->GetStyledText((int) *startPos,(int) *endPos)); newPtr((void *) Result,3, memenv);;
+ wxMemoryBuffer * Result = new wxMemoryBuffer(This->GetStyledText(*startPos,*endPos)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxMemoryBuffer");
  break;
 }
@@ -27063,7 +27104,7 @@ case wxStyledTextCtrl_MarkerLineFromHandle: { // wxStyledTextCtrl::MarkerLineFro
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * handle = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->MarkerLineFromHandle((int) *handle);
+ int Result = This->MarkerLineFromHandle(*handle);
  rt.addInt(Result);
  break;
 }
@@ -27071,7 +27112,7 @@ case wxStyledTextCtrl_MarkerDeleteHandle: { // wxStyledTextCtrl::MarkerDeleteHan
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * handle = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->MarkerDeleteHandle((int) *handle);
+ This->MarkerDeleteHandle(*handle);
  break;
 }
 case wxStyledTextCtrl_GetUndoCollection: { // wxStyledTextCtrl::GetUndoCollection
@@ -27092,7 +27133,7 @@ case wxStyledTextCtrl_SetViewWhiteSpace: { // wxStyledTextCtrl::SetViewWhiteSpac
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * viewWS = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetViewWhiteSpace((int) *viewWS);
+ This->SetViewWhiteSpace(*viewWS);
  break;
 }
 case wxStyledTextCtrl_PositionFromPoint: { // wxStyledTextCtrl::PositionFromPoint
@@ -27110,7 +27151,7 @@ case wxStyledTextCtrl_PositionFromPointClose: { // wxStyledTextCtrl::PositionFro
  int * x = (int *) bp; bp += 4;
  int * y = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->PositionFromPointClose((int) *x,(int) *y);
+ int Result = This->PositionFromPointClose(*x,*y);
  rt.addInt(Result);
  break;
 }
@@ -27118,21 +27159,21 @@ case wxStyledTextCtrl_GotoLine: { // wxStyledTextCtrl::GotoLine
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->GotoLine((int) *line);
+ This->GotoLine(*line);
  break;
 }
 case wxStyledTextCtrl_GotoPos: { // wxStyledTextCtrl::GotoPos
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->GotoPos((int) *pos);
+ This->GotoPos(*pos);
  break;
 }
 case wxStyledTextCtrl_SetAnchor: { // wxStyledTextCtrl::SetAnchor
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * posAnchor = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetAnchor((int) *posAnchor);
+ This->SetAnchor(*posAnchor);
  break;
 }
 case wxStyledTextCtrl_GetCurLine: { // wxStyledTextCtrl::GetCurLine
@@ -27156,7 +27197,7 @@ case wxStyledTextCtrl_ConvertEOLs: { // wxStyledTextCtrl::ConvertEOLs
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * eolMode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ConvertEOLs((int) *eolMode);
+ This->ConvertEOLs(*eolMode);
  break;
 }
 case wxStyledTextCtrl_GetEOLMode: { // wxStyledTextCtrl::GetEOLMode
@@ -27170,7 +27211,7 @@ case wxStyledTextCtrl_SetEOLMode: { // wxStyledTextCtrl::SetEOLMode
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * eolMode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetEOLMode((int) *eolMode);
+ This->SetEOLMode(*eolMode);
  break;
 }
 case wxStyledTextCtrl_StartStyling: { // wxStyledTextCtrl::StartStyling
@@ -27178,7 +27219,7 @@ case wxStyledTextCtrl_StartStyling: { // wxStyledTextCtrl::StartStyling
  int * pos = (int *) bp; bp += 4;
  int * mask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StartStyling((int) *pos,(int) *mask);
+ This->StartStyling(*pos,*mask);
  break;
 }
 case wxStyledTextCtrl_SetStyling: { // wxStyledTextCtrl::SetStyling
@@ -27186,7 +27227,7 @@ case wxStyledTextCtrl_SetStyling: { // wxStyledTextCtrl::SetStyling
  int * length = (int *) bp; bp += 4;
  int * style = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetStyling((int) *length,(int) *style);
+ This->SetStyling(*length,*style);
  break;
 }
 case wxStyledTextCtrl_GetBufferedDraw: { // wxStyledTextCtrl::GetBufferedDraw
@@ -27200,14 +27241,14 @@ case wxStyledTextCtrl_SetBufferedDraw: { // wxStyledTextCtrl::SetBufferedDraw
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * buffered = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetBufferedDraw((bool) *buffered);
+ This->SetBufferedDraw(*buffered);
  break;
 }
 case wxStyledTextCtrl_SetTabWidth: { // wxStyledTextCtrl::SetTabWidth
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * tabWidth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetTabWidth((int) *tabWidth);
+ This->SetTabWidth(*tabWidth);
  break;
 }
 case wxStyledTextCtrl_GetTabWidth: { // wxStyledTextCtrl::GetTabWidth
@@ -27221,7 +27262,7 @@ case wxStyledTextCtrl_SetCodePage: { // wxStyledTextCtrl::SetCodePage
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * codePage = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCodePage((int) *codePage);
+ This->SetCodePage(*codePage);
  break;
 }
 case wxStyledTextCtrl_MarkerDefine: { // wxStyledTextCtrl::MarkerDefine
@@ -27250,7 +27291,7 @@ case wxStyledTextCtrl_MarkerDefine: { // wxStyledTextCtrl::MarkerDefine
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->MarkerDefine((int) *markerNumber,(int) *markerSymbol,foreground,background);
+ This->MarkerDefine(*markerNumber,*markerSymbol,foreground,background);
  break;
 }
 case wxStyledTextCtrl_MarkerSetForeground: { // wxStyledTextCtrl::MarkerSetForeground
@@ -27262,7 +27303,7 @@ case wxStyledTextCtrl_MarkerSetForeground: { // wxStyledTextCtrl::MarkerSetForeg
  int * foreA = (int *) bp; bp += 4;
  wxColour fore = wxColour(*foreR,*foreG,*foreB,*foreA);
  if(!This) throw wxe_badarg(0);
- This->MarkerSetForeground((int) *markerNumber,fore);
+ This->MarkerSetForeground(*markerNumber,fore);
  break;
 }
 case wxStyledTextCtrl_MarkerSetBackground: { // wxStyledTextCtrl::MarkerSetBackground
@@ -27274,7 +27315,7 @@ case wxStyledTextCtrl_MarkerSetBackground: { // wxStyledTextCtrl::MarkerSetBackg
  int * backA = (int *) bp; bp += 4;
  wxColour back = wxColour(*backR,*backG,*backB,*backA);
  if(!This) throw wxe_badarg(0);
- This->MarkerSetBackground((int) *markerNumber,back);
+ This->MarkerSetBackground(*markerNumber,back);
  break;
 }
 case wxStyledTextCtrl_MarkerAdd: { // wxStyledTextCtrl::MarkerAdd
@@ -27282,7 +27323,7 @@ case wxStyledTextCtrl_MarkerAdd: { // wxStyledTextCtrl::MarkerAdd
  int * line = (int *) bp; bp += 4;
  int * markerNumber = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->MarkerAdd((int) *line,(int) *markerNumber);
+ int Result = This->MarkerAdd(*line,*markerNumber);
  rt.addInt(Result);
  break;
 }
@@ -27291,21 +27332,21 @@ case wxStyledTextCtrl_MarkerDelete: { // wxStyledTextCtrl::MarkerDelete
  int * line = (int *) bp; bp += 4;
  int * markerNumber = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->MarkerDelete((int) *line,(int) *markerNumber);
+ This->MarkerDelete(*line,*markerNumber);
  break;
 }
 case wxStyledTextCtrl_MarkerDeleteAll: { // wxStyledTextCtrl::MarkerDeleteAll
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * markerNumber = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->MarkerDeleteAll((int) *markerNumber);
+ This->MarkerDeleteAll(*markerNumber);
  break;
 }
 case wxStyledTextCtrl_MarkerGet: { // wxStyledTextCtrl::MarkerGet
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->MarkerGet((int) *line);
+ int Result = This->MarkerGet(*line);
  rt.addInt(Result);
  break;
 }
@@ -27314,7 +27355,7 @@ case wxStyledTextCtrl_MarkerNext: { // wxStyledTextCtrl::MarkerNext
  int * lineStart = (int *) bp; bp += 4;
  int * markerMask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->MarkerNext((int) *lineStart,(int) *markerMask);
+ int Result = This->MarkerNext(*lineStart,*markerMask);
  rt.addInt(Result);
  break;
 }
@@ -27323,7 +27364,7 @@ case wxStyledTextCtrl_MarkerPrevious: { // wxStyledTextCtrl::MarkerPrevious
  int * lineStart = (int *) bp; bp += 4;
  int * markerMask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->MarkerPrevious((int) *lineStart,(int) *markerMask);
+ int Result = This->MarkerPrevious(*lineStart,*markerMask);
  rt.addInt(Result);
  break;
 }
@@ -27332,7 +27373,7 @@ case wxStyledTextCtrl_MarkerDefineBitmap: { // wxStyledTextCtrl::MarkerDefineBit
  int * markerNumber = (int *) bp; bp += 4;
  wxBitmap *bmp = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->MarkerDefineBitmap((int) *markerNumber,*bmp);
+ This->MarkerDefineBitmap(*markerNumber,*bmp);
  break;
 }
 case wxStyledTextCtrl_MarkerAddSet: { // wxStyledTextCtrl::MarkerAddSet
@@ -27340,7 +27381,7 @@ case wxStyledTextCtrl_MarkerAddSet: { // wxStyledTextCtrl::MarkerAddSet
  int * line = (int *) bp; bp += 4;
  int * set = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->MarkerAddSet((int) *line,(int) *set);
+ This->MarkerAddSet(*line,*set);
  break;
 }
 case wxStyledTextCtrl_MarkerSetAlpha: { // wxStyledTextCtrl::MarkerSetAlpha
@@ -27348,7 +27389,7 @@ case wxStyledTextCtrl_MarkerSetAlpha: { // wxStyledTextCtrl::MarkerSetAlpha
  int * markerNumber = (int *) bp; bp += 4;
  int * alpha = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->MarkerSetAlpha((int) *markerNumber,(int) *alpha);
+ This->MarkerSetAlpha(*markerNumber,*alpha);
  break;
 }
 case wxStyledTextCtrl_SetMarginType: { // wxStyledTextCtrl::SetMarginType
@@ -27356,14 +27397,14 @@ case wxStyledTextCtrl_SetMarginType: { // wxStyledTextCtrl::SetMarginType
  int * margin = (int *) bp; bp += 4;
  int * marginType = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMarginType((int) *margin,(int) *marginType);
+ This->SetMarginType(*margin,*marginType);
  break;
 }
 case wxStyledTextCtrl_GetMarginType: { // wxStyledTextCtrl::GetMarginType
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * margin = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetMarginType((int) *margin);
+ int Result = This->GetMarginType(*margin);
  rt.addInt(Result);
  break;
 }
@@ -27372,14 +27413,14 @@ case wxStyledTextCtrl_SetMarginWidth: { // wxStyledTextCtrl::SetMarginWidth
  int * margin = (int *) bp; bp += 4;
  int * pixelWidth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMarginWidth((int) *margin,(int) *pixelWidth);
+ This->SetMarginWidth(*margin,*pixelWidth);
  break;
 }
 case wxStyledTextCtrl_GetMarginWidth: { // wxStyledTextCtrl::GetMarginWidth
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * margin = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetMarginWidth((int) *margin);
+ int Result = This->GetMarginWidth(*margin);
  rt.addInt(Result);
  break;
 }
@@ -27388,14 +27429,14 @@ case wxStyledTextCtrl_SetMarginMask: { // wxStyledTextCtrl::SetMarginMask
  int * margin = (int *) bp; bp += 4;
  int * mask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMarginMask((int) *margin,(int) *mask);
+ This->SetMarginMask(*margin,*mask);
  break;
 }
 case wxStyledTextCtrl_GetMarginMask: { // wxStyledTextCtrl::GetMarginMask
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * margin = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetMarginMask((int) *margin);
+ int Result = This->GetMarginMask(*margin);
  rt.addInt(Result);
  break;
 }
@@ -27404,14 +27445,14 @@ case wxStyledTextCtrl_SetMarginSensitive: { // wxStyledTextCtrl::SetMarginSensit
  int * margin = (int *) bp; bp += 4;
  bool * sensitive = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMarginSensitive((int) *margin,(bool) *sensitive);
+ This->SetMarginSensitive(*margin,*sensitive);
  break;
 }
 case wxStyledTextCtrl_GetMarginSensitive: { // wxStyledTextCtrl::GetMarginSensitive
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * margin = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetMarginSensitive((int) *margin);
+ bool Result = This->GetMarginSensitive(*margin);
  rt.addBool(Result);
  break;
 }
@@ -27430,7 +27471,7 @@ case wxStyledTextCtrl_StyleSetForeground: { // wxStyledTextCtrl::StyleSetForegro
  int * foreA = (int *) bp; bp += 4;
  wxColour fore = wxColour(*foreR,*foreG,*foreB,*foreA);
  if(!This) throw wxe_badarg(0);
- This->StyleSetForeground((int) *style,fore);
+ This->StyleSetForeground(*style,fore);
  break;
 }
 case wxStyledTextCtrl_StyleSetBackground: { // wxStyledTextCtrl::StyleSetBackground
@@ -27442,7 +27483,7 @@ case wxStyledTextCtrl_StyleSetBackground: { // wxStyledTextCtrl::StyleSetBackgro
  int * backA = (int *) bp; bp += 4;
  wxColour back = wxColour(*backR,*backG,*backB,*backA);
  if(!This) throw wxe_badarg(0);
- This->StyleSetBackground((int) *style,back);
+ This->StyleSetBackground(*style,back);
  break;
 }
 case wxStyledTextCtrl_StyleSetBold: { // wxStyledTextCtrl::StyleSetBold
@@ -27450,7 +27491,7 @@ case wxStyledTextCtrl_StyleSetBold: { // wxStyledTextCtrl::StyleSetBold
  int * style = (int *) bp; bp += 4;
  bool * bold = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetBold((int) *style,(bool) *bold);
+ This->StyleSetBold(*style,*bold);
  break;
 }
 case wxStyledTextCtrl_StyleSetItalic: { // wxStyledTextCtrl::StyleSetItalic
@@ -27458,7 +27499,7 @@ case wxStyledTextCtrl_StyleSetItalic: { // wxStyledTextCtrl::StyleSetItalic
  int * style = (int *) bp; bp += 4;
  bool * italic = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetItalic((int) *style,(bool) *italic);
+ This->StyleSetItalic(*style,*italic);
  break;
 }
 case wxStyledTextCtrl_StyleSetSize: { // wxStyledTextCtrl::StyleSetSize
@@ -27466,7 +27507,7 @@ case wxStyledTextCtrl_StyleSetSize: { // wxStyledTextCtrl::StyleSetSize
  int * style = (int *) bp; bp += 4;
  int * sizePoints = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetSize((int) *style,(int) *sizePoints);
+ This->StyleSetSize(*style,*sizePoints);
  break;
 }
 case wxStyledTextCtrl_StyleSetFaceName: { // wxStyledTextCtrl::StyleSetFaceName
@@ -27476,7 +27517,7 @@ case wxStyledTextCtrl_StyleSetFaceName: { // wxStyledTextCtrl::StyleSetFaceName
  wxString fontName = wxString(bp, wxConvUTF8);
  bp += *fontNameLen+((8-((4+ *fontNameLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->StyleSetFaceName((int) *style,fontName);
+ This->StyleSetFaceName(*style,fontName);
  break;
 }
 case wxStyledTextCtrl_StyleSetEOLFilled: { // wxStyledTextCtrl::StyleSetEOLFilled
@@ -27484,7 +27525,7 @@ case wxStyledTextCtrl_StyleSetEOLFilled: { // wxStyledTextCtrl::StyleSetEOLFille
  int * style = (int *) bp; bp += 4;
  bool * filled = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetEOLFilled((int) *style,(bool) *filled);
+ This->StyleSetEOLFilled(*style,*filled);
  break;
 }
 case wxStyledTextCtrl_StyleResetDefault: { // wxStyledTextCtrl::StyleResetDefault
@@ -27498,7 +27539,7 @@ case wxStyledTextCtrl_StyleSetUnderline: { // wxStyledTextCtrl::StyleSetUnderlin
  int * style = (int *) bp; bp += 4;
  bool * underline = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetUnderline((int) *style,(bool) *underline);
+ This->StyleSetUnderline(*style,*underline);
  break;
 }
 case wxStyledTextCtrl_StyleSetCase: { // wxStyledTextCtrl::StyleSetCase
@@ -27506,7 +27547,7 @@ case wxStyledTextCtrl_StyleSetCase: { // wxStyledTextCtrl::StyleSetCase
  int * style = (int *) bp; bp += 4;
  int * caseForce = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetCase((int) *style,(int) *caseForce);
+ This->StyleSetCase(*style,*caseForce);
  break;
 }
 case wxStyledTextCtrl_StyleSetHotSpot: { // wxStyledTextCtrl::StyleSetHotSpot
@@ -27514,7 +27555,7 @@ case wxStyledTextCtrl_StyleSetHotSpot: { // wxStyledTextCtrl::StyleSetHotSpot
  int * style = (int *) bp; bp += 4;
  bool * hotspot = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetHotSpot((int) *style,(bool) *hotspot);
+ This->StyleSetHotSpot(*style,*hotspot);
  break;
 }
 case wxStyledTextCtrl_SetSelForeground: { // wxStyledTextCtrl::SetSelForeground
@@ -27526,7 +27567,7 @@ case wxStyledTextCtrl_SetSelForeground: { // wxStyledTextCtrl::SetSelForeground
  int * foreA = (int *) bp; bp += 4;
  wxColour fore = wxColour(*foreR,*foreG,*foreB,*foreA);
  if(!This) throw wxe_badarg(0);
- This->SetSelForeground((bool) *useSetting,fore);
+ This->SetSelForeground(*useSetting,fore);
  break;
 }
 case wxStyledTextCtrl_SetSelBackground: { // wxStyledTextCtrl::SetSelBackground
@@ -27538,7 +27579,7 @@ case wxStyledTextCtrl_SetSelBackground: { // wxStyledTextCtrl::SetSelBackground
  int * backA = (int *) bp; bp += 4;
  wxColour back = wxColour(*backR,*backG,*backB,*backA);
  if(!This) throw wxe_badarg(0);
- This->SetSelBackground((bool) *useSetting,back);
+ This->SetSelBackground(*useSetting,back);
  break;
 }
 case wxStyledTextCtrl_GetSelAlpha: { // wxStyledTextCtrl::GetSelAlpha
@@ -27552,7 +27593,7 @@ case wxStyledTextCtrl_SetSelAlpha: { // wxStyledTextCtrl::SetSelAlpha
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * alpha = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelAlpha((int) *alpha);
+ This->SetSelAlpha(*alpha);
  break;
 }
 case wxStyledTextCtrl_SetCaretForeground: { // wxStyledTextCtrl::SetCaretForeground
@@ -27572,7 +27613,7 @@ case wxStyledTextCtrl_CmdKeyAssign: { // wxStyledTextCtrl::CmdKeyAssign
  int * modifiers = (int *) bp; bp += 4;
  int * cmd = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CmdKeyAssign((int) *key,(int) *modifiers,(int) *cmd);
+ This->CmdKeyAssign(*key,*modifiers,*cmd);
  break;
 }
 case wxStyledTextCtrl_CmdKeyClear: { // wxStyledTextCtrl::CmdKeyClear
@@ -27580,7 +27621,7 @@ case wxStyledTextCtrl_CmdKeyClear: { // wxStyledTextCtrl::CmdKeyClear
  int * key = (int *) bp; bp += 4;
  int * modifiers = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CmdKeyClear((int) *key,(int) *modifiers);
+ This->CmdKeyClear(*key,*modifiers);
  break;
 }
 case wxStyledTextCtrl_CmdKeyClearAll: { // wxStyledTextCtrl::CmdKeyClearAll
@@ -27594,7 +27635,7 @@ case wxStyledTextCtrl_SetStyleBytes: { // wxStyledTextCtrl::SetStyleBytes
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * length = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetStyleBytes((int) *length,&styleBytes);
+ This->SetStyleBytes(*length,&styleBytes);
  rt.addInt(styleBytes);
  break;
 }
@@ -27603,7 +27644,7 @@ case wxStyledTextCtrl_StyleSetVisible: { // wxStyledTextCtrl::StyleSetVisible
  int * style = (int *) bp; bp += 4;
  bool * visible = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetVisible((int) *style,(bool) *visible);
+ This->StyleSetVisible(*style,*visible);
  break;
 }
 case wxStyledTextCtrl_GetCaretPeriod: { // wxStyledTextCtrl::GetCaretPeriod
@@ -27617,7 +27658,7 @@ case wxStyledTextCtrl_SetCaretPeriod: { // wxStyledTextCtrl::SetCaretPeriod
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * periodMilliseconds = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCaretPeriod((int) *periodMilliseconds);
+ This->SetCaretPeriod(*periodMilliseconds);
  break;
 }
 case wxStyledTextCtrl_SetWordChars: { // wxStyledTextCtrl::SetWordChars
@@ -27646,14 +27687,14 @@ case wxStyledTextCtrl_IndicatorSetStyle: { // wxStyledTextCtrl::IndicatorSetStyl
  int * indic = (int *) bp; bp += 4;
  int * style = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->IndicatorSetStyle((int) *indic,(int) *style);
+ This->IndicatorSetStyle(*indic,*style);
  break;
 }
 case wxStyledTextCtrl_IndicatorGetStyle: { // wxStyledTextCtrl::IndicatorGetStyle
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * indic = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->IndicatorGetStyle((int) *indic);
+ int Result = This->IndicatorGetStyle(*indic);
  rt.addInt(Result);
  break;
 }
@@ -27666,14 +27707,14 @@ case wxStyledTextCtrl_IndicatorSetForeground: { // wxStyledTextCtrl::IndicatorSe
  int * foreA = (int *) bp; bp += 4;
  wxColour fore = wxColour(*foreR,*foreG,*foreB,*foreA);
  if(!This) throw wxe_badarg(0);
- This->IndicatorSetForeground((int) *indic,fore);
+ This->IndicatorSetForeground(*indic,fore);
  break;
 }
 case wxStyledTextCtrl_IndicatorGetForeground: { // wxStyledTextCtrl::IndicatorGetForeground
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * indic = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxColour Result = This->IndicatorGetForeground((int) *indic);
+ wxColour Result = This->IndicatorGetForeground(*indic);
  rt.add(Result);
  break;
 }
@@ -27686,7 +27727,7 @@ case wxStyledTextCtrl_SetWhitespaceForeground: { // wxStyledTextCtrl::SetWhitesp
  int * foreA = (int *) bp; bp += 4;
  wxColour fore = wxColour(*foreR,*foreG,*foreB,*foreA);
  if(!This) throw wxe_badarg(0);
- This->SetWhitespaceForeground((bool) *useSetting,fore);
+ This->SetWhitespaceForeground(*useSetting,fore);
  break;
 }
 case wxStyledTextCtrl_SetWhitespaceBackground: { // wxStyledTextCtrl::SetWhitespaceBackground
@@ -27698,7 +27739,7 @@ case wxStyledTextCtrl_SetWhitespaceBackground: { // wxStyledTextCtrl::SetWhitesp
  int * backA = (int *) bp; bp += 4;
  wxColour back = wxColour(*backR,*backG,*backB,*backA);
  if(!This) throw wxe_badarg(0);
- This->SetWhitespaceBackground((bool) *useSetting,back);
+ This->SetWhitespaceBackground(*useSetting,back);
  break;
 }
 case wxStyledTextCtrl_GetStyleBits: { // wxStyledTextCtrl::GetStyleBits
@@ -27713,14 +27754,14 @@ case wxStyledTextCtrl_SetLineState: { // wxStyledTextCtrl::SetLineState
  int * line = (int *) bp; bp += 4;
  int * state = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLineState((int) *line,(int) *state);
+ This->SetLineState(*line,*state);
  break;
 }
 case wxStyledTextCtrl_GetLineState: { // wxStyledTextCtrl::GetLineState
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetLineState((int) *line);
+ int Result = This->GetLineState(*line);
  rt.addInt(Result);
  break;
 }
@@ -27742,7 +27783,7 @@ case wxStyledTextCtrl_SetCaretLineVisible: { // wxStyledTextCtrl::SetCaretLineVi
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCaretLineVisible((bool) *show);
+ This->SetCaretLineVisible(*show);
  break;
 }
 case wxStyledTextCtrl_GetCaretLineBackground: { // wxStyledTextCtrl::GetCaretLineBackground
@@ -27770,7 +27811,7 @@ case wxStyledTextCtrl_AutoCompShow: { // wxStyledTextCtrl::AutoCompShow
  wxString itemList = wxString(bp, wxConvUTF8);
  bp += *itemListLen+((8-((4+ *itemListLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->AutoCompShow((int) *lenEntered,itemList);
+ This->AutoCompShow(*lenEntered,itemList);
  break;
 }
 case wxStyledTextCtrl_AutoCompCancel: { // wxStyledTextCtrl::AutoCompCancel
@@ -27812,7 +27853,7 @@ case wxStyledTextCtrl_AutoCompSetSeparator: { // wxStyledTextCtrl::AutoCompSetSe
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * separatorCharacter = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetSeparator((int) *separatorCharacter);
+ This->AutoCompSetSeparator(*separatorCharacter);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetSeparator: { // wxStyledTextCtrl::AutoCompGetSeparator
@@ -27835,7 +27876,7 @@ case wxStyledTextCtrl_AutoCompSetCancelAtStart: { // wxStyledTextCtrl::AutoCompS
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * cancel = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetCancelAtStart((bool) *cancel);
+ This->AutoCompSetCancelAtStart(*cancel);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetCancelAtStart: { // wxStyledTextCtrl::AutoCompGetCancelAtStart
@@ -27858,7 +27899,7 @@ case wxStyledTextCtrl_AutoCompSetChooseSingle: { // wxStyledTextCtrl::AutoCompSe
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * chooseSingle = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetChooseSingle((bool) *chooseSingle);
+ This->AutoCompSetChooseSingle(*chooseSingle);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetChooseSingle: { // wxStyledTextCtrl::AutoCompGetChooseSingle
@@ -27872,7 +27913,7 @@ case wxStyledTextCtrl_AutoCompSetIgnoreCase: { // wxStyledTextCtrl::AutoCompSetI
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * ignoreCase = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetIgnoreCase((bool) *ignoreCase);
+ This->AutoCompSetIgnoreCase(*ignoreCase);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetIgnoreCase: { // wxStyledTextCtrl::AutoCompGetIgnoreCase
@@ -27889,14 +27930,14 @@ case wxStyledTextCtrl_UserListShow: { // wxStyledTextCtrl::UserListShow
  wxString itemList = wxString(bp, wxConvUTF8);
  bp += *itemListLen+((8-((4+ *itemListLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->UserListShow((int) *listType,itemList);
+ This->UserListShow(*listType,itemList);
  break;
 }
 case wxStyledTextCtrl_AutoCompSetAutoHide: { // wxStyledTextCtrl::AutoCompSetAutoHide
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * autoHide = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetAutoHide((bool) *autoHide);
+ This->AutoCompSetAutoHide(*autoHide);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetAutoHide: { // wxStyledTextCtrl::AutoCompGetAutoHide
@@ -27910,7 +27951,7 @@ case wxStyledTextCtrl_AutoCompSetDropRestOfWord: { // wxStyledTextCtrl::AutoComp
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * dropRestOfWord = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetDropRestOfWord((bool) *dropRestOfWord);
+ This->AutoCompSetDropRestOfWord(*dropRestOfWord);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetDropRestOfWord: { // wxStyledTextCtrl::AutoCompGetDropRestOfWord
@@ -27925,7 +27966,7 @@ case wxStyledTextCtrl_RegisterImage: { // wxStyledTextCtrl::RegisterImage
  int * type = (int *) bp; bp += 4;
  wxBitmap *bmp = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->RegisterImage((int) *type,*bmp);
+ This->RegisterImage(*type,*bmp);
  break;
 }
 case wxStyledTextCtrl_ClearRegisteredImages: { // wxStyledTextCtrl::ClearRegisteredImages
@@ -27945,14 +27986,14 @@ case wxStyledTextCtrl_AutoCompSetTypeSeparator: { // wxStyledTextCtrl::AutoCompS
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * separatorCharacter = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetTypeSeparator((int) *separatorCharacter);
+ This->AutoCompSetTypeSeparator(*separatorCharacter);
  break;
 }
 case wxStyledTextCtrl_AutoCompSetMaxWidth: { // wxStyledTextCtrl::AutoCompSetMaxWidth
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * characterCount = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetMaxWidth((int) *characterCount);
+ This->AutoCompSetMaxWidth(*characterCount);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetMaxWidth: { // wxStyledTextCtrl::AutoCompGetMaxWidth
@@ -27966,7 +28007,7 @@ case wxStyledTextCtrl_AutoCompSetMaxHeight: { // wxStyledTextCtrl::AutoCompSetMa
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * rowCount = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->AutoCompSetMaxHeight((int) *rowCount);
+ This->AutoCompSetMaxHeight(*rowCount);
  break;
 }
 case wxStyledTextCtrl_AutoCompGetMaxHeight: { // wxStyledTextCtrl::AutoCompGetMaxHeight
@@ -27980,7 +28021,7 @@ case wxStyledTextCtrl_SetIndent: { // wxStyledTextCtrl::SetIndent
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * indentSize = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetIndent((int) *indentSize);
+ This->SetIndent(*indentSize);
  break;
 }
 case wxStyledTextCtrl_GetIndent: { // wxStyledTextCtrl::GetIndent
@@ -27994,7 +28035,7 @@ case wxStyledTextCtrl_SetUseTabs: { // wxStyledTextCtrl::SetUseTabs
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * useTabs = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetUseTabs((bool) *useTabs);
+ This->SetUseTabs(*useTabs);
  break;
 }
 case wxStyledTextCtrl_GetUseTabs: { // wxStyledTextCtrl::GetUseTabs
@@ -28009,14 +28050,14 @@ case wxStyledTextCtrl_SetLineIndentation: { // wxStyledTextCtrl::SetLineIndentat
  int * line = (int *) bp; bp += 4;
  int * indentSize = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLineIndentation((int) *line,(int) *indentSize);
+ This->SetLineIndentation(*line,*indentSize);
  break;
 }
 case wxStyledTextCtrl_GetLineIndentation: { // wxStyledTextCtrl::GetLineIndentation
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetLineIndentation((int) *line);
+ int Result = This->GetLineIndentation(*line);
  rt.addInt(Result);
  break;
 }
@@ -28024,7 +28065,7 @@ case wxStyledTextCtrl_GetLineIndentPosition: { // wxStyledTextCtrl::GetLineInden
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetLineIndentPosition((int) *line);
+ int Result = This->GetLineIndentPosition(*line);
  rt.addInt(Result);
  break;
 }
@@ -28032,7 +28073,7 @@ case wxStyledTextCtrl_GetColumn: { // wxStyledTextCtrl::GetColumn
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetColumn((int) *pos);
+ int Result = This->GetColumn(*pos);
  rt.addInt(Result);
  break;
 }
@@ -28040,7 +28081,7 @@ case wxStyledTextCtrl_SetUseHorizontalScrollBar: { // wxStyledTextCtrl::SetUseHo
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetUseHorizontalScrollBar((bool) *show);
+ This->SetUseHorizontalScrollBar(*show);
  break;
 }
 case wxStyledTextCtrl_GetUseHorizontalScrollBar: { // wxStyledTextCtrl::GetUseHorizontalScrollBar
@@ -28054,7 +28095,7 @@ case wxStyledTextCtrl_SetIndentationGuides: { // wxStyledTextCtrl::SetIndentatio
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetIndentationGuides((bool) *show);
+ This->SetIndentationGuides(*show);
  break;
 }
 case wxStyledTextCtrl_GetIndentationGuides: { // wxStyledTextCtrl::GetIndentationGuides
@@ -28068,7 +28109,7 @@ case wxStyledTextCtrl_SetHighlightGuide: { // wxStyledTextCtrl::SetHighlightGuid
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * column = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetHighlightGuide((int) *column);
+ This->SetHighlightGuide(*column);
  break;
 }
 case wxStyledTextCtrl_GetHighlightGuide: { // wxStyledTextCtrl::GetHighlightGuide
@@ -28082,7 +28123,7 @@ case wxStyledTextCtrl_GetLineEndPosition: { // wxStyledTextCtrl::GetLineEndPosit
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetLineEndPosition((int) *line);
+ int Result = This->GetLineEndPosition(*line);
  rt.addInt(Result);
  break;
 }
@@ -28111,14 +28152,14 @@ case wxStyledTextCtrl_SetCurrentPos: { // wxStyledTextCtrl::SetCurrentPos
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCurrentPos((int) *pos);
+ This->SetCurrentPos(*pos);
  break;
 }
 case wxStyledTextCtrl_SetSelectionStart: { // wxStyledTextCtrl::SetSelectionStart
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelectionStart((int) *pos);
+ This->SetSelectionStart(*pos);
  break;
 }
 case wxStyledTextCtrl_GetSelectionStart: { // wxStyledTextCtrl::GetSelectionStart
@@ -28132,7 +28173,7 @@ case wxStyledTextCtrl_SetSelectionEnd: { // wxStyledTextCtrl::SetSelectionEnd
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelectionEnd((int) *pos);
+ This->SetSelectionEnd(*pos);
  break;
 }
 case wxStyledTextCtrl_GetSelectionEnd: { // wxStyledTextCtrl::GetSelectionEnd
@@ -28146,7 +28187,7 @@ case wxStyledTextCtrl_SetPrintMagnification: { // wxStyledTextCtrl::SetPrintMagn
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * magnification = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPrintMagnification((int) *magnification);
+ This->SetPrintMagnification(*magnification);
  break;
 }
 case wxStyledTextCtrl_GetPrintMagnification: { // wxStyledTextCtrl::GetPrintMagnification
@@ -28160,7 +28201,7 @@ case wxStyledTextCtrl_SetPrintColourMode: { // wxStyledTextCtrl::SetPrintColourM
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * mode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPrintColourMode((int) *mode);
+ This->SetPrintColourMode(*mode);
  break;
 }
 case wxStyledTextCtrl_GetPrintColourMode: { // wxStyledTextCtrl::GetPrintColourMode
@@ -28184,7 +28225,7 @@ case wxStyledTextCtrl_FindText: { // wxStyledTextCtrl::FindText
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- int Result = This->FindText((int) *minPos,(int) *maxPos,text,flags);
+ int Result = This->FindText(*minPos,*maxPos,text,flags);
  rt.addInt(Result);
  break;
 }
@@ -28206,7 +28247,7 @@ case wxStyledTextCtrl_FormatRange: { // wxStyledTextCtrl::FormatRange
  int * pageRectH = (int *) bp; bp += 4;
  wxRect pageRect = wxRect(*pageRectX,*pageRectY,*pageRectW,*pageRectH);
  if(!This) throw wxe_badarg(0);
- int Result = This->FormatRange((bool) *doDraw,(int) *startPos,(int) *endPos,draw,target,renderRect,pageRect);
+ int Result = This->FormatRange(*doDraw,*startPos,*endPos,draw,target,renderRect,pageRect);
  rt.addInt(Result);
  break;
 }
@@ -28221,7 +28262,7 @@ case wxStyledTextCtrl_GetLine: { // wxStyledTextCtrl::GetLine
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetLine((int) *line);
+ wxString Result = This->GetLine(*line);
  rt.add(Result);
  break;
 }
@@ -28236,7 +28277,7 @@ case wxStyledTextCtrl_SetMarginLeft: { // wxStyledTextCtrl::SetMarginLeft
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pixelWidth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMarginLeft((int) *pixelWidth);
+ This->SetMarginLeft(*pixelWidth);
  break;
 }
 case wxStyledTextCtrl_GetMarginLeft: { // wxStyledTextCtrl::GetMarginLeft
@@ -28250,7 +28291,7 @@ case wxStyledTextCtrl_SetMarginRight: { // wxStyledTextCtrl::SetMarginRight
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pixelWidth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMarginRight((int) *pixelWidth);
+ This->SetMarginRight(*pixelWidth);
  break;
 }
 case wxStyledTextCtrl_GetMarginRight: { // wxStyledTextCtrl::GetMarginRight
@@ -28272,7 +28313,7 @@ case wxStyledTextCtrl_SetSelection: { // wxStyledTextCtrl::SetSelection
  int * start = (int *) bp; bp += 4;
  int * end = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((int) *start,(int) *end);
+ This->SetSelection(*start,*end);
  break;
 }
 case wxStyledTextCtrl_GetSelectedText: { // wxStyledTextCtrl::GetSelectedText
@@ -28287,7 +28328,7 @@ case wxStyledTextCtrl_GetTextRange: { // wxStyledTextCtrl::GetTextRange
  int * startPos = (int *) bp; bp += 4;
  int * endPos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxString Result = This->GetTextRange((int) *startPos,(int) *endPos);
+ wxString Result = This->GetTextRange(*startPos,*endPos);
  rt.add(Result);
  break;
 }
@@ -28295,14 +28336,14 @@ case wxStyledTextCtrl_HideSelection: { // wxStyledTextCtrl::HideSelection
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * normal = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->HideSelection((bool) *normal);
+ This->HideSelection(*normal);
  break;
 }
 case wxStyledTextCtrl_LineFromPosition: { // wxStyledTextCtrl::LineFromPosition
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->LineFromPosition((int) *pos);
+ int Result = This->LineFromPosition(*pos);
  rt.addInt(Result);
  break;
 }
@@ -28310,7 +28351,7 @@ case wxStyledTextCtrl_PositionFromLine: { // wxStyledTextCtrl::PositionFromLine
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->PositionFromLine((int) *line);
+ int Result = This->PositionFromLine(*line);
  rt.addInt(Result);
  break;
 }
@@ -28319,7 +28360,7 @@ case wxStyledTextCtrl_LineScroll: { // wxStyledTextCtrl::LineScroll
  int * columns = (int *) bp; bp += 4;
  int * lines = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->LineScroll((int) *columns,(int) *lines);
+ This->LineScroll(*columns,*lines);
  break;
 }
 case wxStyledTextCtrl_EnsureCaretVisible: { // wxStyledTextCtrl::EnsureCaretVisible
@@ -28341,7 +28382,7 @@ case wxStyledTextCtrl_SetReadOnly: { // wxStyledTextCtrl::SetReadOnly
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * readOnly = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetReadOnly((bool) *readOnly);
+ This->SetReadOnly(*readOnly);
  break;
 }
 case wxStyledTextCtrl_CanPaste: { // wxStyledTextCtrl::CanPaste
@@ -28428,7 +28469,7 @@ case wxStyledTextCtrl_SetCaretWidth: { // wxStyledTextCtrl::SetCaretWidth
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pixelWidth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCaretWidth((int) *pixelWidth);
+ This->SetCaretWidth(*pixelWidth);
  break;
 }
 case wxStyledTextCtrl_GetCaretWidth: { // wxStyledTextCtrl::GetCaretWidth
@@ -28442,7 +28483,7 @@ case wxStyledTextCtrl_SetTargetStart: { // wxStyledTextCtrl::SetTargetStart
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetTargetStart((int) *pos);
+ This->SetTargetStart(*pos);
  break;
 }
 case wxStyledTextCtrl_GetTargetStart: { // wxStyledTextCtrl::GetTargetStart
@@ -28456,7 +28497,7 @@ case wxStyledTextCtrl_SetTargetEnd: { // wxStyledTextCtrl::SetTargetEnd
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetTargetEnd((int) *pos);
+ This->SetTargetEnd(*pos);
  break;
 }
 case wxStyledTextCtrl_GetTargetEnd: { // wxStyledTextCtrl::GetTargetEnd
@@ -28490,7 +28531,7 @@ case wxStyledTextCtrl_SetSearchFlags: { // wxStyledTextCtrl::SetSearchFlags
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * flags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSearchFlags((int) *flags);
+ This->SetSearchFlags(*flags);
  break;
 }
 case wxStyledTextCtrl_GetSearchFlags: { // wxStyledTextCtrl::GetSearchFlags
@@ -28507,7 +28548,7 @@ case wxStyledTextCtrl_CallTipShow: { // wxStyledTextCtrl::CallTipShow
  wxString definition = wxString(bp, wxConvUTF8);
  bp += *definitionLen+((8-((4+ *definitionLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->CallTipShow((int) *pos,definition);
+ This->CallTipShow(*pos,definition);
  break;
 }
 case wxStyledTextCtrl_CallTipCancel: { // wxStyledTextCtrl::CallTipCancel
@@ -28535,7 +28576,7 @@ case wxStyledTextCtrl_CallTipSetHighlight: { // wxStyledTextCtrl::CallTipSetHigh
  int * start = (int *) bp; bp += 4;
  int * end = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CallTipSetHighlight((int) *start,(int) *end);
+ This->CallTipSetHighlight(*start,*end);
  break;
 }
 case wxStyledTextCtrl_CallTipSetBackground: { // wxStyledTextCtrl::CallTipSetBackground
@@ -28575,14 +28616,14 @@ case wxStyledTextCtrl_CallTipUseStyle: { // wxStyledTextCtrl::CallTipUseStyle
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * tabSize = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CallTipUseStyle((int) *tabSize);
+ This->CallTipUseStyle(*tabSize);
  break;
 }
 case wxStyledTextCtrl_VisibleFromDocLine: { // wxStyledTextCtrl::VisibleFromDocLine
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->VisibleFromDocLine((int) *line);
+ int Result = This->VisibleFromDocLine(*line);
  rt.addInt(Result);
  break;
 }
@@ -28590,7 +28631,7 @@ case wxStyledTextCtrl_DocLineFromVisible: { // wxStyledTextCtrl::DocLineFromVisi
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * lineDisplay = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->DocLineFromVisible((int) *lineDisplay);
+ int Result = This->DocLineFromVisible(*lineDisplay);
  rt.addInt(Result);
  break;
 }
@@ -28598,7 +28639,7 @@ case wxStyledTextCtrl_WrapCount: { // wxStyledTextCtrl::WrapCount
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->WrapCount((int) *line);
+ int Result = This->WrapCount(*line);
  rt.addInt(Result);
  break;
 }
@@ -28607,14 +28648,14 @@ case wxStyledTextCtrl_SetFoldLevel: { // wxStyledTextCtrl::SetFoldLevel
  int * line = (int *) bp; bp += 4;
  int * level = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFoldLevel((int) *line,(int) *level);
+ This->SetFoldLevel(*line,*level);
  break;
 }
 case wxStyledTextCtrl_GetFoldLevel: { // wxStyledTextCtrl::GetFoldLevel
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetFoldLevel((int) *line);
+ int Result = This->GetFoldLevel(*line);
  rt.addInt(Result);
  break;
 }
@@ -28623,7 +28664,7 @@ case wxStyledTextCtrl_GetLastChild: { // wxStyledTextCtrl::GetLastChild
  int * line = (int *) bp; bp += 4;
  int * level = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetLastChild((int) *line,(int) *level);
+ int Result = This->GetLastChild(*line,*level);
  rt.addInt(Result);
  break;
 }
@@ -28631,7 +28672,7 @@ case wxStyledTextCtrl_GetFoldParent: { // wxStyledTextCtrl::GetFoldParent
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->GetFoldParent((int) *line);
+ int Result = This->GetFoldParent(*line);
  rt.addInt(Result);
  break;
 }
@@ -28640,7 +28681,7 @@ case wxStyledTextCtrl_ShowLines: { // wxStyledTextCtrl::ShowLines
  int * lineStart = (int *) bp; bp += 4;
  int * lineEnd = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ShowLines((int) *lineStart,(int) *lineEnd);
+ This->ShowLines(*lineStart,*lineEnd);
  break;
 }
 case wxStyledTextCtrl_HideLines: { // wxStyledTextCtrl::HideLines
@@ -28648,14 +28689,14 @@ case wxStyledTextCtrl_HideLines: { // wxStyledTextCtrl::HideLines
  int * lineStart = (int *) bp; bp += 4;
  int * lineEnd = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->HideLines((int) *lineStart,(int) *lineEnd);
+ This->HideLines(*lineStart,*lineEnd);
  break;
 }
 case wxStyledTextCtrl_GetLineVisible: { // wxStyledTextCtrl::GetLineVisible
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetLineVisible((int) *line);
+ bool Result = This->GetLineVisible(*line);
  rt.addBool(Result);
  break;
 }
@@ -28664,14 +28705,14 @@ case wxStyledTextCtrl_SetFoldExpanded: { // wxStyledTextCtrl::SetFoldExpanded
  int * line = (int *) bp; bp += 4;
  bool * expanded = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFoldExpanded((int) *line,(bool) *expanded);
+ This->SetFoldExpanded(*line,*expanded);
  break;
 }
 case wxStyledTextCtrl_GetFoldExpanded: { // wxStyledTextCtrl::GetFoldExpanded
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- bool Result = This->GetFoldExpanded((int) *line);
+ bool Result = This->GetFoldExpanded(*line);
  rt.addBool(Result);
  break;
 }
@@ -28679,35 +28720,35 @@ case wxStyledTextCtrl_ToggleFold: { // wxStyledTextCtrl::ToggleFold
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ToggleFold((int) *line);
+ This->ToggleFold(*line);
  break;
 }
 case wxStyledTextCtrl_EnsureVisible: { // wxStyledTextCtrl::EnsureVisible
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnsureVisible((int) *line);
+ This->EnsureVisible(*line);
  break;
 }
 case wxStyledTextCtrl_SetFoldFlags: { // wxStyledTextCtrl::SetFoldFlags
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * flags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetFoldFlags((int) *flags);
+ This->SetFoldFlags(*flags);
  break;
 }
 case wxStyledTextCtrl_EnsureVisibleEnforcePolicy: { // wxStyledTextCtrl::EnsureVisibleEnforcePolicy
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->EnsureVisibleEnforcePolicy((int) *line);
+ This->EnsureVisibleEnforcePolicy(*line);
  break;
 }
 case wxStyledTextCtrl_SetTabIndents: { // wxStyledTextCtrl::SetTabIndents
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * tabIndents = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetTabIndents((bool) *tabIndents);
+ This->SetTabIndents(*tabIndents);
  break;
 }
 case wxStyledTextCtrl_GetTabIndents: { // wxStyledTextCtrl::GetTabIndents
@@ -28721,7 +28762,7 @@ case wxStyledTextCtrl_SetBackSpaceUnIndents: { // wxStyledTextCtrl::SetBackSpace
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * bsUnIndents = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetBackSpaceUnIndents((bool) *bsUnIndents);
+ This->SetBackSpaceUnIndents(*bsUnIndents);
  break;
 }
 case wxStyledTextCtrl_GetBackSpaceUnIndents: { // wxStyledTextCtrl::GetBackSpaceUnIndents
@@ -28735,7 +28776,7 @@ case wxStyledTextCtrl_SetMouseDwellTime: { // wxStyledTextCtrl::SetMouseDwellTim
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * periodMilliseconds = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMouseDwellTime((int) *periodMilliseconds);
+ This->SetMouseDwellTime(*periodMilliseconds);
  break;
 }
 case wxStyledTextCtrl_GetMouseDwellTime: { // wxStyledTextCtrl::GetMouseDwellTime
@@ -28750,7 +28791,7 @@ case wxStyledTextCtrl_WordStartPosition: { // wxStyledTextCtrl::WordStartPositio
  int * pos = (int *) bp; bp += 4;
  bool * onlyWordCharacters = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->WordStartPosition((int) *pos,(bool) *onlyWordCharacters);
+ int Result = This->WordStartPosition(*pos,*onlyWordCharacters);
  rt.addInt(Result);
  break;
 }
@@ -28759,7 +28800,7 @@ case wxStyledTextCtrl_WordEndPosition: { // wxStyledTextCtrl::WordEndPosition
  int * pos = (int *) bp; bp += 4;
  bool * onlyWordCharacters = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->WordEndPosition((int) *pos,(bool) *onlyWordCharacters);
+ int Result = This->WordEndPosition(*pos,*onlyWordCharacters);
  rt.addInt(Result);
  break;
 }
@@ -28767,7 +28808,7 @@ case wxStyledTextCtrl_SetWrapMode: { // wxStyledTextCtrl::SetWrapMode
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * mode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWrapMode((int) *mode);
+ This->SetWrapMode(*mode);
  break;
 }
 case wxStyledTextCtrl_GetWrapMode: { // wxStyledTextCtrl::GetWrapMode
@@ -28781,7 +28822,7 @@ case wxStyledTextCtrl_SetWrapVisualFlags: { // wxStyledTextCtrl::SetWrapVisualFl
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * wrapVisualFlags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWrapVisualFlags((int) *wrapVisualFlags);
+ This->SetWrapVisualFlags(*wrapVisualFlags);
  break;
 }
 case wxStyledTextCtrl_GetWrapVisualFlags: { // wxStyledTextCtrl::GetWrapVisualFlags
@@ -28795,7 +28836,7 @@ case wxStyledTextCtrl_SetWrapVisualFlagsLocation: { // wxStyledTextCtrl::SetWrap
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * wrapVisualFlagsLocation = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWrapVisualFlagsLocation((int) *wrapVisualFlagsLocation);
+ This->SetWrapVisualFlagsLocation(*wrapVisualFlagsLocation);
  break;
 }
 case wxStyledTextCtrl_GetWrapVisualFlagsLocation: { // wxStyledTextCtrl::GetWrapVisualFlagsLocation
@@ -28809,7 +28850,7 @@ case wxStyledTextCtrl_SetWrapStartIndent: { // wxStyledTextCtrl::SetWrapStartInd
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * indent = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetWrapStartIndent((int) *indent);
+ This->SetWrapStartIndent(*indent);
  break;
 }
 case wxStyledTextCtrl_GetWrapStartIndent: { // wxStyledTextCtrl::GetWrapStartIndent
@@ -28823,7 +28864,7 @@ case wxStyledTextCtrl_SetLayoutCache: { // wxStyledTextCtrl::SetLayoutCache
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * mode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLayoutCache((int) *mode);
+ This->SetLayoutCache(*mode);
  break;
 }
 case wxStyledTextCtrl_GetLayoutCache: { // wxStyledTextCtrl::GetLayoutCache
@@ -28837,7 +28878,7 @@ case wxStyledTextCtrl_SetScrollWidth: { // wxStyledTextCtrl::SetScrollWidth
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pixelWidth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetScrollWidth((int) *pixelWidth);
+ This->SetScrollWidth(*pixelWidth);
  break;
 }
 case wxStyledTextCtrl_GetScrollWidth: { // wxStyledTextCtrl::GetScrollWidth
@@ -28854,7 +28895,7 @@ case wxStyledTextCtrl_TextWidth: { // wxStyledTextCtrl::TextWidth
  wxString text = wxString(bp, wxConvUTF8);
  bp += *textLen+((8-((4+ *textLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- int Result = This->TextWidth((int) *style,text);
+ int Result = This->TextWidth(*style,text);
  rt.addInt(Result);
  break;
 }
@@ -28869,7 +28910,7 @@ case wxStyledTextCtrl_TextHeight: { // wxStyledTextCtrl::TextHeight
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->TextHeight((int) *line);
+ int Result = This->TextHeight(*line);
  rt.addInt(Result);
  break;
 }
@@ -28877,7 +28918,7 @@ case wxStyledTextCtrl_SetUseVerticalScrollBar: { // wxStyledTextCtrl::SetUseVert
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * show = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetUseVerticalScrollBar((bool) *show);
+ This->SetUseVerticalScrollBar(*show);
  break;
 }
 case wxStyledTextCtrl_GetUseVerticalScrollBar: { // wxStyledTextCtrl::GetUseVerticalScrollBar
@@ -28907,7 +28948,7 @@ case wxStyledTextCtrl_SetTwoPhaseDraw: { // wxStyledTextCtrl::SetTwoPhaseDraw
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * twoPhase = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetTwoPhaseDraw((bool) *twoPhase);
+ This->SetTwoPhaseDraw(*twoPhase);
  break;
 }
 case wxStyledTextCtrl_TargetFromSelection: { // wxStyledTextCtrl::TargetFromSelection
@@ -28926,7 +28967,7 @@ case wxStyledTextCtrl_LinesSplit: { // wxStyledTextCtrl::LinesSplit
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pixelWidth = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->LinesSplit((int) *pixelWidth);
+ This->LinesSplit(*pixelWidth);
  break;
 }
 case wxStyledTextCtrl_SetFoldMarginColour: { // wxStyledTextCtrl::SetFoldMarginColour
@@ -28938,7 +28979,7 @@ case wxStyledTextCtrl_SetFoldMarginColour: { // wxStyledTextCtrl::SetFoldMarginC
  int * backA = (int *) bp; bp += 4;
  wxColour back = wxColour(*backR,*backG,*backB,*backA);
  if(!This) throw wxe_badarg(0);
- This->SetFoldMarginColour((bool) *useSetting,back);
+ This->SetFoldMarginColour(*useSetting,back);
  break;
 }
 case wxStyledTextCtrl_SetFoldMarginHiColour: { // wxStyledTextCtrl::SetFoldMarginHiColour
@@ -28950,7 +28991,7 @@ case wxStyledTextCtrl_SetFoldMarginHiColour: { // wxStyledTextCtrl::SetFoldMargi
  int * foreA = (int *) bp; bp += 4;
  wxColour fore = wxColour(*foreR,*foreG,*foreB,*foreA);
  if(!This) throw wxe_badarg(0);
- This->SetFoldMarginHiColour((bool) *useSetting,fore);
+ This->SetFoldMarginHiColour(*useSetting,fore);
  break;
 }
 case wxStyledTextCtrl_LineDown: { // wxStyledTextCtrl::LineDown
@@ -29299,7 +29340,7 @@ case wxStyledTextCtrl_LineLength: { // wxStyledTextCtrl::LineLength
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->LineLength((int) *line);
+ int Result = This->LineLength(*line);
  rt.addInt(Result);
  break;
 }
@@ -29308,21 +29349,21 @@ case wxStyledTextCtrl_BraceHighlight: { // wxStyledTextCtrl::BraceHighlight
  int * pos1 = (int *) bp; bp += 4;
  int * pos2 = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->BraceHighlight((int) *pos1,(int) *pos2);
+ This->BraceHighlight(*pos1,*pos2);
  break;
 }
 case wxStyledTextCtrl_BraceBadLight: { // wxStyledTextCtrl::BraceBadLight
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->BraceBadLight((int) *pos);
+ This->BraceBadLight(*pos);
  break;
 }
 case wxStyledTextCtrl_BraceMatch: { // wxStyledTextCtrl::BraceMatch
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->BraceMatch((int) *pos);
+ int Result = This->BraceMatch(*pos);
  rt.addInt(Result);
  break;
 }
@@ -29337,14 +29378,14 @@ case wxStyledTextCtrl_SetViewEOL: { // wxStyledTextCtrl::SetViewEOL
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * visible = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetViewEOL((bool) *visible);
+ This->SetViewEOL(*visible);
  break;
 }
 case wxStyledTextCtrl_SetModEventMask: { // wxStyledTextCtrl::SetModEventMask
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * mask = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetModEventMask((int) *mask);
+ This->SetModEventMask(*mask);
  break;
 }
 case wxStyledTextCtrl_GetEdgeColumn: { // wxStyledTextCtrl::GetEdgeColumn
@@ -29358,14 +29399,14 @@ case wxStyledTextCtrl_SetEdgeColumn: { // wxStyledTextCtrl::SetEdgeColumn
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * column = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetEdgeColumn((int) *column);
+ This->SetEdgeColumn(*column);
  break;
 }
 case wxStyledTextCtrl_SetEdgeMode: { // wxStyledTextCtrl::SetEdgeMode
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * mode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetEdgeMode((int) *mode);
+ This->SetEdgeMode(*mode);
  break;
 }
 case wxStyledTextCtrl_GetEdgeMode: { // wxStyledTextCtrl::GetEdgeMode
@@ -29406,7 +29447,7 @@ case wxStyledTextCtrl_SearchNext: { // wxStyledTextCtrl::SearchNext
  wxString text = wxString(bp, wxConvUTF8);
  bp += *textLen+((8-((4+ *textLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- int Result = This->SearchNext((int) *flags,text);
+ int Result = This->SearchNext(*flags,text);
  rt.addInt(Result);
  break;
 }
@@ -29417,7 +29458,7 @@ case wxStyledTextCtrl_SearchPrev: { // wxStyledTextCtrl::SearchPrev
  wxString text = wxString(bp, wxConvUTF8);
  bp += *textLen+((8-((4+ *textLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- int Result = This->SearchPrev((int) *flags,text);
+ int Result = This->SearchPrev(*flags,text);
  rt.addInt(Result);
  break;
 }
@@ -29432,7 +29473,7 @@ case wxStyledTextCtrl_UsePopUp: { // wxStyledTextCtrl::UsePopUp
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * allowPopUp = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->UsePopUp((bool) *allowPopUp);
+ This->UsePopUp(*allowPopUp);
  break;
 }
 case wxStyledTextCtrl_SelectionIsRectangle: { // wxStyledTextCtrl::SelectionIsRectangle
@@ -29446,7 +29487,7 @@ case wxStyledTextCtrl_SetZoom: { // wxStyledTextCtrl::SetZoom
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * zoom = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetZoom((int) *zoom);
+ This->SetZoom(*zoom);
  break;
 }
 case wxStyledTextCtrl_GetZoom: { // wxStyledTextCtrl::GetZoom
@@ -29467,7 +29508,7 @@ case wxStyledTextCtrl_SetSTCFocus: { // wxStyledTextCtrl::SetSTCFocus
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * focus = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSTCFocus((bool) *focus);
+ This->SetSTCFocus(*focus);
  break;
 }
 case wxStyledTextCtrl_GetSTCFocus: { // wxStyledTextCtrl::GetSTCFocus
@@ -29481,7 +29522,7 @@ case wxStyledTextCtrl_SetStatus: { // wxStyledTextCtrl::SetStatus
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * statusCode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetStatus((int) *statusCode);
+ This->SetStatus(*statusCode);
  break;
 }
 case wxStyledTextCtrl_GetStatus: { // wxStyledTextCtrl::GetStatus
@@ -29495,7 +29536,7 @@ case wxStyledTextCtrl_SetMouseDownCaptures: { // wxStyledTextCtrl::SetMouseDownC
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * captures = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMouseDownCaptures((bool) *captures);
+ This->SetMouseDownCaptures(*captures);
  break;
 }
 case wxStyledTextCtrl_GetMouseDownCaptures: { // wxStyledTextCtrl::GetMouseDownCaptures
@@ -29509,7 +29550,7 @@ case wxStyledTextCtrl_SetSTCCursor: { // wxStyledTextCtrl::SetSTCCursor
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * cursorType = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSTCCursor((int) *cursorType);
+ This->SetSTCCursor(*cursorType);
  break;
 }
 case wxStyledTextCtrl_GetSTCCursor: { // wxStyledTextCtrl::GetSTCCursor
@@ -29523,7 +29564,7 @@ case wxStyledTextCtrl_SetControlCharSymbol: { // wxStyledTextCtrl::SetControlCha
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * symbol = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetControlCharSymbol((int) *symbol);
+ This->SetControlCharSymbol(*symbol);
  break;
 }
 case wxStyledTextCtrl_GetControlCharSymbol: { // wxStyledTextCtrl::GetControlCharSymbol
@@ -29562,7 +29603,7 @@ case wxStyledTextCtrl_SetVisiblePolicy: { // wxStyledTextCtrl::SetVisiblePolicy
  int * visiblePolicy = (int *) bp; bp += 4;
  int * visibleSlop = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetVisiblePolicy((int) *visiblePolicy,(int) *visibleSlop);
+ This->SetVisiblePolicy(*visiblePolicy,*visibleSlop);
  break;
 }
 case wxStyledTextCtrl_DelLineLeft: { // wxStyledTextCtrl::DelLineLeft
@@ -29595,7 +29636,7 @@ case wxStyledTextCtrl_SetXCaretPolicy: { // wxStyledTextCtrl::SetXCaretPolicy
  int * caretPolicy = (int *) bp; bp += 4;
  int * caretSlop = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetXCaretPolicy((int) *caretPolicy,(int) *caretSlop);
+ This->SetXCaretPolicy(*caretPolicy,*caretSlop);
  break;
 }
 case wxStyledTextCtrl_SetYCaretPolicy: { // wxStyledTextCtrl::SetYCaretPolicy
@@ -29603,7 +29644,7 @@ case wxStyledTextCtrl_SetYCaretPolicy: { // wxStyledTextCtrl::SetYCaretPolicy
  int * caretPolicy = (int *) bp; bp += 4;
  int * caretSlop = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetYCaretPolicy((int) *caretPolicy,(int) *caretSlop);
+ This->SetYCaretPolicy(*caretPolicy,*caretSlop);
  break;
 }
 case wxStyledTextCtrl_GetPrintWrapMode: { // wxStyledTextCtrl::GetPrintWrapMode
@@ -29622,7 +29663,7 @@ case wxStyledTextCtrl_SetHotspotActiveForeground: { // wxStyledTextCtrl::SetHots
  int * foreA = (int *) bp; bp += 4;
  wxColour fore = wxColour(*foreR,*foreG,*foreB,*foreA);
  if(!This) throw wxe_badarg(0);
- This->SetHotspotActiveForeground((bool) *useSetting,fore);
+ This->SetHotspotActiveForeground(*useSetting,fore);
  break;
 }
 case wxStyledTextCtrl_SetHotspotActiveBackground: { // wxStyledTextCtrl::SetHotspotActiveBackground
@@ -29634,21 +29675,21 @@ case wxStyledTextCtrl_SetHotspotActiveBackground: { // wxStyledTextCtrl::SetHots
  int * backA = (int *) bp; bp += 4;
  wxColour back = wxColour(*backR,*backG,*backB,*backA);
  if(!This) throw wxe_badarg(0);
- This->SetHotspotActiveBackground((bool) *useSetting,back);
+ This->SetHotspotActiveBackground(*useSetting,back);
  break;
 }
 case wxStyledTextCtrl_SetHotspotActiveUnderline: { // wxStyledTextCtrl::SetHotspotActiveUnderline
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * underline = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetHotspotActiveUnderline((bool) *underline);
+ This->SetHotspotActiveUnderline(*underline);
  break;
 }
 case wxStyledTextCtrl_SetHotspotSingleLine: { // wxStyledTextCtrl::SetHotspotSingleLine
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * singleLine = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetHotspotSingleLine((bool) *singleLine);
+ This->SetHotspotSingleLine(*singleLine);
  break;
 }
 case wxStyledTextCtrl_ParaDownExtend: { // wxStyledTextCtrl::ParaDownExtend
@@ -29673,7 +29714,7 @@ case wxStyledTextCtrl_PositionBefore: { // wxStyledTextCtrl::PositionBefore
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->PositionBefore((int) *pos);
+ int Result = This->PositionBefore(*pos);
  rt.addInt(Result);
  break;
 }
@@ -29681,7 +29722,7 @@ case wxStyledTextCtrl_PositionAfter: { // wxStyledTextCtrl::PositionAfter
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->PositionAfter((int) *pos);
+ int Result = This->PositionAfter(*pos);
  rt.addInt(Result);
  break;
 }
@@ -29690,7 +29731,7 @@ case wxStyledTextCtrl_CopyRange: { // wxStyledTextCtrl::CopyRange
  int * start = (int *) bp; bp += 4;
  int * end = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CopyRange((int) *start,(int) *end);
+ This->CopyRange(*start,*end);
  break;
 }
 case wxStyledTextCtrl_CopyText: { // wxStyledTextCtrl::CopyText
@@ -29700,14 +29741,14 @@ case wxStyledTextCtrl_CopyText: { // wxStyledTextCtrl::CopyText
  wxString text = wxString(bp, wxConvUTF8);
  bp += *textLen+((8-((4+ *textLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->CopyText((int) *length,text);
+ This->CopyText(*length,text);
  break;
 }
 case wxStyledTextCtrl_SetSelectionMode: { // wxStyledTextCtrl::SetSelectionMode
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * mode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelectionMode((int) *mode);
+ This->SetSelectionMode(*mode);
  break;
 }
 case wxStyledTextCtrl_GetSelectionMode: { // wxStyledTextCtrl::GetSelectionMode
@@ -29845,7 +29886,7 @@ case wxStyledTextCtrl_Allocate: { // wxStyledTextCtrl::Allocate
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * bytes = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Allocate((int) *bytes);
+ This->Allocate(*bytes);
  break;
 }
 case wxStyledTextCtrl_FindColumn: { // wxStyledTextCtrl::FindColumn
@@ -29853,7 +29894,7 @@ case wxStyledTextCtrl_FindColumn: { // wxStyledTextCtrl::FindColumn
  int * line = (int *) bp; bp += 4;
  int * column = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- int Result = This->FindColumn((int) *line,(int) *column);
+ int Result = This->FindColumn(*line,*column);
  rt.addInt(Result);
  break;
 }
@@ -29868,7 +29909,7 @@ case wxStyledTextCtrl_SetCaretSticky: { // wxStyledTextCtrl::SetCaretSticky
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * useCaretStickyBehaviour = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCaretSticky((bool) *useCaretStickyBehaviour);
+ This->SetCaretSticky(*useCaretStickyBehaviour);
  break;
 }
 case wxStyledTextCtrl_ToggleCaretSticky: { // wxStyledTextCtrl::ToggleCaretSticky
@@ -29881,7 +29922,7 @@ case wxStyledTextCtrl_SetPasteConvertEndings: { // wxStyledTextCtrl::SetPasteCon
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * convert = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPasteConvertEndings((bool) *convert);
+ This->SetPasteConvertEndings(*convert);
  break;
 }
 case wxStyledTextCtrl_GetPasteConvertEndings: { // wxStyledTextCtrl::GetPasteConvertEndings
@@ -29901,7 +29942,7 @@ case wxStyledTextCtrl_SetCaretLineBackAlpha: { // wxStyledTextCtrl::SetCaretLine
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * alpha = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCaretLineBackAlpha((int) *alpha);
+ This->SetCaretLineBackAlpha(*alpha);
  break;
 }
 case wxStyledTextCtrl_GetCaretLineBackAlpha: { // wxStyledTextCtrl::GetCaretLineBackAlpha
@@ -29927,7 +29968,7 @@ case wxStyledTextCtrl_SetLexer: { // wxStyledTextCtrl::SetLexer
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * lexer = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLexer((int) *lexer);
+ This->SetLexer(*lexer);
  break;
 }
 case wxStyledTextCtrl_GetLexer: { // wxStyledTextCtrl::GetLexer
@@ -29942,7 +29983,7 @@ case wxStyledTextCtrl_Colourise: { // wxStyledTextCtrl::Colourise
  int * start = (int *) bp; bp += 4;
  int * end = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->Colourise((int) *start,(int) *end);
+ This->Colourise(*start,*end);
  break;
 }
 case wxStyledTextCtrl_SetProperty: { // wxStyledTextCtrl::SetProperty
@@ -29964,7 +30005,7 @@ case wxStyledTextCtrl_SetKeyWords: { // wxStyledTextCtrl::SetKeyWords
  wxString keyWords = wxString(bp, wxConvUTF8);
  bp += *keyWordsLen+((8-((4+ *keyWordsLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->SetKeyWords((int) *keywordSet,keyWords);
+ This->SetKeyWords(*keywordSet,keyWords);
  break;
 }
 case wxStyledTextCtrl_SetLexerLanguage: { // wxStyledTextCtrl::SetLexerLanguage
@@ -30007,7 +30048,7 @@ case wxStyledTextCtrl_StyleSetSpec: { // wxStyledTextCtrl::StyleSetSpec
  wxString spec = wxString(bp, wxConvUTF8);
  bp += *specLen+((8-((4+ *specLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- This->StyleSetSpec((int) *styleNum,spec);
+ This->StyleSetSpec(*styleNum,spec);
  break;
 }
 case wxStyledTextCtrl_StyleSetFont: { // wxStyledTextCtrl::StyleSetFont
@@ -30015,7 +30056,7 @@ case wxStyledTextCtrl_StyleSetFont: { // wxStyledTextCtrl::StyleSetFont
  int * styleNum = (int *) bp; bp += 4;
  wxFont *font = (wxFont *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetFont((int) *styleNum,*font);
+ This->StyleSetFont(*styleNum,*font);
  break;
 }
 case wxStyledTextCtrl_StyleSetFontAttr: { // wxStyledTextCtrl::StyleSetFontAttr
@@ -30036,7 +30077,7 @@ encoding = *(wxFontEncoding *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->StyleSetFontAttr((int) *styleNum,(int) *size,faceName,(bool) *bold,(bool) *italic,(bool) *underline,(wxFontEncoding) encoding);
+ This->StyleSetFontAttr(*styleNum,*size,faceName,*bold,*italic,*underline,encoding);
  break;
 }
 case wxStyledTextCtrl_StyleSetCharacterSet: { // wxStyledTextCtrl::StyleSetCharacterSet
@@ -30044,7 +30085,7 @@ case wxStyledTextCtrl_StyleSetCharacterSet: { // wxStyledTextCtrl::StyleSetChara
  int * style = (int *) bp; bp += 4;
  int * characterSet = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->StyleSetCharacterSet((int) *style,(int) *characterSet);
+ This->StyleSetCharacterSet(*style,*characterSet);
  break;
 }
 case wxStyledTextCtrl_StyleSetFontEncoding: { // wxStyledTextCtrl::StyleSetFontEncoding
@@ -30052,14 +30093,14 @@ case wxStyledTextCtrl_StyleSetFontEncoding: { // wxStyledTextCtrl::StyleSetFontE
  int * style = (int *) bp; bp += 4;
  wxFontEncoding encoding = *(wxFontEncoding *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- This->StyleSetFontEncoding((int) *style,(wxFontEncoding) encoding);
+ This->StyleSetFontEncoding(*style,encoding);
  break;
 }
 case wxStyledTextCtrl_CmdKeyExecute: { // wxStyledTextCtrl::CmdKeyExecute
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * cmd = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->CmdKeyExecute((int) *cmd);
+ This->CmdKeyExecute(*cmd);
  break;
 }
 case wxStyledTextCtrl_SetMargins: { // wxStyledTextCtrl::SetMargins
@@ -30067,7 +30108,7 @@ case wxStyledTextCtrl_SetMargins: { // wxStyledTextCtrl::SetMargins
  int * left = (int *) bp; bp += 4;
  int * right = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMargins((int) *left,(int) *right);
+ This->SetMargins(*left,*right);
  break;
 }
 case wxStyledTextCtrl_GetSelection: { // wxStyledTextCtrl::GetSelection
@@ -30085,7 +30126,7 @@ case wxStyledTextCtrl_PointFromPosition: { // wxStyledTextCtrl::PointFromPositio
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxPoint Result = This->PointFromPosition((int) *pos);
+ wxPoint Result = This->PointFromPosition(*pos);
  rt.add(Result);
  break;
 }
@@ -30093,32 +30134,14 @@ case wxStyledTextCtrl_ScrollToLine: { // wxStyledTextCtrl::ScrollToLine
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ScrollToLine((int) *line);
+ This->ScrollToLine(*line);
  break;
 }
 case wxStyledTextCtrl_ScrollToColumn: { // wxStyledTextCtrl::ScrollToColumn
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * column = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->ScrollToColumn((int) *column);
- break;
-}
-case wxStyledTextCtrl_SendMsg: { // wxStyledTextCtrl::SendMsg
- long wp=0;
- long lp=0;
- wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
- int * msg = (int *) bp; bp += 4;
- while( * (int*) bp) { switch (* (int*) bp) {
-  case 1: {bp += 4;
- wp = (long)*(int *) bp; bp += 4;
-  } break;
-  case 2: {bp += 4;
- lp = (long)*(int *) bp; bp += 4;
-  } break;
- }};
- if(!This) throw wxe_badarg(0);
- long Result = This->SendMsg((int) *msg,wp,lp);
- rt.addInt(Result);
+ This->ScrollToColumn(*column);
  break;
 }
 case wxStyledTextCtrl_SetVScrollBar: { // wxStyledTextCtrl::SetVScrollBar
@@ -30146,7 +30169,7 @@ case wxStyledTextCtrl_SetLastKeydownProcessed: { // wxStyledTextCtrl::SetLastKey
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  bool * val = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetLastKeydownProcessed((bool) *val);
+ This->SetLastKeydownProcessed(*val);
  break;
 }
 case wxStyledTextCtrl_SaveFile: { // wxStyledTextCtrl::SaveFile
@@ -30175,7 +30198,7 @@ case wxStyledTextCtrl_DoDragOver: { // wxStyledTextCtrl::DoDragOver
  int * y = (int *) bp; bp += 4;
  wxDragResult def = *(wxDragResult *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- int Result = This->DoDragOver((wxCoord) *x,(wxCoord) *y,(wxDragResult) def);
+ int Result = This->DoDragOver(*x,*y,def);
  rt.addInt(Result);
  break;
 }
@@ -30187,7 +30210,7 @@ case wxStyledTextCtrl_DoDropText: { // wxStyledTextCtrl::DoDropText
  wxString data = wxString(bp, wxConvUTF8);
  bp += *dataLen+((8-((0+ *dataLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- bool Result = This->DoDropText((long) *x,(long) *y,data);
+ bool Result = This->DoDropText(*x,*y,data);
  rt.addBool(Result);
  break;
 }
@@ -30210,7 +30233,7 @@ case wxStyledTextCtrl_InsertTextRaw: { // wxStyledTextCtrl::InsertTextRaw
  int * pos = (int *) bp; bp += 4;
  const char * text = (const char*) Ecmd.bin[0]->base;
  if(!This) throw wxe_badarg(0);
- This->InsertTextRaw((int) *pos,text);
+ This->InsertTextRaw(*pos,text);
  break;
 }
 case wxStyledTextCtrl_GetCurLineRaw: { // wxStyledTextCtrl::GetCurLineRaw
@@ -30229,7 +30252,7 @@ case wxStyledTextCtrl_GetLineRaw: { // wxStyledTextCtrl::GetLineRaw
  wxStyledTextCtrl *This = (wxStyledTextCtrl *) getPtr(bp,memenv); bp += 4;
  int * line = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- char * Result = This->GetLineRaw((int) *line).data();
+ char * Result = This->GetLineRaw(*line).data();
  if(Result) {
     rt.addBinary(Result, strlen(Result));
  } else {rt.addAtom("null");};
@@ -30249,7 +30272,7 @@ case wxStyledTextCtrl_GetTextRangeRaw: { // wxStyledTextCtrl::GetTextRangeRaw
  int * startPos = (int *) bp; bp += 4;
  int * endPos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- char * Result = This->GetTextRangeRaw((int) *startPos,(int) *endPos).data();
+ char * Result = This->GetTextRangeRaw(*startPos,*endPos).data();
  if(Result) {
     rt.addBinary(Result, strlen(Result));
  } else {rt.addAtom("null");};
@@ -30400,19 +30423,19 @@ case wxNotebookEvent_SetOldSelection: { // wxNotebookEvent::SetOldSelection
  wxNotebookEvent *This = (wxNotebookEvent *) getPtr(bp,memenv); bp += 4;
  int * nOldSel = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetOldSelection((int) *nOldSel);
+ This->SetOldSelection(*nOldSel);
  break;
 }
 case wxNotebookEvent_SetSelection: { // wxNotebookEvent::SetSelection
  wxNotebookEvent *This = (wxNotebookEvent *) getPtr(bp,memenv); bp += 4;
  int * nSel = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((int) *nSel);
+ This->SetSelection(*nSel);
  break;
 }
 case wxFileDataObject_new: { // wxFileDataObject::wxFileDataObject
  wxFileDataObject * Result = new wxFileDataObject();
- newPtr((void *) Result, 212, memenv);
+ newPtr((void *) Result, 211, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFileDataObject");
  break;
 }
@@ -30448,7 +30471,7 @@ case wxTextDataObject_new: { // wxTextDataObject::wxTextDataObject
   } break;
  }};
  wxTextDataObject * Result = new wxTextDataObject(text);
- newPtr((void *) Result, 213, memenv);
+ newPtr((void *) Result, 212, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxTextDataObject");
  break;
 }
@@ -30484,7 +30507,7 @@ case wxTextDataObject_destroy: { // wxTextDataObject::destroy
 case wxBitmapDataObject_new_1_1: { // wxBitmapDataObject::wxBitmapDataObject
  wxBitmap *bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  wxBitmapDataObject * Result = new wxBitmapDataObject(*bitmap);
- newPtr((void *) Result, 214, memenv);
+ newPtr((void *) Result, 213, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmapDataObject");
  break;
 }
@@ -30496,7 +30519,7 @@ bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  wxBitmapDataObject * Result = new wxBitmapDataObject(*bitmap);
- newPtr((void *) Result, 214, memenv);
+ newPtr((void *) Result, 213, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmapDataObject");
  break;
 }
@@ -30598,9 +30621,9 @@ case wxClipboard_UsePrimarySelection: { // wxClipboard::UsePrimarySelection
 }
 case wxClipboard_IsSupported: { // wxClipboard::IsSupported
  wxClipboard *This = (wxClipboard *) getPtr(bp,memenv); bp += 4;
- const int * format = (const int *) bp; bp += 4;
+ wxDataFormatId format = *(wxDataFormatId *) bp; bp += 4;;
  if(!This) throw wxe_badarg(0);
- bool Result = This->IsSupported((wxDataFormatId) *format);
+ bool Result = This->IsSupported(format);
  rt.addBool(Result);
  break;
 }
@@ -30620,7 +30643,7 @@ case wxSpinEvent_SetPosition: { // wxSpinEvent::SetPosition
  wxSpinEvent *This = (wxSpinEvent *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetPosition((int) *pos);
+ This->SetPosition(*pos);
  break;
 }
 case wxSplitterWindow_new_0: { // wxSplitterWindow::wxSplitterWindow
@@ -30763,7 +30786,7 @@ case wxSplitterWindow_SetSashGravity: { // wxSplitterWindow::SetSashGravity
  bp += 4; /* Align */
  double * gravity = (double *) bp; bp += 8;
  if(!This) throw wxe_badarg(0);
- This->SetSashGravity((double) *gravity);
+ This->SetSashGravity(*gravity);
  break;
 }
 case wxSplitterWindow_SetSashPosition: { // wxSplitterWindow::SetSashPosition
@@ -30776,28 +30799,28 @@ case wxSplitterWindow_SetSashPosition: { // wxSplitterWindow::SetSashPosition
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- This->SetSashPosition((int) *position,redraw);
+ This->SetSashPosition(*position,redraw);
  break;
 }
 case wxSplitterWindow_SetSashSize: { // wxSplitterWindow::SetSashSize
  wxSplitterWindow *This = (wxSplitterWindow *) getPtr(bp,memenv); bp += 4;
  int * width = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSashSize((int) *width);
+ This->SetSashSize(*width);
  break;
 }
 case wxSplitterWindow_SetMinimumPaneSize: { // wxSplitterWindow::SetMinimumPaneSize
  wxSplitterWindow *This = (wxSplitterWindow *) getPtr(bp,memenv); bp += 4;
  int * min = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetMinimumPaneSize((int) *min);
+ This->SetMinimumPaneSize(*min);
  break;
 }
 case wxSplitterWindow_SetSplitMode: { // wxSplitterWindow::SetSplitMode
  wxSplitterWindow *This = (wxSplitterWindow *) getPtr(bp,memenv); bp += 4;
  int * mode = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSplitMode((int) *mode);
+ This->SetSplitMode(*mode);
  break;
 }
 case wxSplitterWindow_SplitHorizontally: { // wxSplitterWindow::SplitHorizontally
@@ -30884,7 +30907,7 @@ case wxSplitterEvent_SetSashPosition: { // wxSplitterEvent::SetSashPosition
  wxSplitterEvent *This = (wxSplitterEvent *) getPtr(bp,memenv); bp += 4;
  int * pos = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSashPosition((int) *pos);
+ This->SetSashPosition(*pos);
  break;
 }
 case wxHtmlWindow_new_0: { // wxHtmlWindow::wxHtmlWindow
@@ -31053,7 +31076,7 @@ case wxHtmlWindow_SetBorders: { // wxHtmlWindow::SetBorders
  wxHtmlWindow *This = (wxHtmlWindow *) getPtr(bp,memenv); bp += 4;
  int * b = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetBorders((int) *b);
+ This->SetBorders(*b);
  break;
 }
 case wxHtmlWindow_SetFonts: { // wxHtmlWindow::SetFonts
@@ -31098,7 +31121,7 @@ case wxHtmlWindow_SetRelatedStatusBar: { // wxHtmlWindow::SetRelatedStatusBar
  wxHtmlWindow *This = (wxHtmlWindow *) getPtr(bp,memenv); bp += 4;
  int * bar = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetRelatedStatusBar((int) *bar);
+ This->SetRelatedStatusBar(*bar);
  break;
 }
 case wxHtmlWindow_ToText: { // wxHtmlWindow::ToText
@@ -31117,13 +31140,13 @@ case wxHtmlLinkEvent_GetLinkInfo: { // wxHtmlLinkEvent::GetLinkInfo
 }
 case wxSystemSettings_GetColour: { // wxSystemSettings::GetColour
  wxSystemColour index = *(wxSystemColour *) bp; bp += 4;;
- wxColour Result = wxSystemSettings::GetColour((wxSystemColour) index);
+ wxColour Result = wxSystemSettings::GetColour(index);
  rt.add(Result);
  break;
 }
 case wxSystemSettings_GetFont: { // wxSystemSettings::GetFont
  wxSystemFont index = *(wxSystemFont *) bp; bp += 4;;
- wxFont * Result = new wxFont(wxSystemSettings::GetFont((wxSystemFont) index)); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new wxFont(wxSystemSettings::GetFont(index)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -31136,7 +31159,7 @@ case wxSystemSettings_GetMetric: { // wxSystemSettings::GetMetric
 win = (wxWindow *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
- int Result = wxSystemSettings::GetMetric((wxSystemMetric) index,win);
+ int Result = wxSystemSettings::GetMetric(index,win);
  rt.addInt(Result);
  break;
 }
@@ -31192,14 +31215,14 @@ case wxSystemOptions_SetOption_2_0: { // wxSystemOptions::SetOption
  wxString name = wxString(bp, wxConvUTF8);
  bp += *nameLen+((8-((4+ *nameLen) & 7)) & 7);
  int * value = (int *) bp; bp += 4;
- wxSystemOptions::SetOption(name,(int) *value);
+ wxSystemOptions::SetOption(name,*value);
  break;
 }
 case wxAuiNotebookEvent_SetSelection: { // wxAuiNotebookEvent::SetSelection
  wxAuiNotebookEvent *This = (wxAuiNotebookEvent *) getPtr(bp,memenv); bp += 4;
  int * s = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetSelection((int) *s);
+ This->SetSelection(*s);
  break;
 }
 case wxAuiNotebookEvent_GetSelection: { // wxAuiNotebookEvent::GetSelection
@@ -31213,7 +31236,7 @@ case wxAuiNotebookEvent_SetOldSelection: { // wxAuiNotebookEvent::SetOldSelectio
  wxAuiNotebookEvent *This = (wxAuiNotebookEvent *) getPtr(bp,memenv); bp += 4;
  int * s = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetOldSelection((int) *s);
+ This->SetOldSelection(*s);
  break;
 }
 case wxAuiNotebookEvent_GetOldSelection: { // wxAuiNotebookEvent::GetOldSelection
@@ -31269,7 +31292,7 @@ case wxAuiManagerEvent_SetButton: { // wxAuiManagerEvent::SetButton
  wxAuiManagerEvent *This = (wxAuiManagerEvent *) getPtr(bp,memenv); bp += 4;
  int * b = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetButton((int) *b);
+ This->SetButton(*b);
  break;
 }
 case wxAuiManagerEvent_GetButton: { // wxAuiManagerEvent::GetButton
@@ -31317,7 +31340,7 @@ case wxAuiManagerEvent_SetCanVeto: { // wxAuiManagerEvent::SetCanVeto
  wxAuiManagerEvent *This = (wxAuiManagerEvent *) getPtr(bp,memenv); bp += 4;
  bool * can_veto = (bool *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- This->SetCanVeto((bool) *can_veto);
+ This->SetCanVeto(*can_veto);
  break;
 }
 case wxAuiManagerEvent_CanVeto: { // wxAuiManagerEvent::CanVeto
@@ -31329,7 +31352,7 @@ case wxAuiManagerEvent_CanVeto: { // wxAuiManagerEvent::CanVeto
 }
 case wxLogNull_new: { // wxLogNull::wxLogNull
  wxLogNull * Result = new wxLogNull();
- newPtr((void *) Result, 225, memenv);
+ newPtr((void *) Result, 224, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxLogNull");
  break;
 }
@@ -31416,10 +31439,10 @@ void WxeApp::delete_object(void *ptr, wxeRefData *refd) {
   case 101: delete (wxListItemAttr *) ptr; break;
   case 103: delete (wxTextAttr *) ptr; break;
   case 155: delete (wxAuiPaneInfo *) ptr; break;
-  case 212: /* delete (wxFileDataObject *) ptr;These objects must be deleted by owner object */ break;
-  case 213: /* delete (wxTextDataObject *) ptr;These objects must be deleted by owner object */ break;
-  case 214: /* delete (wxBitmapDataObject *) ptr;These objects must be deleted by owner object */ break;
-  case 225: delete (wxLogNull *) ptr; break;
+  case 211: /* delete (wxFileDataObject *) ptr;These objects must be deleted by owner object */ break;
+  case 212: /* delete (wxTextDataObject *) ptr;These objects must be deleted by owner object */ break;
+  case 213: /* delete (wxBitmapDataObject *) ptr;These objects must be deleted by owner object */ break;
+  case 224: delete (wxLogNull *) ptr; break;
   default: delete (wxObject *) ptr;
 }}
 
diff --git a/lib/wx/c_src/gen/wxe_macros.h b/lib/wx/c_src/gen/wxe_macros.h
index b24becae06..4b87c2340e 100644
--- a/lib/wx/c_src/gen/wxe_macros.h
+++ b/lib/wx/c_src/gen/wxe_macros.h
@@ -3201,155 +3201,154 @@
 #define wxStyledTextCtrl_PointFromPosition 3370
 #define wxStyledTextCtrl_ScrollToLine 3371
 #define wxStyledTextCtrl_ScrollToColumn 3372
-#define wxStyledTextCtrl_SendMsg 3373
-#define wxStyledTextCtrl_SetVScrollBar 3374
-#define wxStyledTextCtrl_SetHScrollBar 3375
-#define wxStyledTextCtrl_GetLastKeydownProcessed 3376
-#define wxStyledTextCtrl_SetLastKeydownProcessed 3377
-#define wxStyledTextCtrl_SaveFile 3378
-#define wxStyledTextCtrl_LoadFile 3379
-#define wxStyledTextCtrl_DoDragOver 3380
-#define wxStyledTextCtrl_DoDropText 3381
-#define wxStyledTextCtrl_GetUseAntiAliasing 3382
-#define wxStyledTextCtrl_AddTextRaw 3383
-#define wxStyledTextCtrl_InsertTextRaw 3384
-#define wxStyledTextCtrl_GetCurLineRaw 3385
-#define wxStyledTextCtrl_GetLineRaw 3386
-#define wxStyledTextCtrl_GetSelectedTextRaw 3387
-#define wxStyledTextCtrl_GetTextRangeRaw 3388
-#define wxStyledTextCtrl_SetTextRaw 3389
-#define wxStyledTextCtrl_GetTextRaw 3390
-#define wxStyledTextCtrl_AppendTextRaw 3391
-#define wxArtProvider_GetBitmap 3392
-#define wxArtProvider_GetIcon 3393
-#define wxTreeEvent_GetKeyCode 3394
-#define wxTreeEvent_GetItem 3395
-#define wxTreeEvent_GetKeyEvent 3396
-#define wxTreeEvent_GetLabel 3397
-#define wxTreeEvent_GetOldItem 3398
-#define wxTreeEvent_GetPoint 3399
-#define wxTreeEvent_IsEditCancelled 3400
-#define wxTreeEvent_SetToolTip 3401
-#define wxNotebookEvent_GetOldSelection 3402
-#define wxNotebookEvent_GetSelection 3403
-#define wxNotebookEvent_SetOldSelection 3404
-#define wxNotebookEvent_SetSelection 3405
-#define wxFileDataObject_new 3406
-#define wxFileDataObject_AddFile 3407
-#define wxFileDataObject_GetFilenames 3408
-#define wxFileDataObject_destroy 3409
-#define wxTextDataObject_new 3410
-#define wxTextDataObject_GetTextLength 3411
-#define wxTextDataObject_GetText 3412
-#define wxTextDataObject_SetText 3413
-#define wxTextDataObject_destroy 3414
-#define wxBitmapDataObject_new_1_1 3415
-#define wxBitmapDataObject_new_1_0 3416
-#define wxBitmapDataObject_GetBitmap 3417
-#define wxBitmapDataObject_SetBitmap 3418
-#define wxBitmapDataObject_destroy 3419
-#define wxClipboard_new 3421
-#define wxClipboard_destruct 3422
-#define wxClipboard_AddData 3423
-#define wxClipboard_Clear 3424
-#define wxClipboard_Close 3425
-#define wxClipboard_Flush 3426
-#define wxClipboard_GetData 3427
-#define wxClipboard_IsOpened 3428
-#define wxClipboard_Open 3429
-#define wxClipboard_SetData 3430
-#define wxClipboard_UsePrimarySelection 3432
-#define wxClipboard_IsSupported 3433
-#define wxClipboard_Get 3434
-#define wxSpinEvent_GetPosition 3435
-#define wxSpinEvent_SetPosition 3436
-#define wxSplitterWindow_new_0 3437
-#define wxSplitterWindow_new_2 3438
-#define wxSplitterWindow_destruct 3439
-#define wxSplitterWindow_Create 3440
-#define wxSplitterWindow_GetMinimumPaneSize 3441
-#define wxSplitterWindow_GetSashGravity 3442
-#define wxSplitterWindow_GetSashPosition 3443
-#define wxSplitterWindow_GetSplitMode 3444
-#define wxSplitterWindow_GetWindow1 3445
-#define wxSplitterWindow_GetWindow2 3446
-#define wxSplitterWindow_Initialize 3447
-#define wxSplitterWindow_IsSplit 3448
-#define wxSplitterWindow_ReplaceWindow 3449
-#define wxSplitterWindow_SetSashGravity 3450
-#define wxSplitterWindow_SetSashPosition 3451
-#define wxSplitterWindow_SetSashSize 3452
-#define wxSplitterWindow_SetMinimumPaneSize 3453
-#define wxSplitterWindow_SetSplitMode 3454
-#define wxSplitterWindow_SplitHorizontally 3455
-#define wxSplitterWindow_SplitVertically 3456
-#define wxSplitterWindow_Unsplit 3457
-#define wxSplitterWindow_UpdateSize 3458
-#define wxSplitterEvent_GetSashPosition 3459
-#define wxSplitterEvent_GetX 3460
-#define wxSplitterEvent_GetY 3461
-#define wxSplitterEvent_GetWindowBeingRemoved 3462
-#define wxSplitterEvent_SetSashPosition 3463
-#define wxHtmlWindow_new_0 3464
-#define wxHtmlWindow_new_2 3465
-#define wxHtmlWindow_AppendToPage 3466
-#define wxHtmlWindow_GetOpenedAnchor 3467
-#define wxHtmlWindow_GetOpenedPage 3468
-#define wxHtmlWindow_GetOpenedPageTitle 3469
-#define wxHtmlWindow_GetRelatedFrame 3470
-#define wxHtmlWindow_HistoryBack 3471
-#define wxHtmlWindow_HistoryCanBack 3472
-#define wxHtmlWindow_HistoryCanForward 3473
-#define wxHtmlWindow_HistoryClear 3474
-#define wxHtmlWindow_HistoryForward 3475
-#define wxHtmlWindow_LoadFile 3476
-#define wxHtmlWindow_LoadPage 3477
-#define wxHtmlWindow_SelectAll 3478
-#define wxHtmlWindow_SelectionToText 3479
-#define wxHtmlWindow_SelectLine 3480
-#define wxHtmlWindow_SelectWord 3481
-#define wxHtmlWindow_SetBorders 3482
-#define wxHtmlWindow_SetFonts 3483
-#define wxHtmlWindow_SetPage 3484
-#define wxHtmlWindow_SetRelatedFrame 3485
-#define wxHtmlWindow_SetRelatedStatusBar 3486
-#define wxHtmlWindow_ToText 3487
-#define wxHtmlWindow_destroy 3488
-#define wxHtmlLinkEvent_GetLinkInfo 3489
-#define wxSystemSettings_GetColour 3490
-#define wxSystemSettings_GetFont 3491
-#define wxSystemSettings_GetMetric 3492
-#define wxSystemSettings_GetScreenType 3493
-#define wxSystemOptions_GetOption 3494
-#define wxSystemOptions_GetOptionInt 3495
-#define wxSystemOptions_HasOption 3496
-#define wxSystemOptions_IsFalse 3497
-#define wxSystemOptions_SetOption_2_1 3498
-#define wxSystemOptions_SetOption_2_0 3499
-#define wxAuiNotebookEvent_SetSelection 3500
-#define wxAuiNotebookEvent_GetSelection 3501
-#define wxAuiNotebookEvent_SetOldSelection 3502
-#define wxAuiNotebookEvent_GetOldSelection 3503
-#define wxAuiNotebookEvent_SetDragSource 3504
-#define wxAuiNotebookEvent_GetDragSource 3505
-#define wxAuiManagerEvent_SetManager 3506
-#define wxAuiManagerEvent_GetManager 3507
-#define wxAuiManagerEvent_SetPane 3508
-#define wxAuiManagerEvent_GetPane 3509
-#define wxAuiManagerEvent_SetButton 3510
-#define wxAuiManagerEvent_GetButton 3511
-#define wxAuiManagerEvent_SetDC 3512
-#define wxAuiManagerEvent_GetDC 3513
-#define wxAuiManagerEvent_Veto 3514
-#define wxAuiManagerEvent_GetVeto 3515
-#define wxAuiManagerEvent_SetCanVeto 3516
-#define wxAuiManagerEvent_CanVeto 3517
-#define wxLogNull_new 3518
-#define wxLogNull_destroy 3519
-#define wxTaskBarIcon_new 3520
-#define wxTaskBarIcon_destruct 3521
-#define wxTaskBarIcon_PopupMenu 3522
-#define wxTaskBarIcon_RemoveIcon 3523
-#define wxTaskBarIcon_SetIcon 3524
+#define wxStyledTextCtrl_SetVScrollBar 3373
+#define wxStyledTextCtrl_SetHScrollBar 3374
+#define wxStyledTextCtrl_GetLastKeydownProcessed 3375
+#define wxStyledTextCtrl_SetLastKeydownProcessed 3376
+#define wxStyledTextCtrl_SaveFile 3377
+#define wxStyledTextCtrl_LoadFile 3378
+#define wxStyledTextCtrl_DoDragOver 3379
+#define wxStyledTextCtrl_DoDropText 3380
+#define wxStyledTextCtrl_GetUseAntiAliasing 3381
+#define wxStyledTextCtrl_AddTextRaw 3382
+#define wxStyledTextCtrl_InsertTextRaw 3383
+#define wxStyledTextCtrl_GetCurLineRaw 3384
+#define wxStyledTextCtrl_GetLineRaw 3385
+#define wxStyledTextCtrl_GetSelectedTextRaw 3386
+#define wxStyledTextCtrl_GetTextRangeRaw 3387
+#define wxStyledTextCtrl_SetTextRaw 3388
+#define wxStyledTextCtrl_GetTextRaw 3389
+#define wxStyledTextCtrl_AppendTextRaw 3390
+#define wxArtProvider_GetBitmap 3391
+#define wxArtProvider_GetIcon 3392
+#define wxTreeEvent_GetKeyCode 3393
+#define wxTreeEvent_GetItem 3394
+#define wxTreeEvent_GetKeyEvent 3395
+#define wxTreeEvent_GetLabel 3396
+#define wxTreeEvent_GetOldItem 3397
+#define wxTreeEvent_GetPoint 3398
+#define wxTreeEvent_IsEditCancelled 3399
+#define wxTreeEvent_SetToolTip 3400
+#define wxNotebookEvent_GetOldSelection 3401
+#define wxNotebookEvent_GetSelection 3402
+#define wxNotebookEvent_SetOldSelection 3403
+#define wxNotebookEvent_SetSelection 3404
+#define wxFileDataObject_new 3405
+#define wxFileDataObject_AddFile 3406
+#define wxFileDataObject_GetFilenames 3407
+#define wxFileDataObject_destroy 3408
+#define wxTextDataObject_new 3409
+#define wxTextDataObject_GetTextLength 3410
+#define wxTextDataObject_GetText 3411
+#define wxTextDataObject_SetText 3412
+#define wxTextDataObject_destroy 3413
+#define wxBitmapDataObject_new_1_1 3414
+#define wxBitmapDataObject_new_1_0 3415
+#define wxBitmapDataObject_GetBitmap 3416
+#define wxBitmapDataObject_SetBitmap 3417
+#define wxBitmapDataObject_destroy 3418
+#define wxClipboard_new 3420
+#define wxClipboard_destruct 3421
+#define wxClipboard_AddData 3422
+#define wxClipboard_Clear 3423
+#define wxClipboard_Close 3424
+#define wxClipboard_Flush 3425
+#define wxClipboard_GetData 3426
+#define wxClipboard_IsOpened 3427
+#define wxClipboard_Open 3428
+#define wxClipboard_SetData 3429
+#define wxClipboard_UsePrimarySelection 3431
+#define wxClipboard_IsSupported 3432
+#define wxClipboard_Get 3433
+#define wxSpinEvent_GetPosition 3434
+#define wxSpinEvent_SetPosition 3435
+#define wxSplitterWindow_new_0 3436
+#define wxSplitterWindow_new_2 3437
+#define wxSplitterWindow_destruct 3438
+#define wxSplitterWindow_Create 3439
+#define wxSplitterWindow_GetMinimumPaneSize 3440
+#define wxSplitterWindow_GetSashGravity 3441
+#define wxSplitterWindow_GetSashPosition 3442
+#define wxSplitterWindow_GetSplitMode 3443
+#define wxSplitterWindow_GetWindow1 3444
+#define wxSplitterWindow_GetWindow2 3445
+#define wxSplitterWindow_Initialize 3446
+#define wxSplitterWindow_IsSplit 3447
+#define wxSplitterWindow_ReplaceWindow 3448
+#define wxSplitterWindow_SetSashGravity 3449
+#define wxSplitterWindow_SetSashPosition 3450
+#define wxSplitterWindow_SetSashSize 3451
+#define wxSplitterWindow_SetMinimumPaneSize 3452
+#define wxSplitterWindow_SetSplitMode 3453
+#define wxSplitterWindow_SplitHorizontally 3454
+#define wxSplitterWindow_SplitVertically 3455
+#define wxSplitterWindow_Unsplit 3456
+#define wxSplitterWindow_UpdateSize 3457
+#define wxSplitterEvent_GetSashPosition 3458
+#define wxSplitterEvent_GetX 3459
+#define wxSplitterEvent_GetY 3460
+#define wxSplitterEvent_GetWindowBeingRemoved 3461
+#define wxSplitterEvent_SetSashPosition 3462
+#define wxHtmlWindow_new_0 3463
+#define wxHtmlWindow_new_2 3464
+#define wxHtmlWindow_AppendToPage 3465
+#define wxHtmlWindow_GetOpenedAnchor 3466
+#define wxHtmlWindow_GetOpenedPage 3467
+#define wxHtmlWindow_GetOpenedPageTitle 3468
+#define wxHtmlWindow_GetRelatedFrame 3469
+#define wxHtmlWindow_HistoryBack 3470
+#define wxHtmlWindow_HistoryCanBack 3471
+#define wxHtmlWindow_HistoryCanForward 3472
+#define wxHtmlWindow_HistoryClear 3473
+#define wxHtmlWindow_HistoryForward 3474
+#define wxHtmlWindow_LoadFile 3475
+#define wxHtmlWindow_LoadPage 3476
+#define wxHtmlWindow_SelectAll 3477
+#define wxHtmlWindow_SelectionToText 3478
+#define wxHtmlWindow_SelectLine 3479
+#define wxHtmlWindow_SelectWord 3480
+#define wxHtmlWindow_SetBorders 3481
+#define wxHtmlWindow_SetFonts 3482
+#define wxHtmlWindow_SetPage 3483
+#define wxHtmlWindow_SetRelatedFrame 3484
+#define wxHtmlWindow_SetRelatedStatusBar 3485
+#define wxHtmlWindow_ToText 3486
+#define wxHtmlWindow_destroy 3487
+#define wxHtmlLinkEvent_GetLinkInfo 3488
+#define wxSystemSettings_GetColour 3489
+#define wxSystemSettings_GetFont 3490
+#define wxSystemSettings_GetMetric 3491
+#define wxSystemSettings_GetScreenType 3492
+#define wxSystemOptions_GetOption 3493
+#define wxSystemOptions_GetOptionInt 3494
+#define wxSystemOptions_HasOption 3495
+#define wxSystemOptions_IsFalse 3496
+#define wxSystemOptions_SetOption_2_1 3497
+#define wxSystemOptions_SetOption_2_0 3498
+#define wxAuiNotebookEvent_SetSelection 3499
+#define wxAuiNotebookEvent_GetSelection 3500
+#define wxAuiNotebookEvent_SetOldSelection 3501
+#define wxAuiNotebookEvent_GetOldSelection 3502
+#define wxAuiNotebookEvent_SetDragSource 3503
+#define wxAuiNotebookEvent_GetDragSource 3504
+#define wxAuiManagerEvent_SetManager 3505
+#define wxAuiManagerEvent_GetManager 3506
+#define wxAuiManagerEvent_SetPane 3507
+#define wxAuiManagerEvent_GetPane 3508
+#define wxAuiManagerEvent_SetButton 3509
+#define wxAuiManagerEvent_GetButton 3510
+#define wxAuiManagerEvent_SetDC 3511
+#define wxAuiManagerEvent_GetDC 3512
+#define wxAuiManagerEvent_Veto 3513
+#define wxAuiManagerEvent_GetVeto 3514
+#define wxAuiManagerEvent_SetCanVeto 3515
+#define wxAuiManagerEvent_CanVeto 3516
+#define wxLogNull_new 3517
+#define wxLogNull_destroy 3518
+#define wxTaskBarIcon_new 3519
+#define wxTaskBarIcon_destruct 3520
+#define wxTaskBarIcon_PopupMenu 3521
+#define wxTaskBarIcon_RemoveIcon 3522
+#define wxTaskBarIcon_SetIcon 3523
 
 
diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp
index 69fcd4e362..527fabc315 100644
--- a/lib/wx/c_src/wxe_impl.cpp
+++ b/lib/wx/c_src/wxe_impl.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2011. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2012. 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
@@ -30,6 +30,11 @@
 // Ok ugly but needed for wxBufferedDC crash workaround
 #define private public
 #include <wx/dcbuffer.h>
+
+#if defined(__WXMSW__)
+    #include <wx/msw/private.h> // for wxSetInstance
+#endif
+
 #undef private
 
 #include "wxe_impl.h"
@@ -222,6 +227,11 @@ void *wxe_main_loop(void *vpdl)
   // This should be done in emulator but it's not in yet.
 #ifndef _WIN32
   erts_thread_disable_fpe();
+#else 
+  // Setup that wxWidgets should look for cursors and icons in 
+  // this dll and not in werl.exe (which is the default)
+  HMODULE WXEHandle = GetModuleHandle(_T("wxe_driver"));
+  wxSetInstance((HINSTANCE) WXEHandle);
 #endif
 
   result = wxEntry(argc, argv);
@@ -248,20 +258,30 @@ wxFrame * dummy_window;
 
 void create_dummy_window() {
   dummy_window = new wxFrame(NULL,-1, wxT("wx driver"),
-			     wxDefaultPosition, wxSize(5,5),
+			     wxPoint(0,0), wxSize(5,5),
 			     wxFRAME_NO_TASKBAR);
+
+  wxMenuBar * menubar = new wxMenuBar();
+  dummy_window->SetMenuBar(menubar);
+  // wx-2.9 Don't delete the app menubar correctly
   dummy_window->Connect(wxID_ANY, wxEVT_CLOSE_WINDOW,
 			(wxObjectEventFunction) (wxEventFunction) &WxeApp::dummy_close);
+  dummy_window->Connect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED,
+			(wxObjectEventFunction) (wxEventFunction) &WxeApp::dummy_close);
+  dummy_window->Show(true);
+  // dummy_window->Show(false);
 }
 
 // wxMac really wants a top level window which command-q quits if there are no
 // windows open, and this will kill the thread, so restart the dummy_window each
 // time a we receive a close.
 void WxeApp::dummy_close(wxEvent& Ev) {
-  // fprintf(stderr, "Tried to close dummy window\r\n"); fflush(stderr);
-  create_dummy_window();
+  if(Ev.GetEventType() == wxEVT_CLOSE_WINDOW) {
+    create_dummy_window();
+  }
 }
 
+
 // Init wx-widgets thread
 bool WxeApp::OnInit()
 {
@@ -272,7 +292,7 @@ bool WxeApp::OnInit()
   wxe_batch_cb_saved = new wxList;
   cb_buff = NULL;
 
-  wxIdleEvent::SetMode(wxIDLE_PROCESS_SPECIFIED);
+  // wxIdleEvent::SetMode(wxIDLE_PROCESS_SPECIFIED); Hmm printpreview doesn't work in 2.9 with this
 
   this->Connect(wxID_ANY, wxEVT_IDLE,
 		(wxObjectEventFunction) (wxEventFunction) &WxeApp::idle);
@@ -290,7 +310,11 @@ bool WxeApp::OnInit()
 
   /* Create a dummy window so wxWidgets don't automagicly quits the main loop
      after the last window */
+#ifdef __DARWIN__
   create_dummy_window();
+#else
+  SetExitOnFrameDelete(false);
+#endif
 
   init_nonconsts(global_me, init_caller);
   erl_drv_mutex_lock(wxe_status_m);
@@ -301,7 +325,9 @@ bool WxeApp::OnInit()
 }
 
 void WxeApp::shutdown(wxeMetaCommand& Ecmd) {
+#ifdef __DARWIN__
   delete dummy_window;
+#endif
   ExitMainLoop();
 }
 
diff --git a/lib/wx/c_src/wxe_ps_init.c b/lib/wx/c_src/wxe_ps_init.c
index a85f751024..025ea90f8b 100644
--- a/lib/wx/c_src/wxe_ps_init.c
+++ b/lib/wx/c_src/wxe_ps_init.c
@@ -25,12 +25,17 @@
 #include <Cocoa/Cocoa.h>
 #include <objc/objc-runtime.h>
 
+extern OSErr  CPSSetProcessName (ProcessSerialNumber *psn, char *processname);
+
 void * wxe_ps_init() 
 {
    ProcessSerialNumber psn;
    NSAutoreleasePool *pool;
    // Enable GUI 
    GetCurrentProcess(&psn);
+   char *app_title = getenv("WX_APP_TITLE");
+   // Undocumented function (but no documented way of doing this exists)
+   CPSSetProcessName(&psn, app_title?app_title:"Erlang");
    TransformProcessType(&psn, kProcessTransformToForegroundApplication);
    SetFrontProcess(&psn);
    // Enable Cocoa calls from Carbon app
diff --git a/lib/wx/configure.in b/lib/wx/configure.in
index 0d3a3c11b3..c45d2285af 100755
--- a/lib/wx/configure.in
+++ b/lib/wx/configure.in
@@ -80,20 +80,20 @@ fi
 ## Otherwise skip building wxErlang
 AC_CHECK_SIZEOF(void *)
 
-case $ac_cv_sizeof_void_p-$host_os in
-    8-darwin*)
-	if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then
-		AC_MSG_ERROR([Can not use 64bits wxWidgets on Darwin])
-	else
-		echo "Can not combine 64bits erlang with wxWidgets on MacOSX, wx will not be useable" > ./CONF_INFO
-		WXERL_CAN_BUILD_DRIVER=false
-		AC_MSG_WARN([Can not combine 64bits erlang with wxWidgets on MacOSX, wx will not be useable])
-	fi
-	WXERL_CAN_BUILD_DRIVER=false
-	;;
-    *)
-	;;
-esac
+# case $ac_cv_sizeof_void_p-$host_os in
+#     8-darwin*)
+# 	if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then
+# 		AC_MSG_ERROR([Can not use 64bits wxWidgets on Darwin])
+# 	else
+# 		echo "Can not combine 64bits erlang with wxWidgets on MacOSX, wx will not be useable" > ./CONF_INFO
+# 		WXERL_CAN_BUILD_DRIVER=false
+# 		AC_MSG_WARN([Can not combine 64bits erlang with wxWidgets on MacOSX, wx will not be useable])
+# 	fi
+# 	WXERL_CAN_BUILD_DRIVER=false
+# 	;;
+#     *)
+# 	;;
+# esac
 
 PTHR_CFLAGS="-D_THREAD_SAFE -D_REENTRANT"
 
@@ -155,7 +155,7 @@ case $host_os in
 	      OBJC_CFLAGS="-ObjC"
 	   fi
   	fi
-  	CFLAGS=$saved_CFLAGS
+  	CFLAGS="$saved_CFLAGS -Wno-deprecated-declarations"
 	CPPFLAGS="$CPPFLAGS -D_MACOSX $PTHR_CFLAGS"
 	;;
     mingw32)
@@ -169,6 +169,7 @@ case $host_os in
 	CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0500"
 	;;
     *)
+	CFLAGS="$CFLAGS -Wno-deprecated-declarations"
 	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE $PTHR_CFLAGS"
 	;;
 esac
@@ -252,6 +253,18 @@ else
     AC_CHECK_HEADERS([gl/gl.h],[],[],[#include <windows.h>])
 fi
 
+if test X"$host_os" != X"win32" ; then
+    AC_CHECK_HEADERS([GL/glu.h], [],
+        [AC_CHECK_HEADERS([OpenGL/glu.h])])
+    if test X"$ac_cv_header_GL_glu_h" != Xyes &&
+        test X"$ac_cv_header_OpenGL_glu_h" != Xyes
+    then
+	AC_MSG_WARN([No GLU headers found, wx will NOT be usable])
+    fi
+else
+    AC_CHECK_HEADERS([gl/glu.h],[],[],[#include <windows.h>])
+fi
+
 AC_SUBST(GL_LIBS)
 
 CXXFLAGS="$CFLAGS $CPPFLAGS" 
@@ -308,7 +321,15 @@ if test "$cross_compiling" = "yes"; then
     echo "Cross compilation of the wx driver is not supported yet, wx will NOT be usable" > ./CONF_INFO
     WXERL_CAN_BUILD_DRIVER=false
 elif test  X"$MIXED_CYGWIN_VC" == X"no" -a X"$MIXED_MSYS_VC" == X"no"; then
-    m4_include(wxwin.m4)
+    WX_VERSION=`wx-config --version`
+    case $WX_VERSION in
+         2.8.*)
+		m4_include(wxwin-2.8.m4)
+		;;
+	 *)
+		m4_include(wxwin-2.9.m4)
+		;;
+    esac
 
     AM_OPTIONS_WXCONFIG
     reqwx=2.8.4
@@ -395,12 +416,12 @@ else
     else
 	CWXWIN_PROG=`cygpath -d "$PROGRAMFILES" | cygpath -f - 2>/dev/null`
     fi
-    CWXWIN3=$CWXWIN_PROG/wxWidgets-2.8
-    CWXWIN4=$CWXWIN_PROG/wxMSW-2.8
-    CWX_DOCUMENTED="/opt/local/pgm/wxMSW-2.8.* /opt/local/pgm/wxWidgets-2.8.*"
+    CWXWIN3=$CWXWIN_PROG/wxWidgets-2.*.*
+    CWXWIN4=$CWXWIN_PROG/wxMSW-2.*.*
+    CWX_DOCUMENTED="/opt/local/pgm/wxMSW-2.*.* /opt/local/pgm/wxWidgets-2.*.*"
     case $ac_cv_sizeof_void_p in
     	 8)
-		CWX_DOCUMENTED="/opt/local64/pgm/wxMSW-2.8.* /opt/local64/pgm/wxWidgets-2.8.* $CWX_DOCUMENTED"
+		CWX_DOCUMENTED="/opt/local64/pgm/wxMSW-2.*.* /opt/local64/pgm/wxWidgets-2.*.* $CWX_DOCUMENTED"
 		;;
          *)
 		true
@@ -442,6 +463,7 @@ else
 	    fi
 	fi
     done
+
     if test -z "$WX_LIBS_STATIC"; then
 	AC_MSG_RESULT([failed])
         if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then
diff --git a/lib/wx/examples/demo/demo.erl b/lib/wx/examples/demo/demo.erl
index 61e71af021..2f560096f5 100644
--- a/lib/wx/examples/demo/demo.erl
+++ b/lib/wx/examples/demo/demo.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -32,6 +32,21 @@
 
 -record(state, {win, demo, example, selector, log, code}).
 
+%% For wx-2.9 usage
+-ifndef(wxSTC_ERLANG_COMMENT_FUNCTION).
+-define(wxSTC_ERLANG_COMMENT_FUNCTION, 14).
+-define(wxSTC_ERLANG_COMMENT_MODULE, 15).
+-define(wxSTC_ERLANG_COMMENT_DOC, 16).
+-define(wxSTC_ERLANG_COMMENT_DOC_MACRO, 17).
+-define(wxSTC_ERLANG_ATOM_QUOTED, 18).
+-define(wxSTC_ERLANG_MACRO_QUOTED, 19).
+-define(wxSTC_ERLANG_RECORD_QUOTED, 20).
+-define(wxSTC_ERLANG_NODE_NAME_QUOTED, 21).
+-define(wxSTC_ERLANG_BIFS, 22).
+-define(wxSTC_ERLANG_MODULES, 23).
+-define(wxSTC_ERLANG_MODULES_ATT, 24).
+-endif.
+
 start() ->
     start([]).
 
@@ -78,6 +93,7 @@ init(Options) ->
     wxFrame:setMenuBar(Frame,MB),
 
     wxFrame:connect(Frame, command_menu_selected),
+    wxFrame:connect(Frame, close_window),
 
     _SB = wxFrame:createStatusBar(Frame,[]),
     
@@ -179,6 +195,8 @@ create_subwindow(Parent, BoxLabel, Funs) ->
 %% Handled as in normal gen_server callbacks
 handle_info({'EXIT',_, wx_deleted}, State) ->
     {noreply,State};
+handle_info({'EXIT',_, shutdown}, State) ->
+    {noreply,State};
 handle_info({'EXIT',_, normal}, State) ->
     {noreply,State};
 handle_info(Msg, State) ->
@@ -197,13 +215,13 @@ handle_cast(Msg, State) ->
 handle_event(#wx{event=#wxCommand{type=command_listbox_selected, cmdString=Ex}}, 
 	     State = #state{demo={_,DemoSz}, example=Example, code=Code}) ->
     case Ex of
-	[] -> 
+	[] ->
 	    {noreply, State};
 	_  ->
 	    wxSizer:detach(DemoSz, Example),
-	    wxWindow:destroy(Example),
+	    wx_object:call(Example, shutdown),
 	    unload_code(Code),
-	    NewExample = load_example(Ex, State), 
+	    NewExample = load_example(Ex, State),
 	    wxSizer:add(DemoSz, NewExample, [{proportion,1}, {flag, ?wxEXPAND}]),
 	    wxSizer:layout(DemoSz),
 	    {noreply, State#state{example=NewExample}}
@@ -247,9 +265,9 @@ handle_event(#wx{id = Id,
 							    ?wxICON_INFORMATION bor
 							    ?wxSTAY_ON_TOP},
 							   {caption, "About"}])),
-	    {noreply, State};		    
+	    {noreply, State};
 	?wxID_EXIT ->
-	    wx_object:get_pid(State#state.example) ! stop,
+	    wx_object:call(State#state.example, shutdown),
 	    {stop, normal, State};
 	_ ->
 	    {noreply, State}
@@ -265,9 +283,9 @@ handle_event(Ev,State) ->
 code_change(_, _, State) ->
     {stop, not_yet_implemented, State}.
 
-terminate(_Reason, State) ->
-    wx_object:get_pid(State#state.example) ! stop,
-    timer:sleep(200), %% Give the example process some time to cleanup.
+terminate(_Reason, State = #state{win=Frame}) ->
+    catch wx_object:call(State#state.example, shutdown),
+    wxFrame:destroy(Frame),
     wx:destroy().
 
 %%%%%%%%%%%%%%%%% Internals %%%%%%%%%%
@@ -275,8 +293,6 @@ terminate(_Reason, State) ->
 load_example(Ex, #state{demo={DemoPanel,DemoSz}, log=EvCtrl, code=Code}) ->
     ModStr = "ex_" ++ Ex,
     Mod = list_to_atom(ModStr),
-%%     WxDir = code:lib_dir(wx),
-%%     ModFile = filename:join([WxDir, "examples","demo", ModStr ++ ".erl"]),
     ModFile = ModStr ++ ".erl",
     load_code(Code, file:read_file(ModFile)),
     find(Code),
@@ -312,7 +328,20 @@ code_area(Parent) ->
 	       {?wxSTC_ERLANG_MACRO,    {40,144,170}},
 	       {?wxSTC_ERLANG_RECORD,   {40,100,20}},
 	       {?wxSTC_ERLANG_SEPARATOR,{0,0,0}},
-	       {?wxSTC_ERLANG_NODE_NAME,{0,0,0}}],
+	       {?wxSTC_ERLANG_NODE_NAME,{0,0,0}},
+	       %% Optional 2.9 stuff
+	       {?wxSTC_ERLANG_COMMENT_FUNCTION, {160,53,35}},
+	       {?wxSTC_ERLANG_COMMENT_MODULE, {160,53,35}},
+	       {?wxSTC_ERLANG_COMMENT_DOC, {160,53,35}},
+	       {?wxSTC_ERLANG_COMMENT_DOC_MACRO, {160,53,35}},
+	       {?wxSTC_ERLANG_ATOM_QUOTED, {0,0,0}},
+	       {?wxSTC_ERLANG_MACRO_QUOTED, {40,144,170}},
+	       {?wxSTC_ERLANG_RECORD_QUOTED, {40,100,20}},
+	       {?wxSTC_ERLANG_NODE_NAME_QUOTED, {0,0,0}},
+	       {?wxSTC_ERLANG_BIFS, {130,40,172}},
+	       {?wxSTC_ERLANG_MODULES, {64,102,244}},
+	       {?wxSTC_ERLANG_MODULES_ATT, {64,102,244}}
+	      ],
     SetStyle = fun({Style, Color}) ->
 		       ?stc:styleSetFont(Ed, Style, FixedFont),
 		       ?stc:styleSetForeground(Ed, Style, Color)
diff --git a/lib/wx/examples/demo/ex_aui.erl b/lib/wx/examples/demo/ex_aui.erl
index 50f077638d..70372caad8 100644
--- a/lib/wx/examples/demo/ex_aui.erl
+++ b/lib/wx/examples/demo/ex_aui.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -32,7 +32,8 @@
 -record(state, 
 	{
 	  parent,
-	  config
+	  config,
+	  aui
 	}).
 
 start(Config) ->
@@ -47,12 +48,10 @@ init(Config) ->
 do_init(Config) ->
     Parent = proplists:get_value(parent, Config),  
     Panel = wxPanel:new(Parent, []),
-
     %% Setup sizers
     MainSizer = wxBoxSizer:new(?wxVERTICAL),
 
-    Manager = wxAuiManager:new([{managed_wnd, Panel}
-				]),
+    Manager = wxAuiManager:new([{managed_wnd, Panel}]),
 
     Pane = ?pi:new(),
     ?pi:closeButton(Pane),
@@ -79,8 +78,8 @@ do_init(Config) ->
     wxAuiManager:connect(Manager, aui_pane_button, [{skip,true}]),
     wxAuiManager:connect(Manager, aui_pane_maximize, [{skip,true}]),
     wxAuiManager:update(Manager),
-
-    {Panel, #state{parent=Panel, config=Config}}.
+    process_flag(trap_exit, true),
+    {Panel, #state{parent=Panel, config=Config, aui=Manager}}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Callbacks handled as normal gen_server callbacks
@@ -88,6 +87,12 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel, aui=Manager}) ->
+    wxAuiManager:unInit(Manager),
+    wxAuiManager:destroy(Manager),
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
@@ -134,11 +139,10 @@ handle_event(Ev = #wx{}, State) ->
     io:format("~p\n", [Ev]),
     {noreply, State}.
 
-
 code_change(_, _, State) ->
     {stop, ignore, State}.
 
-terminate(_Reason, _State) ->
+terminate(_Reason, _) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/wx/examples/demo/ex_button.erl b/lib/wx/examples/demo/ex_button.erl
index 0dd0363933..41bf34e572 100644
--- a/lib/wx/examples/demo/ex_button.erl
+++ b/lib/wx/examples/demo/ex_button.erl
@@ -25,7 +25,8 @@
 -include_lib("wx/include/wx.hrl").
 
 -behaviour(wx_object).
--export([start/1, init/1, terminate/2,  code_change/3,
+-export([start/1, init/1,
+	 terminate/2,  code_change/3,
 	 handle_info/2, handle_call/3, handle_cast/2, handle_event/2]).
 
 -record(state, 
@@ -120,6 +121,7 @@ do_init(Config) ->
     wxWindow:connect(Panel, command_button_clicked),
     wxWindow:setSizer(Panel, Sz),
     wxSizer:layout(Sz),
+    wxWindow:refresh(Panel),
     wxScrolledWindow:setScrollRate(Panel, 5, 5),
     {Panel, #state{parent=Panel, config=Config}}.
 
@@ -149,6 +151,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p~n",[Msg]),
     {noreply,State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p~n",[Msg]),
     {reply,ok,State}.
@@ -160,7 +166,7 @@ handle_cast(Msg, State) ->
 code_change(_, _, State) ->
     {stop, ignore, State}.
 
-terminate(_Reason, _State) ->
+terminate(_Reason, _) ->
     ok.
 
 %%%%%  a copy from wxwidgets samples.
diff --git a/lib/wx/examples/demo/ex_canvas.erl b/lib/wx/examples/demo/ex_canvas.erl
index 1ec4760f40..1f1d260276 100644
--- a/lib/wx/examples/demo/ex_canvas.erl
+++ b/lib/wx/examples/demo/ex_canvas.erl
@@ -140,6 +140,9 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
@@ -151,7 +154,7 @@ handle_cast(Msg, State) ->
 code_change(_, _, State) ->
     {stop, ignore, State}.
 
-terminate(_Reason, _State) ->
+terminate(_Reason, _) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/wx/examples/demo/ex_canvas_paint.erl b/lib/wx/examples/demo/ex_canvas_paint.erl
index 9bc083766a..6873724655 100644
--- a/lib/wx/examples/demo/ex_canvas_paint.erl
+++ b/lib/wx/examples/demo/ex_canvas_paint.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -207,6 +207,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
@@ -218,7 +222,7 @@ handle_cast(Msg, State) ->
 code_change(_, _, State) ->
     {stop, ignore, State}.
 
-terminate(_Reason, _State) ->
+terminate(_Reason, _) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -239,14 +243,17 @@ draw(Canvas, Bitmap, Fun) ->
     wxMemoryDC:destroy(MemoryDC).
 
 redraw(DC, Bitmap) ->
-    MemoryDC = wxMemoryDC:new(Bitmap),
+    try
+	MemoryDC = wxMemoryDC:new(Bitmap),
 
-    wxDC:blit(DC, {0,0},
-	      {wxBitmap:getWidth(Bitmap), wxBitmap:getHeight(Bitmap)},
-	      MemoryDC, {0,0}),
-
-    wxMemoryDC:destroy(MemoryDC).
+	wxDC:blit(DC, {0,0},
+		  {wxBitmap:getWidth(Bitmap), wxBitmap:getHeight(Bitmap)},
+		  MemoryDC, {0,0}),
 
+	wxMemoryDC:destroy(MemoryDC)
+    catch error:{{badarg,_},_} -> %% Bitmap have been deleted
+	    ok
+    end.
 
-getPageInfo(_This) -> 
+getPageInfo(_This) ->
     {1,1,1,1}.
diff --git a/lib/wx/examples/demo/ex_choices.erl b/lib/wx/examples/demo/ex_choices.erl
index 2e456ae249..b4418293c1 100644
--- a/lib/wx/examples/demo/ex_choices.erl
+++ b/lib/wx/examples/demo/ex_choices.erl
@@ -143,6 +143,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n",[Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p\n",[Msg]),
     {reply, {error,nyi}, State}.
@@ -154,7 +158,7 @@ handle_cast(Msg, State) ->
 code_change(_, _, State) ->
     {stop, ignore, State}.
 
-terminate(_Reason, _State) ->
+terminate(_Reason, _) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/wx/examples/demo/ex_cursor.erl b/lib/wx/examples/demo/ex_cursor.erl
index c1a558541b..2f1eaaf7c7 100644
--- a/lib/wx/examples/demo/ex_cursor.erl
+++ b/lib/wx/examples/demo/ex_cursor.erl
@@ -131,6 +131,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_dialogs.erl b/lib/wx/examples/demo/ex_dialogs.erl
index b39344f8b1..5c47b51271 100644
--- a/lib/wx/examples/demo/ex_dialogs.erl
+++ b/lib/wx/examples/demo/ex_dialogs.erl
@@ -149,6 +149,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_frame_utils.erl b/lib/wx/examples/demo/ex_frame_utils.erl
index a90642b355..4a59bb3a68 100644
--- a/lib/wx/examples/demo/ex_frame_utils.erl
+++ b/lib/wx/examples/demo/ex_frame_utils.erl
@@ -98,6 +98,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_gauge.erl b/lib/wx/examples/demo/ex_gauge.erl
index ffc667ff05..c53dfb807b 100644
--- a/lib/wx/examples/demo/ex_gauge.erl
+++ b/lib/wx/examples/demo/ex_gauge.erl
@@ -114,6 +114,10 @@ handle_info(pulse, State=#state{undeterminate_gauge = Gauge=#gauge{obj = Obj}})
     Timer = erlang:send_after(300, self(), pulse),
     {noreply, State#state{undeterminate_gauge = Gauge#gauge{timer = Timer}}}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p\n",[Msg]),
     {reply,ok, State}.
diff --git a/lib/wx/examples/demo/ex_gl.erl b/lib/wx/examples/demo/ex_gl.erl
index 72dad2cf9d..6bb2d12dff 100644
--- a/lib/wx/examples/demo/ex_gl.erl
+++ b/lib/wx/examples/demo/ex_gl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -20,7 +20,8 @@
 
 -behaviour(wx_object).
 
--export([init/1, code_change/3, handle_info/2, handle_event/2,
+-export([init/1, code_change/3, handle_info/2, 
+	 handle_sync_event/3, handle_event/2,
 	 handle_call/3, handle_cast/2, terminate/2,
 	 start/1]).
 
@@ -34,6 +35,7 @@
 	  config,
 	  gl,
 	  canvas,
+	  image, 
 	  timer,
 	  time
 	 }).
@@ -58,7 +60,7 @@ do_init(Config) ->
     %% Setup sizer
     Sizer = wxStaticBoxSizer:new(?wxHORIZONTAL, Panel, [{label, "wxGLCanvas"}]),
 
-    Opts = [{size, {300,300}}, {style, ?wxSUNKEN_BORDER}],
+    Opts = [{style, ?wxFULL_REPAINT_ON_RESIZE}],
     GLAttrib = [{attribList, [?WX_GL_RGBA,
 			      ?WX_GL_DOUBLEBUFFER,
 			      ?WX_GL_MIN_RED,8,
@@ -67,34 +69,48 @@ do_init(Config) ->
 			      ?WX_GL_DEPTH_SIZE,24,0]}],
     Canvas = wxGLCanvas:new(Panel,Opts ++ GLAttrib),
     wxGLCanvas:connect(Canvas, size),
+    wxGLCanvas:connect(Canvas, paint, [callback]),
 
-    wxGLCanvas:setCurrent(Canvas),
     Image   = wxImage:scale(wxImage:new("image.jpg"), 128,128),
-    GL = setup_gl(Canvas,Image),
-    Timer = timer:send_interval(20, self(), update),
 
     %% Add to sizers
     wxSizer:add(Sizer, Canvas, [{flag, ?wxEXPAND},{proportion, 1}]), 
     wxWindow:setSizer(Panel,Sizer),
     wxSizer:layout(Sizer),
+    Timer = timer:send_interval(20, self(), update),
     {Panel, #state{parent = Panel, config = Config,
-		   canvas = Canvas,
-		   gl = GL, timer = Timer}}.
+		   canvas = Canvas, image=Image,
+		   timer = Timer}}.
 
 %% Event handling
-handle_event(#wx{event = #wxSize{size = {W,H}}}, State) ->
-    case W =:= 0 orelse H =:= 0 of
-	true -> skip;
-	_ -> 
+handle_sync_event(_PaintEvent, _, #state{canvas=Canvas}) ->
+    %% Sync events are called from a temporary process,
+    %% we need to setup the gl canvas on cocoa for some reason
+    %% We do not really have to do anything, the timer event will refresh the painting
+    wxGLCanvas:setCurrent(Canvas),
+    DC= wxPaintDC:new(Canvas),
+    wxPaintDC:destroy(DC),
+    ok.
+
+handle_event(#wx{event = #wxSize{size = {W,H}}}, State = #state{gl=GL}) ->
+    if 
+	GL =:= undefined ->
+	    #state{canvas=Canvas, image=Image} = State,
+	    wxGLCanvas:setCurrent(Canvas),
+	    {noreply, State#state{gl=setup_gl(Canvas,Image)}};
+	W =:= 0, H =:= 0 -> {noreply, State};
+	true -> 
 	    gl:viewport(0,0,W,H),
 	    gl:matrixMode(?GL_PROJECTION),
 	    gl:loadIdentity(),
 	    gl:ortho( -2.0, 2.0, -2.0*H/W, 2.0*H/W, -20.0, 20.0),
 	    gl:matrixMode(?GL_MODELVIEW),
-	    gl:loadIdentity()
-    end,
-    {noreply, State}.
+	    gl:loadIdentity(),
+	    {noreply, State}
+    end.
 
+handle_info(update, State=#state{gl=undefined}) -> 
+    {noreply, State};
 handle_info(update, State) ->
     S1 = update_rotation(State),
     GL = S1#state.gl,
@@ -113,7 +129,13 @@ handle_info(stop, State) ->
     timer:cancel(State#state.timer),
     catch wxGLCanvas:destroy(State#state.canvas),
     {stop, normal, State}.
-    
+
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    catch wxGLCanvas:destroy(State#state.canvas),
+    timer:cancel(State#state.timer),
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     io:format("Got Call ~p~n",[Msg]),
     {reply,ok,State}.
@@ -125,11 +147,8 @@ handle_cast(Msg, State) ->
 code_change(_, _, State) ->
     {stop, not_yet_implemented, State}.
 
-terminate(_Reason, State) ->
-    catch wxGLCanvas:destroy(State#state.canvas),
-    timer:cancel(State#state.timer),
-    timer:sleep(300).
-
+terminate(_Reason, _State) ->
+    ok.
 
 
 -define(VS, {{-0.5, -0.5, -0.5},  %1
diff --git a/lib/wx/examples/demo/ex_graphicsContext.erl b/lib/wx/examples/demo/ex_graphicsContext.erl
index c356500d99..59bfe7ff64 100644
--- a/lib/wx/examples/demo/ex_graphicsContext.erl
+++ b/lib/wx/examples/demo/ex_graphicsContext.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -25,8 +25,8 @@
 
 %% wx_object callbacks
 -export([init/1, terminate/2,  code_change/3,
-	 handle_info/2, handle_call/3,
-handle_cast/2, 	 handle_event/2, handle_sync_event/3]).
+	 handle_info/2, handle_call/3,handle_cast/2, 	 
+	 handle_event/2, handle_sync_event/3]).
 
 -include_lib("wx/include/wx.hrl").
 
@@ -57,11 +57,9 @@ do_init(Config) ->
 				 [{label, "wxGrapicsContext"}]),
 
     Win = wxPanel:new(Panel, []),
-    Pen = wxPen:new(),
-    Brush = wxBrush:new(?wxBLACK),
-    Font = wxFont:new(),
-    wxFont:setWeight(Font, ?wxBOLD),
-
+    Pen = ?wxBLACK_PEN,
+    Brush = wxBrush:new({30, 175, 23, 127}),
+    Font = ?wxITALIC_FONT,
     wxPanel:connect(Win, paint, [callback]),
 
     %% Add to sizers
@@ -94,6 +92,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
@@ -112,36 +114,26 @@ terminate(_Reason, _State) ->
 %% Local functions
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-draw(Win, Pen0, _Brush0, Font0) ->
+draw(Win, Pen, Brush, Font) ->
     try
 	Canvas = wxGraphicsContext:create(Win),
-	Pen    = wxGraphicsContext:createPen(Canvas, Pen0),
 	wxGraphicsContext:setPen(Canvas, Pen),
-	Brush = wxGraphicsContext:createLinearGradientBrush(Canvas, 0.0,0.0, 30.0,30.0,
-							    {200,50,50,50},
-							    {200,50,50,200}),
 	wxGraphicsContext:setBrush(Canvas, Brush),
-	Font  = wxGraphicsContext:createFont(Canvas, Font0),
-	wxGraphicsContext:setFont(Canvas, Font),
+	wxGraphicsContext:setFont(Canvas, Font, {0, 0, 50}),
 	
 	wxGraphicsContext:drawRoundedRectangle(Canvas, 35.0,35.0, 100.0, 50.0, 10.0),
-	wxGraphicsContext:drawText(Canvas, "Welcome", 60.0, 55.0),
+	wxGraphicsContext:drawText(Canvas, "This text should be antialised", 60.0, 55.0),
 	Path = wxGraphicsContext:createPath(Canvas),
 	wxGraphicsPath:addCircle(Path, 0.0, 0.0, 40.0),
 	wxGraphicsPath:closeSubpath(Path),
-	wxGraphicsContext:translate(Canvas, 100.0, 100.0),
-
-	Brush2 = wxGraphicsContext:createLinearGradientBrush(Canvas, 0.0,0.0, 30.0,30.0,
-							     {50,200,50,50},
-							     {50,50,200,50}),
-	wxGraphicsContext:setBrush(Canvas, Brush2),
+	wxGraphicsContext:translate(Canvas, 100.0, 250.0),
 	
-	F = fun(_) ->
+	F = fun(N) ->
 		    wxGraphicsContext:scale(Canvas, 1.1, 1.1),
-		    wxGraphicsContext:translate(Canvas, 3.0,3.0),
+		    wxGraphicsContext:translate(Canvas, 15.0,-1.0*N),
 		    wxGraphicsContext:drawPath(Canvas, Path)
 	    end,
-	wx:foreach(F, lists:seq(1,5)),
+	wx:foreach(F, lists:seq(1,10)),
 	ok
     catch _:{not_supported, _} ->
 	    Err = "wxGraphicsContext not available in this build of wxwidgets",
diff --git a/lib/wx/examples/demo/ex_grid.erl b/lib/wx/examples/demo/ex_grid.erl
index d1a9952ab2..e284836d5b 100644
--- a/lib/wx/examples/demo/ex_grid.erl
+++ b/lib/wx/examples/demo/ex_grid.erl
@@ -78,6 +78,10 @@ handle_event(#wx{event = #wxGrid{type = grid_cell_change,
 handle_info(_Msg, State) ->
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(_Msg, _From, State) ->
     {reply,{error, nyi}, State}.
 
diff --git a/lib/wx/examples/demo/ex_htmlWindow.erl b/lib/wx/examples/demo/ex_htmlWindow.erl
index 564c790e48..af3d4c71f5 100644
--- a/lib/wx/examples/demo/ex_htmlWindow.erl
+++ b/lib/wx/examples/demo/ex_htmlWindow.erl
@@ -77,6 +77,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_listCtrl.erl b/lib/wx/examples/demo/ex_listCtrl.erl
index 13096dfa52..2c62ac9d5f 100644
--- a/lib/wx/examples/demo/ex_listCtrl.erl
+++ b/lib/wx/examples/demo/ex_listCtrl.erl
@@ -58,8 +58,8 @@ do_init(Config) ->
     IL = wxImageList:new(16,16),
     wxImageList:add(IL, wxArtProvider:getBitmap("wxART_COPY", [{size, {16,16}}])),
     wxImageList:add(IL, wxArtProvider:getBitmap("wxART_MISSING_IMAGE", [{size, {16,16}}])),
-    wxImageList:add(IL, wxArtProvider:getBitmap("wxART_TICK_MARK", [{size, {16,16}}])),
-    wxImageList:add(IL, wxArtProvider:getBitmap("wxART_CROSS_MARK", [{size, {16,16}}])),
+    wxImageList:add(IL, wxArtProvider:getBitmap("wxART_QUESTION", [{size, {16,16}}])),
+    wxImageList:add(IL, wxArtProvider:getBitmap("wxART_WARNING", [{size, {16,16}}])),
     wxListCtrl:assignImageList(ListCtrl2, IL, ?wxIMAGE_LIST_SMALL),
     Fun =
 	fun(Item) ->
@@ -143,6 +143,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n",[Msg]),
     {noreply,State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p\n",[Msg]),
     {reply,ok,State}.
diff --git a/lib/wx/examples/demo/ex_notebook.erl b/lib/wx/examples/demo/ex_notebook.erl
index fc38fdae08..5edcc65082 100644
--- a/lib/wx/examples/demo/ex_notebook.erl
+++ b/lib/wx/examples/demo/ex_notebook.erl
@@ -129,6 +129,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n",[Msg]),
     {noreply,State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p\n",[Msg]),
     {reply,ok,State}.
diff --git a/lib/wx/examples/demo/ex_pickers.erl b/lib/wx/examples/demo/ex_pickers.erl
index 8013a5ba32..54f8c7a8e5 100644
--- a/lib/wx/examples/demo/ex_pickers.erl
+++ b/lib/wx/examples/demo/ex_pickers.erl
@@ -120,6 +120,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_popupMenu.erl b/lib/wx/examples/demo/ex_popupMenu.erl
index d6778c5dc5..f48b00963d 100644
--- a/lib/wx/examples/demo/ex_popupMenu.erl
+++ b/lib/wx/examples/demo/ex_popupMenu.erl
@@ -86,6 +86,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_radioBox.erl b/lib/wx/examples/demo/ex_radioBox.erl
index ab7685f41f..17a11d1054 100644
--- a/lib/wx/examples/demo/ex_radioBox.erl
+++ b/lib/wx/examples/demo/ex_radioBox.erl
@@ -103,6 +103,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n",[Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p\n",[Msg]),
     {reply, {error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_sashWindow.erl b/lib/wx/examples/demo/ex_sashWindow.erl
index d8a8958f28..9eb3b9b27e 100644
--- a/lib/wx/examples/demo/ex_sashWindow.erl
+++ b/lib/wx/examples/demo/ex_sashWindow.erl
@@ -112,6 +112,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_sizers.erl b/lib/wx/examples/demo/ex_sizers.erl
index 7b9e8eb37f..ecd539cd62 100644
--- a/lib/wx/examples/demo/ex_sizers.erl
+++ b/lib/wx/examples/demo/ex_sizers.erl
@@ -97,6 +97,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_slider.erl b/lib/wx/examples/demo/ex_slider.erl
index 612543ff26..4979e8b4f4 100644
--- a/lib/wx/examples/demo/ex_slider.erl
+++ b/lib/wx/examples/demo/ex_slider.erl
@@ -97,6 +97,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n",[Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p\n",[Msg]),
     {reply, {error, nyi},State}.
diff --git a/lib/wx/examples/demo/ex_splitterWindow.erl b/lib/wx/examples/demo/ex_splitterWindow.erl
index 4f25b73293..ac2fbe0113 100644
--- a/lib/wx/examples/demo/ex_splitterWindow.erl
+++ b/lib/wx/examples/demo/ex_splitterWindow.erl
@@ -86,6 +86,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_static.erl b/lib/wx/examples/demo/ex_static.erl
index 013bd5ac35..8cf477b55a 100644
--- a/lib/wx/examples/demo/ex_static.erl
+++ b/lib/wx/examples/demo/ex_static.erl
@@ -101,6 +101,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_textCtrl.erl b/lib/wx/examples/demo/ex_textCtrl.erl
index d82884f30b..57088ad878 100644
--- a/lib/wx/examples/demo/ex_textCtrl.erl
+++ b/lib/wx/examples/demo/ex_textCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -51,27 +51,23 @@ do_init(Config) ->
     Sizer3 = wxStaticBoxSizer:new(?wxVERTICAL, Panel, 
 				  [{label, "wxTextCtrl multiline"}]),
 
-    TextCtrl = wxTextCtrl:new(Panel, 1, [{value, "This is a single line wxTextCtrl"},
+    TextCtrl  = wxTextCtrl:new(Panel, 1, [{value, "This is a single line wxTextCtrl"},
 					 {style, ?wxDEFAULT}]),
     TextCtrl2 = wxTextCtrl:new(Panel, 2, [{value, "password"},
-					 {style, ?wxDEFAULT bor
-					   	  ?wxTE_PASSWORD}]),
-    TextCtrl3 = wxTextCtrl:new(Panel, 3, [{value, "This is a\n"
-					   	  "multiline\n"
-					   	  "wxTextCtrl"},
-					 {style, ?wxDEFAULT bor
-					   	  ?wxTE_MULTILINE}]),
+					  {style, ?wxDEFAULT bor ?wxTE_PASSWORD}]),
+    TextCtrl3 = wxTextCtrl:new(Panel, 3, [{value, "This is a\nmultiline\nwxTextCtrl"},
+					  {style, ?wxDEFAULT bor ?wxTE_MULTILINE}]),
 
     %% Add to sizers
-    wxSizer:add(Sizer, TextCtrl, [{flag, ?wxEXPAND}]),
+    wxSizer:add(Sizer, TextCtrl,  [{flag, ?wxEXPAND}]),
     wxSizer:add(Sizer2, TextCtrl2, []),
-    wxSizer:add(Sizer3, TextCtrl3, [{flag, ?wxEXPAND}]),
+    wxSizer:add(Sizer3, TextCtrl3, [{flag, ?wxEXPAND}, {proportion, 1}]),
 
     wxSizer:add(MainSizer, Sizer,  [{flag, ?wxEXPAND}]),
     wxSizer:addSpacer(MainSizer, 10),
     wxSizer:add(MainSizer, Sizer2, [{flag, ?wxEXPAND}]),
     wxSizer:addSpacer(MainSizer, 10),
-    wxSizer:add(MainSizer, Sizer3, [{flag, ?wxEXPAND}]),
+    wxSizer:add(MainSizer, Sizer3, [{flag, ?wxEXPAND}, {proportion, 1}]),
 
     wxPanel:setSizer(Panel, MainSizer),
     {Panel, #state{parent=Panel, config=Config}}.
@@ -88,6 +84,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n",[Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config,"Got Call ~p\n",[Msg]),
     {reply, {error,nyi}, State}.
diff --git a/lib/wx/examples/demo/ex_treeCtrl.erl b/lib/wx/examples/demo/ex_treeCtrl.erl
index 611904500a..7698ab1f00 100644
--- a/lib/wx/examples/demo/ex_treeCtrl.erl
+++ b/lib/wx/examples/demo/ex_treeCtrl.erl
@@ -105,6 +105,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
diff --git a/lib/wx/examples/simple/menu.erl b/lib/wx/examples/simple/menu.erl
index 0025a0b027..9e6b28b46b 100644
--- a/lib/wx/examples/simple/menu.erl
+++ b/lib/wx/examples/simple/menu.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -105,7 +105,7 @@ create_frame(Wx) ->
     Frame = wxFrame:new(Wx, -1, "wxErlang menu sample", [{size, {600,400}}]),
 
     Path = filename:dirname(code:which(?MODULE)),    
-    wxFrame:setIcon(Frame,  wxIcon:new(filename:join(Path,"sample.xpm"))),
+    wxFrame:setIcon(Frame,  wxIcon:new(filename:join(Path,"sample.xpm"), [{type, ?wxBITMAP_TYPE_XPM}])),
 
     wxFrame:createStatusBar(Frame,[]),
     wxFrame:connect(Frame, close_window),
diff --git a/lib/wx/examples/simple/minimal.erl b/lib/wx/examples/simple/minimal.erl
index bdff66e217..4782745dfc 100644
--- a/lib/wx/examples/simple/minimal.erl
+++ b/lib/wx/examples/simple/minimal.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -41,8 +41,8 @@ start() ->
 create_window(Wx) ->
     Frame = wxFrame:new(Wx, -1, "Minimal wxErlang App", [{size, {600,400}}]),
 
-    Path = filename:dirname(code:which(?MODULE)),    
-    wxFrame:setIcon(Frame,  wxIcon:new(filename:join(Path,"sample.xpm"))),
+    Path = filename:dirname(code:which(?MODULE)),
+    wxFrame:setIcon(Frame,  wxIcon:new(filename:join(Path,"sample.xpm"), [{type, ?wxBITMAP_TYPE_XPM}])),
 
     wxFrame:createStatusBar(Frame,[]),
     wxFrame:connect(Frame, close_window),
diff --git a/lib/wx/examples/sudoku/sudoku_board.erl b/lib/wx/examples/sudoku/sudoku_board.erl
index 4b26ff97da..ed9c62b7c8 100644
--- a/lib/wx/examples/sudoku/sudoku_board.erl
+++ b/lib/wx/examples/sudoku/sudoku_board.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -27,7 +27,7 @@
 -export([new/1, setup_board/2, clear_board/1, left/1,
 	 get_board_data/1,set_board_data/2, 
 	 set_butt/3, butt_correct/3,
-	 draw/3, 
+	 get_state/1, redraw/3,
 	 %% Callbacks
 	 init/1, handle_sync_event/3, 
 	 handle_event/2, handle_info/2, handle_call/3, handle_cast/2,
@@ -69,9 +69,8 @@ get_board_data(Board) ->
 set_board_data(Board, List) ->
     wx_object:call(Board, {set_board_data, List}).
 
-
-draw(Board, DC, Size) ->
-    wx_object:call(Board, {draw, DC, Size}).
+get_state(Board) ->
+    wx_object:call(Board, get_state).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -85,26 +84,29 @@ init([ParentObj, ParentPid]) ->
     wxWindow:connect(Win, erase_background, []),
     wxWindow:connect(Win, key_up, [{skip, true}]),
     wxWindow:connect(Win, left_down, [{skip, true}]),
-    wxWindow:connect(Win, enter_window, [{skip, true}]), 
+    wxWindow:connect(Win, enter_window, [{skip, true}]),
 
     %% Init pens and fonts
     Pen = wxPen:new({0,0,0}, [{width, 3}]),
     Fs0  = [{Sz,wxFont:new(Sz, ?wxSWISS, ?wxNORMAL, ?wxNORMAL,[])} ||
 	       Sz <- [8,9,10,11,12,13,14,16,18,20,22,24,26,28,30,34,38,42,44,46]],
-    TestDC  = wxClientDC:new(Win),
+    TestDC  = wxMemoryDC:new(),
+    Bitmap = wxBitmap:new(256,256),
+    wxMemoryDC:selectObject(TestDC, Bitmap),
+    true = wxDC:isOk(TestDC),
     CW = fun({Sz,Font},Acc) ->
 		 case wxFont:ok(Font) of
-		     true -> 
+		     true ->
 			 wxDC:setFont(TestDC, Font),
-			 CH = wxDC:getCharHeight(TestDC), 
+			 CH = wxDC:getCharHeight(TestDC),
 			 [{CH,Sz,Font} | Acc];
 		     false ->
 			 Acc
 		 end
 	 end,
     Fs = lists:foldl(CW, [], Fs0),
-    wxClientDC:destroy(TestDC),    
-    {Win, #state{win=Win, board=[], pen=Pen, fonts=Fs, parent=ParentPid}}.
+    wxMemoryDC:destroy(TestDC),
+    {Win, #state{win=Win, board=[], pen=Pen, fonts=Fs,parent=ParentPid}}.
 
 handle_sync_event(#wx{event=#wxPaint{}}, _Obj, State = #state{win=Win}) ->
     %% io:format("EPaint~n",[]),
@@ -119,22 +121,17 @@ handle_sync_event(#wx{event=#wxPaint{}}, _Obj, State = #state{win=Win}) ->
 handle_event(#wx{event=#wxMouse{type=enter_window}}, State = #state{win=Win}) ->
     wxWindow:setFocus(Win), %% Get keyboard focus
     {noreply,State};
-handle_event(#wx{event=#wxKey{keyCode=KeyC, x=X,y=Y}},
+handle_event(#wx{event=#wxKey{keyCode=KeyC}},
 	     S = #state{parent=Pid, win=Win}) ->
     Val = if KeyC > 47, KeyC < 58 -> KeyC - $0;
 	     KeyC > 325, KeyC < 336 -> KeyC - 326; %% NUM LOCK
 	     true -> 0
 	  end,    
-    case get_butt(X,Y,S) of
-	error ->   %% Mac don't get correct coordinates.
-	    Global = wx_misc:getMousePosition(),
-	    {CX,CY} = wxWindow:screenToClient(Win, Global),
-	    case get_butt(CX,CY,S) of 
-		error -> ignore;
-		Id -> Pid ! {set_val,Id,Val}
-	    end;
-	Id -> 
-	    Pid ! {set_val,Id,Val} 
+    Global = wx_misc:getMousePosition(),
+    {CX,CY} = wxWindow:screenToClient(Win, Global),
+    case get_butt(CX,CY,S) of
+	error -> ignore;
+	Id -> Pid ! {set_val,Id,Val}
     end,
     {noreply, S};
 handle_event(#wx{event=#wxMouse{type=left_down,x=X,y=Y}},
@@ -205,9 +202,8 @@ handle_call({set_board_data, B},_From, S0) ->
 handle_call(left,_From, S = #state{board=B}) ->
     Res = 81 - length([ok || #sq{correct=C} <- B, C /= false]),
     {reply, Res, S};
-handle_call({draw, DC, Size},_From, S) ->    
-    redraw(DC,Size,S),
-    {reply, ok, S}.
+handle_call(get_state, _From, S) ->
+    {reply, {ok,S}, S}.
 
 handle_cast(Msg, State) ->
     io:format("Got cast ~p~n",[Msg]),
diff --git a/lib/wx/examples/sudoku/sudoku_gui.erl b/lib/wx/examples/sudoku/sudoku_gui.erl
index 3d0c95ffa7..5f3f1a2621 100644
--- a/lib/wx/examples/sudoku/sudoku_gui.erl
+++ b/lib/wx/examples/sudoku/sudoku_gui.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -307,19 +307,19 @@ dialog(?PRINT_PAGE_SETUP, S = #gs{frame=Frame, print_psdd=PsDD0, print_d=PD0}) -
     wxPageSetupDialogData:destroy(PsDD0),
     wxPrintData:destroy(PD0),
     S#gs{print_psdd=PsDD, print_d=PD};
-dialog(?PRINT_PRE, S = #gs{frame=Frame, print_d=PD}) ->    
+dialog(?PRINT_PRE, S = #gs{frame=Frame, print_d=PD, board=Board}) ->
+    {ok, BoardS} = sudoku_board:get_state(Board),
     PDD = wxPrintDialogData:new(PD),
-    Printout1 = wxPrintout:new("Print", fun(This,Page) -> printout(This,Page,S) end,
+    Printout1 = wxPrintout:new("Print 1", fun(This,Page) -> printout(This,Page,BoardS, S) end,
 			       [{getPageInfo, fun getPageInfo/1}]),
-    Printout2 = wxPrintout:new("Print", fun(This,Page) -> printout(This,Page,S) end,
+    Printout2 = wxPrintout:new("Print 2", fun(This,Page) -> printout(This,Page,BoardS, S) end,
 			       [{getPageInfo, fun getPageInfo/1}]),
-    Preview = wxPrintPreview:new(Printout1, [{printoutForPrinting,Printout2},{data,PDD}]), 
+    Preview = wxPrintPreview:new(Printout1, [{printoutForPrinting,Printout2},{data,PDD}]),
     case wxPrintPreview:isOk(Preview) of
 	true ->
 	    PF = wxPreviewFrame:new(Preview, Frame, [{title, "Print Preview"}]),
 	    wxPreviewFrame:centre(PF, [{dir, ?wxBOTH}]),
 	    wxPreviewFrame:initialize(PF),
-	    wxPreviewFrame:centre(PF),
 	    wxPreviewFrame:show(PF);
 	false ->
 	    io:format("Could not create preview window.\n"
@@ -327,10 +327,11 @@ dialog(?PRINT_PRE, S = #gs{frame=Frame, print_d=PD}) ->
 	    wxPrintPreview:destroy(Preview)
     end,
     S;
-dialog(?PRINT, S = #gs{frame=Frame, print_d=PD}) ->    
+dialog(?PRINT, S = #gs{frame=Frame, print_d=PD, board=Board}) ->
+    {ok, BoardS} = sudoku_board:get_state(Board),
     PDD = wxPrintDialogData:new(PD),
     Printer = wxPrinter:new([{data,PDD}]),
-    Printout = wxPrintout:new("Print", fun(This,Page) -> printout(This,Page,S) end,
+    Printout = wxPrintout:new("Print", fun(This,Page) -> printout(This,Page,BoardS,S) end,
 			      [{getPageInfo, fun getPageInfo/1}]),
 
     case wxPrinter:print(Printer, Frame, Printout, [{prompt,true}]) of
@@ -374,16 +375,14 @@ init_printer(S) ->
 getPageInfo(_This) -> 
     {1,1,1,1}.
 
-printout(This, _Page, #gs{board=Board, print_psdd=PsDD}) ->
+printout(This, _Page, Board, #gs{print_psdd=PsDD}) ->
     MX = MY = 500,  
     wxPrintout:fitThisSizeToPageMargins(This, {MX,MY}, PsDD),
-    
+
     _DBG = {_X,_Y,W,H} = wxPrintout:getLogicalPageMarginsRect(This, PsDD),
     wxPrintout:offsetLogicalOrigin(This,(W-MX) div 2, (H-MY) div 2),
-%%    io:format("~p ->{~p,~p} ~n", [_DBG, (W-MX) div 2, (H-MY) div 2]),
-
     DC = wxPrintout:getDC(This),
-    sudoku_board:draw(Board, DC, {500,500}),
+    sudoku_board:redraw(DC, {500,500}, Board),
     true.
 
 set_val(Id, Val, Board, G) ->
diff --git a/lib/wx/include/wx.hrl b/lib/wx/include/wx.hrl
index 62979908a6..a48c756dea 100644
--- a/lib/wx/include/wx.hrl
+++ b/lib/wx/include/wx.hrl
@@ -131,7 +131,7 @@
 -type wxScrollWin() :: #wxScrollWin{}. %% Callback event: {@link wxScrollWinEvent}
 
 -record(wxPaint, {type :: wxPaintEventType()}). %% Callback event: {@link wxPaintEvent}
--type wxPaintEventType() :: paint | paint_icon.
+-type wxPaintEventType() :: paint.
 -type wxPaint() :: #wxPaint{}. %% Callback event: {@link wxPaintEvent}
 
 -record(wxChildFocus, {type :: wxChildFocusEventType()}). %% Callback event: {@link wxChildFocusEvent}
@@ -252,7 +252,7 @@
 	wheelRotation :: integer(),
 	wheelDelta :: integer(),
 	linesPerAction :: integer()}).
--type wxMouseEventType() :: left_down | left_up | middle_down | middle_up | right_down | right_up | motion | enter_window | leave_window | left_dclick | middle_dclick | right_dclick | mousewheel | nc_left_down | nc_left_up | nc_middle_down | nc_middle_up | nc_right_down | nc_right_up | nc_motion | nc_enter_window | nc_leave_window | nc_left_dclick | nc_middle_dclick | nc_right_dclick.
+-type wxMouseEventType() :: left_down | left_up | middle_down | middle_up | right_down | right_up | motion | enter_window | leave_window | left_dclick | middle_dclick | right_dclick | mousewheel.
 -type wxMouse() :: #wxMouse{}. %% Callback event: {@link wxMouseEvent}
 
 -record(wxWindowCreate, {type :: wxWindowCreateEventType()}). %% Callback event: {@link wxWindowCreateEvent}
@@ -292,10 +292,6 @@
 -type wxIdleEventType() :: idle.
 -type wxIdle() :: #wxIdle{}. %% Callback event: {@link wxIdleEvent}
 
--record(wxNcPaint, {type :: wxNcPaintEventType()}). %% Callback event: {@link wxNcPaintEvent}
--type wxNcPaintEventType() :: nc_paint.
--type wxNcPaint() :: #wxNcPaint{}. %% Callback event: {@link wxNcPaintEvent}
-
 -record(wxColourPicker,{type :: wxColourPickerEventType(), %% Callback event: {@link wxColourPickerEvent}
 	colour :: wx:wx_colour()}).
 -type wxColourPickerEventType() :: command_colourpicker_changed.
@@ -312,8 +308,8 @@
 -type wxTreeEventType() :: command_tree_begin_drag | command_tree_begin_rdrag | command_tree_begin_label_edit | command_tree_end_label_edit | command_tree_delete_item | command_tree_get_info | command_tree_set_info | command_tree_item_expanded | command_tree_item_expanding | command_tree_item_collapsed | command_tree_item_collapsing | command_tree_sel_changed | command_tree_sel_changing | command_tree_key_down | command_tree_item_activated | command_tree_item_right_click | command_tree_item_middle_click | command_tree_end_drag | command_tree_state_image_click | command_tree_item_gettooltip | command_tree_item_menu.
 -type wxTree() :: #wxTree{}. %% Callback event: {@link wxTreeEvent}
 
--type event() :: wxAuiManager() | wxAuiNotebook() | wxCalendar() | wxChildFocus() | wxClose() | wxColourPicker() | wxCommand() | wxContextMenu() | wxDate() | wxDisplayChanged() | wxErase() | wxFileDirPicker() | wxFocus() | wxFontPicker() | wxGrid() | wxHelp() | wxHtmlLink() | wxIconize() | wxIdle() | wxJoystick() | wxKey() | wxList() | wxMaximize() | wxMenu() | wxMouse() | wxMouseCaptureChanged() | wxMove() | wxNavigationKey() | wxNcPaint() | wxNotebook() | wxPaint() | wxPaletteChanged() | wxQueryNewPalette() | wxSash() | wxScroll() | wxScrollWin() | wxSetCursor() | wxShow() | wxSize() | wxSpin() | wxSplitter() | wxStyledText() | wxSysColourChanged() | wxTaskBarIcon() | wxTree() | wxUpdateUI() | wxWindowCreate() | wxWindowDestroy().
--type wxEventType() :: wxAuiManagerEventType() | wxAuiNotebookEventType() | wxCalendarEventType() | wxChildFocusEventType() | wxCloseEventType() | wxColourPickerEventType() | wxCommandEventType() | wxContextMenuEventType() | wxDateEventType() | wxDisplayChangedEventType() | wxEraseEventType() | wxFileDirPickerEventType() | wxFocusEventType() | wxFontPickerEventType() | wxGridEventType() | wxHelpEventType() | wxHtmlLinkEventType() | wxIconizeEventType() | wxIdleEventType() | wxJoystickEventType() | wxKeyEventType() | wxListEventType() | wxMaximizeEventType() | wxMenuEventType() | wxMouseCaptureChangedEventType() | wxMouseEventType() | wxMoveEventType() | wxNavigationKeyEventType() | wxNcPaintEventType() | wxNotebookEventType() | wxPaintEventType() | wxPaletteChangedEventType() | wxQueryNewPaletteEventType() | wxSashEventType() | wxScrollEventType() | wxScrollWinEventType() | wxSetCursorEventType() | wxShowEventType() | wxSizeEventType() | wxSpinEventType() | wxSplitterEventType() | wxStyledTextEventType() | wxSysColourChangedEventType() | wxTaskBarIconEventType() | wxTreeEventType() | wxUpdateUIEventType() | wxWindowCreateEventType() | wxWindowDestroyEventType().
+-type event() :: wxAuiManager() | wxAuiNotebook() | wxCalendar() | wxChildFocus() | wxClose() | wxColourPicker() | wxCommand() | wxContextMenu() | wxDate() | wxDisplayChanged() | wxErase() | wxFileDirPicker() | wxFocus() | wxFontPicker() | wxGrid() | wxHelp() | wxHtmlLink() | wxIconize() | wxIdle() | wxJoystick() | wxKey() | wxList() | wxMaximize() | wxMenu() | wxMouse() | wxMouseCaptureChanged() | wxMove() | wxNavigationKey() | wxNotebook() | wxPaint() | wxPaletteChanged() | wxQueryNewPalette() | wxSash() | wxScroll() | wxScrollWin() | wxSetCursor() | wxShow() | wxSize() | wxSpin() | wxSplitter() | wxStyledText() | wxSysColourChanged() | wxTaskBarIcon() | wxTree() | wxUpdateUI() | wxWindowCreate() | wxWindowDestroy().
+-type wxEventType() :: wxAuiManagerEventType() | wxAuiNotebookEventType() | wxCalendarEventType() | wxChildFocusEventType() | wxCloseEventType() | wxColourPickerEventType() | wxCommandEventType() | wxContextMenuEventType() | wxDateEventType() | wxDisplayChangedEventType() | wxEraseEventType() | wxFileDirPickerEventType() | wxFocusEventType() | wxFontPickerEventType() | wxGridEventType() | wxHelpEventType() | wxHtmlLinkEventType() | wxIconizeEventType() | wxIdleEventType() | wxJoystickEventType() | wxKeyEventType() | wxListEventType() | wxMaximizeEventType() | wxMenuEventType() | wxMouseCaptureChangedEventType() | wxMouseEventType() | wxMoveEventType() | wxNavigationKeyEventType() | wxNotebookEventType() | wxPaintEventType() | wxPaletteChangedEventType() | wxQueryNewPaletteEventType() | wxSashEventType() | wxScrollEventType() | wxScrollWinEventType() | wxSetCursorEventType() | wxShowEventType() | wxSizeEventType() | wxSpinEventType() | wxSplitterEventType() | wxStyledTextEventType() | wxSysColourChangedEventType() | wxTaskBarIconEventType() | wxTreeEventType() | wxUpdateUIEventType() | wxWindowCreateEventType() | wxWindowDestroyEventType().
 
 %% Hardcoded Records
 -record(wxMouseState, {x :: integer(), y :: integer(),
@@ -420,78 +416,78 @@
 -define(wxDateTime_Country_Unknown, 0).
 -define(wxDateTime_Country_Default, 1).
 -define(wxDateTime_Country_WesternEurope_Start, 2).
--define(wxDateTime_Country_EEC, ?Country_WesternEurope_Start).
--define(wxDateTime_France, (?Country_WesternEurope_Start+1)).
--define(wxDateTime_Germany, (?Country_WesternEurope_Start+2)).
--define(wxDateTime_UK, (?Country_WesternEurope_Start+3)).
--define(wxDateTime_Country_WesternEurope_End, ?UK).
--define(wxDateTime_Russia, (?UK+1)).
--define(wxDateTime_USA, (?UK+2)).
+-define(wxDateTime_Country_EEC, ?wxDateTime_Country_WesternEurope_Start).
+-define(wxDateTime_France, (?wxDateTime_Country_WesternEurope_Start+1)).
+-define(wxDateTime_Germany, (?wxDateTime_Country_WesternEurope_Start+2)).
+-define(wxDateTime_UK, (?wxDateTime_Country_WesternEurope_Start+3)).
+-define(wxDateTime_Country_WesternEurope_End, ?wxDateTime_UK).
+-define(wxDateTime_Russia, (?wxDateTime_UK+1)).
+-define(wxDateTime_USA, (?wxDateTime_UK+2)).
 % From class wxDateTime::GregorianAdoption
 -define(wxDateTime_Gr_Unknown, 0).
 -define(wxDateTime_Gr_Standard, 1).
 -define(wxDateTime_Gr_Alaska, 2).
 -define(wxDateTime_Gr_Albania, 3).
--define(wxDateTime_Gr_Austria, ?Gr_Unknown).
--define(wxDateTime_Gr_Austria_Brixen, (?Gr_Unknown+1)).
--define(wxDateTime_Gr_Austria_Salzburg, ?Gr_Austria_Brixen).
--define(wxDateTime_Gr_Austria_Tyrol, ?Gr_Austria_Brixen).
--define(wxDateTime_Gr_Austria_Carinthia, (?Gr_Austria_Brixen+1)).
--define(wxDateTime_Gr_Austria_Styria, ?Gr_Austria_Carinthia).
--define(wxDateTime_Gr_Belgium, (?Gr_Austria_Carinthia+1)).
--define(wxDateTime_Gr_Bulgaria, ?Gr_Unknown).
--define(wxDateTime_Gr_Bulgaria_1, (?Gr_Unknown+1)).
--define(wxDateTime_Gr_Bulgaria_2, (?Gr_Unknown+2)).
--define(wxDateTime_Gr_Bulgaria_3, (?Gr_Unknown+3)).
--define(wxDateTime_Gr_Canada, ?Gr_Unknown).
--define(wxDateTime_Gr_China, ?Gr_Unknown).
--define(wxDateTime_Gr_China_1, (?Gr_Unknown+1)).
--define(wxDateTime_Gr_China_2, (?Gr_Unknown+2)).
--define(wxDateTime_Gr_Czechoslovakia, (?Gr_Unknown+3)).
--define(wxDateTime_Gr_Denmark, (?Gr_Unknown+4)).
--define(wxDateTime_Gr_Egypt, (?Gr_Unknown+5)).
--define(wxDateTime_Gr_Estonia, (?Gr_Unknown+6)).
--define(wxDateTime_Gr_Finland, (?Gr_Unknown+7)).
--define(wxDateTime_Gr_France, (?Gr_Unknown+8)).
--define(wxDateTime_Gr_France_Alsace, (?Gr_Unknown+9)).
--define(wxDateTime_Gr_France_Lorraine, (?Gr_Unknown+10)).
--define(wxDateTime_Gr_France_Strasbourg, (?Gr_Unknown+11)).
--define(wxDateTime_Gr_Germany, ?Gr_Unknown).
--define(wxDateTime_Gr_Germany_Catholic, (?Gr_Unknown+1)).
--define(wxDateTime_Gr_Germany_Prussia, (?Gr_Unknown+2)).
--define(wxDateTime_Gr_Germany_Protestant, (?Gr_Unknown+3)).
--define(wxDateTime_Gr_GreatBritain, (?Gr_Unknown+4)).
--define(wxDateTime_Gr_Greece, (?Gr_Unknown+5)).
--define(wxDateTime_Gr_Hungary, (?Gr_Unknown+6)).
--define(wxDateTime_Gr_Ireland, ?Gr_GreatBritain).
--define(wxDateTime_Gr_Italy, ?Gr_Standard).
--define(wxDateTime_Gr_Japan, ?Gr_Unknown).
--define(wxDateTime_Gr_Japan_1, (?Gr_Unknown+1)).
--define(wxDateTime_Gr_Japan_2, (?Gr_Unknown+2)).
--define(wxDateTime_Gr_Japan_3, (?Gr_Unknown+3)).
--define(wxDateTime_Gr_Latvia, (?Gr_Unknown+4)).
--define(wxDateTime_Gr_Lithuania, (?Gr_Unknown+5)).
--define(wxDateTime_Gr_Luxemburg, (?Gr_Unknown+6)).
--define(wxDateTime_Gr_Netherlands, ?Gr_Belgium).
--define(wxDateTime_Gr_Netherlands_Groningen, (?Gr_Belgium+1)).
--define(wxDateTime_Gr_Netherlands_Gelderland, (?Gr_Belgium+2)).
--define(wxDateTime_Gr_Netherlands_Utrecht, (?Gr_Belgium+3)).
--define(wxDateTime_Gr_Netherlands_Friesland, (?Gr_Belgium+4)).
--define(wxDateTime_Gr_Norway, ?Gr_Denmark).
--define(wxDateTime_Gr_Poland, ?Gr_Standard).
--define(wxDateTime_Gr_Portugal, ?Gr_Standard).
--define(wxDateTime_Gr_Romania, (?Gr_Standard+1)).
--define(wxDateTime_Gr_Russia, (?Gr_Standard+2)).
--define(wxDateTime_Gr_Scotland, ?Gr_GreatBritain).
--define(wxDateTime_Gr_Spain, ?Gr_Standard).
--define(wxDateTime_Gr_Sweden, ?Gr_Finland).
--define(wxDateTime_Gr_Switzerland, ?Gr_Unknown).
--define(wxDateTime_Gr_Switzerland_Catholic, (?Gr_Unknown+1)).
--define(wxDateTime_Gr_Switzerland_Protestant, (?Gr_Unknown+2)).
--define(wxDateTime_Gr_Turkey, (?Gr_Unknown+3)).
--define(wxDateTime_Gr_USA, ?Gr_GreatBritain).
--define(wxDateTime_Gr_Wales, ?Gr_GreatBritain).
--define(wxDateTime_Gr_Yugoslavia, (?Gr_GreatBritain+1)).
+-define(wxDateTime_Gr_Austria, ?wxDateTime_Gr_Unknown).
+-define(wxDateTime_Gr_Austria_Brixen, (?wxDateTime_Gr_Unknown+1)).
+-define(wxDateTime_Gr_Austria_Salzburg, ?wxDateTime_Gr_Austria_Brixen).
+-define(wxDateTime_Gr_Austria_Tyrol, ?wxDateTime_Gr_Austria_Brixen).
+-define(wxDateTime_Gr_Austria_Carinthia, (?wxDateTime_Gr_Austria_Brixen+1)).
+-define(wxDateTime_Gr_Austria_Styria, ?wxDateTime_Gr_Austria_Carinthia).
+-define(wxDateTime_Gr_Belgium, (?wxDateTime_Gr_Austria_Carinthia+1)).
+-define(wxDateTime_Gr_Bulgaria, ?wxDateTime_Gr_Unknown).
+-define(wxDateTime_Gr_Bulgaria_1, (?wxDateTime_Gr_Unknown+1)).
+-define(wxDateTime_Gr_Bulgaria_2, (?wxDateTime_Gr_Unknown+2)).
+-define(wxDateTime_Gr_Bulgaria_3, (?wxDateTime_Gr_Unknown+3)).
+-define(wxDateTime_Gr_Canada, ?wxDateTime_Gr_Unknown).
+-define(wxDateTime_Gr_China, ?wxDateTime_Gr_Unknown).
+-define(wxDateTime_Gr_China_1, (?wxDateTime_Gr_Unknown+1)).
+-define(wxDateTime_Gr_China_2, (?wxDateTime_Gr_Unknown+2)).
+-define(wxDateTime_Gr_Czechoslovakia, (?wxDateTime_Gr_Unknown+3)).
+-define(wxDateTime_Gr_Denmark, (?wxDateTime_Gr_Unknown+4)).
+-define(wxDateTime_Gr_Egypt, (?wxDateTime_Gr_Unknown+5)).
+-define(wxDateTime_Gr_Estonia, (?wxDateTime_Gr_Unknown+6)).
+-define(wxDateTime_Gr_Finland, (?wxDateTime_Gr_Unknown+7)).
+-define(wxDateTime_Gr_France, (?wxDateTime_Gr_Unknown+8)).
+-define(wxDateTime_Gr_France_Alsace, (?wxDateTime_Gr_Unknown+9)).
+-define(wxDateTime_Gr_France_Lorraine, (?wxDateTime_Gr_Unknown+10)).
+-define(wxDateTime_Gr_France_Strasbourg, (?wxDateTime_Gr_Unknown+11)).
+-define(wxDateTime_Gr_Germany, ?wxDateTime_Gr_Unknown).
+-define(wxDateTime_Gr_Germany_Catholic, (?wxDateTime_Gr_Unknown+1)).
+-define(wxDateTime_Gr_Germany_Prussia, (?wxDateTime_Gr_Unknown+2)).
+-define(wxDateTime_Gr_Germany_Protestant, (?wxDateTime_Gr_Unknown+3)).
+-define(wxDateTime_Gr_GreatBritain, (?wxDateTime_Gr_Unknown+4)).
+-define(wxDateTime_Gr_Greece, (?wxDateTime_Gr_Unknown+5)).
+-define(wxDateTime_Gr_Hungary, (?wxDateTime_Gr_Unknown+6)).
+-define(wxDateTime_Gr_Ireland, ?wxDateTime_Gr_GreatBritain).
+-define(wxDateTime_Gr_Italy, ?wxDateTime_Gr_Standard).
+-define(wxDateTime_Gr_Japan, ?wxDateTime_Gr_Unknown).
+-define(wxDateTime_Gr_Japan_1, (?wxDateTime_Gr_Unknown+1)).
+-define(wxDateTime_Gr_Japan_2, (?wxDateTime_Gr_Unknown+2)).
+-define(wxDateTime_Gr_Japan_3, (?wxDateTime_Gr_Unknown+3)).
+-define(wxDateTime_Gr_Latvia, (?wxDateTime_Gr_Unknown+4)).
+-define(wxDateTime_Gr_Lithuania, (?wxDateTime_Gr_Unknown+5)).
+-define(wxDateTime_Gr_Luxemburg, (?wxDateTime_Gr_Unknown+6)).
+-define(wxDateTime_Gr_Netherlands, ?wxDateTime_Gr_Belgium).
+-define(wxDateTime_Gr_Netherlands_Groningen, (?wxDateTime_Gr_Belgium+1)).
+-define(wxDateTime_Gr_Netherlands_Gelderland, (?wxDateTime_Gr_Belgium+2)).
+-define(wxDateTime_Gr_Netherlands_Utrecht, (?wxDateTime_Gr_Belgium+3)).
+-define(wxDateTime_Gr_Netherlands_Friesland, (?wxDateTime_Gr_Belgium+4)).
+-define(wxDateTime_Gr_Norway, ?wxDateTime_Gr_Denmark).
+-define(wxDateTime_Gr_Poland, ?wxDateTime_Gr_Standard).
+-define(wxDateTime_Gr_Portugal, ?wxDateTime_Gr_Standard).
+-define(wxDateTime_Gr_Romania, (?wxDateTime_Gr_Standard+1)).
+-define(wxDateTime_Gr_Russia, (?wxDateTime_Gr_Standard+2)).
+-define(wxDateTime_Gr_Scotland, ?wxDateTime_Gr_GreatBritain).
+-define(wxDateTime_Gr_Spain, ?wxDateTime_Gr_Standard).
+-define(wxDateTime_Gr_Sweden, ?wxDateTime_Gr_Finland).
+-define(wxDateTime_Gr_Switzerland, ?wxDateTime_Gr_Unknown).
+-define(wxDateTime_Gr_Switzerland_Catholic, (?wxDateTime_Gr_Unknown+1)).
+-define(wxDateTime_Gr_Switzerland_Protestant, (?wxDateTime_Gr_Unknown+2)).
+-define(wxDateTime_Gr_Turkey, (?wxDateTime_Gr_Unknown+3)).
+-define(wxDateTime_Gr_USA, ?wxDateTime_Gr_GreatBritain).
+-define(wxDateTime_Gr_Wales, ?wxDateTime_Gr_GreatBritain).
+-define(wxDateTime_Gr_Yugoslavia, (?wxDateTime_Gr_GreatBritain+1)).
 % From class wxDateTime::Month
 -define(wxDateTime_Jan, 0).
 -define(wxDateTime_Feb, 1).
@@ -537,34 +533,34 @@
 -define(wxDateTime_GMT11, 24).
 -define(wxDateTime_GMT12, 25).
 -define(wxDateTime_GMT13, 26).
--define(wxDateTime_WET, ?GMT0).
--define(wxDateTime_WEST, ?GMT1).
--define(wxDateTime_CET, ?GMT1).
--define(wxDateTime_CEST, ?GMT2).
--define(wxDateTime_EET, ?GMT2).
--define(wxDateTime_EEST, ?GMT3).
--define(wxDateTime_MSK, ?GMT3).
--define(wxDateTime_MSD, ?GMT4).
--define(wxDateTime_AST, ?GMT_4).
--define(wxDateTime_ADT, ?GMT_3).
--define(wxDateTime_EST, ?GMT_5).
--define(wxDateTime_EDT, ?GMT_4).
--define(wxDateTime_CST, ?GMT_6).
--define(wxDateTime_CDT, ?GMT_5).
--define(wxDateTime_MST, ?GMT_7).
--define(wxDateTime_MDT, ?GMT_6).
--define(wxDateTime_PST, ?GMT_8).
--define(wxDateTime_PDT, ?GMT_7).
--define(wxDateTime_HST, ?GMT_10).
--define(wxDateTime_AKST, ?GMT_9).
--define(wxDateTime_AKDT, ?GMT_8).
--define(wxDateTime_A_WST, ?GMT8).
--define(wxDateTime_A_CST, ?GMT13+1).
--define(wxDateTime_A_EST, ?GMT10).
--define(wxDateTime_A_ESST, ?GMT11).
--define(wxDateTime_NZST, ?GMT12).
--define(wxDateTime_NZDT, ?GMT13).
--define(wxDateTime_UTC, ?GMT0).
+-define(wxDateTime_WET, ?wxDateTime_GMT0).
+-define(wxDateTime_WEST, ?wxDateTime_GMT1).
+-define(wxDateTime_CET, ?wxDateTime_GMT1).
+-define(wxDateTime_CEST, ?wxDateTime_GMT2).
+-define(wxDateTime_EET, ?wxDateTime_GMT2).
+-define(wxDateTime_EEST, ?wxDateTime_GMT3).
+-define(wxDateTime_MSK, ?wxDateTime_GMT3).
+-define(wxDateTime_MSD, ?wxDateTime_GMT4).
+-define(wxDateTime_AST, ?wxDateTime_GMT_4).
+-define(wxDateTime_ADT, ?wxDateTime_GMT_3).
+-define(wxDateTime_EST, ?wxDateTime_GMT_5).
+-define(wxDateTime_EDT, ?wxDateTime_GMT_4).
+-define(wxDateTime_CST, ?wxDateTime_GMT_6).
+-define(wxDateTime_CDT, ?wxDateTime_GMT_5).
+-define(wxDateTime_MST, ?wxDateTime_GMT_7).
+-define(wxDateTime_MDT, ?wxDateTime_GMT_6).
+-define(wxDateTime_PST, ?wxDateTime_GMT_8).
+-define(wxDateTime_PDT, ?wxDateTime_GMT_7).
+-define(wxDateTime_HST, ?wxDateTime_GMT_10).
+-define(wxDateTime_AKST, ?wxDateTime_GMT_9).
+-define(wxDateTime_AKDT, ?wxDateTime_GMT_8).
+-define(wxDateTime_A_WST, ?wxDateTime_GMT8).
+-define(wxDateTime_A_CST, (?wxDateTime_GMT13+1)).
+-define(wxDateTime_A_EST, ?wxDateTime_GMT10).
+-define(wxDateTime_A_ESST, ?wxDateTime_GMT11).
+-define(wxDateTime_NZST, ?wxDateTime_GMT12).
+-define(wxDateTime_NZDT, ?wxDateTime_GMT13).
+-define(wxDateTime_UTC, ?wxDateTime_GMT0).
 % From class wxDateTime::WeekDay
 -define(wxDateTime_Sun, 0).
 -define(wxDateTime_Mon, 1).
@@ -579,7 +575,6 @@
 -define(wxDateTime_Monday_First, 1).
 -define(wxDateTime_Sunday_First, 2).
 % From class wxDateTime::Year
--define(wxDateTime_Inv_Year, ?SHRT_MIN).
 % From class wxDialog
 -define(wxDialog_ButtonSizerFlags, (?wxOK bor ?wxCANCEL bor ?wxYES bor ?wxNO bor ?wxHELP bor ?wxNO_DEFAULT)).
 % From class wxGrid
@@ -760,6 +755,7 @@
 -define(wxCLRP_DEFAULT_STYLE, 0).
 -define(wxCLRP_USE_TEXTCTRL, ?wxPB_USE_TEXTCTRL).
 -define(wxCLRP_SHOW_LABEL, 8).
+% From "cmndata.h"
 % From "cmndata.h": wxPrintBin
 -define(wxPRINTBIN_DEFAULT, 0).
 -define(wxPRINTBIN_ONLYONE, 1).
@@ -782,6 +778,8 @@
 -define(wxC2S_NAME, 1).
 % From "confbase.h"
 -define(wxCONFIG_CASE_SENSITIVE, 0).
+% From "cpp.h"
+-define(wxEMPTY_PARAMETER_VALUE, ()).
 % From "datectrl.h"
 -define(wxDP_DEFAULT, 0).
 -define(wxDP_SPIN, 1).
@@ -789,7 +787,6 @@
 -define(wxDP_SHOWCENTURY, 4).
 -define(wxDP_ALLOWNONE, 8).
 % From "datetime.h"
--define(wxInvalidDateTime, ?wxDefaultDateTime).
 % From "dcbuffer.h"
 -define(wxBUFFER_CLIENT_AREA, 2).
 -define(wxBUFFER_VIRTUAL_AREA, 1).
@@ -1560,13 +1557,13 @@
 % From "event.h"
 % From "event.h": Propagation_state
 -define(wxEVENT_PROPAGATE_NONE, 0).
--define(wxEVENT_PROPAGATE_MAX, ?INT_MAX).
 % From "event.h": wxIdleMode
 -define(wxIDLE_PROCESS_ALL, 0).
 -define(wxIDLE_PROCESS_SPECIFIED, 1).
 % From "event.h": wxUpdateUIMode
 -define(wxUPDATE_UI_PROCESS_ALL, 0).
 -define(wxUPDATE_UI_PROCESS_SPECIFIED, 1).
+% From "fdrepdlg.h"
 % From "fdrepdlg.h": wxFindReplaceDialogStyles
 -define(wxFR_REPLACEDIALOG, 1).
 -define(wxFR_NOUPDOWN, 2).
@@ -1810,7 +1807,6 @@
 -define(wxGA_VERTICAL, ?wxVERTICAL).
 -define(wxGA_HORIZONTAL, ?wxHORIZONTAL).
 % From "gdicmn.h"
--define(wxGetDisplayDepth, ?wxDisplayDepth).
 % From "gdicmn.h": wxBitmapType
 -define(wxBITMAP_TYPE_INVALID, 0).
 -define(wxBITMAP_TYPE_BMP, 1).
@@ -2091,7 +2087,6 @@
 -define(wxLB_TOP, ?wxBK_TOP).
 -define(wxLB_DEFAULT, ?wxBK_DEFAULT).
 % From "log.h"
--define(wxTRACE_OleCalls, ?wxEmptyString).
 -define(wxTraceRefCount, 8).
 -define(wxTraceResAlloc, 4).
 -define(wxTraceMessages, 2).
@@ -2195,7 +2190,8 @@
 -define(wxSYS_COLOUR_MENUHILIGHT, (?wxSYS_COLOUR_BTNHIGHLIGHT+9)).
 -define(wxSYS_COLOUR_MENUBAR, (?wxSYS_COLOUR_BTNHIGHLIGHT+10)).
 -define(wxSYS_COLOUR_LISTBOXTEXT, (?wxSYS_COLOUR_BTNHIGHLIGHT+11)).
--define(wxSYS_COLOUR_MAX, (?wxSYS_COLOUR_BTNHIGHLIGHT+12)).
+-define(wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT, (?wxSYS_COLOUR_BTNHIGHLIGHT+12)).
+-define(wxSYS_COLOUR_MAX, (?wxSYS_COLOUR_BTNHIGHLIGHT+13)).
 % From "settings.h": wxSystemFeature
 -define(wxSYS_CAN_DRAW_FRAME_DECORATIONS, 1).
 -define(wxSYS_CAN_ICONIZE_FRAME, 2).
@@ -3797,6 +3793,7 @@
 -define(wxRELEASE_NUMBER, wxe_util:get_const(wxRELEASE_NUMBER)).
 -define(wxMINOR_VERSION, wxe_util:get_const(wxMINOR_VERSION)).
 -define(wxMAJOR_VERSION, wxe_util:get_const(wxMAJOR_VERSION)).
+% From "window.h"
 % From "window.h": wxWindowVariant
 -define(wxWINDOW_VARIANT_NORMAL, 0).
 -define(wxWINDOW_VARIANT_SMALL, 1).
diff --git a/lib/wx/src/gen/gl.erl b/lib/wx/src/gen/gl.erl
index ff381683ee..8a8158c35e 100644
--- a/lib/wx/src/gen/gl.erl
+++ b/lib/wx/src/gen/gl.erl
@@ -1,7 +1,9 @@
+%% -*- coding: utf-8 -*-
+
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. 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
@@ -460,7 +462,7 @@ alphaFunc(Func,Ref) ->
 %% as (R s0 G s0 B s0 A s0), (R s1 G s1 B s1 A s1) and (R d G d B d A d), respectively. The color specified by  {@link gl:blendColor/4}  is referred to
 %% as (R c G c B c A c). They are understood to have integer values between 0 and (k R k G k B k A), where 
 %%
-%%  k c= 2(m c)-1
+%%  k c=2(m c)-1
 %%
 %%  and (m R m G m B m A) is the number of red, green, blue, and alpha bitplanes. 
 %%
@@ -489,12 +491,12 @@ alphaFunc(Func,Ref) ->
 %%
 %%  In the table, 
 %%
-%%  i= min(A s k A-A d) k/A
+%%  i=min(A s k A-A d) k/A
 %%
 %%  To determine the blended RGBA values of a pixel, the system uses the following equations:
 %% 
 %%
-%%  R d= min(k R R s  s R+R d  d R) G d= min(k G G s  s G+G d  d G) B d= min(k B B s  s B+B d  d B) A d= min(k A A s  s A+A d  d A)
+%%  R d=min(k R R s  s R+R d  d R) G d=min(k G G s  s G+G d  d G) B d=min(k B B s  s B+B d  d B) A d=min(k A A s  s A+A d  d A)
 %%
 %%  Despite the apparent precision of the above equations, blending arithmetic is not exactly
 %% specified, because blending operates with imprecise integer color values. However, a blend
@@ -503,7 +505,7 @@ alphaFunc(Func,Ref) ->
 %% ,  `Dfactor'  is `?GL_ONE_MINUS_SRC_ALPHA', and   A s is equal to   k A, the equations
 %% reduce to simple replacement: 
 %%
-%%  R d= R s G d= G s B d= B s A d= A s
+%%  R d=R s G d=G s B d=B s A d=A s
 %%
 %% 
 %%
@@ -643,7 +645,7 @@ lineWidth(Width) ->
 %%  is 0, otherwise these fragments are sent to the frame buffer. Bit zero of  `Pattern' 
 %% is the least significant bit. 
 %%
-%%  Antialiased lines are treated as a sequence of   1*width rectangles for purposes of stippling.
+%%  Antialiased lines are treated as a sequence of   1×width rectangles for purposes of stippling.
 %% Whether rectangle   s is rasterized or not depends on the fragment rule described for
 %% aliased lines, counting rectangles rather than groups of fragments. 
 %%
@@ -690,7 +692,7 @@ polygonMode(Face,Mode) ->
 %%  When `?GL_POLYGON_OFFSET_FILL', `?GL_POLYGON_OFFSET_LINE', or `?GL_POLYGON_OFFSET_POINT'
 %%  is enabled, each fragment's `depth' value will be offset after it is interpolated
 %% from the `depth' values of the appropriate vertices. The value of the offset is  
-%% factor*DZ+r*units, where   DZ is a measurement of the change in depth relative to the
+%% factor×DZ+r×units, where   DZ is a measurement of the change in depth relative to the
 %% screen area of the polygon, and   r is the smallest value that is guaranteed to produce
 %% a resolvable offset for a given implementation. The offset is added before the depth test
 %% is performed and before the value is written into the depth buffer. 
@@ -709,10 +711,10 @@ polygonOffset(Factor,Units) ->
 %% fragments produced by rasterization, creating a pattern. Stippling is independent of polygon
 %% antialiasing. 
 %%
-%%  `Pattern'  is a pointer to a   32*32 stipple pattern that is stored in memory just
+%%  `Pattern'  is a pointer to a   32×32 stipple pattern that is stored in memory just
 %% like the pixel data supplied to a  {@link gl:drawPixels/5}  call with  height and `width'
 %%  both equal to 32, a pixel format of `?GL_COLOR_INDEX', and data type of `?GL_BITMAP'
-%% . That is, the stipple pattern is represented as a   32*32 array of 1-bit color indices
+%% . That is, the stipple pattern is represented as a   32×32 array of 1-bit color indices
 %% packed in unsigned bytes.  {@link gl:pixelStoref/2}  parameters like `?GL_UNPACK_SWAP_BYTES'
 %%  and `?GL_UNPACK_LSB_FIRST' affect the assembling of the bits into a stipple pattern.
 %% Pixel transfer operations (shift, offset, pixel map) are not applied to the stipple image,
@@ -737,10 +739,10 @@ polygonStipple(Mask) ->
 
 %% @doc Return the polygon stipple pattern
 %%
-%% ``gl:getPolygonStipple'' returns to  `Pattern'  a   32*32 polygon stipple pattern.
+%% ``gl:getPolygonStipple'' returns to  `Pattern'  a   32×32 polygon stipple pattern.
 %% The pattern is packed into memory as if  {@link gl:readPixels/7}  with both `height'
 %% and `width' of 32, `type' of `?GL_BITMAP', and `format' of `?GL_COLOR_INDEX'
-%%  were called, and the stipple pattern were stored in an internal   32*32 color index buffer.
+%%  were called, and the stipple pattern were stored in an internal   32×32 color index buffer.
 %% Unlike  {@link gl:readPixels/7} , however, pixel transfer operations (shift, offset, pixel
 %% map) are not applied to the returned stipple image. 
 %%
@@ -2635,7 +2637,7 @@ loadIdentity() ->
 %% and  `M'  points to an array of   16 single- or double-precision floating-point values
 %%   m={m[0] m[1] ... m[15]}, then the modelview transformation   M(v) does the following: 
 %%
-%%  M(v)=(m[0] m[4] m[8] m[12] m[1] m[5] m[9] m[13] m[2] m[6] m[10] m[14] m[3] m[7] m[11] m[15])*(v[0] v[1] v[2] v[3])
+%%  M(v)=(m[0] m[4] m[8] m[12] m[1] m[5] m[9] m[13] m[2] m[6] m[10] m[14] m[3] m[7] m[11] m[15])×(v[0] v[1] v[2] v[3])
 %%
 %%  Projection and texture transformations are similarly defined. 
 %%
@@ -2687,7 +2689,7 @@ multMatrixf({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
 %% (x 2(1-c)+c x  y(1-c)-z  s x  z(1-c)+y  s 0 y  x(1-c)+z  s y 2(1-c)+c y  z(1-c)-x  s 0 x  z(1-c)-y  s y  z(1-c)+x  s z 2(1-c)+c 0 0 0 0
 %% 1)
 %%
-%%  Where   c= cos(angle),   s= sin(angle), and ||(x y z)||= 1 (if not, the GL will normalize this vector). 
+%%  Where   c=cos(angle),   s=sin(angle), and ||(x y z)||=1 (if not, the GL will normalize this vector). 
 %%
 %%  If the matrix mode is either `?GL_MODELVIEW' or `?GL_PROJECTION', all objects
 %% drawn after ``gl:rotate'' is called are rotated. Use  {@link gl:pushMatrix/0}  and  {@link gl:pushMatrix/0} 
@@ -3814,7 +3816,7 @@ rasterPos4sv({X,Y,Z,W}) ->  rasterPos4s(X,Y,Z,W).
 %% ``gl:rect'' supports efficient specification of rectangles as two corner points. Each
 %% rectangle command takes four arguments, organized either as two consecutive pairs of  (x y)
 %% coordinates or as two pointers to arrays, each containing an  (x y) pair. The resulting rectangle
-%% is defined in the   z= 0 plane. 
+%% is defined in the   z=0 plane. 
 %%
 %% ``gl:rect''( `X1' ,  `Y1' ,  `X2' ,  `Y2' ) is exactly equivalent to the
 %% following sequence:  glBegin(`?GL_POLYGON'); glVertex2( `X1' ,  `Y1' ); glVertex2(
@@ -4684,9 +4686,9 @@ pixelZoom(Xfactor,Yfactor) ->
 %% is the number of pixels in a row (`?GL_PACK_ROW_LENGTH' if it is greater than 0,
 %% the   width argument to the pixel routine otherwise),  a is the value of `?GL_PACK_ALIGNMENT'
 %% , and  s is the size, in bytes, of a single component (if   a&lt; s, then it is as if   a=
-%%  s). In the case of 1-bit values, the location of the next row is obtained by skipping 
+%% s). In the case of 1-bit values, the location of the next row is obtained by skipping 
 %%
-%%  k= 8  a |(n  l)/(8  a)|
+%%  k=8  a |(n  l)/(8  a)|
 %%
 %%  components or indices. 
 %%
@@ -4708,7 +4710,7 @@ pixelZoom(Xfactor,Yfactor) ->
 %% a pixel image (`?GL_PACK_IMAGE_HEIGHT' if it is greater than 0, the   height argument
 %% to the  {@link gl:texImage3D/10}  routine otherwise),  a is the value of `?GL_PACK_ALIGNMENT'
 %% , and   s is the size, in bytes, of a single component (if   a&lt; s, then it is as if  
-%% a= s). 
+%% a=s). 
 %%
 %%  The word `component' in this description refers to the nonindex values red, green,
 %% blue, alpha, and depth. Storage format `?GL_RGB', for example, has three components
@@ -4758,9 +4760,9 @@ pixelZoom(Xfactor,Yfactor) ->
 %% is the number of pixels in a row (`?GL_UNPACK_ROW_LENGTH' if it is greater than 0,
 %% the   width argument to the pixel routine otherwise),  a is the value of `?GL_UNPACK_ALIGNMENT'
 %% , and  s is the size, in bytes, of a single component (if   a&lt; s, then it is as if   a=
-%%  s). In the case of 1-bit values, the location of the next row is obtained by skipping 
+%% s). In the case of 1-bit values, the location of the next row is obtained by skipping 
 %%
-%%  k= 8  a |(n  l)/(8  a)|
+%%  k=8  a |(n  l)/(8  a)|
 %%
 %%  components or indices. 
 %%
@@ -4781,8 +4783,8 @@ pixelZoom(Xfactor,Yfactor) ->
 %% the   width argument to  {@link gl:texImage3D/10}  otherwise),  h is the number of rows in
 %% an image (`?GL_UNPACK_IMAGE_HEIGHT' if it is greater than 0, the   height argument
 %% to  {@link gl:texImage3D/10}  otherwise),  a is the value of `?GL_UNPACK_ALIGNMENT',
-%% and  s is the size, in bytes, of a single component (if   a&lt; s, then it is as if   a=
-%% s). 
+%% and  s is the size, in bytes, of a single component (if   a&lt; s, then it is as if   a=s).
+%% 
 %%
 %%  The word `component' in this description refers to the nonindex values red, green,
 %% blue, alpha, and depth. Storage format `?GL_RGB', for example, has three components
@@ -5327,7 +5329,7 @@ readPixels(X,Y,Width,Height,Format,Type,Pixels) ->
 %%  or `?GL_STENCIL_INDEX'. Each unsigned byte is treated as eight 1-bit pixels, with
 %% bit ordering determined by `?GL_UNPACK_LSB_FIRST' (see  {@link gl:pixelStoref/2} ). 
 %%
-%%  width*height pixels are read from memory, starting at location  `Data' . By default,
+%%  width×height pixels are read from memory, starting at location  `Data' . By default,
 %% these pixels are taken from adjacent memory locations, except that after all  `Width' 
 %% pixels are read, the read pointer is advanced to the next four-byte boundary. The four-byte
 %% row alignment is specified by  {@link gl:pixelStoref/2}  with argument `?GL_UNPACK_ALIGNMENT'
@@ -5340,7 +5342,7 @@ readPixels(X,Y,Width,Height,Format,Type,Pixels) ->
 %%  (see  {@link gl:bindBuffer/2} ) while a block of pixels is specified,  `Data'  is treated
 %% as a byte offset into the buffer object's data store. 
 %%
-%%  The   width*height pixels that are read from memory are each operated on in the same
+%%  The   width×height pixels that are read from memory are each operated on in the same
 %% way, based on the values of several parameters specified by  {@link gl:pixelTransferf/2} 
 %% and  {@link gl:pixelMapfv/3} . The details of these operations, as well as the target buffer
 %% into which the pixels are drawn, are specific to the format of the pixels, as specified
@@ -5366,10 +5368,10 @@ readPixels(X,Y,Width,Height,Format,Type,Pixels) ->
 %%
 %%  The GL then converts the resulting indices or RGBA colors to fragments by attaching the
 %% current raster position `z' coordinate and texture coordinates to each pixel, then
-%% assigning   x and   y window coordinates to the   nth fragment such that  x n= x r+n%
-%% width
+%% assigning   x and   y window coordinates to the   nth fragment such that  x n=x r+n% width
+%% 
 %%
-%%  y n= y r+|n/width|
+%%  y n=y r+|n/width|
 %%
 %%  where  (x r y r) is the current raster position. These pixel fragments are then treated just like
 %% the fragments generated by rasterizing points, lines, or polygons. Texture mapping, fog,
@@ -5391,9 +5393,9 @@ readPixels(X,Y,Width,Height,Format,Type,Pixels) ->
 %% the number of bits in the stencil buffer. The resulting stencil indices are then written
 %% to the stencil buffer such that the   nth index is written to location 
 %%
-%%  x n= x r+n% width
+%%  x n=x r+n% width
 %%
-%%  y n= y r+|n/width|
+%%  y n=y r+|n/width|
 %%
 %%  where  (x r y r) is the current raster position. Only the pixel ownership test, the scissor test,
 %% and the stencil writemask affect these write operations. 
@@ -5411,9 +5413,9 @@ readPixels(X,Y,Width,Height,Format,Type,Pixels) ->
 %% raster position color or color index and texture coordinates to each pixel, then assigning
 %%   x and   y window coordinates to the   nth fragment such that 
 %%
-%%  x n= x r+n% width
+%%  x n=x r+n% width
 %%
-%%  y n= y r+|n/width|
+%%  y n=y r+|n/width|
 %%
 %%  where  (x r y r) is the current raster position. These pixel fragments are then treated just like
 %% the fragments generated by rasterizing points, lines, or polygons. Texture mapping, fog,
@@ -5442,9 +5444,9 @@ readPixels(X,Y,Width,Height,Format,Type,Pixels) ->
 %% raster position `z' coordinate and texture coordinates to each pixel, then assigning
 %%   x and   y window coordinates to the   nth fragment such that 
 %%
-%%  x n= x r+n% width
+%%  x n=x r+n% width
 %%
-%%  y n= y r+|n/width|
+%%  y n=y r+|n/width|
 %%
 %%  where  (x r y r) is the current raster position. These pixel fragments are then treated just like
 %% the fragments generated by rasterizing points, lines, or polygons. Texture mapping, fog,
@@ -5810,7 +5812,7 @@ clearStencil(S) ->
 %%
 %%  If the texture generation function is `?GL_OBJECT_LINEAR', the function 
 %%
-%%  g= p 1*x o+p 2*y o+p 3*z o+p 4*w o
+%%  g=p 1×x o+p 2×y o+p 3×z o+p 4×w o
 %%
 %%  is used, where   g is the value computed for the coordinate named in  `Coord' ,  p 1,
 %%  p 2,  p 3, and  p 4 are the four values supplied in  `Params' , and  x o,  y o,  z o,
@@ -5823,7 +5825,7 @@ clearStencil(S) ->
 %%
 %%  If the texture generation function is `?GL_EYE_LINEAR', the function 
 %%
-%%  g=(p 1)"*x e+(p 2)"*y e+(p 3)"*z e+(p 4)"*w e
+%%  g=(p 1)"×x e+(p 2)"×y e+(p 3)"×z e+(p 4)"×w e
 %%
 %%  is used, where 
 %%
@@ -5847,14 +5849,14 @@ clearStencil(S) ->
 %%
 %%  f=(f x  f y  f z) T be the reflection vector such that 
 %%
-%%  f= u-2  n" (n") T  u
+%%  f=u-2  n" (n") T  u
 %%
-%%  Finally, let   m= 2 ((f x) 2+(f y) 2+(f z+1) 2). Then the values assigned to the   s and   t texture coordinates
+%%  Finally, let   m=2 ((f x) 2+(f y) 2+(f z+1) 2). Then the values assigned to the   s and   t texture coordinates
 %% are 
 %%
-%%  s= f x/m+1/2
+%%  s=f x/m+1/2
 %%
-%%  t= f y/m+1/2
+%%  t=f y/m+1/2
 %%
 %%  To enable or disable a texture-coordinate generation function, call  {@link gl:enable/1} 
 %% or  {@link gl:enable/1}  with one of the symbolic texture-coordinate names (`?GL_TEXTURE_GEN_S'
@@ -6002,7 +6004,7 @@ texEnvi(Target,Pname,Param) ->
 %% `?GL_BLEND' Function </td><td>`?GL_ADD' Function </td></tr></tbody><tbody><tr><td>
 %% `?GL_ALPHA'</td><td> C v=</td><td> C p</td><td> C p</td><td> undefined </td><td> C p</td>
 %% <td> C p</td></tr><tr><td></td><td> A v=</td><td> A s</td><td> A p  A s</td><td></td><td>
-%% A v= A p  A s</td><td> A p  A s</td></tr><tr><td>`?GL_LUMINANCE'</td><td> C v=</td><td>
+%% A v=A p  A s</td><td> A p  A s</td></tr><tr><td>`?GL_LUMINANCE'</td><td> C v=</td><td>
 %%  C s</td><td> C p  C s</td><td> undefined </td><td> C p (1-C s)+C c  C s</td><td> C p+C s</td></tr>
 %% <tr><td> (or 1) </td><td> A v=</td><td> A p</td><td> A p</td><td></td><td> A p</td><td> A
 %% p</td></tr><tr><td>`?GL_LUMINANCE_ALPHA'</td><td> C v=</td><td> C s</td><td> C p  C
@@ -6034,11 +6036,11 @@ texEnvi(Target,Pname,Param) ->
 %%
 %% <table><tbody><tr><td>`?GL_COMBINE_RGB'</td><td>` Texture Function '</td></tr></tbody>
 %% <tbody><tr><td>`?GL_REPLACE'</td><td> Arg0</td></tr><tr><td>`?GL_MODULATE'</td><td>
-%%  Arg0*Arg1</td></tr><tr><td>`?GL_ADD'</td><td> Arg0+Arg1</td></tr><tr><td>`?GL_ADD_SIGNED'
-%% </td><td> Arg0+Arg1-0.5</td></tr><tr><td>`?GL_INTERPOLATE'</td><td> Arg0*Arg2+Arg1*(1-
+%%  Arg0×Arg1</td></tr><tr><td>`?GL_ADD'</td><td> Arg0+Arg1</td></tr><tr><td>`?GL_ADD_SIGNED'
+%% </td><td> Arg0+Arg1-0.5</td></tr><tr><td>`?GL_INTERPOLATE'</td><td> Arg0×Arg2+Arg1×(1-
 %% Arg2)</td>
 %% </tr><tr><td>`?GL_SUBTRACT'</td><td> Arg0-Arg1</td></tr><tr><td>`?GL_DOT3_RGB'
-%% or `?GL_DOT3_RGBA'</td><td> 4*((((Arg0 r)-0.5)*((Arg1 r)-0.5))+(((Arg0 g)-0.5)*((Arg1 g)-0.5))+(((Arg0 b)-0.5)*((Arg1 b)-0.5)))</td></tr></tbody></table>
+%% or `?GL_DOT3_RGBA'</td><td> 4×((((Arg0 r)-0.5)×((Arg1 r)-0.5))+(((Arg0 g)-0.5)×((Arg1 g)-0.5))+(((Arg0 b)-0.5)×((Arg1 b)-0.5)))</td></tr></tbody></table>
 %%
 %%  The scalar results for `?GL_DOT3_RGB' and `?GL_DOT3_RGBA' are placed into each
 %% of the 3 (RGB) or 4 (RGBA) components on output. 
@@ -6049,8 +6051,8 @@ texEnvi(Target,Pname,Param) ->
 %%
 %% <table><tbody><tr><td>`?GL_COMBINE_ALPHA'</td><td>` Texture Function '</td></tr>
 %% </tbody><tbody><tr><td>`?GL_REPLACE'</td><td> Arg0</td></tr><tr><td>`?GL_MODULATE'
-%% </td><td> Arg0*Arg1</td></tr><tr><td>`?GL_ADD'</td><td> Arg0+Arg1</td></tr><tr><td>`?GL_ADD_SIGNED'
-%% </td><td> Arg0+Arg1-0.5</td></tr><tr><td>`?GL_INTERPOLATE'</td><td> Arg0*Arg2+Arg1*(1-
+%% </td><td> Arg0×Arg1</td></tr><tr><td>`?GL_ADD'</td><td> Arg0+Arg1</td></tr><tr><td>`?GL_ADD_SIGNED'
+%% </td><td> Arg0+Arg1-0.5</td></tr><tr><td>`?GL_INTERPOLATE'</td><td> Arg0×Arg2+Arg1×(1-
 %% Arg2)</td>
 %% </tr><tr><td>`?GL_SUBTRACT'</td><td> Arg0-Arg1</td></tr></tbody></table>
 %%
@@ -6245,19 +6247,18 @@ getTexEnviv(Target,Pname) ->
 %%  If the values for `?GL_TEXTURE_BORDER_COLOR' are specified with ``gl:texParameterIiv''
 %%  or ``gl:texParameterIuiv'', the values are stored unmodified with an internal data
 %% type of integer. If specified with ``gl:texParameteriv'', they are converted to floating
-%% point with the following equation:  f= 2 c+1 2 b-/1. If specified with ``gl:texParameterfv''
+%% point with the following equation:  f=2 c+1 2 b-/1. If specified with ``gl:texParameterfv''
 %% , they are stored unmodified as floating-point values. 
 %%
 %% `?GL_TEXTURE_COMPARE_FUNC':  Specifies the comparison operator used when `?GL_TEXTURE_COMPARE_MODE'
 %%  is set to `?GL_COMPARE_REF_TO_TEXTURE'. Permissible values are: <table><tbody><tr><td>
 %% ` Texture Comparison Function '</td><td>` Computed result  '</td></tr></tbody><tbody>
-%% <tr><td>`?GL_LEQUAL'</td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&lt;=(D t) r&gt;(D t))</td></tr><tr><td>`?GL_GEQUAL'</td><td>
-%% result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&gt;=(D t) r&lt;(D t))</td></tr><tr><td>`?GL_LESS'</td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&lt;
-%% (D t) r&gt;=(D t))</td></tr><tr><td>`?GL_GREATER'
-%% </td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&gt;(D t) r&lt;=(D t))</td></tr><tr><td>`?GL_EQUAL'</td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp;
-%%  r=(D t) r&amp;ne;(D t))</td></tr><tr><td>`?GL_NOTEQUAL'
-%% </td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&amp;ne;(D t) r=(D t))</td></tr><tr><td>`?GL_ALWAYS'</td><td> result= 1.0</td></tr><tr><td>
-%% `?GL_NEVER'</td><td> result= 0.0</td></tr></tbody></table> where  r is the current
+%% <tr><td>`?GL_LEQUAL'</td><td> result={1.0 0.0    r&lt;=(D t) r&gt;(D t))</td></tr><tr><td>`?GL_GEQUAL'</td><td>
+%% result={1.0 0.0    r&gt;=(D t) r&lt;(D t))</td></tr><tr><td>`?GL_LESS'</td><td> result={1.0 0.0    r&lt;(D t) r&gt;=(D t))</td></tr><tr><td>`?GL_GREATER'
+%% </td><td> result={1.0 0.0    r&gt;(D t) r&lt;=(D t))</td></tr><tr><td>`?GL_EQUAL'</td><td> result={1.0 0.0    r=(D t) r&amp;ne;
+%% (D t))</td></tr><tr><td>`?GL_NOTEQUAL'
+%% </td><td> result={1.0 0.0    r&amp;ne;(D t) r=(D t))</td></tr><tr><td>`?GL_ALWAYS'</td><td> result=1.0</td></tr><tr><td>
+%% `?GL_NEVER'</td><td> result=0.0</td></tr></tbody></table> where  r is the current
 %% interpolated texture coordinate, and   D t is the depth texture value sampled from the
 %% currently bound depth texture.  result is assigned to the the red channel. 
 %%
@@ -6286,14 +6287,14 @@ getTexEnviv(Target,Pname) ->
 %% The other four use mipmaps. 
 %%
 %%  A mipmap is an ordered set of arrays representing the same image at progressively lower
-%% resolutions. If the texture has dimensions   2 n*2 m, there are  max(n m)+1 mipmaps. The first
-%% mipmap is the original texture, with dimensions   2 n*2 m. Each subsequent mipmap has
-%% dimensions   2(k-1)*2(l-1), where   2 k*2 l are the dimensions of the previous mipmap, until either
-%%   k= 0 or   l= 0. At that point, subsequent mipmaps have dimension   1*2(l-1) or   2(k-1)*1 until
-%% the final mipmap, which has dimension   1*1. To define the mipmaps, call  {@link gl:texImage1D/8} 
+%% resolutions. If the texture has dimensions   2 n×2 m, there are  max(n m)+1 mipmaps. The first
+%% mipmap is the original texture, with dimensions   2 n×2 m. Each subsequent mipmap has
+%% dimensions   2(k-1)×2(l-1), where   2 k×2 l are the dimensions of the previous mipmap, until either
+%%   k=0 or   l=0. At that point, subsequent mipmaps have dimension   1×2(l-1) or   2(k-1)×1 until
+%% the final mipmap, which has dimension   1×1. To define the mipmaps, call  {@link gl:texImage1D/8} 
 %% ,  {@link gl:texImage2D/9} ,  {@link gl:texImage3D/10} ,  {@link gl:copyTexImage1D/7} , or  {@link gl:copyTexImage2D/8} 
 %%  with the `level' argument indicating the order of the mipmaps. Level 0 is the original
-%% texture; level   max(n m) is the final   1*1 mipmap. 
+%% texture; level   max(n m) is the final   1×1 mipmap. 
 %%
 %%  `Params'  supplies a function for minifying the texture as one of the following: 
 %%
@@ -7255,7 +7256,7 @@ map2f(Target,U1,U2,Ustride,Uorder,V1,V2,Vstride,Vorder,Points) ->
 %%  `Query'  can assume the following values: 
 %%
 %% `?GL_COEFF':  `V'  returns the control points for the evaluator function. One-dimensional
-%% evaluators return   order control points, and two-dimensional evaluators return   uorder*vorder
+%% evaluators return   order control points, and two-dimensional evaluators return   uorder×vorder
 %%  control points. Each control point consists of one, two, three, or four integer, single-precision
 %% floating-point, or double-precision floating-point values, depending on the type of the
 %% evaluator. The GL returns two-dimensional control points in row-major order, incrementing
@@ -7330,9 +7331,9 @@ getMapiv(Target,Query,V) ->
 %% `?GL_AUTO_NORMAL', ``gl:evalCoord2'' generates surface normals analytically, regardless
 %% of the contents or enabling of the `?GL_MAP2_NORMAL' map. Let 
 %%
-%%  m=((&amp;PartialD; p)/(&amp;PartialD; u))*((&amp;PartialD; p)/(&amp;PartialD; v))
+%%  m=((&amp;PartialD; p)/(&amp;PartialD; u))×((&amp;PartialD; p)/(&amp;PartialD; v))
 %%
-%%  Then the generated normal   n is  n= m/(||m||)
+%%  Then the generated normal   n is  n=m/(||m||)
 %%
 %%  If automatic normal generation is disabled, the corresponding normal map `?GL_MAP2_NORMAL'
 %% , if enabled, is used to produce a normal. If neither automatic normal generation nor
@@ -7393,17 +7394,17 @@ evalCoord2fv({U,V}) ->  evalCoord2f(U,V).
 %% 0 maps exactly to  `U1' , and integer grid coordinate  `Un'  maps exactly to  `U2' 
 %% . All other integer grid coordinates   i are mapped so that 
 %%
-%%  u= i(u2-u1)/un+u1
+%%  u=i(u2-u1)/un+u1
 %%
 %% ``gl:mapGrid2'' specifies two such linear mappings. One maps integer grid coordinate  
-%% i= 0 exactly to  `U1' , and integer grid coordinate   i= un exactly to  `U2' . The
-%% other maps integer grid coordinate   j= 0 exactly to  `V1' , and integer grid coordinate
-%%   j= vn exactly to  `V2' . Other integer grid coordinates   i and   j are mapped such
+%% i=0 exactly to  `U1' , and integer grid coordinate   i=un exactly to  `U2' . The
+%% other maps integer grid coordinate   j=0 exactly to  `V1' , and integer grid coordinate
+%%   j=vn exactly to  `V2' . Other integer grid coordinates   i and   j are mapped such
 %% that 
 %%
-%%  u= i(u2-u1)/un+u1
+%%  u=i(u2-u1)/un+u1
 %%
-%%  v= j(v2-v1)/vn+v1
+%%  v=j(v2-v1)/vn+v1
 %%
 %%  The mappings specified by ``gl:mapGrid'' are used identically by  {@link gl:evalMesh1/3} 
 %% and  {@link gl:evalPoint1/1} . 
@@ -7440,7 +7441,7 @@ mapGrid2f(Un,U1,U2,Vn,V1,V2) ->
 %% 1 );  where &amp;Delta; u=(u 2-u 1)/n
 %%
 %%  and   n,   u 1, and   u 2 are the arguments to the most recent  {@link gl:mapGrid1d/3}  command.
-%% The one absolute numeric requirement is that if   i= n, then the value computed from  i.&amp;Delta;
+%% The one absolute numeric requirement is that if   i=n, then the value computed from  i.&amp;Delta;
 %%  u+u 1 is exactly   u 2. 
 %%
 %%  In the two-dimensional case, ``gl:evalPoint2'', let 
@@ -7452,8 +7453,8 @@ mapGrid2f(Un,U1,U2,Vn,V1,V2) ->
 %%  where   n,   u 1,   u 2,   m,   v 1, and   v 2 are the arguments to the most recent  {@link gl:mapGrid1d/3} 
 %%  command. Then the ``gl:evalPoint2'' command is equivalent to calling  glEvalCoord2(  i.
 %% &amp;Delta; u+u 1, j.&amp;Delta; v+v 1 );  The only absolute numeric requirements are
-%% that if   i= n, then the value computed from  i.&amp;Delta; u+u 1 is exactly   u 2, and
-%% if   j= m, then the value computed from  j.&amp;Delta; v+v 1 is exactly   v 2. 
+%% that if   i=n, then the value computed from  i.&amp;Delta; u+u 1 is exactly   u 2, and
+%% if   j=m, then the value computed from  j.&amp;Delta; v+v 1 is exactly   v 2. 
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEvalPoint.xml">external</a> documentation.
 -spec evalPoint1(I) -> ok when I :: integer().
@@ -7486,8 +7487,8 @@ evalPoint2(I,J) ->
 %% `type' is `?GL_POINTS' if  `Mode'  is `?GL_POINT', or `?GL_LINES'
 %% if  `Mode'  is `?GL_LINE'. 
 %%
-%%  The one absolute numeric requirement is that if   i= n, then the value computed from   i.
-%% &amp;Delta; u+u 1 is exactly   u 2. 
+%%  The one absolute numeric requirement is that if   i=n, then the value computed from   i.&amp;Delta;
+%%  u+u 1 is exactly   u 2. 
 %%
 %%  In the two-dimensional case, ``gl:evalMesh2'', let .cp &amp;Delta; u=(u 2-u 1)/n
 %%
@@ -7516,8 +7517,8 @@ evalPoint2(I,J) ->
 %% ; i &lt;=  `I2' ; i += 1 ) glEvalCoord2(  i.&amp;Delta; u+u 1, j.&amp;Delta; v+v 1
 %% ); glEnd(); 
 %%
-%%  In all three cases, the only absolute numeric requirements are that if   i= n, then the
-%% value computed from   i.&amp;Delta; u+u 1 is exactly  u 2, and if   j= m, then the value
+%%  In all three cases, the only absolute numeric requirements are that if   i=n, then the
+%% value computed from   i.&amp;Delta; u+u 1 is exactly  u 2, and if   j=m, then the value
 %% computed from  j.&amp;Delta; v+v 1 is exactly   v 2. 
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEvalMesh.xml">external</a> documentation.
@@ -7578,21 +7579,21 @@ evalMesh2(Mode,I1,I2,J1,J2) ->
 %% (in the case that `?GL_FOG_COORD_SRC' is `?GL_FOG_COORD'). The equation for `?GL_LINEAR'
 %%  fog is  f=(end-c)/(end-start)
 %%
-%%  The equation for `?GL_EXP' fog is  f= e(-(density. c))
+%%  The equation for `?GL_EXP' fog is  f=e(-(density. c))
 %%
-%%  The equation for `?GL_EXP2' fog is  f= e(-(density. c)) 2
+%%  The equation for `?GL_EXP2' fog is  f=e(-(density. c)) 2
 %%
 %%  Regardless of the fog mode,  f is clamped to the range  [0 1] after it is computed. Then,
 %% if the GL is in RGBA color mode, the fragment's red, green, and blue colors, represented
 %% by   C r, are replaced by 
 %%
-%% (C r)"= f*C r+(1-f)*C f
+%% (C r)"=f×C r+(1-f)×C f
 %%
 %%  Fog does not affect a fragment's alpha component. 
 %%
 %%  In color index mode, the fragment's color index   i r is replaced by 
 %%
-%% (i r)"= i r+(1-f)*i f
+%% (i r)"=i r+(1-f)×i f
 %%
 %% 
 %%
@@ -7664,44 +7665,45 @@ fogiv(Pname,Params) ->
 %% is fed back as some number of floating-point values, as determined by  `Type' . Colors
 %% are fed back as four values in RGBA mode and one value in color index mode. 
 %%
-%%  feedbackList  feedbackItem feedbackList | feedbackItem 
+%%  feedbackList  ← feedbackItem feedbackList | feedbackItem 
 %%
-%%  feedbackItem  point | lineSegment | polygon | bitmap | pixelRectangle | passThru 
+%%  feedbackItem  ← point | lineSegment | polygon | bitmap | pixelRectangle | passThru 
 %%
-%%  point `?GL_POINT_TOKEN' vertex 
+%%  point  ←`?GL_POINT_TOKEN' vertex 
 %%
-%%  lineSegment `?GL_LINE_TOKEN' vertex vertex | `?GL_LINE_RESET_TOKEN' vertex
+%%  lineSegment  ←`?GL_LINE_TOKEN' vertex vertex | `?GL_LINE_RESET_TOKEN' vertex
 %% vertex 
 %%
-%%  polygon `?GL_POLYGON_TOKEN' n polySpec 
+%%  polygon  ←`?GL_POLYGON_TOKEN' n polySpec 
 %%
-%%  polySpec  polySpec vertex | vertex vertex vertex 
+%%  polySpec  ← polySpec vertex | vertex vertex vertex 
 %%
-%%  bitmap `?GL_BITMAP_TOKEN' vertex 
+%%  bitmap  ←`?GL_BITMAP_TOKEN' vertex 
 %%
-%%  pixelRectangle `?GL_DRAW_PIXEL_TOKEN' vertex | `?GL_COPY_PIXEL_TOKEN' vertex 
+%%  pixelRectangle  ←`?GL_DRAW_PIXEL_TOKEN' vertex | `?GL_COPY_PIXEL_TOKEN' vertex
+%% 
 %%
-%%  passThru `?GL_PASS_THROUGH_TOKEN' value 
+%%  passThru  ←`?GL_PASS_THROUGH_TOKEN' value 
 %%
-%%  vertex  2d | 3d | 3dColor | 3dColorTexture | 4dColorTexture 
+%%  vertex  ← 2d | 3d | 3dColor | 3dColorTexture | 4dColorTexture 
 %%
-%%  2d  value value 
+%%  2d  ← value value 
 %%
-%%  3d  value value value 
+%%  3d  ← value value value 
 %%
-%%  3dColor  value value value color 
+%%  3dColor  ← value value value color 
 %%
-%%  3dColorTexture  value value value color tex 
+%%  3dColorTexture  ← value value value color tex 
 %%
-%%  4dColorTexture  value value value value color tex 
+%%  4dColorTexture  ← value value value value color tex 
 %%
-%%  color  rgba | index 
+%%  color  ← rgba | index 
 %%
-%%  rgba  value value value value 
+%%  rgba  ← value value value value 
 %%
-%%  index  value 
+%%  index  ← value 
 %%
-%%  tex  value value value value 
+%%  tex  ← value value value value 
 %%
 %% `value' is a floating-point number, and `n' is a floating-point integer giving
 %% the number of vertices in the polygon. `?GL_POINT_TOKEN', `?GL_LINE_TOKEN', `?GL_LINE_RESET_TOKEN'
@@ -7886,13 +7888,13 @@ blendColor(Red,Green,Blue,Alpha) ->
 %% blend factors are denoted (s R s G s B s A) and (d R d G d B d A), respectively. For these equations all color components
 %% are understood to have values in the range  [0 1].  <table><tbody><tr><td>` Mode '</td><td>
 %% ` RGB Components '</td><td>` Alpha Component '</td></tr></tbody><tbody><tr><td>`?GL_FUNC_ADD'
-%% </td><td> Rr= R s  s R+R d  d R Gr= G s  s G+G d  d G Br= B s  s B+B d  d B</td><td> Ar=
-%% A s  s A+A d  d A</td></tr><tr><td>`?GL_FUNC_SUBTRACT'</td><td> Rr= R s  s R-R d  d
-%% R Gr= G s  s G-G d  d G Br= B s  s B-B d  d B</td><td> Ar= A s  s A-A d  d A</td></tr><tr>
-%% <td>`?GL_FUNC_REVERSE_SUBTRACT'</td><td> Rr= R d  d R-R s  s R Gr= G d  d G-G s  s G
-%% Br= B d  d B-B s  s B</td><td> Ar= A d  d A-A s  s A</td></tr><tr><td>`?GL_MIN'</td><td>
-%%  Rr= min(R s R d) Gr= min(G s G d) Br= min(B s B d)</td><td> Ar= min(A s A d)</td></tr><tr><td>`?GL_MAX'</td><td> Rr=
-%% max(R s R d) Gr= max(G s G d) Br= max(B s B d)</td><td> Ar= max(A s A d)</td></tr></tbody></table>
+%% </td><td> Rr=R s  s R+R d  d R Gr=G s  s G+G d  d G Br=B s  s B+B d  d B</td><td> Ar=A s 
+%% s A+A d  d A</td></tr><tr><td>`?GL_FUNC_SUBTRACT'</td><td> Rr=R s  s R-R d  d R Gr=G
+%% s  s G-G d  d G Br=B s  s B-B d  d B</td><td> Ar=A s  s A-A d  d A</td></tr><tr><td>`?GL_FUNC_REVERSE_SUBTRACT'
+%% </td><td> Rr=R d  d R-R s  s R Gr=G d  d G-G s  s G Br=B d  d B-B s  s B</td><td> Ar=A d 
+%% d A-A s  s A</td></tr><tr><td>`?GL_MIN'</td><td> Rr=min(R s R d) Gr=min(G s G d) Br=min(B s B d)</td><td> Ar=min
+%% (A s A d)</td></tr><tr><td>`?GL_MAX'</td><td> Rr=max(R s R d) Gr=max(G s G d) Br=max(B s B d)</td><td> Ar=max(A s A d)</td></tr></tbody>
+%% </table>
 %%
 %%  The results of these equations are clamped to the range  [0 1]. 
 %%
@@ -9062,7 +9064,7 @@ sampleCoverage(Value,Invert) ->
 %%
 %%  `ImageSize'  must be equal to: 
 %%
-%%  b s*|width b/w|*|height b/h|*|depth b/d|
+%%  b s×|width b/w|×|height b/h|×|depth b/d|
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompressedTexImage3D.xml">external</a> documentation.
 -spec compressedTexImage3D(Target, Level, Internalformat, Width, Height, Depth, Border, ImageSize, Data) -> ok when Target :: enum(),Level :: integer(),Internalformat :: enum(),Width :: integer(),Height :: integer(),Depth :: integer(),Border :: integer(),ImageSize :: integer(),Data :: offset()|mem().
@@ -9124,7 +9126,7 @@ compressedTexImage3D(Target,Level,Internalformat,Width,Height,Depth,Border,Image
 %%
 %%  `ImageSize'  must be equal to: 
 %%
-%%  b s*|width b/w|*|height b/h|
+%%  b s×|width b/w|×|height b/h|
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompressedTexImage2D.xml">external</a> documentation.
 -spec compressedTexImage2D(Target, Level, Internalformat, Width, Height, Border, ImageSize, Data) -> ok when Target :: enum(),Level :: integer(),Internalformat :: enum(),Width :: integer(),Height :: integer(),Border :: integer(),ImageSize :: integer(),Data :: offset()|mem().
@@ -9181,7 +9183,7 @@ compressedTexImage2D(Target,Level,Internalformat,Width,Height,Border,ImageSize,D
 %%
 %%  `ImageSize'  must be equal to: 
 %%
-%%  b s*|width b/w|
+%%  b s×|width b/w|
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompressedTexImage1D.xml">external</a> documentation.
 -spec compressedTexImage1D(Target, Level, Internalformat, Width, Border, ImageSize, Data) -> ok when Target :: enum(),Level :: integer(),Internalformat :: enum(),Width :: integer(),Border :: integer(),ImageSize :: integer(),Data :: offset()|mem().
@@ -9502,7 +9504,7 @@ multiTexCoord4sv(Target,{S,T,R,Q}) ->  multiTexCoord4s(Target,S,T,R,Q).
 %% and  `M'  points to an array of   16 single- or double-precision floating-point values
 %%   m={m[0] m[1] ... m[15]}, then the modelview transformation   M(v) does the following: 
 %%
-%%  M(v)=(m[0] m[1] m[2] m[3] m[4] m[5] m[6] m[7] m[8] m[9] m[10] m[11] m[12] m[13] m[14] m[15])*(v[0] v[1] v[2] v[3])
+%%  M(v)=(m[0] m[1] m[2] m[3] m[4] m[5] m[6] m[7] m[8] m[9] m[10] m[11] m[12] m[13] m[14] m[15])×(v[0] v[1] v[2] v[3])
 %%
 %%  Projection and texture transformations are similarly defined. 
 %%
@@ -9569,7 +9571,7 @@ multTransposeMatrixd({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
 %%  is referred to as (R c G c B c A c). They are understood to have integer values between 0 and (k R k G k B
 %% k A), where 
 %%
-%%  k c= 2(m c)-1
+%%  k c=2(m c)-1
 %%
 %%  and (m R m G m B m A) is the number of red, green, blue, and alpha bitplanes. 
 %%
@@ -9601,12 +9603,12 @@ multTransposeMatrixd({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
 %%
 %%  In the table, 
 %%
-%%  i= min(A s 1-(A d))
+%%  i=min(A s 1-(A d))
 %%
 %%  To determine the blended RGBA values of a pixel, the system uses the following equations:
 %% 
 %%
-%%  R d= min(k R R s  s R+R d  d R) G d= min(k G G s  s G+G d  d G) B d= min(k B B s  s B+B d  d B) A d= min(k A A s  s A+A d  d A)
+%%  R d=min(k R R s  s R+R d  d R) G d=min(k G G s  s G+G d  d G) B d=min(k B B s  s B+B d  d B) A d=min(k A A s  s A+A d  d A)
 %%
 %%  Despite the apparent precision of the above equations, blending arithmetic is not exactly
 %% specified, because blending operates with imprecise integer color values. However, a blend
@@ -9615,7 +9617,7 @@ multTransposeMatrixd({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
 %% ,  `DstRGB'  is `?GL_ONE_MINUS_SRC_ALPHA', and   A s is equal to   k A, the equations
 %% reduce to simple replacement: 
 %%
-%%  R d= R s G d= G s B d= B s A d= A s
+%%  R d=R s G d=G s B d=B s A d=A s
 %%
 %% 
 %%
@@ -9899,7 +9901,7 @@ secondaryColorPointer(Size,Type,Stride,Pointer) ->
 %% current modelview and projection matrices, nor by the viewport-to-window transform. The  
 %% z coordinate of the current raster position is updated in the following manner: 
 %%
-%%  z={n f(n+z*(f-n))  if  z&lt;= 0 if  z&gt;= 1(otherwise))
+%%  z={n f(n+z×(f-n))  if  z&lt;= 0 if  z&gt;= 1(otherwise))
 %%
 %%  where   n is `?GL_DEPTH_RANGE''s near value, and   f is `?GL_DEPTH_RANGE''s
 %% far value. See  {@link gl:depthRange/2} . 
@@ -10397,13 +10399,13 @@ getBufferParameteriv(Target,Pname) ->
 %% blend factors are denoted (s R s G s B s A) and (d R d G d B d A), respectively. For these equations all color components
 %% are understood to have values in the range  [0 1].  <table><tbody><tr><td>` Mode '</td><td>
 %% ` RGB Components '</td><td>` Alpha Component '</td></tr></tbody><tbody><tr><td>`?GL_FUNC_ADD'
-%% </td><td> Rr= R s  s R+R d  d R Gr= G s  s G+G d  d G Br= B s  s B+B d  d B</td><td> Ar=
-%% A s  s A+A d  d A</td></tr><tr><td>`?GL_FUNC_SUBTRACT'</td><td> Rr= R s  s R-R d  d
-%% R Gr= G s  s G-G d  d G Br= B s  s B-B d  d B</td><td> Ar= A s  s A-A d  d A</td></tr><tr>
-%% <td>`?GL_FUNC_REVERSE_SUBTRACT'</td><td> Rr= R d  d R-R s  s R Gr= G d  d G-G s  s G
-%% Br= B d  d B-B s  s B</td><td> Ar= A d  d A-A s  s A</td></tr><tr><td>`?GL_MIN'</td><td>
-%%  Rr= min(R s R d) Gr= min(G s G d) Br= min(B s B d)</td><td> Ar= min(A s A d)</td></tr><tr><td>`?GL_MAX'</td><td> Rr=
-%% max(R s R d) Gr= max(G s G d) Br= max(B s B d)</td><td> Ar= max(A s A d)</td></tr></tbody></table>
+%% </td><td> Rr=R s  s R+R d  d R Gr=G s  s G+G d  d G Br=B s  s B+B d  d B</td><td> Ar=A s 
+%% s A+A d  d A</td></tr><tr><td>`?GL_FUNC_SUBTRACT'</td><td> Rr=R s  s R-R d  d R Gr=G
+%% s  s G-G d  d G Br=B s  s B-B d  d B</td><td> Ar=A s  s A-A d  d A</td></tr><tr><td>`?GL_FUNC_REVERSE_SUBTRACT'
+%% </td><td> Rr=R d  d R-R s  s R Gr=G d  d G-G s  s G Br=B d  d B-B s  s B</td><td> Ar=A d 
+%% d A-A s  s A</td></tr><tr><td>`?GL_MIN'</td><td> Rr=min(R s R d) Gr=min(G s G d) Br=min(B s B d)</td><td> Ar=min
+%% (A s A d)</td></tr><tr><td>`?GL_MAX'</td><td> Rr=max(R s R d) Gr=max(G s G d) Br=max(B s B d)</td><td> Ar=max(A s A d)</td></tr></tbody>
+%% </table>
 %%
 %%  The results of these equations are clamped to the range  [0 1]. 
 %%
@@ -11626,11 +11628,11 @@ useProgram(Program) ->
 %%
 %% The commands ``gl:uniformMatrix{2|3|4|2x3|3x2|2x4|4x2|3x4|4x3}fv''  are used to modify
 %% a matrix or an array of matrices. The numbers in the command name are interpreted as the
-%% dimensionality of the matrix. The number `2' indicates a 2 � 2 matrix (i.e., 4 values),
-%% the number `3' indicates a 3 � 3 matrix (i.e., 9 values), and the number `4'
-%% indicates a 4 � 4 matrix (i.e., 16 values). Non-square matrix dimensionality is explicit,
+%% dimensionality of the matrix. The number `2' indicates a 2 × 2 matrix (i.e., 4 values),
+%% the number `3' indicates a 3 × 3 matrix (i.e., 9 values), and the number `4'
+%% indicates a 4 × 4 matrix (i.e., 16 values). Non-square matrix dimensionality is explicit,
 %% with the first number representing the number of columns and the second number representing
-%% the number of rows. For example,  `2x4' indicates a 2 � 4 matrix with 2 columns and
+%% the number of rows. For example,  `2x4' indicates a 2 × 4 matrix with 2 columns and
 %% 4 rows (i.e., 8 values). If  `Transpose'  is `?GL_FALSE', each matrix is assumed
 %% to be supplied in column major order. If  `Transpose'  is `?GL_TRUE', each matrix
 %% is assumed to be supplied in row major order. The  `Count'  argument indicates the
@@ -12753,7 +12755,7 @@ drawElementsInstanced(Mode,Count,Type,Indices,Primcount) ->
 %%
 %%  When a buffer object is attached to a buffer texture, the buffer object's data store
 %% is taken as the texture's texel array. The number of texels in the buffer texture's texel
-%% array is given by  buffer_size components� sizeof( base_type/)
+%% array is given by  buffer_size components×sizeof( base_type/)
 %%
 %%  where `buffer_size' is the size of the buffer object, in basic machine units and
 %% components and base type are the element count and base data type for elements, as specified
@@ -14576,14 +14578,14 @@ bindSampler(Unit,Sampler) ->
 %% to compute the texture value. The other four use mipmaps. 
 %%
 %%  A mipmap is an ordered set of arrays representing the same image at progressively lower
-%% resolutions. If the texture has dimensions   2 n*2 m, there are  max(n m)+1 mipmaps. The first
-%% mipmap is the original texture, with dimensions   2 n*2 m. Each subsequent mipmap has
-%% dimensions   2(k-1)*2(l-1), where   2 k*2 l are the dimensions of the previous mipmap, until either
-%%   k= 0 or   l= 0. At that point, subsequent mipmaps have dimension   1*2(l-1) or   2(k-1)*1 until
-%% the final mipmap, which has dimension   1*1. To define the mipmaps, call  {@link gl:texImage1D/8} 
+%% resolutions. If the texture has dimensions   2 n×2 m, there are  max(n m)+1 mipmaps. The first
+%% mipmap is the original texture, with dimensions   2 n×2 m. Each subsequent mipmap has
+%% dimensions   2(k-1)×2(l-1), where   2 k×2 l are the dimensions of the previous mipmap, until either
+%%   k=0 or   l=0. At that point, subsequent mipmaps have dimension   1×2(l-1) or   2(k-1)×1 until
+%% the final mipmap, which has dimension   1×1. To define the mipmaps, call  {@link gl:texImage1D/8} 
 %% ,  {@link gl:texImage2D/9} ,  {@link gl:texImage3D/10} ,  {@link gl:copyTexImage1D/7} , or  {@link gl:copyTexImage2D/8} 
 %%  with the `level' argument indicating the order of the mipmaps. Level 0 is the original
-%% texture; level   max(n m) is the final   1*1 mipmap. 
+%% texture; level   max(n m) is the final   1×1 mipmap. 
 %%
 %%  `Params'  supplies a function for minifying the texture as one of the following: 
 %%
@@ -14695,13 +14697,12 @@ bindSampler(Unit,Sampler) ->
 %% `?GL_TEXTURE_COMPARE_FUNC':  Specifies the comparison operator used when `?GL_TEXTURE_COMPARE_MODE'
 %%  is set to `?GL_COMPARE_REF_TO_TEXTURE'. Permissible values are: <table><tbody><tr><td>
 %% ` Texture Comparison Function '</td><td>` Computed result  '</td></tr></tbody><tbody>
-%% <tr><td>`?GL_LEQUAL'</td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&lt;=(D t) r&gt;(D t))</td></tr><tr><td>`?GL_GEQUAL'</td><td>
-%% result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&gt;=(D t) r&lt;(D t))</td></tr><tr><td>`?GL_LESS'</td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&lt;
-%% (D t) r&gt;=(D t))</td></tr><tr><td>`?GL_GREATER'
-%% </td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&gt;(D t) r&lt;=(D t))</td></tr><tr><td>`?GL_EQUAL'</td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp;
-%%  r=(D t) r&amp;ne;(D t))</td></tr><tr><td>`?GL_NOTEQUAL'
-%% </td><td> result={1.0 0.0 &amp;nbsp;&amp;nbsp; r&amp;ne;(D t) r=(D t))</td></tr><tr><td>`?GL_ALWAYS'</td><td> result= 1.0</td></tr><tr><td>
-%% `?GL_NEVER'</td><td> result= 0.0</td></tr></tbody></table> where  r is the current
+%% <tr><td>`?GL_LEQUAL'</td><td> result={1.0 0.0    r&lt;=(D t) r&gt;(D t))</td></tr><tr><td>`?GL_GEQUAL'</td><td>
+%% result={1.0 0.0    r&gt;=(D t) r&lt;(D t))</td></tr><tr><td>`?GL_LESS'</td><td> result={1.0 0.0    r&lt;(D t) r&gt;=(D t))</td></tr><tr><td>`?GL_GREATER'
+%% </td><td> result={1.0 0.0    r&gt;(D t) r&lt;=(D t))</td></tr><tr><td>`?GL_EQUAL'</td><td> result={1.0 0.0    r=(D t) r&amp;ne;
+%% (D t))</td></tr><tr><td>`?GL_NOTEQUAL'
+%% </td><td> result={1.0 0.0    r&amp;ne;(D t) r=(D t))</td></tr><tr><td>`?GL_ALWAYS'</td><td> result=1.0</td></tr><tr><td>
+%% `?GL_NEVER'</td><td> result=0.0</td></tr></tbody></table> where  r is the current
 %% interpolated texture coordinate, and   D t is the texture value sampled from the currently
 %% bound texture.  result is assigned to  R t. 
 %%
@@ -15774,11 +15775,11 @@ getProgramPipelineiv(Pipeline,Pname) ->
 %%
 %% The commands ``gl:programUniformMatrix{2|3|4|2x3|3x2|2x4|4x2|3x4|4x3}fv''  are used
 %% to modify a matrix or an array of matrices. The numbers in the command name are interpreted
-%% as the dimensionality of the matrix. The number `2' indicates a 2 � 2 matrix (i.e.,
-%% 4 values), the number `3' indicates a 3 � 3 matrix (i.e., 9 values), and the number `4'
-%%  indicates a 4 � 4 matrix (i.e., 16 values). Non-square matrix dimensionality is explicit,
+%% as the dimensionality of the matrix. The number `2' indicates a 2 × 2 matrix (i.e.,
+%% 4 values), the number `3' indicates a 3 × 3 matrix (i.e., 9 values), and the number `4'
+%%  indicates a 4 × 4 matrix (i.e., 16 values). Non-square matrix dimensionality is explicit,
 %% with the first number representing the number of columns and the second number representing
-%% the number of rows. For example,  `2x4' indicates a 2 � 4 matrix with 2 columns and
+%% the number of rows. For example,  `2x4' indicates a 2 × 4 matrix with 2 columns and
 %% 4 rows (i.e., 8 values). If  `Transpose'  is `?GL_FALSE', each matrix is assumed
 %% to be supplied in column major order. If  `Transpose'  is `?GL_TRUE', each matrix
 %% is assumed to be supplied in row major order. The  `Count'  argument indicates the
diff --git a/lib/wx/src/gen/glu.erl b/lib/wx/src/gen/glu.erl
index 2c82c9792f..dc64c3c3a7 100644
--- a/lib/wx/src/gen/glu.erl
+++ b/lib/wx/src/gen/glu.erl
@@ -1,7 +1,9 @@
+%% -*- coding: utf-8 -*-
+
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. 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
@@ -91,19 +93,19 @@ tesselate({Nx,Ny,Nz}, Vs) ->
 %% ). 
 %%
 %%  A series of mipmap levels from  `Base'  to  `Max'  is built by decimating   `Data' 
-%%  in half  until size   1*1 is reached. At each level, each texel in the halved mipmap
+%%  in half  until size   1×1 is reached. At each level, each texel in the halved mipmap
 %% level is an average of the corresponding two texels in the larger mipmap level.   {@link gl:texImage1D/8} 
 %%  is called to load these mipmap levels from  `Base'  to  `Max' . If  `Max'  is
 %% larger than the highest mipmap level for the texture of the specified size, then a GLU
 %% error code is returned (see  {@link glu:errorString/1} ) and nothing is loaded. 
 %%
 %%  For example, if  `Level'  is 2 and  `Width'  is 16, the following levels are possible:
-%%   16*1,   8*1,   4*1,  2*1,   1*1. These correspond to levels 2 through 6 respectively.
-%% If  `Base'  is 3 and  `Max'  is 5, then only mipmap levels   8*1,  4*1 and   2*1
+%%   16×1,   8×1,   4×1,  2×1,   1×1. These correspond to levels 2 through 6 respectively.
+%% If  `Base'  is 3 and  `Max'  is 5, then only mipmap levels   8×1,  4×1 and   2×1
 %% are loaded. However, if  `Max'  is 7, then an error is returned and nothing is loaded
 %% since  `Max'  is larger than the highest mipmap level which is, in  this case, 6. 
 %%
-%%  The highest mipmap level can be derived from the formula  log 2(width*2 level). 
+%%  The highest mipmap level can be derived from the formula  log 2(width×2 level). 
 %%
 %%  See the  {@link gl:texImage1D/8}  reference page for a description of the acceptable values
 %% for  `Type'  parameter. See the  {@link gl:drawPixels/5}   reference page for a description
@@ -134,13 +136,13 @@ build1DMipmapLevels(Target,InternalFormat,Width,Format,Type,Level,Base,Max,Data)
 %% can fit the requested texture. If not,  `Width'  is continually halved until it fits. 
 %%
 %%  Next, a series of mipmap levels is built by decimating a copy of  `Data'  in half
-%% until size   1*1 is reached. At each level, each texel in the halved mipmap level is an
+%% until size   1×1 is reached. At each level, each texel in the halved mipmap level is an
 %% average of the corresponding two texels in the larger mipmap level. 
 %%
 %%  {@link gl:texImage1D/8}  is called to load each of these mipmap levels. Level 0 is a copy
 %% of  `Data' .  The highest level is  (log 2)(width). For example, if  `Width'  is 64 and the implementation
-%% can store a texture of this size, the following mipmap levels are built:   64*1,   32*1,
-%%   16*1,   8*1,  4*1,   2*1, and   1*1. These correspond to  levels 0 through 6, respectively.
+%% can store a texture of this size, the following mipmap levels are built:   64×1,   32×1,
+%%   16×1,   8×1,  4×1,   2×1, and   1×1. These correspond to  levels 0 through 6, respectively.
 %% 
 %%
 %%  See the  {@link gl:texImage1D/8}  reference page for a description of the acceptable values
@@ -163,22 +165,22 @@ build1DMipmaps(Target,InternalFormat,Width,Format,Type,Data) ->
 %% ). 
 %%
 %%  A series of mipmap levels from  `Base'  to  `Max'  is built by decimating   `Data' 
-%%  in half along both dimensions until size   1*1 is reached. At each level, each texel
+%%  in half along both dimensions until size   1×1 is reached. At each level, each texel
 %% in the halved mipmap level is an average of the corresponding four texels in the larger
 %% mipmap level. (In the case of rectangular images, the decimation will ultimately  reach
-%% an   N*1 or   1*N configuration. Here, two texels are averaged instead.)  {@link gl:texImage2D/9} 
+%% an   N×1 or   1×N configuration. Here, two texels are averaged instead.)  {@link gl:texImage2D/9} 
 %%  is called to load these mipmap levels from  `Base'  to  `Max' . If  `Max'  is
 %% larger than the highest mipmap level for the texture of the specified size, then a GLU
 %% error code is returned (see  {@link glu:errorString/1} ) and nothing is loaded. 
 %%
 %%  For example, if  `Level'  is 2 and  `Width'  is 16 and  `Height'  is 8, the
-%% following levels are possible:   16*8,   8*4,   4*2,  2*1,   1*1. These correspond to
+%% following levels are possible:   16×8,   8×4,   4×2,  2×1,   1×1. These correspond to
 %% levels 2 through 6 respectively. If  `Base'  is 3 and  `Max'  is 5, then only mipmap
-%% levels  8*4,   4*2, and   2*1 are loaded. However, if  `Max'  is 7, then an error is
+%% levels  8×4,   4×2, and   2×1 are loaded. However, if  `Max'  is 7, then an error is
 %% returned and nothing is loaded since  `Max'  is larger than the highest mipmap level
 %% which is, in this case, 6. 
 %%
-%%  The highest mipmap level can be derived from the formula  log 2(max(width height)*2 level). 
+%%  The highest mipmap level can be derived from the formula  log 2(max(width height)×2 level). 
 %%
 %%  See the  {@link gl:texImage1D/8}  reference page for a description of the acceptable values
 %% for  `Format'  parameter. See the  {@link gl:drawPixels/5}   reference page for a description
@@ -214,15 +216,15 @@ build2DMipmapLevels(Target,InternalFormat,Width,Height,Format,Type,Level,Base,Ma
 %% .) 
 %%
 %%  Next, a series of mipmap levels is built by decimating a copy of  `Data'  in half
-%% along both dimensions until size   1*1 is reached. At each level, each texel in the halved
+%% along both dimensions until size   1×1 is reached. At each level, each texel in the halved
 %% mipmap level is an average of the corresponding four texels in the larger mipmap level.
-%% (In the case of rectangular images, the decimation will ultimately reach an   N*1 or  1*N
+%% (In the case of rectangular images, the decimation will ultimately reach an   N×1 or  1×N
 %% configuration. Here, two texels are averaged instead.) 
 %%
 %%  {@link gl:texImage2D/9}  is called to load each of these mipmap levels. Level 0 is a copy
 %% of  `Data' . The highest level is (log 2)(max(width height)). For example, if  `Width'  is 64 and  `Height' 
 %%  is 16 and the implementation can store a texture of this size, the following mipmap levels
-%% are built:   64*16,   32*8,   16*4,  8*2,   4*1,   2*1, and   1*1 These correspond to
+%% are built:   64×16,   32×8,   16×4,  8×2,   4×1,   2×1, and   1×1 These correspond to
 %% levels 0 through 6, respectively. 
 %%
 %%  See the  {@link gl:texImage1D/8}  reference page for a description of the acceptable values
@@ -245,7 +247,7 @@ build2DMipmaps(Target,InternalFormat,Width,Height,Format,Type,Data) ->
 %% ). 
 %%
 %%  A series of mipmap levels from  `Base'  to  `Max'  is built by decimating  `Data' 
-%%  in half along both dimensions until size  1*1*1 is reached. At each level, each texel
+%%  in half along both dimensions until size  1×1×1 is reached. At each level, each texel
 %% in the halved mipmap level is an average of the corresponding eight texels in the larger
 %% mipmap level. (If exactly one of the dimensions is 1, four texels are averaged. If exactly
 %% two of the dimensions are 1, two texels are averaged.)  {@link gl:texImage3D/10}  is called
@@ -254,13 +256,13 @@ build2DMipmaps(Target,InternalFormat,Width,Height,Format,Type,Data) ->
 %% is returned (see  {@link glu:errorString/1} ) and nothing is loaded. 
 %%
 %%  For example, if  `Level'  is 2 and  `Width'  is 16,  `Height'  is 8 and  `Depth' 
-%%  is 4, the following levels are possible:   16*8*4,   8*4*2,  4*2*1,   2*1*1,  1*1*1.
+%%  is 4, the following levels are possible:   16×8×4,   8×4×2,  4×2×1,   2×1×1,  1×1×1.
 %% These correspond to levels 2 through 6 respectively. If  `Base'  is 3 and  `Max' 
-%% is 5, then only mipmap levels   8*4*2,  4*2*1, and   2*1*1 are loaded. However, if  `Max' 
+%% is 5, then only mipmap levels   8×4×2,  4×2×1, and   2×1×1 are loaded. However, if  `Max' 
 %%  is 7, then an error is returned and nothing is loaded, since  `Max'  is larger than
 %% the highest mipmap level which is, in this case, 6. 
 %%
-%%  The highest mipmap level can be derived from the formula  log 2(max(width height depth)*2 level). 
+%%  The highest mipmap level can be derived from the formula  log 2(max(width height depth)×2 level). 
 %%
 %%  See the  {@link gl:texImage1D/8}  reference page for a description of the acceptable values
 %% for  `Format'  parameter. See the  {@link gl:drawPixels/5}   reference page for a description
@@ -295,7 +297,7 @@ build3DMipmapLevels(Target,InternalFormat,Width,Height,Depth,Format,Type,Level,B
 %% it fits.  
 %%
 %%  Next, a series of mipmap levels is built by decimating a copy of  `Data'  in half
-%% along all three dimensions until size   1*1*1 is reached. At each level, each texel in
+%% along all three dimensions until size   1×1×1 is reached. At each level, each texel in
 %% the halved mipmap level is an average of the corresponding eight texels in the larger
 %% mipmap level. (If exactly one of the dimensions is 1, four texels are averaged. If exactly
 %% two of the dimensions are 1, two texels are averaged.) 
@@ -303,8 +305,8 @@ build3DMipmapLevels(Target,InternalFormat,Width,Height,Depth,Format,Type,Level,B
 %%  {@link gl:texImage3D/10}  is called to load each of these mipmap levels. Level 0 is a copy
 %% of  `Data' . The highest level is (log 2)(max(width height depth)). For example, if  `Width'  is 64,  `Height' 
 %% is 16, and  `Depth'  is 32, and the implementation can store a texture of this size,
-%% the following mipmap levels are built:   64*16*32,  32*8*16,   16*4*8,  8*2*4,   4*1*2, 
-%% 2*1*1, and   1*1*1. These correspond to levels 0 through 6, respectively. 
+%% the following mipmap levels are built:   64×16×32,  32×8×16,   16×4×8,  8×2×4,   4×1×2, 
+%% 2×1×1, and   1×1×1. These correspond to levels 0 through 6, respectively. 
 %%
 %%  See the  {@link gl:texImage1D/8}  reference page for a description of the acceptable values
 %% for  `Format'  parameter. See the  {@link gl:drawPixels/5}   reference page for a description
@@ -334,7 +336,7 @@ checkExtension(ExtName,ExtString) ->
 %% @doc Draw a cylinder
 %%
 %% ``glu:cylinder'' draws a cylinder oriented along the `z' axis. The base of the
-%% cylinder is placed at `z' = 0 and the top at   z= height. Like a sphere, a cylinder
+%% cylinder is placed at `z' = 0 and the top at   z=height. Like a sphere, a cylinder
 %% is subdivided around the `z' axis into slices and along the  `z' axis into stacks.
 %% 
 %%
@@ -380,7 +382,7 @@ deleteQuadric(Quad) ->
 %% the -`z'  axis. 
 %%
 %%  If texturing has been turned on (with  {@link glu:quadricTexture/2} ),  texture coordinates
-%% are generated linearly such that where   r= outer, the value at (`r', 0, 0) is  (1,
+%% are generated linearly such that where   r=outer, the value at (`r', 0, 0) is  (1,
 %% 0.5), at (0, `r', 0) it is (0.5, 1), at (-`r', 0, 0)  it is (0, 0.5), and  at
 %% (0, -`r', 0) it is (0.5, 0). 
 %%
@@ -451,11 +453,11 @@ getString(Name) ->
 %%
 %%  Let `UP' be the vector  (upX upY upZ).  
 %%
-%%  Then normalize as follows:   f= F/(||F||)
+%%  Then normalize as follows:   f=F/(||F||)
 %%
-%%  UP"= UP/(||UP||)
+%%  UP"=UP/(||UP||)
 %%
-%%  Finally, let   s= f*UP", and   u= s*f. 
+%%  Finally, let   s=f×UP", and   u=s×f. 
 %%
 %%  M is then constructed as follows:  M=(s[0] s[1] s[2] 0 u[0] u[1] u[2] 0-f[0]-f[1]-f[2] 0 0 0 0 1)
 %%
@@ -481,7 +483,7 @@ newQuadric() ->
 %% @doc Define a 2D orthographic projection matrix
 %%
 %% ``glu:ortho2D'' sets up a two-dimensional orthographic viewing region.  This is equivalent
-%% to calling  {@link gl:ortho/6}  with   near= -1 and   far= 1. 
+%% to calling  {@link gl:ortho/6}  with   near=-1 and   far=1. 
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluOrtho2D.xml">external</a> documentation.
 -spec ortho2D(Left, Right, Bottom, Top) -> ok when Left :: float(),Right :: float(),Bottom :: float(),Top :: float().
@@ -490,7 +492,7 @@ ortho2D(Left,Right,Bottom,Top) ->
 
 %% @doc Draw an arc of a disk
 %%
-%% ``glu:partialDisk'' renders a partial disk on the   z= 0 plane. A partial disk is  similar
+%% ``glu:partialDisk'' renders a partial disk on the   z=0 plane. A partial disk is  similar
 %% to a full disk, except that only the subset of the disk from  `Start'  through  `Start' 
 %%  +  `Sweep'  is included (where 0 degrees is along the  +f2yf axis, 90 degrees along
 %% the +`x' axis, 180 degrees along the -`y' axis, and  270 degrees along the -`x'
@@ -508,7 +510,7 @@ ortho2D(Left,Right,Bottom,Top) ->
 %% Otherwise, they point along the -`z'  axis. 
 %%
 %%  If texturing is turned on (with  {@link glu:quadricTexture/2} ), texture coordinates are
-%% generated linearly such that where   r= outer, the value at (`r', 0, 0) is  (1.0,
+%% generated linearly such that where   r=outer, the value at (`r', 0, 0) is  (1.0,
 %% 0.5), at (0, `r', 0) it is (0.5, 1.0), at (-`r', 0, 0)  it is (0.0, 0.5), and
 %%  at (0, -`r', 0) it is (0.5, 0.0). 
 %%
@@ -521,7 +523,7 @@ partialDisk(Quad,Inner,Outer,Slices,Loops,Start,Sweep) ->
 %%
 %% ``glu:perspective'' specifies a viewing frustum into the world coordinate system. In
 %% general, the aspect ratio in ``glu:perspective'' should match the aspect ratio of the
-%% associated viewport. For example,   aspect= 2.0 means  the viewer's angle of view is twice
+%% associated viewport. For example,   aspect=2.0 means  the viewer's angle of view is twice
 %% as wide in `x' as it is in `y'. If the viewport is twice as wide as it is tall,
 %% it displays the image without distortion. 
 %%
@@ -532,9 +534,9 @@ partialDisk(Quad,Inner,Outer,Slices,Loops,Start,Sweep) ->
 %%
 %%  Given `f' defined as follows: 
 %%
-%%  f= cotangent(fovy/2) The generated matrix is 
+%%  f=cotangent(fovy/2) The generated matrix is 
 %%
-%% (f/aspect 0 0 0 0 f 0 0 0 0(zFar+zNear)/(zNear-zFar)(2*zFar*zNear)/(zNear-zFar) 0 0 -1 0)
+%% (f/aspect 0 0 0 0 f 0 0 0 0(zFar+zNear)/(zNear-zFar)(2×zFar×zNear)/(zNear-zFar) 0 0 -1 0)
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluPerspective.xml">external</a> documentation.
 -spec perspective(Fovy, Aspect, ZNear, ZFar) -> ok when Fovy :: float(),Aspect :: float(),ZNear :: float(),ZFar :: float().
@@ -577,16 +579,16 @@ pickMatrix(X,Y,DelX,DelY,{V1,V2,V3,V4}) ->
 %%  To compute the coordinates, let   v=(objX objY objZ 1.0) represented as a matrix with 4 rows and 1 column.
 %% Then ``glu:project'' computes   v" as follows:  
 %%
-%%  v"= P*M*v
+%%  v"=P×M×v
 %%
 %%  where   P is the current projection matrix  `Proj'  and   M is the current modelview
-%% matrix  `Model'  (both represented as  4*4 matrices in column-major order). 
+%% matrix  `Model'  (both represented as  4×4 matrices in column-major order). 
 %%
 %%  The window coordinates are then computed as follows:  
 %%
-%%  winX= view(0)+view(2)*(v"(0)+1)/2
+%%  winX=view(0)+view(2)×(v"(0)+1)/2
 %%
-%%  winY= view(1)+view(3)*(v"(1)+1)/2
+%%  winY=view(1)+view(3)×(v"(1)+1)/2
 %%
 %%  winZ=(v"(2)+1)/2
 %%
@@ -703,7 +705,7 @@ scaleImage(Format,WIn,HIn,TypeIn,DataIn,WOut,HOut,TypeOut,DataOut) ->
 %% point toward the center of the sphere. 
 %%
 %%  If texturing is turned on (with  {@link glu:quadricTexture/2} ), then texture  coordinates
-%% are  generated so that `t' ranges from 0.0 at   z=-radius to 1.0 at   z= radius (`t'
+%% are  generated so that `t' ranges from 0.0 at   z=-radius to 1.0 at   z=radius (`t'
 %%  increases linearly along longitudinal lines), and `s' ranges from 0.0 at the +`y'
 %%  axis, to 0.25 at the  +`x' axis,  to 0.5 at the -`y' axis, to 0.75 at the -`x'
 %%  axis, and back to 1.0  at the +`y' axis. 
@@ -723,7 +725,7 @@ sphere(Quad,Radius,Slices,Stacks) ->
 %%  To compute the coordinates  (objX objY objZ), ``glu:unProject'' multiplies the normalized device coordinates
 %% by the inverse of  `Model'  *  `Proj'  as follows: 
 %%
-%% (objX objY objZ W)= INV(P  M) ((2(winX-view[0]))/(view[2])-1(2(winY-view[1]))/(view[3])-1 2(winZ)-1 1) INV denotes matrix inversion.  W is an unused variable, included for consistent
+%% (objX objY objZ W)=INV(P  M) ((2(winX-view[0]))/(view[2])-1(2(winY-view[1]))/(view[3])-1 2(winZ)-1 1) INV denotes matrix inversion.  W is an unused variable, included for consistent
 %% matrix notation. 
 %%
 %% See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluUnProject.xml">external</a> documentation.
diff --git a/lib/wx/src/gen/wxCalendarCtrl.erl b/lib/wx/src/gen/wxCalendarCtrl.erl
index 01d171800b..2a476c5e92 100644
--- a/lib/wx/src/gen/wxCalendarCtrl.erl
+++ b/lib/wx/src/gen/wxCalendarCtrl.erl
@@ -75,6 +75,8 @@
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
 -export_type([wxCalendarCtrl/0]).
+-deprecated([enableYearChange/1,enableYearChange/2]).
+
 %% @hidden
 parent_class(wxControl) -> true;
 parent_class(wxWindow) -> true;
diff --git a/lib/wx/src/gen/wxClientDC.erl b/lib/wx/src/gen/wxClientDC.erl
index 7dfebe4068..cb75fdc58d 100644
--- a/lib/wx/src/gen/wxClientDC.erl
+++ b/lib/wx/src/gen/wxClientDC.erl
@@ -54,6 +54,8 @@
   startPage/1]).
 
 -export_type([wxClientDC/0]).
+-deprecated([new/0]).
+
 %% @hidden
 parent_class(wxWindowDC) -> true;
 parent_class(wxDC) -> true;
diff --git a/lib/wx/src/gen/wxClipboard.erl b/lib/wx/src/gen/wxClipboard.erl
index 8f1d59f603..c7336fcc47 100644
--- a/lib/wx/src/gen/wxClipboard.erl
+++ b/lib/wx/src/gen/wxClipboard.erl
@@ -130,8 +130,9 @@ usePrimarySelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardissupported">external documentation</a>.
+%%<br /> Format = ?wxDF_INVALID | ?wxDF_TEXT | ?wxDF_BITMAP | ?wxDF_METAFILE | ?wxDF_SYLK | ?wxDF_DIF | ?wxDF_TIFF | ?wxDF_OEMTEXT | ?wxDF_DIB | ?wxDF_PALETTE | ?wxDF_PENDATA | ?wxDF_RIFF | ?wxDF_WAVE | ?wxDF_UNICODETEXT | ?wxDF_ENHMETAFILE | ?wxDF_FILENAME | ?wxDF_LOCALE | ?wxDF_PRIVATE | ?wxDF_HTML | ?wxDF_MAX
 -spec isSupported(This, Format) -> boolean() when
-	This::wxClipboard(), Format::integer().
+	This::wxClipboard(), Format::wx:wx_enum().
 isSupported(#wx_ref{type=ThisT,ref=ThisRef},Format)
  when is_integer(Format) ->
   ?CLASS(ThisT,wxClipboard),
diff --git a/lib/wx/src/gen/wxCursor.erl b/lib/wx/src/gen/wxCursor.erl
index b9e3a8e3f7..423e444f2f 100644
--- a/lib/wx/src/gen/wxCursor.erl
+++ b/lib/wx/src/gen/wxCursor.erl
@@ -35,6 +35,8 @@
   saveFile/4,setDepth/2,setHeight/2,setMask/2,setPalette/2,setWidth/2]).
 
 -export_type([wxCursor/0]).
+-deprecated([new/3,new/4]).
+
 %% @hidden
 parent_class(wxBitmap) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
diff --git a/lib/wx/src/gen/wxDC.erl b/lib/wx/src/gen/wxDC.erl
index 9f57978849..42d5d7b1df 100644
--- a/lib/wx/src/gen/wxDC.erl
+++ b/lib/wx/src/gen/wxDC.erl
@@ -50,6 +50,8 @@
 -export([parent_class/1]).
 
 -export_type([wxDC/0]).
+-deprecated([computeScaleAndOrigin/1]).
+
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
@@ -63,9 +65,10 @@ blit(This,DestPt={DestPtX,DestPtY},Sz={SzW,SzH},Source,SrcPt={SrcPtX,SrcPtY})
   blit(This,DestPt,Sz,Source,SrcPt, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcblit">external documentation</a>.
+%%<br /> Rop = integer
 -spec blit(This, DestPt, Sz, Source, SrcPt, [Option]) -> boolean() when
 	This::wxDC(), DestPt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}, Source::wxDC(), SrcPt::{X::integer(), Y::integer()},
-	Option :: {rop, integer()}
+	Option :: {rop, wx:wx_enum()}
 		 | {useMask, boolean()}
 		 | {srcPtMask, {X::integer(), Y::integer()}}.
 blit(#wx_ref{type=ThisT,ref=ThisRef},{DestPtX,DestPtY},{SzW,SzH},#wx_ref{type=SourceT,ref=SourceRef},{SrcPtX,SrcPtY}, Options)
@@ -310,11 +313,12 @@ drawPolygon(This,Points)
   drawPolygon(This,Points, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawpolygon">external documentation</a>.
+%%<br /> FillStyle = integer
 -spec drawPolygon(This, Points, [Option]) -> ok when
 	This::wxDC(), Points::[{X::integer(), Y::integer()}],
 	Option :: {xoffset, integer()}
 		 | {yoffset, integer()}
-		 | {fillStyle, integer()}.
+		 | {fillStyle, wx:wx_enum()}.
 drawPolygon(#wx_ref{type=ThisT,ref=ThisRef},Points, Options)
  when is_list(Points),is_list(Options) ->
   ?CLASS(ThisT,wxDC),
@@ -417,9 +421,10 @@ floodFill(This,Pt={PtX,PtY},Col)
   floodFill(This,Pt,Col, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcfloodfill">external documentation</a>.
+%%<br /> Style = integer
 -spec floodFill(This, Pt, Col, [Option]) -> boolean() when
 	This::wxDC(), Pt::{X::integer(), Y::integer()}, Col::wx:wx_colour(),
-	Option :: {style, integer()}.
+	Option :: {style, wx:wx_enum()}.
 floodFill(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},Col, Options)
  when is_integer(PtX),is_integer(PtY),tuple_size(Col) =:= 3; tuple_size(Col) =:= 4,is_list(Options) ->
   ?CLASS(ThisT,wxDC),
@@ -855,8 +860,9 @@ setLayoutDirection(#wx_ref{type=ThisT,ref=ThisRef},Dir)
   <<ThisRef:32/?UI,Dir:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetlogicalfunction">external documentation</a>.
+%%<br /> Function = integer
 -spec setLogicalFunction(This, Function) -> ok when
-	This::wxDC(), Function::integer().
+	This::wxDC(), Function::wx:wx_enum().
 setLogicalFunction(#wx_ref{type=ThisT,ref=ThisRef},Function)
  when is_integer(Function) ->
   ?CLASS(ThisT,wxDC),
@@ -864,8 +870,9 @@ setLogicalFunction(#wx_ref{type=ThisT,ref=ThisRef},Function)
   <<ThisRef:32/?UI,Function:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetmapmode">external documentation</a>.
+%%<br /> Mode = integer
 -spec setMapMode(This, Mode) -> ok when
-	This::wxDC(), Mode::integer().
+	This::wxDC(), Mode::wx:wx_enum().
 setMapMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
  when is_integer(Mode) ->
   ?CLASS(ThisT,wxDC),
diff --git a/lib/wx/src/gen/wxGraphicsContext.erl b/lib/wx/src/gen/wxGraphicsContext.erl
index 1dfa0dd405..575e48d7af 100644
--- a/lib/wx/src/gen/wxGraphicsContext.erl
+++ b/lib/wx/src/gen/wxGraphicsContext.erl
@@ -40,6 +40,8 @@
 -export([getRenderer/1,isNull/1,parent_class/1]).
 
 -export_type([wxGraphicsContext/0]).
+-deprecated([createLinearGradientBrush/7,createRadialGradientBrush/8]).
+
 %% @hidden
 parent_class(wxGraphicsObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
@@ -225,9 +227,10 @@ drawLines(This,Points)
   drawLines(This,Points, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawlines">external documentation</a>.
+%%<br /> FillStyle = integer
 -spec drawLines(This, Points, [Option]) -> ok when
 	This::wxGraphicsContext(), Points::[{X::float(), Y::float()}],
-	Option :: {fillStyle, integer()}.
+	Option :: {fillStyle, wx:wx_enum()}.
 drawLines(#wx_ref{type=ThisT,ref=ThisRef},Points, Options)
  when is_list(Points),is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -247,9 +250,10 @@ drawPath(This,Path)
   drawPath(This,Path, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawpath">external documentation</a>.
+%%<br /> FillStyle = integer
 -spec drawPath(This, Path, [Option]) -> ok when
 	This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath(),
-	Option :: {fillStyle, integer()}.
+	Option :: {fillStyle, wx:wx_enum()}.
 drawPath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsContext),
@@ -331,9 +335,10 @@ fillPath(This,Path)
   fillPath(This,Path, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextfillpath">external documentation</a>.
+%%<br /> FillStyle = integer
 -spec fillPath(This, Path, [Option]) -> ok when
 	This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath(),
-	Option :: {fillStyle, integer()}.
+	Option :: {fillStyle, wx:wx_enum()}.
 fillPath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsContext),
diff --git a/lib/wx/src/gen/wxGraphicsPath.erl b/lib/wx/src/gen/wxGraphicsPath.erl
index 56b853899a..246ea489ec 100644
--- a/lib/wx/src/gen/wxGraphicsPath.erl
+++ b/lib/wx/src/gen/wxGraphicsPath.erl
@@ -197,13 +197,14 @@ contains(This,C={CX,CY})
 %% <br /> Also:<br />
 %% contains(This, C, [Option]) -> boolean() when<br />
 %% 	This::wxGraphicsPath(), C::{X::float(), Y::float()},<br />
-%% 	Option :: {fillStyle, integer()}.<br />
+%% 	Option :: {fillStyle, wx:wx_enum()}.<br />
 %% 
+%%<br /> FillStyle = integer
 -spec contains(This, X, Y) -> boolean() when
 	This::wxGraphicsPath(), X::number(), Y::number();
       (This, C, [Option]) -> boolean() when
 	This::wxGraphicsPath(), C::{X::float(), Y::float()},
-	Option :: {fillStyle, integer()}.
+	Option :: {fillStyle, wx:wx_enum()}.
 
 contains(This,X,Y)
  when is_record(This, wx_ref),is_number(X),is_number(Y) ->
@@ -218,9 +219,10 @@ contains(#wx_ref{type=ThisT,ref=ThisRef},{CX,CY}, Options)
   <<ThisRef:32/?UI,0:32,CX:64/?F,CY:64/?F, BinOpt/binary>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathcontains">external documentation</a>.
+%%<br /> FillStyle = integer
 -spec contains(This, X, Y, [Option]) -> boolean() when
 	This::wxGraphicsPath(), X::number(), Y::number(),
-	Option :: {fillStyle, integer()}.
+	Option :: {fillStyle, wx:wx_enum()}.
 contains(#wx_ref{type=ThisT,ref=ThisRef},X,Y, Options)
  when is_number(X),is_number(Y),is_list(Options) ->
   ?CLASS(ThisT,wxGraphicsPath),
diff --git a/lib/wx/src/gen/wxGraphicsRenderer.erl b/lib/wx/src/gen/wxGraphicsRenderer.erl
index 21082bde23..2b64f86182 100644
--- a/lib/wx/src/gen/wxGraphicsRenderer.erl
+++ b/lib/wx/src/gen/wxGraphicsRenderer.erl
@@ -32,6 +32,8 @@
 -export([parent_class/1]).
 
 -export_type([wxGraphicsRenderer/0]).
+-deprecated([createLinearGradientBrush/7,createRadialGradientBrush/8]).
+
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
diff --git a/lib/wx/src/gen/wxGridCellEditor.erl b/lib/wx/src/gen/wxGridCellEditor.erl
index e84cdeb49a..4f86e307b5 100644
--- a/lib/wx/src/gen/wxGridCellEditor.erl
+++ b/lib/wx/src/gen/wxGridCellEditor.erl
@@ -31,6 +31,8 @@
 -export([parent_class/1]).
 
 -export_type([wxGridCellEditor/0]).
+-deprecated([endEdit/4,paintBackground/3]).
+
 %% @hidden
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
diff --git a/lib/wx/src/gen/wxIdleEvent.erl b/lib/wx/src/gen/wxIdleEvent.erl
index 4749026446..a19fdcc48e 100644
--- a/lib/wx/src/gen/wxIdleEvent.erl
+++ b/lib/wx/src/gen/wxIdleEvent.erl
@@ -38,6 +38,8 @@
   resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
 
 -export_type([wxIdleEvent/0]).
+-deprecated([canSend/1]).
+
 %% @hidden
 parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
diff --git a/lib/wx/src/gen/wxImage.erl b/lib/wx/src/gen/wxImage.erl
index c21b5d4789..0edaee2979 100644
--- a/lib/wx/src/gen/wxImage.erl
+++ b/lib/wx/src/gen/wxImage.erl
@@ -424,9 +424,10 @@ getImageCount(Name)
   getImageCount(Name, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetimagecount">external documentation</a>.
+%%<br /> Type = ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY
 -spec getImageCount(Name, [Option]) -> integer() when
 	Name::unicode:chardata(),
-	Option :: {type, integer()}.
+	Option :: {type, wx:wx_enum()}.
 getImageCount(Name, Options)
  when is_list(Name),is_list(Options) ->
   Name_UC = unicode:characters_to_binary([Name,0]),
@@ -687,9 +688,10 @@ rescale(This,Width,Height)
   rescale(This,Width,Height, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagerescale">external documentation</a>.
+%%<br /> Quality = integer
 -spec rescale(This, Width, Height, [Option]) -> wxImage() when
 	This::wxImage(), Width::integer(), Height::integer(),
-	Option :: {quality, integer()}.
+	Option :: {quality, wx:wx_enum()}.
 rescale(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
  when is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
@@ -819,9 +821,10 @@ scale(This,Width,Height)
   scale(This,Width,Height, []).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagescale">external documentation</a>.
+%%<br /> Quality = integer
 -spec scale(This, Width, Height, [Option]) -> wxImage() when
 	This::wxImage(), Width::integer(), Height::integer(),
-	Option :: {quality, integer()}.
+	Option :: {quality, wx:wx_enum()}.
 scale(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
  when is_integer(Width),is_integer(Height),is_list(Options) ->
   ?CLASS(ThisT,wxImage),
diff --git a/lib/wx/src/gen/wxMDIClientWindow.erl b/lib/wx/src/gen/wxMDIClientWindow.erl
index 344dcdbbaf..bfdba336f8 100644
--- a/lib/wx/src/gen/wxMDIClientWindow.erl
+++ b/lib/wx/src/gen/wxMDIClientWindow.erl
@@ -69,6 +69,8 @@
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
 -export_type([wxMDIClientWindow/0]).
+-deprecated([new/1,new/2]).
+
 %% @hidden
 parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
diff --git a/lib/wx/src/gen/wxMouseEvent.erl b/lib/wx/src/gen/wxMouseEvent.erl
index 97ea9e908f..29a4f13ba8 100644
--- a/lib/wx/src/gen/wxMouseEvent.erl
+++ b/lib/wx/src/gen/wxMouseEvent.erl
@@ -19,7 +19,7 @@
 
 %% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html">wxMouseEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
-%% <dd><em>left_down</em>, <em>left_up</em>, <em>middle_down</em>, <em>middle_up</em>, <em>right_down</em>, <em>right_up</em>, <em>motion</em>, <em>enter_window</em>, <em>leave_window</em>, <em>left_dclick</em>, <em>middle_dclick</em>, <em>right_dclick</em>, <em>mousewheel</em>, <em>nc_left_down</em>, <em>nc_left_up</em>, <em>nc_middle_down</em>, <em>nc_middle_up</em>, <em>nc_right_down</em>, <em>nc_right_up</em>, <em>nc_motion</em>, <em>nc_enter_window</em>, <em>nc_leave_window</em>, <em>nc_left_dclick</em>, <em>nc_middle_dclick</em>, <em>nc_right_dclick</em></dd></dl>
+%% <dd><em>left_down</em>, <em>left_up</em>, <em>middle_down</em>, <em>middle_up</em>, <em>right_down</em>, <em>right_up</em>, <em>motion</em>, <em>enter_window</em>, <em>leave_window</em>, <em>left_dclick</em>, <em>middle_dclick</em>, <em>right_dclick</em>, <em>mousewheel</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxMouse(). #wxMouse{}} event record type.
 %%
 %% <p>This class is derived (and can use functions) from:
diff --git a/lib/wx/src/gen/wxPageSetupDialogData.erl b/lib/wx/src/gen/wxPageSetupDialogData.erl
index 7c453a9872..4850e62925 100644
--- a/lib/wx/src/gen/wxPageSetupDialogData.erl
+++ b/lib/wx/src/gen/wxPageSetupDialogData.erl
@@ -194,7 +194,8 @@ getMinMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   <<ThisRef:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetpaperid">external documentation</a>.
--spec getPaperId(This) -> integer() when
+%%<br /> Res = ?wxPAPER_NONE | ?wxPAPER_LETTER | ?wxPAPER_LEGAL | ?wxPAPER_A4 | ?wxPAPER_CSHEET | ?wxPAPER_DSHEET | ?wxPAPER_ESHEET | ?wxPAPER_LETTERSMALL | ?wxPAPER_TABLOID | ?wxPAPER_LEDGER | ?wxPAPER_STATEMENT | ?wxPAPER_EXECUTIVE | ?wxPAPER_A3 | ?wxPAPER_A4SMALL | ?wxPAPER_A5 | ?wxPAPER_B4 | ?wxPAPER_B5 | ?wxPAPER_FOLIO | ?wxPAPER_QUARTO | ?wxPAPER_10X14 | ?wxPAPER_11X17 | ?wxPAPER_NOTE | ?wxPAPER_ENV_9 | ?wxPAPER_ENV_10 | ?wxPAPER_ENV_11 | ?wxPAPER_ENV_12 | ?wxPAPER_ENV_14 | ?wxPAPER_ENV_DL | ?wxPAPER_ENV_C5 | ?wxPAPER_ENV_C3 | ?wxPAPER_ENV_C4 | ?wxPAPER_ENV_C6 | ?wxPAPER_ENV_C65 | ?wxPAPER_ENV_B4 | ?wxPAPER_ENV_B5 | ?wxPAPER_ENV_B6 | ?wxPAPER_ENV_ITALY | ?wxPAPER_ENV_MONARCH | ?wxPAPER_ENV_PERSONAL | ?wxPAPER_FANFOLD_US | ?wxPAPER_FANFOLD_STD_GERMAN | ?wxPAPER_FANFOLD_LGL_GERMAN | ?wxPAPER_ISO_B4 | ?wxPAPER_JAPANESE_POSTCARD | ?wxPAPER_9X11 | ?wxPAPER_10X11 | ?wxPAPER_15X11 | ?wxPAPER_ENV_INVITE | ?wxPAPER_LETTER_EXTRA | ?wxPAPER_LEGAL_EXTRA | ?wxPAPER_TABLOID_EXTRA | ?wxPAPER_A4_EXTRA | ?wxPAPER_LETTER_TRANSVERSE | ?wxPAPER_A4_TRANSVERSE | ?wxPAPER_LETTER_EXTRA_TRANSVERSE | ?wxPAPER_A_PLUS | ?wxPAPER_B_PLUS | ?wxPAPER_LETTER_PLUS | ?wxPAPER_A4_PLUS | ?wxPAPER_A5_TRANSVERSE | ?wxPAPER_B5_TRANSVERSE | ?wxPAPER_A3_EXTRA | ?wxPAPER_A5_EXTRA | ?wxPAPER_B5_EXTRA | ?wxPAPER_A2 | ?wxPAPER_A3_TRANSVERSE | ?wxPAPER_A3_EXTRA_TRANSVERSE | ?wxPAPER_DBL_JAPANESE_POSTCARD | ?wxPAPER_A6 | ?wxPAPER_JENV_KAKU2 | ?wxPAPER_JENV_KAKU3 | ?wxPAPER_JENV_CHOU3 | ?wxPAPER_JENV_CHOU4 | ?wxPAPER_LETTER_ROTATED | ?wxPAPER_A3_ROTATED | ?wxPAPER_A4_ROTATED | ?wxPAPER_A5_ROTATED | ?wxPAPER_B4_JIS_ROTATED | ?wxPAPER_B5_JIS_ROTATED | ?wxPAPER_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_A6_ROTATED | ?wxPAPER_JENV_KAKU2_ROTATED | ?wxPAPER_JENV_KAKU3_ROTATED | ?wxPAPER_JENV_CHOU3_ROTATED | ?wxPAPER_JENV_CHOU4_ROTATED | ?wxPAPER_B6_JIS | ?wxPAPER_B6_JIS_ROTATED | ?wxPAPER_12X11 | ?wxPAPER_JENV_YOU4 | ?wxPAPER_JENV_YOU4_ROTATED | ?wxPAPER_P16K | ?wxPAPER_P32K | ?wxPAPER_P32KBIG | ?wxPAPER_PENV_1 | ?wxPAPER_PENV_2 | ?wxPAPER_PENV_3 | ?wxPAPER_PENV_4 | ?wxPAPER_PENV_5 | ?wxPAPER_PENV_6 | ?wxPAPER_PENV_7 | ?wxPAPER_PENV_8 | ?wxPAPER_PENV_9 | ?wxPAPER_PENV_10 | ?wxPAPER_P16K_ROTATED | ?wxPAPER_P32K_ROTATED | ?wxPAPER_P32KBIG_ROTATED | ?wxPAPER_PENV_1_ROTATED | ?wxPAPER_PENV_2_ROTATED | ?wxPAPER_PENV_3_ROTATED | ?wxPAPER_PENV_4_ROTATED | ?wxPAPER_PENV_5_ROTATED | ?wxPAPER_PENV_6_ROTATED | ?wxPAPER_PENV_7_ROTATED | ?wxPAPER_PENV_8_ROTATED | ?wxPAPER_PENV_9_ROTATED | ?wxPAPER_PENV_10_ROTATED
+-spec getPaperId(This) -> wx:wx_enum() when
 	This::wxPageSetupDialogData().
 getPaperId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
@@ -280,8 +281,9 @@ setMinMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetpaperid">external documentation</a>.
+%%<br /> Id = ?wxPAPER_NONE | ?wxPAPER_LETTER | ?wxPAPER_LEGAL | ?wxPAPER_A4 | ?wxPAPER_CSHEET | ?wxPAPER_DSHEET | ?wxPAPER_ESHEET | ?wxPAPER_LETTERSMALL | ?wxPAPER_TABLOID | ?wxPAPER_LEDGER | ?wxPAPER_STATEMENT | ?wxPAPER_EXECUTIVE | ?wxPAPER_A3 | ?wxPAPER_A4SMALL | ?wxPAPER_A5 | ?wxPAPER_B4 | ?wxPAPER_B5 | ?wxPAPER_FOLIO | ?wxPAPER_QUARTO | ?wxPAPER_10X14 | ?wxPAPER_11X17 | ?wxPAPER_NOTE | ?wxPAPER_ENV_9 | ?wxPAPER_ENV_10 | ?wxPAPER_ENV_11 | ?wxPAPER_ENV_12 | ?wxPAPER_ENV_14 | ?wxPAPER_ENV_DL | ?wxPAPER_ENV_C5 | ?wxPAPER_ENV_C3 | ?wxPAPER_ENV_C4 | ?wxPAPER_ENV_C6 | ?wxPAPER_ENV_C65 | ?wxPAPER_ENV_B4 | ?wxPAPER_ENV_B5 | ?wxPAPER_ENV_B6 | ?wxPAPER_ENV_ITALY | ?wxPAPER_ENV_MONARCH | ?wxPAPER_ENV_PERSONAL | ?wxPAPER_FANFOLD_US | ?wxPAPER_FANFOLD_STD_GERMAN | ?wxPAPER_FANFOLD_LGL_GERMAN | ?wxPAPER_ISO_B4 | ?wxPAPER_JAPANESE_POSTCARD | ?wxPAPER_9X11 | ?wxPAPER_10X11 | ?wxPAPER_15X11 | ?wxPAPER_ENV_INVITE | ?wxPAPER_LETTER_EXTRA | ?wxPAPER_LEGAL_EXTRA | ?wxPAPER_TABLOID_EXTRA | ?wxPAPER_A4_EXTRA | ?wxPAPER_LETTER_TRANSVERSE | ?wxPAPER_A4_TRANSVERSE | ?wxPAPER_LETTER_EXTRA_TRANSVERSE | ?wxPAPER_A_PLUS | ?wxPAPER_B_PLUS | ?wxPAPER_LETTER_PLUS | ?wxPAPER_A4_PLUS | ?wxPAPER_A5_TRANSVERSE | ?wxPAPER_B5_TRANSVERSE | ?wxPAPER_A3_EXTRA | ?wxPAPER_A5_EXTRA | ?wxPAPER_B5_EXTRA | ?wxPAPER_A2 | ?wxPAPER_A3_TRANSVERSE | ?wxPAPER_A3_EXTRA_TRANSVERSE | ?wxPAPER_DBL_JAPANESE_POSTCARD | ?wxPAPER_A6 | ?wxPAPER_JENV_KAKU2 | ?wxPAPER_JENV_KAKU3 | ?wxPAPER_JENV_CHOU3 | ?wxPAPER_JENV_CHOU4 | ?wxPAPER_LETTER_ROTATED | ?wxPAPER_A3_ROTATED | ?wxPAPER_A4_ROTATED | ?wxPAPER_A5_ROTATED | ?wxPAPER_B4_JIS_ROTATED | ?wxPAPER_B5_JIS_ROTATED | ?wxPAPER_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_A6_ROTATED | ?wxPAPER_JENV_KAKU2_ROTATED | ?wxPAPER_JENV_KAKU3_ROTATED | ?wxPAPER_JENV_CHOU3_ROTATED | ?wxPAPER_JENV_CHOU4_ROTATED | ?wxPAPER_B6_JIS | ?wxPAPER_B6_JIS_ROTATED | ?wxPAPER_12X11 | ?wxPAPER_JENV_YOU4 | ?wxPAPER_JENV_YOU4_ROTATED | ?wxPAPER_P16K | ?wxPAPER_P32K | ?wxPAPER_P32KBIG | ?wxPAPER_PENV_1 | ?wxPAPER_PENV_2 | ?wxPAPER_PENV_3 | ?wxPAPER_PENV_4 | ?wxPAPER_PENV_5 | ?wxPAPER_PENV_6 | ?wxPAPER_PENV_7 | ?wxPAPER_PENV_8 | ?wxPAPER_PENV_9 | ?wxPAPER_PENV_10 | ?wxPAPER_P16K_ROTATED | ?wxPAPER_P32K_ROTATED | ?wxPAPER_P32KBIG_ROTATED | ?wxPAPER_PENV_1_ROTATED | ?wxPAPER_PENV_2_ROTATED | ?wxPAPER_PENV_3_ROTATED | ?wxPAPER_PENV_4_ROTATED | ?wxPAPER_PENV_5_ROTATED | ?wxPAPER_PENV_6_ROTATED | ?wxPAPER_PENV_7_ROTATED | ?wxPAPER_PENV_8_ROTATED | ?wxPAPER_PENV_9_ROTATED | ?wxPAPER_PENV_10_ROTATED
 -spec setPaperId(This, Id) -> ok when
-	This::wxPageSetupDialogData(), Id::integer().
+	This::wxPageSetupDialogData(), Id::wx:wx_enum().
 setPaperId(#wx_ref{type=ThisT,ref=ThisRef},Id)
  when is_integer(Id) ->
   ?CLASS(ThisT,wxPageSetupDialogData),
@@ -293,8 +295,9 @@ setPaperId(#wx_ref{type=ThisT,ref=ThisRef},Id)
 %% setPaperSize(This, Sz) -> ok when<br />
 %% 	This::wxPageSetupDialogData(), Sz::{W::integer(), H::integer()}.<br />
 %% 
+%%<br /> Id = ?wxPAPER_NONE | ?wxPAPER_LETTER | ?wxPAPER_LEGAL | ?wxPAPER_A4 | ?wxPAPER_CSHEET | ?wxPAPER_DSHEET | ?wxPAPER_ESHEET | ?wxPAPER_LETTERSMALL | ?wxPAPER_TABLOID | ?wxPAPER_LEDGER | ?wxPAPER_STATEMENT | ?wxPAPER_EXECUTIVE | ?wxPAPER_A3 | ?wxPAPER_A4SMALL | ?wxPAPER_A5 | ?wxPAPER_B4 | ?wxPAPER_B5 | ?wxPAPER_FOLIO | ?wxPAPER_QUARTO | ?wxPAPER_10X14 | ?wxPAPER_11X17 | ?wxPAPER_NOTE | ?wxPAPER_ENV_9 | ?wxPAPER_ENV_10 | ?wxPAPER_ENV_11 | ?wxPAPER_ENV_12 | ?wxPAPER_ENV_14 | ?wxPAPER_ENV_DL | ?wxPAPER_ENV_C5 | ?wxPAPER_ENV_C3 | ?wxPAPER_ENV_C4 | ?wxPAPER_ENV_C6 | ?wxPAPER_ENV_C65 | ?wxPAPER_ENV_B4 | ?wxPAPER_ENV_B5 | ?wxPAPER_ENV_B6 | ?wxPAPER_ENV_ITALY | ?wxPAPER_ENV_MONARCH | ?wxPAPER_ENV_PERSONAL | ?wxPAPER_FANFOLD_US | ?wxPAPER_FANFOLD_STD_GERMAN | ?wxPAPER_FANFOLD_LGL_GERMAN | ?wxPAPER_ISO_B4 | ?wxPAPER_JAPANESE_POSTCARD | ?wxPAPER_9X11 | ?wxPAPER_10X11 | ?wxPAPER_15X11 | ?wxPAPER_ENV_INVITE | ?wxPAPER_LETTER_EXTRA | ?wxPAPER_LEGAL_EXTRA | ?wxPAPER_TABLOID_EXTRA | ?wxPAPER_A4_EXTRA | ?wxPAPER_LETTER_TRANSVERSE | ?wxPAPER_A4_TRANSVERSE | ?wxPAPER_LETTER_EXTRA_TRANSVERSE | ?wxPAPER_A_PLUS | ?wxPAPER_B_PLUS | ?wxPAPER_LETTER_PLUS | ?wxPAPER_A4_PLUS | ?wxPAPER_A5_TRANSVERSE | ?wxPAPER_B5_TRANSVERSE | ?wxPAPER_A3_EXTRA | ?wxPAPER_A5_EXTRA | ?wxPAPER_B5_EXTRA | ?wxPAPER_A2 | ?wxPAPER_A3_TRANSVERSE | ?wxPAPER_A3_EXTRA_TRANSVERSE | ?wxPAPER_DBL_JAPANESE_POSTCARD | ?wxPAPER_A6 | ?wxPAPER_JENV_KAKU2 | ?wxPAPER_JENV_KAKU3 | ?wxPAPER_JENV_CHOU3 | ?wxPAPER_JENV_CHOU4 | ?wxPAPER_LETTER_ROTATED | ?wxPAPER_A3_ROTATED | ?wxPAPER_A4_ROTATED | ?wxPAPER_A5_ROTATED | ?wxPAPER_B4_JIS_ROTATED | ?wxPAPER_B5_JIS_ROTATED | ?wxPAPER_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_A6_ROTATED | ?wxPAPER_JENV_KAKU2_ROTATED | ?wxPAPER_JENV_KAKU3_ROTATED | ?wxPAPER_JENV_CHOU3_ROTATED | ?wxPAPER_JENV_CHOU4_ROTATED | ?wxPAPER_B6_JIS | ?wxPAPER_B6_JIS_ROTATED | ?wxPAPER_12X11 | ?wxPAPER_JENV_YOU4 | ?wxPAPER_JENV_YOU4_ROTATED | ?wxPAPER_P16K | ?wxPAPER_P32K | ?wxPAPER_P32KBIG | ?wxPAPER_PENV_1 | ?wxPAPER_PENV_2 | ?wxPAPER_PENV_3 | ?wxPAPER_PENV_4 | ?wxPAPER_PENV_5 | ?wxPAPER_PENV_6 | ?wxPAPER_PENV_7 | ?wxPAPER_PENV_8 | ?wxPAPER_PENV_9 | ?wxPAPER_PENV_10 | ?wxPAPER_P16K_ROTATED | ?wxPAPER_P32K_ROTATED | ?wxPAPER_P32KBIG_ROTATED | ?wxPAPER_PENV_1_ROTATED | ?wxPAPER_PENV_2_ROTATED | ?wxPAPER_PENV_3_ROTATED | ?wxPAPER_PENV_4_ROTATED | ?wxPAPER_PENV_5_ROTATED | ?wxPAPER_PENV_6_ROTATED | ?wxPAPER_PENV_7_ROTATED | ?wxPAPER_PENV_8_ROTATED | ?wxPAPER_PENV_9_ROTATED | ?wxPAPER_PENV_10_ROTATED
 -spec setPaperSize(This, Id) -> ok when
-	This::wxPageSetupDialogData(), Id::integer();
+	This::wxPageSetupDialogData(), Id::wx:wx_enum();
       (This, Sz) -> ok when
 	This::wxPageSetupDialogData(), Sz::{W::integer(), H::integer()}.
 setPaperSize(#wx_ref{type=ThisT,ref=ThisRef},Id)
diff --git a/lib/wx/src/gen/wxPaintDC.erl b/lib/wx/src/gen/wxPaintDC.erl
index 9e81bc31af..6648f278bb 100644
--- a/lib/wx/src/gen/wxPaintDC.erl
+++ b/lib/wx/src/gen/wxPaintDC.erl
@@ -54,6 +54,8 @@
   startPage/1]).
 
 -export_type([wxPaintDC/0]).
+-deprecated([new/0]).
+
 %% @hidden
 parent_class(wxWindowDC) -> true;
 parent_class(wxDC) -> true;
diff --git a/lib/wx/src/gen/wxPaintEvent.erl b/lib/wx/src/gen/wxPaintEvent.erl
index a13db607a4..80ac7d78ce 100644
--- a/lib/wx/src/gen/wxPaintEvent.erl
+++ b/lib/wx/src/gen/wxPaintEvent.erl
@@ -19,7 +19,7 @@
 
 %% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpaintevent.html">wxPaintEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
-%% <dd><em>paint</em>, <em>paint_icon</em></dd></dl>
+%% <dd><em>paint</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxPaint(). #wxPaint{}} event record type.
 %%
 %% <p>This class is derived (and can use functions) from:
diff --git a/lib/wx/src/gen/wxPen.erl b/lib/wx/src/gen/wxPen.erl
index 8b8aafddba..681a7edebc 100644
--- a/lib/wx/src/gen/wxPen.erl
+++ b/lib/wx/src/gen/wxPen.erl
@@ -113,8 +113,9 @@ isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   <<ThisRef:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetcap">external documentation</a>.
+%%<br /> CapStyle = integer
 -spec setCap(This, CapStyle) -> ok when
-	This::wxPen(), CapStyle::integer().
+	This::wxPen(), CapStyle::wx:wx_enum().
 setCap(#wx_ref{type=ThisT,ref=ThisRef},CapStyle)
  when is_integer(CapStyle) ->
   ?CLASS(ThisT,wxPen),
@@ -140,8 +141,9 @@ setColour(#wx_ref{type=ThisT,ref=ThisRef},Red,Green,Blue)
   <<ThisRef:32/?UI,Red:32/?UI,Green:32/?UI,Blue:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetjoin">external documentation</a>.
+%%<br /> JoinStyle = integer
 -spec setJoin(This, JoinStyle) -> ok when
-	This::wxPen(), JoinStyle::integer().
+	This::wxPen(), JoinStyle::wx:wx_enum().
 setJoin(#wx_ref{type=ThisT,ref=ThisRef},JoinStyle)
  when is_integer(JoinStyle) ->
   ?CLASS(ThisT,wxPen),
diff --git a/lib/wx/src/gen/wxPostScriptDC.erl b/lib/wx/src/gen/wxPostScriptDC.erl
index 2eb25b6a8e..5329d4562e 100644
--- a/lib/wx/src/gen/wxPostScriptDC.erl
+++ b/lib/wx/src/gen/wxPostScriptDC.erl
@@ -53,6 +53,8 @@
   startPage/1]).
 
 -export_type([wxPostScriptDC/0]).
+-deprecated([getResolution/0,setResolution/1]).
+
 %% @hidden
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
diff --git a/lib/wx/src/gen/wxPrintData.erl b/lib/wx/src/gen/wxPrintData.erl
index 2cb8dd3c5f..79ba26afab 100644
--- a/lib/wx/src/gen/wxPrintData.erl
+++ b/lib/wx/src/gen/wxPrintData.erl
@@ -102,7 +102,8 @@ getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   <<ThisRef:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetpaperid">external documentation</a>.
--spec getPaperId(This) -> integer() when
+%%<br /> Res = ?wxPAPER_NONE | ?wxPAPER_LETTER | ?wxPAPER_LEGAL | ?wxPAPER_A4 | ?wxPAPER_CSHEET | ?wxPAPER_DSHEET | ?wxPAPER_ESHEET | ?wxPAPER_LETTERSMALL | ?wxPAPER_TABLOID | ?wxPAPER_LEDGER | ?wxPAPER_STATEMENT | ?wxPAPER_EXECUTIVE | ?wxPAPER_A3 | ?wxPAPER_A4SMALL | ?wxPAPER_A5 | ?wxPAPER_B4 | ?wxPAPER_B5 | ?wxPAPER_FOLIO | ?wxPAPER_QUARTO | ?wxPAPER_10X14 | ?wxPAPER_11X17 | ?wxPAPER_NOTE | ?wxPAPER_ENV_9 | ?wxPAPER_ENV_10 | ?wxPAPER_ENV_11 | ?wxPAPER_ENV_12 | ?wxPAPER_ENV_14 | ?wxPAPER_ENV_DL | ?wxPAPER_ENV_C5 | ?wxPAPER_ENV_C3 | ?wxPAPER_ENV_C4 | ?wxPAPER_ENV_C6 | ?wxPAPER_ENV_C65 | ?wxPAPER_ENV_B4 | ?wxPAPER_ENV_B5 | ?wxPAPER_ENV_B6 | ?wxPAPER_ENV_ITALY | ?wxPAPER_ENV_MONARCH | ?wxPAPER_ENV_PERSONAL | ?wxPAPER_FANFOLD_US | ?wxPAPER_FANFOLD_STD_GERMAN | ?wxPAPER_FANFOLD_LGL_GERMAN | ?wxPAPER_ISO_B4 | ?wxPAPER_JAPANESE_POSTCARD | ?wxPAPER_9X11 | ?wxPAPER_10X11 | ?wxPAPER_15X11 | ?wxPAPER_ENV_INVITE | ?wxPAPER_LETTER_EXTRA | ?wxPAPER_LEGAL_EXTRA | ?wxPAPER_TABLOID_EXTRA | ?wxPAPER_A4_EXTRA | ?wxPAPER_LETTER_TRANSVERSE | ?wxPAPER_A4_TRANSVERSE | ?wxPAPER_LETTER_EXTRA_TRANSVERSE | ?wxPAPER_A_PLUS | ?wxPAPER_B_PLUS | ?wxPAPER_LETTER_PLUS | ?wxPAPER_A4_PLUS | ?wxPAPER_A5_TRANSVERSE | ?wxPAPER_B5_TRANSVERSE | ?wxPAPER_A3_EXTRA | ?wxPAPER_A5_EXTRA | ?wxPAPER_B5_EXTRA | ?wxPAPER_A2 | ?wxPAPER_A3_TRANSVERSE | ?wxPAPER_A3_EXTRA_TRANSVERSE | ?wxPAPER_DBL_JAPANESE_POSTCARD | ?wxPAPER_A6 | ?wxPAPER_JENV_KAKU2 | ?wxPAPER_JENV_KAKU3 | ?wxPAPER_JENV_CHOU3 | ?wxPAPER_JENV_CHOU4 | ?wxPAPER_LETTER_ROTATED | ?wxPAPER_A3_ROTATED | ?wxPAPER_A4_ROTATED | ?wxPAPER_A5_ROTATED | ?wxPAPER_B4_JIS_ROTATED | ?wxPAPER_B5_JIS_ROTATED | ?wxPAPER_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_A6_ROTATED | ?wxPAPER_JENV_KAKU2_ROTATED | ?wxPAPER_JENV_KAKU3_ROTATED | ?wxPAPER_JENV_CHOU3_ROTATED | ?wxPAPER_JENV_CHOU4_ROTATED | ?wxPAPER_B6_JIS | ?wxPAPER_B6_JIS_ROTATED | ?wxPAPER_12X11 | ?wxPAPER_JENV_YOU4 | ?wxPAPER_JENV_YOU4_ROTATED | ?wxPAPER_P16K | ?wxPAPER_P32K | ?wxPAPER_P32KBIG | ?wxPAPER_PENV_1 | ?wxPAPER_PENV_2 | ?wxPAPER_PENV_3 | ?wxPAPER_PENV_4 | ?wxPAPER_PENV_5 | ?wxPAPER_PENV_6 | ?wxPAPER_PENV_7 | ?wxPAPER_PENV_8 | ?wxPAPER_PENV_9 | ?wxPAPER_PENV_10 | ?wxPAPER_P16K_ROTATED | ?wxPAPER_P32K_ROTATED | ?wxPAPER_P32KBIG_ROTATED | ?wxPAPER_PENV_1_ROTATED | ?wxPAPER_PENV_2_ROTATED | ?wxPAPER_PENV_3_ROTATED | ?wxPAPER_PENV_4_ROTATED | ?wxPAPER_PENV_5_ROTATED | ?wxPAPER_PENV_6_ROTATED | ?wxPAPER_PENV_7_ROTATED | ?wxPAPER_PENV_8_ROTATED | ?wxPAPER_PENV_9_ROTATED | ?wxPAPER_PENV_10_ROTATED
+-spec getPaperId(This) -> wx:wx_enum() when
 	This::wxPrintData().
 getPaperId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxPrintData),
@@ -190,8 +191,9 @@ setOrientation(#wx_ref{type=ThisT,ref=ThisRef},Orient)
   <<ThisRef:32/?UI,Orient:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetpaperid">external documentation</a>.
+%%<br /> SizeId = ?wxPAPER_NONE | ?wxPAPER_LETTER | ?wxPAPER_LEGAL | ?wxPAPER_A4 | ?wxPAPER_CSHEET | ?wxPAPER_DSHEET | ?wxPAPER_ESHEET | ?wxPAPER_LETTERSMALL | ?wxPAPER_TABLOID | ?wxPAPER_LEDGER | ?wxPAPER_STATEMENT | ?wxPAPER_EXECUTIVE | ?wxPAPER_A3 | ?wxPAPER_A4SMALL | ?wxPAPER_A5 | ?wxPAPER_B4 | ?wxPAPER_B5 | ?wxPAPER_FOLIO | ?wxPAPER_QUARTO | ?wxPAPER_10X14 | ?wxPAPER_11X17 | ?wxPAPER_NOTE | ?wxPAPER_ENV_9 | ?wxPAPER_ENV_10 | ?wxPAPER_ENV_11 | ?wxPAPER_ENV_12 | ?wxPAPER_ENV_14 | ?wxPAPER_ENV_DL | ?wxPAPER_ENV_C5 | ?wxPAPER_ENV_C3 | ?wxPAPER_ENV_C4 | ?wxPAPER_ENV_C6 | ?wxPAPER_ENV_C65 | ?wxPAPER_ENV_B4 | ?wxPAPER_ENV_B5 | ?wxPAPER_ENV_B6 | ?wxPAPER_ENV_ITALY | ?wxPAPER_ENV_MONARCH | ?wxPAPER_ENV_PERSONAL | ?wxPAPER_FANFOLD_US | ?wxPAPER_FANFOLD_STD_GERMAN | ?wxPAPER_FANFOLD_LGL_GERMAN | ?wxPAPER_ISO_B4 | ?wxPAPER_JAPANESE_POSTCARD | ?wxPAPER_9X11 | ?wxPAPER_10X11 | ?wxPAPER_15X11 | ?wxPAPER_ENV_INVITE | ?wxPAPER_LETTER_EXTRA | ?wxPAPER_LEGAL_EXTRA | ?wxPAPER_TABLOID_EXTRA | ?wxPAPER_A4_EXTRA | ?wxPAPER_LETTER_TRANSVERSE | ?wxPAPER_A4_TRANSVERSE | ?wxPAPER_LETTER_EXTRA_TRANSVERSE | ?wxPAPER_A_PLUS | ?wxPAPER_B_PLUS | ?wxPAPER_LETTER_PLUS | ?wxPAPER_A4_PLUS | ?wxPAPER_A5_TRANSVERSE | ?wxPAPER_B5_TRANSVERSE | ?wxPAPER_A3_EXTRA | ?wxPAPER_A5_EXTRA | ?wxPAPER_B5_EXTRA | ?wxPAPER_A2 | ?wxPAPER_A3_TRANSVERSE | ?wxPAPER_A3_EXTRA_TRANSVERSE | ?wxPAPER_DBL_JAPANESE_POSTCARD | ?wxPAPER_A6 | ?wxPAPER_JENV_KAKU2 | ?wxPAPER_JENV_KAKU3 | ?wxPAPER_JENV_CHOU3 | ?wxPAPER_JENV_CHOU4 | ?wxPAPER_LETTER_ROTATED | ?wxPAPER_A3_ROTATED | ?wxPAPER_A4_ROTATED | ?wxPAPER_A5_ROTATED | ?wxPAPER_B4_JIS_ROTATED | ?wxPAPER_B5_JIS_ROTATED | ?wxPAPER_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_A6_ROTATED | ?wxPAPER_JENV_KAKU2_ROTATED | ?wxPAPER_JENV_KAKU3_ROTATED | ?wxPAPER_JENV_CHOU3_ROTATED | ?wxPAPER_JENV_CHOU4_ROTATED | ?wxPAPER_B6_JIS | ?wxPAPER_B6_JIS_ROTATED | ?wxPAPER_12X11 | ?wxPAPER_JENV_YOU4 | ?wxPAPER_JENV_YOU4_ROTATED | ?wxPAPER_P16K | ?wxPAPER_P32K | ?wxPAPER_P32KBIG | ?wxPAPER_PENV_1 | ?wxPAPER_PENV_2 | ?wxPAPER_PENV_3 | ?wxPAPER_PENV_4 | ?wxPAPER_PENV_5 | ?wxPAPER_PENV_6 | ?wxPAPER_PENV_7 | ?wxPAPER_PENV_8 | ?wxPAPER_PENV_9 | ?wxPAPER_PENV_10 | ?wxPAPER_P16K_ROTATED | ?wxPAPER_P32K_ROTATED | ?wxPAPER_P32KBIG_ROTATED | ?wxPAPER_PENV_1_ROTATED | ?wxPAPER_PENV_2_ROTATED | ?wxPAPER_PENV_3_ROTATED | ?wxPAPER_PENV_4_ROTATED | ?wxPAPER_PENV_5_ROTATED | ?wxPAPER_PENV_6_ROTATED | ?wxPAPER_PENV_7_ROTATED | ?wxPAPER_PENV_8_ROTATED | ?wxPAPER_PENV_9_ROTATED | ?wxPAPER_PENV_10_ROTATED
 -spec setPaperId(This, SizeId) -> ok when
-	This::wxPrintData(), SizeId::integer().
+	This::wxPrintData(), SizeId::wx:wx_enum().
 setPaperId(#wx_ref{type=ThisT,ref=ThisRef},SizeId)
  when is_integer(SizeId) ->
   ?CLASS(ThisT,wxPrintData),
diff --git a/lib/wx/src/gen/wxPrintout.erl b/lib/wx/src/gen/wxPrintout.erl
index ab96a09c09..c75edd2b5a 100644
--- a/lib/wx/src/gen/wxPrintout.erl
+++ b/lib/wx/src/gen/wxPrintout.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. 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
@@ -61,7 +61,8 @@ new(Title, OnPrintPage) ->
 %%   <pre>OnBeginDocument(This,StartPage,EndPage) -> boolean()  </pre>
 %%   <pre>OnEndDocument(This) -> term()  </pre>
 %%   <pre>HasPage(This,Page)} -> boolean()   </pre>
-%%   <pre>GetPageInfo(This) -> {MinPage:.integer(), MaxPage::integer(), PageFrom::integer(), PageTo::integer()}  </pre>
+%%   <pre>GetPageInfo(This) -> {MinPage::integer(), MaxPage::integer(),
+%%                              PageFrom::integer(), PageTo::integer()}  </pre>
 %%  The <b>This</b> argument is the wxPrintout object reference to this object
 %%  <br /> NOTE: The callbacks may not call other processes. 
 new(Title, OnPrintPage, Opts) when is_list(Title), is_function(OnPrintPage), is_list(Opts) ->
diff --git a/lib/wx/src/gen/wxStyledTextCtrl.erl b/lib/wx/src/gen/wxStyledTextCtrl.erl
index f6dc2176b7..55ac410407 100644
--- a/lib/wx/src/gen/wxStyledTextCtrl.erl
+++ b/lib/wx/src/gen/wxStyledTextCtrl.erl
@@ -95,18 +95,18 @@
   redo/1,registerImage/3,replaceSelection/2,replaceTarget/2,saveFile/2,
   scrollToColumn/2,scrollToLine/2,searchAnchor/1,searchInTarget/2,searchNext/3,
   searchPrev/3,selectAll/1,selectionDuplicate/1,selectionIsRectangle/1,
-  sendMsg/2,sendMsg/3,setAnchor/2,setBackSpaceUnIndents/2,setBufferedDraw/2,
-  setCaretForeground/2,setCaretLineBackAlpha/2,setCaretLineBackground/2,
-  setCaretLineVisible/2,setCaretPeriod/2,setCaretSticky/2,setCaretWidth/2,
-  setCharsDefault/1,setCodePage/2,setControlCharSymbol/2,setCurrentPos/2,
-  setEOLMode/2,setEdgeColour/2,setEdgeColumn/2,setEdgeMode/2,setFoldExpanded/3,
-  setFoldFlags/2,setFoldLevel/3,setFoldMarginColour/3,setFoldMarginHiColour/3,
-  setHScrollBar/2,setHighlightGuide/2,setHotspotActiveBackground/3,
-  setHotspotActiveForeground/3,setHotspotActiveUnderline/2,setHotspotSingleLine/2,
-  setIndent/2,setIndentationGuides/2,setKeyWords/3,setLastKeydownProcessed/2,
-  setLayoutCache/2,setLexer/2,setLexerLanguage/2,setLineIndentation/3,
-  setLineState/3,setMarginLeft/2,setMarginMask/3,setMarginRight/2,setMarginSensitive/3,
-  setMarginType/3,setMarginWidth/3,setMargins/3,setModEventMask/2,setMouseDownCaptures/2,
+  setAnchor/2,setBackSpaceUnIndents/2,setBufferedDraw/2,setCaretForeground/2,
+  setCaretLineBackAlpha/2,setCaretLineBackground/2,setCaretLineVisible/2,
+  setCaretPeriod/2,setCaretSticky/2,setCaretWidth/2,setCharsDefault/1,
+  setCodePage/2,setControlCharSymbol/2,setCurrentPos/2,setEOLMode/2,
+  setEdgeColour/2,setEdgeColumn/2,setEdgeMode/2,setFoldExpanded/3,setFoldFlags/2,
+  setFoldLevel/3,setFoldMarginColour/3,setFoldMarginHiColour/3,setHScrollBar/2,
+  setHighlightGuide/2,setHotspotActiveBackground/3,setHotspotActiveForeground/3,
+  setHotspotActiveUnderline/2,setHotspotSingleLine/2,setIndent/2,setIndentationGuides/2,
+  setKeyWords/3,setLastKeydownProcessed/2,setLayoutCache/2,setLexer/2,
+  setLexerLanguage/2,setLineIndentation/3,setLineState/3,setMarginLeft/2,
+  setMarginMask/3,setMarginRight/2,setMarginSensitive/3,setMarginType/3,
+  setMarginWidth/3,setMargins/3,setModEventMask/2,setMouseDownCaptures/2,
   setMouseDwellTime/2,setPasteConvertEndings/2,setPrintColourMode/2,
   setPrintMagnification/2,setProperty/3,setReadOnly/2,setSTCCursor/2,
   setSTCFocus/2,setSavePoint/1,setScrollWidth/2,setSearchFlags/2,setSelAlpha/2,
@@ -3897,29 +3897,6 @@ scrollToColumn(#wx_ref{type=ThisT,ref=ThisRef},Column)
   wxe_util:cast(?wxStyledTextCtrl_ScrollToColumn,
   <<ThisRef:32/?UI,Column:32/?UI>>).
 
-%% @equiv sendMsg(This,Msg, [])
--spec sendMsg(This, Msg) -> integer() when
-	This::wxStyledTextCtrl(), Msg::integer().
-
-sendMsg(This,Msg)
- when is_record(This, wx_ref),is_integer(Msg) ->
-  sendMsg(This,Msg, []).
-
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsendmsg">external documentation</a>.
--spec sendMsg(This, Msg, [Option]) -> integer() when
-	This::wxStyledTextCtrl(), Msg::integer(),
-	Option :: {wp, integer()}
-		 | {lp, integer()}.
-sendMsg(#wx_ref{type=ThisT,ref=ThisRef},Msg, Options)
- when is_integer(Msg),is_list(Options) ->
-  ?CLASS(ThisT,wxStyledTextCtrl),
-  MOpts = fun({wp, Wp}, Acc) -> [<<1:32/?UI,Wp:32/?UI>>|Acc];
-          ({lp, Lp}, Acc) -> [<<2:32/?UI,Lp:32/?UI>>|Acc];
-          (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
-  BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
-  wxe_util:call(?wxStyledTextCtrl_SendMsg,
-  <<ThisRef:32/?UI,Msg:32/?UI, BinOpt/binary>>).
-
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetvscrollbar">external documentation</a>.
 -spec setVScrollBar(This, Bar) -> ok when
 	This::wxStyledTextCtrl(), Bar::wxScrollBar:wxScrollBar().
diff --git a/lib/wx/src/gen/wxSystemSettings.erl b/lib/wx/src/gen/wxSystemSettings.erl
index a3bae5c85f..630162afd2 100644
--- a/lib/wx/src/gen/wxSystemSettings.erl
+++ b/lib/wx/src/gen/wxSystemSettings.erl
@@ -35,7 +35,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSystemSettings() :: wx:wx_object().
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetcolour">external documentation</a>.
-%%<br /> Index = ?wxSYS_COLOUR_SCROLLBAR | ?wxSYS_COLOUR_BACKGROUND | ?wxSYS_COLOUR_DESKTOP | ?wxSYS_COLOUR_ACTIVECAPTION | ?wxSYS_COLOUR_INACTIVECAPTION | ?wxSYS_COLOUR_MENU | ?wxSYS_COLOUR_WINDOW | ?wxSYS_COLOUR_WINDOWFRAME | ?wxSYS_COLOUR_MENUTEXT | ?wxSYS_COLOUR_WINDOWTEXT | ?wxSYS_COLOUR_CAPTIONTEXT | ?wxSYS_COLOUR_ACTIVEBORDER | ?wxSYS_COLOUR_INACTIVEBORDER | ?wxSYS_COLOUR_APPWORKSPACE | ?wxSYS_COLOUR_HIGHLIGHT | ?wxSYS_COLOUR_HIGHLIGHTTEXT | ?wxSYS_COLOUR_BTNFACE | ?wxSYS_COLOUR_3DFACE | ?wxSYS_COLOUR_BTNSHADOW | ?wxSYS_COLOUR_3DSHADOW | ?wxSYS_COLOUR_GRAYTEXT | ?wxSYS_COLOUR_BTNTEXT | ?wxSYS_COLOUR_INACTIVECAPTIONTEXT | ?wxSYS_COLOUR_BTNHIGHLIGHT | ?wxSYS_COLOUR_BTNHILIGHT | ?wxSYS_COLOUR_3DHIGHLIGHT | ?wxSYS_COLOUR_3DHILIGHT | ?wxSYS_COLOUR_3DDKSHADOW | ?wxSYS_COLOUR_3DLIGHT | ?wxSYS_COLOUR_INFOTEXT | ?wxSYS_COLOUR_INFOBK | ?wxSYS_COLOUR_LISTBOX | ?wxSYS_COLOUR_HOTLIGHT | ?wxSYS_COLOUR_GRADIENTACTIVECAPTION | ?wxSYS_COLOUR_GRADIENTINACTIVECAPTION | ?wxSYS_COLOUR_MENUHILIGHT | ?wxSYS_COLOUR_MENUBAR | ?wxSYS_COLOUR_LISTBOXTEXT | ?wxSYS_COLOUR_MAX
+%%<br /> Index = ?wxSYS_COLOUR_SCROLLBAR | ?wxSYS_COLOUR_BACKGROUND | ?wxSYS_COLOUR_DESKTOP | ?wxSYS_COLOUR_ACTIVECAPTION | ?wxSYS_COLOUR_INACTIVECAPTION | ?wxSYS_COLOUR_MENU | ?wxSYS_COLOUR_WINDOW | ?wxSYS_COLOUR_WINDOWFRAME | ?wxSYS_COLOUR_MENUTEXT | ?wxSYS_COLOUR_WINDOWTEXT | ?wxSYS_COLOUR_CAPTIONTEXT | ?wxSYS_COLOUR_ACTIVEBORDER | ?wxSYS_COLOUR_INACTIVEBORDER | ?wxSYS_COLOUR_APPWORKSPACE | ?wxSYS_COLOUR_HIGHLIGHT | ?wxSYS_COLOUR_HIGHLIGHTTEXT | ?wxSYS_COLOUR_BTNFACE | ?wxSYS_COLOUR_3DFACE | ?wxSYS_COLOUR_BTNSHADOW | ?wxSYS_COLOUR_3DSHADOW | ?wxSYS_COLOUR_GRAYTEXT | ?wxSYS_COLOUR_BTNTEXT | ?wxSYS_COLOUR_INACTIVECAPTIONTEXT | ?wxSYS_COLOUR_BTNHIGHLIGHT | ?wxSYS_COLOUR_BTNHILIGHT | ?wxSYS_COLOUR_3DHIGHLIGHT | ?wxSYS_COLOUR_3DHILIGHT | ?wxSYS_COLOUR_3DDKSHADOW | ?wxSYS_COLOUR_3DLIGHT | ?wxSYS_COLOUR_INFOTEXT | ?wxSYS_COLOUR_INFOBK | ?wxSYS_COLOUR_LISTBOX | ?wxSYS_COLOUR_HOTLIGHT | ?wxSYS_COLOUR_GRADIENTACTIVECAPTION | ?wxSYS_COLOUR_GRADIENTINACTIVECAPTION | ?wxSYS_COLOUR_MENUHILIGHT | ?wxSYS_COLOUR_MENUBAR | ?wxSYS_COLOUR_LISTBOXTEXT | ?wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT | ?wxSYS_COLOUR_MAX
 -spec getColour(Index) -> wx:wx_colour4() when
 	Index::wx:wx_enum().
 getColour(Index)
diff --git a/lib/wx/src/gen/wxWindowDC.erl b/lib/wx/src/gen/wxWindowDC.erl
index babb3c0e90..4515f0e6b9 100644
--- a/lib/wx/src/gen/wxWindowDC.erl
+++ b/lib/wx/src/gen/wxWindowDC.erl
@@ -53,6 +53,8 @@
   startPage/1]).
 
 -export_type([wxWindowDC/0]).
+-deprecated([new/0]).
+
 %% @hidden
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
diff --git a/lib/wx/src/gen/wxe_debug.hrl b/lib/wx/src/gen/wxe_debug.hrl
index 297d99324a..6f4fa3fe34 100644
--- a/lib/wx/src/gen/wxe_debug.hrl
+++ b/lib/wx/src/gen/wxe_debug.hrl
@@ -3154,156 +3154,155 @@ wxdebug_table() ->
  {3370, {wxStyledTextCtrl, pointFromPosition, 1}},
  {3371, {wxStyledTextCtrl, scrollToLine, 1}},
  {3372, {wxStyledTextCtrl, scrollToColumn, 1}},
- {3373, {wxStyledTextCtrl, sendMsg, 2}},
- {3374, {wxStyledTextCtrl, setVScrollBar, 1}},
- {3375, {wxStyledTextCtrl, setHScrollBar, 1}},
- {3376, {wxStyledTextCtrl, getLastKeydownProcessed, 0}},
- {3377, {wxStyledTextCtrl, setLastKeydownProcessed, 1}},
- {3378, {wxStyledTextCtrl, saveFile, 1}},
- {3379, {wxStyledTextCtrl, loadFile, 1}},
- {3380, {wxStyledTextCtrl, doDragOver, 3}},
- {3381, {wxStyledTextCtrl, doDropText, 3}},
- {3382, {wxStyledTextCtrl, getUseAntiAliasing, 0}},
- {3383, {wxStyledTextCtrl, addTextRaw, 1}},
- {3384, {wxStyledTextCtrl, insertTextRaw, 2}},
- {3385, {wxStyledTextCtrl, getCurLineRaw, 1}},
- {3386, {wxStyledTextCtrl, getLineRaw, 1}},
- {3387, {wxStyledTextCtrl, getSelectedTextRaw, 0}},
- {3388, {wxStyledTextCtrl, getTextRangeRaw, 2}},
- {3389, {wxStyledTextCtrl, setTextRaw, 1}},
- {3390, {wxStyledTextCtrl, getTextRaw, 0}},
- {3391, {wxStyledTextCtrl, appendTextRaw, 1}},
- {3392, {wxArtProvider, getBitmap, 2}},
- {3393, {wxArtProvider, getIcon, 2}},
- {3394, {wxTreeEvent, getKeyCode, 0}},
- {3395, {wxTreeEvent, getItem, 0}},
- {3396, {wxTreeEvent, getKeyEvent, 0}},
- {3397, {wxTreeEvent, getLabel, 0}},
- {3398, {wxTreeEvent, getOldItem, 0}},
- {3399, {wxTreeEvent, getPoint, 0}},
- {3400, {wxTreeEvent, isEditCancelled, 0}},
- {3401, {wxTreeEvent, setToolTip, 1}},
- {3402, {wxNotebookEvent, getOldSelection, 0}},
- {3403, {wxNotebookEvent, getSelection, 0}},
- {3404, {wxNotebookEvent, setOldSelection, 1}},
- {3405, {wxNotebookEvent, setSelection, 1}},
- {3406, {wxFileDataObject, new, 0}},
- {3407, {wxFileDataObject, addFile, 1}},
- {3408, {wxFileDataObject, getFilenames, 0}},
- {3409, {wxFileDataObject, 'Destroy', undefined}},
- {3410, {wxTextDataObject, new, 1}},
- {3411, {wxTextDataObject, getTextLength, 0}},
- {3412, {wxTextDataObject, getText, 0}},
- {3413, {wxTextDataObject, setText, 1}},
- {3414, {wxTextDataObject, 'Destroy', undefined}},
- {3415, {wxBitmapDataObject, new_1_1, 1}},
- {3416, {wxBitmapDataObject, new_1_0, 1}},
- {3417, {wxBitmapDataObject, getBitmap, 0}},
- {3418, {wxBitmapDataObject, setBitmap, 1}},
- {3419, {wxBitmapDataObject, 'Destroy', undefined}},
- {3421, {wxClipboard, new, 0}},
- {3422, {wxClipboard, destruct, 0}},
- {3423, {wxClipboard, addData, 1}},
- {3424, {wxClipboard, clear, 0}},
- {3425, {wxClipboard, close, 0}},
- {3426, {wxClipboard, flush, 0}},
- {3427, {wxClipboard, getData, 1}},
- {3428, {wxClipboard, isOpened, 0}},
- {3429, {wxClipboard, open, 0}},
- {3430, {wxClipboard, setData, 1}},
- {3432, {wxClipboard, usePrimarySelection, 1}},
- {3433, {wxClipboard, isSupported, 1}},
- {3434, {wxClipboard, get, 0}},
- {3435, {wxSpinEvent, getPosition, 0}},
- {3436, {wxSpinEvent, setPosition, 1}},
- {3437, {wxSplitterWindow, new_0, 0}},
- {3438, {wxSplitterWindow, new_2, 2}},
- {3439, {wxSplitterWindow, destruct, 0}},
- {3440, {wxSplitterWindow, create, 2}},
- {3441, {wxSplitterWindow, getMinimumPaneSize, 0}},
- {3442, {wxSplitterWindow, getSashGravity, 0}},
- {3443, {wxSplitterWindow, getSashPosition, 0}},
- {3444, {wxSplitterWindow, getSplitMode, 0}},
- {3445, {wxSplitterWindow, getWindow1, 0}},
- {3446, {wxSplitterWindow, getWindow2, 0}},
- {3447, {wxSplitterWindow, initialize, 1}},
- {3448, {wxSplitterWindow, isSplit, 0}},
- {3449, {wxSplitterWindow, replaceWindow, 2}},
- {3450, {wxSplitterWindow, setSashGravity, 1}},
- {3451, {wxSplitterWindow, setSashPosition, 2}},
- {3452, {wxSplitterWindow, setSashSize, 1}},
- {3453, {wxSplitterWindow, setMinimumPaneSize, 1}},
- {3454, {wxSplitterWindow, setSplitMode, 1}},
- {3455, {wxSplitterWindow, splitHorizontally, 3}},
- {3456, {wxSplitterWindow, splitVertically, 3}},
- {3457, {wxSplitterWindow, unsplit, 1}},
- {3458, {wxSplitterWindow, updateSize, 0}},
- {3459, {wxSplitterEvent, getSashPosition, 0}},
- {3460, {wxSplitterEvent, getX, 0}},
- {3461, {wxSplitterEvent, getY, 0}},
- {3462, {wxSplitterEvent, getWindowBeingRemoved, 0}},
- {3463, {wxSplitterEvent, setSashPosition, 1}},
- {3464, {wxHtmlWindow, new_0, 0}},
- {3465, {wxHtmlWindow, new_2, 2}},
- {3466, {wxHtmlWindow, appendToPage, 1}},
- {3467, {wxHtmlWindow, getOpenedAnchor, 0}},
- {3468, {wxHtmlWindow, getOpenedPage, 0}},
- {3469, {wxHtmlWindow, getOpenedPageTitle, 0}},
- {3470, {wxHtmlWindow, getRelatedFrame, 0}},
- {3471, {wxHtmlWindow, historyBack, 0}},
- {3472, {wxHtmlWindow, historyCanBack, 0}},
- {3473, {wxHtmlWindow, historyCanForward, 0}},
- {3474, {wxHtmlWindow, historyClear, 0}},
- {3475, {wxHtmlWindow, historyForward, 0}},
- {3476, {wxHtmlWindow, loadFile, 1}},
- {3477, {wxHtmlWindow, loadPage, 1}},
- {3478, {wxHtmlWindow, selectAll, 0}},
- {3479, {wxHtmlWindow, selectionToText, 0}},
- {3480, {wxHtmlWindow, selectLine, 1}},
- {3481, {wxHtmlWindow, selectWord, 1}},
- {3482, {wxHtmlWindow, setBorders, 1}},
- {3483, {wxHtmlWindow, setFonts, 3}},
- {3484, {wxHtmlWindow, setPage, 1}},
- {3485, {wxHtmlWindow, setRelatedFrame, 2}},
- {3486, {wxHtmlWindow, setRelatedStatusBar, 1}},
- {3487, {wxHtmlWindow, toText, 0}},
- {3488, {wxHtmlWindow, 'Destroy', undefined}},
- {3489, {wxHtmlLinkEvent, getLinkInfo, 0}},
- {3490, {wxSystemSettings, getColour, 1}},
- {3491, {wxSystemSettings, getFont, 1}},
- {3492, {wxSystemSettings, getMetric, 2}},
- {3493, {wxSystemSettings, getScreenType, 0}},
- {3494, {wxSystemOptions, getOption, 1}},
- {3495, {wxSystemOptions, getOptionInt, 1}},
- {3496, {wxSystemOptions, hasOption, 1}},
- {3497, {wxSystemOptions, isFalse, 1}},
- {3498, {wxSystemOptions, setOption_2_1, 2}},
- {3499, {wxSystemOptions, setOption_2_0, 2}},
- {3500, {wxAuiNotebookEvent, setSelection, 1}},
- {3501, {wxAuiNotebookEvent, getSelection, 0}},
- {3502, {wxAuiNotebookEvent, setOldSelection, 1}},
- {3503, {wxAuiNotebookEvent, getOldSelection, 0}},
- {3504, {wxAuiNotebookEvent, setDragSource, 1}},
- {3505, {wxAuiNotebookEvent, getDragSource, 0}},
- {3506, {wxAuiManagerEvent, setManager, 1}},
- {3507, {wxAuiManagerEvent, getManager, 0}},
- {3508, {wxAuiManagerEvent, setPane, 1}},
- {3509, {wxAuiManagerEvent, getPane, 0}},
- {3510, {wxAuiManagerEvent, setButton, 1}},
- {3511, {wxAuiManagerEvent, getButton, 0}},
- {3512, {wxAuiManagerEvent, setDC, 1}},
- {3513, {wxAuiManagerEvent, getDC, 0}},
- {3514, {wxAuiManagerEvent, veto, 1}},
- {3515, {wxAuiManagerEvent, getVeto, 0}},
- {3516, {wxAuiManagerEvent, setCanVeto, 1}},
- {3517, {wxAuiManagerEvent, canVeto, 0}},
- {3518, {wxLogNull, new, 0}},
- {3519, {wxLogNull, 'Destroy', undefined}},
- {3520, {wxTaskBarIcon, new, 0}},
- {3521, {wxTaskBarIcon, destruct, 0}},
- {3522, {wxTaskBarIcon, popupMenu, 1}},
- {3523, {wxTaskBarIcon, removeIcon, 0}},
- {3524, {wxTaskBarIcon, setIcon, 2}},
+ {3373, {wxStyledTextCtrl, setVScrollBar, 1}},
+ {3374, {wxStyledTextCtrl, setHScrollBar, 1}},
+ {3375, {wxStyledTextCtrl, getLastKeydownProcessed, 0}},
+ {3376, {wxStyledTextCtrl, setLastKeydownProcessed, 1}},
+ {3377, {wxStyledTextCtrl, saveFile, 1}},
+ {3378, {wxStyledTextCtrl, loadFile, 1}},
+ {3379, {wxStyledTextCtrl, doDragOver, 3}},
+ {3380, {wxStyledTextCtrl, doDropText, 3}},
+ {3381, {wxStyledTextCtrl, getUseAntiAliasing, 0}},
+ {3382, {wxStyledTextCtrl, addTextRaw, 1}},
+ {3383, {wxStyledTextCtrl, insertTextRaw, 2}},
+ {3384, {wxStyledTextCtrl, getCurLineRaw, 1}},
+ {3385, {wxStyledTextCtrl, getLineRaw, 1}},
+ {3386, {wxStyledTextCtrl, getSelectedTextRaw, 0}},
+ {3387, {wxStyledTextCtrl, getTextRangeRaw, 2}},
+ {3388, {wxStyledTextCtrl, setTextRaw, 1}},
+ {3389, {wxStyledTextCtrl, getTextRaw, 0}},
+ {3390, {wxStyledTextCtrl, appendTextRaw, 1}},
+ {3391, {wxArtProvider, getBitmap, 2}},
+ {3392, {wxArtProvider, getIcon, 2}},
+ {3393, {wxTreeEvent, getKeyCode, 0}},
+ {3394, {wxTreeEvent, getItem, 0}},
+ {3395, {wxTreeEvent, getKeyEvent, 0}},
+ {3396, {wxTreeEvent, getLabel, 0}},
+ {3397, {wxTreeEvent, getOldItem, 0}},
+ {3398, {wxTreeEvent, getPoint, 0}},
+ {3399, {wxTreeEvent, isEditCancelled, 0}},
+ {3400, {wxTreeEvent, setToolTip, 1}},
+ {3401, {wxNotebookEvent, getOldSelection, 0}},
+ {3402, {wxNotebookEvent, getSelection, 0}},
+ {3403, {wxNotebookEvent, setOldSelection, 1}},
+ {3404, {wxNotebookEvent, setSelection, 1}},
+ {3405, {wxFileDataObject, new, 0}},
+ {3406, {wxFileDataObject, addFile, 1}},
+ {3407, {wxFileDataObject, getFilenames, 0}},
+ {3408, {wxFileDataObject, 'Destroy', undefined}},
+ {3409, {wxTextDataObject, new, 1}},
+ {3410, {wxTextDataObject, getTextLength, 0}},
+ {3411, {wxTextDataObject, getText, 0}},
+ {3412, {wxTextDataObject, setText, 1}},
+ {3413, {wxTextDataObject, 'Destroy', undefined}},
+ {3414, {wxBitmapDataObject, new_1_1, 1}},
+ {3415, {wxBitmapDataObject, new_1_0, 1}},
+ {3416, {wxBitmapDataObject, getBitmap, 0}},
+ {3417, {wxBitmapDataObject, setBitmap, 1}},
+ {3418, {wxBitmapDataObject, 'Destroy', undefined}},
+ {3420, {wxClipboard, new, 0}},
+ {3421, {wxClipboard, destruct, 0}},
+ {3422, {wxClipboard, addData, 1}},
+ {3423, {wxClipboard, clear, 0}},
+ {3424, {wxClipboard, close, 0}},
+ {3425, {wxClipboard, flush, 0}},
+ {3426, {wxClipboard, getData, 1}},
+ {3427, {wxClipboard, isOpened, 0}},
+ {3428, {wxClipboard, open, 0}},
+ {3429, {wxClipboard, setData, 1}},
+ {3431, {wxClipboard, usePrimarySelection, 1}},
+ {3432, {wxClipboard, isSupported, 1}},
+ {3433, {wxClipboard, get, 0}},
+ {3434, {wxSpinEvent, getPosition, 0}},
+ {3435, {wxSpinEvent, setPosition, 1}},
+ {3436, {wxSplitterWindow, new_0, 0}},
+ {3437, {wxSplitterWindow, new_2, 2}},
+ {3438, {wxSplitterWindow, destruct, 0}},
+ {3439, {wxSplitterWindow, create, 2}},
+ {3440, {wxSplitterWindow, getMinimumPaneSize, 0}},
+ {3441, {wxSplitterWindow, getSashGravity, 0}},
+ {3442, {wxSplitterWindow, getSashPosition, 0}},
+ {3443, {wxSplitterWindow, getSplitMode, 0}},
+ {3444, {wxSplitterWindow, getWindow1, 0}},
+ {3445, {wxSplitterWindow, getWindow2, 0}},
+ {3446, {wxSplitterWindow, initialize, 1}},
+ {3447, {wxSplitterWindow, isSplit, 0}},
+ {3448, {wxSplitterWindow, replaceWindow, 2}},
+ {3449, {wxSplitterWindow, setSashGravity, 1}},
+ {3450, {wxSplitterWindow, setSashPosition, 2}},
+ {3451, {wxSplitterWindow, setSashSize, 1}},
+ {3452, {wxSplitterWindow, setMinimumPaneSize, 1}},
+ {3453, {wxSplitterWindow, setSplitMode, 1}},
+ {3454, {wxSplitterWindow, splitHorizontally, 3}},
+ {3455, {wxSplitterWindow, splitVertically, 3}},
+ {3456, {wxSplitterWindow, unsplit, 1}},
+ {3457, {wxSplitterWindow, updateSize, 0}},
+ {3458, {wxSplitterEvent, getSashPosition, 0}},
+ {3459, {wxSplitterEvent, getX, 0}},
+ {3460, {wxSplitterEvent, getY, 0}},
+ {3461, {wxSplitterEvent, getWindowBeingRemoved, 0}},
+ {3462, {wxSplitterEvent, setSashPosition, 1}},
+ {3463, {wxHtmlWindow, new_0, 0}},
+ {3464, {wxHtmlWindow, new_2, 2}},
+ {3465, {wxHtmlWindow, appendToPage, 1}},
+ {3466, {wxHtmlWindow, getOpenedAnchor, 0}},
+ {3467, {wxHtmlWindow, getOpenedPage, 0}},
+ {3468, {wxHtmlWindow, getOpenedPageTitle, 0}},
+ {3469, {wxHtmlWindow, getRelatedFrame, 0}},
+ {3470, {wxHtmlWindow, historyBack, 0}},
+ {3471, {wxHtmlWindow, historyCanBack, 0}},
+ {3472, {wxHtmlWindow, historyCanForward, 0}},
+ {3473, {wxHtmlWindow, historyClear, 0}},
+ {3474, {wxHtmlWindow, historyForward, 0}},
+ {3475, {wxHtmlWindow, loadFile, 1}},
+ {3476, {wxHtmlWindow, loadPage, 1}},
+ {3477, {wxHtmlWindow, selectAll, 0}},
+ {3478, {wxHtmlWindow, selectionToText, 0}},
+ {3479, {wxHtmlWindow, selectLine, 1}},
+ {3480, {wxHtmlWindow, selectWord, 1}},
+ {3481, {wxHtmlWindow, setBorders, 1}},
+ {3482, {wxHtmlWindow, setFonts, 3}},
+ {3483, {wxHtmlWindow, setPage, 1}},
+ {3484, {wxHtmlWindow, setRelatedFrame, 2}},
+ {3485, {wxHtmlWindow, setRelatedStatusBar, 1}},
+ {3486, {wxHtmlWindow, toText, 0}},
+ {3487, {wxHtmlWindow, 'Destroy', undefined}},
+ {3488, {wxHtmlLinkEvent, getLinkInfo, 0}},
+ {3489, {wxSystemSettings, getColour, 1}},
+ {3490, {wxSystemSettings, getFont, 1}},
+ {3491, {wxSystemSettings, getMetric, 2}},
+ {3492, {wxSystemSettings, getScreenType, 0}},
+ {3493, {wxSystemOptions, getOption, 1}},
+ {3494, {wxSystemOptions, getOptionInt, 1}},
+ {3495, {wxSystemOptions, hasOption, 1}},
+ {3496, {wxSystemOptions, isFalse, 1}},
+ {3497, {wxSystemOptions, setOption_2_1, 2}},
+ {3498, {wxSystemOptions, setOption_2_0, 2}},
+ {3499, {wxAuiNotebookEvent, setSelection, 1}},
+ {3500, {wxAuiNotebookEvent, getSelection, 0}},
+ {3501, {wxAuiNotebookEvent, setOldSelection, 1}},
+ {3502, {wxAuiNotebookEvent, getOldSelection, 0}},
+ {3503, {wxAuiNotebookEvent, setDragSource, 1}},
+ {3504, {wxAuiNotebookEvent, getDragSource, 0}},
+ {3505, {wxAuiManagerEvent, setManager, 1}},
+ {3506, {wxAuiManagerEvent, getManager, 0}},
+ {3507, {wxAuiManagerEvent, setPane, 1}},
+ {3508, {wxAuiManagerEvent, getPane, 0}},
+ {3509, {wxAuiManagerEvent, setButton, 1}},
+ {3510, {wxAuiManagerEvent, getButton, 0}},
+ {3511, {wxAuiManagerEvent, setDC, 1}},
+ {3512, {wxAuiManagerEvent, getDC, 0}},
+ {3513, {wxAuiManagerEvent, veto, 1}},
+ {3514, {wxAuiManagerEvent, getVeto, 0}},
+ {3515, {wxAuiManagerEvent, setCanVeto, 1}},
+ {3516, {wxAuiManagerEvent, canVeto, 0}},
+ {3517, {wxLogNull, new, 0}},
+ {3518, {wxLogNull, 'Destroy', undefined}},
+ {3519, {wxTaskBarIcon, new, 0}},
+ {3520, {wxTaskBarIcon, destruct, 0}},
+ {3521, {wxTaskBarIcon, popupMenu, 1}},
+ {3522, {wxTaskBarIcon, removeIcon, 0}},
+ {3523, {wxTaskBarIcon, setIcon, 2}},
  {-1, {mod, func, -1}}
 ].
 
diff --git a/lib/wx/src/gen/wxe_funcs.hrl b/lib/wx/src/gen/wxe_funcs.hrl
index fe35cb1374..e6aced6e09 100644
--- a/lib/wx/src/gen/wxe_funcs.hrl
+++ b/lib/wx/src/gen/wxe_funcs.hrl
@@ -3151,153 +3151,152 @@
 -define(wxStyledTextCtrl_PointFromPosition, 3370).
 -define(wxStyledTextCtrl_ScrollToLine, 3371).
 -define(wxStyledTextCtrl_ScrollToColumn, 3372).
--define(wxStyledTextCtrl_SendMsg, 3373).
--define(wxStyledTextCtrl_SetVScrollBar, 3374).
--define(wxStyledTextCtrl_SetHScrollBar, 3375).
--define(wxStyledTextCtrl_GetLastKeydownProcessed, 3376).
--define(wxStyledTextCtrl_SetLastKeydownProcessed, 3377).
--define(wxStyledTextCtrl_SaveFile, 3378).
--define(wxStyledTextCtrl_LoadFile, 3379).
--define(wxStyledTextCtrl_DoDragOver, 3380).
--define(wxStyledTextCtrl_DoDropText, 3381).
--define(wxStyledTextCtrl_GetUseAntiAliasing, 3382).
--define(wxStyledTextCtrl_AddTextRaw, 3383).
--define(wxStyledTextCtrl_InsertTextRaw, 3384).
--define(wxStyledTextCtrl_GetCurLineRaw, 3385).
--define(wxStyledTextCtrl_GetLineRaw, 3386).
--define(wxStyledTextCtrl_GetSelectedTextRaw, 3387).
--define(wxStyledTextCtrl_GetTextRangeRaw, 3388).
--define(wxStyledTextCtrl_SetTextRaw, 3389).
--define(wxStyledTextCtrl_GetTextRaw, 3390).
--define(wxStyledTextCtrl_AppendTextRaw, 3391).
--define(wxArtProvider_GetBitmap, 3392).
--define(wxArtProvider_GetIcon, 3393).
--define(wxTreeEvent_GetKeyCode, 3394).
--define(wxTreeEvent_GetItem, 3395).
--define(wxTreeEvent_GetKeyEvent, 3396).
--define(wxTreeEvent_GetLabel, 3397).
--define(wxTreeEvent_GetOldItem, 3398).
--define(wxTreeEvent_GetPoint, 3399).
--define(wxTreeEvent_IsEditCancelled, 3400).
--define(wxTreeEvent_SetToolTip, 3401).
--define(wxNotebookEvent_GetOldSelection, 3402).
--define(wxNotebookEvent_GetSelection, 3403).
--define(wxNotebookEvent_SetOldSelection, 3404).
--define(wxNotebookEvent_SetSelection, 3405).
--define(wxFileDataObject_new, 3406).
--define(wxFileDataObject_AddFile, 3407).
--define(wxFileDataObject_GetFilenames, 3408).
--define(wxFileDataObject_destroy, 3409).
--define(wxTextDataObject_new, 3410).
--define(wxTextDataObject_GetTextLength, 3411).
--define(wxTextDataObject_GetText, 3412).
--define(wxTextDataObject_SetText, 3413).
--define(wxTextDataObject_destroy, 3414).
--define(wxBitmapDataObject_new_1_1, 3415).
--define(wxBitmapDataObject_new_1_0, 3416).
--define(wxBitmapDataObject_GetBitmap, 3417).
--define(wxBitmapDataObject_SetBitmap, 3418).
--define(wxBitmapDataObject_destroy, 3419).
--define(wxClipboard_new, 3421).
--define(wxClipboard_destruct, 3422).
--define(wxClipboard_AddData, 3423).
--define(wxClipboard_Clear, 3424).
--define(wxClipboard_Close, 3425).
--define(wxClipboard_Flush, 3426).
--define(wxClipboard_GetData, 3427).
--define(wxClipboard_IsOpened, 3428).
--define(wxClipboard_Open, 3429).
--define(wxClipboard_SetData, 3430).
--define(wxClipboard_UsePrimarySelection, 3432).
--define(wxClipboard_IsSupported, 3433).
--define(wxClipboard_Get, 3434).
--define(wxSpinEvent_GetPosition, 3435).
--define(wxSpinEvent_SetPosition, 3436).
--define(wxSplitterWindow_new_0, 3437).
--define(wxSplitterWindow_new_2, 3438).
--define(wxSplitterWindow_destruct, 3439).
--define(wxSplitterWindow_Create, 3440).
--define(wxSplitterWindow_GetMinimumPaneSize, 3441).
--define(wxSplitterWindow_GetSashGravity, 3442).
--define(wxSplitterWindow_GetSashPosition, 3443).
--define(wxSplitterWindow_GetSplitMode, 3444).
--define(wxSplitterWindow_GetWindow1, 3445).
--define(wxSplitterWindow_GetWindow2, 3446).
--define(wxSplitterWindow_Initialize, 3447).
--define(wxSplitterWindow_IsSplit, 3448).
--define(wxSplitterWindow_ReplaceWindow, 3449).
--define(wxSplitterWindow_SetSashGravity, 3450).
--define(wxSplitterWindow_SetSashPosition, 3451).
--define(wxSplitterWindow_SetSashSize, 3452).
--define(wxSplitterWindow_SetMinimumPaneSize, 3453).
--define(wxSplitterWindow_SetSplitMode, 3454).
--define(wxSplitterWindow_SplitHorizontally, 3455).
--define(wxSplitterWindow_SplitVertically, 3456).
--define(wxSplitterWindow_Unsplit, 3457).
--define(wxSplitterWindow_UpdateSize, 3458).
--define(wxSplitterEvent_GetSashPosition, 3459).
--define(wxSplitterEvent_GetX, 3460).
--define(wxSplitterEvent_GetY, 3461).
--define(wxSplitterEvent_GetWindowBeingRemoved, 3462).
--define(wxSplitterEvent_SetSashPosition, 3463).
--define(wxHtmlWindow_new_0, 3464).
--define(wxHtmlWindow_new_2, 3465).
--define(wxHtmlWindow_AppendToPage, 3466).
--define(wxHtmlWindow_GetOpenedAnchor, 3467).
--define(wxHtmlWindow_GetOpenedPage, 3468).
--define(wxHtmlWindow_GetOpenedPageTitle, 3469).
--define(wxHtmlWindow_GetRelatedFrame, 3470).
--define(wxHtmlWindow_HistoryBack, 3471).
--define(wxHtmlWindow_HistoryCanBack, 3472).
--define(wxHtmlWindow_HistoryCanForward, 3473).
--define(wxHtmlWindow_HistoryClear, 3474).
--define(wxHtmlWindow_HistoryForward, 3475).
--define(wxHtmlWindow_LoadFile, 3476).
--define(wxHtmlWindow_LoadPage, 3477).
--define(wxHtmlWindow_SelectAll, 3478).
--define(wxHtmlWindow_SelectionToText, 3479).
--define(wxHtmlWindow_SelectLine, 3480).
--define(wxHtmlWindow_SelectWord, 3481).
--define(wxHtmlWindow_SetBorders, 3482).
--define(wxHtmlWindow_SetFonts, 3483).
--define(wxHtmlWindow_SetPage, 3484).
--define(wxHtmlWindow_SetRelatedFrame, 3485).
--define(wxHtmlWindow_SetRelatedStatusBar, 3486).
--define(wxHtmlWindow_ToText, 3487).
--define(wxHtmlWindow_destroy, 3488).
--define(wxHtmlLinkEvent_GetLinkInfo, 3489).
--define(wxSystemSettings_GetColour, 3490).
--define(wxSystemSettings_GetFont, 3491).
--define(wxSystemSettings_GetMetric, 3492).
--define(wxSystemSettings_GetScreenType, 3493).
--define(wxSystemOptions_GetOption, 3494).
--define(wxSystemOptions_GetOptionInt, 3495).
--define(wxSystemOptions_HasOption, 3496).
--define(wxSystemOptions_IsFalse, 3497).
--define(wxSystemOptions_SetOption_2_1, 3498).
--define(wxSystemOptions_SetOption_2_0, 3499).
--define(wxAuiNotebookEvent_SetSelection, 3500).
--define(wxAuiNotebookEvent_GetSelection, 3501).
--define(wxAuiNotebookEvent_SetOldSelection, 3502).
--define(wxAuiNotebookEvent_GetOldSelection, 3503).
--define(wxAuiNotebookEvent_SetDragSource, 3504).
--define(wxAuiNotebookEvent_GetDragSource, 3505).
--define(wxAuiManagerEvent_SetManager, 3506).
--define(wxAuiManagerEvent_GetManager, 3507).
--define(wxAuiManagerEvent_SetPane, 3508).
--define(wxAuiManagerEvent_GetPane, 3509).
--define(wxAuiManagerEvent_SetButton, 3510).
--define(wxAuiManagerEvent_GetButton, 3511).
--define(wxAuiManagerEvent_SetDC, 3512).
--define(wxAuiManagerEvent_GetDC, 3513).
--define(wxAuiManagerEvent_Veto, 3514).
--define(wxAuiManagerEvent_GetVeto, 3515).
--define(wxAuiManagerEvent_SetCanVeto, 3516).
--define(wxAuiManagerEvent_CanVeto, 3517).
--define(wxLogNull_new, 3518).
--define(wxLogNull_destroy, 3519).
--define(wxTaskBarIcon_new, 3520).
--define(wxTaskBarIcon_destruct, 3521).
--define(wxTaskBarIcon_PopupMenu, 3522).
--define(wxTaskBarIcon_RemoveIcon, 3523).
--define(wxTaskBarIcon_SetIcon, 3524).
+-define(wxStyledTextCtrl_SetVScrollBar, 3373).
+-define(wxStyledTextCtrl_SetHScrollBar, 3374).
+-define(wxStyledTextCtrl_GetLastKeydownProcessed, 3375).
+-define(wxStyledTextCtrl_SetLastKeydownProcessed, 3376).
+-define(wxStyledTextCtrl_SaveFile, 3377).
+-define(wxStyledTextCtrl_LoadFile, 3378).
+-define(wxStyledTextCtrl_DoDragOver, 3379).
+-define(wxStyledTextCtrl_DoDropText, 3380).
+-define(wxStyledTextCtrl_GetUseAntiAliasing, 3381).
+-define(wxStyledTextCtrl_AddTextRaw, 3382).
+-define(wxStyledTextCtrl_InsertTextRaw, 3383).
+-define(wxStyledTextCtrl_GetCurLineRaw, 3384).
+-define(wxStyledTextCtrl_GetLineRaw, 3385).
+-define(wxStyledTextCtrl_GetSelectedTextRaw, 3386).
+-define(wxStyledTextCtrl_GetTextRangeRaw, 3387).
+-define(wxStyledTextCtrl_SetTextRaw, 3388).
+-define(wxStyledTextCtrl_GetTextRaw, 3389).
+-define(wxStyledTextCtrl_AppendTextRaw, 3390).
+-define(wxArtProvider_GetBitmap, 3391).
+-define(wxArtProvider_GetIcon, 3392).
+-define(wxTreeEvent_GetKeyCode, 3393).
+-define(wxTreeEvent_GetItem, 3394).
+-define(wxTreeEvent_GetKeyEvent, 3395).
+-define(wxTreeEvent_GetLabel, 3396).
+-define(wxTreeEvent_GetOldItem, 3397).
+-define(wxTreeEvent_GetPoint, 3398).
+-define(wxTreeEvent_IsEditCancelled, 3399).
+-define(wxTreeEvent_SetToolTip, 3400).
+-define(wxNotebookEvent_GetOldSelection, 3401).
+-define(wxNotebookEvent_GetSelection, 3402).
+-define(wxNotebookEvent_SetOldSelection, 3403).
+-define(wxNotebookEvent_SetSelection, 3404).
+-define(wxFileDataObject_new, 3405).
+-define(wxFileDataObject_AddFile, 3406).
+-define(wxFileDataObject_GetFilenames, 3407).
+-define(wxFileDataObject_destroy, 3408).
+-define(wxTextDataObject_new, 3409).
+-define(wxTextDataObject_GetTextLength, 3410).
+-define(wxTextDataObject_GetText, 3411).
+-define(wxTextDataObject_SetText, 3412).
+-define(wxTextDataObject_destroy, 3413).
+-define(wxBitmapDataObject_new_1_1, 3414).
+-define(wxBitmapDataObject_new_1_0, 3415).
+-define(wxBitmapDataObject_GetBitmap, 3416).
+-define(wxBitmapDataObject_SetBitmap, 3417).
+-define(wxBitmapDataObject_destroy, 3418).
+-define(wxClipboard_new, 3420).
+-define(wxClipboard_destruct, 3421).
+-define(wxClipboard_AddData, 3422).
+-define(wxClipboard_Clear, 3423).
+-define(wxClipboard_Close, 3424).
+-define(wxClipboard_Flush, 3425).
+-define(wxClipboard_GetData, 3426).
+-define(wxClipboard_IsOpened, 3427).
+-define(wxClipboard_Open, 3428).
+-define(wxClipboard_SetData, 3429).
+-define(wxClipboard_UsePrimarySelection, 3431).
+-define(wxClipboard_IsSupported, 3432).
+-define(wxClipboard_Get, 3433).
+-define(wxSpinEvent_GetPosition, 3434).
+-define(wxSpinEvent_SetPosition, 3435).
+-define(wxSplitterWindow_new_0, 3436).
+-define(wxSplitterWindow_new_2, 3437).
+-define(wxSplitterWindow_destruct, 3438).
+-define(wxSplitterWindow_Create, 3439).
+-define(wxSplitterWindow_GetMinimumPaneSize, 3440).
+-define(wxSplitterWindow_GetSashGravity, 3441).
+-define(wxSplitterWindow_GetSashPosition, 3442).
+-define(wxSplitterWindow_GetSplitMode, 3443).
+-define(wxSplitterWindow_GetWindow1, 3444).
+-define(wxSplitterWindow_GetWindow2, 3445).
+-define(wxSplitterWindow_Initialize, 3446).
+-define(wxSplitterWindow_IsSplit, 3447).
+-define(wxSplitterWindow_ReplaceWindow, 3448).
+-define(wxSplitterWindow_SetSashGravity, 3449).
+-define(wxSplitterWindow_SetSashPosition, 3450).
+-define(wxSplitterWindow_SetSashSize, 3451).
+-define(wxSplitterWindow_SetMinimumPaneSize, 3452).
+-define(wxSplitterWindow_SetSplitMode, 3453).
+-define(wxSplitterWindow_SplitHorizontally, 3454).
+-define(wxSplitterWindow_SplitVertically, 3455).
+-define(wxSplitterWindow_Unsplit, 3456).
+-define(wxSplitterWindow_UpdateSize, 3457).
+-define(wxSplitterEvent_GetSashPosition, 3458).
+-define(wxSplitterEvent_GetX, 3459).
+-define(wxSplitterEvent_GetY, 3460).
+-define(wxSplitterEvent_GetWindowBeingRemoved, 3461).
+-define(wxSplitterEvent_SetSashPosition, 3462).
+-define(wxHtmlWindow_new_0, 3463).
+-define(wxHtmlWindow_new_2, 3464).
+-define(wxHtmlWindow_AppendToPage, 3465).
+-define(wxHtmlWindow_GetOpenedAnchor, 3466).
+-define(wxHtmlWindow_GetOpenedPage, 3467).
+-define(wxHtmlWindow_GetOpenedPageTitle, 3468).
+-define(wxHtmlWindow_GetRelatedFrame, 3469).
+-define(wxHtmlWindow_HistoryBack, 3470).
+-define(wxHtmlWindow_HistoryCanBack, 3471).
+-define(wxHtmlWindow_HistoryCanForward, 3472).
+-define(wxHtmlWindow_HistoryClear, 3473).
+-define(wxHtmlWindow_HistoryForward, 3474).
+-define(wxHtmlWindow_LoadFile, 3475).
+-define(wxHtmlWindow_LoadPage, 3476).
+-define(wxHtmlWindow_SelectAll, 3477).
+-define(wxHtmlWindow_SelectionToText, 3478).
+-define(wxHtmlWindow_SelectLine, 3479).
+-define(wxHtmlWindow_SelectWord, 3480).
+-define(wxHtmlWindow_SetBorders, 3481).
+-define(wxHtmlWindow_SetFonts, 3482).
+-define(wxHtmlWindow_SetPage, 3483).
+-define(wxHtmlWindow_SetRelatedFrame, 3484).
+-define(wxHtmlWindow_SetRelatedStatusBar, 3485).
+-define(wxHtmlWindow_ToText, 3486).
+-define(wxHtmlWindow_destroy, 3487).
+-define(wxHtmlLinkEvent_GetLinkInfo, 3488).
+-define(wxSystemSettings_GetColour, 3489).
+-define(wxSystemSettings_GetFont, 3490).
+-define(wxSystemSettings_GetMetric, 3491).
+-define(wxSystemSettings_GetScreenType, 3492).
+-define(wxSystemOptions_GetOption, 3493).
+-define(wxSystemOptions_GetOptionInt, 3494).
+-define(wxSystemOptions_HasOption, 3495).
+-define(wxSystemOptions_IsFalse, 3496).
+-define(wxSystemOptions_SetOption_2_1, 3497).
+-define(wxSystemOptions_SetOption_2_0, 3498).
+-define(wxAuiNotebookEvent_SetSelection, 3499).
+-define(wxAuiNotebookEvent_GetSelection, 3500).
+-define(wxAuiNotebookEvent_SetOldSelection, 3501).
+-define(wxAuiNotebookEvent_GetOldSelection, 3502).
+-define(wxAuiNotebookEvent_SetDragSource, 3503).
+-define(wxAuiNotebookEvent_GetDragSource, 3504).
+-define(wxAuiManagerEvent_SetManager, 3505).
+-define(wxAuiManagerEvent_GetManager, 3506).
+-define(wxAuiManagerEvent_SetPane, 3507).
+-define(wxAuiManagerEvent_GetPane, 3508).
+-define(wxAuiManagerEvent_SetButton, 3509).
+-define(wxAuiManagerEvent_GetButton, 3510).
+-define(wxAuiManagerEvent_SetDC, 3511).
+-define(wxAuiManagerEvent_GetDC, 3512).
+-define(wxAuiManagerEvent_Veto, 3513).
+-define(wxAuiManagerEvent_GetVeto, 3514).
+-define(wxAuiManagerEvent_SetCanVeto, 3515).
+-define(wxAuiManagerEvent_CanVeto, 3516).
+-define(wxLogNull_new, 3517).
+-define(wxLogNull_destroy, 3518).
+-define(wxTaskBarIcon_new, 3519).
+-define(wxTaskBarIcon_destruct, 3520).
+-define(wxTaskBarIcon_PopupMenu, 3521).
+-define(wxTaskBarIcon_RemoveIcon, 3522).
+-define(wxTaskBarIcon_SetIcon, 3523).
diff --git a/lib/wx/test/wx_basic_SUITE.erl b/lib/wx/test/wx_basic_SUITE.erl
index e240bbcfe8..cf17818a9d 100644
--- a/lib/wx/test/wx_basic_SUITE.erl
+++ b/lib/wx/test/wx_basic_SUITE.erl
@@ -308,12 +308,12 @@ data_types(_Config) ->
     ?m({_,_}, wxWindow:getSize(Frame)),
 
     %% DateTime 
-    DateTime = calendar:now_to_datetime(erlang:now()),
+    DateTime = {Date, _Time} = calendar:now_to_datetime(erlang:now()),
     io:format("DateTime ~p ~n",[DateTime]),
     Cal = ?mt(wxCalendarCtrl, wxCalendarCtrl:new(Frame, ?wxID_ANY, [{date,DateTime}])),
-    ?m(DateTime, wxCalendarCtrl:getDate(Cal)),
+    ?m({Date,_}, wxCalendarCtrl:getDate(Cal)),
     ?m(true, is_boolean(wxCalendarCtrl:setDate(Cal,DateTime))),
-    ?m(DateTime, wxCalendarCtrl:getDate(Cal)),
+    ?m({Date,_}, wxCalendarCtrl:getDate(Cal)),
 
     wxClientDC:destroy(CDC),
     %%wx_test_lib:wx_destroy(Frame,Config).
diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl
index 6ed7243c5b..22bfa53e0a 100644
--- a/lib/wx/test/wx_class_SUITE.erl
+++ b/lib/wx/test/wx_class_SUITE.erl
@@ -82,13 +82,14 @@ calendarCtrl(Config) ->
 	true ->
 	    ?log("DateAttr is null~n",[]);
 	false ->
-	    ?log("DateAttr is useable~n",[])
+	    ?log("DateAttr is useable~n",[]),
+	    DateAttr = ?mt(wxCalendarDateAttr, wxCalendarDateAttr:new()),
+	    wxCalendarDateAttr:setBackgroundColour(DateAttr, {0,243,0}),
+	    wxCalendarCtrl:setAttr(Cal, Day, DateAttr),
+	    DateAttr1 = ?mt(wxCalendarDateAttr, wxCalendarCtrl:getAttr(Cal,Day)),
+	    io:format("DateAttr ~p~n",[DateAttr1]),
+	    ?m({0,243,0,255}, wxCalendarDateAttr:getBackgroundColour(DateAttr1))
     end,
-    DateAttr = ?mt(wxCalendarDateAttr, wxCalendarDateAttr:new()),
-    wxCalendarDateAttr:setBackgroundColour(DateAttr, {0,243,0}),
-    wxCalendarCtrl:setAttr(Cal, Day, DateAttr),
-    DateAttr1 = ?mt(wxCalendarDateAttr, wxCalendarCtrl:getAttr(Cal,Day)),
-    ?m({0,243,0,255}, wxCalendarDateAttr:getBackgroundColour(DateAttr1)),
 
     ?m({YMD, _},wxCalendarCtrl:getDate(Cal)),
 
@@ -476,7 +477,9 @@ taskBarIcon(Config) ->
     Wx = wx:new(),
     Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
     TBI = wxTaskBarIcon:new(),
-    Icon = wxIcon:new(filename:join(code:priv_dir(debugger), "erlang_bug.png")),
+    Image = wxImage:new(filename:join(code:priv_dir(debugger), "erlang_bug.png")),
+    io:format("Image ~p~n",[wxImage:ok(Image)]),
+    Icon = wxIcon:new(filename:join(code:priv_dir(debugger), "erlang_bug.png"), [{type, ?wxBITMAP_TYPE_PNG}]),
     wxTaskBarIcon:setIcon(TBI, Icon, [{tooltip, "Testing wxTaskBarIcon"}]),
     wxWindow:show(Frame),
     wxTaskBarIcon:connect(TBI, taskbar_left_down, [{callback, fun(Ev,_) -> io:format("Left clicked: ~p~n",[Ev]) end}]),
diff --git a/lib/wx/test/wx_event_SUITE.erl b/lib/wx/test/wx_event_SUITE.erl
index 8f364049b4..53a2ee7d7b 100644
--- a/lib/wx/test/wx_event_SUITE.erl
+++ b/lib/wx/test/wx_event_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -301,35 +301,70 @@ connect_in_callback(TestInfo)
   when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
 connect_in_callback(Config) ->
     Wx = ?mr(wx_ref, wx:new()),
+    %% wx:debug([driver,trace]),
+    %% io:format("gdb -p ~s~n",[os:getpid()]),
     Frame = wxFrame:new(Wx, ?wxID_ANY, "Connect in callback"),
     Panel = wxPanel:new(Frame, []),
-    
+
+    Tester = self(),
+
+    %% Connect in callbacks works different in 2.9
+    %% such that new events are not fired until the previous
+    %% callback have returned.
+
+    %% That means that a callback can not wait for other events
+    %% in receive since they will not come.
+    %% It also means that you can not attach a new callback directly from
+    %% the callback since that callback will be removed when the temporary
+    %% process that executes the outer callback (may) die(s) before the callback
+    %% is invoked
+
+    %% Thus connect in callbacks needs to done in a another process, and
+    %% not in the fun directly
+    Env = wx:get_env(),
+    TestWindow =
+	fun() ->
+		wx:set_env(Env),
+		Me = self(),
+		F1 = wxFrame:new(Frame, ?wxID_ANY, "Frame size event"),
+		wxFrame:connect(F1,size,[{callback,
+					  fun(_,_) ->
+						  io:format("CB2 got size~n",[]),
+						  Me ! {continue, F1}
+					  end}]),
+		wxWindow:show(F1),
+		receive
+		    {continue, F1} -> Tester ! {continue, F1}
+		end
+	end,
     wxFrame:connect(Frame,size,
-		    [{callback, 
-		      fun(#wx{event=#wxSize{}},_SizeEv) -> 
-			      io:format("Frame got size~n",[]),		 
-			      F1 = wxFrame:new(Frame, ?wxID_ANY, "Frame size event"),
-			      CBPid = self(),
-			      wxFrame:connect(F1,size,[{callback,
-							fun(_,_) ->
-								io:format("CB2 got size~n",[]),
-								CBPid ! continue
-							end}]),
-			      wxWindow:show(F1),
-			      receive continue -> wxFrame:destroy(F1) end
+		    [{callback,
+		      fun(#wx{event=#wxSize{}},_SizeEv) ->
+			      io:format("Frame got size~n",[]),
+			      spawn(TestWindow)
 		      end}]),
     wxPanel:connect(Panel,size,
-		    [{callback, 
-		      fun(#wx{event=#wxSize{}},_SizeEv) -> 
+		    [{callback,
+		      fun(#wx{event=#wxSize{}},_SizeEv) ->
 			      io:format("Panel got size~n",[]),
-			      F1 = wxFrame:new(Frame, ?wxID_ANY, "Panel size event"),
-			      wxFrame:connect(F1,size),
-			      wxWindow:show(F1),
-			      receive #wx{event=#wxSize{}} -> wxFrame:destroy(F1) end
-		      end}]),   
+			      spawn(fun() ->
+					    wx:set_env(Env),
+					    F1 = wxFrame:new(Frame, ?wxID_ANY,
+							     "Panel size event"),
+					    wxFrame:connect(F1,size),
+					    wxWindow:show(F1),
+					    receive
+						#wx{event=#wxSize{}} ->
+						    io:format("All Fine ~n",[]),
+						    wxFrame:destroy(F1)
+					    end
+				    end)
+		      end}]),
     wxFrame:show(Frame),
+
+    ok = receive {continue, F1} -> wxFrame:destroy(F1)
+	 after 5000 -> timeout end,
     wx_test_lib:flush(),
-    
     wx_test_lib:wx_destroy(Frame, Config).
 
 %% Test that event callback which triggers another callback works
diff --git a/lib/wx/test/wx_opengl_SUITE.erl b/lib/wx/test/wx_opengl_SUITE.erl
index e8fdf603d6..f351bc93ed 100644
--- a/lib/wx/test/wx_opengl_SUITE.erl
+++ b/lib/wx/test/wx_opengl_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. 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
@@ -92,10 +92,22 @@ canvas(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
 canvas(Config) ->
     WX = ?mr(wx_ref, wx:new()),
     Frame = wxFrame:new(WX,1,"Hello 3D-World",[]),
-    Attrs = [{attribList, [?WX_GL_RGBA,?WX_GL_DOUBLEBUFFER,0]}],
-    Canvas = ?mt(wxGLCanvas, wxGLCanvas:new(Frame, Attrs)),
+    Attrs = [{attribList, [?WX_GL_RGBA,
+			   ?WX_GL_DOUBLEBUFFER,
+			   ?WX_GL_MIN_RED,8,
+			   ?WX_GL_MIN_GREEN,8,
+			   ?WX_GL_MIN_BLUE,8,
+			   ?WX_GL_DEPTH_SIZE,24,0]}],
+    Canvas = ?mt(wxGLCanvas, wxGLCanvas:new(Frame, [{style,?wxFULL_REPAINT_ON_RESIZE}|
+						    Attrs])),
     
+    wxFrame:connect(Frame, show),
     ?m(true, wxWindow:show(Frame)),
+
+    receive #wx{event=#wxShow{}} -> ok
+    after 1000 -> exit(show_timeout)
+    end,
+
     ?m(false, wx:is_null(wxGLCanvas:getContext(Canvas))),
     ?m({'EXIT', {{error, no_gl_context,_},_}}, gl:getString(?GL_VENDOR)),
 
@@ -111,7 +123,7 @@ canvas(Config) ->
     %%gl:frustum( -2.0, 2.0, -2.0, 2.0, 5.0, 25.0 ),
     gl:ortho( -2.0, 2.0, -2.0*H/W, 2.0*H/W, -20.0, 20.0),
     gl:matrixMode(?GL_MODELVIEW),
-    gl:loadIdentity(),    
+    gl:loadIdentity(),
     gl:enable(?GL_DEPTH_TEST),
     gl:depthFunc(?GL_LESS),
     {R,G,B,_} = wxWindow:getBackgroundColour(Frame),
@@ -122,7 +134,7 @@ canvas(Config) ->
     ?m([], flush()),
     Env = wx:get_env(),
     Tester = self(),
-    spawn_link(fun() -> 
+    spawn_link(fun() ->
 		       wx:set_env(Env),
 		       ?m(ok, wxGLCanvas:setCurrent(Canvas)),
 		       ?m(ok, drawBox(1, Data)),
@@ -131,11 +143,20 @@ canvas(Config) ->
 		       %% This may fail when window is deleted
 		       catch draw_loop(2,Data,Canvas)
 	       end),
+    %% Needed on mac with wx-2.9
+    wxGLCanvas:connect(Canvas, paint, 
+    		       [{callback, fun(_,_) ->
+    					   wxGLCanvas:setCurrent(Canvas),
+    					   DC= wxPaintDC:new(Canvas),
+    					   wxPaintDC:destroy(DC)
+    				   end}]),
+
+
     ?m_receive(works),
     ?m([], flush()),
     io:format("Undef func ~p ~n", [catch gl:uniform1d(2, 0.75)]),
     timer:sleep(500),
-    ?m([], flush()),
+    flush(),
     wx_test_lib:wx_destroy(Frame, Config).
 
 flush() ->
@@ -150,6 +171,8 @@ flush(Collected) ->
     	  
 draw_loop(Deg,Data,Canvas) ->
     timer:sleep(15),
+    {NW,NH} = wxGLCanvas:getClientSize(Canvas),
+    gl:viewport(0,0,NW,NH),
     drawBox(Deg,Data),
     ?m(ok, wxGLCanvas:swapBuffers(Canvas)),
     draw_loop(Deg+1, Data,Canvas).
@@ -181,7 +204,12 @@ glu_tesselation(Config) ->
     Frame = wxFrame:new(WX,1,"Hello 3D-World",[]),
     Attrs = [{attribList, [?WX_GL_RGBA,?WX_GL_DOUBLEBUFFER,0]}],
     Canvas = ?mt(wxGLCanvas, wxGLCanvas:new(Frame, Attrs)),
+    wxFrame:connect(Frame, show),
     ?m(true, wxWindow:show(Frame)),
+
+    receive #wx{event=#wxShow{}} -> ok
+    after 1000 -> exit(show_timeout)
+    end,
     ?m(ok, wxGLCanvas:setCurrent(Canvas)),
     
     {RL1,RB1} = ?m({_,_}, glu:tesselate({0,0,1}, [{-1,0,0},{1,0,0},{0,1,0}])),
diff --git a/lib/wx/test/wx_xtra_SUITE.erl b/lib/wx/test/wx_xtra_SUITE.erl
index 02a0672594..a2d4c26319 100644
--- a/lib/wx/test/wx_xtra_SUITE.erl
+++ b/lib/wx/test/wx_xtra_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. 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
@@ -111,6 +111,7 @@ app_dies(_Config) ->
 		     oops(Die,?LINE),
 		     wxFrame:show(Frame),
 		     oops(Die,?LINE),
+		     timer:sleep(100), %% Let the window be shown before DC can be created
 		     DC0  = wxClientDC:new(Win),
 		     oops(Die,?LINE),
 		     DC   = wxBufferedDC:new(DC0),
@@ -134,7 +135,7 @@ app_dies2(Test, N) ->
     end.
 
 oops(Die, Line) when (Die =:= last) orelse (Die =< Line) ->
-    timer:sleep(500),
+    timer:sleep(300),
     ?log(" Exits at line ~p~n",[Line]),
     exit({oops, Die});
 oops(_,_) -> ok.
@@ -191,8 +192,12 @@ menu_item_debug(Config) ->
     wxFrame:connect(Frame, close_window),
 
     wxPanel:new(Frame),
-    create_menus(Frame),
+    MenuBar = create_menus(Frame),
     wxWindow:show(Frame),
+    N = wxMenuBar:getMenuCount(MenuBar),
+    io:format("No of menus ~p~n",[N]),
+    [io:format("Menu ~p ~p~n",[Id, wxMenuBar:getLabelTop(MenuBar, Id)]) 
+     || Id <- lists:seq(0, N-1)],
     wx_test_lib:wx_destroy(Frame,Config).
 
 
@@ -224,14 +229,15 @@ create_menus(Frame) ->
      || Id <- lists:seq(600, 620)],
 
     ?m(ok,wxFrame:connect(Frame, command_menu_selected)),
-    ?m(true, wxMenuBar:append(MenuBar, File, "&File")),
-    ?m(true, wxMenuBar:append(MenuBar, Help, "&Help")),
-    ?m(true, wxMenuBar:append(MenuBar, T1, "T1")),
-    ?m(true, wxMenuBar:append(MenuBar, T2, "T2")),
-    ?m(true, wxMenuBar:append(MenuBar, T3, "T3")),
-    ?m(true, wxMenuBar:append(MenuBar, T4, "T4")),
-    ?m(true, wxMenuBar:append(MenuBar, T5, "T5")),
-    ?m(true, wxMenuBar:append(MenuBar, T6, "T6")),
 
-
-    ?m(ok, wxFrame:setMenuBar(Frame,MenuBar)).
+    ?m(true, wxMenuBar:insert(MenuBar, 0,File, "&File")),
+    ?m(true, wxMenuBar:insert(MenuBar, 1,Help, "&Help")),
+    ?m(true, wxMenuBar:insert(MenuBar, 2,T1, "T1")),
+    ?m(true, wxMenuBar:insert(MenuBar, 3,T2, "T2")),
+    ?m(true, wxMenuBar:insert(MenuBar, 4,T3, "T3")),
+    ?m(true, wxMenuBar:insert(MenuBar, 5,T4, "T4")),
+    ?m(true, wxMenuBar:insert(MenuBar, 6,T5, "T5")),
+    ?m(true, wxMenuBar:insert(MenuBar, 7,T6, "T6")),
+
+    ?m(ok, wxFrame:setMenuBar(Frame,MenuBar)),
+    MenuBar.
diff --git a/lib/wx/wxwin.m4 b/lib/wx/wxwin-2.8.m4
index 52c55e2e6e..52c55e2e6e 100644
--- a/lib/wx/wxwin.m4
+++ b/lib/wx/wxwin-2.8.m4
diff --git a/lib/wx/wxwin-2.9.m4 b/lib/wx/wxwin-2.9.m4
new file mode 100644
index 0000000000..1c50dcc272
--- /dev/null
+++ b/lib/wx/wxwin-2.9.m4
@@ -0,0 +1,1060 @@
+dnl ---------------------------------------------------------------------------
+dnl Author:          wxWidgets development team,
+dnl                  Francesco Montorsi,
+dnl                  Bob McCown (Mac-testing)
+dnl Creation date:   24/11/2001
+dnl RCS-ID:          $Id$
+dnl ---------------------------------------------------------------------------
+
+dnl ===========================================================================
+dnl Table of Contents of this macro file:
+dnl -------------------------------------
+dnl
+dnl SECTION A: wxWidgets main macros
+dnl  - WX_CONFIG_OPTIONS
+dnl  - WX_CONFIG_CHECK
+dnl  - WXRC_CHECK
+dnl  - WX_STANDARD_OPTIONS
+dnl  - WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
+dnl  - WX_DETECT_STANDARD_OPTION_VALUES
+dnl
+dnl SECTION B: wxWidgets-related utilities
+dnl  - WX_LIKE_LIBNAME
+dnl  - WX_ARG_ENABLE_YESNOAUTO
+dnl  - WX_ARG_WITH_YESNOAUTO
+dnl
+dnl SECTION C: messages to the user
+dnl  - WX_STANDARD_OPTIONS_SUMMARY_MSG
+dnl  - WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN
+dnl  - WX_STANDARD_OPTIONS_SUMMARY_MSG_END
+dnl  - WX_BOOLOPT_SUMMARY
+dnl
+dnl The special "WX_DEBUG_CONFIGURE" variable can be set to 1 to enable extra
+dnl debug output on stdout from these macros.
+dnl ===========================================================================
+
+
+dnl ---------------------------------------------------------------------------
+dnl Macros for wxWidgets detection. Typically used in configure.in as:
+dnl
+dnl     AC_ARG_ENABLE(...)
+dnl     AC_ARG_WITH(...)
+dnl        ...
+dnl     WX_CONFIG_OPTIONS
+dnl        ...
+dnl        ...
+dnl     WX_CONFIG_CHECK([2.6.0], [wxWin=1])
+dnl     if test "$wxWin" != 1; then
+dnl        AC_MSG_ERROR([
+dnl                wxWidgets must be installed on your system
+dnl                but wx-config script couldn't be found.
+dnl
+dnl                Please check that wx-config is in path, the directory
+dnl                where wxWidgets libraries are installed (returned by
+dnl                'wx-config --libs' command) is in LD_LIBRARY_PATH or
+dnl                equivalent variable and wxWidgets version is 2.3.4 or above.
+dnl        ])
+dnl     fi
+dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+dnl
+dnl     LIBS="$LIBS $WX_LIBS"
+dnl
+dnl If you want to support standard --enable-debug/unicode/shared options, you
+dnl may do the following:
+dnl
+dnl     ...
+dnl     AC_CANONICAL_SYSTEM
+dnl
+dnl     # define configure options
+dnl     WX_CONFIG_OPTIONS
+dnl     WX_STANDARD_OPTIONS([debug,unicode,shared,toolkit,wxshared])
+dnl
+dnl     # basic configure checks
+dnl     ...
+dnl
+dnl     # we want to always have DEBUG==WX_DEBUG and UNICODE==WX_UNICODE
+dnl     WX_DEBUG=$DEBUG
+dnl     WX_UNICODE=$UNICODE
+dnl
+dnl     WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
+dnl     WX_CONFIG_CHECK([2.8.0], [wxWin=1],,[html,core,net,base],[$WXCONFIG_FLAGS])
+dnl     WX_DETECT_STANDARD_OPTION_VALUES
+dnl
+dnl     # write the output files
+dnl     AC_CONFIG_FILES([Makefile ...])
+dnl     AC_OUTPUT
+dnl
+dnl     # optional: just to show a message to the user
+dnl     WX_STANDARD_OPTIONS_SUMMARY_MSG
+dnl
+dnl ---------------------------------------------------------------------------
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_CONFIG_OPTIONS
+dnl
+dnl adds support for --wx-prefix, --wx-exec-prefix, --with-wxdir and
+dnl --wx-config command line options
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN([WX_CONFIG_OPTIONS],
+[
+    AC_ARG_WITH(wxdir,
+                [  --with-wxdir=PATH       Use uninstalled version of wxWidgets in PATH],
+                [ wx_config_name="$withval/wx-config"
+                  wx_config_args="--inplace"])
+    AC_ARG_WITH(wx-config,
+                [  --with-wx-config=CONFIG wx-config script to use (optional)],
+                wx_config_name="$withval" )
+    AC_ARG_WITH(wx-prefix,
+                [  --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)],
+                wx_config_prefix="$withval", wx_config_prefix="")
+    AC_ARG_WITH(wx-exec-prefix,
+                [  --with-wx-exec-prefix=PREFIX
+                          Exec prefix where wxWidgets is installed (optional)],
+                wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
+])
+
+dnl Helper macro for checking if wx version is at least $1.$2.$3, set's
+dnl wx_ver_ok=yes if it is:
+AC_DEFUN([_WX_PRIVATE_CHECK_VERSION],
+[
+    wx_ver_ok=""
+    if test "x$WX_VERSION" != x ; then
+      if test $wx_config_major_version -gt $1; then
+        wx_ver_ok=yes
+      else
+        if test $wx_config_major_version -eq $1; then
+           if test $wx_config_minor_version -gt $2; then
+              wx_ver_ok=yes
+           else
+              if test $wx_config_minor_version -eq $2; then
+                 if test $wx_config_micro_version -ge $3; then
+                    wx_ver_ok=yes
+                 fi
+              fi
+           fi
+        fi
+      fi
+    fi
+])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_CONFIG_CHECK(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
+dnl                  [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]])
+dnl
+dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
+dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME
+dnl environment variable to override the default name of the wx-config script
+dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
+dnl case the macro won't even waste time on tests for its existence.
+dnl
+dnl Optional WX-LIBS argument contains comma- or space-separated list of
+dnl wxWidgets libraries to link against. If it is not specified then WX_LIBS
+dnl and WX_LIBS_STATIC will contain flags to link with all of the core
+dnl wxWidgets libraries.
+dnl
+dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
+dnl invocation command in present. It can be used to fine-tune lookup of
+dnl best wxWidgets build available.
+dnl
+dnl Example use:
+dnl   WX_CONFIG_CHECK([2.6.0], [wxWin=1], [wxWin=0], [html,core,net]
+dnl                    [--unicode --debug])
+dnl ---------------------------------------------------------------------------
+
+dnl
+dnl Get the cflags and libraries from the wx-config script
+dnl
+AC_DEFUN([WX_CONFIG_CHECK],
+[
+  dnl do we have wx-config name: it can be wx-config or wxd-config or ...
+  if test x${WX_CONFIG_NAME+set} != xset ; then
+     WX_CONFIG_NAME=wx-config
+  fi
+
+  if test "x$wx_config_name" != x ; then
+     WX_CONFIG_NAME="$wx_config_name"
+  fi
+
+  dnl deal with optional prefixes
+  if test x$wx_config_exec_prefix != x ; then
+     wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
+     WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
+  fi
+  if test x$wx_config_prefix != x ; then
+     wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
+     WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
+  fi
+  if test "$cross_compiling" = "yes"; then
+     wx_config_args="$wx_config_args --host=$host_alias"
+  fi
+
+  dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
+  if test -x "$WX_CONFIG_NAME" ; then
+     AC_MSG_CHECKING(for wx-config)
+     WX_CONFIG_PATH="$WX_CONFIG_NAME"
+     AC_MSG_RESULT($WX_CONFIG_PATH)
+  else
+     AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH")
+  fi
+
+  if test "$WX_CONFIG_PATH" != "no" ; then
+    WX_VERSION=""
+
+    min_wx_version=ifelse([$1], ,2.2.1,$1)
+    if test -z "$5" ; then
+      AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version])
+    else
+      AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)])
+    fi
+
+    dnl don't add the libraries ($4) to this variable as this would result in
+    dnl an error when it's used with --version below
+    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5"
+
+    WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
+    wx_config_major_version=`echo $WX_VERSION | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    wx_config_minor_version=`echo $WX_VERSION | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    wx_config_micro_version=`echo $WX_VERSION | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+    wx_requested_major_version=`echo $min_wx_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    wx_requested_minor_version=`echo $min_wx_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    wx_requested_micro_version=`echo $min_wx_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+    _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
+                              [$wx_requested_minor_version],
+                              [$wx_requested_micro_version])
+
+    if test -n "$wx_ver_ok"; then
+      AC_MSG_RESULT(yes (version $WX_VERSION))
+      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $4`
+
+      dnl is this even still appropriate?  --static is a real option now
+      dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
+      dnl what the user actually wants, making this redundant at best.
+      dnl For now keep it in case anyone actually used it in the past.
+      AC_MSG_CHECKING([for wxWidgets static library])
+      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $4 2>/dev/null`
+      if test "x$WX_LIBS_STATIC" = "x"; then
+        AC_MSG_RESULT(no)
+      else
+        AC_MSG_RESULT(yes)
+      fi
+
+      dnl starting with version 2.2.6 wx-config has --cppflags argument
+      wx_has_cppflags=""
+      if test $wx_config_major_version -gt 2; then
+        wx_has_cppflags=yes
+      else
+        if test $wx_config_major_version -eq 2; then
+           if test $wx_config_minor_version -gt 2; then
+              wx_has_cppflags=yes
+           else
+              if test $wx_config_minor_version -eq 2; then
+                 if test $wx_config_micro_version -ge 6; then
+                    wx_has_cppflags=yes
+                 fi
+              fi
+           fi
+        fi
+      fi
+
+      dnl starting with version 2.7.0 wx-config has --rescomp option
+      wx_has_rescomp=""
+      if test $wx_config_major_version -gt 2; then
+        wx_has_rescomp=yes
+      else
+        if test $wx_config_major_version -eq 2; then
+           if test $wx_config_minor_version -ge 7; then
+              wx_has_rescomp=yes
+           fi
+        fi
+      fi
+      if test "x$wx_has_rescomp" = x ; then
+         dnl cannot give any useful info for resource compiler
+         WX_RESCOMP=
+      else
+         WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
+      fi
+
+      if test "x$wx_has_cppflags" = x ; then
+         dnl no choice but to define all flags like CFLAGS
+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
+         WX_CPPFLAGS=$WX_CFLAGS
+         WX_CXXFLAGS=$WX_CFLAGS
+
+         WX_CFLAGS_ONLY=$WX_CFLAGS
+         WX_CXXFLAGS_ONLY=$WX_CFLAGS
+      else
+         dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
+         WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags $4`
+         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags $4`
+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
+
+         WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
+         WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
+      fi
+
+      ifelse([$2], , :, [$2])
+
+    else
+
+       if test "x$WX_VERSION" = x; then
+          dnl no wx-config at all
+          AC_MSG_RESULT(no)
+       else
+          AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
+       fi
+
+       WX_CFLAGS=""
+       WX_CPPFLAGS=""
+       WX_CXXFLAGS=""
+       WX_LIBS=""
+       WX_LIBS_STATIC=""
+       WX_RESCOMP=""
+
+       if test ! -z "$5"; then
+
+          wx_error_message="
+    The configuration you asked for $PACKAGE_NAME requires a wxWidgets
+    build with the following settings:
+        $5
+    but such build is not available.
+
+    To see the wxWidgets builds available on this system, please use
+    'wx-config --list' command. To use the default build, returned by
+    'wx-config --selected-config', use the options with their 'auto'
+    default values."
+
+       fi
+
+       wx_error_message="
+    The requested wxWidgets build couldn't be found.
+    $wx_error_message
+
+    If you still get this error, then check that 'wx-config' is
+    in path, the directory where wxWidgets libraries are installed
+    (returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH
+    or equivalent variable and wxWidgets version is $1 or above."
+
+       ifelse([$3], , AC_MSG_ERROR([$wx_error_message]), [$3])
+
+    fi
+  else
+
+    WX_CFLAGS=""
+    WX_CPPFLAGS=""
+    WX_CXXFLAGS=""
+    WX_LIBS=""
+    WX_LIBS_STATIC=""
+    WX_RESCOMP=""
+
+    ifelse([$3], , :, [$3])
+
+  fi
+
+  AC_SUBST(WX_CPPFLAGS)
+  AC_SUBST(WX_CFLAGS)
+  AC_SUBST(WX_CXXFLAGS)
+  AC_SUBST(WX_CFLAGS_ONLY)
+  AC_SUBST(WX_CXXFLAGS_ONLY)
+  AC_SUBST(WX_LIBS)
+  AC_SUBST(WX_LIBS_STATIC)
+  AC_SUBST(WX_VERSION)
+  AC_SUBST(WX_RESCOMP)
+
+  dnl need to export also WX_VERSION_MINOR and WX_VERSION_MAJOR symbols
+  dnl to support wxpresets bakefiles (we export also WX_VERSION_MICRO for completeness):
+  WX_VERSION_MAJOR="$wx_config_major_version"
+  WX_VERSION_MINOR="$wx_config_minor_version"
+  WX_VERSION_MICRO="$wx_config_micro_version"
+  AC_SUBST(WX_VERSION_MAJOR)
+  AC_SUBST(WX_VERSION_MINOR)
+  AC_SUBST(WX_VERSION_MICRO)
+])
+
+dnl ---------------------------------------------------------------------------
+dnl Get information on the wxrc program for making C++, Python and xrs
+dnl resource files.
+dnl
+dnl     AC_ARG_ENABLE(...)
+dnl     AC_ARG_WITH(...)
+dnl        ...
+dnl     WX_CONFIG_OPTIONS
+dnl        ...
+dnl     WX_CONFIG_CHECK(2.6.0, wxWin=1)
+dnl     if test "$wxWin" != 1; then
+dnl        AC_MSG_ERROR([
+dnl                wxWidgets must be installed on your system
+dnl                but wx-config script couldn't be found.
+dnl
+dnl                Please check that wx-config is in path, the directory
+dnl                where wxWidgets libraries are installed (returned by
+dnl                'wx-config --libs' command) is in LD_LIBRARY_PATH or
+dnl                equivalent variable and wxWidgets version is 2.6.0 or above.
+dnl        ])
+dnl     fi
+dnl
+dnl     WXRC_CHECK([HAVE_WXRC=1], [HAVE_WXRC=0])
+dnl     if test "x$HAVE_WXRC" != x1; then
+dnl         AC_MSG_ERROR([
+dnl                The wxrc program was not installed or not found.
+dnl
+dnl                Please check the wxWidgets installation.
+dnl         ])
+dnl     fi
+dnl
+dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+dnl
+dnl     LDFLAGS="$LDFLAGS $WX_LIBS"
+dnl ---------------------------------------------------------------------------
+
+dnl ---------------------------------------------------------------------------
+dnl WXRC_CHECK([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+dnl Test for wxWidgets' wxrc program for creating either C++, Python or XRS
+dnl resources.  The variable WXRC will be set and substituted in the configure
+dnl script and Makefiles.
+dnl
+dnl Example use:
+dnl   WXRC_CHECK([wxrc=1], [wxrc=0])
+dnl ---------------------------------------------------------------------------
+
+dnl
+dnl wxrc program from the wx-config script
+dnl
+AC_DEFUN([WXRC_CHECK],
+[
+  AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler])
+
+  if test "x$WX_CONFIG_NAME" = x; then
+    AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.])
+  else
+
+    AC_MSG_CHECKING([for wxrc])
+
+    if test "x$WXRC" = x ; then
+      dnl wx-config --utility is a new addition to wxWidgets:
+      _WX_PRIVATE_CHECK_VERSION(2,5,3)
+      if test -n "$wx_ver_ok"; then
+        WXRC=`$WX_CONFIG_WITH_ARGS --utility=wxrc`
+      fi
+    fi
+
+    if test "x$WXRC" = x ; then
+      AC_MSG_RESULT([not found])
+      ifelse([$2], , :, [$2])
+    else
+      AC_MSG_RESULT([$WXRC])
+      ifelse([$1], , :, [$1])
+    fi
+
+    AC_SUBST(WXRC)
+  fi
+])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_LIKE_LIBNAME([output-var] [prefix], [name])
+dnl
+dnl Sets the "output-var" variable to the name of a library named with same
+dnl wxWidgets rule.
+dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets
+dnl      the $lib variable to:
+dnl          'mine_gtk2ud_test-2.8'
+dnl      if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_RELEASE=28
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_LIKE_LIBNAME],
+    [
+        wx_temp="$2""_""$WX_PORT"
+
+        dnl add the [u][d] string
+        if test "$WX_UNICODE" = "1"; then
+            wx_temp="$wx_temp""u"
+        fi
+        if test "$WX_DEBUG" = "1"; then
+            wx_temp="$wx_temp""d"
+        fi
+
+        dnl complete the name of the lib
+        wx_temp="$wx_temp""_""$3""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR"
+
+        dnl save it in the user's variable
+        $1=$wx_temp
+    ])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_ARG_ENABLE_YESNOAUTO/WX_ARG_WITH_YESNOAUTO
+dnl
+dnl Two little custom macros which define the ENABLE/WITH configure arguments.
+dnl Macro arguments:
+dnl $1 = the name of the --enable / --with  feature
+dnl $2 = the name of the variable associated
+dnl $3 = the description of that feature
+dnl $4 = the default value for that feature
+dnl $5 = additional action to do in case option is given with "yes" value
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_ARG_ENABLE_YESNOAUTO],
+         [AC_ARG_ENABLE($1,
+            AC_HELP_STRING([--enable-$1], [$3 (default is $4)]),
+            [], [enableval="$4"])
+
+            dnl Show a message to the user about this option
+            AC_MSG_CHECKING([for the --enable-$1 option])
+            if test "$enableval" = "yes" ; then
+                AC_MSG_RESULT([yes])
+                $2=1
+                $5
+            elif test "$enableval" = "no" ; then
+                AC_MSG_RESULT([no])
+                $2=0
+            elif test "$enableval" = "auto" ; then
+                AC_MSG_RESULT([will be automatically detected])
+                $2="auto"
+            else
+                AC_MSG_ERROR([
+    Unrecognized option value (allowed values: yes, no, auto)
+                ])
+            fi
+         ])
+
+AC_DEFUN([WX_ARG_WITH_YESNOAUTO],
+         [AC_ARG_WITH($1,
+            AC_HELP_STRING([--with-$1], [$3 (default is $4)]),
+            [], [withval="$4"])
+
+            dnl Show a message to the user about this option
+            AC_MSG_CHECKING([for the --with-$1 option])
+            if test "$withval" = "yes" ; then
+                AC_MSG_RESULT([yes])
+                $2=1
+                $5
+            dnl NB: by default we don't allow --with-$1=no option
+            dnl     since it does not make much sense !
+            elif test "$6" = "1" -a "$withval" = "no" ; then
+                AC_MSG_RESULT([no])
+                $2=0
+            elif test "$withval" = "auto" ; then
+                AC_MSG_RESULT([will be automatically detected])
+                $2="auto"
+            else
+                AC_MSG_ERROR([
+    Unrecognized option value (allowed values: yes, auto)
+                ])
+            fi
+         ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_STANDARD_OPTIONS([options-to-add])
+dnl
+dnl Adds to the configure script one or more of the following options:
+dnl   --enable-[debug|unicode|shared|wxshared|wxdebug]
+dnl   --with-[gtk|msw|motif|x11|mac|dfb]
+dnl   --with-wxversion
+dnl Then checks for their presence and eventually set the DEBUG, UNICODE, SHARED,
+dnl PORT, WX_SHARED, WX_DEBUG, variables to one of the "yes", "no", "auto" values.
+dnl
+dnl Note that e.g. UNICODE != WX_UNICODE; the first is the value of the
+dnl --enable-unicode option (in boolean format) while the second indicates
+dnl if wxWidgets was built in Unicode mode (and still is in boolean format).
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_STANDARD_OPTIONS],
+        [
+
+        dnl the following lines will expand to WX_ARG_ENABLE_YESNOAUTO calls if and only if
+        dnl the $1 argument contains respectively the debug,unicode or shared options.
+
+        dnl be careful here not to set debug flag if only "wxdebug" was specified
+        ifelse(regexp([$1], [\bdebug]), [-1],,
+               [WX_ARG_ENABLE_YESNOAUTO([debug], [DEBUG], [Build in debug mode], [auto])])
+
+        ifelse(index([$1], [unicode]), [-1],,
+               [WX_ARG_ENABLE_YESNOAUTO([unicode], [UNICODE], [Build in Unicode mode], [auto])])
+
+        ifelse(regexp([$1], [\bshared]), [-1],,
+               [WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Build as shared library], [auto])])
+
+        dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-toolkit since it's an option
+        dnl which must be able to accept the auto|gtk1|gtk2|msw|... values
+        ifelse(index([$1], [toolkit]), [-1],,
+               [
+                AC_ARG_WITH([toolkit],
+                            AC_HELP_STRING([--with-toolkit],
+                                           [Build against a specific wxWidgets toolkit (default is auto)]),
+                            [], [withval="auto"])
+
+                dnl Show a message to the user about this option
+                AC_MSG_CHECKING([for the --with-toolkit option])
+                if test "$withval" = "auto" ; then
+                    AC_MSG_RESULT([will be automatically detected])
+                    TOOLKIT="auto"
+                else
+                    TOOLKIT="$withval"
+
+                    dnl PORT must be one of the allowed values
+                    if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a \
+                            "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
+                            "$TOOLKIT" != "osx_carbon" -a "$TOOLKIT" != "osx_cocoa" -a \
+                            "$TOOLKIT" != "dfb" -a "$TOOLKIT" != "x11"; then
+                        AC_MSG_ERROR([
+    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, osx_carbon, osx_cocoa, dfb, x11)
+                        ])
+                    fi
+
+                    AC_MSG_RESULT([$TOOLKIT])
+                fi
+               ])
+
+        dnl ****** IMPORTANT *******
+        dnl   Unlike for the UNICODE setting, you can build your program in
+        dnl   shared mode against a static build of wxWidgets. Thus we have the
+        dnl   following option which allows these mixtures. E.g.
+        dnl
+        dnl      ./configure --disable-shared --with-wxshared
+        dnl
+        dnl   will build your library in static mode against the first available
+        dnl   shared build of wxWidgets.
+        dnl
+        dnl   Note that's not possible to do the viceversa:
+        dnl
+        dnl      ./configure --enable-shared --without-wxshared
+        dnl
+        dnl   Doing so you would try to build your library in shared mode against a static
+        dnl   build of wxWidgets. This is not possible (you would mix PIC and non PIC code) !
+        dnl   A check for this combination of options is in WX_DETECT_STANDARD_OPTION_VALUES
+        dnl   (where we know what 'auto' should be expanded to).
+        dnl
+        dnl   If you try to build something in ANSI mode against a UNICODE build
+        dnl   of wxWidgets or in RELEASE mode against a DEBUG build of wxWidgets,
+        dnl   then at best you'll get ton of linking errors !
+        dnl ************************
+
+        ifelse(index([$1], [wxshared]), [-1],,
+               [
+                WX_ARG_WITH_YESNOAUTO(
+                    [wxshared], [WX_SHARED],
+                    [Force building against a shared build of wxWidgets, even if --disable-shared is given],
+                    [auto], [], [1])
+               ])
+
+        dnl Just like for SHARED and WX_SHARED it may happen that some adventurous
+        dnl peoples will want to mix a wxWidgets release build with a debug build of
+        dnl his app/lib. So, we have both DEBUG and WX_DEBUG variables.
+        ifelse(index([$1], [wxdebug]), [-1],,
+               [
+                WX_ARG_WITH_YESNOAUTO(
+                    [wxdebug], [WX_DEBUG],
+                    [Force building against a debug build of wxWidgets, even if --disable-debug is given],
+                    [auto], [], [1])
+               ])
+
+        dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-wxversion since it's an option
+        dnl which accepts the "auto|2.6|2.7|2.8|2.9|3.0" etc etc values
+        ifelse(index([$1], [wxversion]), [-1],,
+               [
+                AC_ARG_WITH([wxversion],
+                            AC_HELP_STRING([--with-wxversion],
+                                           [Build against a specific version of wxWidgets (default is auto)]),
+                            [], [withval="auto"])
+
+                dnl Show a message to the user about this option
+                AC_MSG_CHECKING([for the --with-wxversion option])
+                if test "$withval" = "auto" ; then
+                    AC_MSG_RESULT([will be automatically detected])
+                    WX_RELEASE="auto"
+                else
+
+                    wx_requested_major_version=`echo $withval | \
+                        sed 's/\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+                    wx_requested_minor_version=`echo $withval | \
+                        sed 's/\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+
+                    dnl both vars above must be exactly 1 digit
+                    if test "${#wx_requested_major_version}" != "1" -o \
+                            "${#wx_requested_minor_version}" != "1" ; then
+                        AC_MSG_ERROR([
+    Unrecognized option value (allowed values: auto, 2.6, 2.7, 2.8, 2.9, 3.0)
+                        ])
+                    fi
+
+                    WX_RELEASE="$wx_requested_major_version"".""$wx_requested_minor_version"
+                    AC_MSG_RESULT([$WX_RELEASE])
+                fi
+               ])
+
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
+            echo "[[dbg]] DEBUG: $DEBUG, WX_DEBUG: $WX_DEBUG"
+            echo "[[dbg]] UNICODE: $UNICODE, WX_UNICODE: $WX_UNICODE"
+            echo "[[dbg]] SHARED: $SHARED, WX_SHARED: $WX_SHARED"
+            echo "[[dbg]] TOOLKIT: $TOOLKIT, WX_TOOLKIT: $WX_TOOLKIT"
+            echo "[[dbg]] VERSION: $VERSION, WX_RELEASE: $WX_RELEASE"
+        fi
+    ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
+dnl
+dnl Sets the WXCONFIG_FLAGS string using the SHARED,DEBUG,UNICODE variable values
+dnl which are different from "auto".
+dnl Thus this macro needs to be called only once all options have been set.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS],
+        [
+        if test "$WX_SHARED" = "1" ; then
+            WXCONFIG_FLAGS="--static=no "
+        elif test "$WX_SHARED" = "0" ; then
+            WXCONFIG_FLAGS="--static=yes "
+        fi
+
+        if test "$WX_DEBUG" = "1" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=yes "
+        elif test "$WX_DEBUG" = "0" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=no "
+        fi
+
+        dnl The user should have set WX_UNICODE=UNICODE
+        if test "$WX_UNICODE" = "1" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=yes "
+        elif test "$WX_UNICODE" = "0" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=no "
+        fi
+
+        if test "$TOOLKIT" != "auto" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--toolkit=$TOOLKIT "
+        fi
+
+        if test "$WX_RELEASE" != "auto" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--version=$WX_RELEASE "
+        fi
+
+        dnl strip out the last space of the string
+        WXCONFIG_FLAGS=${WXCONFIG_FLAGS% }
+
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
+            echo "[[dbg]] WXCONFIG_FLAGS: $WXCONFIG_FLAGS"
+        fi
+    ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl _WX_SELECTEDCONFIG_CHECKFOR([RESULTVAR], [STRING], [MSG]
+dnl                             [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+dnl Outputs the given MSG. Then searches the given STRING in the wxWidgets
+dnl additional CPP flags and put the result of the search in WX_$RESULTVAR
+dnl also adding the "yes" or "no" message result to MSG.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([_WX_SELECTEDCONFIG_CHECKFOR],
+        [
+        if test "$$1" = "auto" ; then
+
+            dnl The user does not have particular preferences for this option;
+            dnl so we will detect the wxWidgets relative build setting and use it
+            AC_MSG_CHECKING([$3])
+
+            dnl set WX_$1 variable to 1 if the $WX_SELECTEDCONFIG contains the $2
+            dnl string or to 0 otherwise.
+            dnl NOTE: 'expr match STRING REGEXP' cannot be used since on Mac it
+            dnl       doesn't work; we use 'expr STRING : REGEXP' instead
+            WX_$1=$(expr "$WX_SELECTEDCONFIG" : ".*$2.*")
+
+            if test "$WX_$1" != "0"; then
+                WX_$1=1
+                AC_MSG_RESULT([yes])
+                ifelse([$4], , :, [$4])
+            else
+                WX_$1=0
+                AC_MSG_RESULT([no])
+                ifelse([$5], , :, [$5])
+            fi
+        else
+
+            dnl Use the setting given by the user
+            WX_$1=$$1
+        fi
+    ])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_DETECT_STANDARD_OPTION_VALUES
+dnl
+dnl Detects the values of the following variables:
+dnl 1) WX_RELEASE
+dnl 2) WX_UNICODE
+dnl 3) WX_DEBUG
+dnl 4) WX_SHARED    (and also WX_STATIC)
+dnl 5) WX_PORT
+dnl from the previously selected wxWidgets build; this macro in fact must be
+dnl called *after* calling the WX_CONFIG_CHECK macro.
+dnl
+dnl Note that the WX_VERSION_MAJOR, WX_VERSION_MINOR symbols are already set
+dnl by WX_CONFIG_CHECK macro
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
+        [
+        dnl IMPORTANT: WX_VERSION contains all three major.minor.micro digits,
+        dnl            while WX_RELEASE only the major.minor ones.
+        WX_RELEASE="$WX_VERSION_MAJOR""$WX_VERSION_MINOR"
+        if test $WX_RELEASE -lt 26 ; then
+
+            AC_MSG_ERROR([
+    Cannot detect the wxWidgets configuration for the selected wxWidgets build
+    since its version is $WX_VERSION < 2.6.0; please install a newer
+    version of wxWidgets.
+                         ])
+        fi
+
+        dnl The wx-config we are using understands the "--selected_config"
+        dnl option which returns an easy-parseable string !
+        WX_SELECTEDCONFIG=$($WX_CONFIG_WITH_ARGS --selected_config)
+
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
+            echo "[[dbg]] Using wx-config --selected-config"
+            echo "[[dbg]] WX_SELECTEDCONFIG: $WX_SELECTEDCONFIG"
+        fi
+
+
+        dnl we could test directly for WX_SHARED with a line like:
+        dnl    _WX_SELECTEDCONFIG_CHECKFOR([SHARED], [shared],
+        dnl                                [if wxWidgets was built in SHARED mode])
+        dnl but wx-config --selected-config DOES NOT outputs the 'shared'
+        dnl word when wx was built in shared mode; it rather outputs the
+        dnl 'static' word when built in static mode.
+        if test $WX_SHARED = "1"; then
+            STATIC=0
+        elif test $WX_SHARED = "0"; then
+            STATIC=1
+        elif test $WX_SHARED = "auto"; then
+            STATIC="auto"
+        fi
+
+        dnl Now set the WX_UNICODE, WX_DEBUG, WX_STATIC variables
+        _WX_SELECTEDCONFIG_CHECKFOR([UNICODE], [unicode],
+                                    [if wxWidgets was built with UNICODE enabled])
+        _WX_SELECTEDCONFIG_CHECKFOR([DEBUG], [debug],
+                                    [if wxWidgets was built in DEBUG mode])
+        _WX_SELECTEDCONFIG_CHECKFOR([STATIC], [static],
+                                    [if wxWidgets was built in STATIC mode])
+
+        dnl init WX_SHARED from WX_STATIC
+        if test "$WX_STATIC" != "0"; then
+            WX_SHARED=0
+        else
+            WX_SHARED=1
+        fi
+
+        AC_SUBST(WX_UNICODE)
+        AC_SUBST(WX_DEBUG)
+        AC_SUBST(WX_SHARED)
+
+        dnl detect the WX_PORT to use
+        if test "$TOOLKIT" = "auto" ; then
+
+            dnl The user does not have particular preferences for this option;
+            dnl so we will detect the wxWidgets relative build setting and use it
+            AC_MSG_CHECKING([which wxWidgets toolkit was selected])
+
+            WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*")
+            WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
+            WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
+            WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*")
+            WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
+            WX_OSXCARBONPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_carbon.*")
+            WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*")
+            WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*")
+
+            WX_PORT="unknown"
+            if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
+            if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
+            if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
+            if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
+            if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
+            if test "$WX_OSXCARBONPORT" != "0"; then WX_PORT="osx_carbon"; fi
+            if test "$WX_X11PORT" != "0"; then WX_PORT="x11"; fi
+            if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi
+
+            dnl NOTE: backward-compatible check for wx2.8; in wx2.9 the mac
+            dnl       ports are called 'osx_cocoa' and 'osx_carbon' (see above)
+            WX_MACPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mac.*")
+            if test "$WX_MACPORT" != "0"; then WX_PORT="mac"; fi
+
+            dnl check at least one of the WX_*PORT has been set !
+
+            if test "$WX_PORT" = "unknown" ; then
+                AC_MSG_ERROR([
+        Cannot detect the currently installed wxWidgets port !
+        Please check your 'wx-config --cxxflags'...
+                            ])
+            fi
+
+            AC_MSG_RESULT([$WX_PORT])
+        else
+
+            dnl Use the setting given by the user
+            if test -z "$TOOLKIT" ; then
+                WX_PORT=$TOOLKIT
+            else
+                dnl try with PORT
+                WX_PORT=$PORT
+            fi
+        fi
+
+        AC_SUBST(WX_PORT)
+
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
+            echo "[[dbg]] Values of all WX_* options after final detection:"
+            echo "[[dbg]] WX_DEBUG: $WX_DEBUG"
+            echo "[[dbg]] WX_UNICODE: $WX_UNICODE"
+            echo "[[dbg]] WX_SHARED: $WX_SHARED"
+            echo "[[dbg]] WX_RELEASE: $WX_RELEASE"
+            echo "[[dbg]] WX_PORT: $WX_PORT"
+        fi
+
+        dnl Avoid problem described in the WX_STANDARD_OPTIONS which happens when
+        dnl the user gives the options:
+        dnl      ./configure --enable-shared --without-wxshared
+        dnl or just do
+        dnl      ./configure --enable-shared
+        dnl but there is only a static build of wxWidgets available.
+        if test "$WX_SHARED" = "0" -a "$SHARED" = "1"; then
+            AC_MSG_ERROR([
+    Cannot build shared library against a static build of wxWidgets !
+    This error happens because the wxWidgets build which was selected
+    has been detected as static while you asked to build $PACKAGE_NAME
+    as shared library and this is not possible.
+    Use the '--disable-shared' option to build $PACKAGE_NAME
+    as static library or '--with-wxshared' to use wxWidgets as shared library.
+                         ])
+        fi
+
+        dnl now we can finally update the DEBUG,UNICODE,SHARED options
+        dnl to their final values if they were set to 'auto'
+        if test "$DEBUG" = "auto"; then
+            DEBUG=$WX_DEBUG
+        fi
+        if test "$UNICODE" = "auto"; then
+            UNICODE=$WX_UNICODE
+        fi
+        if test "$SHARED" = "auto"; then
+            SHARED=$WX_SHARED
+        fi
+        if test "$TOOLKIT" = "auto"; then
+            TOOLKIT=$WX_PORT
+        fi
+
+        dnl in case the user needs a BUILD=debug/release var...
+        if test "$DEBUG" = "1"; then
+            BUILD="debug"
+        elif test "$DEBUG" = "0" -o "$DEBUG" = ""; then
+            BUILD="release"
+        fi
+
+        dnl respect the DEBUG variable adding the optimize/debug flags
+        dnl NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we
+        dnl       don't need to set them, too
+        if test "$DEBUG" = "1"; then
+            CXXFLAGS="$CXXFLAGS -g -O0"
+            CFLAGS="$CFLAGS -g -O0"
+        else
+            CXXFLAGS="$CXXFLAGS -O2"
+            CFLAGS="$CFLAGS -O2"
+        fi
+    ])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_BOOLOPT_SUMMARY([name of the boolean variable to show summary for],
+dnl                   [what to print when var is 1],
+dnl                   [what to print when var is 0])
+dnl
+dnl Prints $2 when variable $1 == 1 and prints $3 when variable $1 == 0.
+dnl This macro mainly exists just to make configure.ac scripts more readable.
+dnl
+dnl NOTE: you need to use the [" my message"] syntax for 2nd and 3rd arguments
+dnl       if you want that m4 avoid to throw away the spaces prefixed to the
+dnl       argument value.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_BOOLOPT_SUMMARY],
+        [
+        if test "x$$1" = "x1" ; then
+            echo $2
+        elif test "x$$1" = "x0" ; then
+            echo $3
+        else
+            echo "$1 is $$1"
+        fi
+    ])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_STANDARD_OPTIONS_SUMMARY_MSG
+dnl
+dnl Shows a summary message to the user about the WX_* variable contents.
+dnl This macro is used typically at the end of the configure script.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG],
+        [
+        echo
+        echo "  The wxWidgets build which will be used by $PACKAGE_NAME $PACKAGE_VERSION"
+        echo "  has the following settings:"
+        WX_BOOLOPT_SUMMARY([WX_DEBUG],   ["  - DEBUG build"],  ["  - RELEASE build"])
+        WX_BOOLOPT_SUMMARY([WX_UNICODE], ["  - UNICODE mode"], ["  - ANSI mode"])
+        WX_BOOLOPT_SUMMARY([WX_SHARED],  ["  - SHARED mode"],  ["  - STATIC mode"])
+        echo "  - VERSION: $WX_VERSION"
+        echo "  - PORT: $WX_PORT"
+    ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN, WX_STANDARD_OPTIONS_SUMMARY_MSG_END
+dnl
+dnl Like WX_STANDARD_OPTIONS_SUMMARY_MSG macro but these two macros also gives info
+dnl about the configuration of the package which used the wxpresets.
+dnl
+dnl Typical usage:
+dnl    WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN
+dnl    echo "   - Package setting 1: $SETTING1"
+dnl    echo "   - Package setting 2: $SETTING1"
+dnl    ...
+dnl    WX_STANDARD_OPTIONS_SUMMARY_MSG_END
+dnl
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN],
+        [
+        echo
+        echo " ----------------------------------------------------------------"
+        echo "  Configuration for $PACKAGE_NAME $PACKAGE_VERSION successfully completed."
+        echo "  Summary of main configuration settings for $PACKAGE_NAME:"
+        WX_BOOLOPT_SUMMARY([DEBUG], ["  - DEBUG build"], ["  - RELEASE build"])
+        WX_BOOLOPT_SUMMARY([UNICODE], ["  - UNICODE mode"], ["  - ANSI mode"])
+        WX_BOOLOPT_SUMMARY([SHARED], ["  - SHARED mode"], ["  - STATIC mode"])
+    ])
+
+AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG_END],
+        [
+        WX_STANDARD_OPTIONS_SUMMARY_MSG
+        echo
+        echo "  Now, just run make."
+        echo " ----------------------------------------------------------------"
+        echo
+    ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl Deprecated macro wrappers
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN([AM_OPTIONS_WXCONFIG], [WX_CONFIG_OPTIONS])
+AC_DEFUN([AM_PATH_WXCONFIG], [
+    WX_CONFIG_CHECK([$1],[$2],[$3],[$4],[$5])
+])
+AC_DEFUN([AM_PATH_WXRC], [WXRC_CHECK([$1],[$2])])
author	Dan Gudmundsson <[email protected]>	2013-01-15 09:18:49 +0100
committer	Dan Gudmundsson <[email protected]>	2013-01-15 09:18:49 +0100
commit	0e044f3525d22de4c4c471f601de50ad3acda304 (patch)
tree	dfbbcc31814b0890fcb7774a48cf43322b29ac94 /lib/wx
parent	fdd0b38e2c85d897a240e5f8f79e268c6540dbfd (diff)
parent	c384a91846f7d0aff189fb51d1d502330d7abef4 (diff)
download	otp-0e044f3525d22de4c4c471f601de50ad3acda304.tar.gz otp-0e044f3525d22de4c4c471f601de50ad3acda304.tar.bz2 otp-0e044f3525d22de4c4c471f601de50ad3acda304.zip