Merge branch 'major' of super:otp into bmk/inets/inets58_integration

214 files changed, 14788 insertions, 8700 deletions

diff --git a/lib/Makefile b/lib/Makefile
index c443425f8b..7e52d6e32e 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -70,19 +70,15 @@ endif
 
 ifdef BOOTSTRAP
   SUB_DIRECTORIES = \
-    kernel stdlib compiler orber/include
+    kernel stdlib compiler
 else
   ifdef SECONDARY_BOOTSTRAP
     SUB_DIRECTORIES = hipe parsetools asn1/src
   else
     ifdef TERTIARY_BOOTSTRAP
-      SUB_DIRECTORIES = snmp
-    else
-      ifdef FOURTH_BOOTSTRAP
-        SUB_DIRECTORIES = sasl jinterface ic syntax_tools
-      else # Not bootstrap build
-        SUB_DIRECTORIES = $(ERTS_SUB_DIRECTORIES) $(OTHER_SUB_DIRECTORIES)
-      endif
+      SUB_DIRECTORIES = snmp sasl jinterface ic syntax_tools
+    else # Not bootstrap build
+      SUB_DIRECTORIES = $(ERTS_SUB_DIRECTORIES) $(OTHER_SUB_DIRECTORIES)
     endif
   endif
 endif
diff --git a/lib/asn1/doc/src/asn1ct.xml b/lib/asn1/doc/src/asn1ct.xml
index 13e6977419..0b9ec3df7f 100644
--- a/lib/asn1/doc/src/asn1ct.xml
+++ b/lib/asn1/doc/src/asn1ct.xml
@@ -53,7 +53,7 @@
         <v>Option = ber_bin | per_bin | uper_bin | der | compact_bit_string | 
 	noobj | {n2n,EnumTypeName} |{outdir,Dir} | {i,IncludeDir} | optimize | 
 	nif | asn1config | undec_rest | {inline,OutputName} | inline |
-	{macro_name_prefix, Prefix} | {record_name_prefix, Prefix} | verbose</v>
+	{macro_name_prefix, Prefix} | {record_name_prefix, Prefix} | verbose | warnings_as_errors</v>
         <v>OldOption = ber | per</v> 
         <v>Reason = term()</v>
         <v>Prefix = string()</v>
@@ -298,6 +298,10 @@ Binary = binary()
             <p>Causes more verbose information from the compiler
               describing what it is doing.</p>
           </item>
+          <tag><c>warnings_as_errors</c></tag>
+          <item>
+            <p>Causes warnings to be treated as errors.</p>
+          </item>
         </taglist>
         <p>Any additional option that is applied will be passed to
           the final step when the generated .erl file is compiled.
diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
index a170dd8660..85bb5b2f28 100644
--- a/lib/asn1/src/asn1ct.erl
+++ b/lib/asn1/src/asn1ct.erl
@@ -39,7 +39,7 @@
 	 add_tobe_refed_func/1,add_generated_refed_func/1,
 	 maybe_rename_function/3,latest_sindex/0,current_sindex/0,
 	 set_current_sindex/1,next_sindex/0,maybe_saved_sindex/2,
-	 parse_and_save/2,verbose/3,warning/3,error/3]).
+	 parse_and_save/2,verbose/3,warning/3,warning/4,error/3]).
 
 -include("asn1_records.hrl").
 -include_lib("stdlib/include/erl_compile.hrl").
@@ -835,10 +835,13 @@ generate({true,{M,_Module,GenTOrV}},OutFile,EncodingRule,Options) ->
     case catch specialized_decode_prepare(EncodingRule,M,GenTOrV,Options) of
 	{error, enoent} -> ok;
 	{error, Reason} -> warning("Error in configuration "
-				   "file: ~n~p~n",[Reason],Options);
+				   "file: ~n~p~n",[Reason],Options,
+				   "Error in configuration file");
 	{'EXIT',Reason} -> warning("Internal error when "
 				   "analyzing configuration "
-				   "file: ~n~p~n",[Reason],Options);
+				   "file: ~n~p~n",[Reason],Options,
+				   "Internal error when "
+				   "analyzing configuration");
 	_ -> ok
     end,
 
@@ -2534,14 +2537,14 @@ type_check(#'Externaltypereference'{}) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Report functions.
 %%
-%% Errors messages are controlled with the 'errors' compiler option
+%% Error messages are controlled with the 'errors' compiler option
 %% Warning messages are controlled with the 'warnings' compiler option
 %% Verbose messages are controlled with the 'verbose' compiler option
 
 error(Format, Args, S) ->
     case is_error(S) of
 	true ->
-	    io:format("Error: " ++ Format, Args);
+	    io:format(Format, Args);
 	false ->
 	    ok
     end.
@@ -2554,6 +2557,17 @@ warning(Format, Args, S) ->
 	    ok
     end.
 
+warning(Format, Args, S, Reason) ->
+    case {is_werr(S), is_error(S), is_warning(S)} of
+	{true, true, _} ->
+	    io:format(Format, Args),
+	    throw({error, Reason});
+	{false, _, true} ->
+	    io:format(Format, Args);
+	_ ->
+	    ok
+    end.
+
 verbose(Format, Args, S) ->
     case is_verbose(S) of
 	true ->
@@ -2576,3 +2590,8 @@ is_verbose(S) when is_record(S, state) ->
     is_verbose(S#state.options);
 is_verbose(O) ->
     lists:member(verbose, O).
+
+is_werr(S) when is_record(S, state) ->
+    is_werr(S#state.options);
+is_werr(O) ->
+    lists:member(warnings_as_errors, O).
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index efd731f052..e318477234 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -2031,7 +2031,7 @@ get_objectset_def2(_S,T = #typedef{typespec=#'ObjectSet'{}},_CField) ->
     T;
 get_objectset_def2(S,T,_CField) ->
     asn1ct:warning("get_objectset_def2: uncontrolled object set structure:~n~p~n",
-		   [T],S).
+		   [T],S,"get_objectset_def2: uncontrolled object set structure").
     
 type_name(S,#type{def=Def}) ->
     CurrMod = S#state.mname,
@@ -2705,7 +2705,7 @@ normalize_value(S,Type,{'DEFAULT',Value},NameList) ->
 	    normalize_objectclassfieldvalue(S,Value,NL);
 	Err ->
 	    asn1ct:warning("could not check default value ~p~nType:~n~p~nNameList:~n~p~n",
-			   [Value,Type,Err],S),
+			   [Value,Type,Err],S,"could not check default value"),
 	    Value
     end;
 normalize_value(S,Type,Val,NameList) ->
@@ -2791,22 +2791,27 @@ normalize_bitstring(S,Value,Type)->
 		    case catch lists:map(F,RecList) of
 			{error,Reason} ->
 			    asn1ct:warning("default value not "
-				      "compatible with type definition ~p~n",
-				      [Reason],S),
+					   "compatible with type definition ~p~n",
+					   [Reason],S,
+					   "default value not "
+					   "compatible with type definition"),
 			    Value;
 			NewList ->
 			    NewList
 		    end;
 		_ ->
 		    asn1ct:warning("default value not "
-			      "compatible with type definition ~p~n",
-			      [RecList],S),
+				   "compatible with type definition ~p~n",
+				   [RecList],S,
+				   "default value not "
+				   "compatible with type definition"),
 		    Value
 	    end;
 	{Name,String} when is_atom(Name) ->
 	    normalize_bitstring(S,String,Type);
 	Other ->
-	    asn1ct:warning("illegal default value ~p~n",[Other],S),
+	    asn1ct:warning("illegal default value ~p~n",[Other],S,
+			   "illegal default value"),
 	    Value
     end.
 
@@ -2846,12 +2851,14 @@ normalize_octetstring(S,Value,CType) ->
 	    lists:map(fun([])-> ok;
 			 (H)when H > 255->
 			      asn1ct:warning("not legal octet value ~p in OCTET STRING, ~p~n",
-					     [H,List],S);
+					     [H,List],S,
+					     "not legal octet value ~p in OCTET STRING");
 			 (_)-> ok
 		      end, List),
 	    List;
 	Other ->
-	    asn1ct:warning("unknown default value ~p~n",[Other],S),
+	    asn1ct:warning("unknown default value ~p~n",[Other],S,
+			   "unknown default value"),
 	    Value
     end.
 
@@ -2908,13 +2915,15 @@ normalize_enumerated(S,{Name,EnumV},CType) when is_atom(Name) ->
 normalize_enumerated(S,Value,{CType1,CType2}) when is_list(CType1), is_list(CType2)->
     normalize_enumerated(S,Value,CType1++CType2);
 normalize_enumerated(S,V,CType) ->
-    asn1ct:warning("Enumerated unknown type ~p~n",[CType],S),
+    asn1ct:warning("Enumerated unknown type ~p~n",[CType],S,
+		   "Enumerated unknown type"),
     V.
 normalize_enumerated2(S,V,Enum) ->
     case lists:keysearch(V,1,Enum) of
 	{value,{Val,_}} -> Val;
 	_ -> 
-	    asn1ct:warning("Enumerated value is not correct ~p~n",[V],S),
+	    asn1ct:warning("enumerated value is not correct ~p~n",[V],S,
+			   "enumerated value is not correct"),
 	    V
     end.
 
@@ -2925,7 +2934,8 @@ normalize_choice(S,{'CHOICE',{C,V}},CType,NameList) when is_atom(C) ->
 	    {C,normalize_value(S,CT,{'DEFAULT',V},
 			       [Name|NameList])};
 	Other ->
-	    asn1ct:warning("Wrong format of type/value ~p/~p~n",[Other,V],S),
+	    asn1ct:warning("Wrong format of type/value ~p/~p~n",[Other,V],S,
+			   "Wrong format of type/value"),
 	    {C,V}
     end;
 normalize_choice(S,{'DEFAULT',ValueList},CType,NameList) when is_list(ValueList) ->
@@ -3101,7 +3111,8 @@ normalize_s_of(SorS,S,Value,Type,NameList) when is_list(Value) ->
 	List when is_list(List) ->
 	    List;
 	_ ->
-	    asn1ct:warning("~p could not handle value ~p~n",[SorS,Value],S),
+	    asn1ct:warning("~p could not handle value ~p~n",[SorS,Value],S,
+			   "could not handle value"),
 	    Value
     end;
 normalize_s_of(SorS,S,Value,Type,NameList) 
@@ -3159,7 +3170,8 @@ get_normalized_value(S,Val,Type,Func,AddArg) ->
 	    V2 = sort_val_if_set(AddArg,NewVal,Type),
 	    call_Func(update_state(S,ExtM),V2,Type,Func,AddArg);
 	_ ->
-	    asn1ct:warning("default value not comparable ~p~n",[Val],S),
+	    asn1ct:warning("default value not comparable ~p~n",[Val],S,
+			   "default value not comparable"),
 	    Val
     end.
 
@@ -5756,7 +5768,8 @@ ascending_order_check1(S,TypeName,
 		       [C1 = #'ComponentType'{tags=[{_,T}|_]},
 			C2 = #'ComponentType'{tags=[{_,T}|_]}|Rest]) ->
     asn1ct:warning("Indistinct tag ~p in SET ~p, components ~p and ~p~n",
-	      [T,TypeName,C1#'ComponentType'.name,C2#'ComponentType'.name],S),
+		   [T,TypeName,C1#'ComponentType'.name,C2#'ComponentType'.name],S,
+		   "Indistinct tag in SET"),
     ascending_order_check1(S,TypeName,[C2|Rest]);
 ascending_order_check1(S,TypeName,
 		       [C1 = #'ComponentType'{tags=[{'UNIVERSAL',T1}|_]},
@@ -5764,9 +5777,10 @@ ascending_order_check1(S,TypeName,
     case (decode_type(T1) == decode_type(T2)) of
 	true ->
 	    asn1ct:warning("Indistinct tags ~p and ~p in"
-		      " SET ~p, components ~p and ~p~n",
-		      [T1,T2,TypeName,C1#'ComponentType'.name,
-		       C2#'ComponentType'.name],S),
+			   " SET ~p, components ~p and ~p~n",
+			   [T1,T2,TypeName,C1#'ComponentType'.name,
+			    C2#'ComponentType'.name],S,
+			   "Indistinct tags and in SET"),
 	    ascending_order_check1(S,TypeName,[C2|Rest]);
 	_ ->
 	    ascending_order_check1(S,TypeName,[C2|Rest])
diff --git a/lib/asn1/src/asn1ct_value.erl b/lib/asn1/src/asn1ct_value.erl
index 693e039a13..d099376b1b 100644
--- a/lib/asn1/src/asn1ct_value.erl
+++ b/lib/asn1/src/asn1ct_value.erl
@@ -435,11 +435,11 @@ get_encoding_rule(M) ->
 open_type_value(ber) ->
     [4,9,111,112,101,110,95,116,121,112,101];
 open_type_value(ber_bin) ->
-    [4,9,111,112,101,110,95,116,121,112,101];
-%    <<4,9,111,112,101,110,95,116,121,112,101>>;
+%    [4,9,111,112,101,110,95,116,121,112,101];
+    <<4,9,111,112,101,110,95,116,121,112,101>>;
 open_type_value(ber_bin_v2) ->
-    [4,9,111,112,101,110,95,116,121,112,101];
-%    <<4,9,111,112,101,110,95,116,121,112,101>>;
+%    [4,9,111,112,101,110,95,116,121,112,101];
+    <<4,9,111,112,101,110,95,116,121,112,101>>;
 open_type_value(per) ->
     "\n\topen_type"; %octet string value "open_type"
 open_type_value(per_bin) ->
diff --git a/lib/asn1/test/asn1_SUITE.erl.src b/lib/asn1/test/asn1_SUITE.erl.src
index 5339ad78c7..124ee2d2bb 100644
--- a/lib/asn1/test/asn1_SUITE.erl.src
+++ b/lib/asn1/test/asn1_SUITE.erl.src
@@ -2232,8 +2232,10 @@ test_compile_options(Config) ->
     	  ?line ok = test_compile_options:path(Config),
     	  ?line ok = test_compile_options:noobj(Config),
 	  ?line ok = test_compile_options:record_name_prefix(Config),
-	  ?line ok = test_compile_options:verbose(Config)
+	  ?line ok = test_compile_options:verbose(Config),
+	  ?line ok = test_compile_options:warnings_as_errors(Config)
     end.
+
 testDoubleEllipses(suite) ->  [];
 testDoubleEllipses(Config) ->
     ?line testDoubleEllipses:compile(Config,?BER,[]),
diff --git a/lib/asn1/test/test_compile_options.erl b/lib/asn1/test/test_compile_options.erl
index 5e027cdedb..5cb212eddf 100644
--- a/lib/asn1/test/test_compile_options.erl
+++ b/lib/asn1/test/test_compile_options.erl
@@ -24,7 +24,7 @@
 
 
 -export([wrong_path/1,comp/2,path/1,ticket_6143/1,noobj/1,
-	 record_name_prefix/1,verbose/1]).
+	 record_name_prefix/1,verbose/1,warnings_as_errors/1]).
 
 %% OTP-5689
 wrong_path(Config) ->
@@ -141,6 +141,43 @@ verbose(Config) when is_list(Config) ->
     ?line [] = test_server:capture_get(),
     ok.
 
+warnings_as_errors(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    Asn1File = filename:join([PrivDir,"WERROR.asn1"]),
+    OutFile = filename:join([PrivDir,"WERROR.erl"]),
+    Opts = [{outdir,PrivDir},noobj,verbose],
+
+    %% Generate WERR.asn to emit warning
+    %% Warning: Wrong format of type/value
+    %%     false/{'Externalvaluereference',_,'WERR',noInvokeId}
+    Warn = <<"WERROR DEFINITIONS IMPLICIT TAGS ::=\n"
+	     "\n"
+	     "BEGIN\n"
+	     "\n"
+	     "InvokeId ::= CHOICE\n"
+	     "{\n"
+	     "    present INTEGER,\n"
+	     "    absent NULL\n"
+	     "}\n"
+	     "\n"
+	     "noInvokeId InvokeId ::= absent:NULL\n"
+	     "\n"
+	     "NoInvokeId InvokeId ::= {noInvokeId}\n"
+	     "\n"
+	     "END -- end of useful definitions.\n">>,
+    ?line ok = file:write_file(Asn1File, Warn),
+
+    %% Test warnings_as_errors compile
+    ?line false = filelib:is_regular(OutFile),
+    ?line {error, _} = asn1ct:compile(Asn1File, [warnings_as_errors|Opts]),
+    ?line false = filelib:is_regular(OutFile),
+
+    %% Test normal compile
+    ?line ok = asn1ct:compile(Asn1File, Opts),
+    ?line true = filelib:is_regular(OutFile),
+    ?line ok = file:delete(OutFile),
+    ok.
+
 outfiles_check(OutDir) ->
     outfiles_check(OutDir,outfiles1()).
 
diff --git a/lib/common_test/doc/src/ct_hooks.xml b/lib/common_test/doc/src/ct_hooks.xml
index 0ece3199bb..f9fc1858d0 100644
--- a/lib/common_test/doc/src/ct_hooks.xml
+++ b/lib/common_test/doc/src/ct_hooks.xml
@@ -302,7 +302,7 @@
 
 	<p>Note that it is not possible to add CTH's here right now, 
 	that feature might be added later, 
-	but it would right now break backwards compatability.</p>
+	but it would right now break backwards compatibility.</p>
       </desc>
     </func>
 
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 9e597edf38..2ebc6c311a 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -437,7 +437,7 @@ try_set_default(Name,Key,Info,Where) ->
 %%% @doc Test server framework callback, called by the test_server
 %%% when a test case is finished.
 end_tc(Mod, Fun, Args) ->
-    %% Have to keep end_tc/3 for backwards compatabilty issues
+    %% Have to keep end_tc/3 for backwards compatibility issues
     end_tc(Mod, Fun, Args, '$end_tc_dummy').
 end_tc(?MODULE,error_in_suite,_, _) ->		% bad start!
     ok;
diff --git a/lib/compiler/src/beam_disasm.erl b/lib/compiler/src/beam_disasm.erl
index 410233a0f7..29a634b18e 100644
--- a/lib/compiler/src/beam_disasm.erl
+++ b/lib/compiler/src/beam_disasm.erl
@@ -204,7 +204,7 @@ process_chunks(F) ->
 optional_chunk(F, ChunkTag) ->
     case beam_lib:chunks(F, [ChunkTag]) of
 	{ok,{_Module,[{ChunkTag,Chunk}]}} -> Chunk;
-	{error,beam_lib,{missing_chunk,_,ChunkTag}} -> none
+	{error,beam_lib,{missing_chunk,_,_}} -> none
     end.
 
 %%-----------------------------------------------------------------------
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index 29c7ec0dcd..15849957e7 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -113,7 +113,7 @@ noenv_forms(Forms, Opt) when is_atom(Opt) ->
 
 noenv_output_generated(Opts) ->
     {_,Passes} = passes(file, expand_opts(Opts)),
-    any(fun ({save_binary,_F}) -> true;
+    any(fun ({save_binary,_T,_F}) -> true;
 	    (_Other) -> false
 	end, Passes).
 
@@ -122,6 +122,7 @@ noenv_output_generated(Opts) ->
 %%
 
 -define(pass(P), {P,fun P/1}).
+-define(pass(P,T), {P,fun T/1,fun P/1}).
 
 env_default_opts() ->
     Key = "ERL_COMPILER_OPTIONS",
@@ -304,7 +305,7 @@ run_tc({Name,Fun}, St) ->
     Val.
 
 comp_ret_ok(#compile{code=Code,warnings=Warn0,module=Mod,options=Opts}=St) ->
-    case member(warnings_as_errors, Opts) andalso length(Warn0) > 0 of
+    case werror(St) of
         true ->
             case member(report_warnings, Opts) of
                 true ->
@@ -339,6 +340,11 @@ comp_ret_err(#compile{warnings=Warn0,errors=Err0,options=Opts}=St) ->
 	false -> error
     end.
 
+not_werror(St) -> not werror(St).
+
+werror(#compile{options=Opts,warnings=Ws}) ->
+    Ws =/= [] andalso member(warnings_as_errors, Opts).
+
 %% messages_per_file([{File,[Message]}]) -> [{File,[Message]}]
 messages_per_file(Ms) ->
     T = lists:sort([{File,M} || {File,Messages} <- Ms, M <- Messages]),
@@ -373,7 +379,7 @@ passes(Type, Opts) ->
     %% insert a first pass to remove the file (unless the
     %% source file is a BEAM file).
     {Ext,case last(Passes) of
-	     {save_binary,_Fun} ->
+	     {save_binary,_TestFun,_Fun} ->
 		 case Passes of
 		     [{read_beam_file,_}|_] ->
 			 %% The BEAM is both input and output.
@@ -655,7 +661,7 @@ asm_passes() ->
 
 binary_passes() ->
     [{native_compile,fun test_native/1,fun native_compile/1},
-     {unless,binary,?pass(save_binary)}].
+     {unless,binary,?pass(save_binary,not_werror)}].
 
 %%%
 %%% Compiler passes.
@@ -1379,28 +1385,34 @@ report_errors(#compile{options=Opts,errors=Errors}) ->
     end.
 
 report_warnings(#compile{options=Opts,warnings=Ws0}) ->
-    case member(report_warnings, Opts) of
+    Werror = member(warnings_as_errors, Opts),
+    P = case Werror of
+	    true -> "";
+	    false -> "Warning: "
+	end,
+    ReportWerror = Werror andalso member(report_errors, Opts),
+    case member(report_warnings, Opts) orelse ReportWerror of
 	true ->
-	    Ws1 = flatmap(fun({{F,_L},Eds}) -> format_message(F, Eds);
-			     ({F,Eds}) -> format_message(F, Eds) end,
+	    Ws1 = flatmap(fun({{F,_L},Eds}) -> format_message(F, P, Eds);
+			     ({F,Eds}) -> format_message(F, P, Eds) end,
 			  Ws0),
 	    Ws = lists:sort(Ws1),
 	    foreach(fun({_,Str}) -> io:put_chars(Str) end, Ws);
 	false -> ok
     end.
 
-format_message(F, [{{Line,Column}=Loc,Mod,E}|Es]) ->
-    M = {{F,Loc},io_lib:format("~s:~w:~w Warning: ~s\n",
-                                [F,Line,Column,Mod:format_error(E)])},
-    [M|format_message(F, Es)];
-format_message(F, [{Line,Mod,E}|Es]) ->
-    M = {{F,{Line,0}},io_lib:format("~s:~w: Warning: ~s\n",
-                                [F,Line,Mod:format_error(E)])},
-    [M|format_message(F, Es)];
-format_message(F, [{Mod,E}|Es]) ->
-    M = {none,io_lib:format("~s: Warning: ~s\n", [F,Mod:format_error(E)])},
-    [M|format_message(F, Es)];
-format_message(_, []) -> [].
+format_message(F, P, [{{Line,Column}=Loc,Mod,E}|Es]) ->
+    M = {{F,Loc},io_lib:format("~s:~w:~w ~s~s\n",
+                                [F,Line,Column,P,Mod:format_error(E)])},
+    [M|format_message(F, P, Es)];
+format_message(F, P, [{Line,Mod,E}|Es]) ->
+    M = {{F,{Line,0}},io_lib:format("~s:~w: ~s~s\n",
+                                [F,Line,P,Mod:format_error(E)])},
+    [M|format_message(F, P, Es)];
+format_message(F, P, [{Mod,E}|Es]) ->
+    M = {none,io_lib:format("~s: ~s~s\n", [F,P,Mod:format_error(E)])},
+    [M|format_message(F, P, Es)];
+format_message(_, _, []) -> [].
 
 %% list_errors(File, ErrorDescriptors) -> ok
 
diff --git a/lib/compiler/src/sys_pre_expand.erl b/lib/compiler/src/sys_pre_expand.erl
index 480954adac..dd6f24e21f 100644
--- a/lib/compiler/src/sys_pre_expand.erl
+++ b/lib/compiler/src/sys_pre_expand.erl
@@ -223,10 +223,8 @@ attribute(export, Es, _L, St) ->
     St#expand{exports=union(from_list(Es), St#expand.exports)};
 attribute(import, Is, _L, St) ->
     import(Is, St);
-attribute(compile, C, _L, St) when is_list(C) ->
-    St#expand{compile=St#expand.compile ++ C};
-attribute(compile, C, _L, St) ->
-    St#expand{compile=St#expand.compile ++ [C]};
+attribute(compile, _C, _L, St) ->
+    St;
 attribute(Name, Val, Line, St) when is_list(Val) ->
     St#expand{attributes=St#expand.attributes ++ [{Name,Line,Val}]};
 attribute(Name, Val, Line, St) ->
diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index fe713fd019..b90adaf917 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -9,6 +9,7 @@ MODULES= \
 	andor_SUITE \
 	apply_SUITE \
 	beam_validator_SUITE \
+	beam_disasm_SUITE \
 	bs_bincomp_SUITE \
 	bs_bit_binaries_SUITE \
 	bs_construct_SUITE \
diff --git a/lib/compiler/test/beam_disasm_SUITE.erl b/lib/compiler/test/beam_disasm_SUITE.erl
new file mode 100644
index 0000000000..44574ae64a
--- /dev/null
+++ b/lib/compiler/test/beam_disasm_SUITE.erl
@@ -0,0 +1,65 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(beam_disasm_SUITE).
+
+-include_lib("test_server/include/test_server.hrl").
+
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
+	 init_per_group/2,end_per_group/2]).
+
+-export([stripped/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [stripped].
+
+groups() ->
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+stripped(doc) ->
+    ["Check that stripped beam files can be disassembled"];
+stripped(Config) when is_list(Config) ->
+    ?line PrivDir = ?config(priv_dir, Config),
+    ?line SrcName = filename:join(PrivDir, "tmp.erl"),
+    ?line BeamName = filename:join(PrivDir, "tmp.beam"),
+    Prog = <<"-module(tmp).\n-export([tmp/0]).\ntmp()->ok.\n">>,
+    ?line ok = file:write_file(SrcName, Prog),
+    ?line {ok, tmp} =
+	compile:file(SrcName, [{outdir, PrivDir}]),
+    ?line {beam_file, tmp, _, Attr, CompileInfo, [_|_]} =
+	beam_disasm:file(BeamName),
+    ?line true = is_list(Attr),
+    ?line true = is_list(CompileInfo),
+    ?line {ok, {tmp, _}} = beam_lib:strip(BeamName),
+    ?line {beam_file, tmp, _, none, none, [_|_]} =
+	beam_disasm:file(BeamName),
+    ok.
diff --git a/lib/compiler/test/error_SUITE.erl b/lib/compiler/test/error_SUITE.erl
index 6e0aadf007..eb5e50818e 100644
--- a/lib/compiler/test/error_SUITE.erl
+++ b/lib/compiler/test/error_SUITE.erl
@@ -183,23 +183,47 @@ get_compilation_errors(Config, Filename) ->
     E.
 
 warnings_as_errors(Config) when is_list(Config) ->
-    Ts = [{warnings_as_errors,
+    ?line TestFile = test_filename(Config),
+    ?line BeamFile = filename:rootname(TestFile, ".erl") ++ ".beam",
+    ?line OutDir = ?config(priv_dir, Config),
+
+    Ts1 = [{warnings_as_errors,
            <<"
                t() ->
                  A = unused,
                  ok.
              ">>,
-           [export_all,warnings_as_errors],
-          {error,
-           [],
-           [{3,erl_lint,{unused_var,'A'}}]} }],
-    ?line [] = run(Config, Ts),
+	    [warnings_as_errors, export_all, {outdir, OutDir}],
+	    {error,
+	     [],
+	     [{3,erl_lint,{unused_var,'A'}}]} }],
+    ?line [] = run(Ts1, TestFile, write_beam),
+    ?line false = filelib:is_regular(BeamFile),
+
+    Ts2 = [{warning_unused_var,
+           <<"
+               t() ->
+                 A = unused,
+                 ok.
+             ">>,
+	    [return_warnings, export_all, {outdir, OutDir}],
+	    {warning,
+	       [{3,erl_lint,{unused_var,'A'}}]} }],
+
+    ?line [] = run(Ts2, TestFile, write_beam),
+    ?line true = filelib:is_regular(BeamFile),
+    ?line ok = file:delete(BeamFile),
+
     ok.
 
 
 run(Config, Tests) ->
+    ?line File = test_filename(Config),
+    run(Tests, File, dont_write_beam).
+
+run(Tests, File, WriteBeam) ->
     F = fun({N,P,Ws,E}, BadL) ->
-                case catch run_test(Config, P, Ws) of
+                case catch run_test(P, File, Ws, WriteBeam) of
                     E -> 
                         BadL;
                     Bad -> 
@@ -211,8 +235,12 @@ run(Config, Tests) ->
     lists:foldl(F, [], Tests).
 
 run2(Config, Tests) ->
+    ?line File = test_filename(Config),
+    run2(Tests, File, dont_write_beam).
+
+run2(Tests, File, WriteBeam) ->
     F = fun({N,P,Ws,E}, BadL) ->
-                case catch filter(run_test(Config, P, Ws)) of
+                case catch filter(run_test(P, File, Ws, WriteBeam)) of
                     E ->
                         BadL;
                     Bad ->
@@ -231,12 +259,19 @@ filter(X) ->
 
 %% Compiles a test module and returns the list of errors and warnings.
 
-run_test(Conf, Test0, Warnings) ->
-    Filename = 'errors_test.erl',
-    ?line DataDir = ?config(priv_dir, Conf),
+test_filename(Conf) ->
+    Filename = "errors_test.erl",
+    DataDir = ?config(priv_dir, Conf),
+    filename:join(DataDir, Filename).
+
+run_test(Test0, File, Warnings, WriteBeam) ->
     ?line Test = ["-module(errors_test). ", Test0],
-    ?line File = filename:join(DataDir, Filename),
-    ?line Opts = [binary,return_errors|Warnings],
+    ?line Opts = case WriteBeam of
+		     dont_write_beam ->
+			 [binary,return_errors|Warnings];
+		     write_beam ->
+			 [return_errors|Warnings]
+		 end,
     ?line ok = file:write_file(File, Test),
 
     %% Compile once just to print all errors and warnings.
@@ -252,6 +287,10 @@ run_test(Conf, Test0, Warnings) ->
 			%io:format("compile:file(~s,~p) ->~n~p~n",
 			%	  [File,Opts,Ws]),
 			[];
+		    {ok,errors_test,[{_File,Ws}]} ->
+			{warning,Ws};
+		    {ok,errors_test,[]} ->
+			[];
 		    {error,[{XFile,Es}],Ws} = _ZZ when is_list(XFile) ->
 			%io:format("compile:file(~s,~p) ->~n~p~n",
 			%	  [File,Opts,_ZZ]),
diff --git a/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl b/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl
index e222c5b92b..5dbe6f6b2f 100644
--- a/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl
+++ b/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl
@@ -792,7 +792,7 @@ target_FTS_operation(State, _SrcFile, DestFile, Op, Offset) ->
             %% Delete the temporary local copy.
 	    delete_tmp_file(TempName, 
 			    "Transfer completed but failed to remove temporary local copy."),
-            %% Completed the transfer succesfully.
+            %% Completed the transfer successfully.
 	    {reply, ok, State};
 	{error, epath} ->
 	    delete_tmp_file(TempName,
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 775e5a9b89..285537643e 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -41,6 +41,7 @@ CFLAGS = $(DED_CFLAGS)
 SSL_LIBDIR = @SSL_LIBDIR@
 SSL_INCLUDE = @SSL_INCLUDE@
 SSL_CRYPTO_LIBNAME = @SSL_CRYPTO_LIBNAME@
+SSL_SSL_LIBNAME = @SSL_SSL_LIBNAME@
 
 
 INCLUDES = $(SSL_INCLUDE) $(DED_INCLUDES)
@@ -84,7 +85,7 @@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
 
 ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
 SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
-CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
+CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
 else
 SSL_DED_LD_RUNTIME_LIBRARY_PATH=
 CRYPTO_LINK_LIB=$(SSL_LIBDIR)/lib$(SSL_CRYPTO_LIBNAME).a 
@@ -108,7 +109,7 @@ $(LIBDIR)/crypto$(TYPEMARKER).so: $(OBJS)
 
 $(LIBDIR)/crypto$(TYPEMARKER).dll: $(OBJS)
 	$(INSTALL_DIR) $(LIBDIR)
-	$(LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(OBJS) -l$(SSL_CRYPTO_LIBNAME)
+	$(LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(OBJS) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
 
 clean:
 ifeq ($(findstring win32,$(TARGET)), win32)
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index c781ccb302..83772d9023 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -43,6 +43,7 @@
 #include <openssl/aes.h>
 #include <openssl/md5.h>
 #include <openssl/md4.h>
+#include <openssl/md2.h>
 #include <openssl/sha.h>
 #include <openssl/bn.h>
 #include <openssl/objects.h>
@@ -267,6 +268,7 @@ static ERL_NIF_TERM atom_true;
 static ERL_NIF_TERM atom_false;
 static ERL_NIF_TERM atom_sha;
 static ERL_NIF_TERM atom_md5;
+static ERL_NIF_TERM atom_md2;
 static ERL_NIF_TERM atom_ripemd160;
 static ERL_NIF_TERM atom_error;
 static ERL_NIF_TERM atom_rsa_pkcs1_padding;
@@ -337,6 +339,7 @@ static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
     atom_false = enif_make_atom(env,"false");
     atom_sha = enif_make_atom(env,"sha");
     atom_md5 = enif_make_atom(env,"md5");
+    atom_md2 = enif_make_atom(env,"md2");
     atom_ripemd160 = enif_make_atom(env,"ripemd160");
     atom_error = enif_make_atom(env,"error");
     atom_rsa_pkcs1_padding = enif_make_atom(env,"rsa_pkcs1_padding");
@@ -1047,16 +1050,28 @@ static ERL_NIF_TERM dss_verify(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv
     return(i > 0) ? atom_true : atom_false;
 }
 
+struct hash_def {
+    int type;
+    unsigned int m_len;
+    unsigned char * (*func) (const unsigned char *d, size_t n, unsigned char *md);
+};
+
+static const struct hash_def md2_hash_def  = { NID_md2,  MD2_DIGEST_LENGTH, &MD2};
+static const struct hash_def md5_hash_def  = { NID_md5,  MD5_DIGEST_LENGTH, &MD5};
+static const struct hash_def sha1_hash_def = { NID_sha1, SHA_DIGEST_LENGTH, &SHA1};
+
 static ERL_NIF_TERM rsa_verify(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Type, Data, Signature, Key=[E,N]) */
     ErlNifBinary data_bin, sign_bin;
     unsigned char hmacbuf[SHA_DIGEST_LENGTH];
     ERL_NIF_TERM head, tail, ret;
-    int i, is_sha;
+    int i;
     RSA* rsa = RSA_new();
+    const struct hash_def *hash_def = NULL;
 
-    if (argv[0] == atom_sha) is_sha = 1;
-    else if (argv[0] == atom_md5) is_sha = 0;
+    if      (argv[0] == atom_sha)  hash_def = &sha1_hash_def;
+    else if (argv[0] == atom_md5)  hash_def = &md5_hash_def;
+    else if (argv[0] == atom_md2)  hash_def = &md2_hash_def;
     else goto badarg;
 
     if (!inspect_mpint(env, argv[1], &data_bin)
@@ -1070,16 +1085,9 @@ static ERL_NIF_TERM rsa_verify(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv
 	ret = enif_make_badarg(env);
     }
     else {
-	if (is_sha) {
-	    SHA1(data_bin.data+4, data_bin.size-4, hmacbuf);
-	    i = RSA_verify(NID_sha1, hmacbuf, SHA_DIGEST_LENGTH,
-			   sign_bin.data+4, sign_bin.size-4, rsa);
-	}
-	else {
-	    MD5(data_bin.data+4, data_bin.size-4, hmacbuf);
-	    i = RSA_verify(NID_md5, hmacbuf, MD5_DIGEST_LENGTH,
-			   sign_bin.data+4, sign_bin.size-4, rsa);
-	}
+	(void) *hash_def->func(data_bin.data+4, data_bin.size-4, hmacbuf);
+	i = RSA_verify(hash_def->type, hmacbuf, hash_def->m_len,
+		       sign_bin.data+4, sign_bin.size-4, rsa);
 	ret = (i==1 ? atom_true : atom_false);
     }
     RSA_free(rsa);
@@ -1221,10 +1229,12 @@ static ERL_NIF_TERM rsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
     unsigned char hmacbuf[SHA_DIGEST_LENGTH];
     unsigned rsa_s_len;
     RSA *rsa = RSA_new();
-    int i, is_sha;
+    int i;
+    const struct hash_def *hash_def = NULL;
 
-    if (argv[0] == atom_sha) is_sha = 1;
-    else if (argv[0] == atom_md5) is_sha = 0;
+    if      (argv[0] == atom_sha)  hash_def = &sha1_hash_def;
+    else if (argv[0] == atom_md5)  hash_def = &md5_hash_def;
+    else if (argv[0] == atom_md2)  hash_def = &md2_hash_def;
     else goto badarg;
 
     if (!inspect_mpint(env,argv[1],&data_bin)
@@ -1240,18 +1250,10 @@ static ERL_NIF_TERM rsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
 	return enif_make_badarg(env);
     }
     enif_alloc_binary(RSA_size(rsa), &ret_bin);
-    if (is_sha) {
-	SHA1(data_bin.data+4, data_bin.size-4, hmacbuf);
-	ERL_VALGRIND_ASSERT_MEM_DEFINED(hmacbuf, SHA_DIGEST_LENGTH);
-	i =  RSA_sign(NID_sha1, hmacbuf, SHA_DIGEST_LENGTH,
-		      ret_bin.data, &rsa_s_len, rsa);
-    }
-    else {
-	MD5(data_bin.data+4, data_bin.size-4, hmacbuf);
-	ERL_VALGRIND_ASSERT_MEM_DEFINED(hmacbuf, MD5_DIGEST_LENGTH);
-	i = RSA_sign(NID_md5, hmacbuf,MD5_DIGEST_LENGTH,
-		     ret_bin.data, &rsa_s_len, rsa);     
-    }
+    (void) *hash_def->func(data_bin.data+4, data_bin.size-4, hmacbuf);
+    ERL_VALGRIND_ASSERT_MEM_DEFINED(hmacbuf, hash_def->m_len);
+    i =  RSA_sign(hash_def->type, hmacbuf, hash_def->m_len,
+		  ret_bin.data, &rsa_s_len, rsa);
     RSA_free(rsa);
     if (i) {
 	ERL_VALGRIND_MAKE_MEM_DEFINED(ret_bin.data, rsa_s_len);
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 179ba4498c..b593958264 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -347,7 +347,7 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
     </func>
     <func>
       <name>sha_mac_96(Key, Data) -> Mac</name>
-      <fsummary>Compute an <c>MD5 MAC</c>message authentification code</fsummary>
+      <fsummary>Compute an <c>SHA MAC</c>message authentification code</fsummary>
       <type>
         <v>Key = Data = iolist() | binary()</v>
         <v>Mac = binary()</v>
@@ -744,7 +744,7 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
         <p>Generate a random number <c><![CDATA[N, Lo =< N < Hi.]]></c> Uses the
           <c>crypto</c> library pseudo-random number generator. The
           arguments (and result) can be either erlang integers or binary
-          multi-precision integers.</p>
+          multi-precision integers. <c>Hi</c> must be larger than <c>Lo</c>.</p>
       </desc>
     </func>
     <func>
@@ -795,7 +795,7 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
         <v>E, N, D = Mpint</v>
         <d>Where <c>E</c> is the public exponent, <c>N</c> is public modulus and 
 	  <c>D</c> is the private exponent.</d>
-	<v>DigestType = md5 | sha</v>
+	<v>DigestType = md2 | md5 | sha</v>
 	<d>The default <c>DigestType</c> is sha.</d>
         <v>Mpint = binary()</v>
         <v>Signature = binary()</v>
@@ -817,7 +817,7 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
         <v>Key = [E, N]</v>
         <v>E, N = Mpint</v>
         <d>Where <c>E</c> is the public exponent and <c>N</c> is public modulus.</d>
-	<v>DigestType = md5 | sha</v>
+	<v>DigestType = md2 | md5 | sha</v>
 	<d> The default <c>DigestType</c> is sha.</d>
         <v>Mpint = binary()</v>
       </type>
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index c35dfcebab..ddad00f4b4 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -91,7 +91,7 @@
                     aes_ctr_stream_init, aes_ctr_stream_encrypt, aes_ctr_stream_decrypt,
 		    info_lib]).
 
--type rsa_digest_type() :: 'md5' | 'sha'.
+-type rsa_digest_type() :: 'md2' | 'md5' | 'sha'.
 -type dss_digest_type() :: 'none' | 'sha'.
 -type crypto_integer() :: binary() | integer().
 
@@ -415,6 +415,13 @@ rand_uniform(From,To) when is_binary(From), is_binary(To) ->
 	    Whatever
     end;
 rand_uniform(From,To) when is_integer(From),is_integer(To) ->
+    if From < 0 -> 
+	    rand_uniform_pos(0, To - From) + From;
+       true ->
+	    rand_uniform_pos(From, To)
+    end.
+
+rand_uniform_pos(From,To) when From < To ->
     BinFrom = mpint(From),
     BinTo = mpint(To),
     case rand_uniform(BinFrom, BinTo) of
@@ -422,7 +429,9 @@ rand_uniform(From,To) when is_integer(From),is_integer(To) ->
             erlint(Result);
         Other ->
             Other
-    end.
+    end;
+rand_uniform_pos(_,_) ->
+    error(badarg).
 
 rand_uniform_nif(_From,_To) -> ?nif_stub.     
 
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 283aadb6ea..2fa058c852 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -878,10 +878,17 @@ rand_uniform_aux_test(0) ->
 rand_uniform_aux_test(N) ->
     ?line L = N*1000,
     ?line H = N*100000+1,
+    ?line crypto_rand_uniform(L, H),
+    ?line crypto_rand_uniform(-L, L),
+    ?line crypto_rand_uniform(-H, -L),
+    ?line crypto_rand_uniform(-H, L),
+    ?line rand_uniform_aux_test(N-1).
+
+crypto_rand_uniform(L,H) ->
     ?line R1 = crypto:rand_uniform(L, H),
     ?line t(R1 >= L),
-    ?line t(R1 < H),
-    ?line rand_uniform_aux_test(N-1).
+    ?line t(R1 < H).
+
 
 %%
 %%
@@ -1075,16 +1082,30 @@ rsa_sign_test(Config) when is_list(Config) ->
     
     PrivKey = [crypto:mpint(PubEx), crypto:mpint(Mod), crypto:mpint(PrivEx)],
     PubKey  = [crypto:mpint(PubEx), crypto:mpint(Mod)],
-    ?line Sig1 = crypto:rsa_sign(sized_binary(Msg), PrivKey),
-    ?line m(crypto:rsa_verify(sized_binary(Msg), sized_binary(Sig1),PubKey), true),
+    ?line Sig = crypto:rsa_sign(sized_binary(Msg), PrivKey),
+    ?line m(crypto:rsa_verify(sized_binary(Msg), sized_binary(Sig),PubKey), true),
     
-    ?line Sig2 = crypto:rsa_sign(md5, sized_binary(Msg), PrivKey),
-    ?line m(crypto:rsa_verify(md5, sized_binary(Msg), sized_binary(Sig2),PubKey), true),
-    
-    ?line m(Sig1 =:= Sig2, false),
-    ?line m(crypto:rsa_verify(md5, sized_binary(Msg), sized_binary(Sig1),PubKey), false),
-    ?line m(crypto:rsa_verify(sha, sized_binary(Msg), sized_binary(Sig1),PubKey), true),
+    ?line Sig_md2 = crypto:rsa_sign(md2, sized_binary(Msg), PrivKey),
+    ?line Sig_md5 = crypto:rsa_sign(md5, sized_binary(Msg), PrivKey),
+    ?line Sig_sha = crypto:rsa_sign(sha, sized_binary(Msg), PrivKey),
+
+    ?line m(Sig =:= Sig_sha, true),
+    ?line m(Sig_md2 =:= Sig_md5, false),
+    ?line m(Sig_md2 =:= Sig_sha, false),
+    ?line m(Sig_md5 =:= Sig_sha, false),
   
+    ?line m(crypto:rsa_verify(md2, sized_binary(Msg), sized_binary(Sig_md2),PubKey), true),
+    ?line m(crypto:rsa_verify(md2, sized_binary(Msg), sized_binary(Sig_md5),PubKey), false),
+    ?line m(crypto:rsa_verify(md2, sized_binary(Msg), sized_binary(Sig_sha),PubKey), false),
+
+    ?line m(crypto:rsa_verify(md5, sized_binary(Msg), sized_binary(Sig_md2),PubKey), false),
+    ?line m(crypto:rsa_verify(md5, sized_binary(Msg), sized_binary(Sig_md5),PubKey), true),
+    ?line m(crypto:rsa_verify(md5, sized_binary(Msg), sized_binary(Sig_sha),PubKey), false),
+
+    ?line m(crypto:rsa_verify(sha, sized_binary(Msg), sized_binary(Sig_md2),PubKey), false),
+    ?line m(crypto:rsa_verify(sha, sized_binary(Msg), sized_binary(Sig_md5),PubKey), false),
+    ?line m(crypto:rsa_verify(sha, sized_binary(Msg), sized_binary(Sig_sha),PubKey), true),
+
     ok.
     
 dsa_sign_test(doc) ->
diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl
index 8cb16d8f09..659297f993 100644
--- a/lib/dialyzer/src/dialyzer_dataflow.erl
+++ b/lib/dialyzer/src/dialyzer_dataflow.erl
@@ -528,7 +528,7 @@ handle_apply(Tree, Map, State) ->
       {CallSitesKnown, FunList} =
 	case state__lookup_call_site(Tree, State2) of
 	  error -> {false, []};
-	  {ok, [external]} -> {false, {}};
+	  {ok, [external]} -> {false, []};
 	  {ok, List} -> {true, List}
 	end,
       case CallSitesKnown of
@@ -554,7 +554,13 @@ handle_apply(Tree, Map, State) ->
 		  {State3, enter_type(Op, OpType1, Map2), t_none()};
 		false ->
 		  Map3 = enter_type_lists(Args, NewArgs, Map2),
-		  {State2, enter_type(Op, OpType1, Map3), t_fun_range(OpType1)}
+		  Range0 = t_fun_range(OpType1),
+		  Range =
+		    case t_is_unit(Range0) of
+		      true  -> t_none();
+		      false -> Range0
+		    end,
+		  {State2, enter_type(Op, OpType1, Map3), Range}
 	      end
 	  end;
 	true ->
@@ -2946,7 +2952,7 @@ state__get_warnings(#state{tree_map = TreeMap, fun_tab = FunTab,
 		%% Check if the function has a contract that allows this.
 		Warn =
 		  case Contract of
-		    none -> true;
+		    none -> not parent_allows_this(FunLbl, State);
 		    {value, C} ->
 		      GenRet = dialyzer_contracts:get_contract_return(C),
 		      not t_is_unit(GenRet)
@@ -3434,6 +3440,33 @@ map_pats(Pats) ->
 	end,
   cerl_trees:map(Fun, Pats).
 
+parent_allows_this(FunLbl, #state{callgraph = Callgraph, plt = Plt} =State) ->
+  case state__is_escaping(FunLbl, State) of
+    false -> false; % if it isn't escaping it can't be a return value
+    true ->
+      case state__lookup_name(FunLbl, State) of
+	{_M, _F, _A} -> false; % if it has a name it is not a fun
+	_ ->
+	  case dialyzer_callgraph:in_neighbours(FunLbl, Callgraph) of
+	    [Parent] ->
+	      case state__lookup_name(Parent, State) of
+		{_M, _F, _A} = PMFA ->
+		  case dialyzer_plt:lookup_contract(Plt, PMFA) of
+		    none -> false;
+		    {value, C} ->
+		      GenRet = dialyzer_contracts:get_contract_return(C),
+		      case erl_types:t_is_fun(GenRet) of
+			false -> false; % element of structure? far-fetched...
+			true -> t_is_unit(t_fun_range(GenRet))
+		      end
+		  end;
+		_ -> false % parent should have a name to have a contract
+	      end;
+	    _ -> false % called in other funs? far-fetched...
+	  end
+      end
+  end.
+
 classify_returns(Tree) ->
   case find_terminals(cerl:fun_body(Tree)) of
     {false, false} -> no_match;
diff --git a/lib/dialyzer/src/dialyzer_typesig.erl b/lib/dialyzer/src/dialyzer_typesig.erl
index 65c2ff76bb..06863d89a7 100644
--- a/lib/dialyzer/src/dialyzer_typesig.erl
+++ b/lib/dialyzer/src/dialyzer_typesig.erl
@@ -62,7 +62,8 @@
 -type dep()      :: integer().  %% type variable names used as constraint ids
 -type type_var() :: erl_types:erl_type(). %% actually: {'c','var',_,_}
 
--record(fun_var, {'fun' :: fun((_) -> erl_types:erl_type()), deps :: [dep()]}).
+-record(fun_var, {'fun' :: fun((_) -> erl_types:erl_type()), deps :: [dep()],
+		  origin :: integer()}).
 
 -type constr_op()    :: 'eq' | 'sub'.
 -type fvar_or_type() :: #fun_var{} | erl_types:erl_type().
@@ -121,8 +122,10 @@
 
 -ifdef(DEBUG).
 -define(debug(__String, __Args), io:format(__String, __Args)).
+-define(mk_fun_var(Fun, Vars), mk_fun_var(?LINE, Fun, Vars)).
 -else.
 -define(debug(__String, __Args), ok).
+-define(mk_fun_var(Fun, Vars), mk_fun_var(Fun, Vars)).
 -endif.
 
 %% ============================================================================
@@ -218,10 +221,10 @@ traverse(Tree, DefinedVars, State) ->
     binary ->
       {State1, SegTypes} = traverse_list(cerl:binary_segments(Tree),
 					 DefinedVars, State),
-      Type = mk_fun_var(fun(Map) ->
-			    TmpSegTypes = lookup_type_list(SegTypes, Map),
-			    t_bitstr_concat(TmpSegTypes)
-			end, SegTypes),
+      Type = ?mk_fun_var(fun(Map) ->
+			     TmpSegTypes = lookup_type_list(SegTypes, Map),
+			     t_bitstr_concat(TmpSegTypes)
+			 end, SegTypes),
       {state__store_conj(mk_var(Tree), sub, Type, State1), mk_var(Tree)};
     bitstr ->
       Size = cerl:bitstr_size(Tree),
@@ -236,7 +239,7 @@ traverse(Tree, DefinedVars, State) ->
 	  N when is_integer(N) -> {State1, t_bitstr(0, N)};
 	  any -> % Size is not a literal
 	    {state__store_conj(SizeType, sub, t_non_neg_integer(), State1),
-	     mk_fun_var(bitstr_constr(SizeType, UnitVal), [SizeType])}
+	     ?mk_fun_var(bitstr_constr(SizeType, UnitVal), [SizeType])}
 	end,
       ValTypeConstr =
 	case cerl:concrete(cerl:bitstr_type(Tree)) of
@@ -250,8 +253,8 @@ traverse(Tree, DefinedVars, State) ->
 	    case state__is_in_match(State1) of
 	      true ->
 		Flags = cerl:concrete(cerl:bitstr_flags(Tree)),
-		mk_fun_var(bitstr_val_constr(SizeType, UnitVal, Flags),
-			   [SizeType]);
+		?mk_fun_var(bitstr_val_constr(SizeType, UnitVal, Flags),
+			    [SizeType]);
 	      false -> t_integer()
 	    end;
 	  utf8  -> t_integer();
@@ -281,24 +284,24 @@ traverse(Tree, DefinedVars, State) ->
 	  {State, t_cons(HdVar, TlVar)};
 	false ->
 	  ConsVar = mk_var(Tree),
-	  ConsType = mk_fun_var(fun(Map) ->
-				    t_cons(lookup_type(HdVar, Map),
-					   lookup_type(TlVar, Map))
-				end, [HdVar, TlVar]),
-	  HdType = mk_fun_var(fun(Map) ->
-				  Cons = lookup_type(ConsVar, Map),
-				  case t_is_cons(Cons) of
-				    false -> t_any();
-				    true -> t_cons_hd(Cons)
-				  end
-			      end, [ConsVar]),
-	  TlType = mk_fun_var(fun(Map) ->
-				  Cons = lookup_type(ConsVar, Map),
-				  case t_is_cons(Cons) of
-				    false -> t_any();
-				    true -> t_cons_tl(Cons)
-				  end
-			      end, [ConsVar]),
+	  ConsType = ?mk_fun_var(fun(Map) ->
+				     t_cons(lookup_type(HdVar, Map),
+					    lookup_type(TlVar, Map))
+				 end, [HdVar, TlVar]),
+	  HdType = ?mk_fun_var(fun(Map) ->
+				   Cons = lookup_type(ConsVar, Map),
+				   case t_is_cons(Cons) of
+				     false -> t_any();
+				     true -> t_cons_hd(Cons)
+				   end
+			       end, [ConsVar]),
+	  TlType = ?mk_fun_var(fun(Map) ->
+				   Cons = lookup_type(ConsVar, Map),
+				   case t_is_cons(Cons) of
+				     false -> t_any();
+				     true -> t_cons_tl(Cons)
+				   end
+			       end, [ConsVar]),
 	  State2 = state__store_conj_lists([HdVar, TlVar, ConsVar], sub,
 					   [HdType, TlType, ConsType],
 					   State1),
@@ -656,25 +659,25 @@ get_plt_constr(MFA, Dst, ArgVars, State) ->
       {RetType, ArgCs} =
 	case PltRes of
 	  none ->
-	    {mk_fun_var(fun(Map) ->
-			    ArgTypes = lookup_type_list(ArgVars, Map),
-			    dialyzer_contracts:get_contract_return(C, ArgTypes)
-			end, ArgVars), GenArgs};
+	    {?mk_fun_var(fun(Map) ->
+			     ArgTypes = lookup_type_list(ArgVars, Map),
+			     dialyzer_contracts:get_contract_return(C, ArgTypes)
+			 end, ArgVars), GenArgs};
 	  {value, {PltRetType, PltArgTypes}} ->
 	    %% Need to combine the contract with the success typing.
-	    {mk_fun_var(
-	       fun(Map) ->
-		   ArgTypes0 = lookup_type_list(ArgVars, Map),
-		   ArgTypes = case FunModule =:= Module of
-				false ->
-				  List = lists:zip(PltArgTypes, ArgTypes0),
-				  [erl_types:t_unopaque_on_mismatch(T1, T2, Opaques)
-				   || {T1, T2} <- List];
-				true -> ArgTypes0
-			      end,
-		   CRet = dialyzer_contracts:get_contract_return(C, ArgTypes),
-		   t_inf(CRet, PltRetType, opaque)
-	       end, ArgVars),
+	    {?mk_fun_var(
+		fun(Map) ->
+		    ArgTypes0 = lookup_type_list(ArgVars, Map),
+		    ArgTypes = case FunModule =:= Module of
+				 false ->
+				   List = lists:zip(PltArgTypes, ArgTypes0),
+				   [erl_types:t_unopaque_on_mismatch(T1, T2, Opaques)
+				    || {T1, T2} <- List];
+				 true -> ArgTypes0
+			       end,
+		    CRet = dialyzer_contracts:get_contract_return(C, ArgTypes),
+		    t_inf(CRet, PltRetType, opaque)
+		end, ArgVars),
 	     [t_inf(X, Y, opaque) || {X, Y} <- lists:zip(GenArgs, PltArgTypes)]}
 	end,
       state__store_conj_lists([Dst|ArgVars], sub, [RetType|ArgCs], State)
@@ -766,10 +769,10 @@ handle_clauses_1([Clause|Tail], TopVar, Arg, DefinedVars,
 	  case SubtrTypes =:= overflow of
 	    true -> S;
 	    false ->
-	      SubtrPatVar = mk_fun_var(fun(Map) ->
-					   TmpType = lookup_type(Arg, Map),
-					   t_subtract_list(TmpType, SubtrTypes)
-				       end, [Arg]),
+	      SubtrPatVar = ?mk_fun_var(fun(Map) ->
+					    TmpType = lookup_type(Arg, Map),
+					    t_subtract_list(TmpType, SubtrTypes)
+					end, [Arg]),
 	      state__store_conj(Arg, sub, SubtrPatVar, S)
 	  end
       end,
@@ -1043,10 +1046,10 @@ handle_guard(Guard, DefinedVars, State) ->
 
 get_bif_constr({erlang, Op, 2}, Dst, Args = [Arg1, Arg2], _State)
   when Op =:= '+'; Op =:= '-'; Op =:= '*' ->
-  ReturnType = mk_fun_var(fun(Map) ->
-			      TmpArgTypes = lookup_type_list(Args, Map),
-			      erl_bif_types:type(erlang, Op, 2, TmpArgTypes)
-			  end, Args),
+  ReturnType = ?mk_fun_var(fun(Map) ->
+			       TmpArgTypes = lookup_type_list(Args, Map),
+			       erl_bif_types:type(erlang, Op, 2, TmpArgTypes)
+			   end, Args),
   ArgFun =
     fun(A, Pos) ->
 	F =
@@ -1074,7 +1077,7 @@ get_bif_constr({erlang, Op, 2}, Dst, Args = [Arg1, Arg2], _State)
 		  end
 	      end
 	  end,
-	mk_fun_var(F, [Dst, A])
+	?mk_fun_var(F, [Dst, A])
     end,
   Arg1FunVar = ArgFun(Arg2, 2),
   Arg2FunVar = ArgFun(Arg1, 1),
@@ -1131,12 +1134,12 @@ get_bif_constr({erlang, Op, 2}, Dst, [Arg1, Arg2] = Args, _State)
       '>=' -> {ArgFun(Arg1, Arg2, '>='), ArgFun(Arg2, Arg1, '=<')}
     end,
   DstArgs = [Dst, Arg1, Arg2],
-  Arg1Var = mk_fun_var(Arg1Fun, DstArgs),
-  Arg2Var = mk_fun_var(Arg2Fun, DstArgs),
-  DstVar = mk_fun_var(fun(Map) ->
-			  TmpArgTypes = lookup_type_list(Args, Map),
-			  erl_bif_types:type(erlang, Op, 2, TmpArgTypes)
-		      end, Args),
+  Arg1Var = ?mk_fun_var(Arg1Fun, DstArgs),
+  Arg2Var = ?mk_fun_var(Arg2Fun, DstArgs),
+  DstVar = ?mk_fun_var(fun(Map) ->
+			   TmpArgTypes = lookup_type_list(Args, Map),
+			   erl_bif_types:type(erlang, Op, 2, TmpArgTypes)
+		       end, Args),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstVar),
 			   mk_constraint(Arg1, sub, Arg1Var),
 			   mk_constraint(Arg2, sub, Arg2Var)]);
@@ -1172,13 +1175,13 @@ get_bif_constr({erlang, '++', 2}, Dst, [Hd, Tl] = Args, _State) ->
 	      end
 	  end,
   DstL = [Dst],
-  HdVar = mk_fun_var(HdFun, DstL),
-  TlVar = mk_fun_var(TlFun, DstL),
+  HdVar = ?mk_fun_var(HdFun, DstL),
+  TlVar = ?mk_fun_var(TlFun, DstL),
   ArgTypes = erl_bif_types:arg_types(erlang, '++', 2),
-  ReturnType = mk_fun_var(fun(Map) ->
-			      TmpArgTypes = lookup_type_list(Args, Map),
-			      erl_bif_types:type(erlang, '++', 2, TmpArgTypes)
-			  end, Args),
+  ReturnType = ?mk_fun_var(fun(Map) ->
+			       TmpArgTypes = lookup_type_list(Args, Map),
+			       erl_bif_types:type(erlang, '++', 2, TmpArgTypes)
+			   end, Args),
   Cs = mk_constraints(Args, sub, ArgTypes),
   mk_conj_constraint_list([mk_constraint(Dst, sub, ReturnType),
 			   mk_constraint(Hd, sub, HdVar),
@@ -1209,7 +1212,7 @@ get_bif_constr({erlang, is_function, 2}, Dst, [Fun, Arity], _State) ->
 		 false -> t_any()
 	       end
 	   end,
-  ArgV = mk_fun_var(ArgFun, [Dst, Arity]),
+  ArgV = ?mk_fun_var(ArgFun, [Dst, Arity]),
   mk_conj_constraint_list([mk_constraint(Dst, sub, t_boolean()),
 			   mk_constraint(Arity, sub, t_integer()),
 			   mk_constraint(Fun, sub, ArgV)]);
@@ -1232,12 +1235,12 @@ get_bif_constr({erlang, is_record, 2}, Dst, [Var, Tag] = Args, _State) ->
 		 false -> t_any()
 	       end
 	   end,
-  ArgV = mk_fun_var(ArgFun, [Dst]),
+  ArgV = ?mk_fun_var(ArgFun, [Dst]),
   DstFun = fun(Map) ->
 	       TmpArgTypes = lookup_type_list(Args, Map),
 	       erl_bif_types:type(erlang, is_record, 2, TmpArgTypes)
 	   end,
-  DstV = mk_fun_var(DstFun, Args),
+  DstV = ?mk_fun_var(DstFun, Args),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Tag, sub, t_atom()),
 			   mk_constraint(Var, sub, ArgV)]);
@@ -1280,7 +1283,7 @@ get_bif_constr({erlang, is_record, 3}, Dst, [Var, Tag, Arity] = Args, State) ->
 	  false -> t_any()
 	end
     end,
-  ArgV = mk_fun_var(ArgFun, [Tag, Arity, Dst]),
+  ArgV = ?mk_fun_var(ArgFun, [Tag, Arity, Dst]),
   DstFun = fun(Map) ->
 	       [TmpVar, TmpTag, TmpArity] = TmpArgTypes = lookup_type_list(Args, Map),
 	       TmpArgTypes2 =
@@ -1314,7 +1317,7 @@ get_bif_constr({erlang, is_record, 3}, Dst, [Var, Tag, Arity] = Args, State) ->
 		 end,
 	       erl_bif_types:type(erlang, is_record, 3, TmpArgTypes2)
 	   end,
-  DstV = mk_fun_var(DstFun, Args),
+  DstV = ?mk_fun_var(DstFun, Args),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Arity, sub, t_integer()),
 			   mk_constraint(Tag, sub, t_atom()),
@@ -1359,9 +1362,9 @@ get_bif_constr({erlang, 'and', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 		   end
 	       end
 	   end,
-  ArgV1 = mk_fun_var(ArgFun(Arg2), [Arg2, Dst]),
-  ArgV2 = mk_fun_var(ArgFun(Arg1), [Arg1, Dst]),
-  DstV = mk_fun_var(DstFun, Args),
+  ArgV1 = ?mk_fun_var(ArgFun(Arg2), [Arg2, Dst]),
+  ArgV2 = ?mk_fun_var(ArgFun(Arg1), [Arg1, Dst]),
+  DstV = ?mk_fun_var(DstFun, Args),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Arg1, sub, ArgV1),
 			   mk_constraint(Arg2, sub, ArgV2)]);
@@ -1403,9 +1406,9 @@ get_bif_constr({erlang, 'or', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 		   end
 	       end
 	   end,
-  ArgV1 = mk_fun_var(ArgFun(Arg2), [Arg2, Dst]),
-  ArgV2 = mk_fun_var(ArgFun(Arg1), [Arg1, Dst]),
-  DstV = mk_fun_var(DstFun, Args),
+  ArgV1 = ?mk_fun_var(ArgFun(Arg2), [Arg2, Dst]),
+  ArgV2 = ?mk_fun_var(ArgFun(Arg1), [Arg1, Dst]),
+  DstV = ?mk_fun_var(DstFun, Args),
   F = fun(A) ->
 	  try [mk_constraint(A, sub, True)]
 	  catch throw:error -> []
@@ -1433,8 +1436,8 @@ get_bif_constr({erlang, 'not', 1}, Dst, [Arg] = Args, _State) ->
 		end
 	    end
 	end,
-  ArgV = mk_fun_var(Fun(Dst), [Dst]),
-  DstV = mk_fun_var(Fun(Arg), Args),
+  ArgV = ?mk_fun_var(Fun(Dst), [Dst]),
+  DstV = ?mk_fun_var(Fun(Arg), Args),
   mk_conj_constraint_list([mk_constraint(Arg, sub, ArgV),
 			   mk_constraint(Dst, sub, DstV)]);
 get_bif_constr({erlang, '=:=', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
@@ -1467,9 +1470,9 @@ get_bif_constr({erlang, '=:=', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 	       end
 	   end,
   DstArgs = [Dst, Arg1, Arg2],
-  ArgV1 = mk_fun_var(ArgFun(Arg1, Arg2), DstArgs),
-  ArgV2 = mk_fun_var(ArgFun(Arg2, Arg1), DstArgs),
-  DstV = mk_fun_var(DstFun, Args),
+  ArgV1 = ?mk_fun_var(ArgFun(Arg1, Arg2), DstArgs),
+  ArgV2 = ?mk_fun_var(ArgFun(Arg2, Arg1), DstArgs),
+  DstV = ?mk_fun_var(DstFun, Args),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Arg1, sub, ArgV1),
 			   mk_constraint(Arg2, sub, ArgV2)]);
@@ -1510,10 +1513,10 @@ get_bif_constr({erlang, '==', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 	    end
 	end
     end,
-  DstV = mk_fun_var(DstFun, Args),
+  DstV = ?mk_fun_var(DstFun, Args),
   ArgL = [Arg1, Arg2, Dst],
-  ArgV1 = mk_fun_var(ArgFun(Arg2, Arg1), ArgL),
-  ArgV2 = mk_fun_var(ArgFun(Arg1, Arg2), ArgL),
+  ArgV1 = ?mk_fun_var(ArgFun(Arg2, Arg1), ArgL),
+  ArgV2 = ?mk_fun_var(ArgFun(Arg1, Arg2), ArgL),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Arg1, sub, ArgV1),
 			   mk_constraint(Arg2, sub, ArgV2)]);
@@ -1531,7 +1534,7 @@ get_bif_constr({erlang, element, 2} = _BIF, Dst, Args,
 		       end,
 		erl_bif_types:type(erlang, element, 2, ATs2)
 	    end,
-      ReturnType = mk_fun_var(Fun, Args),
+      ReturnType = ?mk_fun_var(Fun, Args),
       ArgTypes = erl_bif_types:arg_types(erlang, element, 2),
       Cs = mk_constraints(Args, sub, ArgTypes),
       NewCs =
@@ -1553,7 +1556,7 @@ get_bif_constr({M, F, A} = _BIF, Dst, Args, State) ->
 		    false -> T
 		  end
 	end,
-      ReturnType = mk_fun_var(fun(Map) ->
+      ReturnType = ?mk_fun_var(fun(Map) ->
 				  TmpArgTypes0 = lookup_type_list(Args, Map),
 				  TmpArgTypes = [UnopaqueFun(T) || T<- TmpArgTypes0],
 				  erl_bif_types:type(M, F, A, TmpArgTypes)
@@ -1608,7 +1611,7 @@ get_bif_test_constr(Dst, Arg, Type, State) ->
 		 false -> t_any()
 	       end
 	   end,
-  ArgV = mk_fun_var(ArgFun, [Dst]),
+  ArgV = ?mk_fun_var(ArgFun, [Dst]),
   DstFun = fun(Map) ->
 	       ArgType = lookup_type(Arg, Map),
 	       case t_is_none(t_inf(ArgType, Type)) of
@@ -1633,7 +1636,7 @@ get_bif_test_constr(Dst, Arg, Type, State) ->
 		   end
 	       end
 	   end,
-  DstV = mk_fun_var(DstFun, [Arg]),
+  DstV = ?mk_fun_var(DstFun, [Arg]),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Arg, sub, ArgV)]).
 
@@ -2323,12 +2326,25 @@ mk_constraint(Lhs, Op, Rhs) ->
 constraint_opnd_is_any(#fun_var{}) -> false;
 constraint_opnd_is_any(Type) -> t_is_any(Type).
 
+-ifdef(DEBUG).
+
+-spec mk_fun_var(fun((_) -> erl_types:erl_type()), [erl_types:erl_type()],
+		    integer()) -> #fun_var{}.
+
+mk_fun_var(Line, Fun, Types) ->
+  Deps = [t_var_name(Var) || Var <- t_collect_vars(t_product(Types))],
+  #fun_var{'fun' = Fun, deps = ordsets:from_list(Deps), origin = Line}.
+
+-else.
+
 -spec mk_fun_var(fun((_) -> erl_types:erl_type()), [erl_types:erl_type()]) -> #fun_var{}.
 
 mk_fun_var(Fun, Types) ->
   Deps = [t_var_name(Var) || Var <- t_collect_vars(t_product(Types))],
   #fun_var{'fun' = Fun, deps = ordsets:from_list(Deps)}.
 
+-endif.
+
 -spec get_deps(constr()) -> [dep()].
 
 get_deps(#constraint{deps = D}) -> D;
@@ -2679,8 +2695,9 @@ find_constraint(Tuple, [_|Cs]) ->
 -endif.
 
 -ifdef(DEBUG).
-format_type(#fun_var{deps = Deps}) ->
-  io_lib:format("Fun(~s)", [lists:flatten([format_type(t_var(X))||X<-Deps])]);
+format_type(#fun_var{deps = Deps, origin = Origin}) ->
+  io_lib:format("Fun@L~p(~s)",
+		[Origin, lists:flatten([format_type(t_var(X))||X<-Deps])]);
 format_type(Type) ->
   case cerl:is_literal(Type) of
     true -> io_lib:format("~w", [cerl:concrete(Type)]);
diff --git a/lib/dialyzer/test/r9c_SUITE_data/results/asn1 b/lib/dialyzer/test/r9c_SUITE_data/results/asn1
index 571e562d0d..292275dd6e 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/results/asn1
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/asn1
@@ -6,7 +6,7 @@ asn1ct.erl:672: The pattern <{'false', Result}, _, _> can never match the type <
 asn1ct.erl:909: Guard test is_atom(Ext::[49 | 97 | 98 | 100 | 110 | 115]) can never succeed
 asn1ct_check.erl:1698: The pattern {'error', _} can never match the type [any()]
 asn1ct_check.erl:2733: The pattern {'type', Tag, _, _, _, _} can never match the type 'ASN1_OPEN_TYPE' | {_,_} | {'fixedtypevaluefield',_,_}
-asn1ct_check.erl:2738: The pattern <_S, _> can never match since previous clauses completely covered the type <#state{},#ObjectClassFieldType{class::#objectclass{fields::maybe_improper_list() | {_,_,_,_}},fieldname::{_,maybe_improper_list()},type::'ASN1_OPEN_TYPE' | {_,_} | {'fixedtypevaluefield',_,_}}>
+asn1ct_check.erl:2738: The pattern <_S, _> can never match since previous clauses completely covered the type <#state{},#'ObjectClassFieldType'{class::#objectclass{fields::maybe_improper_list() | {_,_,_,_}},fieldname::{_,maybe_improper_list()},type::'ASN1_OPEN_TYPE' | {_,_} | {'fixedtypevaluefield',_,_}}>
 asn1ct_check.erl:2887: The variable Other can never match since previous clauses completely covered the type any()
 asn1ct_check.erl:3188: The pattern <_S, [], B> can never match the type <#state{},{'SingleValue',_},{'ValueRange',_}>
 asn1ct_check.erl:3190: The pattern <_S, A, []> can never match the type <#state{},{'SingleValue',_},{'ValueRange',_}>
@@ -29,8 +29,8 @@ asn1ct_check.erl:5128: Guard test is_record(Type::{_,_} | {'fixedtypevaluefield'
 asn1ct_check.erl:540: The pattern <_S, {'poc', _ObjSet, _Params}> can never match since previous clauses completely covered the type <#state{},_>
 asn1ct_check.erl:5517: The pattern <_, []> can never match the type <_,[{'ABSTRACT-SYNTAX',{_,_,_}} | {'TYPE-IDENTIFIER',{_,_,_}},...]>
 asn1ct_constructed_ber.erl:1075: The pattern {{{'ObjectClassFieldType', _, _, _, {'objectfield', PrimFieldName1, PFNList}}, _}, {'componentrelation', _, _}} can never match the type {#type{},_}
-asn1ct_constructed_ber.erl:695: The pattern {'EXTENSIONMARK', _, _} can never match the type #ComponentType{}
-asn1ct_constructed_ber.erl:748: The pattern <Erules, TopType, {CompList, _ExtList}> can never match the type <_,maybe_improper_list(),[#ComponentType{typespec::{_,_,_,_,_,_}}]>
+asn1ct_constructed_ber.erl:695: The pattern {'EXTENSIONMARK', _, _} can never match the type #'ComponentType'{}
+asn1ct_constructed_ber.erl:748: The pattern <Erules, TopType, {CompList, _ExtList}> can never match the type <_,maybe_improper_list(),[#'ComponentType'{typespec::{_,_,_,_,_,_}}]>
 asn1ct_constructed_ber_bin_v2.erl:914: The pattern {{{'ObjectClassFieldType', _, _, _, {'objectfield', PrimFieldName1, PFNList}}, _}, {'componentrelation', _, _}} can never match the type {#type{},_}
 asn1ct_gen.erl:740: The pattern [] can never match the type [any(),...]
 asn1ct_gen_ber.erl:974: The pattern <Erules, [{Name, Def} | Rest]> can never match the type <_,[#typedef{name::atom(),typespec::{_,_,_,_,_,_}}]>
diff --git a/lib/dialyzer/test/r9c_SUITE_data/results/inets b/lib/dialyzer/test/r9c_SUITE_data/results/inets
index 6b16dba2ff..0177dcc88c 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/results/inets
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/inets
@@ -3,9 +3,14 @@ ftp.erl:1243: The pattern {'ok', {N, Bytes}} can never match the type 'eof' | {'
 ftp.erl:640: The pattern {'closed', _Why} can never match the type 'perm_fname_not_allowed' | 'perm_neg_compl' | 'perm_no_space' | 'pos_compl' | 'pos_interm' | 'pos_interm_acct' | 'trans_neg_compl' | 'trans_no_space' | {'error' | 'perm_fname_not_allowed' | 'perm_neg_compl' | 'perm_no_space' | 'pos_compl' | 'pos_interm' | 'pos_interm_acct' | 'pos_prel' | 'trans_neg_compl' | 'trans_no_space',atom() | [any()] | {'invalid_server_response',[any(),...]}}
 http.erl:117: The pattern {'error', Reason} can never match the type #req_headers{connection::[45 | 97 | 101 | 105 | 107 | 108 | 112 | 118,...],content_length::[48,...],other::[{_,_}]}
 http.erl:138: Function close_session/2 will never be called
-http_lib.erl:286: The call http_lib:close('ip_comm' | {'ssl',_},any()) will never return since it differs in the 1st argument from the success typing arguments: ('http' | 'https',any())
-http_lib.erl:424: The variable _ can never match since previous clauses completely covered the type any()
-http_lib.erl:438: The variable _ can never match since previous clauses completely covered the type any()
+http_lib.erl:286: The call http_lib:close('ip_comm' | {'ssl',_},port() | {'sslsocket',_,_}) will never return since it differs in the 1st argument from the success typing arguments: ('http' | 'https',port() | {'sslsocket',_,pid() | {_,{'config',_,_,_,_,{_,_,_,_}}} | {'sslsocket',_,pid() | {'sslsocket',_,pid() | {_,_,_}}}})
+http_lib.erl:415: The pattern 61 can never match the type 'http_eoh' | binary() | maybe_improper_list(any(),binary() | []) | {'http_error',binary() | string()} | #http_request{method::'DELETE' | 'GET' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT' | 'TRACE' | binary() | string(),path::'*' | binary() | string() | {'abs_path',binary() | string()} | {'scheme',binary() | string(),binary() | string()} | {'absoluteURI','http' | 'https',binary() | string(),'undefined' | non_neg_integer(),binary() | string()},version::{non_neg_integer(),non_neg_integer()}} | #http_response{version::{non_neg_integer(),non_neg_integer()},status::integer(),phrase::binary() | string()} | {'http_header',integer(),atom() | binary() | string(),_,binary() | string()}
+http_lib.erl:417: The pattern 59 can never match the type 'http_eoh' | binary() | maybe_improper_list(any(),binary() | []) | {'http_error',binary() | string()} | #http_request{method::'DELETE' | 'GET' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT' | 'TRACE' | binary() | string(),path::'*' | binary() | string() | {'abs_path',binary() | string()} | {'scheme',binary() | string(),binary() | string()} | {'absoluteURI','http' | 'https',binary() | string(),'undefined' | non_neg_integer(),binary() | string()},version::{non_neg_integer(),non_neg_integer()}} | #http_response{version::{non_neg_integer(),non_neg_integer()},status::integer(),phrase::binary() | string()} | {'http_header',integer(),atom() | binary() | string(),_,binary() | string()}
+http_lib.erl:420: The pattern 13 can never match the type 'http_eoh' | binary() | maybe_improper_list(any(),binary() | []) | {'http_error',binary() | string()} | #http_request{method::'DELETE' | 'GET' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT' | 'TRACE' | binary() | string(),path::'*' | binary() | string() | {'abs_path',binary() | string()} | {'scheme',binary() | string(),binary() | string()} | {'absoluteURI','http' | 'https',binary() | string(),'undefined' | non_neg_integer(),binary() | string()},version::{non_neg_integer(),non_neg_integer()}} | #http_response{version::{non_neg_integer(),non_neg_integer()},status::integer(),phrase::binary() | string()} | {'http_header',integer(),atom() | binary() | string(),_,binary() | string()}
+http_lib.erl:424: The variable _ can never match since previous clauses completely covered the type 'http_eoh' | binary() | maybe_improper_list(any(),binary() | []) | {'http_error',binary() | string()} | #http_request{method::'DELETE' | 'GET' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT' | 'TRACE' | binary() | string(),path::'*' | binary() | string() | {'abs_path',binary() | string()} | {'scheme',binary() | string(),binary() | string()} | {'absoluteURI','http' | 'https',binary() | string(),'undefined' | non_neg_integer(),binary() | string()},version::{non_neg_integer(),non_neg_integer()}} | #http_response{version::{non_neg_integer(),non_neg_integer()},status::integer(),phrase::binary() | string()} | {'http_header',integer(),atom() | binary() | string(),_,binary() | string()}
+http_lib.erl:428: Function read_chunk_ext_val/6 will never be called
+http_lib.erl:444: The pattern 10 can never match the type 'http_eoh' | binary() | maybe_improper_list(any(),binary() | []) | {'http_error',binary() | string()} | #http_request{method::'DELETE' | 'GET' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT' | 'TRACE' | binary() | string(),path::'*' | binary() | string() | {'abs_path',binary() | string()} | {'scheme',binary() | string(),binary() | string()} | {'absoluteURI','http' | 'https',binary() | string(),'undefined' | non_neg_integer(),binary() | string()},version::{non_neg_integer(),non_neg_integer()}} | #http_response{version::{non_neg_integer(),non_neg_integer()},status::integer(),phrase::binary() | string()} | {'http_header',integer(),atom() | binary() | string(),_,binary() | string()}
+http_lib.erl:552: Call to missing or unexported function ssl:accept/2
 http_lib.erl:99: Function getHeaderValue/2 will never be called
 httpc_handler.erl:660: Function exit_session_ok/2 has no local return
 httpc_manager.erl:145: The pattern {ErrorReply, State2} can never match the type {{'ok',number()},number(),#state{reqid::number()}}
@@ -21,11 +26,14 @@ httpd_manager.erl:885: The pattern {'EXIT', Reason} can never match since previo
 httpd_manager.erl:919: Function auth_status/1 will never be called
 httpd_manager.erl:926: Function sec_status/1 will never be called
 httpd_manager.erl:933: Function acceptor_status/1 will never be called
-httpd_request_handler.erl:374: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 66 | 98 | 100 | 103 | 105 | 111 | 116 | 121,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
-httpd_request_handler.erl:378: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 77 | 97 | 100 | 101 | 104 | 108 | 110 | 111 | 116 | 119,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
-httpd_request_handler.erl:401: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 77 | 97 | 100 | 101 | 104 | 108 | 110 | 111 | 116 | 119,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
+httpd_request_handler.erl:374: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 66 | 98 | 100 | 103 | 105 | 111 | 116 | 121,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_},socket::port() | {'sslsocket',_,_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
+httpd_request_handler.erl:378: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 77 | 97 | 100 | 101 | 104 | 108 | 110 | 111 | 116 | 119,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_},socket::port() | {'sslsocket',_,_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
+httpd_request_handler.erl:401: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 77 | 97 | 100 | 101 | 104 | 108 | 110 | 111 | 116 | 119,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_},socket::port() | {'sslsocket',_,_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
+httpd_request_handler.erl:489: The variable Other can never match since previous clauses completely covered the type {'error',_} | {'ok','http_eoh' | binary() | maybe_improper_list(any(),binary() | []) | {'http_error',binary() | string()} | {'http_request','DELETE' | 'GET' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT' | 'TRACE' | binary() | string(),'*' | binary() | string() | {'abs_path',binary() | [any()]} | {'scheme',binary() | [any()],binary() | [any()]} | {'absoluteURI','http' | 'https',binary() | [any()],'undefined' | non_neg_integer(),binary() | [any()]},{non_neg_integer(),non_neg_integer()}} | {'http_response',{non_neg_integer(),non_neg_integer()},integer(),binary() | string()} | {'http_header',integer(),atom() | binary() | string(),_,binary() | string()}}
 httpd_request_handler.erl:644: The call lists:reverse(Fields0::{'error',_} | {'ok',_}) will never return since it differs in the 1st argument from the success typing arguments: ([any()])
 httpd_request_handler.erl:645: Function will never be called
+httpd_socket.erl:129: Call to missing or unexported function ssl:accept/2
+httpd_socket.erl:49: The pattern {'ok', _} can never match the type {'error',_}
 httpd_sup.erl:63: The variable Else can never match since previous clauses completely covered the type {'error',_} | {'ok',[any()],_,_}
 httpd_sup.erl:88: The pattern {'error', Reason} can never match the type {'ok',_,_}
 httpd_sup.erl:92: The variable Else can never match since previous clauses completely covered the type {'ok',_,_}
diff --git a/lib/dialyzer/test/r9c_SUITE_data/results/mnesia b/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
index b0f4d12ae5..2be71ac7d7 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
@@ -6,8 +6,6 @@ mnesia_bup.erl:111: The created fun has no local return
 mnesia_bup.erl:574: Function fallback_receiver/2 has no local return
 mnesia_bup.erl:967: Function uninstall_fallback_master/2 has no local return
 mnesia_checkpoint.erl:1014: The variable Error can never match since previous clauses completely covered the type {'ok',#checkpoint_args{nodes::[any()],retainers::[any(),...]}}
-mnesia_checkpoint.erl:1209: Function system_continue/3 has no local return
-mnesia_checkpoint.erl:792: Function retainer_loop/1 has no local return
 mnesia_checkpoint.erl:894: The call sys:handle_system_msg(Msg::any(),From::any(),'no_parent','mnesia_checkpoint',[],Cp::#checkpoint_args{}) breaks the contract (Msg,From,Parent,Module,Debug,Misc) -> Void when is_subtype(Msg,term()), is_subtype(From,{pid(),Tag::_}), is_subtype(Parent,pid()), is_subtype(Module,module()), is_subtype(Debug,[dbg_opt()]), is_subtype(Misc,term()), is_subtype(Void,term())
 mnesia_controller.erl:1666: The variable Tab can never match since previous clauses completely covered the type [any()]
 mnesia_controller.erl:1679: The pattern {'stop', Reason, Reply, State2} can never match the type {'noreply',_} | {'reply',_,_} | {'stop','shutdown',#state{}}
diff --git a/lib/dialyzer/test/small_SUITE_data/results/common_eunit b/lib/dialyzer/test/small_SUITE_data/results/common_eunit
new file mode 100644
index 0000000000..bb5fd1c9ac
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/common_eunit
@@ -0,0 +1,2 @@
+
+common_eunit.erl:57: The created fun has no local return
diff --git a/lib/dialyzer/test/small_SUITE_data/results/comparisons b/lib/dialyzer/test/small_SUITE_data/results/comparisons
new file mode 100644
index 0000000000..642585d25e
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/comparisons
@@ -0,0 +1,153 @@
+
+comparisons.erl:100: The pattern 'true' can never match the type 'false'
+comparisons.erl:101: The pattern 'true' can never match the type 'false'
+comparisons.erl:102: The pattern 'false' can never match the type 'true'
+comparisons.erl:103: The pattern 'false' can never match the type 'true'
+comparisons.erl:104: The pattern 'true' can never match the type 'false'
+comparisons.erl:105: The pattern 'true' can never match the type 'false'
+comparisons.erl:107: The pattern 'true' can never match the type 'false'
+comparisons.erl:108: The pattern 'true' can never match the type 'false'
+comparisons.erl:109: The pattern 'false' can never match the type 'true'
+comparisons.erl:110: The pattern 'false' can never match the type 'true'
+comparisons.erl:111: The pattern 'true' can never match the type 'false'
+comparisons.erl:112: The pattern 'true' can never match the type 'false'
+comparisons.erl:113: The pattern 'false' can never match the type 'true'
+comparisons.erl:114: The pattern 'false' can never match the type 'true'
+comparisons.erl:115: The pattern 'true' can never match the type 'false'
+comparisons.erl:116: The pattern 'true' can never match the type 'false'
+comparisons.erl:117: The pattern 'false' can never match the type 'true'
+comparisons.erl:118: The pattern 'false' can never match the type 'true'
+comparisons.erl:123: The pattern 'false' can never match the type 'true'
+comparisons.erl:124: The pattern 'false' can never match the type 'true'
+comparisons.erl:125: The pattern 'true' can never match the type 'false'
+comparisons.erl:126: The pattern 'true' can never match the type 'false'
+comparisons.erl:127: The pattern 'false' can never match the type 'true'
+comparisons.erl:128: The pattern 'false' can never match the type 'true'
+comparisons.erl:129: The pattern 'true' can never match the type 'false'
+comparisons.erl:130: The pattern 'true' can never match the type 'false'
+comparisons.erl:132: The pattern 'true' can never match the type 'false'
+comparisons.erl:133: The pattern 'true' can never match the type 'false'
+comparisons.erl:134: The pattern 'false' can never match the type 'true'
+comparisons.erl:135: The pattern 'false' can never match the type 'true'
+comparisons.erl:136: The pattern 'true' can never match the type 'false'
+comparisons.erl:137: The pattern 'true' can never match the type 'false'
+comparisons.erl:138: The pattern 'false' can never match the type 'true'
+comparisons.erl:139: The pattern 'false' can never match the type 'true'
+comparisons.erl:140: The pattern 'true' can never match the type 'false'
+comparisons.erl:141: The pattern 'true' can never match the type 'false'
+comparisons.erl:142: The pattern 'false' can never match the type 'true'
+comparisons.erl:143: The pattern 'false' can never match the type 'true'
+comparisons.erl:144: The pattern 'true' can never match the type 'false'
+comparisons.erl:145: The pattern 'true' can never match the type 'false'
+comparisons.erl:146: The pattern 'false' can never match the type 'true'
+comparisons.erl:147: The pattern 'false' can never match the type 'true'
+comparisons.erl:152: The pattern 'false' can never match the type 'true'
+comparisons.erl:153: The pattern 'false' can never match the type 'true'
+comparisons.erl:154: The pattern 'true' can never match the type 'false'
+comparisons.erl:155: The pattern 'true' can never match the type 'false'
+comparisons.erl:157: The pattern 'true' can never match the type 'false'
+comparisons.erl:158: The pattern 'true' can never match the type 'false'
+comparisons.erl:159: The pattern 'false' can never match the type 'true'
+comparisons.erl:160: The pattern 'false' can never match the type 'true'
+comparisons.erl:161: The pattern 'true' can never match the type 'false'
+comparisons.erl:162: The pattern 'true' can never match the type 'false'
+comparisons.erl:163: The pattern 'false' can never match the type 'true'
+comparisons.erl:164: The pattern 'false' can never match the type 'true'
+comparisons.erl:165: The pattern 'true' can never match the type 'false'
+comparisons.erl:166: The pattern 'true' can never match the type 'false'
+comparisons.erl:167: The pattern 'false' can never match the type 'true'
+comparisons.erl:168: The pattern 'false' can never match the type 'true'
+comparisons.erl:169: The pattern 'true' can never match the type 'false'
+comparisons.erl:170: The pattern 'true' can never match the type 'false'
+comparisons.erl:171: The pattern 'false' can never match the type 'true'
+comparisons.erl:172: The pattern 'false' can never match the type 'true'
+comparisons.erl:173: The pattern 'true' can never match the type 'false'
+comparisons.erl:174: The pattern 'true' can never match the type 'false'
+comparisons.erl:175: The pattern 'false' can never match the type 'true'
+comparisons.erl:176: The pattern 'false' can never match the type 'true'
+comparisons.erl:186: The pattern 'false' can never match the type 'true'
+comparisons.erl:187: The pattern 'false' can never match the type 'true'
+comparisons.erl:188: The pattern 'true' can never match the type 'false'
+comparisons.erl:189: The pattern 'true' can never match the type 'false'
+comparisons.erl:190: The pattern 'false' can never match the type 'true'
+comparisons.erl:191: The pattern 'false' can never match the type 'true'
+comparisons.erl:192: The pattern 'true' can never match the type 'false'
+comparisons.erl:193: The pattern 'true' can never match the type 'false'
+comparisons.erl:203: The pattern 'false' can never match the type 'true'
+comparisons.erl:204: The pattern 'false' can never match the type 'true'
+comparisons.erl:205: The pattern 'true' can never match the type 'false'
+comparisons.erl:206: The pattern 'true' can never match the type 'false'
+comparisons.erl:208: The pattern 'true' can never match the type 'false'
+comparisons.erl:209: The pattern 'true' can never match the type 'false'
+comparisons.erl:210: The pattern 'false' can never match the type 'true'
+comparisons.erl:211: The pattern 'false' can never match the type 'true'
+comparisons.erl:221: The pattern 'true' can never match the type 'false'
+comparisons.erl:222: The pattern 'true' can never match the type 'false'
+comparisons.erl:223: The pattern 'false' can never match the type 'true'
+comparisons.erl:224: The pattern 'false' can never match the type 'true'
+comparisons.erl:225: The pattern 'true' can never match the type 'false'
+comparisons.erl:226: The pattern 'true' can never match the type 'false'
+comparisons.erl:227: The pattern 'false' can never match the type 'true'
+comparisons.erl:228: The pattern 'false' can never match the type 'true'
+comparisons.erl:242: The pattern 'false' can never match the type 'true'
+comparisons.erl:243: The pattern 'false' can never match the type 'true'
+comparisons.erl:244: The pattern 'true' can never match the type 'false'
+comparisons.erl:245: The pattern 'true' can never match the type 'false'
+comparisons.erl:246: The pattern 'false' can never match the type 'true'
+comparisons.erl:247: The pattern 'false' can never match the type 'true'
+comparisons.erl:248: The pattern 'true' can never match the type 'false'
+comparisons.erl:249: The pattern 'true' can never match the type 'false'
+comparisons.erl:251: The pattern 'true' can never match the type 'false'
+comparisons.erl:252: The pattern 'true' can never match the type 'false'
+comparisons.erl:253: The pattern 'false' can never match the type 'true'
+comparisons.erl:254: The pattern 'false' can never match the type 'true'
+comparisons.erl:263: The pattern 'false' can never match the type 'true'
+comparisons.erl:264: The pattern 'false' can never match the type 'true'
+comparisons.erl:265: The pattern 'true' can never match the type 'false'
+comparisons.erl:266: The pattern 'true' can never match the type 'false'
+comparisons.erl:268: The pattern 'true' can never match the type 'false'
+comparisons.erl:269: The pattern 'true' can never match the type 'false'
+comparisons.erl:270: The pattern 'false' can never match the type 'true'
+comparisons.erl:271: The pattern 'false' can never match the type 'true'
+comparisons.erl:272: The pattern 'true' can never match the type 'false'
+comparisons.erl:273: The pattern 'true' can never match the type 'false'
+comparisons.erl:274: The pattern 'false' can never match the type 'true'
+comparisons.erl:275: The pattern 'false' can never match the type 'true'
+comparisons.erl:293: The pattern 'false' can never match the type 'true'
+comparisons.erl:294: The pattern 'false' can never match the type 'true'
+comparisons.erl:295: The pattern 'true' can never match the type 'false'
+comparisons.erl:296: The pattern 'true' can never match the type 'false'
+comparisons.erl:311: The pattern 'true' can never match the type 'false'
+comparisons.erl:312: The pattern 'true' can never match the type 'false'
+comparisons.erl:313: The pattern 'false' can never match the type 'true'
+comparisons.erl:314: The pattern 'false' can never match the type 'true'
+comparisons.erl:44: The pattern 'false' can never match the type 'true'
+comparisons.erl:45: The pattern 'false' can never match the type 'true'
+comparisons.erl:46: The pattern 'true' can never match the type 'false'
+comparisons.erl:47: The pattern 'true' can never match the type 'false'
+comparisons.erl:48: The pattern 'false' can never match the type 'true'
+comparisons.erl:49: The pattern 'false' can never match the type 'true'
+comparisons.erl:50: The pattern 'true' can never match the type 'false'
+comparisons.erl:51: The pattern 'true' can never match the type 'false'
+comparisons.erl:52: The pattern 'false' can never match the type 'true'
+comparisons.erl:53: The pattern 'false' can never match the type 'true'
+comparisons.erl:54: The pattern 'true' can never match the type 'false'
+comparisons.erl:55: The pattern 'true' can never match the type 'false'
+comparisons.erl:69: The pattern 'false' can never match the type 'true'
+comparisons.erl:70: The pattern 'false' can never match the type 'true'
+comparisons.erl:71: The pattern 'true' can never match the type 'false'
+comparisons.erl:72: The pattern 'true' can never match the type 'false'
+comparisons.erl:73: The pattern 'false' can never match the type 'true'
+comparisons.erl:74: The pattern 'false' can never match the type 'true'
+comparisons.erl:75: The pattern 'true' can never match the type 'false'
+comparisons.erl:76: The pattern 'true' can never match the type 'false'
+comparisons.erl:77: The pattern 'false' can never match the type 'true'
+comparisons.erl:78: The pattern 'false' can never match the type 'true'
+comparisons.erl:79: The pattern 'true' can never match the type 'false'
+comparisons.erl:80: The pattern 'true' can never match the type 'false'
+comparisons.erl:94: The pattern 'false' can never match the type 'true'
+comparisons.erl:95: The pattern 'false' can never match the type 'true'
+comparisons.erl:96: The pattern 'true' can never match the type 'false'
+comparisons.erl:97: The pattern 'true' can never match the type 'false'
+comparisons.erl:98: The pattern 'false' can never match the type 'true'
+comparisons.erl:99: The pattern 'false' can never match the type 'true'
diff --git a/lib/dialyzer/test/small_SUITE_data/results/failing_funs b/lib/dialyzer/test/small_SUITE_data/results/failing_funs
new file mode 100644
index 0000000000..a1fb22cbc6
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/failing_funs
@@ -0,0 +1,20 @@
+
+failing_funs.erl:101: The created fun has no local return
+failing_funs.erl:104: The created fun has no local return
+failing_funs.erl:127: The created fun has no local return
+failing_funs.erl:135: The created fun has no local return
+failing_funs.erl:138: The created fun has no local return
+failing_funs.erl:13: Function foo3/0 has no local return
+failing_funs.erl:13: The pattern 'b' can never match the type 'a'
+failing_funs.erl:161: The created fun has no local return
+failing_funs.erl:169: The created fun has no local return
+failing_funs.erl:172: The created fun has no local return
+failing_funs.erl:17: The pattern 'b' can never match the type 'a'
+failing_funs.erl:195: The created fun has no local return
+failing_funs.erl:203: The created fun has no local return
+failing_funs.erl:206: The created fun has no local return
+failing_funs.erl:229: The created fun has no local return
+failing_funs.erl:55: The created fun has no local return
+failing_funs.erl:62: The created fun has no local return
+failing_funs.erl:69: The created fun has no local return
+failing_funs.erl:76: The created fun has no local return
diff --git a/lib/dialyzer/test/small_SUITE_data/results/my_sofs b/lib/dialyzer/test/small_SUITE_data/results/my_sofs
index bfee0bce0d..bc97c08d62 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/my_sofs
+++ b/lib/dialyzer/test/small_SUITE_data/results/my_sofs
@@ -1,3 +1,3 @@
 
-my_sofs.erl:34: The pattern {'Set', _, _} can never match the type #OrdSet{}
-my_sofs.erl:54: The pattern {'Set', _, _} can never match the type #OrdSet{}
+my_sofs.erl:34: The pattern {'Set', _, _} can never match the type #'OrdSet'{}
+my_sofs.erl:54: The pattern {'Set', _, _} can never match the type #'OrdSet'{}
diff --git a/lib/dialyzer/test/small_SUITE_data/src/common_eunit.erl b/lib/dialyzer/test/small_SUITE_data/src/common_eunit.erl
new file mode 100644
index 0000000000..bca390068e
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/common_eunit.erl
@@ -0,0 +1,121 @@
+%%=====================================================================
+%% Program with an erroneous type declaration that caused dialyzer to
+%% go into an infinite loop. There are some comments that explain the
+%% symptoms and the culprit: the return of test_fun() is erroneous and
+%% its type should read
+%%	fun((config()) -> test_rep() | [test_rep()])
+%% instead. But this should not throw dialyzer into an infinite loop.
+%% This concerned dialyzer in R14B02 (and probably prior).
+%%=====================================================================
+-module(common_eunit).
+
+-export([expand_cases/2]).
+
+-type test_name() :: atom() | {'group', atom()}.
+
+-type test_rep()  :: {{atom(), atom(), arity()}, fun()}
+                   | {'setup', fun(), fun()}
+                   | {'setup', fun(), fun(), fun()}
+                   | {atom(), test_rep()}
+                   | {atom(), term(), test_rep()}.
+
+-type config()    :: [proplists:property()].
+
+-type control()   :: tuple() | atom().
+
+%% The combination of the following type and the (erroneous) spec for
+%% expand_cases/2 is the reason for the infinite loop in dialyzer.
+-type test_fun()  :: fun((config()) -> test_rep()).
+
+%% If one comments out this spec the infinite loop disappears.
+-spec expand_cases(atom(), test_name() | [test_name()]) -> test_fun().
+expand_cases(Module, Cases) ->
+    if is_list(Cases) ->
+            TestFuns = [expand_case(Module, Case) || Case <- Cases],
+            fun(Config) -> [F(Config) || F <- TestFuns] end;
+       is_atom(Cases); is_tuple(Cases) ->
+           expand_cases(Module, [Cases])
+    end.
+
+-spec expand_case(atom(), test_name()) -> test_fun().
+expand_case(Module, CaseName) when is_atom(CaseName) ->
+    TestFun = fun(Config) ->
+		      {{Module, CaseName, 1},
+		       fun() -> apply(Module, CaseName, [Config]) end}
+	      end,
+    setup_wrapper(Module, TestFun, {init_per_testcase, [CaseName]},
+		  {end_per_testcase, [CaseName]});
+expand_case(Module, {group, GroupName}) ->
+    {Control, Cases} = group_specification(Module, GroupName),
+    TestFun = control_wrapper(Control, expand_cases(Module, Cases)),
+    setup_wrapper(Module, TestFun, {init_per_group, [GroupName]},
+		  {end_per_group, [GroupName]}).
+
+-spec control_wrapper([control()], test_fun()) -> test_fun().
+control_wrapper([Control|T], TestFun0) ->
+    TestFun1 = control_wrapper(T, TestFun0),
+    fun(Config) ->
+	    case Control of
+		parallel ->
+		    {inparallel, TestFun1(Config)};
+		sequence ->
+		    {inorder, TestFun1(Config)};
+		{timetrap, Time} ->
+		    Seconds = case Time of
+				  {hours, Hs}   -> Hs * 60 * 60;
+				  {minutes, Ms} -> Ms * 60;
+				  {seconds, Ss} -> Ss;
+				  MSs           -> MSs / 1000
+			      end,
+		    {timeout, Seconds, TestFun1(Config)};
+		C when is_atom(C) ->
+		    {C, TestFun1(Config)};
+		{C, Arg} ->
+		    {C, Arg, TestFun1(Config)}
+	    end
+    end;
+control_wrapper([], TestFun) ->
+    TestFun.
+
+-spec setup_wrapper(atom(), test_fun(), Callback, Callback) -> test_fun()
+        when Callback :: {atom(), list()}.
+setup_wrapper(Module, TestFun, {Setup, SA}, {Cleanup, CA}) ->
+    case erlang:function_exported(Module, Setup, length(SA) + 1) of
+        true ->
+            case erlang:function_exported(Module, Cleanup, length(CA) + 1) of
+                true ->
+                    fun(Config0) ->
+			    {setup,
+			     fun() ->
+				     apply(Module, Setup, SA ++ [Config0])
+			     end,
+			     fun(Config1) ->
+				     apply(Module, Cleanup, CA ++ [Config1])
+			     end,
+			     TestFun}
+                    end;
+                false ->
+                    fun(Config) ->
+			    {setup,
+			     fun() ->
+				     apply(Module, Setup, SA ++ [Config])
+			     end,
+			     TestFun}
+                    end
+            end;
+        false ->
+            TestFun
+    end.
+
+-spec group_specification(atom(), atom()) -> {[control()], [test_name()]}.
+group_specification(Module, GroupName) ->
+    case lists:keyfind(GroupName, 1, Module:groups()) of
+        {_, Control, Cases} when is_list(Control), is_list(Cases) ->
+            {Control, Cases};
+        {_, Cases} when is_list(Cases) ->
+            {[], Cases};
+        false ->
+            exit({missing_group, GroupName});
+        _ ->
+            exit({bad_group_spec, GroupName})
+    end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/comparisons.erl b/lib/dialyzer/test/small_SUITE_data/src/comparisons.erl
new file mode 100644
index 0000000000..70e3cb6af4
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/comparisons.erl
@@ -0,0 +1,322 @@
+-module(comparisons).
+
+-compile(export_all).
+
+-define(r, get(r)).
+
+integer() -> integer(?r).
+integer(X) when is_integer(X) -> X.
+
+mfloat() -> float(?r).
+mfloat(X) when is_float(X) -> X.
+
+atom() -> atom(?r).
+atom(X) when is_atom(X) -> X.
+
+tuple() -> tuple(?r).
+tuple(X) when is_tuple(X) -> X.
+
+list() -> list(?r).
+list(X) when is_list(X) -> X.
+
+i() -> integer().
+f() -> mfloat().
+n() -> case ?r of 1 -> i(); 2 -> f() end.
+a() -> atom().
+t() -> tuple().
+l() -> list().
+na() -> case ?r of 1 -> n(); 2 -> a() end.
+at() -> case ?r of 1 -> t(); 2 -> a() end.
+tl() -> case ?r of 1 -> t(); 2 -> l() end.
+
+test_i_ll_i() -> case i()  < i() of true -> maybe; false -> maybe_too end.
+test_i_le_i() -> case i() =< i() of true -> maybe; false -> maybe_too end.
+test_i_gg_i() -> case i()  > i() of true -> maybe; false -> maybe_too end.
+test_i_ge_i() -> case i() >= i() of true -> maybe; false -> maybe_too end.
+test_i_ll_f() -> case i()  < f() of true -> maybe; false -> maybe_too end.
+test_i_le_f() -> case i() =< f() of true -> maybe; false -> maybe_too end.
+test_i_gg_f() -> case i()  > f() of true -> maybe; false -> maybe_too end.
+test_i_ge_f() -> case i() >= f() of true -> maybe; false -> maybe_too end.
+test_i_ll_n() -> case i()  < n() of true -> maybe; false -> maybe_too end.
+test_i_le_n() -> case i() =< n() of true -> maybe; false -> maybe_too end.
+test_i_gg_n() -> case i()  > n() of true -> maybe; false -> maybe_too end.
+test_i_ge_n() -> case i() >= n() of true -> maybe; false -> maybe_too end.
+test_i_ll_a() -> case i()  < a() of true -> always; false -> never end.
+test_i_le_a() -> case i() =< a() of true -> always; false -> never end.
+test_i_gg_a() -> case i()  > a() of true -> never; false -> always end.
+test_i_ge_a() -> case i() >= a() of true -> never; false -> always end.
+test_i_ll_t() -> case i()  < t() of true -> always; false -> never end.
+test_i_le_t() -> case i() =< t() of true -> always; false -> never end.
+test_i_gg_t() -> case i()  > t() of true -> never; false -> always end.
+test_i_ge_t() -> case i() >= t() of true -> never; false -> always end.
+test_i_ll_l() -> case i()  < l() of true -> always; false -> never end.
+test_i_le_l() -> case i() =< l() of true -> always; false -> never end.
+test_i_gg_l() -> case i()  > l() of true -> never; false -> always end.
+test_i_ge_l() -> case i() >= l() of true -> never; false -> always end.
+
+test_f_ll_i() -> case f()  < i() of true -> maybe; false -> maybe_too end.
+test_f_le_i() -> case f() =< i() of true -> maybe; false -> maybe_too end.
+test_f_gg_i() -> case f()  > i() of true -> maybe; false -> maybe_too end.
+test_f_ge_i() -> case f() >= i() of true -> maybe; false -> maybe_too end.
+test_f_ll_f() -> case f()  < f() of true -> maybe; false -> maybe_too end.
+test_f_le_f() -> case f() =< f() of true -> maybe; false -> maybe_too end.
+test_f_gg_f() -> case f()  > f() of true -> maybe; false -> maybe_too end.
+test_f_ge_f() -> case f() >= f() of true -> maybe; false -> maybe_too end.
+test_f_ll_n() -> case f()  < n() of true -> maybe; false -> maybe_too end.
+test_f_le_n() -> case f() =< n() of true -> maybe; false -> maybe_too end.
+test_f_gg_n() -> case f()  > n() of true -> maybe; false -> maybe_too end.
+test_f_ge_n() -> case f() >= n() of true -> maybe; false -> maybe_too end.
+test_f_ll_a() -> case f()  < a() of true -> always; false -> never end.
+test_f_le_a() -> case f() =< a() of true -> always; false -> never end.
+test_f_gg_a() -> case f()  > a() of true -> never; false -> always end.
+test_f_ge_a() -> case f() >= a() of true -> never; false -> always end.
+test_f_ll_t() -> case f()  < t() of true -> always; false -> never end.
+test_f_le_t() -> case f() =< t() of true -> always; false -> never end.
+test_f_gg_t() -> case f()  > t() of true -> never; false -> always end.
+test_f_ge_t() -> case f() >= t() of true -> never; false -> always end.
+test_f_ll_l() -> case f()  < l() of true -> always; false -> never end.
+test_f_le_l() -> case f() =< l() of true -> always; false -> never end.
+test_f_gg_l() -> case f()  > l() of true -> never; false -> always end.
+test_f_ge_l() -> case f() >= l() of true -> never; false -> always end.
+
+test_n_ll_i() -> case n()  < i() of true -> maybe; false -> maybe_too end.
+test_n_le_i() -> case n() =< i() of true -> maybe; false -> maybe_too end.
+test_n_gg_i() -> case n()  > i() of true -> maybe; false -> maybe_too end.
+test_n_ge_i() -> case n() >= i() of true -> maybe; false -> maybe_too end.
+test_n_ll_f() -> case n()  < f() of true -> maybe; false -> maybe_too end.
+test_n_le_f() -> case n() =< f() of true -> maybe; false -> maybe_too end.
+test_n_gg_f() -> case n()  > f() of true -> maybe; false -> maybe_too end.
+test_n_ge_f() -> case n() >= f() of true -> maybe; false -> maybe_too end.
+test_n_ll_n() -> case n()  < n() of true -> maybe; false -> maybe_too end.
+test_n_le_n() -> case n() =< n() of true -> maybe; false -> maybe_too end.
+test_n_gg_n() -> case n()  > n() of true -> maybe; false -> maybe_too end.
+test_n_ge_n() -> case n() >= n() of true -> maybe; false -> maybe_too end.
+test_n_ll_a() -> case n()  < a() of true -> always; false -> never end.
+test_n_le_a() -> case n() =< a() of true -> always; false -> never end.
+test_n_gg_a() -> case n()  > a() of true -> never; false -> always end.
+test_n_ge_a() -> case n() >= a() of true -> never; false -> always end.
+test_n_ll_t() -> case n()  < t() of true -> always; false -> never end.
+test_n_le_t() -> case n() =< t() of true -> always; false -> never end.
+test_n_gg_t() -> case n()  > t() of true -> never; false -> always end.
+test_n_ge_t() -> case n() >= t() of true -> never; false -> always end.
+test_n_ll_l() -> case n()  < l() of true -> always; false -> never end.
+test_n_le_l() -> case n() =< l() of true -> always; false -> never end.
+test_n_gg_l() -> case n()  > l() of true -> never; false -> always end.
+test_n_ge_l() -> case n() >= l() of true -> never; false -> always end.
+
+test_a_ll_i() -> case a()  < i() of true -> never; false -> always end.
+test_a_le_i() -> case a() =< i() of true -> never; false -> always end.
+test_a_gg_i() -> case a()  > i() of true -> always; false -> never end.
+test_a_ge_i() -> case a() >= i() of true -> always; false -> never end.
+test_a_ll_f() -> case a()  < f() of true -> never; false -> always end.
+test_a_le_f() -> case a() =< f() of true -> never; false -> always end.
+test_a_gg_f() -> case a()  > f() of true -> always; false -> never end.
+test_a_ge_f() -> case a() >= f() of true -> always; false -> never end.
+test_a_ll_n() -> case a()  < n() of true -> never; false -> always end.
+test_a_le_n() -> case a() =< n() of true -> never; false -> always end.
+test_a_gg_n() -> case a()  > n() of true -> always; false -> never end.
+test_a_ge_n() -> case a() >= n() of true -> always; false -> never end.
+test_a_ll_a() -> case a()  < a() of true -> maybe; false -> maybe_too end.
+test_a_le_a() -> case a() =< a() of true -> maybe; false -> maybe_too end.
+test_a_gg_a() -> case a()  > a() of true -> maybe; false -> maybe_too end.
+test_a_ge_a() -> case a() >= a() of true -> maybe; false -> maybe_too end.
+test_a_ll_t() -> case a()  < t() of true -> always; false -> never end.
+test_a_le_t() -> case a() =< t() of true -> always; false -> never end.
+test_a_gg_t() -> case a()  > t() of true -> never; false -> always end.
+test_a_ge_t() -> case a() >= t() of true -> never; false -> always end.
+test_a_ll_l() -> case a()  < l() of true -> always; false -> never end.
+test_a_le_l() -> case a() =< l() of true -> always; false -> never end.
+test_a_gg_l() -> case a()  > l() of true -> never; false -> always end.
+test_a_ge_l() -> case a() >= l() of true -> never; false -> always end.
+
+test_t_ll_i() -> case t()  < i() of true -> never; false -> always end.
+test_t_le_i() -> case t() =< i() of true -> never; false -> always end.
+test_t_gg_i() -> case t()  > i() of true -> always; false -> never end.
+test_t_ge_i() -> case t() >= i() of true -> always; false -> never end.
+test_t_ll_f() -> case t()  < f() of true -> never; false -> always end.
+test_t_le_f() -> case t() =< f() of true -> never; false -> always end.
+test_t_gg_f() -> case t()  > f() of true -> always; false -> never end.
+test_t_ge_f() -> case t() >= f() of true -> always; false -> never end.
+test_t_ll_n() -> case t()  < n() of true -> never; false -> always end.
+test_t_le_n() -> case t() =< n() of true -> never; false -> always end.
+test_t_gg_n() -> case t()  > n() of true -> always; false -> never end.
+test_t_ge_n() -> case t() >= n() of true -> always; false -> never end.
+test_t_ll_a() -> case t()  < a() of true -> never; false -> always end.
+test_t_le_a() -> case t() =< a() of true -> never; false -> always end.
+test_t_gg_a() -> case t()  > a() of true -> always; false -> never end.
+test_t_ge_a() -> case t() >= a() of true -> always; false -> never end.
+test_t_ll_t() -> case t()  < t() of true -> maybe; false -> maybe_too end.
+test_t_le_t() -> case t() =< t() of true -> maybe; false -> maybe_too end.
+test_t_gg_t() -> case t()  > t() of true -> maybe; false -> maybe_too end.
+test_t_ge_t() -> case t() >= t() of true -> maybe; false -> maybe_too end.
+test_t_ll_l() -> case t()  < l() of true -> always; false -> never end.
+test_t_le_l() -> case t() =< l() of true -> always; false -> never end.
+test_t_gg_l() -> case t()  > l() of true -> never; false -> always end.
+test_t_ge_l() -> case t() >= l() of true -> never; false -> always end.
+
+test_l_ll_i() -> case l()  < i() of true -> never; false -> always end.
+test_l_le_i() -> case l() =< i() of true -> never; false -> always end.
+test_l_gg_i() -> case l()  > i() of true -> always; false -> never end.
+test_l_ge_i() -> case l() >= i() of true -> always; false -> never end.
+test_l_ll_f() -> case l()  < f() of true -> never; false -> always end.
+test_l_le_f() -> case l() =< f() of true -> never; false -> always end.
+test_l_gg_f() -> case l()  > f() of true -> always; false -> never end.
+test_l_ge_f() -> case l() >= f() of true -> always; false -> never end.
+test_l_ll_n() -> case l()  < n() of true -> never; false -> always end.
+test_l_le_n() -> case l() =< n() of true -> never; false -> always end.
+test_l_gg_n() -> case l()  > n() of true -> always; false -> never end.
+test_l_ge_n() -> case l() >= n() of true -> always; false -> never end.
+test_l_ll_a() -> case l()  < a() of true -> never; false -> always end.
+test_l_le_a() -> case l() =< a() of true -> never; false -> always end.
+test_l_gg_a() -> case l()  > a() of true -> always; false -> never end.
+test_l_ge_a() -> case l() >= a() of true -> always; false -> never end.
+test_l_ll_t() -> case l()  < t() of true -> never; false -> always end.
+test_l_le_t() -> case l() =< t() of true -> never; false -> always end.
+test_l_gg_t() -> case l()  > t() of true -> always; false -> never end.
+test_l_ge_t() -> case l() >= t() of true -> always; false -> never end.
+test_l_ll_l() -> case l()  < l() of true -> maybe; false -> maybe_too end.
+test_l_le_l() -> case l() =< l() of true -> maybe; false -> maybe_too end.
+test_l_gg_l() -> case l()  > l() of true -> maybe; false -> maybe_too end.
+test_l_ge_l() -> case l() >= l() of true -> maybe; false -> maybe_too end.
+
+test_n_ll_na() -> case n()  < na() of true -> maybe; false -> maybe_too end.
+test_n_le_na() -> case n() =< na() of true -> maybe; false -> maybe_too end.
+test_n_gg_na() -> case n()  > na() of true -> maybe; false -> maybe_too end.
+test_n_ge_na() -> case n() >= na() of true -> maybe; false -> maybe_too end.
+test_n_ll_at() -> case n()  < at() of true -> always; false -> never end.
+test_n_le_at() -> case n() =< at() of true -> always; false -> never end.
+test_n_gg_at() -> case n()  > at() of true -> never; false -> always end.
+test_n_ge_at() -> case n() >= at() of true -> never; false -> always end.
+test_n_ll_tl() -> case n()  < tl() of true -> always; false -> never end.
+test_n_le_tl() -> case n() =< tl() of true -> always; false -> never end.
+test_n_gg_tl() -> case n()  > tl() of true -> never; false -> always end.
+test_n_ge_tl() -> case n() >= tl() of true -> never; false -> always end.
+
+test_a_ll_na() -> case a()  < na() of true -> maybe; false -> maybe_too end.
+test_a_le_na() -> case a() =< na() of true -> maybe; false -> maybe_too end.
+test_a_gg_na() -> case a()  > na() of true -> maybe; false -> maybe_too end.
+test_a_ge_na() -> case a() >= na() of true -> maybe; false -> maybe_too end.
+test_a_ll_at() -> case a()  < at() of true -> maybe; false -> maybe_too end.
+test_a_le_at() -> case a() =< at() of true -> maybe; false -> maybe_too end.
+test_a_gg_at() -> case a()  > at() of true -> maybe; false -> maybe_too end.
+test_a_ge_at() -> case a() >= at() of true -> maybe; false -> maybe_too end.
+test_a_ll_tl() -> case a()  < tl() of true -> always; false -> never end.
+test_a_le_tl() -> case a() =< tl() of true -> always; false -> never end.
+test_a_gg_tl() -> case a()  > tl() of true -> never; false -> always end.
+test_a_ge_tl() -> case a() >= tl() of true -> never; false -> always end.
+
+test_t_ll_na() -> case t()  < na() of true -> never; false -> always end.
+test_t_le_na() -> case t() =< na() of true -> never; false -> always end.
+test_t_gg_na() -> case t()  > na() of true -> always; false -> never end.
+test_t_ge_na() -> case t() >= na() of true -> always; false -> never end.
+test_t_ll_at() -> case t()  < at() of true -> maybe; false -> maybe_too end.
+test_t_le_at() -> case t() =< at() of true -> maybe; false -> maybe_too end.
+test_t_gg_at() -> case t()  > at() of true -> maybe; false -> maybe_too end.
+test_t_ge_at() -> case t() >= at() of true -> maybe; false -> maybe_too end.
+test_t_ll_tl() -> case t()  < tl() of true -> maybe; false -> maybe_too end.
+test_t_le_tl() -> case t() =< tl() of true -> maybe; false -> maybe_too end.
+test_t_gg_tl() -> case t()  > tl() of true -> maybe; false -> maybe_too end.
+test_t_ge_tl() -> case t() >= tl() of true -> maybe; false -> maybe_too end.
+
+test_l_ll_na() -> case l()  < na() of true -> never; false -> always end.
+test_l_le_na() -> case l() =< na() of true -> never; false -> always end.
+test_l_gg_na() -> case l()  > na() of true -> always; false -> never end.
+test_l_ge_na() -> case l() >= na() of true -> always; false -> never end.
+test_l_ll_at() -> case l()  < at() of true -> never; false -> always end.
+test_l_le_at() -> case l() =< at() of true -> never; false -> always end.
+test_l_gg_at() -> case l()  > at() of true -> always; false -> never end.
+test_l_ge_at() -> case l() >= at() of true -> always; false -> never end.
+test_l_ll_tl() -> case l()  < tl() of true -> maybe; false -> maybe_too end.
+test_l_le_tl() -> case l() =< tl() of true -> maybe; false -> maybe_too end.
+test_l_gg_tl() -> case l()  > tl() of true -> maybe; false -> maybe_too end.
+test_l_ge_tl() -> case l() >= tl() of true -> maybe; false -> maybe_too end.
+
+test_na_ll_n() -> case na()  < n() of true -> maybe; false -> maybe_too end.
+test_na_le_n() -> case na() =< n() of true -> maybe; false -> maybe_too end.
+test_na_gg_n() -> case na()  > n() of true -> maybe; false -> maybe_too end.
+test_na_ge_n() -> case na() >= n() of true -> maybe; false -> maybe_too end.
+test_na_ll_a() -> case na()  < a() of true -> maybe; false -> maybe_too end.
+test_na_le_a() -> case na() =< a() of true -> maybe; false -> maybe_too end.
+test_na_gg_a() -> case na()  > a() of true -> maybe; false -> maybe_too end.
+test_na_ge_a() -> case na() >= a() of true -> maybe; false -> maybe_too end.
+test_na_ll_t() -> case na()  < t() of true -> always; false -> never end.
+test_na_le_t() -> case na() =< t() of true -> always; false -> never end.
+test_na_gg_t() -> case na()  > t() of true -> never; false -> always end.
+test_na_ge_t() -> case na() >= t() of true -> never; false -> always end.
+test_na_ll_l() -> case na()  < l() of true -> always; false -> never end.
+test_na_le_l() -> case na() =< l() of true -> always; false -> never end.
+test_na_gg_l() -> case na()  > l() of true -> never; false -> always end.
+test_na_ge_l() -> case na() >= l() of true -> never; false -> always end.
+
+test_at_ll_n() -> case at()  < n() of true -> never; false -> always end.
+test_at_le_n() -> case at() =< n() of true -> never; false -> always end.
+test_at_gg_n() -> case at()  > n() of true -> always; false -> never end.
+test_at_ge_n() -> case at() >= n() of true -> always; false -> never end.
+test_at_ll_a() -> case at()  < a() of true -> maybe; false -> maybe_too end.
+test_at_le_a() -> case at() =< a() of true -> maybe; false -> maybe_too end.
+test_at_gg_a() -> case at()  > a() of true -> maybe; false -> maybe_too end.
+test_at_ge_a() -> case at() >= a() of true -> maybe; false -> maybe_too end.
+test_at_ll_t() -> case at()  < t() of true -> maybe; false -> maybe_too end.
+test_at_le_t() -> case at() =< t() of true -> maybe; false -> maybe_too end.
+test_at_gg_t() -> case at()  > t() of true -> maybe; false -> maybe_too end.
+test_at_ge_t() -> case at() >= t() of true -> maybe; false -> maybe_too end.
+test_at_ll_l() -> case at()  < l() of true -> always; false -> never end.
+test_at_le_l() -> case at() =< l() of true -> always; false -> never end.
+test_at_gg_l() -> case at()  > l() of true -> never; false -> always end.
+test_at_ge_l() -> case at() >= l() of true -> never; false -> always end.
+
+test_tl_ll_n() -> case tl()  < n() of true -> never; false -> always end.
+test_tl_le_n() -> case tl() =< n() of true -> never; false -> always end.
+test_tl_gg_n() -> case tl()  > n() of true -> always; false -> never end.
+test_tl_ge_n() -> case tl() >= n() of true -> always; false -> never end.
+test_tl_ll_a() -> case tl()  < a() of true -> never; false -> always end.
+test_tl_le_a() -> case tl() =< a() of true -> never; false -> always end.
+test_tl_gg_a() -> case tl()  > a() of true -> always; false -> never end.
+test_tl_ge_a() -> case tl() >= a() of true -> always; false -> never end.
+test_tl_ll_t() -> case tl()  < t() of true -> maybe; false -> maybe_too end.
+test_tl_le_t() -> case tl() =< t() of true -> maybe; false -> maybe_too end.
+test_tl_gg_t() -> case tl()  > t() of true -> maybe; false -> maybe_too end.
+test_tl_ge_t() -> case tl() >= t() of true -> maybe; false -> maybe_too end.
+test_tl_ll_l() -> case tl()  < l() of true -> maybe; false -> maybe_too end.
+test_tl_le_l() -> case tl() =< l() of true -> maybe; false -> maybe_too end.
+test_tl_gg_l() -> case tl()  > l() of true -> maybe; false -> maybe_too end.
+test_tl_ge_l() -> case tl() >= l() of true -> maybe; false -> maybe_too end.
+
+test_na_ll_na() -> case na()  < na() of true -> maybe; false -> maybe_too end.
+test_na_le_na() -> case na() =< na() of true -> maybe; false -> maybe_too end.
+test_na_gg_na() -> case na()  > na() of true -> maybe; false -> maybe_too end.
+test_na_ge_na() -> case na() >= na() of true -> maybe; false -> maybe_too end.
+test_na_ll_at() -> case na()  < at() of true -> maybe; false -> maybe_too end.
+test_na_le_at() -> case na() =< at() of true -> maybe; false -> maybe_too end.
+test_na_gg_at() -> case na()  > at() of true -> maybe; false -> maybe_too end.
+test_na_ge_at() -> case na() >= at() of true -> maybe; false -> maybe_too end.
+test_na_ll_tl() -> case na()  < tl() of true -> always; false -> never end.
+test_na_le_tl() -> case na() =< tl() of true -> always; false -> never end.
+test_na_gg_tl() -> case na()  > tl() of true -> never; false -> always end.
+test_na_ge_tl() -> case na() >= tl() of true -> never; false -> always end.
+
+test_at_ll_na() -> case at()  < na() of true -> maybe; false -> maybe_too end.
+test_at_le_na() -> case at() =< na() of true -> maybe; false -> maybe_too end.
+test_at_gg_na() -> case at()  > na() of true -> maybe; false -> maybe_too end.
+test_at_ge_na() -> case at() >= na() of true -> maybe; false -> maybe_too end.
+test_at_ll_at() -> case at()  < at() of true -> maybe; false -> maybe_too end.
+test_at_le_at() -> case at() =< at() of true -> maybe; false -> maybe_too end.
+test_at_gg_at() -> case at()  > at() of true -> maybe; false -> maybe_too end.
+test_at_ge_at() -> case at() >= at() of true -> maybe; false -> maybe_too end.
+test_at_ll_tl() -> case at()  < tl() of true -> maybe; false -> maybe_too end.
+test_at_le_tl() -> case at() =< tl() of true -> maybe; false -> maybe_too end.
+test_at_gg_tl() -> case at()  > tl() of true -> maybe; false -> maybe_too end.
+test_at_ge_tl() -> case at() >= tl() of true -> maybe; false -> maybe_too end.
+
+test_tl_ll_na() -> case tl()  < na() of true -> never; false -> always end.
+test_tl_le_na() -> case tl() =< na() of true -> never; false -> always end.
+test_tl_gg_na() -> case tl()  > na() of true -> always; false -> never end.
+test_tl_ge_na() -> case tl() >= na() of true -> always; false -> never end.
+test_tl_ll_at() -> case tl()  < at() of true -> maybe; false -> maybe_too end.
+test_tl_le_at() -> case tl() =< at() of true -> maybe; false -> maybe_too end.
+test_tl_gg_at() -> case tl()  > at() of true -> maybe; false -> maybe_too end.
+test_tl_ge_at() -> case tl() >= at() of true -> maybe; false -> maybe_too end.
+test_tl_ll_tl() -> case tl()  < tl() of true -> maybe; false -> maybe_too end.
+test_tl_le_tl() -> case tl() =< tl() of true -> maybe; false -> maybe_too end.
+test_tl_gg_tl() -> case tl()  > tl() of true -> maybe; false -> maybe_too end.
+test_tl_ge_tl() -> case tl() >= tl() of true -> maybe; false -> maybe_too end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/failing_funs.erl b/lib/dialyzer/test/small_SUITE_data/src/failing_funs.erl
new file mode 100644
index 0000000000..1784c4a494
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/failing_funs.erl
@@ -0,0 +1,250 @@
+-module(failing_funs).
+
+-compile(export_all).
+
+% Crashes with system call. No spec.
+foo1() -> halt().
+
+% Crashes with system call. With spec.
+-spec foo2() -> no_return().
+foo2() -> halt().
+
+% Crashes on its own. No spec.
+foo3() -> case a of b -> ok end.
+
+% Crashes on its own. With spec.
+-spec foo4() -> no_return().
+foo4() -> case a of b -> ok end.
+
+% Creates fun that crashes with system call. No spec.
+foo5() -> fun() -> halt() end.
+
+% Creates fun that crashes with system call. With spec.
+-spec foo6() -> fun(() -> no_return()).
+foo6() -> fun() -> halt() end.
+
+% Creates fun from named fun that will crash. Neither have spec.
+foo7() -> fun foo1/0.
+
+% Creates fun from named fun that will crash. Has spec.
+-spec foo8() -> fun(() -> no_return()).
+foo8() -> fun foo1/0.
+
+% Creates fun from named fun that will crash. Named has spec.
+foo9() -> fun foo2/0.
+
+% Creates fun from named fun that will crash. Both have specs.
+-spec foo10() -> fun(() -> no_return()).
+foo10() -> fun foo2/0.
+
+% Creates fun from named fun that will crash. Neither have spec.
+foo11() -> fun foo3/0.
+
+% Creates fun from named fun that will crash. Has spec.
+-spec foo12() -> fun(() -> no_return()).
+foo12() -> fun foo3/0.
+
+% Creates fun from named fun that will crash. Named has spec.
+foo13() -> fun foo4/0.
+
+% Creates fun from named fun that will crash. Both have specs.
+-spec foo14() -> fun(() -> no_return()).
+foo14() -> fun foo4/0.
+
+% Creates fun calling a named fun that will crash. Neither have spec.
+foo15() -> fun() -> foo1() end.
+
+% Creates fun calling a named fun that will crash. Has spec.
+-spec foo16() -> fun(() -> no_return()).
+foo16() -> fun() -> foo1() end.
+
+% Creates fun calling a named fun that will crash. Named has spec.
+foo17() -> fun() -> foo2() end.
+
+% Creates fun calling a named fun that will crash. Both have specs.
+-spec foo18() -> fun(() -> no_return()).
+foo18() -> fun() -> foo2() end.
+
+% Creates fun calling a named fun that will crash. Neither have spec.
+foo19() -> fun() -> foo3() end.
+
+% Creates fun calling a named fun that will crash. Has spec.
+-spec foo20() -> fun(() -> no_return()).
+foo20() -> fun() -> foo3() end.
+
+% Creates fun calling a named fun that will crash. Named has spec.
+foo21() -> fun() -> foo4() end.
+
+% Creates fun calling a named fun that will crash. Both have specs.
+-spec foo22() -> fun(() -> no_return()).
+foo22() -> fun() -> foo4() end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo23() ->
+    Bomb = fun() -> halt() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> halt() end
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo24() -> fun(() -> no_return()).
+foo24() ->
+    Bomb = fun() -> halt() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> halt() end
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo25() ->
+    Bomb = fun() -> foo1() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo1() end
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo26() -> fun(() -> no_return()).
+foo26() ->
+    Bomb = fun foo1/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo1/0
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo27() ->
+    Bomb = fun foo1/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo1/0
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo28() -> fun(() -> no_return()).
+foo28() ->
+    Bomb = fun() -> foo1() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo1() end
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo29() ->
+    Bomb = fun() -> foo2() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo2() end
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo30() -> fun(() -> no_return()).
+foo30() ->
+    Bomb = fun foo2/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo2/0
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo31() ->
+    Bomb = fun foo2/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo2/0
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo32() -> fun(() -> no_return()).
+foo32() ->
+    Bomb = fun() -> foo2() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo2() end
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo33() ->
+    Bomb = fun() -> foo3() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo3() end
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo34() -> fun(() -> no_return()).
+foo34() ->
+    Bomb = fun foo3/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo3/0
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo35() ->
+    Bomb = fun foo3/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo3/0
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo36() -> fun(() -> no_return()).
+foo36() ->
+    Bomb = fun() -> foo3() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo3() end
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo37() ->
+    Bomb = fun() -> foo4() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo4() end
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo38() -> fun(() -> no_return()).
+foo38() ->
+    Bomb = fun foo4/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo4/0
+    end.
+
+% Creates two funs with no local return and will return one or die. No spec.
+foo39() ->
+    Bomb = fun foo4/0,
+    case get(42) of
+	a -> Bomb();
+	b -> fun foo4/0
+    end.
+
+% Creates two funs with no local return and will return one or die. With spec.
+-spec foo40() -> fun(() -> no_return()).
+foo40() ->
+    Bomb = fun() -> foo4() end,
+    case get(42) of
+	a -> Bomb();
+	b -> fun() -> foo4() end
+    end.
+
+% Obtains two funs with no local return and will return one or die. No spec.
+foo41() ->
+    Bomb = foo5(),
+    case get(42) of
+	a -> Bomb();
+	b -> foo5()
+    end.
+
+% Obtains two funs with no local return and will return one or die. With spec.
+-spec foo42() -> fun(() -> no_return()).
+foo42() ->
+    Bomb = foo5(),
+    case get(42) of
+	a -> Bomb();
+	b -> foo5()
+    end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/list_to_bitstring.erl b/lib/dialyzer/test/small_SUITE_data/src/list_to_bitstring.erl
index 2da708cb15..109aa88f16 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/list_to_bitstring.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/list_to_bitstring.erl
@@ -2,7 +2,7 @@
 %% From: Ken Robinson
 %% Date: 28/04/2011, 17:26
 %%
-%% Program that produced borus "Function has no local return" warnings
+%% Program that produced bogus "Function has no local return" warnings
 %% due to erlang:list_to_bitstring/1 having erroneous hard coded type
 %% information, namely accepting iolist() instead of bitstrlist().
 %% Fixed 29/04/2011.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/rebar_no_return.erl b/lib/dialyzer/test/small_SUITE_data/src/rebar_no_return.erl
new file mode 100644
index 0000000000..d3b504ae04
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/rebar_no_return.erl
@@ -0,0 +1,19 @@
+-module(rebar_no_return).
+
+-export([t/0]).
+
+-spec t() -> no_return().
+t() ->
+  F = log_and_halt("baz"),
+  F("foo", 123).
+
+-spec log_and_halt(string()) -> fun((string(),integer()) -> no_return()).
+log_and_halt(Msg) ->
+  fun(_, _) ->
+      abort(Msg)
+  end.
+
+-spec abort(string()) -> no_return().
+abort(Msg) ->
+  io:format("~s~n", [Msg]),
+  halt(1).
diff --git a/lib/diameter/make/rules.mk.in b/lib/diameter/make/rules.mk.in
index 4a1a55b8d3..6318f2bc9c 100644
--- a/lib/diameter/make/rules.mk.in
+++ b/lib/diameter/make/rules.mk.in
@@ -164,7 +164,7 @@ $(MAN3DIR)/%.3:: %.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
-# left for compatability
+# left for compatibility
 $(MAN4DIR)/%.4:: %.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
@@ -173,7 +173,7 @@ $(MAN4DIR)/%.5:: %.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
-# left for compatability
+# left for compatibility
 $(MAN6DIR)/%.6:: %_app.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl
index 92aa8488a0..46473e7bf1 100644
--- a/lib/diameter/src/transport/diameter_sctp.erl
+++ b/lib/diameter/src/transport/diameter_sctp.erl
@@ -525,7 +525,22 @@ recv({[#sctp_sndrcvinfo{stream = Id}], Bin}, #transport{parent = Pid})
 
 recv({[], #sctp_shutdown_event{assoc_id = Id}},
      #transport{assoc_id = Id}) ->
-    stop.
+    stop;
+
+%% Note that diameter_sctp(3) documents that sctp_events cannot be
+%% specified in the list of options passed to gen_sctp and that
+%% gen_opts/1 guards against this. This is to ensure that we know what
+%% events to expect and also to ensure that we receive
+%% #sctp_sndrcvinfo{} with each incoming message (data_io_event =
+%% true). Adaptation layer events (ie. #sctp_adaptation_event{}) are
+%% disabled by default so don't handle it. We could simply disable
+%% events we don't react to but don't.
+
+recv({[], #sctp_paddr_change{}}, _) ->
+    ok;
+
+recv({[], #sctp_pdapi_event{}}, _) ->
+    ok.
 
 %% up/1
 
@@ -591,7 +606,7 @@ f([], _, _) ->
 
 %% assoc_id/1
 
-assoc_id(#sctp_shutdown_event{assoc_id = Id}) ->  %% undocumented
+assoc_id(#sctp_shutdown_event{assoc_id = Id}) ->
     Id;
 assoc_id(#sctp_assoc_change{assoc_id = Id}) ->
     Id;
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index a3d601d861..35f6349f70 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -1382,16 +1382,15 @@
   <!-- Func -->
   <xsl:template match="func">
     <xsl:param name="partnum"/>
-
-    <xsl:apply-templates select="name"/>
-    <xsl:apply-templates
-        select="name[string-length(@arity) > 0 and position()=last()]"
-        mode="types"/>
-
-    <xsl:apply-templates select="fsummary|type|desc">
-      <xsl:with-param name="partnum" select="$partnum"/>
-    </xsl:apply-templates>
-
+    <fo:block space-before="1.5em">
+      <xsl:apply-templates select="name"/>
+      <xsl:apply-templates
+	  select="name[string-length(@arity) > 0 and position()=last()]"
+	  mode="types"/>
+      <xsl:apply-templates select="fsummary|type|desc">
+	<xsl:with-param name="partnum" select="$partnum"/>
+      </xsl:apply-templates>
+    </fo:block>
   </xsl:template>
 
 
@@ -1424,14 +1423,10 @@
     <xsl:param name="partnum"/>
     <xsl:choose>
       <xsl:when test="ancestor::cref">
-        <fo:block id="{generate-id(nametext)}">
-          <xsl:value-of select="ret"/><xsl:text> </xsl:text><xsl:value-of select="nametext"/>
-        </fo:block>
+        <fo:block id="{generate-id(nametext)}"><xsl:value-of select="ret"/><xsl:text></xsl:text><xsl:value-of select="nametext"/></fo:block>
       </xsl:when>
       <xsl:otherwise>
-        <fo:block id="{generate-id(.)}">
-          <xsl:value-of select="."/>
-        </fo:block>
+        <fo:block id="{generate-id(.)}"><xsl:value-of select="."/></fo:block>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -1468,7 +1463,7 @@
         </fo:block>
       </fo:list-item-label>
       <fo:list-item-body start-indent="body-start()" format="justify">
-        <fo:block font-weight="bold">
+        <fo:block font-weight="bold" font-family="monospace" >
           <xsl:apply-templates>
             <xsl:with-param name="partnum" select="$partnum"/>
           </xsl:apply-templates>
diff --git a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
index 7de20f2092..3dfecf8b74 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
@@ -316,8 +316,8 @@
     <xsl:attribute name="font-family">monospace</xsl:attribute>
     <!-- xsl:attribute name="font-size">0.8em</xsl:attribute -->
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
-    <xsl:attribute name="space-after">0.3em</xsl:attribute>
-    <xsl:attribute name="space-before">1.5em</xsl:attribute>
+    <xsl:attribute name="space-after">0.25em</xsl:attribute>
+    <!-- xsl:attribute name="space-before">1.5em</xsl:attribute -->
   </xsl:attribute-set> 
 
   <xsl:attribute-set name="type-listblock">
diff --git a/lib/erl_interface/doc/src/ei.xml b/lib/erl_interface/doc/src/ei.xml
index de4e4b4301..76e02a6858 100644
--- a/lib/erl_interface/doc/src/ei.xml
+++ b/lib/erl_interface/doc/src/ei.xml
@@ -581,9 +581,9 @@ ei_x_encode_empty_list(&amp;x);
           <c><![CDATA[term]]></c> union, it is decoded, and the appropriate field
           in <c><![CDATA[term->value]]></c> is set, and <c><![CDATA[*index]]></c> is
           incremented by the term size.</p>
-        <p>The function returns 0 on successful decoding, -1 on error,
-          and 1 if the term seems alright, but does not fit in the
-          <c><![CDATA[term]]></c> structure. If it returns 0, the <c><![CDATA[index]]></c>
+        <p>The function returns 1 on successful decoding, -1 on error,
+          and 0 if the term seems alright, but does not fit in the
+          <c><![CDATA[term]]></c> structure. If it returns 1, the <c><![CDATA[index]]></c>
           will be incremented, and the <c><![CDATA[term]]></c> contains the
           decoded term.</p>
         <p>The <c><![CDATA[term]]></c> structure will contain the arity for a tuple
diff --git a/lib/erl_interface/src/encode/encode_atom.c b/lib/erl_interface/src/encode/encode_atom.c
index 69f2d1451c..b1a4479034 100644
--- a/lib/erl_interface/src/encode/encode_atom.c
+++ b/lib/erl_interface/src/encode/encode_atom.c
@@ -17,13 +17,17 @@
  * %CopyrightEnd%
  */
 #include <string.h>
+#include <limits.h>
 #include "eidef.h"
 #include "eiext.h"
 #include "putget.h"
 
 int ei_encode_atom(char *buf, int *index, const char *p)
 {
-    return ei_encode_atom_len(buf, index, p, strlen(p));
+    size_t len = strlen(p);
+
+    if (len >= INT_MAX) return -1;
+    return ei_encode_atom_len(buf, index, p, len);
 }
 
 int ei_encode_atom_len(char *buf, int *index, const char *p, int len)
diff --git a/lib/erl_interface/src/encode/encode_string.c b/lib/erl_interface/src/encode/encode_string.c
index 1d342cb605..593bbf2b6d 100644
--- a/lib/erl_interface/src/encode/encode_string.c
+++ b/lib/erl_interface/src/encode/encode_string.c
@@ -17,6 +17,7 @@
  * %CopyrightEnd%
  */
 #include <string.h>
+#include <limits.h>
 #include "eidef.h"
 #include "eiext.h"
 #include "putget.h"
@@ -24,7 +25,10 @@
 
 int ei_encode_string(char *buf, int *index, const char *p)
 {
-    return ei_encode_string_len(buf, index, p, strlen(p));
+    size_t len = strlen(p);
+
+    if (len >= INT_MAX) return -1;
+    return ei_encode_string_len(buf, index, p, len);
 }
 
 int ei_encode_string_len(char *buf, int *index, const char *p, int len)
diff --git a/lib/erl_interface/src/legacy/erl_fix_alloc.c b/lib/erl_interface/src/legacy/erl_fix_alloc.c
index 20f3024e41..ca09fc3b8b 100644
--- a/lib/erl_interface/src/legacy/erl_fix_alloc.c
+++ b/lib/erl_interface/src/legacy/erl_fix_alloc.c
@@ -109,6 +109,10 @@ void *erl_eterm_alloc (void)
 	erl_eterm_state->freed--;      
     } else if ((b = malloc(sizeof(*b))) == NULL) {
 	erl_errno = ENOMEM;
+#ifdef _REENTRANT
+	ei_mutex_unlock(erl_eterm_state->lock);
+#endif /* _REENTRANT */
+	return NULL;
     }
     erl_eterm_state->allocated++;
     b->free = 0;
diff --git a/lib/erl_interface/src/misc/ei_decode_term.c b/lib/erl_interface/src/misc/ei_decode_term.c
index bfb4571337..0b82ef0e35 100644
--- a/lib/erl_interface/src/misc/ei_decode_term.c
+++ b/lib/erl_interface/src/misc/ei_decode_term.c
@@ -25,8 +25,8 @@
 #include "ei_decode_term.h"
 #include "putget.h"
 
-/* Returns 0 on successful encoding, -1 on error, and 1 if the term seems
-   alright, but does not fit in the term structure. If it returns 0, the
+/* Returns 1 on successful encoding, -1 on error, and 0 if the term seems
+   alright, but does not fit in the term structure. If it returns 1, the
    index will be incremented, and the term contains the decoded term. */
 
 int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
@@ -111,10 +111,10 @@ int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
 	break;
     case ERL_SMALL_TUPLE_EXT:
 	term->arity = get8(s);
-	break; /*return 0;*/
+	break;
     case ERL_LARGE_TUPLE_EXT:
 	term->arity = get32be(s);
-	break; /*return 0;*/
+	break;
     case ERL_NIL_EXT:
 	term->arity = 0;
 	break;
@@ -123,7 +123,7 @@ int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
 	return 0;
     case ERL_LIST_EXT:
 	term->arity = get32be(s);
-	break; /*return 0;*/
+	break;
     case ERL_BINARY_EXT:
 	term->size = get32be(s);
 	return 0;
diff --git a/lib/erl_interface/src/registry/reg_dump.c b/lib/erl_interface/src/registry/reg_dump.c
index 1e640fb506..d2854c10b5 100644
--- a/lib/erl_interface/src/registry/reg_dump.c
+++ b/lib/erl_interface/src/registry/reg_dump.c
@@ -215,6 +215,7 @@ static int mn_send_write(int fd, erlang_pid *mnesia, const char *key, ei_reg_obj
     else ei_encode_long(msgbuf,&index,(long)(obj->val.p));  /* just the pointer */
     break;
   default:
+    if (dbuf) free(dbuf);
     return -1;
   }
 
diff --git a/lib/erl_interface/src/registry/reg_restore.c b/lib/erl_interface/src/registry/reg_restore.c
index 765c3f4314..7bc1c758af 100644
--- a/lib/erl_interface/src/registry/reg_restore.c
+++ b/lib/erl_interface/src/registry/reg_restore.c
@@ -303,6 +303,9 @@ int ei_reg_restore(int fd, ei_reg *reg, const char *mntab)
     if (mn_decode_insert(reg,msgbuf,&index,keybuf)) goto restore_failure;
   }
   
+  if (keybuf) free(keybuf);
+  if (dbuf) free(dbuf);
+
   /* wait for unlink */
   if (mn_unlink(fd)) return -1;
 
@@ -310,8 +313,6 @@ int ei_reg_restore(int fd, ei_reg *reg, const char *mntab)
   ei_hash_foreach(reg->tab,clean_obj);
 
   /* success */
-  if (keybuf) free(keybuf);
-  if (dbuf) free(dbuf);
   return 0;
 
 restore_failure:
diff --git a/lib/gs/contribs/bonk/sounder.erl b/lib/gs/contribs/bonk/sounder.erl
index 11ab03d167..899f20d4e0 100644
--- a/lib/gs/contribs/bonk/sounder.erl
+++ b/lib/gs/contribs/bonk/sounder.erl
@@ -72,13 +72,13 @@ stop() ->
     sounder ! {stop},
     ok end.
 
-new(File) when list(File) -> new(list_to_atom(File));
-new(File) when atom(File) ->
+new(File) when is_list(File) -> new(list_to_atom(File));
+new(File) when is_atom(File) ->
     catch begin check(),
     sounder ! {new,File,self()},
     wait_for_ack(sounder) end.
 
-play(No) when integer(No) ->
+play(No) when is_integer(No) ->
     catch begin check(),
     sounder ! {play, No, self()},
     wait_for_ack(sounder) end.
@@ -94,14 +94,14 @@ go()  ->
 
 loop(Port) ->
     receive
-	{new, File, From} when atom(File) ->
+	{new, File, From} when is_atom(File) ->
 	    Port ! {self(),{command,lists:append([0],atom_to_list(File))}},
 	    From ! {sounder,wait_for_ack(Port)},
 	    loop(Port);
 	{play,silent,From} ->
 	    From ! {sounder,false},
 	    loop(Port);
-	{play,No,From} when integer(No) ->
+	{play,No,From} when is_integer(No) ->
 	    Port ! {self(),{command,[No]}},
 	    From ! {sounder,wait_for_ack(Port)},
 	    loop(Port);
@@ -118,13 +118,13 @@ loop(Port) ->
 
 nosound() ->
     receive
-	{new,File,From} when atom(File) ->
+	{new,File,From} when is_atom(File) ->
 	    From ! {sounder,{ok,silent}},
 	    nosound();
 	{play,silent,From} ->
 	    From ! {sounder,true},
 	    nosound();
-	{play,No,From} when integer(No) ->
+	{play,No,From} when is_integer(No) ->
 	    From ! {sounder,{error,no_audio_cap}},
 	    nosound();
 	{stop} ->
@@ -135,7 +135,7 @@ nosound() ->
 
 wait_for_ack(sounder) ->
     receive {sounder,Res} -> Res end;
-wait_for_ack(Port) when port(Port) ->
+wait_for_ack(Port) when is_port(Port) ->
     receive
 	{Port,{data,"ok"}} ->
 	    ok;
@@ -149,7 +149,7 @@ wait_for_ack(Port) when port(Port) ->
 
 check() ->
     case whereis(sounder) of
-	Pid when pid(Pid) -> 
+	Pid when is_pid(Pid) -> 
 	    ok;
 	undefined ->
 	    throw({error,sounder_not_started})
diff --git a/lib/gs/contribs/cols/cols.erl b/lib/gs/contribs/cols/cols.erl
index 67b46d0dfb..439eb717f7 100644
--- a/lib/gs/contribs/cols/cols.erl
+++ b/lib/gs/contribs/cols/cols.erl
@@ -278,7 +278,7 @@ fall_column([], _X, _Y, ColumnAcc, ChecksAcc) ->
 fall_column([black|Colors], X, Y, ColumnAcc, ChecksAcc) ->
     case find_box(Colors) of
 	false -> {ColumnAcc, ChecksAcc};
-	NewColors when list(NewColors) ->
+	NewColors when is_list(NewColors) ->
 		fall_one_step(NewColors, X, Y, ColumnAcc, ChecksAcc)
     end;
 fall_column([Color|Colors], X, Y, ColumnAcc, ChecksAcc) ->
@@ -330,7 +330,7 @@ new_column_list([], _, _) -> [].
 %%----------------------------------------------------------------------
 %% Returns: a reversed list of colors.
 %%----------------------------------------------------------------------
-columntuple_to_list(ColumnTuple) when tuple(ColumnTuple) ->
+columntuple_to_list(ColumnTuple) when is_tuple(ColumnTuple) ->
     columntuple_to_list(tuple_to_list(ColumnTuple),[]).
 
 columntuple_to_list([],Acc) -> Acc;
diff --git a/lib/gs/contribs/mandel/mandel.erl b/lib/gs/contribs/mandel/mandel.erl
index d4d2452463..579f8e487b 100644
--- a/lib/gs/contribs/mandel/mandel.erl
+++ b/lib/gs/contribs/mandel/mandel.erl
@@ -119,7 +119,7 @@ start_client(Opts,Nodes) ->
 
 try_random(random,Low,High) ->
     random:uniform()*(High-Low)+Low;
-try_random(Float,_Low,_High) when number(Float) -> Float.
+try_random(Float,_Low,_High) when is_number(Float) -> Float.
     
 
 %%-----------------------------------------------------------------
diff --git a/lib/gs/contribs/othello/othello_board.erl b/lib/gs/contribs/othello/othello_board.erl
index 0206ba2ded..6ccb79b7e4 100644
--- a/lib/gs/contribs/othello/othello_board.erl
+++ b/lib/gs/contribs/othello/othello_board.erl
@@ -147,7 +147,7 @@ but_pressed("Help",_ButtId,_User,GamePid,_Shell,_Wids,_Op) ->
 but_pressed("Newgame",_ButtId,_User,GamePid,_Shell,Wids,Options) ->
     new_game(GamePid,Wids,Options);
 but_pressed([],ButtId,User,GamePid,_Shell,_Wids,_Op) 
-					when pid(GamePid),User == player ->
+					when is_pid(GamePid),User == player ->
     [C,R] = atom_to_list(ButtId),
     GamePid ! {self(),position,othello_adt:pos(C-96,translate(R-48))},
     GamePid;
@@ -243,7 +243,7 @@ game_msg(Msg,User,GamePid,Shell,Wids,Options) ->
     end.
     
 
-new_game(GamePid,Wids,Options) when pid(GamePid) ->
+new_game(GamePid,Wids,Options) when is_pid(GamePid) ->
     exit(GamePid,kill),
     new_game(Wids,Options);
 new_game(_,Wids,Options) ->
diff --git a/lib/gs/examples/calc2.erl b/lib/gs/examples/calc2.erl
index d28780de01..9969a6c40f 100644
--- a/lib/gs/examples/calc2.erl
+++ b/lib/gs/examples/calc2.erl
@@ -54,7 +54,7 @@ calc() ->
 
 calc_loop(Lbl,M,V,Op) ->
     receive
-	{gs,_,click,D,_} when integer(D) -> 
+	{gs,_,click,D,_} when is_integer(D) -> 
 	    digit_press(Lbl,M,V*10+D,Op);
 	{gs,_,click,'C',_} -> 
 	    c(Lbl,M,V,Op);
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index 43c2ac2615..1483b2aee1 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -366,7 +366,7 @@ type(erlang, '>', 2, Xs = [Lhs, Rhs]) ->
 	  is_integer(LhsMax), is_integer(RhsMin), RhsMin >= LhsMax -> F;
 	  true -> t_boolean()
 	end;
-      false -> t_boolean()
+      false -> compare('>', Lhs, Rhs)
     end,
   strict(Xs, Ans);
 type(erlang, '>=', 2, Xs = [Lhs, Rhs]) ->
@@ -384,7 +384,7 @@ type(erlang, '>=', 2, Xs = [Lhs, Rhs]) ->
 	  is_integer(LhsMax), is_integer(RhsMin), RhsMin > LhsMax -> F;
 	  true -> t_boolean()
 	end;
-      false -> t_boolean()
+      false -> compare('>=', Lhs, Rhs)
     end,
   strict(Xs, Ans);
 type(erlang, '<', 2, Xs = [Lhs, Rhs]) ->
@@ -402,7 +402,7 @@ type(erlang, '<', 2, Xs = [Lhs, Rhs]) ->
 	  is_integer(LhsMin), is_integer(RhsMax), RhsMax =< LhsMin -> F;
 	  true -> t_boolean()
 	end;
-      false -> t_boolean()
+      false -> compare('<', Lhs, Rhs)
     end,
   strict(Xs, Ans);
 type(erlang, '=<', 2, Xs = [Lhs, Rhs]) ->
@@ -420,7 +420,7 @@ type(erlang, '=<', 2, Xs = [Lhs, Rhs]) ->
 	  is_integer(LhsMin), is_integer(RhsMax), RhsMax < LhsMin -> F;
 	  true -> t_boolean()
 	end;
-      false -> t_boolean()
+      false -> compare('=<', Lhs, Rhs)
     end,
   strict(Xs, Ans);
 type(erlang, '+', 1, Xs) ->
@@ -737,6 +737,7 @@ type(erlang, element, 2, Xs) ->
 type(erlang, erase, 0, _) -> t_any();
 type(erlang, erase, 1, _) -> t_any();
 type(erlang, external_size, 1, _) -> t_integer();
+type(erlang, external_size, 2, _) -> t_integer();
 type(erlang, finish_after_on_load, 2, Xs) ->
   %% Internal BIF used by on_load.
   strict(arg_types(erlang, finish_after_on_load, 2), Xs,
@@ -1201,6 +1202,7 @@ type(erlang, process_flag, 2, Xs) ->
 		 case t_atom_vals(Flag) of
 		   ['error_handler'] -> t_atom();
 		   ['min_heap_size'] -> t_non_neg_integer();
+		   ['scheduler'] -> t_non_neg_integer();
 		   ['monitor_nodes'] -> t_boolean();
 		   ['priority'] -> t_process_priority_level();
 		   ['save_calls'] -> t_non_neg_integer();
@@ -1901,7 +1903,7 @@ type(prim_file, internal_native2name, 1, Xs) ->
 	 fun (_) -> t_prim_file_name() end);
 type(prim_file, internal_normalize_utf8, 1, Xs) ->
   strict(arg_types(prim_file, internal_normalize_utf8, 1), Xs,  
-	 fun (_) -> t_binary() end);
+	 fun (_) -> t_unicode_string() end);
 %%-- gen_tcp ------------------------------------------------------------------
 %% NOTE: All type information for this module added to avoid loss of precision
 type(gen_tcp, accept, 1, Xs) ->
@@ -2326,10 +2328,7 @@ type(lists, keyfind, 3, Xs) ->
 		     case t_tuple_subtypes(Tuple) of
 		       unknown -> Ret;
 		       List ->
-			 Keys = [type(erlang, element, 2, [Y, S])
-				 || S <- List],
-			 Infs = [t_inf(Key, X) || Key <- Keys],
-			 case all_is_none(Infs) of
+			 case key_comparisons_fail(X, Y, List) of
 			   true -> t_atom('false');
 			   false -> Ret
 			 end
@@ -2359,9 +2358,7 @@ type(lists, keymember, 3, Xs) ->
 		     case t_tuple_subtypes(Tuple) of
 		       unknown -> t_boolean();
 		       List ->
-			 Keys = [type(erlang, element, 2, [Y,S]) || S <- List],
-			 Infs = [t_inf(Key, X) || Key <- Keys],
-			 case all_is_none(Infs) of
+			 case key_comparisons_fail(X, Y, List) of
 			   true -> t_atom('false');
 			   false -> t_boolean()
 			 end
@@ -2391,10 +2388,7 @@ type(lists, keysearch, 3, Xs) ->
 		     case t_tuple_subtypes(Tuple) of
 		       unknown -> Ret;
 		       List ->
-			 Keys = [type(erlang, element, 2, [Y, S])
-				 || S <- List],
-			 Infs = [t_inf(Key, X) || Key <- Keys],
-			 case all_is_none(Infs) of
+			 case key_comparisons_fail(X, Y, List) of
 			   true -> t_atom('false');
 			   false -> Ret
 			 end
@@ -2822,9 +2816,6 @@ list_replace(1, E, [_X | Xs]) ->
 any_is_none_or_unit(Ts) ->
   lists:any(fun erl_types:t_is_none_or_unit/1, Ts).
 
-all_is_none(Ts) ->
-  lists:all(fun erl_types:t_is_none/1, Ts).
-
 check_guard([X], Test, Type) ->
   check_guard_single(X, Test, Type).
 
@@ -3177,6 +3168,59 @@ arith(Op, X1, X2) ->
   end.
 
 %%=============================================================================
+%% Comparison of terms
+%%=============================================================================
+
+compare(Op, Lhs, Rhs) ->
+  case t_is_none(t_inf(Lhs, Rhs)) of
+    false -> t_boolean();
+    true ->
+      case Op of
+	'<' -> always_smaller(Lhs, Rhs);
+	'>' -> always_smaller(Rhs, Lhs);
+	'=<' -> always_smaller(Lhs, Rhs);
+	'>=' -> always_smaller(Rhs, Lhs)
+      end
+  end.
+
+always_smaller(Type1, Type2) ->
+  {Min1, Max1} = type_ranks(Type1),
+  {Min2, Max2} = type_ranks(Type2),
+  if Max1 < Min2 -> t_atom('true');
+     Min1 > Max2 -> t_atom('false');
+     true        -> t_boolean()
+  end.
+
+type_ranks(Type) ->
+  type_ranks(Type, 1, 0, 0, type_order()).
+
+type_ranks(_Type, _I, Min, Max, []) -> {Min, Max};
+type_ranks(Type, I, Min, Max, [TypeClass|Rest]) ->
+  {NewMin, NewMax} =
+    case t_is_none(t_inf(Type, TypeClass)) of
+      true  -> {Min, Max};
+      false -> case Min of
+		 0 -> {I, I};
+		 _ -> {Min, I}
+	       end
+    end,
+  type_ranks(Type, I+1, NewMin, NewMax, Rest).
+
+type_order() ->
+  [t_number(), t_atom(), t_reference(), t_fun(), t_port(), t_pid(), t_tuple(),
+   t_list(), t_binary()].
+
+key_comparisons_fail(X0, KeyPos, TupleList) ->
+  X = case t_is_number(t_inf(X0, t_number())) of
+	false -> X0;
+	true -> t_number()
+      end,
+  lists:all(fun(Tuple) ->
+		Key = type(erlang, element, 2, [KeyPos, Tuple]),
+		t_is_none(t_inf(Key, X))
+	    end, TupleList).
+
+%%=============================================================================
 
 -spec arg_types(atom(), atom(), arity()) -> [erl_types:erl_type()] | 'unknown'.
 
@@ -3443,6 +3487,8 @@ arg_types(erlang, exit, 2) ->
   [t_sup(t_pid(), t_port()), t_any()];
 arg_types(erlang, external_size, 1) ->
   [t_any()]; % takes any term as input
+arg_types(erlang, external_size, 2) ->
+  [t_any(), t_list()]; % takes any term as input and a list of options
 arg_types(erlang, finish_after_on_load, 2) ->
   [t_atom(), t_boolean()];
 arg_types(erlang, float, 1) ->
@@ -3697,6 +3743,7 @@ arg_types(erlang, process_display, 2) ->
 arg_types(erlang, process_flag, 2) ->
   [t_sup([t_atom('trap_exit'), t_atom('error_handler'),
 	  t_atom('min_heap_size'), t_atom('priority'), t_atom('save_calls'),
+	  t_atom('scheduler'),                             % undocumented
 	  t_atom('monitor_nodes'), 			  % undocumented
 	  t_tuple([t_atom('monitor_nodes'), t_list()])]), % undocumented
    t_sup([t_boolean(), t_atom(), t_non_neg_integer()])];
@@ -3738,7 +3785,7 @@ arg_types(erlang, send, 3) ->
 arg_types(erlang, send_after, 3) ->
   [t_non_neg_integer(), t_sup(t_pid(), t_atom()), t_any()];
 arg_types(erlang, seq_trace, 2) ->
-  [t_atom(), t_sup([t_boolean(), t_tuple([t_fixnum(), t_fixnum()]), t_nil()])];
+  [t_atom(), t_sup([t_boolean(), t_tuple([t_fixnum(), t_fixnum()]), t_fixnum(), t_nil()])];
 arg_types(erlang, seq_trace_info, 1) ->
   [t_seq_trace_info()];
 arg_types(erlang, seq_trace_print, 1) ->
@@ -3987,7 +4034,7 @@ arg_types(ets, match_object, 3) ->
 arg_types(ets, match_spec_compile, 1) ->
   [t_matchspecs()];
 arg_types(ets, match_spec_run_r, 3) ->
-  [t_matchspecs(), t_any(), t_list()];
+  [t_list(t_tuple()),t_matchspecs(), t_list()];
 arg_types(ets, member, 2) ->
   [t_tab(), t_any()];
 arg_types(ets, new, 2) ->
@@ -4019,8 +4066,12 @@ arg_types(ets, select_reverse, 3) ->
 arg_types(ets, slot, 2) ->
   [t_tab(), t_non_neg_fixnum()]; % 2nd arg can be 0
 arg_types(ets, setopts, 2) ->
-  Opt = t_sup(t_tuple([t_atom('heir'), t_pid(), t_any()]),
-	      t_tuple([t_atom('heir'), t_atom('none')])),
+  Opt = t_sup([t_tuple([t_atom('heir'), t_pid(), t_any()]),
+	       t_tuple([t_atom('heir'), t_atom('none')]),
+	       t_tuple([t_atom('protection'),
+			t_sup([t_atom('protected'),
+			       t_atom('private'),
+			       t_atom('public')])])]),
   [t_tab(), t_sup(Opt, t_list(Opt))];
 arg_types(ets, update_counter, 3) ->
   Int = t_integer(),
@@ -4812,6 +4863,9 @@ t_ets_info_items() ->
 	 t_atom('owner'),
 	 t_atom('protection'),
 	 t_atom('size'),
+	 t_atom('compressed'),
+	 t_atom('heir'),
+	 t_atom('stats'),
 	 t_atom('type')]).
 
 %% =====================================================================
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index 1748c1cc16..7ff170776e 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -211,7 +211,8 @@
 	 record_field_diffs_to_string/2,
 	 subst_all_vars_to_any/1,
 	 lift_list_to_pos_empty/1,
-	 is_erl_type/1
+	 is_erl_type/1,
+	 atom_to_string/1
 	]).
 
 %%-define(DO_ERL_TYPES_TEST, true).
@@ -3360,14 +3361,14 @@ t_to_string(?var(Id), _RecDict) when is_integer(Id) ->
 
 record_to_string(Tag, [_|Fields], FieldNames, RecDict) ->
   FieldStrings = record_fields_to_string(Fields, FieldNames, RecDict, []),
-  "#" ++ atom_to_list(Tag) ++ "{" ++ string:join(FieldStrings, ",") ++ "}".
+  "#" ++ atom_to_string(Tag) ++ "{" ++ string:join(FieldStrings, ",") ++ "}".
 
 record_fields_to_string([F|Fs], [{FName, _DefType}|FDefs], RecDict, Acc) ->
   NewAcc =
     case t_is_any(F) orelse t_is_atom('undefined', F) of
       true -> Acc;
       false ->
-	StrFV = atom_to_list(FName) ++ "::" ++ t_to_string(F, RecDict),
+	StrFV = atom_to_string(FName) ++ "::" ++ t_to_string(F, RecDict),
 	%% ActualDefType = t_subtract(DefType, t_atom('undefined')),
 	%% Str = case t_is_any(ActualDefType) of
 	%% 	  true -> StrFV;
@@ -3393,7 +3394,7 @@ field_diffs([F|Fs], [{FName, DefType}|FDefs], RecDict, Acc) ->
     case t_is_subtype(F, DefType) of
       true -> Acc;
       false ->
-	Str = atom_to_list(FName) ++ "::" ++ t_to_string(DefType, RecDict),
+	Str = atom_to_string(FName) ++ "::" ++ t_to_string(DefType, RecDict),
 	[Str|Acc]
     end,
   field_diffs(Fs, FDefs, RecDict, NewAcc);
@@ -3906,7 +3907,7 @@ t_form_to_string({type, _L, union, Args}) ->
   string:join(t_form_to_string_list(Args), " | ");
 t_form_to_string({type, _L, Name, []} = T) ->
   try t_to_string(t_from_form(T))
-  catch throw:{error, _} -> atom_to_list(Name) ++ "()"
+  catch throw:{error, _} -> atom_to_string(Name) ++ "()"
   end;
 t_form_to_string({type, _L, Name, List}) -> 
   io_lib:format("~w(~s)",
@@ -3920,6 +3921,11 @@ t_form_to_string_list([H|T], Acc) ->
 t_form_to_string_list([], Acc) ->
   lists:reverse(Acc).
 
+-spec atom_to_string(atom()) -> string().
+
+atom_to_string(Atom) ->
+  lists:flatten(io_lib:format("~w", [Atom])).
+
 %%=============================================================================
 %% 
 %% Utilities
diff --git a/lib/hipe/icode/hipe_beam_to_icode.erl b/lib/hipe/icode/hipe_beam_to_icode.erl
index f557d3419e..45b390acbd 100644
--- a/lib/hipe/icode/hipe_beam_to_icode.erl
+++ b/lib/hipe/icode/hipe_beam_to_icode.erl
@@ -724,7 +724,7 @@ trans_fun([{test,bs_get_float2,{f,Lbl},[Ms,_Live,Size,Unit,{field_flags,Flags0},
 	?EXIT({bad_bs_size_constant,Size});
       BitReg ->
 	Bits = mk_var(BitReg),
-	{{bs_get_float,Unit,Flags}, [Bits,MsVar]}
+	{{bs_get_float,Unit,Flags}, [MsVar,Bits]}
     end,
   trans_op_call({hipe_bs_primop,Name}, Lbl, Args, [Dst,MsVar], Env, Instructions);
 trans_fun([{test,bs_get_integer2,{f,Lbl},[Ms,_Live,Size,Unit,{field_flags,Flags0},X]}|
diff --git a/lib/hipe/regalloc/hipe_node_sets.erl b/lib/hipe/regalloc/hipe_node_sets.erl
index b5e2971c4d..0bb21d7506 100644
--- a/lib/hipe/regalloc/hipe_node_sets.erl
+++ b/lib/hipe/regalloc/hipe_node_sets.erl
@@ -29,7 +29,7 @@
 
 -record(node_sets, 
 	{spilled,    % Nodes marked for spilling
-	 colored     % Nodes succesfully colored
+	 colored     % Nodes successfully colored
 	}).
 
 spilled(Node_sets) -> Node_sets#node_sets.spilled.
diff --git a/lib/hipe/rtl/hipe_rtl_lcm.erl b/lib/hipe/rtl/hipe_rtl_lcm.erl
index 5d65389d48..d45ab4ed46 100644
--- a/lib/hipe/rtl/hipe_rtl_lcm.erl
+++ b/lib/hipe/rtl/hipe_rtl_lcm.erl
@@ -269,7 +269,7 @@ insert_expr_last(CFG0, Label, Instr) ->
 %% is a branch operation).
 insert_expr_last_work(_, Instr, []) ->
   %% This case should not happen since this means that block was completely 
-  %% empty when the function was called. For compability we insert it last.
+  %% empty when the function was called. For compatibility we insert it last.
   [Instr];
 insert_expr_last_work(_, Instr, [Code1]) ->
   %% We insert the code next to last.
diff --git a/lib/ic/src/ic.erl b/lib/ic/src/ic.erl
index 3c6ce3d9d6..e22179fe42 100644
--- a/lib/ic/src/ic.erl
+++ b/lib/ic/src/ic.erl
@@ -320,7 +320,7 @@ pragma(G, File, T) ->
 		 time,
 		 time("pragma registration  ", ic_pragma, pragma_reg, [G,T]),
 		 ic_pragma:pragma_reg(G,T)) of
-	%% All pragmas were succesfully applied
+	%% All pragmas were successfully applied
 	{ok,Clean} ->
 	    typing(G, File, Clean);
        
diff --git a/lib/inets/doc/src/http_server.xml b/lib/inets/doc/src/http_server.xml
index 599a939913..f29b505bc7 100644
--- a/lib/inets/doc/src/http_server.xml
+++ b/lib/inets/doc/src/http_server.xml
@@ -406,7 +406,7 @@ http://your.server.org/***/Module[:/]Function(?QueryString|/PathInfo)
             phase instead of first generating the whole web page and
             then sending it to the client. The option to implement a
             function with arity two is only kept for
-            backwardcompatibilty reasons. 
+            backwards compatibility reasons.
             See <seealso marker="mod_esi">mod_esi(3)</seealso> for 
             implementation details of the esi callback function.</p>
         </section>
diff --git a/lib/inets/doc/src/mod_auth.xml b/lib/inets/doc/src/mod_auth.xml
index 42c49e9c35..2134ebeeae 100644
--- a/lib/inets/doc/src/mod_auth.xml
+++ b/lib/inets/doc/src/mod_auth.xml
@@ -80,7 +80,7 @@
         <marker id="delete_user"></marker>
         <p><c>delete_user/2, delete_user/3</c> and <c>delete_user/4</c> 
           deletes a user 
-          from the user database. If the operation is succesfull, this 
+          from the user database. If the operation is successful, this
           function returns <c>true</c>. If an error occurs, 
           <c>{error,Reason}</c> is returned. When <c>delete_user/2</c> is
           called the Port and Dir options are mandatory.</p>
diff --git a/lib/inets/doc/src/mod_esi.xml b/lib/inets/doc/src/mod_esi.xml
index 9674cd9a88..9906ae0895 100644
--- a/lib/inets/doc/src/mod_esi.xml
+++ b/lib/inets/doc/src/mod_esi.xml
@@ -31,8 +31,8 @@
   <module>mod_esi</module>
   <modulesummary>Erlang Server Interface </modulesummary>
   <description>
-    <p>This module defines the API - Erlang Server Interface (ESI).
-    Which is a more efficient way of writing erlang scripts
+    <p>This module defines the Erlang Server Interface (ESI) API.
+    It is a more efficient way of writing erlang scripts
     for your Inets web server than writing them as common CGI scripts.</p>
 
     <marker id="deliver"></marker>
@@ -95,12 +95,12 @@
           the server uses when <c>deliver/2</c> is called; do not
           assume anything about the datatype.</p>
         <p>Use this callback function to dynamically generate dynamic web
-          content. when a part of the page is generated send the
+          content. When a part of the page is generated send the
           data back to the client through <c>deliver/2</c>. Note
           that the first chunk of data sent to the client must at
           least contain all HTTP header fields that the response
           will generate. If the first chunk does not contain the
-          <em>End of HTTP the header</em>, that is <c>"\r\n\r\n",</c>
+          <em>End of HTTP header</em>, that is <c>"\r\n\r\n",</c>
           the server will
           assume that no HTTP header fields will be generated.</p>
       </desc>
@@ -118,8 +118,8 @@
       <desc>
         <p>This callback format consumes a lot of memory since the
           whole response must be generated before it is sent to the
-          user. This functions is deprecated and only keept for backwards
-          compatibility. 
+          user. This function is deprecated and only kept for backwards
+          compatibility.
           For new development Module:Function/3 should be used.</p>
       </desc>
     </func>
diff --git a/lib/inets/doc/src/notes_history.xml b/lib/inets/doc/src/notes_history.xml
index 6480bad758..f70ce5cf46 100644
--- a/lib/inets/doc/src/notes_history.xml
+++ b/lib/inets/doc/src/notes_history.xml
@@ -123,7 +123,7 @@
 	  re-receive of acknowledgments. If multiple copies of the
 	  same acknowledgments is received the spurious ones are
 	  silently ignored. This fix was intended for inets-4.7.14
-	  but accidentaly it was not included in that release.</p>
+	  but accidentally it was not included in that release.</p>
 	<p>Own Id: OTP-6706 Aux Id: OTP-6691 </p>
       </item>
     </list>
diff --git a/lib/inets/src/http_client/httpc_cookie.erl b/lib/inets/src/http_client/httpc_cookie.erl
index 4d61f82b5a..d1f46c0b0b 100644
--- a/lib/inets/src/http_client/httpc_cookie.erl
+++ b/lib/inets/src/http_client/httpc_cookie.erl
@@ -404,7 +404,7 @@ path_default(#http_cookie{path = undefined} = Cookie, DefaultPath) ->
 path_default(Cookie, _) ->
     Cookie.
 
-%% Note: if the path is only / that / will be keept
+%% Note: if the path is only / that / will be kept
 skip_right_most_slash("/") ->
     "/";
 skip_right_most_slash(Str) ->
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index 9ac9ee6f7b..587e24cc8d 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -1157,7 +1157,7 @@ handle_cookies(Headers, Request, #options{cookies = enabled}, ProfileName) ->
     httpc_manager:store_cookies(Cookies, Request#request.address,
 				ProfileName).
 
-%% This request could not be pipelined or used as sequential keept alive
+%% This request could not be pipelined or used as sequential keep alive
 %% queue
 handle_queue(#state{status = close} = State, _) ->
     {stop, normal, State};
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index 189527e2b3..1ff73d756b 100644
--- a/lib/inets/src/http_server/httpd_conf.erl
+++ b/lib/inets/src/http_server/httpd_conf.erl
@@ -304,7 +304,7 @@ load("MaxKeepAliveRequests " ++  MaxRequests, []) ->
 			  " is an invalid MaxKeepAliveRequests")}
     end;
 
-%% This clause is keept for backwards compability 
+%% This clause is kept for backwards compatibility
 load("MaxKeepAliveRequest " ++  MaxRequests, []) ->
     case make_integer(MaxRequests) of
 	{ok, Integer} ->
diff --git a/lib/inets/src/http_server/httpd_esi.erl b/lib/inets/src/http_server/httpd_esi.erl
index 026ec9a5fe..aac5645282 100644
--- a/lib/inets/src/http_server/httpd_esi.erl
+++ b/lib/inets/src/http_server/httpd_esi.erl
@@ -39,7 +39,7 @@
 %% body part. Note that it is presumed that <Data> starts with a
 %% string including "\r\n\r\n" if there is any header information
 %% present. The returned headers will not contain the HTTP header body
-%% delimiter \r\n. (All header, header delimiters are keept.)
+%% delimiter \r\n. (All header, header delimiters are kept.)
 %% Ex: ["Content-Type : text/html\r\n Connection : closing \r\n\r\n" | 
 %% io_list()] -->  {"Content-Type : text/html\r\n Connection : closing \r\n",
 %% io_list()}
diff --git a/lib/inets/src/http_server/httpd_file.erl b/lib/inets/src/http_server/httpd_file.erl
index ccc1f7874a..e8a8ab6411 100644
--- a/lib/inets/src/http_server/httpd_file.erl
+++ b/lib/inets/src/http_server/httpd_file.erl
@@ -33,7 +33,7 @@ handle_error(enotdir, Op, ModData, Path) ->
     handle_error(404, Op, ModData, Path,
 	         ": A component of the file name is not a directory");
 handle_error(emfile, Op, _ModData, Path) ->
-    handle_error(500, Op, none, Path, ": To many open files");
+    handle_error(500, Op, none, Path, ": Too many open files");
 handle_error({enfile,_}, Op, _ModData, Path) ->
     handle_error(500, Op, none, Path, ": File table overflow");
 handle_error(_Reason, Op, ModData, Path) ->
diff --git a/lib/inets/src/http_server/mod_auth_mnesia.erl b/lib/inets/src/http_server/mod_auth_mnesia.erl
index ffe028617b..b7b9520649 100644
--- a/lib/inets/src/http_server/mod_auth_mnesia.erl
+++ b/lib/inets/src/http_server/mod_auth_mnesia.erl
@@ -55,7 +55,7 @@ store_directory_data(_Directory, _DirData, _Server_root) ->
 %% API
 %%
 
-%% Compability API
+%% Compatibility API
 
 store_user(UserName, Password, Port, Dir, _AccessPassword) ->
    %% AccessPassword is ignored - was not used in previous version
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index b36c28e027..fad5af85bb 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -555,8 +555,14 @@ fe80::204:acff:fe17:bf38
                  mode will return <c>{ok, HttpPacket}</c> from <c>gen_tcp:recv</c>
                  while an active socket will send messages like <c>{http,
                  Socket, HttpPacket}</c>.</p>
-                 <p>Note that the packet type <c>httph</c> is not
-                 needed when reading from a socket.</p>   
+              </item>
+              <tag><c>httph | httph_bin</c></tag>
+              <item>
+                <p>These two types are often not needed as the socket will
+		automatically switch from <c>http</c>/<c>http_bin</c> to
+		<c>httph</c>/<c>httph_bin</c> internally after the first line
+		has been read. There might be occasions however when they are
+		useful, such as parsing trailers from chunked encoding.</p>
               </item>
             </taglist>
           </item>
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index e325443f6c..fc8360b3d1 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -2535,7 +2535,7 @@
             <c>badarg</c> if a process is already registered. As it
             turns out there is no check in <c>global</c> if a process is
             registered under more than one name. If some process is
-            accidentaly or by design given several names, it is
+            accidentally or by design given several names, it is
             possible that the name registry becomes inconsistent due
             to the way the resolve function is called when name
             clashes are discovered (see <c>register_name/3</c> in
diff --git a/lib/kernel/examples/uds_dist/c_src/uds_drv.c b/lib/kernel/examples/uds_dist/c_src/uds_drv.c
index fb10a375f4..9327ab19dc 100644
--- a/lib/kernel/examples/uds_dist/c_src/uds_drv.c
+++ b/lib/kernel/examples/uds_dist/c_src/uds_drv.c
@@ -111,7 +111,7 @@ do {									\
 typedef enum { 
     portTypeUnknown,      /* An uninitialized port */
     portTypeListener,     /* A listening port/socket */
-    portTypeAcceptor,     /* An intermidiate stage when accepting 
+    portTypeAcceptor,     /* An intermediate stage when accepting
 			     on a listen port */
     portTypeConnector,    /* An intermediate stage when connecting */
     portTypeCommand,      /* A connected open port in command mode */
@@ -401,7 +401,7 @@ static void uds_finish(void)
 /*
 ** Protocol to control:
 ** 'C': Set port in command mode.
-** 'I': Set port in intermidiate mode
+** 'I': Set port in intermediate mode
 ** 'D': Set port in data mode
 ** 'N': Get identification number for listen port
 ** 'S': Get statistics
@@ -1000,7 +1000,7 @@ static int ensure_dir(char *path)
 
 /*
 ** Try to open a lock file and lock the first byte write-only (advisory)
-** return the file descriptor if succesful, otherwise -1 (<0).
+** return the file descriptor if successful, otherwise -1 (<0).
 */ 
 static int try_lock(char *sockname, Byte *p_creation)
 {
diff --git a/lib/kernel/src/dist.hrl b/lib/kernel/include/dist.hrl
index aea1ab81ba..aea1ab81ba 100644
--- a/lib/kernel/src/dist.hrl
+++ b/lib/kernel/include/dist.hrl
diff --git a/lib/kernel/src/dist_util.hrl b/lib/kernel/include/dist_util.hrl
index f2b0598532..f2b0598532 100644
--- a/lib/kernel/src/dist_util.hrl
+++ b/lib/kernel/include/dist_util.hrl
diff --git a/lib/kernel/src/net_address.hrl b/lib/kernel/include/net_address.hrl
index 5342076507..5342076507 100644
--- a/lib/kernel/src/net_address.hrl
+++ b/lib/kernel/include/net_address.hrl
diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
index 9db6014a7d..02be6b5036 100644
--- a/lib/kernel/src/Makefile
+++ b/lib/kernel/src/Makefile
@@ -118,11 +118,14 @@ MODULES = \
 	user_sup \
 	wrap_log_reader
 
-HRL_FILES= ../include/file.hrl ../include/inet.hrl ../include/inet_sctp.hrl
+HRL_FILES= ../include/file.hrl ../include/inet.hrl ../include/inet_sctp.hrl \
+	../include/dist.hrl ../include/dist_util.hrl \
+	../include/net_address.hrl 
+
 INTERNAL_HRL_FILES= application_master.hrl disk_log.hrl \
-        net_address.hrl inet_dns.hrl inet_res.hrl \
+        inet_dns.hrl inet_res.hrl \
         inet_boot.hrl inet_config.hrl inet_int.hrl \
-	dist.hrl dist_util.hrl inet_dns_record_adts.hrl
+	inet_dns_record_adts.hrl
 
 ERL_FILES= $(MODULES:%=%.erl)
 
@@ -215,7 +218,7 @@ $(EBIN)/code_server.beam: ../include/file.hrl
 $(EBIN)/disk_log.beam: disk_log.hrl
 $(EBIN)/disk_log_1.beam: disk_log.hrl ../include/file.hrl
 $(EBIN)/disk_log_server.beam: disk_log.hrl
-$(EBIN)/dist_util.beam: dist_util.hrl dist.hrl
+$(EBIN)/dist_util.beam: ../include/dist_util.hrl ../include/dist.hrl
 $(EBIN)/erl_boot_server.beam: inet_boot.hrl
 $(EBIN)/erl_epmd.beam: inet_int.hrl erl_epmd.hrl
 $(EBIN)/file.beam: ../include/file.hrl
@@ -226,7 +229,7 @@ $(EBIN)/global.beam: ../../stdlib/include/ms_transform.hrl
 $(EBIN)/hipe_unified_loader.beam: ../../hipe/main/hipe.hrl hipe_ext_format.hrl
 $(EBIN)/inet.beam: ../include/inet.hrl inet_int.hrl ../include/inet_sctp.hrl
 $(EBIN)/inet6_tcp.beam: inet_int.hrl
-$(EBIN)/inet6_tcp_dist.beam: net_address.hrl dist.hrl dist_util.hrl
+$(EBIN)/inet6_tcp_dist.beam: ../include/net_address.hrl ../include/dist.hrl ../include/dist_util.hrl
 $(EBIN)/inet6_udp.beam: inet_int.hrl
 $(EBIN)/inet6_sctp.beam: inet_int.hrl
 $(EBIN)/inet_config.beam: inet_config.hrl ../include/inet.hrl
@@ -237,10 +240,10 @@ $(EBIN)/inet_hosts.beam: ../include/inet.hrl
 $(EBIN)/inet_parse.beam: ../include/file.hrl
 $(EBIN)/inet_res.beam: ../include/inet.hrl inet_res.hrl inet_dns.hrl inet_int.hrl
 $(EBIN)/inet_tcp.beam: inet_int.hrl
-$(EBIN)/inet_udp_dist.beam: net_address.hrl dist.hrl dist_util.hrl
+$(EBIN)/inet_udp_dist.beam: ../include/net_address.hrl ../include/dist.hrl ../include/dist_util.hrl
 $(EBIN)/inet_udp.beam: inet_int.hrl
 $(EBIN)/inet_sctp.beam: inet_int.hrl ../include/inet_sctp.hrl
-$(EBIN)/net_kernel.beam: net_address.hrl
+$(EBIN)/net_kernel.beam: ../include/net_address.hrl
 $(EBIN)/os.beam: ../include/file.hrl
 $(EBIN)/ram_file.beam: ../include/file.hrl
 $(EBIN)/wrap_log_reader.beam: disk_log.hrl ../include/file.hrl
diff --git a/lib/kernel/src/auth.erl b/lib/kernel/src/auth.erl
index ac25ab958c..c329a5652a 100644
--- a/lib/kernel/src/auth.erl
+++ b/lib/kernel/src/auth.erl
@@ -212,7 +212,7 @@ handle_info({From,badcookie,net_kernel,{From,spawn_link,_M,_F,_A,_Gleader}}, O)
     {noreply, O};
 handle_info({_From,badcookie,ddd_server,_Mess}, O) ->
     %% Ignore bad messages to the ddd server, they will be resent
-    %% If the authentication is succesful
+    %% If the authentication is successful
     {noreply, O};
 handle_info({From,badcookie,rex,_Msg}, O) ->
     auth:print(getnode(From), 
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index fdab2eb02b..77fc7e73f9 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -2165,7 +2165,7 @@ write_compressed(Config) when is_list(Config) ->
     ?line Second = io:get_line(Fd1, ''),
     ?line ok = ?FILE_MODULE:close(Fd1),
 
-    %% Verify succesful compression by uncompressing the file
+    %% Verify successful compression by uncompressing the file
     %% using zlib:gunzip/1.
 
     ?line {ok,Contents} = file:read_file(MyFile),
diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile
index e032f563fa..1c8ec54605 100644
--- a/lib/mnesia/src/Makefile
+++ b/lib/mnesia/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2011. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -113,6 +113,8 @@ clean:
 
 docs:
 
+$(TARGET_FILES): $(HRL_FILES)
+
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl
index d4b2c7b5cc..1d3bd55b48 100644
--- a/lib/mnesia/src/mnesia_controller.erl
+++ b/lib/mnesia/src/mnesia_controller.erl
@@ -57,7 +57,8 @@
 	 release_schema_commit_lock/0,
 	 create_table/1,
 	 get_disc_copy/1,
-	 get_cstructs/0,
+	 get_remote_cstructs/0,  % new function
+	 get_cstructs/0,         % old function
 	 sync_and_block_table_whereabouts/4,
 	 sync_del_table_copy_whereabouts/2,
 	 block_table/1,
@@ -278,9 +279,51 @@ rec_tabs([], _, _, Init) ->
     unlink(Init),
     ok.
 
-get_cstructs() ->
+%% New function that does exactly what get_cstructs() used to do.
+%% When this function is called, we know that the calling node knows
+%% how to convert cstructs on the receiving end (should they differ).
+get_remote_cstructs() ->
     call(get_cstructs).
 
+%% Old function kept for backwards compatibility; converts cstructs before sending.
+get_cstructs() ->
+    {cstructs, Cstructs, Running} = call(get_cstructs),
+    Node = node(group_leader()),
+    {cstructs, normalize_cstructs(Cstructs, Node), Running}.
+
+normalize_cstructs(Cstructs, Node) ->
+    %% backward-compatibility hack; normalize before returning
+    case rpc:call(Node, mnesia_lib, val, [{schema,cstruct}]) of
+	{badrpc, _} ->
+	    %% assume it's not a schema merge
+	    Cstructs;
+	#cstruct{} ->
+	    %% same format
+	    Cstructs;
+	Cstruct ->
+	    %% some other format
+	    RemoteFields = [F || {F,_} <- rpc:call(Node, mnesia_schema, cs2list, [Cstruct])],
+	    [convert_cs(Cs, RemoteFields) || Cs <- Cstructs]
+    end.
+
+convert_cs(Cs, Fields) ->
+    MyFields = record_info(fields, cstruct),
+    convert(tl(tuple_to_list(Cs)), MyFields, Fields, []).
+
+convert([H|T], [F|FsL], [F|FsR], Acc) ->
+    convert(T, FsL, FsR, [H|Acc]);
+convert([H|T], [Fl|FsL] = L, [Fr|FsR] = R, Acc) ->
+    case {lists:member(Fl, FsR), lists:member(Fr, FsL)} of
+	{true, false} ->
+	    convert(T, L, FsR, [H|Acc]);
+	{false, true} ->
+	    %% Field Fl doesn't exist on receiver side; skip.
+	    convert(T, FsL, R, Acc)
+    end;
+convert([], _, _, Acc) ->
+    list_to_tuple([cstruct|lists:reverse(Acc)]).
+
+
 update(Fun) ->
     call({update,Fun}).
 
diff --git a/lib/mnesia/src/mnesia_dumper.erl b/lib/mnesia/src/mnesia_dumper.erl
index 92fd9dfade..f8d7664156 100644
--- a/lib/mnesia/src/mnesia_dumper.erl
+++ b/lib/mnesia/src/mnesia_dumper.erl
@@ -214,7 +214,12 @@ insert_rec(Rec, InPlace, InitBy, LogV) when is_record(Rec, commit) ->
 	{Tid, committed} ->
 	    do_insert_rec(Tid, Rec, InPlace, InitBy, LogV);
 	{Tid, aborted} ->
-	    mnesia_schema:undo_prepare_commit(Tid, Rec)
+	    case InitBy of
+		startup ->
+		    mnesia_schema:undo_prepare_commit(Tid, Rec);
+		_ ->
+		    ok
+	    end
     end;
 insert_rec(H, _InPlace, _InitBy, _LogV) when is_record(H, log_header) ->
     CurrentVersion = mnesia_log:version(),
@@ -359,7 +364,7 @@ dets_insert(Op,Tab,Key,Val) ->
 	    ok = dets:delete_object(Tab, Val);
 	clear_table ->
 	    dets_cleared(Tab),
-	    ok = dets:match_delete(Tab, '_')
+	    ok = dets:delete_all_objects(Tab)
     end.
 	    
 dets_updated(Tab,Key) -> 
diff --git a/lib/mnesia/src/mnesia_lib.erl b/lib/mnesia/src/mnesia_lib.erl
index 775d370d0f..ae6631646c 100644
--- a/lib/mnesia/src/mnesia_lib.erl
+++ b/lib/mnesia/src/mnesia_lib.erl
@@ -1141,12 +1141,18 @@ db_erase(ram_copies, Tab, Key) -> ?ets_delete(Tab, Key), ok;
 db_erase(disc_copies, Tab, Key) -> ?ets_delete(Tab, Key), ok;
 db_erase(disc_only_copies, Tab, Key) -> dets:delete(Tab, Key).
 
+db_match_erase(Tab, '_') ->
+    db_delete_all(val({Tab, storage_type}),Tab);
 db_match_erase(Tab, Pat) ->
     db_match_erase(val({Tab, storage_type}), Tab, Pat).
 db_match_erase(ram_copies, Tab, Pat) -> ?ets_match_delete(Tab, Pat), ok;
 db_match_erase(disc_copies, Tab, Pat) -> ?ets_match_delete(Tab, Pat), ok;
 db_match_erase(disc_only_copies, Tab, Pat) -> dets:match_delete(Tab, Pat).
 
+db_delete_all(ram_copies, Tab) ->       ets:delete_all_objects(Tab);
+db_delete_all(disc_copies, Tab) ->      ets:delete_all_objects(Tab);
+db_delete_all(disc_only_copies, Tab) -> dets:delete_all_objects(Tab).
+
 db_first(Tab) ->
     db_first(val({Tab, storage_type}), Tab).
 db_first(ram_copies, Tab) -> ?ets_first(Tab);
diff --git a/lib/mnesia/src/mnesia_loader.erl b/lib/mnesia/src/mnesia_loader.erl
index 607e205fef..c4b22814a8 100644
--- a/lib/mnesia/src/mnesia_loader.erl
+++ b/lib/mnesia/src/mnesia_loader.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -27,7 +27,6 @@
 	 net_load_table/4,
 	 send_table/3]).
 
--export([old_node_init_table/6]). %% Spawned old node protocol conversion hack
 -export([spawned_receiver/8]).    %% Spawned lock taking process
 
 -import(mnesia_lib, [set/2, fatal/2, verbose/2, dbg_out/2]).
@@ -36,7 +35,7 @@
 
 val(Var) ->
     case ?catch_val(Var) of
-	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason); 
+	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason);
 	Value -> Value
     end.
 
@@ -51,7 +50,7 @@ disc_load_table(Tab, Reason) ->
     ?eval_debug_fun({?MODULE, do_get_disc_copy},
 		    [{tab, Tab},
 		     {reason, Reason},
-		     {storage, Storage}, 
+		     {storage, Storage},
 		     {type, Type}]),
     do_get_disc_copy2(Tab, Reason, Storage, Type).
 
@@ -63,19 +62,19 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_copies ->
     %% NOW we create the actual table
     Repair = mnesia_monitor:get_env(auto_repair),
     Args = [{keypos, 2}, public, named_table, Type],
-    case Reason of 
+    case Reason of
 	{dumper, _} -> %% Resources allready allocated
 	    ignore;
 	_ ->
 	    mnesia_monitor:mktab(Tab, Args),
-	    Count = mnesia_log:dcd2ets(Tab, Repair),	    
+	    Count = mnesia_log:dcd2ets(Tab, Repair),
 	    case ets:info(Tab, size) of
 		X when X < Count * 4 ->
-		    ok = mnesia_log:ets2dcd(Tab); 
+		    ok = mnesia_log:ets2dcd(Tab);
 		_ ->
 		    ignore
 	    end
-    end, 
+    end,
     mnesia_index:init_index(Tab, Storage),
     snmpify(Tab, Storage),
     set({Tab, load_node}, node()),
@@ -84,7 +83,7 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_copies ->
 
 do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == ram_copies ->
     Args = [{keypos, 2}, public, named_table, Type],
-    case Reason of 
+    case Reason of
 	{dumper, _} -> %% Resources allready allocated
 	    ignore;
 	_ ->
@@ -94,12 +93,12 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == ram_copies ->
 	    Repair = mnesia_monitor:get_env(auto_repair),
 	    case mnesia_monitor:use_dir() of
 		true ->
-		    case mnesia_lib:exists(Fname) of 
+		    case mnesia_lib:exists(Fname) of
 			true -> mnesia_log:dcd2ets(Tab, Repair);
 			false ->
 			    case mnesia_lib:exists(Datname) of
 				true ->
-				    mnesia_lib:dets_to_ets(Tab, Tab, Datname, 
+				    mnesia_lib:dets_to_ets(Tab, Tab, Datname,
 							   Type, Repair, no);
 				false ->
 				    false
@@ -154,11 +153,11 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_only_copies -
 %%                                      Disable rehashing of table
 %%                                      Release read lock on table
 %%                                      Send table to receiver in chunks
-%% 
+%%
 %%                                      Grab read lock on table
 %% Block dirty updates
 %%                                      Update wherabouts
-%% 
+%%
 %%                                      Cancel the update subscription
 %% Process the subscription events
 %% Optionally dump to disc
@@ -166,7 +165,7 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_only_copies -
 %%                                      Release read lock on table
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--define(MAX_TRANSFER_SIZE, 7500). 
+-define(MAX_TRANSFER_SIZE, 7500).
 -define(MAX_RAM_FILE_SIZE, 1000000).
 -define(MAX_RAM_TRANSFERS, (?MAX_RAM_FILE_SIZE div ?MAX_TRANSFER_SIZE) + 1).
 -define(MAX_NOPACKETS, 20).
@@ -187,14 +186,14 @@ try_net_load_table(Tab, Reason, Ns, Cs) ->
 do_get_network_copy(Tab, _Reason, _Ns, unknown, _Cs) ->
     verbose("Local table copy of ~p has recently been deleted, ignored.~n", [Tab]),
     {not_loaded, storage_unknown};
-do_get_network_copy(Tab, Reason, Ns, Storage, Cs) ->    
+do_get_network_copy(Tab, Reason, Ns, Storage, Cs) ->
     [Node | Tail] = Ns,
     case lists:member(Node,val({current, db_nodes})) of
 	true ->
 	    dbg_out("Getting table ~p (~p) from node ~p: ~p~n",
 		    [Tab, Storage, Node, Reason]),
 	    ?eval_debug_fun({?MODULE, do_get_network_copy},
-			    [{tab, Tab}, {reason, Reason}, 
+			    [{tab, Tab}, {reason, Reason},
 			     {nodes, Ns}, {storage, Storage}]),
 	    case init_receiver(Node, Tab, Storage, Cs, Reason) of
 		ok ->
@@ -208,7 +207,7 @@ do_get_network_copy(Tab, Reason, Ns, Storage, Cs) ->
 		restart ->
 		    try_net_load_table(Tab, Reason, Tail ++ [Node], Cs);
 		down ->
-		    try_net_load_table(Tab, Reason, Tail, Cs) 
+		    try_net_load_table(Tab, Reason, Tail, Cs)
 	    end;
 	false ->
 	    try_net_load_table(Tab, Reason, Tail, Cs)
@@ -223,10 +222,10 @@ do_snmpify(Tab, Us, Storage) ->
     Snmp = mnesia_snmp_hook:create_table(Us, Tab, Storage),
     set({Tab, {index, snmp}}, Snmp).
 
-%% Start the recieiver 
+%% Start the recieiver
 init_receiver(Node, Tab, Storage, Cs, Reas={dumper,add_table_copy}) ->
     case start_remote_sender(Node, Tab, Storage) of
-	{SenderPid, TabSize, DetsData} -> 
+	{SenderPid, TabSize, DetsData} ->
 	    start_receiver(Tab,Storage,Cs,SenderPid,TabSize,DetsData,Reas);
 	Else ->
 	    Else
@@ -234,21 +233,21 @@ init_receiver(Node, Tab, Storage, Cs, Reas={dumper,add_table_copy}) ->
 init_receiver(Node, Tab,Storage,Cs,Reason) ->
     %% Grab a schema lock to avoid deadlock between table_loader and schema_commit dumping.
     %% Both may grab tables-locks in different order.
-    Load = 
-	fun() -> 
-		{_,Tid,Ts} = get(mnesia_activity_state), 
+    Load =
+	fun() ->
+		{_,Tid,Ts} = get(mnesia_activity_state),
 		mnesia_locker:rlock(Tid, Ts#tidstore.store, {schema, Tab}),
-		%% Check that table still exists		
+		%% Check that table still exists
 		Active = val({Tab, active_replicas}),
 		%% Check that we havn't loaded it already
 		case val({Tab,where_to_read}) == node() of
 		    true -> ok;
 		    _ ->
-			%% And that sender still got a copy 
-			%% (something might have happend while 
+			%% And that sender still got a copy
+			%% (something might have happend while
 			%% we where waiting for the lock)
 			true = lists:member(Node, Active),
-			{SenderPid, TabSize, DetsData} = 
+			{SenderPid, TabSize, DetsData} =
 			    start_remote_sender(Node,Tab,Storage),
 			Init = table_init_fun(SenderPid),
 			Args = [self(),Tab,Storage,Cs,SenderPid,
@@ -258,18 +257,18 @@ init_receiver(Node, Tab,Storage,Cs,Reason) ->
 			wait_on_load_complete(Pid)
 		end
 	end,
-    Res = 
+    Res =
 	case mnesia:transaction(Load, 20) of
-	    {atomic, {error,Result}} when 
-		  element(1,Reason) == dumper -> 
+	    {atomic, {error,Result}} when
+		  element(1,Reason) == dumper ->
 		{error,Result};
-	    {atomic, {error,Result}} -> 
+	    {atomic, {error,Result}} ->
 		fatal("Cannot create table ~p: ~p~n",
 		      [[Tab, Storage], Result]);
 	    {atomic,  Result} -> Result;
 	    {aborted, nomore} -> restart;
-	    {aborted, _Reas} -> 
-		verbose("Receiver failed on ~p from ~p:~nReason: ~p~n", 
+	    {aborted, _Reas} ->
+		verbose("Receiver failed on ~p from ~p:~nReason: ~p~n",
 			[Tab,Node,_Reas]),
 		down  %% either this node or sender is dying
 	end,
@@ -279,7 +278,7 @@ init_receiver(Node, Tab,Storage,Cs,Reason) ->
 start_remote_sender(Node,Tab,Storage) ->
     mnesia_controller:start_remote_sender(Node, Tab, self(), Storage),
     put(mnesia_table_sender_node, {Tab, Node}),
-    receive 
+    receive
 	{SenderPid, {first, TabSize}} ->
 	    {SenderPid, TabSize, false};
 	{SenderPid, {first, TabSize, DetsData}} ->
@@ -291,22 +290,14 @@ start_remote_sender(Node,Tab,Storage) ->
     end.
 
 table_init_fun(SenderPid) ->
-    PConv = mnesia_monitor:needs_protocol_conversion(node(SenderPid)),
-    MeMyselfAndI = self(),
     fun(read) ->
-	    Receiver = 
-		if 
-		    PConv == true -> 
-			MeMyselfAndI ! {actual_tabrec, self()},
-			MeMyselfAndI; %% Old mnesia
-		    PConv == false -> self()
-		end,
+	    Receiver = self(),
 	    SenderPid ! {Receiver, more},
 	    get_data(SenderPid, Receiver)
     end.
 
 %% Add_table_copy get's it's own locks.
-start_receiver(Tab,Storage,Cs,SenderPid,TabSize,DetsData,{dumper,add_table_copy}) ->    
+start_receiver(Tab,Storage,Cs,SenderPid,TabSize,DetsData,{dumper,add_table_copy}) ->
     Init = table_init_fun(SenderPid),
     case do_init_table(Tab,Storage,Cs,SenderPid,TabSize,DetsData,self(), Init) of
 	Err = {error, _} ->
@@ -317,8 +308,8 @@ start_receiver(Tab,Storage,Cs,SenderPid,TabSize,DetsData,{dumper,add_table_copy}
     end.
 
 spawned_receiver(ReplyTo,Tab,Storage,Cs, SenderPid,TabSize,DetsData, Init) ->
-    process_flag(trap_exit, true), 
-    Done = do_init_table(Tab,Storage,Cs, 
+    process_flag(trap_exit, true),
+    Done = do_init_table(Tab,Storage,Cs,
 			 SenderPid,TabSize,DetsData,
 			 ReplyTo, Init),
     ReplyTo ! {self(),Done},
@@ -327,17 +318,17 @@ spawned_receiver(ReplyTo,Tab,Storage,Cs, SenderPid,TabSize,DetsData, Init) ->
     exit(normal).
 
 wait_on_load_complete(Pid) ->
-    receive 
-	{Pid, Res} -> 
+    receive
+	{Pid, Res} ->
 	    Res;
-	{'EXIT', Pid, Reason} -> 
+	{'EXIT', Pid, Reason} ->
 	    exit(Reason);
-	Else -> 
+	Else ->
 	    Pid ! Else,
 	    wait_on_load_complete(Pid)
     end.
 
-do_init_table(Tab,Storage,Cs,SenderPid, 
+do_init_table(Tab,Storage,Cs,SenderPid,
 	      TabSize,DetsInfo,OrigTabRec,Init) ->
     case create_table(Tab, TabSize, Storage, Cs) of
 	{Storage,Tab} ->
@@ -345,11 +336,9 @@ do_init_table(Tab,Storage,Cs,SenderPid,
 	    Node = node(SenderPid),
 	    put(mnesia_table_receiver, {Tab, Node, SenderPid}),
 	    mnesia_tm:block_tab(Tab),
-	    PConv = mnesia_monitor:needs_protocol_conversion(Node),
-
-	    case init_table(Tab,Storage,Init,PConv,DetsInfo,SenderPid) of
-		ok -> 
-		    tab_receiver(Node,Tab,Storage,Cs,PConv,OrigTabRec);
+	    case init_table(Tab,Storage,Init,DetsInfo,SenderPid) of
+		ok ->
+		    tab_receiver(Node,Tab,Storage,Cs,OrigTabRec);
 		Reason ->
 		    Msg = "[d]ets:init table failed",
 		    verbose("~s: ~p: ~p~n", [Msg, Tab, Reason]),
@@ -360,7 +349,7 @@ do_init_table(Tab,Storage,Cs,SenderPid,
     end.
 
 create_table(Tab, TabSize, Storage, Cs) ->
-    if 
+    if
 	Storage == disc_only_copies ->
 	    mnesia_lib:lock_table(Tab),
 	    Tmp = mnesia_lib:tab2tmp(Tab),
@@ -390,54 +379,30 @@ create_table(Tab, TabSize, Storage, Cs) ->
 	    end
     end.
 
-tab_receiver(Node, Tab, Storage, Cs, PConv, OrigTabRec) ->
+tab_receiver(Node, Tab, Storage, Cs, OrigTabRec) ->
     receive
-	{SenderPid, {no_more, DatBin}} when PConv == false ->
+	{SenderPid, {no_more, DatBin}} ->
 	    finish_copy(Storage,Tab,Cs,SenderPid,DatBin,OrigTabRec);
-	
-	%% Protocol conversion hack
-	{SenderPid, {no_more, DatBin}} when is_pid(PConv) ->
-	    PConv ! {SenderPid, no_more},
-	    receive 
-		{old_init_table_complete, ok} ->
-		    finish_copy(Storage, Tab, Cs, SenderPid, DatBin,OrigTabRec);
-		{old_init_table_complete, Reason} ->
-		    Msg = "OLD: [d]ets:init table failed",
-		    verbose("~s: ~p: ~p~n", [Msg, Tab, Reason]),
-		    down(Tab, Storage)
-	    end;
-
-	{actual_tabrec, Pid} ->	
-	    tab_receiver(Node, Tab, Storage, Cs, Pid,OrigTabRec);
-	
-	{SenderPid, {more, [Recs]}} when is_pid(PConv) ->  
-	    PConv ! {SenderPid, {more, Recs}}, %% Forward Msg to OldNodes 
-	    tab_receiver(Node, Tab, Storage, Cs, PConv,OrigTabRec);
 
-	{'EXIT', PConv, Reason} ->  %% [d]ets:init process crashed 
-	    Msg = "Receiver crashed",
-	    verbose("~s: ~p: ~p~n", [Msg, Tab, Reason]),
-	    down(Tab, Storage);
-	
 	%% Protocol conversion hack
 	{copier_done, Node} ->
 	    verbose("Sender of table ~p crashed on node ~p ~n", [Tab, Node]),
 	    down(Tab, Storage);
-	
+
 	{'EXIT', Pid, Reason} ->
 	    handle_exit(Pid, Reason),
-	    tab_receiver(Node, Tab, Storage, Cs, PConv,OrigTabRec)
+	    tab_receiver(Node, Tab, Storage, Cs, OrigTabRec)
     end.
 
 make_table_fun(Pid, TabRec) ->
     fun(close) ->
 	    ok;
        (read) ->
-	    get_data(Pid, TabRec)	   
+	    get_data(Pid, TabRec)
     end.
 
 get_data(Pid, TabRec) ->
-    receive 
+    receive
 	{Pid, {more_z, CompressedRecs}} when is_binary(CompressedRecs) ->
 	    Pid ! {TabRec, more},
 	    {zlib_uncompress(CompressedRecs), make_table_fun(Pid,TabRec)};
@@ -448,7 +413,7 @@ get_data(Pid, TabRec) ->
 	    end_of_input;
 	{copier_done, Node} ->
 	    case node(Pid) of
-		Node -> 
+		Node ->
 		    {copier_done, Node};
 		_ ->
 		    get_data(Pid, TabRec)
@@ -458,10 +423,10 @@ get_data(Pid, TabRec) ->
 	    get_data(Pid, TabRec)
     end.
 
-init_table(Tab, disc_only_copies, Fun, false, DetsInfo,Sender) ->
+init_table(Tab, disc_only_copies, Fun, DetsInfo,Sender) ->
     ErtsVer = erlang:system_info(version),
     case DetsInfo of
-	{ErtsVer, DetsData}  ->  
+	{ErtsVer, DetsData}  ->
 	    Res = (catch dets:is_compatible_bchunk_format(Tab, DetsData)),
 	    case Res of
 		{'EXIT',{undef,[{dets,_,_,_}|_]}} ->
@@ -481,28 +446,19 @@ init_table(Tab, disc_only_copies, Fun, false, DetsInfo,Sender) ->
 	_ ->
 	    dets:init_table(Tab, Fun)
     end;
-init_table(Tab, _, Fun, false, _DetsInfo,_) ->
+init_table(Tab, _, Fun, _DetsInfo,_) ->
     case catch ets:init_table(Tab, Fun) of
 	true ->
 	    ok;
 	{'EXIT', Else} -> Else
-    end;
-init_table(Tab, Storage, Fun, true, _DetsInfo, Sender) ->  %% Old Nodes    
-    spawn_link(?MODULE, old_node_init_table, 
-	       [Tab, Storage, Fun, self(), false, Sender]),
-    ok.
+    end.
 
-old_node_init_table(Tab, Storage, Fun, TabReceiver, DetsInfo,Sender) ->    
-    Res = init_table(Tab, Storage, Fun, false, DetsInfo,Sender),
-    TabReceiver ! {old_init_table_complete, Res},
-    unlink(TabReceiver),
-    ok.
 
 finish_copy(Storage,Tab,Cs,SenderPid,DatBin,OrigTabRec) ->
     TabRef = {Storage, Tab},
     subscr_receiver(TabRef, Cs#cstruct.record_name),
     case handle_last(TabRef, Cs#cstruct.type, DatBin) of
-	ok -> 
+	ok ->
 	    mnesia_index:init_index(Tab, Storage),
 	    snmpify(Tab, Storage),
 	    %% OrigTabRec must not be the spawned tab-receiver
@@ -534,7 +490,7 @@ subscr_receiver(TabRef = {_, Tab}, RecName) ->
 	    ok
     end.
 
-handle_event(TabRef, write, Rec) ->	    
+handle_event(TabRef, write, Rec) ->
     db_put(TabRef, Rec);
 handle_event(TabRef, delete, {_Tab, Key}) ->
     db_erase(TabRef, Key);
@@ -545,8 +501,8 @@ handle_event(TabRef, clear_table, {_Tab, _Key}) ->
 
 handle_last({disc_copies, Tab}, _Type, nobin) ->
     Ret = mnesia_log:ets2dcd(Tab),
-    Fname = mnesia_lib:tab2dat(Tab),  
-    case mnesia_lib:exists(Fname) of 
+    Fname = mnesia_lib:tab2dat(Tab),
+    case mnesia_lib:exists(Fname) of
 	true ->  %% Remove old .DAT files.
 	    file:delete(Fname);
 	false ->
@@ -653,31 +609,29 @@ send_table(Pid, Tab, RemoteS) ->
 	    {error, {no_exists, Tab}};
 	Storage ->
 	    %% Send first
-	    TabSize = mnesia:table_info(Tab, size),	    
-	    Pconvert = mnesia_monitor:needs_protocol_conversion(node(Pid)),
+	    TabSize = mnesia:table_info(Tab, size),
 	    KeysPerTransfer = calc_nokeys(Storage, Tab),
 	    ChunkData = dets:info(Tab, bchunk_format),
 
-	    UseDetsChunk = 
-		Storage == RemoteS andalso 
-		Storage == disc_only_copies andalso 
-		ChunkData /= undefined andalso
-		Pconvert == false,	    
-	    if 
+	    UseDetsChunk =
+		Storage == RemoteS andalso
+		Storage == disc_only_copies andalso
+		ChunkData /= undefined,
+	    if
 		UseDetsChunk == true ->
 		    DetsInfo = erlang:system_info(version),
 		    Pid ! {self(), {first, TabSize, {DetsInfo, ChunkData}}};
 		true  ->
 		    Pid ! {self(), {first, TabSize}}
 	    end,
-	    
+
 	    %% Debug info
 	    put(mnesia_table_sender, {Tab, node(Pid), Pid}),
 	    {Init, Chunk} = reader_funcs(UseDetsChunk, Tab, Storage, KeysPerTransfer),
-	    
+
 	    SendIt = fun() ->
 			     prepare_copy(Pid, Tab, Storage),
-			     send_more(Pid, 1, Chunk, Init(), Tab, Pconvert),
+			     send_more(Pid, 1, Chunk, Init(), Tab),
 			     finish_copy(Pid, Tab, Storage, RemoteS)
 		     end,
 
@@ -698,7 +652,7 @@ send_table(Pid, Tab, RemoteS) ->
 		    {error, Reason}
 	    end
     end.
-		
+
 prepare_copy(Pid, Tab, Storage) ->
     Trans =
 	fun() ->
@@ -717,11 +671,11 @@ prepare_copy(Pid, Tab, Storage) ->
 
 update_where_to_write(Tab, Node) ->
     case val({Tab, access_mode}) of
-	read_only -> 
+	read_only ->
 	    ignore;
-	read_write -> 
+	read_write ->
 	    Current = val({current, db_nodes}),
-	    Ns = 
+	    Ns =
 		case lists:member(Node, Current) of
 		    true -> Current;
 		    false -> [Node | Current]
@@ -729,27 +683,27 @@ update_where_to_write(Tab, Node) ->
 	    update_where_to_write(Ns, Tab, Node)
     end.
 
-update_where_to_write([], _, _) -> 
+update_where_to_write([], _, _) ->
     ok;
 update_where_to_write([H|T], Tab, AddNode) ->
-    rpc:call(H,  mnesia_controller, call, 
+    rpc:call(H,  mnesia_controller, call,
 	     [{update_where_to_write, [add, Tab, AddNode], self()}]),
     update_where_to_write(T, Tab, AddNode).
 
-send_more(Pid, N, Chunk, DataState, Tab, OldNode) ->
+send_more(Pid, N, Chunk, DataState, Tab) ->
     receive
 	{NewPid, more} ->
-	    case send_packet(N - 1, NewPid, Chunk, DataState, OldNode) of 
-		New when is_integer(New) -> 
+	    case send_packet(N - 1, NewPid, Chunk, DataState) of
+		New when is_integer(New) ->
 		    New - 1;
 		NewData ->
-		    send_more(NewPid, ?MAX_NOPACKETS, Chunk, NewData, Tab, OldNode)
+		    send_more(NewPid, ?MAX_NOPACKETS, Chunk, NewData, Tab)
 	    end;
 	{_NewPid, {old_protocol, Tab}} ->
 	    Storage =  val({Tab, storage_type}),
-	    {Init, NewChunk} = 
+	    {Init, NewChunk} =
 		reader_funcs(false, Tab, Storage, calc_nokeys(Storage, Tab)),
-	    send_more(Pid, 1, NewChunk, Init(), Tab, OldNode);
+	    send_more(Pid, 1, NewChunk, Init(), Tab);
 
 	{copier_done, Node} when Node == node(Pid)->
 	    verbose("Receiver of table ~p crashed on ~p (more)~n", [Tab, Node]),
@@ -770,7 +724,7 @@ dets_bchunk(Tab, Chunk) -> %% Arrg
     case dets:bchunk(Tab, Chunk) of
 	{Cont, Data} -> {Data, Cont};
 	Else -> Else
-    end.	    
+    end.
 
 zlib_compress(Data, Level) ->
     BinData = term_to_binary(Data),
@@ -793,28 +747,20 @@ compression_level() ->
 	Val -> Val
     end.
 
-send_packet(N, Pid, _Chunk, '$end_of_table', OldNode) ->
-    case OldNode of
-	true -> ignore; %% Old nodes can't handle the new no_more
-	false ->  Pid ! {self(), no_more}
-    end,
+send_packet(N, Pid, _Chunk, '$end_of_table') ->
+    Pid ! {self(), no_more},
     N;
-send_packet(N, Pid, Chunk, {[], Cont}, OldNode) ->
-    send_packet(N, Pid, Chunk, Chunk(Cont), OldNode);
-send_packet(N, Pid, Chunk, {Recs, Cont}, OldNode) when N < ?MAX_NOPACKETS ->
-    case OldNode of
-        true ->
-            Pid ! {self(), {more, [Recs]}}; %% Old need's wrapping list
-        false ->
-            case compression_level() of
-                0 ->
-                    Pid ! {self(), {more, Recs}};
-                Level ->
-                    Pid ! {self(), {more_z, zlib_compress(Recs, Level)}}
-            end
+send_packet(N, Pid, Chunk, {[], Cont}) ->
+    send_packet(N, Pid, Chunk, Chunk(Cont));
+send_packet(N, Pid, Chunk, {Recs, Cont}) when N < ?MAX_NOPACKETS ->
+    case compression_level() of
+	0 ->
+	    Pid ! {self(), {more, Recs}};
+	Level ->
+	    Pid ! {self(), {more_z, zlib_compress(Recs, Level)}}
     end,
-    send_packet(N+1, Pid, Chunk, Chunk(Cont), OldNode);
-send_packet(_N, _Pid, _Chunk, DataState, _OldNode) ->
+    send_packet(N+1, Pid, Chunk, Chunk(Cont));
+send_packet(_N, _Pid, _Chunk, DataState) ->
     DataState.
 
 finish_copy(Pid, Tab, Storage, RemoteS) ->
@@ -855,5 +801,5 @@ dat2bin(_Tab, _LocalS, _RemoteS) ->
 
 handle_exit(Pid, Reason) when node(Pid) == node() ->
     exit(Reason);
-handle_exit(_Pid, _Reason) ->  %% Not from our node, this will be handled by 
+handle_exit(_Pid, _Reason) ->  %% Not from our node, this will be handled by
     ignore.                  %% mnesia_down soon.
diff --git a/lib/mnesia/src/mnesia_log.erl b/lib/mnesia/src/mnesia_log.erl
index 9e804cc4c2..94153473cb 100644
--- a/lib/mnesia/src/mnesia_log.erl
+++ b/lib/mnesia/src/mnesia_log.erl
@@ -1021,7 +1021,8 @@ add_recs([LogH|Rest], N)
        LogH#log_header.log_version >= "1.0" ->    
     add_recs(Rest, N);
 add_recs([{{Tab, _Key}, _Val, clear_table} | Rest], N) ->
-    true = ets:match_delete(Tab, '_'),
-    add_recs(Rest, N+ets:info(Tab, size));  
+    Size = ets:info(Tab, size),
+    true = ets:delete_all_objects(Tab),
+    add_recs(Rest, N+Size);
 add_recs([], N) ->
     N.
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl
index b6eda9ad3a..e110ad3241 100644
--- a/lib/mnesia/src/mnesia_monitor.erl
+++ b/lib/mnesia/src/mnesia_monitor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -76,13 +76,13 @@
 
 -include("mnesia.hrl").
 
--record(state, {supervisor, pending_negotiators = [], 
+-record(state, {supervisor, pending_negotiators = [],
 		going_down = [], tm_started = false, early_connects = [],
 		connecting, mq = []}).
 
--define(current_protocol_version, {7,6}).
+-define(current_protocol_version,  {8,0}).
 
--define(previous_protocol_version, {7,5}).
+-define(previous_protocol_version, {7,6}).
 
 start() ->
     gen_server:start_link({local, ?MODULE}, ?MODULE,
@@ -151,12 +151,12 @@ check_protocol([{Node, {accept, Mon, Version, Protocol}} | Tail], Protocols) ->
     case lists:member(Protocol, Protocols) of
 	true ->
 	    case Protocol == protocol_version() of
-		true -> 
+		true ->
 		    set({protocol, Node}, {Protocol, false});
 		false ->
 		    set({protocol, Node}, {Protocol, true})
 	    end,
-	    [node(Mon) | check_protocol(Tail, Protocols)]; 
+	    [node(Mon) | check_protocol(Tail, Protocols)];
 	false  ->
 	    verbose("Failed to connect with ~p. ~p protocols rejected. "
 		    "expected version = ~p, expected protocol = ~p~n",
@@ -179,7 +179,7 @@ check_protocol([], [Protocol | _Protocols]) ->
     set(protocol_version, Protocol),
     [].
 
-protocol_version() -> 
+protocol_version() ->
     case ?catch_val(protocol_version) of
 	{'EXIT', _} -> ?current_protocol_version;
 	Version -> Version
@@ -189,14 +189,14 @@ protocol_version() ->
 %% preferred protocols are first in the list
 acceptable_protocol_versions() ->
     [protocol_version(), ?previous_protocol_version].
-    
+
 needs_protocol_conversion(Node) ->
     case {?catch_val({protocol, Node}), protocol_version()} of
 	{{'EXIT', _}, _} ->
 	    false;
-	{{_, Bool}, ?current_protocol_version} -> 
+	{{_, Bool}, ?current_protocol_version} ->
 	    Bool;
-	{{_, Bool}, _} -> 
+	{{_, Bool}, _} ->
 	    not Bool
     end.
 
@@ -255,15 +255,15 @@ terminate_proc(Who, Reason, _State) ->
 %%----------------------------------------------------------------------
 init([Parent]) ->
     process_flag(trap_exit, true),
-    ?ets_new_table(mnesia_gvar, [set, public, named_table]), 
-    ?ets_new_table(mnesia_stats, [set, public, named_table]), 
+    ?ets_new_table(mnesia_gvar, [set, public, named_table]),
+    ?ets_new_table(mnesia_stats, [set, public, named_table]),
     set(subscribers, []),
     set(activity_subscribers, []),
     mnesia_lib:verbose("~p starting: ~p~n", [?MODULE, self()]),
     Version = mnesia:system_info(version),
     set(version, Version),
     dbg_out("Version: ~p~n", [Version]),
-    
+
     case catch process_config_args(env()) of
 	ok ->
 	    mnesia_lib:set({'$$$_report', current_pos}, 0),
@@ -283,7 +283,7 @@ init([Parent]) ->
 	    set(checkpoints, []),
 	    set(pending_checkpoints, []),
 	    set(pending_checkpoint_pids, []),
-	    
+
 	    {ok, #state{supervisor = Parent}};
 	{'EXIT', Reason} ->
 	    mnesia_lib:report_fatal("Bad configuration: ~p~n", [Reason]),
@@ -398,9 +398,9 @@ handle_call({unsafe_close_log, Name}, _From, State) ->
     disk_log:close(Name),
     {reply, ok, State};
 
-handle_call({negotiate_protocol, Mon, _Version, _Protocols}, _From, State) 
+handle_call({negotiate_protocol, Mon, _Version, _Protocols}, _From, State)
   when State#state.tm_started == false ->
-    State2 =  State#state{early_connects = [node(Mon) | State#state.early_connects]},    
+    State2 =  State#state{early_connects = [node(Mon) | State#state.early_connects]},
     {reply, {node(), {reject, self(), uninitialized, uninitialized}}, State2};
 
 %% From remote monitor..
@@ -412,7 +412,7 @@ handle_call({negotiate_protocol, Mon, Version, Protocols}, From, State)
 	true ->
 	    accept_protocol(Mon, MyVersion, Protocol, From, State);
 	false ->
-	    %% in this release we should be able to handle the previous 
+	    %% in this release we should be able to handle the previous
 	    %% protocol
 	    case hd(Protocols) of
 		?previous_protocol_version ->
@@ -427,7 +427,7 @@ handle_call({negotiate_protocol, Mon, Version, Protocols}, From, State)
     end;
 
 %% Local request to negotiate with other monitors (nodes).
-handle_call({negotiate_protocol, Nodes}, From, State) ->    
+handle_call({negotiate_protocol, Nodes}, From, State) ->
     case mnesia_lib:intersect(State#state.going_down, Nodes) of
 	[] ->
 	    spawn_link(?MODULE, negotiate_protocol_impl, [Nodes, From]),
@@ -461,7 +461,7 @@ accept_protocol(Mon, Version, Protocol, From, State) ->
 	    %% No need for wait
 	    link(Mon),  %% link to remote Monitor
 	    case Protocol == protocol_version() of
-		true -> 
+		true ->
 		    set({protocol, Node}, {Protocol, false});
 		false ->
 		    set({protocol, Node}, {Protocol, true})
@@ -509,7 +509,7 @@ handle_cast({disconnect, Node}, State) ->
 	    ignore;
 	undefined ->
 	    ignore;
-	RemoteMon when is_pid(RemoteMon) -> 
+	RemoteMon when is_pid(RemoteMon) ->
 	    unlink(RemoteMon)
     end,
     {noreply, State};
@@ -534,7 +534,7 @@ handle_info({'EXIT', Pid, R}, State) when Pid == State#state.supervisor ->
     dbg_out("~p was ~p by supervisor~n",[?MODULE, R]),
     {stop, R, State};
 
-handle_info({'EXIT', Pid, fatal}, State) when node(Pid) == node() -> 
+handle_info({'EXIT', Pid, fatal}, State) when node(Pid) == node() ->
     dbg_out("~p got FATAL ERROR from: ~p~n",[?MODULE, Pid]),
     exit(State#state.supervisor, shutdown),
     {noreply, State};
@@ -550,7 +550,7 @@ handle_info(Msg = {'EXIT',Pid,_}, State) ->
 	Node /= node() ->
 	    {noreply, State#state{mq = State#state.mq ++ [{info, Msg}]}};
 	true ->
-	    %% We have probably got an exit signal from 
+	    %% We have probably got an exit signal from
 	    %% disk_log or dets
 	    Hint = "Hint: check that the disk still is writable",
 	    fatal("~p got unexpected info: ~p; ~p~n",
@@ -567,10 +567,10 @@ handle_info({nodeup, Node}, State) ->
     %% Let's check if Mnesia is running there in order
     %% to detect if the network has been partitioned
     %% due to communication failure.
-    
+
     HasDown   = mnesia_recover:has_mnesia_down(Node),
     ImRunning = mnesia_lib:is_running(),
-    
+
     if
 	%% If I'm not running the test will be made later.
 	HasDown == true, ImRunning == yes ->
@@ -589,7 +589,7 @@ handle_info({disk_log, _Node, Log, Info}, State) ->
 	{truncated, _No} ->
 	    ok;
 	_ ->
-	    mnesia_lib:important("Warning Log file ~p error reason ~s~n", 
+	    mnesia_lib:important("Warning Log file ~p error reason ~s~n",
 				 [Log, disk_log:format_error(Info)])
     end,
     {noreply, State};
@@ -681,38 +681,38 @@ env() ->
      send_compressed
     ].
 
-default_env(access_module) -> 
+default_env(access_module) ->
     mnesia;
-default_env(auto_repair) -> 
+default_env(auto_repair) ->
     true;
-default_env(backup_module) -> 
+default_env(backup_module) ->
     mnesia_backup;
-default_env(debug) -> 
+default_env(debug) ->
     none;
 default_env(dir) ->
     Name = lists:concat(["Mnesia.", node()]),
     filename:absname(Name);
-default_env(dump_log_load_regulation) -> 
+default_env(dump_log_load_regulation) ->
     false;
-default_env(dump_log_time_threshold) -> 
+default_env(dump_log_time_threshold) ->
     timer:minutes(3);
-default_env(dump_log_update_in_place) -> 
+default_env(dump_log_update_in_place) ->
     true;
 default_env(dump_log_write_threshold) ->
     1000;
-default_env(embedded_mnemosyne) -> 
+default_env(embedded_mnemosyne) ->
     false;
-default_env(event_module) -> 
+default_env(event_module) ->
     mnesia_event;
-default_env(extra_db_nodes) -> 
+default_env(extra_db_nodes) ->
     [];
-default_env(ignore_fallback_at_startup) -> 
+default_env(ignore_fallback_at_startup) ->
     false;
 default_env(fallback_error_function) ->
     {mnesia, lkill};
-default_env(max_wait_for_decision) -> 
+default_env(max_wait_for_decision) ->
     infinity;
-default_env(schema_location) -> 
+default_env(schema_location) ->
     opt_disc;
 default_env(core_dir) ->
     false;
@@ -732,7 +732,7 @@ check_type(Env, Val) ->
 	NewVal ->
 	    NewVal
     end.
-				      
+
 do_check_type(access_module, A) when is_atom(A) -> A;
 do_check_type(auto_repair, B) -> bool(B);
 do_check_type(backup_module, B) when is_atom(B) -> B;
@@ -749,7 +749,7 @@ do_check_type(dump_log_update_in_place, B) -> bool(B);
 do_check_type(dump_log_write_threshold, I) when is_integer(I), I > 0 -> I;
 do_check_type(event_module, A) when is_atom(A) -> A;
 do_check_type(ignore_fallback_at_startup, B) -> bool(B);
-do_check_type(fallback_error_function, {Mod, Func}) 
+do_check_type(fallback_error_function, {Mod, Func})
   when is_atom(Mod), is_atom(Func) -> {Mod, Func};
 do_check_type(embedded_mnemosyne, B) -> bool(B);
 do_check_type(extra_db_nodes, L) when is_list(L) ->
@@ -804,8 +804,8 @@ detect_inconcistency(Nodes, Context) ->
 has_remote_mnesia_down(Node) ->
     HasDown = mnesia_recover:has_mnesia_down(Node),
     Master  = mnesia_recover:get_master_nodes(schema),
-    if 
-	HasDown == true, Master == [] -> 
+    if
+	HasDown == true, Master == [] ->
 	    {true, node()};
 	true ->
 	    {false, node()}
diff --git a/lib/mnesia/src/mnesia_recover.erl b/lib/mnesia/src/mnesia_recover.erl
index b3eed1de6e..4750291a10 100644
--- a/lib/mnesia/src/mnesia_recover.erl
+++ b/lib/mnesia/src/mnesia_recover.erl
@@ -227,11 +227,13 @@ do_log_decision(D, DoTell, NodeD) ->
     note_outcome(D2),
     case mnesia_monitor:use_dir() of
 	true ->
-	    mnesia_log:append(latest_log, D2),
 	    if
 		DoTell == true, Outcome /= unclear ->
 		    tell_im_certain(NodeD#decision.disc_nodes--[node()],D2),
-		    tell_im_certain(NodeD#decision.ram_nodes--[node()], D2);
+		    tell_im_certain(NodeD#decision.ram_nodes--[node()], D2),
+		    mnesia_log:log(D2);
+		Outcome /= unclear ->
+		    mnesia_log:log(D2);
 		true ->
 		    ignore
 	    end;
diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl
index fef72ad39c..05be474aea 100644
--- a/lib/mnesia/src/mnesia_schema.erl
+++ b/lib/mnesia/src/mnesia_schema.erl
@@ -100,7 +100,7 @@
 	]).
 
 %% Needed outside to be able to use/set table_properties
-%% from user (not supported) 
+%% from user (not supported)
 -export([schema_transaction/1,
 	 insert_schema_ops/2,
 	 do_create_table/1,
@@ -118,9 +118,9 @@
 %% Here comes the init function which also resides in
 %% this module, it is called upon by the trans server
 %% at startup of the system
-%% 
+%%
 %% We have a meta table which looks like
-%% {table, schema, 
+%% {table, schema,
 %%    {type, set},
 %%    {disc_copies, all},
 %%    {arity, 2}
@@ -149,14 +149,14 @@ exit_on_error(GoodRes) ->
 
 val(Var) ->
     case ?catch_val(Var) of
-	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason); 
-	Value -> Value 
+	{'EXIT', Reason} -> mnesia_lib:other_val(Var, Reason);
+	Value -> Value
     end.
 
 %% This function traverses all cstructs in the schema and
 %% sets all values in mnesia_gvar accordingly for each table/cstruct
 
-set_schema('$end_of_table') -> 
+set_schema('$end_of_table') ->
     [];
 set_schema(Tab) ->
     do_set_schema(Tab),
@@ -253,8 +253,8 @@ version() ->
 incr_version(Cs) ->
     {{Major, Minor}, _} = Cs#cstruct.version,
     Nodes = mnesia_lib:intersect(val({schema, disc_copies}),
-                                 mnesia_lib:cs_to_nodes(Cs)), 
-    V = 
+                                 mnesia_lib:cs_to_nodes(Cs)),
+    V =
         case Nodes -- val({Cs#cstruct.name, active_replicas}) of
             [] -> {Major + 1, 0};    % All replicas are active
             _ -> {Major, Minor + 1}  % Some replicas are inactive
@@ -359,7 +359,7 @@ delete_schema2() ->
 	{error, Reason} ->
 	    {error, Reason}
     end.
-    
+
 ensure_no_schema([H|T]) when is_atom(H) ->
     case rpc:call(H, ?MODULE, remote_read_schema, []) of
         {badrpc, Reason} ->
@@ -407,7 +407,7 @@ opt_create_dir(UseDir, Dir) when UseDir == true->
             check_can_write(Dir);
         false ->
             case file:make_dir(Dir) of
-                ok -> 
+                ok ->
                     verbose("Create Directory ~p~n", [Dir]),
                     ok;
                 {error, Reason} ->
@@ -417,7 +417,7 @@ opt_create_dir(UseDir, Dir) when UseDir == true->
     end;
 opt_create_dir(false, _) ->
     {error, {has_no_disc, node()}}.
-    
+
 check_can_write(Dir) ->
     case file:read_file_info(Dir) of
         {ok, FI} when FI#file_info.type == directory,
@@ -450,7 +450,7 @@ read_schema(Keep) ->
 
 read_schema(Keep, IgnoreFallback) ->
     lock_schema(),
-    Res = 
+    Res =
         case mnesia:system_info(is_running) of
             yes ->
                 {ok, ram, get_create_list(schema)};
@@ -477,7 +477,7 @@ read_disc_schema(Keep, IgnoreFallback) ->
     case mnesia_bup:fallback_exists() of
         true when IgnoreFallback == false, Running /= yes ->
              mnesia_bup:fallback_to_schema();
-        _ ->  
+        _ ->
             %% If we're running, we read the schema file even
             %% if fallback exists
             Dat = mnesia_lib:tab2dat(schema),
@@ -499,7 +499,7 @@ read_disc_schema(Keep, IgnoreFallback) ->
     end.
 
 do_read_disc_schema(Fname, Keep) ->
-    T = 
+    T =
         case Keep of
             false ->
                 Args = [{keypos, 2}, public, set],
@@ -523,7 +523,7 @@ do_read_disc_schema(Fname, Keep) ->
 get_initial_schema(SchemaStorage, Nodes) ->
     Cs = #cstruct{name = schema,
 		  record_name = schema,
-		  attributes = [table, cstruct]},    
+		  attributes = [table, cstruct]},
     Cs2 =
 	case SchemaStorage of
         ram_copies -> Cs#cstruct{ram_copies = Nodes};
@@ -532,7 +532,7 @@ get_initial_schema(SchemaStorage, Nodes) ->
     cs2list(Cs2).
 
 read_cstructs_from_disc() ->
-    %% Assumptions: 
+    %% Assumptions:
     %% - local schema lock in global
     %% - use_dir is true
     %% - Mnesia is not running
@@ -552,14 +552,14 @@ read_cstructs_from_disc() ->
 			  end,
 		    Cstructs = dets:traverse(Tab, Fun),
 		    dets:close(Tab),
-		    {ok, Cstructs};  
+		    {ok, Cstructs};
 		{error, Reason} ->
 		    {error, Reason}
 	    end;
 	false ->
 	    {error, "No schema file exists"}
     end.
-    
+
 %% We run a very special type of transactions when we
 %% we want to manipulate the schema.
 
@@ -593,20 +593,20 @@ schema_transaction(Fun) ->
 
 %% This process may dump the transaction log, and should
 %% therefore not be run in an application process
-%% 
+%%
 schema_coordinator(Client, _Fun, undefined) ->
     Res = {aborted, {node_not_running, node()}},
     Client ! {transaction_done, Res, self()},
     unlink(Client);
-    
+
 schema_coordinator(Client, Fun, Controller) when is_pid(Controller) ->
     %% Do not trap exit in order to automatically die
     %% when the controller dies
 
     link(Controller),
     unlink(Client),
-    
-    %% Fulfull the transaction even if the client dies     
+
+    %% Fulfull the transaction even if the client dies
     Res = mnesia:transaction(Fun),
     Client ! {transaction_done, Res, self()},
     unlink(Controller),         % Avoids spurious exit message
@@ -619,7 +619,7 @@ schema_coordinator(Client, Fun, Controller) when is_pid(Controller) ->
 
 insert_schema_ops({_Mod, _Tid, Ts}, SchemaIOps) ->
     do_insert_schema_ops(Ts#tidstore.store, SchemaIOps).
-    
+
 do_insert_schema_ops(Store, [Head | Tail]) ->
     ?ets_insert(Store, Head),
     do_insert_schema_ops(Store, Tail);
@@ -628,15 +628,56 @@ do_insert_schema_ops(_Store, []) ->
 
 cs2list(Cs) when is_record(Cs, cstruct) ->
     Tags = record_info(fields, cstruct),
-    rec2list(Tags, 2, Cs);
+    rec2list(Tags, Tags, 2, Cs);
 cs2list(CreateList) when is_list(CreateList) ->
-    CreateList.
-
-rec2list([Tag | Tags], Pos, Rec) ->
+    CreateList;
+%% 4.4.19
+cs2list(Cs) when element(1, Cs) == cstruct, tuple_size(Cs) == 18 ->
+    Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
+	    load_order,access_mode,majority,index,snmp,local_content,
+	    record_name,attributes,user_properties,frag_properties,
+	    cookie,version],
+    rec2list(Tags, Tags, 2, Cs);
+%% 4.4.18 and earlier
+cs2list(Cs) when element(1, Cs) == cstruct, tuple_size(Cs) == 17 ->
+    Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
+	    load_order,access_mode,index,snmp,local_content,
+	    record_name,attributes,user_properties,frag_properties,
+	    cookie,version],
+    rec2list(Tags, Tags, 2, Cs).
+
+cs2list(false, Cs) ->
+    cs2list(Cs);
+cs2list(ver4_4_18, Cs) ->
+    Orig = record_info(fields, cstruct),
+    Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
+	    load_order,access_mode,index,snmp,local_content,
+	    record_name,attributes,user_properties,frag_properties,
+	    cookie,version],
+    rec2list(Tags, Orig, 2, Cs);
+cs2list(ver4_4_19, Cs) ->
+    Orig = record_info(fields, cstruct),
+    Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
+	    load_order,access_mode,majority,index,snmp,local_content,
+	    record_name,attributes,user_properties,frag_properties,
+	    cookie,version],
+    rec2list(Tags, Orig, 2, Cs).
+
+rec2list([Tag | Tags], [Tag | Orig], Pos, Rec) ->
     Val = element(Pos, Rec),
-    [{Tag, Val} | rec2list(Tags, Pos + 1, Rec)];
-rec2list([], _Pos, _Rec) ->
-    [].
+    [{Tag, Val} | rec2list(Tags, Orig, Pos + 1, Rec)];
+rec2list([], _, _Pos, _Rec) ->
+    [];
+rec2list(Tags, [_|Orig], Pos, Rec) ->
+    rec2list(Tags, Orig, Pos+1, Rec).
+
+api_list2cs(List) when is_list(List) ->
+    Name = pick(unknown, name, List, must),
+    Keys = check_keys(Name, List, record_info(fields, cstruct)),
+    check_duplicates(Name, Keys),
+    list2cs(List);
+api_list2cs(Other) ->
+    mnesia:abort({badarg, Other}).
 
 list2cs(List) when is_list(List) ->
     Name = pick(unknown, name, List, must),
@@ -667,10 +708,7 @@ list2cs(List) when is_list(List) ->
 
     Frag = pick(Name, frag_properties, List, []),
     verify({alt, [nil, list]}, mnesia_lib:etype(Frag),
-	   {badarg, Name, {frag_properties, Frag}}), 
-        
-    Keys = check_keys(Name, List, record_info(fields, cstruct)),
-    check_duplicates(Name, Keys),
+	   {badarg, Name, {frag_properties, Frag}}),
     #cstruct{name = Name,
              ram_copies = Rc,
              disc_copies = Dc,
@@ -687,9 +725,7 @@ list2cs(List) when is_list(List) ->
              user_properties = lists:sort(UserProps),
 	     frag_properties = lists:sort(Frag),
              cookie = Cookie,
-             version = Version};
-list2cs(Other) ->
-    mnesia:abort({badarg, Other}).
+             version = Version}.
 
 pick(Tab, Key, List, Default) ->
     case lists:keysearch(Key, 1, List) of
@@ -708,7 +744,7 @@ attr_tab_to_pos(_Tab, Pos) when is_integer(Pos) ->
     Pos;
 attr_tab_to_pos(Tab, Attr) ->
     attr_to_pos(Attr, val({Tab, attributes})).
-    
+
 %% Convert attribute name to integer if neccessary
 attr_to_pos(Pos, _Attrs) when is_integer(Pos) ->
     Pos;
@@ -723,7 +759,7 @@ attr_to_pos(Attr, [_ | Attrs], Pos) ->
     attr_to_pos(Attr, Attrs, Pos + 1);
 attr_to_pos(Attr, _, _) ->
     mnesia:abort({bad_type, Attr}).
-    
+
 check_keys(Tab, [{Key, _Val} | Tail], Items) ->
     case lists:member(Key, Items) of
         true ->  [Key | check_keys(Tab, Tail, Items)];
@@ -759,7 +795,7 @@ verify_cstruct(Cs) when is_record(Cs, cstruct) ->
 	   {bad_type, Tab, {type, Type}}),
 
     %% Currently ordered_set is not supported for disk_only_copies.
-    if 
+    if
  	Type == ordered_set, Cs#cstruct.disc_only_copies /= [] ->
 	    mnesia:abort({bad_type, Tab, {not_supported, Type, disc_only_copies}});
 	true ->
@@ -776,10 +812,10 @@ verify_cstruct(Cs) when is_record(Cs, cstruct) ->
 
     Arity = length(Attrs) + 1,
     verify(true, Arity > 2, {bad_type, Tab, {attributes, Attrs}}),
-    
+
     lists:foldl(fun(Attr,_Other) when Attr == snmp ->
                         mnesia:abort({bad_type, Tab, {attributes, [Attr]}});
-                   (Attr,Other) -> 
+                   (Attr,Other) ->
                         verify(atom, mnesia_lib:etype(Attr),
                                {bad_type, Tab, {attributes, [Attr]}}),
                         verify(false, lists:member(Attr, Other),
@@ -792,7 +828,7 @@ verify_cstruct(Cs) when is_record(Cs, cstruct) ->
     Index = Cs#cstruct.index,
     verify({alt, [nil, list]}, mnesia_lib:etype(Index),
 	   {bad_type, Tab, {index, Index}}),
-    
+
     IxFun =
         fun(Pos) ->
                 verify(true, fun() ->
@@ -807,7 +843,7 @@ verify_cstruct(Cs) when is_record(Cs, cstruct) ->
                        {bad_type, Tab, {index, [Pos]}})
         end,
     lists:foreach(IxFun, Index),
-    
+
     LC = Cs#cstruct.local_content,
     verify({alt, [true, false]}, LC,
 	   {bad_type, Tab, {local_content, LC}}),
@@ -834,7 +870,7 @@ verify_cstruct(Cs) when is_record(Cs, cstruct) ->
     lists:foreach(CheckProp, Cs#cstruct.user_properties),
 
     case Cs#cstruct.cookie of
-	{{MegaSecs, Secs, MicroSecs}, _Node} 
+	{{MegaSecs, Secs, MicroSecs}, _Node}
 	when is_integer(MegaSecs), is_integer(Secs),
 	     is_integer(MicroSecs), is_atom(node) ->
             ok;
@@ -870,15 +906,15 @@ verify_nodes(Cs) ->
     end,
     verify(integer, mnesia_lib:etype(LoadOrder),
 	   {bad_type, Tab, {load_order, LoadOrder}}),
-    
+
     Nodes = Ram ++ Disc ++ DiscOnly,
     verify(list, mnesia_lib:etype(Nodes),
 	   {combine_error, Tab,
 	    [{ram_copies, []}, {disc_copies, []}, {disc_only_copies, []}]}),
     verify(false, has_duplicates(Nodes), {combine_error, Tab, Nodes}),
-    AtomCheck = fun(N) -> verify(atom, mnesia_lib:etype(N), {bad_type, Tab, N}) end, 
+    AtomCheck = fun(N) -> verify(atom, mnesia_lib:etype(N), {bad_type, Tab, N}) end,
     lists:foreach(AtomCheck, Nodes).
-    
+
 verify(Expected, Fun, Error) when is_function(Fun) ->
     do_verify(Expected, catch Fun(), Error);
 verify(Expected, Actual, Error) ->
@@ -909,7 +945,7 @@ ensure_active(Cs, What) ->
     W = {Tab, What},
     ensure_non_empty(W),
     Nodes = mnesia_lib:intersect(val({schema, disc_copies}),
-                                 mnesia_lib:cs_to_nodes(Cs)), 
+                                 mnesia_lib:cs_to_nodes(Cs)),
     case Nodes -- val(W) of
         [] ->
             ok;
@@ -936,7 +972,7 @@ ensure_non_empty({Tab, Vhat}) ->
 
 ensure_not_active(Tab = schema, Node) ->
     Active = val({Tab, active_replicas}),
-    case lists:member(Node, Active) of 
+    case lists:member(Node, Active) of
 	false when Active =/= [] ->
 	    ok;
 	false ->
@@ -970,7 +1006,7 @@ create_table(TabDef) ->
 do_multi_create_table(TabDef) ->
     get_tid_ts_and_lock(schema, write),
     ensure_writable(schema),
-    Cs = list2cs(TabDef),
+    Cs = api_list2cs(TabDef),
     case Cs#cstruct.frag_properties of
 	[] ->
 	    do_create_table(Cs);
@@ -999,7 +1035,7 @@ unsafe_make_create_table(Cs) ->
     {_Mod, Tid, Ts} =  get_tid_ts_and_lock(schema, none),
     verify_cstruct(Cs),
     Tab = Cs#cstruct.name,
-        
+
     %% Check that we have all disc replica nodes running
     DiscNodes = Cs#cstruct.disc_copies ++ Cs#cstruct.disc_only_copies,
     RunningNodes = val({current, db_nodes}),
@@ -1017,7 +1053,7 @@ unsafe_make_create_table(Cs) ->
 check_if_exists(Tab) ->
     TidTs = get_tid_ts_and_lock(schema, write),
     {_, _, Ts} = TidTs,
-    Store = Ts#tidstore.store, 
+    Store = Ts#tidstore.store,
     ets:foldl(
       fun({op, create_table, [{name, T}|_]}, _Acc) when T==Tab ->
 	      true;
@@ -1054,7 +1090,7 @@ make_delete_table(Tab, Mode) ->
 	    %% nodes etc.
 	    TidTs = get_tid_ts_and_lock(schema, write),
 	    {_, _, Ts} = TidTs,
-	    Store = Ts#tidstore.store, 
+	    Store = Ts#tidstore.store,
 	    Deleted = ets:select_delete(
 			Store, [{{op,'$1',[{name,Tab}|'_']},
 				 [{'or',
@@ -1077,9 +1113,9 @@ make_delete_table(Tab, Mode) ->
 			[] ->
 			    [make_delete_table2(Tab)];
 			_Props ->
-			    %% Check if it is a base table 
-			    mnesia_frag:lookup_frag_hash(Tab),		    
-			    
+			    %% Check if it is a base table
+			    mnesia_frag:lookup_frag_hash(Tab),
+
 			    %% Check for foreigners
 			    F = mnesia_frag:lookup_foreigners(Tab),
 			    verify([], F, {combine_error,
@@ -1101,7 +1137,7 @@ make_delete_table2(Tab) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Change fragmentation of a table
-    
+
 change_table_frag(Tab, Change) ->
     schema_transaction(fun() -> do_change_table_frag(Tab, Change) end).
 
@@ -1112,7 +1148,7 @@ do_change_table_frag(Tab, Change) when is_atom(Tab), Tab /= schema ->
     ok;
 do_change_table_frag(Tab, _Change) ->
     mnesia:abort({bad_type, Tab}).
-    
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Clear a table
 
@@ -1150,7 +1186,7 @@ make_add_table_copy(Tab, Node, Storage) ->
     verify(false, lists:member(Node, Ns), {already_exists, Tab, Node}),
     Cs2 = new_cs(Cs, Node, Storage, add),
     verify_cstruct(Cs2),
-    
+
     %% Check storage and if node is running
     IsRunning = lists:member(Node, val({current, db_nodes})),
     if
@@ -1177,21 +1213,21 @@ del_table_copy(Tab, Node) ->
 
 do_del_table_copy(Tab, Node) when is_atom(Node)  ->
     TidTs = get_tid_ts_and_lock(schema, write),
-%%    get_tid_ts_and_lock(Tab, write), 
+%%    get_tid_ts_and_lock(Tab, write),
     insert_schema_ops(TidTs, make_del_table_copy(Tab, Node));
 do_del_table_copy(Tab, Node) ->
     mnesia:abort({badarg, Tab, Node}).
-   
+
 make_del_table_copy(Tab, Node) ->
     ensure_writable(schema),
     Cs = incr_version(val({Tab, cstruct})),
     Storage = mnesia_lib:schema_cs_to_storage_type(Node, Cs),
-    Cs2 = new_cs(Cs, Node, Storage, del),    
+    Cs2 = new_cs(Cs, Node, Storage, del),
     case mnesia_lib:cs_to_nodes(Cs2) of
         [] when Tab == schema ->
             mnesia:abort({combine_error, Tab, "Last replica"});
         [] ->
-	    ensure_active(Cs),	    
+	    ensure_active(Cs),
             dbg_out("Last replica deleted in table ~p~n",  [Tab]),
             make_delete_table(Tab,  whole_table);
         _ when Tab == schema ->
@@ -1210,14 +1246,14 @@ remove_node_from_tabs([], _Node) ->
     [];
 remove_node_from_tabs([schema|Rest], Node) ->
     remove_node_from_tabs(Rest, Node);
-remove_node_from_tabs([Tab|Rest], Node) ->    
-    {Cs, IsFragModified} = 
+remove_node_from_tabs([Tab|Rest], Node) ->
+    {Cs, IsFragModified} =
 	mnesia_frag:remove_node(Node, incr_version(val({Tab, cstruct}))),
     case mnesia_lib:schema_cs_to_storage_type(Node, Cs)  of
 	unknown ->
 	    case IsFragModified of
 		true ->
-		    [{op, change_table_frag, {del_node, Node}, cs2list(Cs)} | 
+		    [{op, change_table_frag, {del_node, Node}, cs2list(Cs)} |
 		     remove_node_from_tabs(Rest, Node)];
 		false ->
 		    remove_node_from_tabs(Rest, Node)
@@ -1246,7 +1282,7 @@ new_cs(Cs, Node, ram_copies, del) ->
 new_cs(Cs, Node, disc_copies, del) ->
     Cs#cstruct{disc_copies = lists:delete(Node , Cs#cstruct.disc_copies)};
 new_cs(Cs, Node, disc_only_copies, del) ->
-    Cs#cstruct{disc_only_copies = 
+    Cs#cstruct{disc_only_copies =
                lists:delete(Node , Cs#cstruct.disc_only_copies)};
 new_cs(Cs, _Node, Storage, _Op) ->
     mnesia:abort({badarg, Cs#cstruct.name, Storage}).
@@ -1278,7 +1314,7 @@ make_move_table(Tab, FromNode, ToNode) ->
     Running = val({current, db_nodes}),
     Storage = mnesia_lib:schema_cs_to_storage_type(FromNode, Cs),
     verify(true, lists:member(ToNode, Running), {not_active, schema, ToNode}),
-    
+
     Cs2 = new_cs(Cs, ToNode, Storage, add),
     Cs3 = new_cs(Cs2, FromNode, Storage, del),
     verify_cstruct(Cs3),
@@ -1306,7 +1342,7 @@ make_change_table_copy_type(Tab, Node, unknown) ->
 make_change_table_copy_type(Tab, Node, ToS) ->
     ensure_writable(schema),
     Cs = incr_version(val({Tab, cstruct})),
-    FromS = mnesia_lib:storage_type_at_node(Node, Tab), 
+    FromS = mnesia_lib:storage_type_at_node(Node, Tab),
 
     case compare_storage_type(false, FromS, ToS) of
 	{same, _} ->
@@ -1320,12 +1356,12 @@ make_change_table_copy_type(Tab, Node, ToS) ->
     Cs2 = new_cs(Cs, Node, FromS, del),
     Cs3 = new_cs(Cs2, Node, ToS, add),
     verify_cstruct(Cs3),
-    
+
     [{op, change_table_copy_type, Node, FromS, ToS, cs2list(Cs3)}].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% change index functions ....
-%% Pos is allready added by 1 in both of these functions 
+%% Pos is allready added by 1 in both of these functions
 
 add_table_index(Tab, Pos) ->
     schema_transaction(fun() -> do_add_table_index(Tab, Pos) end).
@@ -1412,14 +1448,14 @@ make_del_snmp(Tab) ->
     [{op, del_snmp, cs2list(Cs2)}].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
+%%
 
-transform_table(Tab, Fun, NewAttrs, NewRecName) 
-  when is_function(Fun), is_list(NewAttrs), is_atom(NewRecName) -> 
+transform_table(Tab, Fun, NewAttrs, NewRecName)
+  when is_function(Fun), is_list(NewAttrs), is_atom(NewRecName) ->
     schema_transaction(fun() -> do_transform_table(Tab, Fun, NewAttrs, NewRecName) end);
 
-transform_table(Tab, ignore, NewAttrs, NewRecName) 
-  when is_list(NewAttrs), is_atom(NewRecName) -> 
+transform_table(Tab, ignore, NewAttrs, NewRecName)
+  when is_list(NewAttrs), is_atom(NewRecName) ->
     schema_transaction(fun() -> do_transform_table(Tab, ignore, NewAttrs, NewRecName) end);
 
 transform_table(Tab, Fun, NewAttrs, NewRecName) ->
@@ -1438,7 +1474,7 @@ make_transform(Tab, Fun, NewAttrs, NewRecName) ->
     ensure_active(Cs),
     ensure_writable(Tab),
     case mnesia_lib:val({Tab, index}) of
-	[] -> 
+	[] ->
 	    Cs2 = Cs#cstruct{attributes = NewAttrs, record_name = NewRecName},
 	    verify_cstruct(Cs2),
 	    [{op, transform, Fun, cs2list(Cs2)}];
@@ -1464,7 +1500,7 @@ make_transform(Tab, Fun, NewAttrs, NewRecName) ->
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  
+%%
 
 change_table_access_mode(Tab, Mode) ->
     schema_transaction(fun() -> do_change_table_access_mode(Tab, Mode) end).
@@ -1598,9 +1634,9 @@ change_prop_in_existing_op(Tab, Prop, How, Store) ->
 	false ->
 	    false
     end.
- 
-update_existing_op([{op, Op, L = [{name,Tab}|_], _OldProp}|Ops], 
-		   Tab, Prop, How, Acc) when Op == write_property; 
+
+update_existing_op([{op, Op, L = [{name,Tab}|_], _OldProp}|Ops],
+		   Tab, Prop, How, Acc) when Op == write_property;
 					     Op == delete_property ->
     %% Apparently, mnesia_dumper doesn't care about OldProp here -- just L,
     %% so we will throw away OldProp (not that it matters...) and insert Prop.
@@ -1625,7 +1661,7 @@ update_existing_op([], _, _, _, _) ->
 do_read_table_property(Tab, Key) ->
     TidTs = get_tid_ts_and_lock(schema, read),
     {_, _, Ts} = TidTs,
-    Store = Ts#tidstore.store, 
+    Store = Ts#tidstore.store,
     Props = ets:foldl(
 	      fun({op, create_table, [{name, T}|Opts]}, _Acc)
 		 when T==Tab ->
@@ -1689,7 +1725,7 @@ do_delete_table_property(Tab, PropKey) ->
 		    [Tab,PropKey]),
 	    %% this must be an existing table
 	    get_tid_ts_and_lock(Tab, none),
-	    insert_schema_ops(TidTs, 
+	    insert_schema_ops(TidTs,
 			      make_delete_table_properties(Tab, [PropKey]))
     end.
 
@@ -1711,17 +1747,17 @@ make_delete_table_properties(_Tab, [], _Cs) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% Ensure that the transaction can be committed even 
+%% Ensure that the transaction can be committed even
 %% if the node crashes and Mnesia is restarted
 prepare_commit(Tid, Commit, WaitFor) ->
     case Commit#commit.schema_ops of
 	[] ->
 	    {false, Commit, optional};
 	OrigOps ->
-	    {Modified, Ops, DumperMode} = 
+	    {Modified, Ops, DumperMode} =
 		prepare_ops(Tid, OrigOps, WaitFor, false, [], optional),
 	    InitBy = schema_prepare,
-	    GoodRes = {Modified, 
+	    GoodRes = {Modified,
 		       Commit#commit{schema_ops = lists:reverse(Ops)},
 		       DumperMode},
 	    case DumperMode of
@@ -1737,7 +1773,7 @@ prepare_commit(Tid, Commit, WaitFor) ->
 		    end
 	    end,
 	    case Ops of
-		[] -> 
+		[] ->
 		    ignore;
 		_ ->
 		    %% We need to grab a dumper lock here, the log may not
@@ -1749,20 +1785,20 @@ prepare_commit(Tid, Commit, WaitFor) ->
 
 prepare_ops(Tid, [Op | Ops], WaitFor, Changed, Acc, DumperMode) ->
     case prepare_op(Tid, Op, WaitFor) of
-        {true, mandatory} -> 
+        {true, mandatory} ->
 	    prepare_ops(Tid, Ops, WaitFor, Changed, [Op | Acc], mandatory);
-        {true, optional} -> 
+        {true, optional} ->
 	    prepare_ops(Tid, Ops, WaitFor, Changed, [Op | Acc], DumperMode);
-        {true, Ops2, mandatory} -> 
+        {true, Ops2, mandatory} ->
 	    prepare_ops(Tid, Ops, WaitFor, true, Ops2 ++ Acc, mandatory);
-        {true, Ops2, optional} -> 
+        {true, Ops2, optional} ->
 	    prepare_ops(Tid, Ops, WaitFor, true, Ops2 ++ Acc, DumperMode);
-	{false, optional} -> 
+	{false, optional} ->
 	    prepare_ops(Tid, Ops, WaitFor, true, Acc, DumperMode)
     end;
 prepare_ops(_Tid, [], _WaitFor, Changed, Acc, DumperMode) ->
     {Changed, Acc, DumperMode}.
-    
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Prepare for commit
 %% returns true if Op should be included, i.e. unmodified
@@ -1781,8 +1817,8 @@ prepare_op(_Tid, {op, rec, unknown, Rec}, _WaitFor) ->
 
 prepare_op(_Tid, {op, announce_im_running, Node, SchemaDef, Running, RemoteRunning}, _WaitFor) ->
     SchemaCs = list2cs(SchemaDef),
-    if 	
-	Node == node() -> %% Announce has already run on local node 
+    if
+	Node == node() -> %% Announce has already run on local node
 	    ignore;       %% from do_merge_schema
 	true ->
 	    %% If a node has restarted it may still linger in db_nodes,
@@ -1794,9 +1830,9 @@ prepare_op(_Tid, {op, announce_im_running, Node, SchemaDef, Running, RemoteRunni
     end,
     {false, optional};
 
-prepare_op(_Tid, {op, sync_trans}, {part, CoordPid}) ->    
+prepare_op(_Tid, {op, sync_trans}, {part, CoordPid}) ->
     CoordPid ! {sync_trans, self()},
-    receive 
+    receive
 	{sync_trans, CoordPid} ->
 	    {false, optional};
 	{mnesia_down, _Node} = Else ->
@@ -1807,7 +1843,7 @@ prepare_op(_Tid, {op, sync_trans}, {part, CoordPid}) ->
 	    mnesia:abort(Else)
     end;
 
-prepare_op(_Tid, {op, sync_trans}, {coord, Nodes}) ->    
+prepare_op(_Tid, {op, sync_trans}, {coord, Nodes}) ->
     case receive_sync(Nodes, []) of
 	{abort, Reason} ->
 	    mnesia_lib:verbose("sync_op terminated due to ~p~n", [Reason]),
@@ -1838,7 +1874,7 @@ prepare_op(Tid, {op, create_table, TabDef}, _WaitFor) ->
 	    create_ram_table(Tab, Cs#cstruct.type),
 	    create_disc_table(Tab),
 	    insert_cstruct(Tid, Cs, false),
-	    {true, optional};	
+	    {true, optional};
 	disc_only_copies ->
 	    mnesia_lib:set({Tab, create_table},true),
 	    create_disc_only_table(Tab,Cs#cstruct.type),
@@ -1857,15 +1893,15 @@ prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}, _WaitFor) ->
     if
 	Tab == schema ->
 	    {true, optional};
-	
+
 	Node == node() ->
-	    case mnesia_lib:val({schema, storage_type}) of 
-		ram_copies when Storage /= ram_copies -> 
+	    case mnesia_lib:val({schema, storage_type}) of
+		ram_copies when Storage /= ram_copies ->
 		    Error = {combine_error, Tab, "has no disc", Node},
 		    mnesia:abort(Error);
 		_  ->
 		    ok
-	    end,   
+	    end,
 	    %% Tables are created by mnesia_loader get_network code
 	    insert_cstruct(Tid, Cs, true),
 	    case mnesia_controller:get_network_copy(Tab, Cs) of
@@ -1902,22 +1938,22 @@ prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}, _WaitFor) ->
 prepare_op(Tid, {op, del_table_copy, _Storage, Node, TabDef}, _WaitFor) ->
     Cs = list2cs(TabDef),
     Tab = Cs#cstruct.name,
-    
+
     if
 	%% Schema table lock is always required to run a schema op.
 	%% No need to look it.
-	node(Tid#tid.pid) == node(), Tab /= schema -> 
+	node(Tid#tid.pid) == node(), Tab /= schema ->
 	    Self = self(),
 	    Pid = spawn_link(fun() -> lock_del_table(Tab, Node, Cs, Self) end),
 	    put(mnesia_lock, Pid),
-	    receive 
-		{Pid, updated} -> 
+	    receive
+		{Pid, updated} ->
 		    {true, optional};
 		{Pid, FailReason} ->
 		    mnesia:abort(FailReason);
 		{'EXIT', Pid, Reason} ->
 		    mnesia:abort(Reason)
-	    end;	
+	    end;
 	true ->
 	    {true, optional}
     end;
@@ -1928,12 +1964,12 @@ prepare_op(_Tid, {op, change_table_copy_type,  N, FromS, ToS, TabDef}, _WaitFor)
     Tab = Cs#cstruct.name,
 
     NotActive = mnesia_lib:not_active_here(Tab),
-    
-    if 
+
+    if
 	NotActive == true ->
 	    mnesia:abort({not_active, Tab, node()});
-	
-	Tab == schema ->	    
+
+	Tab == schema ->
 	    case {FromS, ToS} of
 		{ram_copies, disc_copies} ->
 		    case mnesia:system_info(schema_location) of
@@ -1943,7 +1979,7 @@ prepare_op(_Tid, {op, change_table_copy_type,  N, FromS, ToS, TabDef}, _WaitFor)
 			    mnesia:abort({combine_error,  Tab, node(),
 					  "schema_location must be opt_disc"})
 		    end,
-		    Dir = mnesia_lib:dir(),    
+		    Dir = mnesia_lib:dir(),
 		    case opt_create_dir(true, Dir) of
 			ok ->
 			    purge_dir(Dir, []),
@@ -1967,18 +2003,18 @@ prepare_op(_Tid, {op, change_table_copy_type,  N, FromS, ToS, TabDef}, _WaitFor)
 		_ ->
 		    mnesia:abort({combine_error, Tab, ToS})
 	    end;
-	
-	FromS == ram_copies ->	    
+
+	FromS == ram_copies ->
 	    case mnesia_monitor:use_dir() of
-		true -> 
+		true ->
 		    Dat = mnesia_lib:tab2dcd(Tab),
 		    case mnesia_lib:exists(Dat) of
 			true ->
 			    mnesia:abort({combine_error, Tab, node(),
 					  "Table dump exists"});
 			false ->
-			    case ToS of 
-				disc_copies -> 
+			    case ToS of
+				disc_copies ->
 				    mnesia_log:ets2dcd(Tab, dmp);
 				disc_only_copies ->
 				    mnesia_dumper:raw_named_dump_table(Tab, dmp)
@@ -1988,7 +2024,7 @@ prepare_op(_Tid, {op, change_table_copy_type,  N, FromS, ToS, TabDef}, _WaitFor)
 		false ->
 		    mnesia:abort({has_no_disc, node()})
 	    end;
-	
+
 	FromS == disc_copies, ToS == disc_only_copies ->
 	    mnesia_dumper:raw_named_dump_table(Tab, dmp);
 	FromS == disc_only_copies ->
@@ -2020,7 +2056,7 @@ prepare_op(_Tid, {op, dump_table, unknown, TabDef}, _WaitFor) ->
     case lists:member(node(), Cs#cstruct.ram_copies) of
         true ->
 	    case mnesia_monitor:use_dir() of
-		true -> 
+		true ->
 		    mnesia_log:ets2dcd(Tab, dmp),
 		    Size = mnesia:table_info(Tab, size),
 		    {true, [{op, dump_table, Size, TabDef}], optional};
@@ -2058,7 +2094,7 @@ prepare_op(_Tid, {op, transform, Fun, TabDef}, _WaitFor) ->
 	    mnesia_lib:db_fixtable(Storage, Tab, true),
             Key = mnesia_lib:db_first(Tab),
 	    Op = {op, transform, Fun, TabDef},
-            case catch transform_objs(Fun, Tab, RecName, 
+            case catch transform_objs(Fun, Tab, RecName,
 				      Key, NewArity, Storage, Type, [Op]) of
                 {'EXIT', Reason} ->
 		    mnesia_lib:db_fixtable(Storage, Tab, false),
@@ -2072,7 +2108,7 @@ prepare_op(_Tid, {op, transform, Fun, TabDef}, _WaitFor) ->
 prepare_op(_Tid, {op, merge_schema, TabDef}, _WaitFor) ->
     Cs = list2cs(TabDef),
     case verify_merge(Cs) of
-	ok  ->	
+	ok  ->
 	    {true, optional};
 	Error ->
 	    verbose("Merge_Schema ~p failed on ~p: ~p~n", [_Tid,node(),Error]),
@@ -2093,7 +2129,7 @@ create_ram_table(Tab, Type) ->
 create_disc_table(Tab) ->
     File = mnesia_lib:tab2dcd(Tab),
     file:delete(File),
-    FArg = [{file, File}, {name, {mnesia,create}}, 
+    FArg = [{file, File}, {name, {mnesia,create}},
 	    {repair, false}, {mode, read_write}],
     case mnesia_monitor:open_log(FArg) of
 	{ok,Log} ->
@@ -2124,7 +2160,7 @@ receive_sync([], Pids) ->
 receive_sync(Nodes, Pids) ->
     receive
 	{sync_trans, Pid} ->
-	    Node = node(Pid),	    
+	    Node = node(Pid),
 	    receive_sync(lists:delete(Node, Nodes), [Pid | Pids]);
 	Else ->
 	    {abort, Else}
@@ -2140,16 +2176,16 @@ lock_del_table(Tab, Node, Cs, Father) ->
 				    false;
 			       ({badrpc, {'EXIT', {undef, _}}}) ->
 				    %% This will be the case we talks with elder nodes
-				    %% than 3.8.2, they will set where_to_read without 
-				    %% getting a lock. 
+				    %% than 3.8.2, they will set where_to_read without
+				    %% getting a lock.
 				    false;
 			       (_) ->
 				    true
 			    end,
 		   case lists:filter(Filter, Res) of
-		       [] -> 
+		       [] ->
 			   Father ! {self(), updated},
-			   %% When transaction is commited the process dies 
+			   %% When transaction is commited the process dies
 			   %% and the lock is released.
 			   receive _ -> ok end;
 		       Err ->
@@ -2166,7 +2202,7 @@ lock_del_table(Tab, Node, Cs, Father) ->
     exit(normal).
 
 set_where_to_read(Tab, Node, Cs) ->
-    case mnesia_lib:val({Tab, where_to_read}) of 
+    case mnesia_lib:val({Tab, where_to_read}) of
 	Node ->
 	    case Cs#cstruct.local_content of
 		true ->
@@ -2185,16 +2221,16 @@ transform_objs(_Fun, _Tab, _RT, '$end_of_table', _NewArity, _Storage, _Type, Acc
 transform_objs(Fun, Tab, RecName, Key, A, Storage, Type, Acc) ->
     Objs = mnesia_lib:db_get(Tab, Key),
     NextKey = mnesia_lib:db_next_key(Tab, Key),
-    Oid = {Tab, Key},   
+    Oid = {Tab, Key},
     NewObjs = {Ws, Ds} = transform_obj(Tab, RecName, Key, Fun, Objs, A, Type, [], []),
-    if 
-	NewObjs == {[], []} -> 
+    if
+	NewObjs == {[], []} ->
 	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type, Acc);
-	Type == bag ->	    
+	Type == bag ->
 	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type,
 			   [{op, rec, Storage, {Oid, Ws, write}},
 			    {op, rec, Storage, {Oid, [Oid], delete}} | Acc]);
-	Ds == [] -> 
+	Ds == [] ->
 	    %% Type is set or ordered_set, no need to delete the record first
 	    transform_objs(Fun, Tab, RecName, NextKey, A, Storage, Type,
 			   [{op, rec, Storage, {Oid, Ws, write}} | Acc]);
@@ -2215,15 +2251,15 @@ transform_obj(Tab, RecName, Key, Fun, [Obj|Rest], NewArity, Type, Ws, Ds) ->
 	NewObj == Obj ->
 	    transform_obj(Tab, RecName, Key, Fun, Rest, NewArity, Type, Ws, Ds);
         RecName == element(1, NewObj), Key == element(2, NewObj) ->
-            transform_obj(Tab, RecName, Key, Fun, Rest, NewArity, 
+            transform_obj(Tab, RecName, Key, Fun, Rest, NewArity,
 			  Type, [NewObj | Ws], Ds);
-	NewObj == delete -> 
-	    case Type of 
+	NewObj == delete ->
+	    case Type of
 		bag -> %% Just don't write that object
-		   transform_obj(Tab, RecName, Key, Fun, Rest, 
-				 NewArity, Type, Ws, Ds); 
+		   transform_obj(Tab, RecName, Key, Fun, Rest,
+				 NewArity, Type, Ws, Ds);
 		_ ->
-		    transform_obj(Tab, RecName, Key, Fun, Rest, NewArity, 
+		    transform_obj(Tab, RecName, Key, Fun, Rest, NewArity,
 				  Type, Ws, [NewObj | Ds])
 	    end;
         true ->
@@ -2247,7 +2283,7 @@ undo_prepare_commit(Tid, Commit) ->
 
 %% Undo in reverse order
 undo_prepare_ops(Tid, [Op | Ops]) ->
-    case element(1, Op) of	
+    case element(1, Op) of
 	TheOp when TheOp /= op, TheOp /= restore_op ->
 	    undo_prepare_ops(Tid, Ops);
 	_ ->
@@ -2274,7 +2310,7 @@ undo_prepare_op(Tid, {op, create_table, TabDef}) ->
     mnesia_lib:unset({Tab, create_table}),
     delete_cstruct(Tid, Cs),
     case mnesia_lib:cs_to_storage_type(node(), Cs) of
-	unknown -> 
+	unknown ->
 	    ok;
 	ram_copies ->
 	    ram_delete_table(Tab, ram_copies);
@@ -2289,7 +2325,7 @@ undo_prepare_op(Tid, {op, create_table, TabDef}) ->
 	    %%	    disc_delete_table(Tab, Storage),
 	    file:delete(Dat)
     end;
-	    
+
 undo_prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}) ->
     Cs = list2cs(TabDef),
     Tab = Cs#cstruct.name,
@@ -2314,21 +2350,21 @@ undo_prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}) ->
 	    Cs2 = new_cs(Cs, Node, Storage, del),
 	    insert_cstruct(Tid, Cs2, true) % Don't care about the version
     end;
-    
-undo_prepare_op(_Tid, {op, del_table_copy, _, Node, TabDef}) 
+
+undo_prepare_op(_Tid, {op, del_table_copy, _, Node, TabDef})
   when Node == node() ->
     Cs = list2cs(TabDef),
     Tab = Cs#cstruct.name,
     mnesia_lib:set({Tab, where_to_read}, Node);
 
 
-undo_prepare_op(_Tid, {op, change_table_copy_type, N, FromS, ToS, TabDef}) 
+undo_prepare_op(_Tid, {op, change_table_copy_type, N, FromS, ToS, TabDef})
         when N == node() ->
     Cs = list2cs(TabDef),
     Tab = Cs#cstruct.name,
     mnesia_checkpoint:tm_change_table_copy_type(Tab, ToS, FromS),
     Dmp = mnesia_lib:tab2dmp(Tab),
-    
+
     case {FromS, ToS} of
         {ram_copies, disc_copies} when Tab == schema ->
             file:delete(Dmp),
@@ -2382,9 +2418,9 @@ ram_delete_table(Tab, Storage) ->
 	    ignore;
 	disc_only_copies ->
 	    ignore;
-	_Else -> 
+	_Else ->
 	    %% delete possible index files and data .....
-	    %% Got to catch this since if no info has been set in the 
+	    %% Got to catch this since if no info has been set in the
 	    %% mnesia_gvar it will crash
 	    catch mnesia_index:del_transient(Tab, Storage),
 	    case ?catch_val({Tab, {index, snmp}}) of
@@ -2454,7 +2490,7 @@ has_known_suffix(File, [Suffix | Tail], false) ->
     has_known_suffix(File, Tail, lists:suffix(Suffix, File));
 has_known_suffix(_File, [], Bool) ->
     Bool.
-	    
+
 known_suffixes() -> real_suffixes() ++ tmp_suffixes().
 
 real_suffixes() ->  [".DAT", ".LOG", ".BUP", ".DCL", ".DCD"].
@@ -2477,11 +2513,11 @@ info2(Tab, [{frag_hash, _V} | Tail]) -> % Ignore frag_hash
 info2(Tab, [{P, V} | Tail]) ->
     io:format("~-20w -> ~p~n",[P,V]),
     info2(Tab, Tail);
-info2(_, []) -> 
+info2(_, []) ->
     io:format("~n", []).
 
 get_table_properties(Tab) ->
-    case catch mnesia_lib:db_match_object(ram_copies, 
+    case catch mnesia_lib:db_match_object(ram_copies,
 					  mnesia_gvar, {{Tab, '_'}, '_'}) of
 	{'EXIT', _} ->
 	    mnesia:abort({no_exists, Tab, all});
@@ -2509,9 +2545,9 @@ get_table_properties(Tab) ->
 	    recs = error_recs
 	   }).
 
-restore(Opaque) -> 
+restore(Opaque) ->
     restore(Opaque, [], mnesia_monitor:get_env(backup_module)).
-restore(Opaque, Args) when is_list(Args) -> 
+restore(Opaque, Args) when is_list(Args) ->
     restore(Opaque, Args, mnesia_monitor:get_env(backup_module));
 restore(_Opaque, BadArg) ->
     {aborted, {badarg, BadArg}}.
@@ -2522,7 +2558,7 @@ restore(Opaque, Args, Module) when is_list(Args), is_atom(Module) ->
 	    case mnesia_bup:read_schema(R#r.module, Opaque) of
 		{error, Reason} ->
 		    {aborted, Reason};
-		BupSchema -> 
+		BupSchema ->
 		    schema_transaction(fun() -> do_restore(R, BupSchema) end)
 	    end;
 	{'EXIT', Reason} ->
@@ -2556,8 +2592,8 @@ check_restore_arg({keep_tables, List}, R) when is_list(List) ->
 check_restore_arg({skip_tables, List}, R) when is_list(List) ->
     TableList = [{Tab, skip_tables} || Tab <- List],
     R#r{table_options = R#r.table_options ++ TableList};
-check_restore_arg({default_op, Op}, R) -> 
-    case Op of 
+check_restore_arg({default_op, Op}, R) ->
+    case Op of
 	clear_tables -> ok;
 	recreate_tables -> ok;
 	keep_tables -> ok;
@@ -2588,12 +2624,12 @@ restore_items([Rec | Recs], Header, Schema, R) ->
     case lists:keysearch(Tab, 1, R#r.tables) of
 	{value, {Tab, Where0, Snmp, RecName}} ->
 	    Where = case Where0 of
-			undefined -> 
+			undefined ->
 			    val({Tab, where_to_commit});
 			_ ->
 			    Where0
 		    end,
-	    {Rest, NRecs} = restore_tab_items([Rec | Recs], Tab, 
+	    {Rest, NRecs} = restore_tab_items([Rec | Recs], Tab,
 					      RecName, Where, Snmp,
 					      R#r.recs, R#r.insert_op),
 	    restore_items(Rest, Header, Schema, R#r{recs = NRecs});
@@ -2601,12 +2637,12 @@ restore_items([Rec | Recs], Header, Schema, R) ->
 	    Rest = skip_tab_items(Recs, Tab),
 	    restore_items(Rest, Header, Schema, R)
     end;
-    
+
 restore_items([], _Header, _Schema, R) ->
     R.
 
 restore_func(Tab, R) ->
-    case lists:keysearch(Tab, 1, R#r.table_options) of 
+    case lists:keysearch(Tab, 1, R#r.table_options) of
 	{value, {Tab, OP}} ->
 	    OP;
 	false ->
@@ -2618,24 +2654,24 @@ where_to_commit(Tab, CsList) ->
     Disc =  [{N, disc_copies} || N <- pick(Tab, disc_copies, CsList, [])],
     DiscO = [{N, disc_only_copies} || N <- pick(Tab, disc_only_copies, CsList, [])],
     Ram ++ Disc ++ DiscO.
-    
+
 %% Changes of the Meta info of schema itself is not allowed
 restore_schema([{schema, schema, _List} | Schema], R) ->
     restore_schema(Schema, R);
 restore_schema([{schema, Tab, List} | Schema], R) ->
     case restore_func(Tab, R) of
-	clear_tables -> 
+	clear_tables ->
 	    do_clear_table(Tab),
-	    Snmp = val({Tab, snmp}), 
-	    RecName = val({Tab, record_name}), 
+	    Snmp = val({Tab, snmp}),
+	    RecName = val({Tab, record_name}),
 	    R2 = R#r{tables = [{Tab, undefined, Snmp, RecName} | R#r.tables]},
 	    restore_schema(Schema, R2);
-	recreate_tables -> 
+	recreate_tables ->
 	    case ?catch_val({Tab, cstruct}) of
-		{'EXIT', _} ->    
+		{'EXIT', _} ->
 		    TidTs = {_Mod, Tid, Ts} = get(mnesia_activity_state),
 		    RunningNodes = val({current, db_nodes}),
-		    Nodes = mnesia_lib:intersect(mnesia_lib:cs_to_nodes(list2cs(List)), 
+		    Nodes = mnesia_lib:intersect(mnesia_lib:cs_to_nodes(list2cs(List)),
 						 RunningNodes),
 		    mnesia_locker:wlock_no_exist(Tid, Ts#tidstore.store, Tab, Nodes),
 		    TidTs;
@@ -2643,20 +2679,20 @@ restore_schema([{schema, Tab, List} | Schema], R) ->
 		    TidTs = get_tid_ts_and_lock(Tab, write)
 	    end,
 	    NC    = {cookie, ?unique_cookie},
-	    List2 = lists:keyreplace(cookie, 1, List, NC),		
+	    List2 = lists:keyreplace(cookie, 1, List, NC),
 	    Where = where_to_commit(Tab, List2),
 	    Snmp  = pick(Tab, snmp, List2, []),
 	    RecName = pick(Tab, record_name, List2, Tab),
 	    insert_schema_ops(TidTs, [{op, restore_recreate, List2}]),
 	    R2 = R#r{tables = [{Tab, Where, Snmp, RecName} | R#r.tables]},
 	    restore_schema(Schema, R2);
-	keep_tables -> 
+	keep_tables ->
 	    get_tid_ts_and_lock(Tab, write),
 	    Snmp = val({Tab, snmp}),
-	    RecName = val({Tab, record_name}), 
+	    RecName = val({Tab, record_name}),
 	    R2 = R#r{tables = [{Tab, undefined, Snmp, RecName} | R#r.tables]},
 	    restore_schema(Schema, R2);
-	skip_tables -> 
+	skip_tables ->
 	    restore_schema(Schema, R)
     end;
 
@@ -2667,7 +2703,7 @@ restore_schema([{schema, Tab} | Schema], R) ->
 restore_schema([], R) ->
     R.
 
-restore_tab_items([Rec | Rest], Tab, RecName, Where, Snmp, Recs, Op) 
+restore_tab_items([Rec | Rest], Tab, RecName, Where, Snmp, Recs, Op)
   when element(1, Rec) == Tab ->
     NewRecs = Op(Rec, Recs, RecName, Where, Snmp),
     restore_tab_items(Rest, Tab, RecName, Where, Snmp, NewRecs, Op);
@@ -2675,7 +2711,7 @@ restore_tab_items([Rec | Rest], Tab, RecName, Where, Snmp, Recs, Op)
 restore_tab_items(Rest, _Tab, _RecName, _Where, _Snmp, Recs, _Op) ->
     {Rest, Recs}.
 
-skip_tab_items([Rec| Rest], Tab) 
+skip_tab_items([Rec| Rest], Tab)
   when element(1, Rec) == Tab ->
     skip_tab_items(Rest, Tab);
 skip_tab_items(Recs, _) ->
@@ -2710,7 +2746,6 @@ merge_schema() ->
 merge_schema(UserFun) ->
     schema_transaction(fun() -> UserFun(fun(Arg) -> do_merge_schema(Arg) end) end).
 
-
 do_merge_schema(LockTabs0) ->
     {_Mod, Tid, Ts} = get_tid_ts_and_lock(schema, write),
     LockTabs = [{T, tab_to_nodes(T)} || T <- LockTabs0],
@@ -2732,14 +2767,14 @@ do_merge_schema(LockTabs0) ->
             [mnesia_locker:wlock_no_exist(
                Tid, Store, T, mnesia_lib:intersect(Ns, OtherNodes))
              || {T,Ns} <- LockTabs],
-	    case rpc:call(Node, mnesia_controller, get_cstructs, []) of
+	    case fetch_cstructs(Node) of
 		{cstructs, Cstructs, RemoteRunning1} ->
 		    LockedAlready = Running ++ [Node],
 		    {New, Old} = mnesia_recover:connect_nodes(RemoteRunning1),
 		    RemoteRunning = mnesia_lib:intersect(New ++ Old, RemoteRunning1),
-		    if 
+		    if
 			RemoteRunning /= RemoteRunning1 ->
-			    mnesia_lib:error("Mnesia on ~p could not connect to node(s) ~p~n", 
+			    mnesia_lib:error("Mnesia on ~p could not connect to node(s) ~p~n",
 					     [node(), RemoteRunning1 -- RemoteRunning]),
 			    mnesia:abort({node_not_running, RemoteRunning1 -- RemoteRunning});
 			true -> ok
@@ -2749,24 +2784,24 @@ do_merge_schema(LockTabs0) ->
                     [mnesia_locker:wlock_no_exist(Tid, Store, T,
                                                   mnesia_lib:intersect(Ns,NeedsLock))
                      || {T,Ns} <- LockTabs],
-		    {value, SchemaCs} =
-			lists:keysearch(schema, #cstruct.name, Cstructs),
 
+		    NeedsConversion = need_old_cstructs(NeedsLock ++ LockedAlready),
+		    {value, SchemaCs} = lists:keysearch(schema, #cstruct.name, Cstructs),
+		    SchemaDef = cs2list(NeedsConversion, SchemaCs),
 		    %% Announce that Node is running
-		    A = [{op, announce_im_running, node(),
-			  cs2list(SchemaCs), Running, RemoteRunning}],
+		    A = [{op, announce_im_running, node(), SchemaDef, Running, RemoteRunning}],
 		    do_insert_schema_ops(Store, A),
-		    
+
 		    %% Introduce remote tables to local node
-		    do_insert_schema_ops(Store, make_merge_schema(Node, Cstructs)),
-		    
+		    do_insert_schema_ops(Store, make_merge_schema(Node, NeedsConversion, Cstructs)),
+
 		    %% Introduce local tables to remote nodes
 		    Tabs = val({schema, tables}),
 		    Ops = [{op, merge_schema, get_create_list(T)}
 			   || T <- Tabs,
 			      not lists:keymember(T, #cstruct.name, Cstructs)],
 		    do_insert_schema_ops(Store, Ops),
-		    
+
 		    %% Ensure that the txn will be committed on all nodes
 		    NewNodes = RemoteRunning -- Running,
 		    mnesia_lib:set(prepare_op, {announce_im_running,NewNodes}),
@@ -2782,19 +2817,49 @@ do_merge_schema(LockTabs0) ->
 	    not_merged
     end.
 
+fetch_cstructs(Node) ->
+    case mnesia_monitor:needs_protocol_conversion(Node) of
+	true ->
+	    case rpc:call(Node, mnesia_controller, get_cstructs, []) of
+		{cstructs, Cs0, RR} ->
+		    {cstructs, [list2cs(cs2list(Cs)) || Cs <- Cs0], RR};
+		Err -> Err
+	    end;
+	false ->
+	    rpc:call(Node, mnesia_controller, get_remote_cstructs, [])
+    end.
+
+need_old_cstructs(Nodes) ->
+    Filter = fun(Node) -> not mnesia_monitor:needs_protocol_conversion(Node) end,
+    case lists:dropwhile(Filter, Nodes) of
+	[] -> false;
+	[Node|_] ->
+	    case rpc:call(Node, mnesia_lib, val, [{schema,cstruct}]) of
+		#cstruct{} ->
+		    %% mnesia_lib:warning("Mnesia on ~p do not need to convert cstruct (~p)~n",
+		    %% 		       [node(), Node]),
+		    false;
+		{badrpc, _} ->
+		    need_old_cstructs(lists:delete(Node,Nodes));
+		Cs when element(1, Cs) == cstruct, tuple_size(Cs) == 17 ->
+		    ver4_4_18;			% Without majority
+		Cs when element(1, Cs) == cstruct, tuple_size(Cs) == 18 ->
+		    ver4_4_19			% With majority
+	    end
+    end.
+
 tab_to_nodes(Tab) when is_atom(Tab) ->
     Cs = val({Tab, cstruct}),
     mnesia_lib:cs_to_nodes(Cs).
 
-make_merge_schema(Node, [Cs | Cstructs]) ->
-    Ops = do_make_merge_schema(Node, Cs),
-    Ops ++ make_merge_schema(Node, Cstructs);
-make_merge_schema(_Node, []) ->
+make_merge_schema(Node, NeedsConv, [Cs | Cstructs]) ->
+    Ops = do_make_merge_schema(Node, NeedsConv, Cs),
+    Ops ++ make_merge_schema(Node, NeedsConv, Cstructs);
+make_merge_schema(_Node, _, []) ->
     [].
 
 %% Merge definitions of schema table
-do_make_merge_schema(Node, RemoteCs)
-  when RemoteCs#cstruct.name == schema ->
+do_make_merge_schema(Node, NeedsConv, RemoteCs = #cstruct{name = schema}) ->
     Cs = val({schema, cstruct}),
     Masters = mnesia_recover:get_master_nodes(schema),
     HasRemoteMaster = lists:member(Node, Masters),
@@ -2804,15 +2869,15 @@ do_make_merge_schema(Node, RemoteCs)
     StCsLocal   = mnesia_lib:cs_to_storage_type(node(), Cs),
     StRcsLocal  = mnesia_lib:cs_to_storage_type(node(), RemoteCs),
     StCsRemote  = mnesia_lib:cs_to_storage_type(Node, Cs),
-    StRcsRemote = mnesia_lib:cs_to_storage_type(Node, RemoteCs),        
-    
+    StRcsRemote = mnesia_lib:cs_to_storage_type(Node, RemoteCs),
+
     if
 	Cs#cstruct.cookie == RemoteCs#cstruct.cookie,
 	Cs#cstruct.version == RemoteCs#cstruct.version ->
 	    %% Great, we have the same cookie and version
 	    %% and do not need to merge cstructs
 	    [];
-	
+
 	Cs#cstruct.cookie /= RemoteCs#cstruct.cookie,
 	Cs#cstruct.disc_copies /= [],
 	RemoteCs#cstruct.disc_copies /= [] ->
@@ -2823,14 +2888,14 @@ do_make_merge_schema(Node, RemoteCs)
 		HasRemoteMaster == false ->
 		    %% Choose local cstruct,
 		    %% since it's the master
-		    [{op, merge_schema, cs2list(Cs)}];
+		    [{op, merge_schema, cs2list(NeedsConv, Cs)}];
 
 		HasRemoteMaster == true,
 		HasLocalMaster == false ->
 		    %% Choose remote cstruct,
 		    %% since it's the master
-		    [{op, merge_schema, cs2list(RemoteCs)}];
-		
+		    [{op, merge_schema, cs2list(NeedsConv, RemoteCs)}];
+
 		true ->
 		    Str = io_lib:format("Incompatible schema cookies. "
 					"Please, restart from old backup."
@@ -2838,12 +2903,12 @@ do_make_merge_schema(Node, RemoteCs)
 					[Node, cs2list(RemoteCs), node(), cs2list(Cs)]),
 		    throw(Str)
 	    end;
-	
+
 	StCsLocal /= StRcsLocal, StRcsLocal /= unknown, StCsLocal /= ram_copies ->
 	    Str = io_lib:format("Incompatible schema storage types (local). "
 				"on ~w storage ~w, on ~w storage ~w~n",
 				[node(), StCsLocal, Node, StRcsLocal]),
-	    throw(Str);    
+	    throw(Str);
 	StCsRemote /= StRcsRemote, StCsRemote /= unknown, StRcsRemote /= ram_copies ->
 	    Str = io_lib:format("Incompatible schema storage types (remote). "
 				"on ~w cs ~w, on ~w rcs ~w~n",
@@ -2854,27 +2919,27 @@ do_make_merge_schema(Node, RemoteCs)
 	    %% Choose local cstruct,
 	    %% since it involves disc nodes
 	    MergedCs = merge_cstructs(Cs, RemoteCs, Force),
-	    [{op, merge_schema, cs2list(MergedCs)}];
-	
+	    [{op, merge_schema, cs2list(NeedsConv, MergedCs)}];
+
 	RemoteCs#cstruct.disc_copies /= [] ->
 	    %% Choose remote cstruct,
 	    %% since it involves disc nodes
 	    MergedCs = merge_cstructs(RemoteCs, Cs, Force),
-	    [{op, merge_schema, cs2list(MergedCs)}];
+	    [{op, merge_schema, cs2list(NeedsConv, MergedCs)}];
 
 	Cs > RemoteCs ->
 	    %% Choose remote cstruct
 	    MergedCs = merge_cstructs(RemoteCs, Cs, Force),
-	    [{op, merge_schema, cs2list(MergedCs)}];
-	
+	    [{op, merge_schema, cs2list(NeedsConv, MergedCs)}];
+
 	true ->
 	    %% Choose local cstruct
 	    MergedCs = merge_cstructs(Cs, RemoteCs, Force),
-	    [{op, merge_schema, cs2list(MergedCs)}]
+	    [{op, merge_schema, cs2list(NeedsConv, MergedCs)}]
     end;
 
 %% Merge definitions of normal table
-do_make_merge_schema(Node, RemoteCs) ->
+do_make_merge_schema(Node, NeedsConv, RemoteCs = #cstruct{}) ->
     Tab = RemoteCs#cstruct.name,
     Masters = mnesia_recover:get_master_nodes(schema),
     HasRemoteMaster = lists:member(Node, Masters),
@@ -2883,27 +2948,27 @@ do_make_merge_schema(Node, RemoteCs) ->
     case ?catch_val({Tab, cstruct}) of
 	{'EXIT', _} ->
 	    %% A completely new table, created while Node was down
-	    [{op, merge_schema, cs2list(RemoteCs)}];
+	    [{op, merge_schema, cs2list(NeedsConv, RemoteCs)}];
 	Cs when Cs#cstruct.cookie == RemoteCs#cstruct.cookie ->
 	    if
 		Cs#cstruct.version == RemoteCs#cstruct.version ->
 		    %% We have exactly the same version of the
 		    %% table def
 		    [];
-		
+
 		Cs#cstruct.version > RemoteCs#cstruct.version ->
 		    %% Oops, we have different versions
 		    %% of the table def, lets merge them.
 		    %% The only changes that may have occurred
 		    %% is that new replicas may have been added.
 		    MergedCs = merge_cstructs(Cs, RemoteCs, Force),
-		    [{op, merge_schema, cs2list(MergedCs)}];
-		
+		    [{op, merge_schema, cs2list(NeedsConv, MergedCs)}];
+
 		Cs#cstruct.version < RemoteCs#cstruct.version ->
 		    %% Oops, we have different versions
 		    %% of the table def, lets merge them
 		    MergedCs = merge_cstructs(RemoteCs, Cs, Force),
-		    [{op, merge_schema, cs2list(MergedCs)}]
+		    [{op, merge_schema, cs2list(NeedsConv, MergedCs)}]
 	    end;
 	Cs ->
 	    %% Different cookies, not possible to merge
@@ -2912,14 +2977,14 @@ do_make_merge_schema(Node, RemoteCs) ->
 		HasRemoteMaster == false ->
 		    %% Choose local cstruct,
 		    %% since it's the master
-		    [{op, merge_schema, cs2list(Cs)}];
+		    [{op, merge_schema, cs2list(NeedsConv, Cs)}];
 
 		HasRemoteMaster == true,
 		HasLocalMaster == false ->
 		    %% Choose remote cstruct,
 		    %% since it's the master
-		    [{op, merge_schema, cs2list(RemoteCs)}];
-		
+		    [{op, merge_schema, cs2list(NeedsConv, RemoteCs)}];
+
 		true ->
 		    Str = io_lib:format("Bad cookie in table definition"
 					" ~w: ~w = ~w, ~w = ~w~n",
@@ -2989,7 +3054,7 @@ compare_storage_type(true, One, Another) ->
     compare_storage_type(false, Another, One);
 compare_storage_type(false, _One, _Another) ->
     incompatible.
-  
+
 change_storage_type(N, ram_copies, Cs) ->
     Nodes = [N | Cs#cstruct.ram_copies],
     Cs#cstruct{ram_copies = mnesia_lib:uniq(Nodes)};
@@ -3071,14 +3136,14 @@ verify_merge(RemoteCs) ->
 	    if
 		StCsLocal  == StRcsLocal ->   ok;
 		StCsLocal  == unknown ->      ok;
-		(StRcsLocal == unknown), (HasRemoteMaster == false) ->      
+		(StRcsLocal == unknown), (HasRemoteMaster == false) ->
 		    {merge_error, Cs, RemoteCs};
 		%%  Trust the merger
 		true  -> ok
 	    end
     end.
 
-announce_im_running([N | Ns], SchemaCs) ->    
+announce_im_running([N | Ns], SchemaCs) ->
     {L1, L2} = mnesia_recover:connect_nodes([N]),
     case lists:member(N, L1) or lists:member(N, L2) of
 	true ->
@@ -3095,7 +3160,7 @@ announce_im_running([], _) ->
 
 unannounce_im_running([N | Ns]) ->
     mnesia_lib:del({current, db_nodes}, N),
-    mnesia_controller:del_active_replica(schema, N),    
+    mnesia_controller:del_active_replica(schema, N),
     unannounce_im_running(Ns);
 unannounce_im_running([]) ->
     ok.
diff --git a/lib/observer/doc/src/ttb.xml b/lib/observer/doc/src/ttb.xml
index 2c80891925..4e63aecbf2 100644
--- a/lib/observer/doc/src/ttb.xml
+++ b/lib/observer/doc/src/ttb.xml
@@ -25,11 +25,12 @@
 
     <title>ttb</title>
     <prepared>Siri hansen</prepared>
+    <prepared>Bartlomiej Puzon</prepared>
     <responsible></responsible>
     <docno>1</docno>
     <approved></approved>
     <checked></checked>
-    <date>2002-02-25</date>
+    <date>2010-08-13</date>
     <rev>PA1</rev>
     <file>ttb.sgml</file>
   </header>
@@ -43,6 +44,35 @@
   </description>
   <funcs>
     <func>
+      <name>start_trace(Nodes, Patterns, FlagSpec, Opts) -> Result</name>
+      <fsummary>Start a trace port on each given node.</fsummary>
+      <type>
+        <v>Result = see p/2</v>
+        <v>Nodes = see tracer/2</v>
+        <v>Patterns = [tuple()]</v>
+        <v>FlagSpec = {Procs, Flags}</v>
+        <v>Proc = see p/2</v>
+        <v>Flags = see p/2</v>
+        <v>Opts = see tracer/2</v>
+      </type>
+      <desc>
+        <p>This function is a shortcut allowing to start a trace with one command. Each
+          tuple in <c>Patterns</c> is converted to list which is in turn passed to
+          <c>ttb:tpl</c>.
+          The call:<code type="none">
+ttb:start_trace([Node, OtherNode],
+[{mod, foo, []}, {mod, bar, 2}],
+{all, call},
+[{file, File}, {handler,{fun myhandler/4, S}}])</code>
+          is equivalent to <code type="none">
+ttb:start_trace([Node, OtherNode], [{file, File}, {handler,{fun myhandler/4, S}}]),
+ttb:tpl(mod, foo, []),
+ttb:tpl(mod, bar, 2, []),
+ttb:p(all, call)</code>
+        </p>
+      </desc>
+    </func>
+    <func>
       <name>tracer() -> Result</name>
       <fsummary>This is equivalent to tracer(node()).</fsummary>
       <desc>
@@ -50,6 +80,17 @@
       </desc>
     </func>
     <func>
+      <name>tracer(Shortcut) -> Result</name>
+      <fsummary>Handy shortcuts for common tracing settings</fsummary>
+      <type>
+        <v>Shortcut = shell | dbg</v>
+      </type>
+      <desc>
+        <p><c>shell</c> is equivalent to <c>tracer(node(),[{file, {local, "ttb"}}, shell])</c>.</p>
+        <p><c>dbg</c> is equivalent to <c>tracer(node(),[{shell, only}])</c>.</p>
+      </desc>
+    </func>
+    <func>
       <name>tracer(Nodes) -> Result</name>
       <fsummary>This is equivalent to tracer(Nodes,[]).</fsummary>
       <desc>
@@ -62,14 +103,21 @@
       <type>
         <v>Result = {ok, ActivatedNodes} | {error,Reason}</v>
         <v>Nodes   = atom() | [atom()] | all | existing | new</v>
-        <v>Opts = [Opt]</v>
-        <v>Opt = {file,Client} | {handler, FormatHandler} | {process_info,PI}</v>
+        <v>Opts = Opt | [Opt]</v>
+        <v>Opt = {file,Client} | {handler, FormatHandler} | {process_info,PI} |
+          shell | {shell, ShellSpec} | {timer, TimerSpec} | {overload, {MSec, Module, Function}}
+          | {flush, MSec} | resume | {resume, FetchTimeout}</v>
+        <v>TimerSpec = MSec | {MSec, StopOpts}</v>
+        <v>MSec = FetchTimeout = integer()</v>
+        <v>Module = Function = atom() </v>
+        <v>StopOpts = see stop/2</v>
         <v>Client = File | {local, File}</v>
         <v>File = Filename | Wrap</v>
         <v>Filename = string()</v>
         <v>Wrap = {wrap,Filename} | {wrap,Filename,Size,Count}</v>
         <v>FormatHandler = See format/2</v>
         <v>PI = true | false </v>
+        <v>ShellSpec = true | false | only</v>
       </type>
       <desc>
         <p>This function starts a file trace port on all given nodes
@@ -96,7 +144,70 @@
           is the process' registered name its globally registered name,
           or its initial function. It is possible to turn off this
           functionality by setting <c>PI = false</c>.
-          </p>
+        </p>
+        <p>The <c>{shell, ShellSpec}</c> option indicates that the trace messages should
+          be printed on the console as they are received by the tracing
+          process. This implies <c>{local, File}</c> trace client. If the ShellSpec
+          is <c>only</c> (instead of <c>true</c>), no trace logs are stored.
+        </p>
+        <p>The <c>shell</c> option is a shortcut for <c>{shell, true}</c>.</p>
+        <p>The <c>timer</c> option indicates that the trace should be
+          automatically stopped after <c>MSec</c> milliseconds. <c>StopOpts</c>
+          are passed to <c>ttb:stop/2</c> command if specified (default is <c>[]</c>).
+          Note that the timing is approximate, as delays related to
+          network communication are always present. The timer starts after
+          <c>ttb:p/2</c> is issued, so you can set up your trace patterns before.
+        </p>
+        <p>The <c>overload</c> option allows to enable overload
+          checking on the nodes under trace. <c>Module:Function(check)</c>
+          is performed each <c>MSec</c> milliseconds. If the check returns
+          <c>true</c>, the tracing is disabled on a given node.<br/>
+          <c>Module:Function</c> should be able to handle at least three
+          atoms: <c>init</c>, <c>check</c> and <c>stop</c>. <c>init</c> and
+          <c>stop</c> give the user a possibility to initialize and clean
+          up the check environment.<br/>
+          When a node gets overloaded, it is not possible to issue <c>ttb:p</c>
+          nor any command from the <c>ttb:tp</c> family, as it would lead to
+          inconsistent tracing state (different trace specifications on
+          different node).
+        </p>
+        <p>The <c>flush</c> option periodically flushes all file trace
+          port clients (see <c>dbg:flush_trace_port/1</c>). When enabled,
+          the buffers are freed each <c>MSec</c> milliseconds. This option is
+          not allowed with <c>{file, {local, File}}</c> tracing.
+        </p>
+        <p><c>{resume, FetchTimeout}</c> enables the autoresume feature.
+          Whenever enabled, remote nodes try to reconnect to the controlling node
+          in case they were restarted. The feature requires <c>runtime_tools</c>
+          application to be started (so it has to be present in the <c>.boot</c>
+          scripts if the traced nodes run with embedded erlang). If this is
+          not possible, resume may be performed manually by starting
+          <c>runtime_tools</c> remotely using <c>rpc:call/4</c>.<br/>
+          <c>ttb</c> tries to fetch all logs from a reconnecting node before
+          reinitializing the trace. This has to finish within FetchTimeout milliseconds
+          or is aborted<br/>
+          By default, autostart information is stored in a file called
+          <c>ttb_autostart.bin</c> on each node. If this is not desired
+          (i.e. on diskless nodes), a custom module to handle autostart
+          information storage and retrieval can be provided by specifying
+          <c>ttb_autostart_module</c> environment variable for the <c>runtime_tools</c>
+          application. The module has to respond to the following API:
+          <taglist>
+            <tag><c>write_config(Data) -> ok</c></tag>
+            <item>Store the provided data for further retrieval. It is
+              important to realize that the data storage used must not
+              be affected by the node crash.</item>
+            <tag><c>read_config() -> {ok, Data} | {error, Error}</c></tag>
+            <item>Retrieve configuration stored with <c>write_config(Data)</c>.</item>
+            <tag><c>delete_config() -> ok</c></tag>
+            <item>Delete configuration stored with <c>write_config(Data)</c>.
+              Note that after this call any subsequent calls to <c>read_config</c>
+              must return <c>{error, Error}</c>.
+            </item>
+          </taglist>
+        </p>
+        <p>The <c>resume</c> option implies the default <c>FetchTimeout</c>, which is
+          10 seconds</p>
       </desc>
     </func>
     <func>
@@ -110,7 +221,7 @@
       </type>
       <desc>
         <p>This function sets the given trace flags on the given
-          processes.
+          processes. The <c>timestamp</c> flag is always turned on.
           </p>
         <p>Please turn to the Reference manual for module <c>dbg</c>
           for details about the possible trace flags. The parameter
@@ -119,6 +230,9 @@
           registered names or process identifiers. If a registered name
           is given, the flags are set on processes with this name on all
           active nodes.</p>
+        <p>Issuing this command starts the timer for this trace if
+          <c>timer</c> option was specified with <c>tracer/2</c>.
+        </p>
       </desc>
     </func>
     <func>
@@ -155,6 +269,18 @@
           <tag><c>ctpg</c></tag>
           <item>Clear trace pattern on global function calls</item>
         </taglist>
+        <p>With <c>tp</c> and <c>tpl</c> one of match specification shortcuts
+          may be used (example: <c>ttb:tp(foo_module, caller)</c>). The shortcuts are:
+          <taglist>
+            <item><c>return</c> - for <c>[{'_',[],[{return_trace}]}]</c>
+              (report the return value)</item>
+            <item><c>caller</c> - for <c>[{'_',[],[{message,{caller}}]}]</c>
+              (report the calling function)</item>
+            <item><c>{codestr, Str}</c> - for <c>dbg:fun2ms/1</c> arguments
+              passed as strings (example: <c>"fun(_) -> return_trace() end"</c>)
+            </item>
+          </taglist>
+        </p>
       </desc>
     </func>
     <func>
@@ -189,7 +315,7 @@
       </desc>
     </func>
     <func>
-      <name>write_config(ConfigFile,Config,Opt) -> ok | {error,Reason}</name>
+      <name>write_config(ConfigFile,Config,Opts) -> ok | {error,Reason}</name>
       <fsummary>Creates a config file.</fsummary>
       <type>
         <v>ConfigFile = string()</v>
@@ -197,7 +323,8 @@
         <v>Mod = atom()</v>
         <v>Func = atom()</v>
         <v>Args = [term()]</v>
-        <v>Opt = [] | [append]</v>
+        <v>Opts = Opt | [Opt]</v>
+        <v>Opt = append</v>
       </type>
       <desc>
         <p>This function creates or extends a config file which can be
@@ -213,9 +340,9 @@
           should be a list of integers pointing out the entries to be
           stored.
           </p>
-        <p>If <c>Opt</c> is not given or if it is <c>[]</c>,
+        <p>If <c>Opts</c> is not given or if it is <c>[]</c>,
           <c>ConfigFile</c> is deleted and a new file is created. If
-          <c>Opt = [append]</c>, <c>ConfigFile</c> will not be deleted.
+          <c>Opts = [append]</c>, <c>ConfigFile</c> will not be deleted.
           The new information will be appended at the end of the file.</p>
       </desc>
     </func>
@@ -226,7 +353,9 @@
         <v>ConfigFile = string()</v>
       </type>
       <desc>
-        <p>Executes all entries in the given config file.</p>
+        <p>Executes all entries in the given config file. Note that the history
+          of the last trace is always available in the file named
+          <c>ttb_last_config</c>.</p>
       </desc>
     </func>
     <func>
@@ -243,6 +372,9 @@
           </p>
         <p>The content of a config file can be listed with
           <c>list_config/1</c>.</p>
+        <p> Note that the history
+          of the last trace is always available in the file named
+          <c>ttb_last_config</c>.</p>
       </desc>
     </func>
     <func>
@@ -334,29 +466,51 @@
       </desc>
     </func>
     <func>
-      <name>stop(Opts) -> stopped</name>
+      <name>stop(Opts) -> stopped | {stopped, Dir}</name>
       <fsummary>Stop tracing and fetch/format logs from all nodes</fsummary>
       <type>
-        <v>Opts = [Opt]</v>
-        <v>Opt = fetch | format</v>
+        <v>Opts = Opt | [Opt]</v>
+        <v>Opt = nofetch | {fetch_dir, Dir} | format | {format, FormatOpts} | return_fetch_dir</v>
+        <v>Dir = string()</v>
+        <v>FormatOpts = see format/2</v>
       </type>
       <desc>
-        <p>Stops tracing on all nodes.
-          </p>
-        <p>The <c>fetch</c> option indicates that trace logs shall be
-          collected from all nodes after tracing is stopped. This option
-          is useful if nodes on remote machines are traced. Logs and
-          trace information files are then sent to the trace control
+        <p>Stops tracing on all nodes. Logs and
+          trace information files are sent to the trace control
           node and stored in a directory named
-          <c>ttb_upload-Timestamp</c>, where <c>Timestamp</c> is on the
+          <c>ttb_upload_FileName-Timestamp</c>, where <c>Filename</c> is
+          the one provided with <c>{file, File}</c> during trace setup
+          and <c>Timestamp</c> is of the
           form <c>yyyymmdd-hhmmss</c>. Even logs from nodes on the same
           machine as the trace control node are moved to this directory.
-          </p>
+          The history list is saved to a file named <c>ttb_last_config</c>
+          for further reference (as it will be not longer accessible
+          through history and configuration management functions (like
+          <c>ttb:list_history/0</c>).
+        </p>
+        <p>The <c>nofetch</c> option indicates that trace logs shall not be
+          collected after tracing is stopped.
+        </p>
+        <p>The <c>{fetch, Dir}</c> option allows to specify the directory
+          to fetch the data to. If the directory already exists, an
+          error is thrown.
+        </p>
         <p>The <c>format</c> option indicates that the trace logs
-          shall be formatted after tracing is stopped. Note that this
-          option also implies the <c>fetch</c> option, i.e. logs are
-          collected in a new directory on the trace control node before
-          formatting. All logs in the directory will be merged.</p>
+          shall be formatted after tracing is stopped. All logs in the fetch directory will be merged.
+          You may use <c>{format, FormatOpts}</c> to pass additional
+          arguments to <c>format/2</c>.</p>
+        <p>The <c>return_fetch_dir</c> option indicates that the return value
+          should be <c>{stopped, Dir}</c> and not just <c>stopped</c>.
+          This implies <c>fetch</c>.
+        </p>
+      </desc>
+    </func>
+    <func>
+      <name>get_et_handler()</name>
+      <fsummary>Returns <c>et</c> handler.</fsummary>
+      <desc>
+        <p>The <c>et</c> handler returned by the function may be used with <c>format/2</c>
+          or <c>tracer/2</c>. Example: <c>ttb:format(Dir, [{handler, ttb:get_et_handler()}])</c>.</p>
       </desc>
     </func>
     <func>
@@ -372,37 +526,40 @@
       <type>
         <v>File = string() | [string()]</v>
         <d>This can be the name of a binary log, a list of such logs or the name of a directory containing one or more binary logs.</d>
-        <v>Options = [Opt]</v>
-        <v>Opt = {out,Out} | {handler,FormatHandler}</v>
+        <v>Options = Opt | [Opt]</v>
+        <v>Opt = {out,Out} | {handler,FormatHandler} | disable_sort</v>
         <v>Out = standard_io | string()</v>
-        <v>FormatHandler = {Function, InitialState} | et</v>
+        <v>FormatHandler = {Function, InitialState}</v>
         <v>Function = fun(Fd,Trace,TraceInfo,State) -> State</v>
         <v>Fd = standard_io | FileDescriptor</v>
         <d>This is the file descriptor of the destination file <c>Out</c></d>
         <v>Trace = tuple()</v>
         <d>This is the trace message. Please turn to the Reference manual for the <c>erlang</c>module for details.</d>
         <v>TraceInfo = [{Key,ValueList}]</v>
-        <d>This includes the keys <c>flags</c>, <c>client</c>and <c>node</c>,  and if <c>handler</c>is given as option to the tracer function,  this is also included. In addition all information written with the <c>write_trace_info/2</c>function is included. </d>
+        <d>This includes the keys <c>flags</c>, <c>client</c> and <c>node</c>,  and if <c>handler</c> is given as option to the tracer function,  this is also included. In addition all information written with the <c>write_trace_info/2</c>function is included. </d>
       </type>
       <desc>
-        <p>Reads the given binary trace log(s). If a directory or a
-          list of logs is given and the <c>timestamp</c> flag was set
-          during tracing, the trace messages from the different logs are
-          merged according to the timestamps.
-          </p>
+        <p>Reads the given binary trace log(s). The logs are processed
+          in the order of their timestamp as long as <c>disable_sort</c>
+          option is not given.
+        </p>
         <p>If <c>FormatHandler = {Function,InitialState}</c>,
           <c>Function</c> will be called for each trace message. If
-          <c>FormatHandler = et</c>, <c>et_viewer</c> in the <em>Event Tracer</em> application (<c>et</c>) is used for presenting the
-          trace log graphically. <c>ttb</c> provides a few different
+          <c>FormatHandler = get_et_handler()</c>, <c>et_viewer</c> in
+          the <em>Event Tracer</em> application (<c>et</c>) is used for presenting
+          the trace log graphically. <c>ttb</c> provides a few different
           filters which can be selected from the Filter menu in the
           <c>et_viewer</c>. If <c>FormatHandler</c> is not given, a
           default handler is used which presents each trace message as a
           line of text.
           </p>
+        <p>The state returned from each call of <c>Function</c> is passed to the next call,
+          even if next call is to format a message from another log file.
+          </p>
         <p>If <c>Out</c> is given, <c>FormatHandler</c> gets the
-          filedescriptor to <c>Out</c> as the first parameter.
+          file descriptor to <c>Out</c> as the first parameter.
           </p>
-        <p><c>Out</c> is ignored if <c>FormatHandler = et</c>.
+        <p><c>Out</c> is ignored if <c>et</c> format handler is used.
           </p>
         <p>Wrap logs can be formatted one by one or all in one go. To
           format one of the wrap logs in a set, give the exact name of
diff --git a/lib/observer/doc/src/ttb_ug.xml b/lib/observer/doc/src/ttb_ug.xml
index 44b7b08fd3..4f2b55a22a 100644
--- a/lib/observer/doc/src/ttb_ug.xml
+++ b/lib/observer/doc/src/ttb_ug.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -48,11 +48,13 @@
       <item>Formatting of binary trace logs and merging of logs from
        multiple nodes.</item>
     </list>
-    <p>Even though the intention of the Trace Tool Builder is to serve
-      as a base for tailor made trace tools, it is of course possible
-      to use it directly from the erlang shell. The application only
-      allows the use of file port tracer, so if you would like would
-      like to use other types of trace clients you will be better off
+    <p>The intention of the Trace Tool Builder is to serve
+      as a base for tailor made trace tools, but you may use it directly
+      from the erlang shell (it may mimic <c>dbg</c> behaviour while
+      still providing useful additions like match specification shortcuts).
+      The application only
+      allows the use of file port tracer, so if you would like
+      to use other types of trace clients you will be better off
       using <c>dbg</c> directly instead.</p>
   </section>
 
@@ -64,14 +66,15 @@
       trace flags on the processes you want to trace with
       <c>ttb:p/2</c>. Then, when the tracing is completed, you must stop
       the tracer with <c>ttb:stop/0/1</c> and format the trace log with
-      <c>ttb:format/1/2</c>.
+      <c>ttb:format/1/2</c> (as long as there is anything to format, of
+      course).
       </p>
-    <p><c>ttb:tracer/0/1/2</c> opens a file trace port on each node
-      that shall be traced. All trace messages will be written to this
-      port and end up in a binary file (the binary trace log).
+    <p><c>ttb:tracer/0/1/2</c> opens a trace port on each node
+      that shall be traced. By default, trace messages are written
+      to binary files on remote nodes(the binary trace log).
       </p>
-    <p><c>ttb:p/2</c> specifies which processes that shall be
-      traced. Trace flags given in this call specifies what to trace on
+    <p><c>ttb:p/2</c> specifies which processes shall be
+      traced. Trace flags given in this call specify what to trace on
       each process. You can call this function several times if you like
       different trace flags to be set on different processes.
       </p>
@@ -105,14 +108,15 @@
 -export([f/0]).
 f() ->
    receive 
-      From when pid(From) -> 
+      From when is_pid(From) ->
          Now = erlang:now(),
          From ! {self(),Now}
    end.      </code>
       <p>The following example shows the basic use of <c>ttb</c> from
         the erlang shell. Default options are used both for starting the
-        tracer and for formatting. This gives a trace log named
-        <c>Node-ttb</c>, where <c>Node</c> is the name of the node.  The
+        tracer and for formatting (the custom fetch dir is however provided).
+        This gives a trace log named <c>Node-ttb</c> in the newly-created
+        directory, where <c>Node</c> is the name of the node.  The
         default handler prints the formatted trace messages in the
         shell.</p>
       <code type="none"><![CDATA[
@@ -131,11 +135,11 @@ f() ->
 (tiger@durin)50> 
 (tiger@durin)50> %% Here I set a trace pattern on erlang:now/0
 (tiger@durin)50> %% The trace pattern is a simple match spec
-(tiger@durin)50> %% generated by dbg:fun2ms/1. It indicates that 
-(tiger@durin)50> %% the return value shall be traced.
-(tiger@durin)50> MS = dbg:fun2ms(fun(_) -> return_trace() end).
-[{'_',[],[{return_trace}]}]
-(tiger@durin)51> ttb:tp(erlang,now,MS).
+(tiger@durin)50> %% indicating that the return value should be
+(tiger@durin)50> %% traced. Refer to the reference_manual for
+(tiger@durin)50> %% the full list of match spec shortcuts
+(tiger@durin)50> %% available.
+(tiger@durin)51> ttb:tp(erlang,now,return).
 {ok,[{matched,tiger@durin,1},{saved,1}]}
 (tiger@durin)52> 
 (tiger@durin)52> %% I run my test (i.e. send a message to
@@ -145,11 +149,11 @@ f() ->
 (tiger@durin)53> 
 (tiger@durin)53> %% And then I have to stop ttb in order to flush
 (tiger@durin)53> %% the trace port buffer
-(tiger@durin)53> ttb:stop().
-stopped
+(tiger@durin)53> ttb:stop([return, {fetch_dir, "fetch"}]).
+{stopped, "fetch"}
 (tiger@durin)54> 
 (tiger@durin)54> %% Finally I format my trace log
-(tiger@durin)54> ttb:format("tiger@durin-ttb").
+(tiger@durin)54> ttb:format("fetch").
 ({<0.125.0>,{m,f,0},tiger@durin}) call erlang:now()
 ({<0.125.0>,{m,f,0},tiger@durin}) returned from erlang:now/0 ->
 {1031,133451,667611}
@@ -166,11 +170,9 @@ ok      ]]></code>
 -module(mydebug).
 -export([start/0,trc/1,stop/0,format/1]).
 -export([print/4]).
-
 %% Include ms_transform.hrl so that I can use dbg:fun2ms/2 to
 %% generate match specifications.
 -include_lib("stdlib/include/ms_transform.hrl").
-
 %%% -------------Tool API-------------
 %%% ----------------------------------
 %%% Star the "mydebug" tool
@@ -180,28 +182,28 @@ start() ->
     %% module shall be used as format handler
     ttb:tracer(all,[{file,"debug_log"},{handler,{{?MODULE,print},0}}]),
     %% All processes (existing and new) shall trace function calls
-    %% and include a timestamp in each trace message
-    ttb:p(all,[call,timestamp]).
+    %% We want trace messages to be sorted upon format, which requires
+    %% timestamp flag. The flag is however enabled by default in ttb.
+    ttb:p(all,call).
 
 %%% Set trace pattern on function(s)
-trc(M) when atom(M) ->
+trc(M) when is_atom(M) ->
     trc({M,'_','_'});
-trc({M,F}) when atom(M), atom(F) ->
+trc({M,F}) when is_atom(M), is_atom(F) ->
     trc({M,F,'_'});
-trc({M,F,_A}=MFA) when atom(M), atom(F) ->
-    %% This match spec specifies that return values shall 
-    %% be traced. NOTE that ms_transform.hrl must be included
-    %% if dbg:fun2ms/1 shall be used!
+trc({M,F,_A}=MFA) when is_atom(M), is_atom(F) ->
+    %% This match spec shortcut specifies that return values shall
+    %% be traced.
     MatchSpec = dbg:fun2ms(fun(_) -> return_trace() end),
     ttb:tpl(MFA,MatchSpec).
 
 %%% Format a binary trace log
-format(File) ->
-    ttb:format(File).
+format(Dir) ->
+    ttb:format(Dir).
 
 %%% Stop the "mydebug" tool
 stop() ->
-    ttb:stop().
+    ttb:stop(return).
 
 %%% --------Internal functions--------
 %%% ----------------------------------
@@ -226,9 +228,9 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
               [N,Ts,P,M,F,A,R]).      ]]></code>
       <p>To distinguish trace logs produced with this tool from other
         logs, the <c>file</c> option is used in <c>tracer/2</c>. The
-        logs will therefore be named <c>Node-debug_log</c>, where
-        <c>Node</c> is the name of the node where the log is produced.
-        </p>
+        logs will therefore be fetched to a directory named
+        <c>ttb_upload_debug_log-YYYYMMDD-HHMMSS</c>
+      </p>
       <p>By using the <c>handler</c> option when starting the tracer,
         the information about how to format the file is stored in the
         trace information file (<c>.ti</c>). This is not necessary, as
@@ -278,13 +280,157 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
         must be given to the <c>tracer/2</c> function with the value
         <c>{local, File}</c>, e.g.</p>
       <code type="none">
-(trace_control@durin)1> ttb:tracer(mynode@diskless,[{file,{local,
-{wrap,"mytrace"}}}]).
+(trace_control@durin)1> ttb:tracer(mynode@diskless,{file,{local,
+{wrap,"mytrace"}}}).
 {ok,[mynode@diskless]}      </code>
     </section>
   </section>
 
   <section>
+    <title>Additional tracing options</title>
+    <p>When setting up a trace, several features may be turned on:</p>
+      <list type="bulleted">
+        <item>time-constrained tracing,</item>
+        <item>overload protection,</item>
+        <item>autoresuming.</item>
+      </list>
+      <section>
+        <title>Time-constrained tracing</title>
+        <p>Sometimes, it may be helpful to enable trace for a
+          given period of time (i.e. to monitor a system for 24 hours
+          or half of a second). This may be done by issuing additional
+          <c>{timer, TimerSpec}</c> option. If <c>TimerSpec</c> has the
+          form of <c>MSec</c>, the trace is stopped after <c>MSec</c>
+          milliseconds using <c>ttb:stop/0</c>. If any additional options
+          are provided (<c>TimerSpec = {MSec, Opts}</c>), <c>ttb:stop/1</c>
+          is called instead with <c>Opts</c> as the arguments. The timer
+          is started with <c>ttb:p/2</c>, so any trace patterns should
+          be set up before. <c>ttb:start_trace/4</c>
+          always sets up all pattern before invoking <c>ttb:p/2</c>.
+          Note that due to network and processing delays the the period
+          of tracing is approximate.
+          The example below shows how to set up a trace which will be
+          automatically stopped and formatted after 5 seconds
+        </p><code>
+(tiger@durin)1>ttb:start_trace([node()],
+                               [{erlang, now,[]}],
+                               {all, call},
+                               [{timer, {5000, format}}]).
+</code>
+        </section>
+        <section>
+          <label>Overload protection</label>
+          <p>When tracing live systems, special care needs to be always taken
+            not to overload a node with too heavy tracing. <c>ttb</c> provides
+            the <c>overload</c> option to help to address the problem.</p>
+          <p><c>{overload, MSec, Module, Function}</c> instructs the ttb backend
+            (called <c>observer_backend</c>, part of the <c>runtime_tools</c>
+            application) to perform overload check every <c>MSec</c> milliseconds.
+            If the check (namely <c>Module:Function(check)</c>) returns
+            <c>true</c>, tracing is disabled on the selected node.</p>
+          <p>Overload protection activated on one node does not
+            affect other nodes, where the tracing continues as normal.
+            <c>ttb:stop/0/1</c> fetches data from all clients, including everything
+            that has been collected before overload protection was activated.
+            Note that
+            changing trace details (with <c>ttb:p</c> and <c>ttb:tp/tpl...</c>)
+            once overload protection gets activated in one of the traced
+            nodes is not permitted in order not to allow trace setup
+            to be inconsistent between nodes.
+          </p>
+          <p><c>Module:Function</c> provided with the <c>overload</c> option must
+            handle three calls: <c>init</c>, <c>check</c> and <c>stop</c>. <c>init</c>
+            and <c>stop</c> allows to perform some setup and teardown required by
+            the check. An overload check module could look like this (note that
+            <c>check</c> is always called by the same process, so <c>put</c> and
+            <c>get</c> are possible).
+          </p><code>
+-module(overload).
+-export([check/1]).
+
+check(init) ->
+    Pid = sophisticated_module:start(),
+    put(pid, Pid);
+check(check) ->
+    get(pid) ! is_overloaded,
+    receive
+        Reply ->
+            Reply
+    after 5000 ->
+            true
+    end;
+check(stop) ->
+    get(pid) ! stop.</code>
+        </section>
+        <section>
+          <title>Autoresume</title>
+          <p>It is possible that a node (probably a buggy one, hence traced)
+            crashes. In order to automatically resume tracing on the node
+            as soon as it gets back, <c>resume</c> has to be used. When
+            it is, the failing node tries to reconnect
+            to trace control node as soon as <c>runtime tools</c> is started.
+            This implies that <c>runtime_tools</c> must be included in
+            other node's startup chain (if it is not, one could still
+            resume tracing by starting <c>runtime_tools</c> manually,
+            i.e. by an RPC call).</p>
+          <p>In order not to loose the data that the failing node stored
+            up to the point of crash, the control node will try to fetch
+            it before restarting trace. This must happen within the allowed
+            time frame or is aborted (default is 10 seconds, can be customized with
+            <c>{resume, MSec}</c>). The data fetched this way is then
+            merged with all other traces.</p>
+          <p>Autostart feature requires additional data to be stored on
+            traced nodes. By default, the data is stored automatically
+            to the file called "ttb_autostart.bin" in the traced node's cwd.
+            Users may decide to change this behaviour (i.e. on diskless
+            nodes) by specifying their own module to handle autostart data
+            storage and retrieval (<c>ttb_autostart_module</c>
+            environment variable of <c>runtime_tools</c>). Please see the
+            ttb's reference manual to see the module's API. This example
+            shows the default handler</p>
+          <code>
+-module(ttb_autostart).
+-export([read_config/0,
+         write_config/1,
+         delete_config/0]).
+
+-define(AUTOSTART_FILENAME, "ttb_autostart.bin").
+
+delete_config() ->
+    file:delete(?AUTOSTART_FILENAME).
+
+read_config() ->
+    case file:read_file(?AUTOSTART_FILENAME) of
+        {ok, Data} -> {ok, binary_to_term(Data)};
+        Error      -> Error
+    end.
+
+write_config(Data) ->
+    file:write_file(?AUTOSTART_FILENAME, term_to_binary(Data)).
+          </code>
+          <p>Remember that file trace ports buffer the data
+            by default. If the node crashes, trace messages are not
+            flushed to the binary log. If the chance of failure is
+            high, it might be a good idea to automatically flush
+            the buffers every now and then. Passing <c>{flush, MSec}</c>
+            as one of <c>ttb:tracer/2</c> option flushes all buffers
+            every <c>MSec</c> milliseconds.</p>
+        </section>
+        <section>
+          <title>dbg mode</title>
+          <p>The <c>{shell, ShellType}</c> option allows to make <c>ttb</c>
+            operation similar to <c>dbg</c>. Using <c>{shell, true}</c>
+            displays all trace messages in the shell before storing them.
+            <c>{shell, only}</c> additionally disables message storage
+            (so that the tool behaves exactly like dbg). This is allowed
+            only with ip trace ports (<c>{trace, {local, File}}</c>).
+          </p>
+          <p>The command <c>ttb:tracer(dbg)</c> is a shortcut for the pure-dbg
+            mode (<c>{shell, only}</c>).</p>
+        </section>
+  </section>
+
+  <section>
     <marker id="trace_info"></marker>
     <title>Trace Information and the .ti File</title>
     <p>In addition to the trace log file(s), a file with the extension
@@ -292,13 +438,9 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
       is the trace information file. It is a binary file, and it
       contains the process information, trace flags used, the name of
       the node to which it belongs and all information written with the
-      <c>write_trace_info/2</c> function.
-      </p>
-    <p>To be able to use all this information during formatting, it is
-      important that the trace information file exists in the same
-      directory as the trace log, and that it has the same name as the
-      trace log with the additional extension <c>.ti</c>.
-      </p>
+      <c>write_trace_info/2</c> function. .ti files are always fetched
+      with other logs when the trace is stopped.
+    </p>
     <p>Except for the process information, everything in the trace
       information file is passed on to the handler function when
       formatting. The <c>TI</c> parameter is a list of
@@ -327,7 +469,12 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
       each log. <c>ttb</c> will create a new binary log each time a log
       reaches the maximum size. When the the maximum number of logs are
       reached, the oldest log is deleted before a new one is created.
-      </p>
+    </p>
+    <p>Note that the overall size of data generated by ttb may be greater
+      than the wrap specification would suggest - if a traced node restarts
+      and autoresume is enabled, old wrap log is always stored and
+      a new one is created.
+    </p>
     <p>Wrap logs can be formatted one by one or all at once. See
       <seealso marker="#format">Formatting</seealso>.
       </p>
@@ -348,12 +495,10 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
       present the trace log graphically (see <seealso marker="#et_viewer">Presenting trace logs with Event Tracer</seealso>).
       </p>
     <p>The first argument to <c>ttb:format/1/2</c> specifies which
-      binary log(s) to format. This can be the name of one binary log, a
-      list of such logs or the name of a directory containing one or
-      more binary logs. If this argument indicates more than one log,
-      and the <c>timestamp</c> flag was set when tracing, the trace
-      messages from the different logs will be merged according to the
-      timestamps in each message.
+      binary log(s) to format. This is usually the name of a directory
+      that ttb created during log fetch. Unless there is the <c>disable_sort</c>
+      option provided, the logs from different files are always sorted
+      according to timestamp in traces.
       </p>
     <p>The second argument to <c>ttb:format/2</c> is a list of
       options. The <c>out</c> option specifies the destination where the
@@ -363,7 +508,10 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
       option is not given, the <c>handler</c> option given when starting
       the tracer is used. If the <c>handler</c> option was not given
       when starting the tracer either, a default handler is used, which
-      prints each trace message as a line of text.
+      prints each trace message as a line of text. The <c>disable_sort</c>
+      option indicates that there logs should not be merged according to
+      timestamp, but processed one file after another (this might be
+      a bit faster).
       </p>
     <p>A format handler is a fun taking four arguments. This fun will
       be called for each trace message in the binary log(s). A simple
@@ -396,10 +544,24 @@ end    </code>
       <c>handle_gc/4</c> in the module <c>multitrace.erl</c> which can
       be found in the <c>src</c> directory of the Observer application.
       </p>
-    <p>By giving the format handler <c>et</c>, you can have the trace
+    <p>The actual trace message is passed as the second argument (<c>Trace</c>).
+      The possible values of <c>Trace</c> are:</p>
+      <list type="bulleted">
+        <item>all trace messages described in <c>erlang:trace/3</c> documentation,
+        </item>
+        <item><c>{drop, N}</c> if ip tracer is used (see <c>dbg:trace_port/2</c>),
+        </item>
+        <item><c>end_of_trace</c> received once when all trace messages have
+          been processed.</item>
+      </list>
+    <p>By giving the format handler <c>ttb:get_et_handler()</c>, you can have the trace
       log presented graphically with <c>et_viewer</c> in the Event
       Tracer application (see <seealso marker="#et_viewer">Presenting trace logs with Event Tracer</seealso>).
-      </p>
+    </p>
+    <p>You may always decide not to format the whole trace data contained
+      in the fetch directory, but analyze single files instead. In order
+      to do so, a single file (or list of files) have to be passed as
+      the first argument to <c>format/1/2</c>.</p>
     <p>Wrap logs can be formatted one by one or all in one go. To
       format one of the wrap logs in a set, give the exact name of the
       file. To format the whole set of wrap logs, give the name with '*'
@@ -407,7 +569,7 @@ end    </code>
       </p>
     <p>Start tracing:</p>
     <code type="none">
-(tiger@durin)1> ttb:tracer(node(),[{file,{wrap,"trace"}}]).
+(tiger@durin)1> ttb:tracer(node(),{file,{wrap,"trace"}}).
 {ok,[tiger@durin]}
 (tiger@durin)2> ttb:p(...)
 ...    </code>
@@ -443,7 +605,7 @@ ok
         to the User's Guide and Reference Manuals for the <c>et</c>
         application.
         </p>
-      <p>By giving the format handler <c>et</c>, you can have the
+      <p>By giving the format handler <c>ttb:get_et_handler()</c>, you can have the
         trace log presented graphically with <c>et_viewer</c> in the
         Event Tracer application. <c>ttb</c> provides a few different
         filters which can be selected from the Filter menu in the
@@ -495,9 +657,23 @@ ok
         filters respectively, except that each module or function can
         have several vertical lines, one for each process it resides on.
         </p>
-      <p>As an example this module is used, and the function
-        <c>bar:f1()</c> is called from another module <c>foo</c>.</p>
+      <p>In the next example, modules <c>foo</c> and <c>bar</c> are used:</p>
       <code type="none">
+-module(foo).
+-export([start/0,go/0]).
+
+start() ->
+    spawn(?MODULE, go, []).
+
+go() ->
+    receive
+        stop ->
+            ok;
+        go ->
+            bar:f1(),
+            go()
+    end.
+</code><code type="none">
 -module(bar).
 -export([f1/0,f3/0]).
 f1() ->
@@ -506,12 +682,23 @@ f1() ->
 f2() ->
     spawn(?MODULE,f3,[]).
 f3() ->
-    ok.      </code>
-      <p>The <c>call</c> and <c>return_to</c> flags are used, and
-        trace pattern is set on local calls in module <c>bar</c>.
-        </p>
-      <p><c>ttb:format("tiger@durin-ttb", [{handler, et}])</c> gives the
-        following result:
+    ok.</code>
+
+      <p>Now let's set up the trace.</p>
+<code>
+(tiger@durin)1>%%First we retrieve the Pid to limit traced processes set
+(tiger@durin)1>Pid = foo:start().
+(tiger@durin)2>%%Now we set up tracing
+(tiger@durin)2>ttb:tracer().
+(tiger@durin)3>ttb:p(Pid, [call, return_to, procs, set_on_spawn]).
+(tiger@durin)4>ttb:tpl(bar, []).
+(tiger@durin)5>%%Invoke our test function and see output with et viewer
+(tiger@durin)5>Pid ! go.
+(tiger@durin)6>ttb:stop({format, {handler, ttb:get_et_handler()}}).
+</code>
+
+      <p>This shoud render a result similar to the
+        following:
         </p>
       <p></p>
       <image file="et_processes.gif">
@@ -520,25 +707,37 @@ f3() ->
       <image file="et_modsprocs.gif">
         <icaption>Filter: "mods_and_procs"</icaption>
       </image>
+
+      <p>Note, that we can use <c>ttb:start_trace/4</c> function to help
+        us here:</p>
+<code>
+(tiger@durin)1>Pid = foo:start().
+(tiger@durin)2>ttb:start_trace([node()],
+                               [{bar,[]}],
+                               {Pid, [call, return_to, procs, set_on_spawn]}
+                               {handler, ttb:get_et_handler()}).
+(tiger@durin)3>Pid ! go.
+(tiger@durin)4>ttb:stop(format).
+</code>
+
     </section>
   </section>
 
   <section>
     <marker id="fetch_format"></marker>
     <title>Automatically collect and format logs from all nodes</title>
-    <p>If the option <c>fetch</c> is given to the <c>ttb:stop/1</c>
-      function, trace logs and trace information files are fetched
-      from all nodes after tracing is stopped. The logs are stored in a
-      new directory named <c>ttb_upload-Timestamp</c> under the working
-      directory of the trace control node.
+    <p>By default <c>ttb:stop/1</c> fetches  trace logs and
+      trace information files from all nodes. The logs are stored in a
+      new directory named <c>ttb_upload-Filename-Timestamp</c> under the working
+      directory of the trace control node. Fetching may be disabled by
+      providing the <c>nofetch</c> option to <c>ttb:stop/1</c>. User can
+      specify a fetch directory of his choice passing the
+      <c>{fetch_dir, Dir}</c> option.
       </p>
     <p>If the option <c>format</c> is given to <c>ttb:stop/1</c>, the
       trace logs are automatically formatted after tracing is
-      stopped. Note that <c>format</c> also implies <c>fetch</c>,
-      i.e. the trace logs will be collected from all nodes as for the
-      <c>fetch</c> option before they are formatted. All logs in the
-      upload directory are merged during formatting.
-      </p>
+      stopped.
+    </p>
   </section>
 
   <section>
@@ -546,13 +745,18 @@ f3() ->
     <p>For the tracing functionality, <c>dbg</c> could be used instead
       of the <c>ttb</c> for setting trace flags on processes and trace
       patterns for call trace, i.e. the functions <c>p</c>, <c>tp</c>,
-      <c>tpl</c>, <c>ctp</c>, <c>ctpl</c> and <c>ctpg</c>. The only
-      thing added by <c>ttb</c> for these functions is that all calls
-      are stored in the history buffer and can be recalled and stored in
-      a configuration file. This makes it easy to setup the same trace
-      environment e.g. if you want to compare two test runs. It also
-      reduces the amount of typing when using <c>ttb</c> from the erlang
-      shell.
+      <c>tpl</c>, <c>ctp</c>, <c>ctpl</c> and <c>ctpg</c>. There are only
+      two things added by <c>ttb</c> for these functions:
+      <list type="bulleted">
+        <item>all calls  are stored in the history buffer and can be
+          recalled and stored in a configuration file. This makes it
+          easy to setup the same trace environment e.g. if you want to
+          compare two test runs. It also reduces the amount of
+          typing when using <c>ttb</c> from the erlang shell;</item>
+        <item>shortcuts are provided for the most common match
+          specifications (in order not to force the user to use
+          <c>dbg:fun2ms</c> continually</item>).
+      </list>
       </p>
     <p>Use <c>list_history/0</c> to see the content of the history
       buffer, and <c>run_history/1</c> to re-execute one of the entries.
@@ -574,7 +778,8 @@ f3() ->
       selected entries from the history by calling
       <c>ttb:write_config(ConfigFile,NumList)</c>, where
       <c>NumList</c> is a list of integers pointing out the history
-      entries to write.
+      entries to write. Moreover, the history buffer is always dumped
+      to <c>ttb_last_config</c> when <c>ttb:stop/0/1</c> is called.
       </p>
     <p>User defined entries can also be written to a config file by
       calling the function
@@ -720,9 +925,7 @@ ok
 {ok,[{matched,1},{saved,1}]}
 (tiger@durin)113> dbg:get_tracer(), seq_trace:reset_trace().         
 true
-(tiger@durin)114> ttb:stop().                                       
-ok
-(tiger@durin)115> ttb:format("tiger@durin-ttb").                    
+(tiger@durin)114> ttb:stop(format).
 ({<0.158.0>,{shell,evaluator,3},tiger@durin}) call dbg:get_tracer()
 SeqTrace [0]: ({<0.158.0>,{shell,evaluator,3},tiger@durin}) 
 {<0.237.0>,dbg,tiger@durin} ! {<0.158.0>,{get_tracer,tiger@durin}} 
@@ -743,9 +946,7 @@ ok
 (tiger@durin)117> seq_trace:set_token(send,true), dbg:get_tracer(), 
 seq_trace:reset_trace().
 true
-(tiger@durin)118> ttb:stop().
-ok
-(tiger@durin)119> ttb:format("tiger@durin-ttb").
+(tiger@durin)118> ttb:stop(format).
 SeqTrace [0]: ({<0.158.0>,{shell,evaluator,3},tiger@durin}) 
 {<0.246.0>,dbg,tiger@durin} ! {<0.158.0>,{get_tracer,tiger@durin}} 
 [Serial: {0,1}]
diff --git a/lib/observer/src/ttb.erl b/lib/observer/src/ttb.erl
index 221b71df6a..072aa165e7 100644
--- a/lib/observer/src/ttb.erl
+++ b/lib/observer/src/ttb.erl
@@ -18,9 +18,11 @@
 %%
 -module(ttb).
 -author('[email protected]').
+-author('[email protected]').
 
 %% API
--export([tracer/0,tracer/1,tracer/2,p/2,stop/0,stop/1]).
+-export([tracer/0,tracer/1,tracer/2,p/2,stop/0,stop/1,start_trace/4]).
+-export([get_et_handler/0]).
 -export([tp/2, tp/3, tp/4, ctp/0, ctp/1, ctp/2, ctp/3, tpl/2, tpl/3, tpl/4, 
 	 ctpl/0, ctpl/1, ctpl/2, ctpl/3, ctpg/0, ctpg/1, ctpg/2, ctpg/3]).
 -export([seq_trigger_ms/0,seq_trigger_ms/1]).
@@ -34,24 +36,38 @@
 
 -include_lib("kernel/include/file.hrl").
 -define(meta_time,5000).
+-define(fetch_time, 10000).
 -define(history_table,ttb_history_table).
 -define(seq_trace_flags,[send,'receive',print,timestamp]).
--define(upload_dir,"ttb_upload").
+-define(upload_dir(Logname),"ttb_upload_"++Logname).
+-define(last_config, "ttb_last_config").
+-define(partial_dir, "ttb_partial_result").
 -ifdef(debug).
--define(get_status,;get_status -> erlang:display(dict:to_list(NodeInfo)),loop(NodeInfo)).
+-define(get_status,;get_status -> erlang:display(dict:to_list(NodeInfo),loop(NodeInfo, TraceInfo)).
 -else.
 -define(get_status,).
 -endif.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Shortcut
+start_trace(Nodes, Patterns, {Procs, Flags}, Options) ->
+    {ok, _} = tracer(Nodes, Options),
+    [{ok, _} = apply(?MODULE, tpl, tuple_to_list(Args)) || Args <- Patterns],
+    {ok, _} = p(Procs, Flags).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Open a trace port on all given nodes and create the meta data file
 tracer() -> tracer(node()).
+tracer(shell) -> tracer(node(), shell);
+tracer(dbg) -> tracer(node(), {shell, only});
 tracer(Nodes) -> tracer(Nodes,[]).
 tracer(Nodes,Opt) ->
-    start(),
-    store(tracer,[Nodes,Opt]),
     {PI,Client,Traci} = opt(Opt),
-    do_tracer(Nodes,PI,Client,Traci).
+    %%We use initial Traci as SessionInfo for loop/2
+    Pid = start(Traci),
+    store(tracer,[Nodes,Opt]),
+    do_tracer(Nodes,PI,Client,[{ttb_control, Pid}|Traci]).
 
 do_tracer(Nodes0,PI,Client,Traci) ->
     Nodes = nods(Nodes0),
@@ -59,9 +75,14 @@ do_tracer(Nodes0,PI,Client,Traci) ->
     do_tracer(Clients,PI,Traci).
 
 do_tracer(Clients,PI,Traci) ->
+    ShellOutput = proplists:get_value(shell, Traci, false),
     {ClientSucc,Succ} = 
 	lists:foldl(
 	  fun({N,{local,File},TF},{CS,S}) -> 
+                  TF2 = case ShellOutput of
+                            only -> none;
+                            _    -> TF
+                        end,
 		  [_Sname,Host] = string:tokens(atom_to_list(N),"@"),
 		  case catch dbg:tracer(N,port,dbg:trace_port(ip,0)) of
 		      {ok,N} ->
@@ -69,8 +90,8 @@ do_tracer(Clients,PI,Traci) ->
 			  {ok,T} = dbg:get_tracer(N),
 			  rpc:call(N,seq_trace,set_system_tracer,[T]),
 			  dbg:trace_client(ip,{Host,Port},
-					   {fun ip_to_file/2,{file,File}}),
-			  {[{N,{local,File,Port},TF}|CS], [N|S]};
+					   {fun ip_to_file/2,{{file,File}, ShellOutput}}),
+			  {[{N,{local,File,Port},TF2}|CS], [N|S]};
 		      Other ->
 			  display_warning(N,{cannot_open_ip_trace_port,
 					     Host,
@@ -98,17 +119,54 @@ do_tracer(Clients,PI,Traci) ->
 	    {ok,Succ}
     end.
 
+opt(Opt) when is_list(Opt) ->
+    opt(Opt,{true,?MODULE,[]});
 opt(Opt) ->
-    opt(Opt,{true,?MODULE,[]}).
+    opt([Opt]).
 
 opt([{process_info,PI}|O],{_,Client,Traci}) ->
     opt(O,{PI,Client,Traci});
 opt([{file,Client}|O],{PI,_,Traci}) ->
-    opt(O,{PI,Client,Traci});
+    opt(O,{PI,Client,[{logfile,get_logname(Client)}|Traci]});
 opt([{handler,Handler}|O],{PI,Client,Traci}) ->
     opt(O,{PI,Client,[{handler,Handler}|Traci]});
+opt([{timer, {MSec, StopOpts}}|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{timer,{MSec, StopOpts}}|Traci]});
+opt([{timer, MSec}|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{timer,{MSec, []}}|Traci]});
+opt([{overload_check, {MSec,M,F}}|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{overload_check,{MSec,M,F}}|Traci]});
+opt([shell|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{shell, true}|Traci]});
+opt([{shell,Type}|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{shell, Type}|Traci]});
+opt([resume|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{resume, {true, ?fetch_time}}|Traci]});
+opt([{resume,MSec}|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{resume, {true, MSec}}|Traci]});
+opt([{flush,MSec}|O],{PI,Client,Traci}) ->
+    opt(O,{PI,Client,[{flush, MSec}|Traci]});
 opt([],Opt) ->
-    Opt.
+    ensure_opt(Opt).
+
+ensure_opt({PI,Client,Traci}) ->
+    case {proplists:get_value(flush, Traci), Client} of
+        {undefined, _}  -> ok;
+        {_, {local, _}} -> exit(flush_unsupported_with_ip_trace_port);
+        {_,_}           -> ok
+    end,
+    NeedIpTracer = proplists:get_value(shell, Traci, false) /= false,
+    case {NeedIpTracer, Client} of
+        {false, _}        -> {PI, Client, Traci};
+        {true, ?MODULE}       -> {PI, {local, ?MODULE}, Traci};
+        {true, {local, File}} -> {PI, {local, File}, Traci};
+        {true, _}             -> exit(local_client_required_on_shell_tracing)
+    end.
+
+get_logname({local, F}) -> get_logname(F);
+get_logname({wrap, F}) -> filename:basename(F);
+get_logname({wrap, F, _, _}) -> filename:basename(F);
+get_logname(F) -> filename:basename(F).
 
 nods(all) ->
     Nodes1 = remove_active([node()|nodes()]),
@@ -205,17 +263,29 @@ run_history([H|T]) ->
 	ok -> run_history(T);
 	{error,not_found} -> {error,{not_found,H}}
     end;
+
+run_history(all) ->
+    CurrentHist = ets:tab2list(?history_table),
+    ets:delete_all_objects(?history_table),
+    [run_printed(MFA,true) || {_, MFA} <- CurrentHist];
+run_history(all_silent) ->
+    CurrentHist = ets:tab2list(?history_table),
+    ets:delete_all_objects(?history_table),
+    [run_printed(MFA,false) || {_, MFA} <- CurrentHist];
 run_history([]) ->
     ok;
 run_history(N) ->
     case catch ets:lookup(?history_table,N) of
 	[{N,{M,F,A}}] -> 
-	    print_func(M,F,A),
-	    R = apply(M,F,A),
-	    print_result(R);
+            run_printed({M,F,A},true);
 	_ -> 
 	    {error, not_found}
     end.
+
+run_printed({M,F,A},Verbose) ->
+    Verbose andalso print_func(M,F,A),
+    R = apply(M,F,A),
+    Verbose andalso print_result(R).
 	
 write_config(ConfigFile,all) ->
     write_config(ConfigFile,['_']);
@@ -223,6 +293,8 @@ write_config(ConfigFile,Config) ->
     write_config(ConfigFile,Config,[]).
 write_config(ConfigFile,all,Opt) ->
     write_config(ConfigFile,['_'],Opt);
+write_config(ConfigFile,Config,Opt) when not(is_list(Opt)) ->
+    write_config(ConfigFile,Config,[Opt]);
 write_config(ConfigFile,Nums,Opt) when is_list(Nums), is_integer(hd(Nums)); 
 				       Nums=:=['_'] ->
     F = fun(N) -> ets:select(?history_table,
@@ -313,6 +385,7 @@ arg_list([A1|A],Acc) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Set trace flags on processes
 p(Procs0,Flags0) ->
+    ensure_no_overloaded_nodes(),
     store(p,[Procs0,Flags0]),
     no_store_p(Procs0,Flags0).
 no_store_p(Procs0,Flags0) ->
@@ -327,11 +400,12 @@ no_store_p(Procs0,Flags0) ->
 					     {error,Reason} -> 
 						 display_warning(P,Reason),
 						 {PMatched,Ps}
-					 end
+						     end
 			     end,{[],[]},Procs) of
 		{[],[]} -> {error, no_match};
 		{SuccMatched,Succ} ->
 		    no_store_write_trace_info(flags,{Succ,Flags}),
+		    ?MODULE ! trace_started,
 		    {ok,SuccMatched}
 	    end
     end.
@@ -339,7 +413,7 @@ no_store_p(Procs0,Flags0) ->
 transform_flags([clear]) ->
     [clear];
 transform_flags(Flags) ->
-    dbg:transform_flags(Flags).
+    dbg:transform_flags([timestamp | Flags]).
 
 
 procs(Procs) when is_list(Procs) ->
@@ -365,24 +439,30 @@ proc({global,Name}) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Trace pattern
 tp(A,B) ->
-    store(tp,[A,B]),
-    dbg:tp(A,B).
+    ensure_no_overloaded_nodes(),
+    store(tp,[A,ms(B)]),
+    dbg:tp(A,ms(B)).
 tp(A,B,C) ->
-    store(tp,[A,B,C]),
-    dbg:tp(A,B,C).
+    ensure_no_overloaded_nodes(),
+    store(tp,[A,B,ms(C)]),
+    dbg:tp(A,B,ms(C)).
 tp(A,B,C,D) ->
-    store(tp,[A,B,C,D]),
-    dbg:tp(A,B,C,D).
+    ensure_no_overloaded_nodes(),
+    store(tp,[A,B,C,ms(D)]),
+    dbg:tp(A,B,C,ms(D)).
 
 tpl(A,B) ->
-    store(tpl,[A,B]),
-    dbg:tpl(A,B).
+    ensure_no_overloaded_nodes(),
+    store(tpl,[A,ms(B)]),
+    dbg:tpl(A,ms(B)).
 tpl(A,B,C) ->
-    store(tpl,[A,B,C]),
-    dbg:tpl(A,B,C).
+    ensure_no_overloaded_nodes(),
+    store(tpl,[A,B,ms(C)]),
+    dbg:tpl(A,B,ms(C)).
 tpl(A,B,C,D) ->
-    store(tpl,[A,B,C,D]),
-    dbg:tpl(A,B,C,D).
+    ensure_no_overloaded_nodes(),
+    store(tpl,[A,B,C,ms(D)]),
+    dbg:tpl(A,B,C,ms(D)).
 
 ctp() ->
     store(ctp,[]),
@@ -423,6 +503,56 @@ ctpg(A,B,C) ->
     store(ctpg,[A,B,C]),
     dbg:ctpg(A,B,C).
 
+ms(return) ->
+    [{'_',[],[{return_trace}]}];
+ms(caller) ->
+    [{'_',[],[{message,{caller}}]}];
+ms({codestr, FunStr}) ->
+    {ok, MS} = string2ms(FunStr),
+    MS;
+ms(Other) ->
+    Other.
+
+ensure_no_overloaded_nodes() ->
+    Overloaded = case whereis(?MODULE) of
+                     undefined ->
+                         [];
+                     _ ->
+                         ?MODULE ! {get_overloaded, self()},
+                         receive O -> O end
+                 end,
+    case Overloaded of
+        [] -> ok;
+        Overloaded -> exit({error, overload_protection_active, Overloaded})
+    end.
+
+-spec string2ms(string()) -> {ok, list()} | {error, fun_format}.
+string2ms(FunStr) ->
+    case erl_scan:string(fix_dot(FunStr)) of
+	{ok, Tokens, _} ->
+	    case erl_parse:parse_exprs(Tokens) of
+		{ok, [Expression]} ->
+		    case Expression of
+			{_, _, {clauses, Clauses}} ->
+			    {ok, ms_transform:transform_from_shell(dbg, Clauses, [])};
+			_ ->
+			    {error, fun_format}
+		    end;
+		_ ->
+		    {error, fun_format}
+	    end;
+	_ ->{error, fun_format}
+    end.
+
+-spec fix_dot(string()) -> string().
+fix_dot(FunStr) ->
+    [H | Rest]  = lists:reverse(FunStr),
+    case H of
+	$. ->
+	    FunStr;
+	H ->
+	    lists:reverse([$., H | Rest])
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Support for sequential trace
@@ -457,66 +587,109 @@ no_store_write_trace_info(Key,What) ->
 %%% Stop tracing on all nodes
 stop() ->
     stop([]).
-stop(Opts) ->
+stop(Opts) when is_list(Opts) ->
     Fetch = stop_opts(Opts),
-    case whereis(?MODULE) of
-	undefined -> ok;
-	Pid when is_pid(Pid) -> 
-	    ?MODULE ! {stop,Fetch,self()},
-	    receive {?MODULE,stopped} -> ok end
+    Result =
+        case whereis(?MODULE) of
+            undefined -> ok;
+            Pid when is_pid(Pid) ->
+                ?MODULE ! {stop,Fetch,self()},
+                receive {?MODULE,R} -> R end
+        end,
+    case {Fetch, Result} of
+        {nofetch, _} ->
+            ok;
+        {_, {stopped, _}} ->
+            %% Printout moved out of the ttb loop to avoid occasional deadlock
+            io:format("Stored logs in ~s~n", [element(2, Result)]);
+        {_, _} ->
+            ok
     end,
-    stopped.
+    stop_return(Result,Opts);
+stop(Opts) ->
+    stop([Opts]).
 
 stop_opts(Opts) ->
-    case lists:member(format,Opts) of
-	true -> 
-	    format; % format implies fetch
-	false -> 
-	    case lists:member(fetch,Opts) of
-		true -> fetch;
-		false -> nofetch
-	    end
+    FetchDir = proplists:get_value(fetch_dir, Opts),
+    ensure_fetch_dir(FetchDir),
+    FormatData = case proplists:get_value(format, Opts) of
+                     undefined -> false;
+                     true ->      {format, []};
+                     FOpts ->     {format, FOpts}
+                 end,
+    case {FormatData, lists:member(return_fetch_dir, Opts)} of
+	{false, true} ->
+	    {fetch, FetchDir}; % if we specify return_fetch_dir, the data should be fetched
+    {false, false} ->
+	    case lists:member(nofetch,Opts) of
+		    false -> {fetch, FetchDir};
+		    true -> nofetch
+	    end;
+    {FormatData, _} ->
+            {FormatData, FetchDir}
+    end.
+
+ensure_fetch_dir(undefined) -> ok;
+ensure_fetch_dir(Dir) ->
+    case filelib:is_file(Dir) of
+	true ->
+	    throw({error, exists, Dir});
+	false ->
+	   ok
+    end.
+
+stop_return(R,Opts) ->
+    case {lists:member(return_fetch_dir,Opts),R} of
+        {true,_} ->
+            R;
+        {false,{stopped,_}} ->
+            stopped;
+        {false,_} ->
+            %% Anything other than 'stopped' would not be bw compatible...
+            stopped
     end.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Process implementation
-start() ->
+start(SessionInfo) ->
     case whereis(?MODULE) of
 	undefined ->
 	    Parent = self(),
-	    Pid = spawn(fun() -> init(Parent) end),
-	    receive {started,Pid} -> ok end;
+	    Pid = spawn(fun() -> init(Parent, SessionInfo) end),
+	    receive {started,Pid} -> ok end,
+            Pid;
 	Pid when is_pid(Pid) ->
-	    ok
+	    Pid
     end.
 
-
-init(Parent) ->
+init(Parent, SessionInfo) ->
     register(?MODULE,self()),
     ets:new(?history_table,[ordered_set,named_table,public]),
     Parent ! {started,self()},
-    loop(dict:new()).
+    NewSessionInfo = [{partials, 0}, {dead_nodes, []} | SessionInfo],
+    try_send_flush_tick(NewSessionInfo),
+    loop(dict:new(), NewSessionInfo).
 
-loop(NodeInfo) ->
+loop(NodeInfo, SessionInfo) ->
     receive 
 	{init_node,Node,MetaFile,PI,Traci} ->
 	    erlang:monitor_node(Node,true),
-	    MetaPid = 
+	    {AbsoluteMetaFile, MetaPid} =
 		case rpc:call(Node,
 			      observer_backend,
 			      ttb_init_node,
 			      [MetaFile,PI,Traci]) of
-		    {ok,MP} ->
-			MP;
+		    {ok,MF,MP} ->
+			{MF,MP};
 		    {badrpc,nodedown} ->
 			%% We will get a nodedown message
-			undefined
+			{MetaFile,undefined}
 		end,
-	    loop(dict:store(Node,{MetaFile,MetaPid},NodeInfo));
+	    loop(dict:store(Node,{AbsoluteMetaFile,MetaPid},NodeInfo), SessionInfo);
 	{get_nodes,Sender} ->
 	    Sender ! {?MODULE,dict:fetch_keys(NodeInfo)},
-	    loop(NodeInfo);
+	    loop(NodeInfo, SessionInfo);
 	{write_trace_info,Key,What} ->
 	    dict:fold(fun(Node,{_MetaFile,MetaPid},_) -> 
 			      rpc:call(Node,observer_backend,
@@ -524,55 +697,121 @@ loop(NodeInfo) ->
 		      end,
 		      ok,
 		      NodeInfo),
-	    loop(NodeInfo);
+	    loop(NodeInfo, SessionInfo);
 	{nodedown,Node} ->
-	    loop(dict:erase(Node,NodeInfo));
-	{stop,nofetch,Sender} ->
-	    dict:fold(
-	      fun(Node,{_,MetaPid},_) -> 
-		      rpc:call(Node,observer_backend,ttb_stop,[MetaPid])
-	      end,
-	      ok,
-	      NodeInfo),
-	    dbg:stop_clear(),
-	    ets:delete(?history_table),
-	    Sender ! {?MODULE,stopped};
-	{stop,FetchOrFormat,Sender} ->
-	    Localhost = host(node()),
-	    Dir = ?upload_dir++ts(),
- 	    file:make_dir(Dir),
-	    %% The nodes are traversed twice here because
-	    %% the meta tracing in observer_backend must be
-	    %% stopped before dbg is stopped, and dbg must
-	    %% be stopped before the trace logs are moved orelse
-	    %% windows complains.
-	    AllNodesAndMeta = 
-		dict:fold(
-		  fun(Node,{MetaFile,MetaPid},Nodes) -> 
-			  rpc:call(Node,observer_backend,ttb_stop,[MetaPid]),
-			  [{Node,MetaFile}|Nodes]
-		  end,
-		  [],
-		  NodeInfo),
-	    dbg:stop_clear(),
-	    AllNodes = 
-		lists:map(
-		  fun({Node,MetaFile}) ->
-			  spawn(fun() -> fetch(Localhost,Dir,Node,MetaFile) end),
-			  Node
-		  end,
-		  AllNodesAndMeta),
-	    ets:delete(?history_table),
-	    wait_for_fetch(AllNodes),
-	    io:format("Stored logs in ~s~n",[filename:absname(Dir)]),
-	    case FetchOrFormat of
-		format -> format(Dir);
-		fetch -> ok
+            NewState = make_node_dead(Node, NodeInfo, SessionInfo),
+	    loop(dict:erase(Node,NodeInfo), NewState);
+        {noderesumed,Node,Reporter} ->
+            {MetaFile, CurrentSuffix, NewState} = make_node_alive(Node, SessionInfo),
+            fetch_partial_result(Node, MetaFile, CurrentSuffix),
+            spawn(fun() -> resume_trace(Reporter) end),
+            loop(NodeInfo, NewState);
+	{timeout, StopOpts} ->
+	    spawn(?MODULE, stop, [StopOpts]),
+	    loop(NodeInfo, SessionInfo);
+        {node_overloaded, Node} ->
+            io:format("Overload check activated on node: ~p.~n", [Node]),
+            {Overloaded, SI} = {proplists:get_value(overloaded, SessionInfo, []),
+                                lists:keydelete(overloaded, 1, SessionInfo)},
+	    loop(NodeInfo, [{overloaded, [Node|Overloaded]} | SI]);
+        {get_overloaded, Pid} ->
+            Pid ! proplists:get_value(overloaded, SessionInfo, []),
+            loop(NodeInfo, SessionInfo);
+	trace_started ->
+	    case proplists:get_value(timer, SessionInfo) of
+		undefined -> ok;
+		{MSec, StopOpts}  -> erlang:send_after(MSec, self(), {timeout, StopOpts})
 	    end,
-	    Sender ! {?MODULE,stopped}
-         ?get_status
+	    loop(NodeInfo, SessionInfo);
+        flush_timeout ->
+            [ dbg:flush_trace_port(Node) || Node <- dict:fetch_keys(NodeInfo) ],
+            try_send_flush_tick(SessionInfo),
+            loop(NodeInfo, SessionInfo);
+	{stop,nofetch,Sender} ->
+            do_stop(nofetch, Sender, NodeInfo, SessionInfo);
+	{stop,FetchSpec,Sender} ->
+            case proplists:get_value(shell, SessionInfo, false) of
+                only -> do_stop(nofetch, Sender, NodeInfo, SessionInfo);
+                _    -> do_stop(FetchSpec, Sender, NodeInfo, SessionInfo)
+            end
+    end.
+
+do_stop(nofetch, Sender, NodeInfo, _) ->
+    write_config(?last_config, all),
+    dict:fold(
+      fun(Node,{_,MetaPid},_) ->
+              rpc:call(Node,observer_backend,ttb_stop,[MetaPid])
+      end,
+      ok,
+      NodeInfo),
+    dbg:stop_clear(),
+    ets:delete(?history_table),
+    Sender ! {?MODULE, stopped};
+
+do_stop({FetchOrFormat, UserDir}, Sender, NodeInfo, SessionInfo) ->
+    write_config(?last_config, all),
+    Localhost = host(node()),
+    Dir = get_fetch_dir(UserDir, proplists:get_value(logfile, SessionInfo)),
+    file:make_dir(Dir),
+    %% The nodes are traversed twice here because
+    %% the meta tracing in observer_backend must be
+    %% stopped before dbg is stopped, and dbg must
+    %% be stopped before the trace logs are moved orelse
+    %% windows complains.
+    AllNodesAndMeta =
+        dict:fold(
+          fun(Node,{MetaFile,MetaPid},Nodes) ->
+                  rpc:call(Node,observer_backend,ttb_stop,[MetaPid]),
+                  [{Node,MetaFile}|Nodes]
+          end,
+          [],
+          NodeInfo),
+    dbg:stop_clear(),
+    AllNodes =
+        lists:map(
+          fun({Node,MetaFile}) ->
+                  spawn(fun() -> fetch_report(Localhost,Dir,Node,MetaFile) end),
+                  Node
+          end,
+          AllNodesAndMeta),
+    ets:delete(?history_table),
+    wait_for_fetch(AllNodes),
+    copy_partials(Dir, proplists:get_value(partials, SessionInfo)),
+    Absname = filename:absname(Dir),
+    case FetchOrFormat of
+        fetch -> ok;
+        {format, Opts} -> format(Dir, Opts)
+    end,
+    Sender ! {?MODULE,{stopped,Absname}}.
+
+make_node_dead(Node, NodeInfo, SessionInfo) ->
+    {MetaFile,_} = dict:fetch(Node, NodeInfo),
+    NewDeadNodes = [{Node, MetaFile} | proplists:get_value(dead_nodes, SessionInfo)],
+    [{dead_nodes, NewDeadNodes} | lists:keydelete(dead_nodes, 1, SessionInfo)].
+
+make_node_alive(Node, SessionInfo) ->
+            DeadNodes = proplists:get_value(dead_nodes, SessionInfo),
+            Partials = proplists:get_value(partials, SessionInfo),
+            {value, {_, MetaFile}, Dn2} = lists:keytake(Node, 1, DeadNodes),
+            SessionInfo2 = lists:keyreplace(dead_nodes, 1, SessionInfo, {dead_nodes, Dn2}),
+            {MetaFile, Partials + 1, lists:keyreplace(partials, 1, SessionInfo2, {partials, Partials + 1})}.
+
+try_send_flush_tick(State) ->
+    case proplists:get_value(flush, State) of
+        undefined ->
+            ok;
+        MSec ->
+            erlang:send_after(MSec, self(), flush_timeout)
     end.
 
+get_fetch_dir(undefined,undefined) -> ?upload_dir(?MODULE_STRING) ++ ts();
+get_fetch_dir(undefined,Logname) -> ?upload_dir(Logname) ++ ts();
+get_fetch_dir(Dir,_) -> Dir.
+
+resume_trace(Reporter) ->
+    ?MODULE:run_history(all_silent),
+    Reporter ! trace_resumed.
+
 get_nodes() ->
     ?MODULE ! {get_nodes,self()},
     receive {?MODULE,Nodes} -> Nodes end.
@@ -582,19 +821,40 @@ ts() ->
     io_lib:format("-~4.4.0w~2.2.0w~2.2.0w-~2.2.0w~2.2.0w~2.2.0w",
 		  [Y,M,D,H,Min,S]).
 
+copy_partials(_, 0) ->
+    ok;
+copy_partials(Dir, Num) ->
+    PartialDir = ?partial_dir ++ integer_to_list(Num),
+    file:rename(PartialDir, filename:join(Dir,PartialDir)),
+    copy_partials(Dir, Num - 1).
+
+fetch_partial_result(Node,MetaFile,Current) ->
+    DirName = ?partial_dir ++ integer_to_list(Current),
+    case file:list_dir(DirName) of
+        {error, enoent} ->
+            ok;
+        {ok, Files} ->
+            [ file:delete(filename:join(DirName, File)) || File <- Files ],
+            file:del_dir(DirName)
+    end,
+    file:make_dir(DirName),
+    fetch(host(node()), DirName, Node, MetaFile).
 
+fetch_report(Localhost, Dir, Node, MetaFile) ->
+    fetch(Localhost,Dir,Node,MetaFile),
+    ?MODULE ! {fetch_complete,Node}.
 
 fetch(Localhost,Dir,Node,MetaFile) ->
-    case host(Node) of
-	Localhost -> % same host, just move the files
-	    Files = rpc:call(Node,observer_backend,ttb_get_filenames,[MetaFile]),
+    case (host(Node) == Localhost) orelse is_local(MetaFile) of
+    true -> % same host, just move the files
+	    Files = get_filenames(Node,MetaFile),
 	    lists:foreach(
-	      fun(File0) ->
-		      File = filename:join(Dir,filename:basename(File0)),
-		      file:rename(File0,File)
-	      end,
-	      Files);
-	_Otherhost ->
+            fun(File0) ->
+                Dest = filename:join(Dir,filename:basename(File0)),
+                file:rename(File0, Dest)
+            end,
+        Files);
+	false ->
 	    {ok, LSock} = gen_tcp:listen(0, [binary,{packet,2},{active,false}]),
 	    {ok,Port} = inet:port(LSock),
 	    rpc:cast(Node,observer_backend,ttb_fetch,
@@ -603,8 +863,17 @@ fetch(Localhost,Dir,Node,MetaFile) ->
 	    receive_files(Dir,Sock,undefined),
 	    ok = gen_tcp:close(LSock),
 	    ok = gen_tcp:close(Sock)
-    end,
-    ?MODULE ! {fetch_complete,Node}.
+    end.
+
+is_local({local, _, _}) ->
+    true;
+is_local(_) ->
+    false.
+
+get_filenames(_N, {local,F,_}) ->
+    observer_backend:ttb_get_filenames(F);
+get_filenames(N, F) ->
+    rpc:call(N, observer_backend,ttb_get_filenames,[F]).
 
 receive_files(Dir,Sock,Fd) ->
     case gen_tcp:recv(Sock, 0) of
@@ -646,9 +915,16 @@ wait_for_fetch(Nodes) ->
 %%% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 write_info(Nodes,PI,Traci) ->
-    lists:foreach(fun({N,{local,C,_},F}) -> 
-			  MetaFile = F ++ ".ti",
-			  file:delete(MetaFile),
+    {ok, Cwd} = file:get_cwd(),
+    lists:foreach(fun({N,{local,C,_},F}) ->
+			  MetaFile = case F of
+                                         none ->
+                                             none;
+                                         F ->
+                                             AbsFile = filename:join(Cwd, F) ++ ".ti",
+                                             file:delete(AbsFile),
+                                             AbsFile
+                                     end,
 			  Traci1 = [{node,N},{file,C}|Traci],
 			  {ok,Port} = dbg:get_tracer(N),
 			  ?MODULE ! 
@@ -662,38 +938,35 @@ write_info(Nodes,PI,Traci) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Format binary trace logs
+get_et_handler() ->
+    {fun ttb_et:handler/4, initial}.
+
 format(Files) ->
     format(Files,[]).
 format(Files,Opt) ->
-    {Out,Handler} = format_opt(Opt),
+    {Out,Handler,DisableSort} = format_opt(Opt),
     ets:new(?MODULE,[named_table]),
-    format(Files,Out,Handler).
-format(File,Out,Handler) when is_list(File), is_integer(hd(File)) ->
+    format(Files,Out,Handler, DisableSort).
+format(File,Out,Handler,DisableSort) when is_list(File), is_integer(hd(File)) ->
     Files = 
 	case filelib:is_dir(File) of
 	    true ->  % will merge all files in the directory
-		MetaFiles = filelib:wildcard(filename:join(File,"*.ti")),
-		lists:map(fun(M) ->
-				  Sub = string:left(M,length(M)-3),
-				  case filelib:is_file(Sub) of
-				      true -> Sub;
-				      false -> Sub++".*.wrp"
-				  end
-			  end,
-			  MetaFiles);
+                List = filelib:wildcard(filename:join(File, ?partial_dir++"*")),
+                lists:append(collect_files([File | List]));
 	    false -> % format one file
 		[File]
 	end,
-    format(Files,Out,Handler);
-format(Files,Out,Handler) when is_list(Files), is_list(hd(Files)) ->
+    format(Files,Out,Handler,DisableSort);
+format(Files,Out,Handler,DisableSort) when is_list(Files), is_list(hd(Files)) ->
     StopDbg = case whereis(dbg) of
 		  undefined -> true;
 		  _ -> false
 	      end,
-    Details = lists:foldl(fun(File,Acc) -> [prepare(File,Handler)|Acc] end,
+    Details = lists:foldl(fun(File,Acc) -> [prepare(File)|Acc] end,
 			  [],Files),
     Fd = get_fd(Out),
-    R = do_format(Fd,Details),
+    RealHandler = get_handler(Handler, Files),
+    R = do_format(Fd,Details,DisableSort,RealHandler),
     file:close(Fd),
     ets:delete(?MODULE),
     case StopDbg of
@@ -702,7 +975,30 @@ format(Files,Out,Handler) when is_list(Files), is_list(hd(Files)) ->
     end,
     R.
 
-prepare(File,Handler) ->
+collect_files(Dirs) ->
+    lists:map(fun(Dir) ->
+                      MetaFiles = filelib:wildcard(filename:join(Dir,"*.ti")),
+                      lists:map(fun(M) ->
+                                        Sub = string:left(M,length(M)-3),
+                                        case filelib:is_file(Sub) of
+                                            true -> Sub;
+                                            false -> Sub++".*.wrp"
+                                        end
+                                end,
+                                MetaFiles)
+              end, Dirs).
+
+get_handler(undefined, Files) ->
+    %%We retrieve traci from the first available file
+    {Traci, _} = read_traci(hd(Files)),
+    case dict:find(handler, Traci) of
+        error             -> {fun defaulthandler/4, initial};
+        {ok, [Handler]}   -> Handler
+    end;
+get_handler(Handler, _) ->
+    Handler.
+
+prepare(File) ->
     {Traci,Proci} = read_traci(File),
     Node = get_node(Traci),
     lists:foreach(fun({Pid,PI}) ->
@@ -714,19 +1010,21 @@ prepare(File,Handler) ->
 			  ets:insert(?MODULE,{Pid,PI,Node})
 		  end,Proci),
     FileOrWrap = get_file(File,Traci),
-    Handler1 = get_handler(Handler,Traci),
-    {FileOrWrap,Traci,Handler1}.
+    {FileOrWrap,Traci}.
 
-format_opt(Opt) ->
+format_opt(Opt) when is_list(Opt) ->
     Out = case lists:keysearch(out,1,Opt) of
 	      {value,{out,O}} -> O;
 	      _ -> standard_io
 	  end,
     Handler = case lists:keysearch(handler,1,Opt) of
-	      {value,{handler,H}} -> H;
-	      _ -> undefined
+                  {value,{handler,H}} -> H;
+                  _ -> undefined
 	  end,
-    {Out,Handler}.
+    DisableSort = proplists:get_value(disable_sort, Opt, false),
+    {Out,Handler,DisableSort};
+format_opt(Opt) ->
+    format_opt([Opt]).
 
 
 read_traci(File) ->
@@ -800,75 +1098,61 @@ check_client(Client,File) when is_tuple(Client),element(2,Client)==wrap ->
 check_exists(File) ->
     case file:read_file_info(File) of
 	{ok,#file_info{type=regular}} -> File;
-	_ -> 
+	_ ->
 	    exit({error,no_file})
     end.
-	
 
-get_handler(Handler,Traci) ->
-    case Handler of
-	undefined -> 
-	    case dict:find(handler,Traci) of
-		{ok,[H]} -> H;
-		error -> undefined
-	    end;
-	_ ->
-	    Handler
-    end.
 
-do_format(Fd,Details) ->
-    Clients = lists:foldl(fun({FileOrWrap,Traci,Handler},Acc) ->
-				  [start_client(FileOrWrap,Traci,Handler)
-				   |Acc]
+do_format(Fd,Details,DisableSort,Handler) ->
+    Clients = lists:foldl(fun({FileOrWrap,Traci},Acc) ->
+                                  [start_client(FileOrWrap,Traci)|Acc]
 			  end,[],Details),
-    init_collector(Fd,Clients).
-
-
-start_client(FileOrWrap,Traci,et) ->
-    dbg:trace_client(file, FileOrWrap, 
-		     {fun handler/2, 
-		      {dict:to_list(Traci),{{ttb_et,handler},initial}}});
-start_client(FileOrWrap,Traci,undefined) ->
-    dbg:trace_client(file, FileOrWrap, 
-		     {fun handler/2, 
-		      {dict:to_list(Traci),{fun defaulthandler/4,initial}}});
-start_client(FileOrWrap,Traci,Handler) ->
-    dbg:trace_client(file, FileOrWrap, 
-		     {fun handler/2, {dict:to_list(Traci),Handler}}).
-
-handler(Trace,State) ->
-    %% State here is only used for the initial state. The accumulated
-    %% State is maintained by collector!!!
-    receive 
-	{get,Collector} -> Collector ! {self(),{Trace,State}};
+    init_collector(Fd,Clients,DisableSort,Handler).
+
+start_client(FileOrWrap,Traci) ->
+    dbg:trace_client(file, FileOrWrap,
+		     {fun handler/2, dict:to_list(Traci)}).
+
+handler(Trace,Traci) ->
+    %%We return our own Traci so that it not necesarry to look it up
+    %%This may take time if something huge has been written to it
+    receive
+	{get,Collector} -> Collector ! {self(),{Trace,Traci}};
 	done -> ok
     end,
-    State.
+    Traci.
 
-handler1(Trace,{Fd,{Traci,{Fun,State}}}) when is_function(Fun) ->
-    {Traci,{Fun,Fun(Fd,Trace,Traci,State)}};
-handler1(Trace,{Fd,{Traci,{{M,F},State}}}) when is_atom(M), is_atom(F) ->
-    {Traci,{{M,F},M:F(Fd,Trace,Traci,State)}}.
+%%Used to handle common state (the same for all clients)
+handler2(Trace,{Fd,Traci,{Fun,State}}) when is_function(Fun) ->
+    {Fun, Fun(Fd, Trace, Traci, State)};
+handler2(Trace,{Fd,Traci,{{M,F},State}}) when is_atom(M), is_atom(F) ->
+    {{M,F}, M:F(Fd, Trace, Traci, State)}.
 
 defaulthandler(Fd,Trace,_Traci,initial) ->
     dbg:dhandler(Trace,Fd);
 defaulthandler(_Fd,Trace,_Traci,State) ->
     dbg:dhandler(Trace,State).
 
-init_collector(Fd,Clients) ->
+init_collector(Fd,Clients,DisableSort,Handler) ->
     Collected = get_first(Clients),
-    collector(Fd,sort(Collected)).
+    case DisableSort of
+        true -> collector(Fd,Collected, DisableSort, Handler);
+        false -> collector(Fd,sort(Collected), DisableSort, Handler)
+    end.
 
-collector(Fd,[{_,{Client,{Trace,State}}}|Rest]) ->
+collector(Fd,[{_,{Client,{Trace,Traci}}} |Rest], DisableSort, CommonState) ->
     Trace1 = update_procinfo(Trace),
-    State1 = handler1(Trace1,{Fd,State}),
-    case get_next(Client,State1) of
-	end_of_trace -> 
-	    handler1(end_of_trace,{Fd,State1}),
-	    collector(Fd,Rest);
-	Next -> collector(Fd,sort([Next|Rest]))
+    CommonState2 = handler2(Trace1, {Fd, Traci, CommonState}),
+    case get_next(Client) of
+	end_of_trace ->
+	    collector(Fd,Rest,DisableSort, CommonState2);
+	Next -> case DisableSort of
+                    false -> collector(Fd,sort([Next|Rest]), DisableSort, CommonState2);
+                    true -> collector(Fd,[Next|Rest], DisableSort, CommonState2)
+                end
     end;
-collector(_Fd,[]) ->
+collector(Fd,[], _, CommonState) ->
+    handler2(end_of_trace, {Fd, end_of_trace, CommonState}),
     ok.
 
 update_procinfo({drop,_N}=Trace) ->
@@ -895,7 +1179,7 @@ update_procinfo(Trace) ->
     ProcInfo = get_procinfo(Pid),
     setelement(2,Trace,ProcInfo).
 
-get_procinfo(Pid) when is_pid(Pid) ->
+get_procinfo(Pid) when is_pid(Pid); is_port(Pid) ->
     case ets:lookup(?MODULE,Pid) of
 	[PI] -> PI;
 	[] -> Pid
@@ -913,21 +1197,21 @@ get_procinfo({Name,Node}) when is_atom(Name) ->
 
 get_first([Client|Clients]) ->
     Client ! {get,self()},
-    receive 
-	{Client,{end_of_trace,_}} -> 
+    receive
+	{Client,{end_of_trace,_}} ->
 	    get_first(Clients);
-	{Client,{Trace,_State}}=Next -> 
+	{Client,{Trace,_}}=Next ->
 	    [{timestamp(Trace),Next}|get_first(Clients)]
     end;
 get_first([]) -> [].
 
-get_next(Client,State) when is_pid(Client) ->
+get_next(Client) when is_pid(Client) ->
     Client ! {get,self()},
-    receive 
-	{Client,{end_of_trace,_}} -> 
+    receive
+	{Client,{end_of_trace,_}} ->
 	    end_of_trace;
-	{Client,{Trace,_OldState}} -> 
-	    {timestamp(Trace),{Client,{Trace,State}}} % inserting new state!!
+	{Client,{Trace, Traci}} ->
+	    {timestamp(Trace),{Client,{Trace,Traci}}}
     end.
 
 sort(List) ->
@@ -971,19 +1255,34 @@ display_warning(Item,Warning) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Trace client which reads an IP port and puts data directly to a file.
 %%% This is used when tracing remote nodes with no file system.
-ip_to_file(Trace,{file,File}) ->
+ip_to_file({metadata,_,_},{_, only} = State) ->
+    State;
+ip_to_file(Trace, {_, only} = State) ->
+    dbg:dhandler(Trace, standard_io),
+    State;
+ip_to_file(Trace,{{file,File}, ShellOutput}) ->
     Fun = dbg:trace_port(file,File), %File can be a filename or a wrap spec
     Port = Fun(),
-    ip_to_file(Trace,Port);
-ip_to_file({metadata,MetaFile,MetaData},Port) ->
+    case Trace of
+        {metadata, _, _} -> ok;
+        Trace            -> show_trace(Trace, ShellOutput)
+    end,
+    ip_to_file(Trace,{Port,ShellOutput});
+ip_to_file({metadata,MetaFile,MetaData},State) ->
     {ok,MetaFd} = file:open(MetaFile,[write,raw,append]),
     file:write(MetaFd,MetaData),
     file:close(MetaFd),
-    Port;
-ip_to_file(Trace,Port) ->
+    State;
+ip_to_file(Trace,{Port, ShellOutput}) ->
+    show_trace(Trace, ShellOutput),
     B = term_to_binary(Trace),
     erlang:port_command(Port,B),
-    Port.
+    {Port, ShellOutput}.
+
+show_trace(Trace, true) ->
+    dbg:dhandler(Trace, standard_io);
+show_trace(_, _) ->
+    ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% For debugging
@@ -996,5 +1295,3 @@ dump_ti(<<>>,Acc) ->
 dump_ti(B,Acc) ->
     {Term,Rest} = get_term(B),
     dump_ti(Rest,[Term|Acc]).
-
-
diff --git a/lib/observer/test/Makefile b/lib/observer/test/Makefile
index 6073e6ea00..bf99f07081 100644
--- a/lib/observer/test/Makefile
+++ b/lib/observer/test/Makefile
@@ -22,7 +22,10 @@ MODULES =  \
 	observer_SUITE \
 	crashdump_viewer_SUITE \
 	etop_SUITE \
+	ttb_helper \
 	ttb_SUITE \
+	client \
+	server \
 	crashdump_helper
 
 ERL_FILES= $(MODULES:%=%.erl)
diff --git a/lib/observer/test/client.erl b/lib/observer/test/client.erl
new file mode 100644
index 0000000000..e756f9d6e8
--- /dev/null
+++ b/lib/observer/test/client.erl
@@ -0,0 +1,28 @@
+-module(client).
+-compile(export_all).
+
+init(Node) ->
+    application:start(runtime_tools),
+    net_kernel:connect_node(Node).
+
+init() ->
+    init(server_node()).
+
+restart() ->
+    init:restart().
+
+server_node() ->
+    {ok,HostName} = inet:gethostname(),
+    list_to_atom("server@" ++ HostName).
+
+get() ->
+    erlang:send({server,server_node()}, {get,self()}),
+    receive Data -> Data
+    after 1000   -> no_reply
+    end.
+
+put(Thing) ->
+    erlang:send({server,server_node()}, {put,self(),Thing}),
+    receive ok -> ok
+    after 1000 -> no_reply
+    end.
diff --git a/lib/observer/test/server.erl b/lib/observer/test/server.erl
new file mode 100644
index 0000000000..c1b1fea562
--- /dev/null
+++ b/lib/observer/test/server.erl
@@ -0,0 +1,43 @@
+-module(server).
+-compile(export_all).
+
+start() ->
+    application:start(runtime_tools),
+    Pid = spawn(?MODULE,loop,[[], 0]),
+    register(server,Pid).
+
+stop() ->
+    case lists:member(server, registered()) of
+	true ->
+	    server ! stop;
+	false ->
+	    ok
+    end.
+
+loop(Data, Num) ->
+    receive
+	{put,From,Ting} -> From ! ok,
+			   received(From,Ting),
+			   loop([Ting|Data], Num+1);
+	{get,From}      -> From ! Data,
+			   loop(Data, Num+1);
+	stop            -> stopped;
+	clear           -> loop([], Num+1);
+	{cnt, From}     -> From ! Num,
+			   loop(Data, Num)
+    end.
+
+counter() ->
+    server ! {cnt, self()},
+    receive
+	Num ->
+	    Num
+    end.
+
+received(From, Thing) ->
+    case Thing of
+	never_send_this_atom ->
+	    loop(Thing, 0);
+	_ ->
+	    {return, 27, Thing, From}
+    end.
diff --git a/lib/observer/test/ttb_SUITE.erl b/lib/observer/test/ttb_SUITE.erl
index 24b4a22aa9..1fd8b4c892 100644
--- a/lib/observer/test/ttb_SUITE.erl
+++ b/lib/observer/test/ttb_SUITE.erl
@@ -1,7 +1,7 @@
-%%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
+%%
+%% Copyright Ericsson AB 2002-2010. 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
@@ -33,9 +33,17 @@
 -include_lib("test_server/include/test_server.hrl").
 
 -define(default_timeout, ?t:minutes(1)).
+-define(OUTPUT, "handler_output").
+-define(FNAME, "temptest").
+-define(DIRNAME, "ddtemp").
 
 init_per_testcase(_Case, Config) ->
     ttb:stop(),
+    os:cmd("rm -rf " ++ ?OUTPUT),
+    os:cmd("rm -rf ttb_upload*"),
+    os:cmd("rm -rf " ++ ?DIRNAME),
+    os:cmd("rm -rf *@*"),
+    os:cmd("rm -rf ttb_last_config"),
     ?line Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
 end_per_testcase(_Case, Config) ->
@@ -49,7 +57,25 @@ all() ->
     [file, file_no_pi, file_fetch, wrap, wrap_merge,
      wrap_merge_fetch_format, write_config1, write_config2,
      write_config3, history, write_trace_info, seq_trace,
-     diskless, otp_4967_1, otp_4967_2].
+     diskless, diskless_wrap, otp_4967_1, otp_4967_2,
+     fetch_when_no_option_given, basic_ttb_run_ip_port, basic_ttb_run_file_port,
+     return_fetch_dir_implies_fetch, logfile_name_in_fetch_dir, upload_to_my_logdir,
+     upload_to_my_existing_logdir, fetch_with_options_not_as_list,
+     error_when_formatting_multiple_files_4393, format_on_trace_stop,
+     trace_to_remote_files_on_localhost_with_different_pwd,
+     trace_to_local_files_on_localhost_with_different_pwd,
+     trace_to_remote_files_on_localhost_with_different_pwd_abs,
+     changing_cwd_on_control_node, changing_cwd_on_remote_node,
+     changing_cwd_on_control_node_with_local_trace,
+     one_command_trace_setup, dbg_style_fetch, shell_tracing_init,
+     only_one_state_for_format_handler, only_one_state_with_default_format_handler,
+     only_one_state_with_initial_format_handler, run_trace_with_shortcut1,
+     run_trace_with_shortcut2, run_trace_with_shortcut3, run_trace_with_shortcut4,
+     cant_specify_local_and_flush, trace_sorted_by_default,disable_sorting,
+     trace_resumed_after_node_restart, trace_resumed_after_node_restart_ip,
+     trace_resumed_after_node_restart_wrap,
+     trace_resumed_after_node_restart_wrap_mult
+].
 
 groups() -> 
     [].
@@ -92,15 +118,15 @@ file(Config) when is_list(Config) ->
     ?line {ok,[{matched,_,1},{matched,_,1}]} = ttb:tp(?MODULE,foo,[]),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line ?t:stop_node(OtherNode),
     ?line ok = ttb:format(filename:join(Privdir,atom_to_list(Node)++"-file")),
     ?line ok = ttb:format(filename:join(Privdir,
 					atom_to_list(OtherNode)++"-file")),
 
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace,
-	   {trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
+	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
     ok.
 
@@ -123,15 +149,15 @@ file_no_pi(Config) when is_list(Config) ->
     ?line {ok,[{matched,_,1},{matched,_,1}]} = ttb:tp(?MODULE,foo,[]),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line ?t:stop_node(OtherNode),
     ?line ok = ttb:format(filename:join(Privdir,atom_to_list(Node)++"-file")),
     ?line ok = ttb:format(filename:join(Privdir,
 					atom_to_list(OtherNode)++"-file")),
 
-    ?line [{trace,LocalProc,call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,LocalProc,call,{?MODULE,foo,[]}, {_,_,_}},
 	   end_of_trace,
-	   {trace,RemoteProc,call,{?MODULE,foo,[]}},
+	   {trace_ts,RemoteProc,call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
     ?line true = is_pid(LocalProc),
     ?line true = is_pid(RemoteProc),
@@ -170,7 +196,7 @@ file_fetch(Config) when is_list(Config) ->
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
     ?line ?t:capture_start(),
-    ?line ttb:stop([fetch]),
+    ?line ttb:stop([return_fetch_dir]),
     ?line ?t:capture_stop(),
     ?line [StoreString] = ?t:capture_get(),
     ?line UploadDir =
@@ -194,9 +220,9 @@ file_fetch(Config) when is_list(Config) ->
     ?line ok = ttb:format(filename:join(UploadDir,
 					atom_to_list(OtherNode)++"-file_fetch")),
 
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace,
-	   {trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
+	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
 
     ?line ok = file:set_cwd(Cwd),
@@ -224,19 +250,19 @@ wrap(Config) when is_list(Config) ->
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line ?t:stop_node(OtherNode),
     ?line ok = ttb:format(filename:join(Privdir,
 					atom_to_list(Node)++"-wrap.*.wrp")),
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   {trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   {trace,{S,_,Node},call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
     ?line ok = ttb:format(filename:join(Privdir,
 					atom_to_list(OtherNode)++"-wrap.*.wrp")),
-    ?line [{trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
-	   {trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
-	   {trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
 
     %% Check that merge does not crash even if the timestamp flag is not on.
@@ -244,14 +270,13 @@ wrap(Config) when is_list(Config) ->
 		 [filename:join(Privdir,
 				atom_to_list(Node)++"-wrap.*.wrp"),
 		  filename:join(Privdir,
-				atom_to_list(OtherNode)++"-wrap.*.wrp")]),
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   {trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   {trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   end_of_trace,
-	   {trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
-	   {trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
-	   {trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},
+				atom_to_list(OtherNode)++"-wrap.*.wrp")],[{disable_sort,true}]),
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
     ok.
 
@@ -277,7 +302,7 @@ wrap_merge(Config) when is_list(Config) ->
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line ?t:stop_node(OtherNode),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,
@@ -289,7 +314,6 @@ wrap_merge(Config) when is_list(Config) ->
 	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},_},
 	   {trace_ts,_,call,{?MODULE,foo,[]},_},
 	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},_},
-	   end_of_trace,
 	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},_},
 	   end_of_trace] = flush(),
     ok.
@@ -330,7 +354,6 @@ wrap_merge_fetch_format(Config) when is_list(Config) ->
 	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},_},
 	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},_},
 	   {trace_ts,{S,_,Node},call,{?MODULE,foo,[]},_},
-	   end_of_trace,
 	   {trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},_},
 	   end_of_trace] = flush(),
 
@@ -360,16 +383,15 @@ write_config1(Config) when is_list(Config) ->
     ?line ok = ttb:run_config(File),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line ?t:stop_node(OtherNode),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,
 				atom_to_list(Node)++"-write_config1"),
 		  filename:join(Privdir,
 				atom_to_list(OtherNode)++"-write_config1")]),
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   end_of_trace,
-	   {trace,Other,call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,Other,call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
 
     case metatest(Other,OtherNode,Privdir,"-write_config1.ti") of
@@ -410,16 +432,15 @@ write_config2(Config) when is_list(Config) ->
     ?line ok = ttb:run_config(File),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line ?t:stop_node(OtherNode),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,
 				atom_to_list(Node)++"-write_config2"),
 		  filename:join(Privdir,
 				atom_to_list(OtherNode)++"-write_config2")]),
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   end_of_trace,
-	   {trace,Other,call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,Other,call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
 
     case metatest(Other,OtherNode,Privdir,"-write_config2.ti") of
@@ -455,18 +476,18 @@ write_config3(Config) when is_list(Config) ->
     ?line {ok,[{all,[{matched,_,_},{matched,_,_}]}]} = ttb:p(all,call),
     ?line {ok,[{matched,_,1},{matched,_,1}]} = ttb:tp(?MODULE,foo,[]),
     ?line ok = ttb:write_config(File,[1,2]),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line [_,_] = ttb:list_config(File),
     ?line ok = ttb:run_config(File),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,
 				atom_to_list(Node)++"-write_config3"),
 		  filename:join(Privdir,
 				atom_to_list(OtherNode)++"-write_config3")]),
-    ?line [] = flush(), %foo is not traced
+    ?line [end_of_trace] = flush(), %foo is not traced
 
     ?line ok = ttb:write_config(File,[{ttb,tp,[?MODULE,foo,[]]}],
 			      [append]),
@@ -474,16 +495,15 @@ write_config3(Config) when is_list(Config) ->
     ?line ok = ttb:run_config(File),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line ?t:stop_node(OtherNode),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,
 				atom_to_list(Node)++"-write_config3"),
 		  filename:join(Privdir,
 				atom_to_list(OtherNode)++"-write_config3")]),
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
-	   end_of_trace,
-	   {trace,Other,call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
+	   {trace_ts,Other,call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
 
     case metatest(Other,OtherNode,Privdir,"-write_config3.ti") of
@@ -531,12 +551,12 @@ history(Config) when is_list(Config) ->
     ?line ?MODULE:foo(),
     ?line ok = ttb:run_history([3,4]),
     ?line ?MODULE:foo(),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line ?t:stop_node(OtherNode),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,atom_to_list(Node)++"-history"),
 		  filename:join(Privdir,atom_to_list(OtherNode)++"-history")]),
-    ?line [{trace,{S,_,Node},call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
     ok.
     
@@ -561,17 +581,16 @@ write_trace_info(Config) when is_list(Config) ->
     ?line ok = ttb:write_trace_info(mytraceinfo,fun() -> node() end),
     ?line ?MODULE:foo(),
     ?line rpc:call(OtherNode,?MODULE,foo,[]),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line ?t:stop_node(OtherNode),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,atom_to_list(Node)++"-write_trace_info"),
 		  filename:join(Privdir,
 				atom_to_list(OtherNode)++"-write_trace_info")],
 		 [{handler,{fun otherhandler/4,S}}]),
-    ?line [{{trace,{S,_,Node},call,{?MODULE,foo,[]}},[Node]},
-	   {end_of_trace,[Node]},
-	   {{trace,{_,_,OtherNode},call,{?MODULE,foo,[]}},[OtherNode]},
-	   {end_of_trace,[OtherNode]}] = flush(),
+    ?line [{{trace_ts,{S,_,Node},call,{?MODULE,foo,[]},{_,_,_}},[Node]},
+	   {{trace_ts,{_,_,OtherNode},call,{?MODULE,foo,[]},{_,_,_}},[OtherNode]},
+	   end_of_trace] = flush(),
 
     ok.
 
@@ -593,10 +612,10 @@ seq_trace(Config) when is_list(Config) ->
 
     ?line Start = spawn(fun() -> seq() end),
     ?line timer:sleep(300),
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line ok = ttb:format(
 		 [filename:join(Privdir,atom_to_list(Node)++"-seq_trace")]),
-    ?line [{trace,StartProc,call,{?MODULE,seq,[]}},
+    ?line [{trace_ts,StartProc,call,{?MODULE,seq,[]},{_,_,_}},
 	   {seq_trace,0,{send,{0,1},StartProc,P1Proc,{Start,P2}}},
 	   {seq_trace,0,{send,{1,2},P1Proc,P2Proc,{P1,Start}}},
 	   {seq_trace,0,{send,{2,3},P2Proc,StartProc,{P2,P1}}},
@@ -660,15 +679,41 @@ diskless(Config) when is_list(Config) ->
 
     ?line rpc:call(RemoteNode,?MODULE,foo,[]),
     ?line timer:sleep(500), % needed for the IP port to flush
-    ?line ttb:stop(),
+    ?line ttb:stop([nofetch]),
     ?line ?t:stop_node(RemoteNode),
     ?line ok = ttb:format(filename:join(Privdir,
 					atom_to_list(RemoteNode)++"-diskless")),
 
-    ?line [{trace,{_,_,RemoteNode},call,{?MODULE,foo,[]}},
+    ?line [{trace_ts,{_,_,RemoteNode},call,{?MODULE,foo,[]},{_,_,_}},
 	   end_of_trace] = flush(),
     ok.
 
+diskless_wrap(suite) ->
+    [];
+diskless_wrap(doc) ->
+    ["Start tracing on diskless remote node, save to local wrapped file"];
+diskless_wrap(Config) when is_list(Config) ->
+    ?line {ok,RemoteNode} = ?t:start_node(node2,slave,[]),
+    ?line c:nl(?MODULE),
+    ?line S = self(),
+    ?line Privdir=?config(priv_dir, Config),
+    ?line File = filename:join(Privdir,"diskless"),
+    ?line {ok,[RemoteNode]} =
+	ttb:tracer([RemoteNode],[{file, {local, {wrap,File,200,3}}},
+				 {handler,{fun myhandler/4, S}}]),
+    ?line {ok,[{all,[{matched,RemoteNode,_}]}]} = ttb:p(all,call),
+    ?line {ok,[{matched,RemoteNode,1}]} = ttb:tp(?MODULE,foo,[]),
+
+    ?line rpc:call(RemoteNode,?MODULE,foo,[]),
+    ?line timer:sleep(500), % needed for the IP port to flush
+    ?line ttb:stop([nofetch]),
+    ?line ?t:stop_node(RemoteNode),
+    ?line ok = ttb:format(filename:join(Privdir,
+					atom_to_list(RemoteNode)++"-diskless.*.wrp")),
+
+    ?line [{trace_ts,{_,_,RemoteNode},call,{?MODULE,foo,[]},{_,_,_}},
+	   end_of_trace] = flush(),
+    ok.
 
 otp_4967_1(suite) ->
     [];
@@ -715,7 +760,7 @@ otp_4967_2(Config) when is_list(Config) ->
     io:format("11: ~p",[now()]),
     ?line true = lists:member(heihopp,Msgs), % the heihopp message itself
     io:format("13: ~p",[now()]),
-    ?line {value,{trace,_,send,heihopp,{_,otp_4967,Node}}} = 
+    ?line {value,{trace_ts,_,send,heihopp,{_,otp_4967,Node},{_,_,_}}} =
 	lists:keysearch(heihopp,4,Msgs), % trace trace of the heihopp message
     io:format("14: ~p",[now()]),
     ?line end_of_trace = lists:last(Msgs), % end of the trace
@@ -728,6 +773,30 @@ myhandler(_Fd,Trace,_,Relay) ->
     Relay ! Trace,
     Relay.
 
+simple_call_handler() ->
+    {fun(A, {trace_ts, _, call, _, _} ,_,_) -> io:format(A, "ok.~n", []);
+	(_, end_of_trace, _, _) -> ok end, []}.
+
+marking_call_handler() ->
+    {fun(_, _, _, initial) -> file:write_file("HANDLER_OK", []);
+	(_,_,_,_) -> ok end, initial}.
+
+counter_call_handler() ->
+    {fun(_, {trace_ts, _, call, _, _} ,_,State) -> State + 1;
+	(A, end_of_trace, _, State) -> io:format(A,"~p.~n", [State]) end, 0}.
+
+ret_caller_call_handler() ->
+    {fun(A, {trace_ts, _, call, _, _, _} ,_,_) -> io:format(A, "ok.~n", []);
+	(A, {trace_ts, _, return_from, _, _, _}, _, _) -> io:format(A, "ok.~n", []);
+	(_, _, _, _) -> ok end, []}.
+
+node_call_handler() ->
+    {fun(A, {trace_ts, {_,_,Node}, call, _, _} ,_,_) -> io:format(A, "~p.~n", [Node]);
+	(_, end_of_trace, _, _) -> ok end, []}.
+
+otherhandler(_Fd,_,end_of_trace,Relay) ->
+    Relay ! end_of_trace,
+    Relay;
 otherhandler(_Fd,Trace,TI,Relay) ->
     {value,{mytraceinfo,I}} = lists:keysearch(mytraceinfo,1,TI),
     Relay ! {Trace,I},
@@ -794,3 +863,568 @@ check_gone(Dir,File) ->
 	      false -> 
 		  ok
 	  end.
+
+start_client_and_server() ->
+    ?line {ok,ClientNode} = ?t:start_node(client,slave,[]),
+    ?line ok = ttb_helper:c(code, add_paths, [code:get_path()]),
+    ?line {ok,ServerNode} = ?t:start_node(server,slave,[]),
+    ?line ok = ttb_helper:s(code, add_paths, [code:get_path()]),
+    ?line ttb_helper:clear(),
+    {ServerNode, ClientNode}.
+
+begin_trace(ServerNode, ClientNode, Dest) ->
+    ?line {ok, _} =
+	ttb:tracer([ServerNode,ClientNode],[{file, Dest}]),
+    ?line ttb:p(all, call),
+    ?line ttb:tp(server, received, []),
+    ?line ttb:tp(client, put, []),
+    ?line ttb:tp(client, get, []).
+
+begin_trace_local(ServerNode, ClientNode, Dest) ->
+    ?line {ok, _} =
+	ttb:tracer([ServerNode,ClientNode],[{file, Dest}]),
+    ?line ttb:p(all, call),
+    ?line ttb:tpl(server, received, []),
+    ?line ttb:tpl(client, put, []),
+    ?line ttb:tpl(client, get, []).
+
+check_size(N, Dest, Output, ServerNode, ClientNode) ->
+    ?line begin_trace(ServerNode, ClientNode, Dest),
+    ?line case Dest of
+        {local, _} ->
+            ?line ttb_helper:msgs_ip(N);
+        _ ->
+            ?line ttb_helper:msgs(N)
+    end,
+    ?line {_, D} = ttb:stop([fetch, return_fetch_dir]),
+    ?line ttb:format(D, [{out, Output}, {handler, simple_call_handler()}]),
+    ?line {ok, Ret} = file:consult(Output),
+    ?line true = (N + 1 == length(Ret)).
+
+fetch_when_no_option_given(suite) ->
+    [];
+fetch_when_no_option_given(doc) ->
+    ["Fetch when no option given"];
+fetch_when_no_option_given(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line {ok, Privdir} = file:get_cwd(),
+    ?line [] = filelib:wildcard(filename:join(Privdir,"ttb_upload_temptest*")),
+    begin_trace(ServerNode, ClientNode, ?FNAME),
+    ?line ttb_helper:msgs(4),
+    ?line stopped = ttb:stop(),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line [_] = filelib:wildcard(filename:join(Privdir,"ttb_upload_temptest*")).
+
+basic_ttb_run_ip_port(suite) ->
+    [];
+basic_ttb_run_ip_port(doc) ->
+    ["Basic ttb run ip port"];
+basic_ttb_run_ip_port(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line check_size(1, {local, ?FNAME}, ?OUTPUT, ServerNode, ClientNode),
+    ?line check_size(2, {local, ?FNAME}, ?OUTPUT, ServerNode, ClientNode),
+    ?line check_size(10, {local, ?FNAME}, ?OUTPUT, ServerNode, ClientNode),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode).
+
+basic_ttb_run_file_port(suite) ->
+    [];
+basic_ttb_run_file_port(doc) ->
+    ["Basic ttb run file port"];
+basic_ttb_run_file_port(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line check_size(1, ?FNAME, ?OUTPUT, ServerNode, ClientNode),
+    ?line check_size(2, ?FNAME, ?OUTPUT, ServerNode, ClientNode),
+    ?line check_size(10, ?FNAME, ?OUTPUT, ServerNode, ClientNode),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode).
+
+return_fetch_dir_implies_fetch(suite) ->
+    [];
+return_fetch_dir_implies_fetch(doc) ->
+    ["Return_fetch_dir implies fetch"];
+return_fetch_dir_implies_fetch(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace(ServerNode, ClientNode, ?FNAME),
+    ?line ttb_helper:msgs(2),
+    ?line {_,_} = ttb:stop([return_fetch_dir]),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode).
+
+logfile_name_in_fetch_dir(suite) ->
+    [];
+logfile_name_in_fetch_dir(doc) ->
+    ["Logfile name in fetch dir"];
+logfile_name_in_fetch_dir(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace(ServerNode, ClientNode, {local, ?FNAME}),
+    ?line {_,Dir} = ttb:stop([return_fetch_dir]),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line P1 = lists:nth(3, string:tokens(filename:basename(Dir), "_")),
+    ?line P2 = hd(string:tokens(P1, "-")),
+    ?line _File = P2.
+
+upload_to_my_logdir(suite) ->
+    [];
+upload_to_my_logdir(doc) ->
+    ["Upload to my logdir"];
+upload_to_my_logdir(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line {ok, _} =
+	ttb:tracer([ServerNode,ClientNode],[{file, ?FNAME}]),
+    ?line {stopped,_} = ttb:stop([return_fetch_dir, {fetch_dir, ?DIRNAME}]),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line true = filelib:is_file(?DIRNAME),
+    ?line [] = filelib:wildcard("ttb_upload_"++?FNAME).
+
+upload_to_my_existing_logdir(suite) ->
+    [];
+upload_to_my_existing_logdir(doc) ->
+    ["Upload to my existing logdir"];
+upload_to_my_existing_logdir(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line ok = file:make_dir(?DIRNAME),
+    ?line {ok, _} =
+	ttb:tracer([ServerNode,ClientNode],[{file, ?FNAME}]),
+    ?line {error,_,_} = (catch ttb:stop([return_fetch_dir, {fetch_dir, ?DIRNAME}])),
+    ?line {stopped,_} = ttb:stop(return_fetch_dir),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode).
+
+fetch_with_options_not_as_list(suite) ->
+    [];
+fetch_with_options_not_as_list(doc) ->
+    ["Fetch with options not as list"];
+fetch_with_options_not_as_list(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line {ok, _} =
+	ttb:tracer([ServerNode,ClientNode],[{file, ?FNAME}]),
+    ?line {stopped, D} = ttb:stop(return_fetch_dir),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line false = filelib:is_file(?OUTPUT),
+    ?line ttb:format(D, {out, ?OUTPUT}),
+    ?line true = filelib:is_file(?OUTPUT).
+
+error_when_formatting_multiple_files_4393(suite) ->
+    [];
+error_when_formatting_multiple_files_4393(doc) ->
+    ["Error when formatting multiple files"];
+error_when_formatting_multiple_files_4393(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace(ServerNode, ClientNode, ?FNAME),
+    ?line ttb_helper:msgs(2),
+    ?line {_, Dir} = ttb:stop(return_fetch_dir),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line Files = [filename:join(Dir, atom_to_list(ttb_helper:get_node(server)) ++ "-" ++ ?FNAME),
+             filename:join(Dir, atom_to_list(ttb_helper:get_node(client)) ++ "-" ++ ?FNAME)],
+    ?line ok = ttb:format(Files).
+
+format_on_trace_stop(suite) ->
+    [];
+format_on_trace_stop(doc) ->
+    ["Format on trace stop"];
+format_on_trace_stop(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace(ServerNode, ClientNode, {local, ?FNAME}),
+    ?line ttb_helper:msgs_ip(2),
+    ?line file:delete("HANDLER_OK"),
+    ?line {_,_} = ttb:stop([fetch, return_fetch_dir, {format, {handler, marking_call_handler()}}]),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line true = filelib:is_file("HANDLER_OK"),
+    ?line ok = file:delete("HANDLER_OK").
+
+%% The following three tests are for the issue "fixes fetch fail when nodes on the same host
+%% have different cwd"
+trace_to_remote_files_on_localhost_with_different_pwd(suite) ->
+    [];
+trace_to_remote_files_on_localhost_with_different_pwd(doc) ->
+    ["Trace to remote files on localhost with different pwd"];
+trace_to_remote_files_on_localhost_with_different_pwd(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line ok = file:set_cwd(".."),
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line check_size(2, ?FNAME, ?OUTPUT, ServerNode, ClientNode),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line ok = file:set_cwd(OldDir).
+
+trace_to_local_files_on_localhost_with_different_pwd(suite) ->
+    [];
+trace_to_local_files_on_localhost_with_different_pwd(doc) ->
+    ["Trace to local files on localhost with different pwd"];
+trace_to_local_files_on_localhost_with_different_pwd(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line ok = file:set_cwd(".."),
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line check_size(2, {local, ?FNAME}, ?OUTPUT, ServerNode, ClientNode),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line ok = file:set_cwd(OldDir).
+
+trace_to_remote_files_on_localhost_with_different_pwd_abs(suite) ->
+    [];
+trace_to_remote_files_on_localhost_with_different_pwd_abs(doc) ->
+    ["Trace to remote files on localhost with different pwd abs"];
+trace_to_remote_files_on_localhost_with_different_pwd_abs(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line ok = file:set_cwd(".."),
+    ?line {ok, Path} = file:get_cwd(),
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line File = filename:join(Path, ?FNAME),
+    ?line check_size(2, File, ?OUTPUT, ServerNode, ClientNode),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line ok = file:set_cwd(OldDir).
+
+%% Trace is not affected by changes of cwd on control node or remote nodes during tracing
+%% (three tests)
+changing_cwd_on_control_node(suite) ->
+    [];
+changing_cwd_on_control_node(doc) ->
+    ["Changing cwd on control node during tracing is safe"];
+changing_cwd_on_control_node(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace(ServerNode, ClientNode, ?FNAME),
+    ?line NumMsgs = 3,
+    ?line ttb_helper:msgs(NumMsgs),
+    ?line ok = file:set_cwd(".."),
+    ?line ttb_helper:msgs(NumMsgs),
+    ?line {_, D} = ttb:stop([fetch, return_fetch_dir]),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, simple_call_handler()}]),
+    ?line {ok, Ret} = file:consult(?OUTPUT),
+    ?line true = (2*(NumMsgs + 1) == length(Ret)),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line ok = file:set_cwd(OldDir).
+
+changing_cwd_on_control_node_with_local_trace(suite) ->
+    [];
+changing_cwd_on_control_node_with_local_trace(doc) ->
+    ["Changing cwd on control node during local tracing is safe"];
+changing_cwd_on_control_node_with_local_trace(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace(ServerNode, ClientNode, {local, ?FNAME}),
+    ?line NumMsgs = 3,
+    ?line ttb_helper:msgs_ip(NumMsgs),
+    ?line ok = file:set_cwd(".."),
+    ?line ttb_helper:msgs_ip(NumMsgs),
+    ?line {_, D} = ttb:stop([fetch, return_fetch_dir]),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, simple_call_handler()}]),
+    ?line {ok, Ret} = file:consult(?OUTPUT),
+    ?line true = (2*(NumMsgs + 1) == length(Ret)),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line ok = file:set_cwd(OldDir).
+
+changing_cwd_on_remote_node(suite) ->
+    [];
+changing_cwd_on_remote_node(doc) ->
+    ["Changing cwd on remote node during tracing is safe"];
+changing_cwd_on_remote_node(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace(ServerNode, ClientNode, ?FNAME),
+    ?line NumMsgs = 2,
+    ?line ttb_helper:msgs(NumMsgs),
+    ?line ok = rpc:call(ClientNode, file, set_cwd, [".."]),
+    ?line ttb_helper:msgs(NumMsgs),
+    ?line {_, D} = ttb:stop([fetch, return_fetch_dir]),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, simple_call_handler()}]),
+    ?line {ok, Ret} = file:consult(?OUTPUT),
+    ?line true = (2*(NumMsgs + 1) == length(Ret)),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode).
+
+one_command_trace_setup(suite) ->
+    [];
+one_command_trace_setup(doc) ->
+    ["One command trace setup"];
+one_command_trace_setup(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line ttb:start_trace([ttb_helper:get_node(client), ttb_helper:get_node(server)],
+		     [{server, received, '_', []},
+		      {client, put, 1, []},
+		      {client, get, '_', []}],
+		     {all, call},
+		     [{file, ?FNAME}]),
+    ?line ttb_helper:msgs(2),
+    ?line {_, D} = ttb:stop(return_fetch_dir),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, simple_call_handler()}]),
+    ?line {ok, Ret} = file:consult(?OUTPUT),
+    ?line 5 = length(Ret).
+
+dbg_style_fetch(suite) ->
+    [];
+dbg_style_fetch(doc) ->
+    ["Dbg style fetch"];
+dbg_style_fetch(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line DirSize = length(element(2, file:list_dir("."))),
+    ?line ttb:start_trace([ttb_helper:get_node(client), ttb_helper:get_node(server)],
+			   [{server, received, '_', []},
+		      {client, put, 1, []},
+		      {client, get, '_', []}],
+			   {all, call},
+			   [{shell, only}]),
+    ?line DirSize = length(element(2, file:list_dir("."))),
+    ?line ttb_helper:msgs(2),
+    ?line DirSize = length(element(2, file:list_dir("."))),
+    ?line stopped, ttb:stop(format),
+    %%+1 -> ttb_last_trace
+    ?line true = (DirSize + 1 == length(element(2, file:list_dir(".")))),
+    ?line {ok,[{all, [{matched,_,_}, {matched,_,_}]}]} =
+	ttb:start_trace([ttb_helper:get_node(client), ttb_helper:get_node(server)],
+			[{server, received, '_', []},
+			  {client, put, 1, []},
+			  {client, get, '_', []}],
+			{all, call},
+			[{shell, only}]),
+    ?line ttb:stop(),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode).
+
+shell_tracing_init(suite) ->
+    [];
+shell_tracing_init(doc) ->
+    ["Shell tracing init"];
+shell_tracing_init(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line ttb:tracer([ttb_helper:get_node(client), ttb_helper:get_node(server)], shell),
+    ?line ttb:stop(),
+    ?line ttb:tracer([ttb_helper:get_node(client), ttb_helper:get_node(server)],
+		     [{file, {local, ?FNAME}}, shell]),
+    ?line ttb:stop(),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line local_client_required_on_shell_tracing = try  ttb:tracer([ttb_helper:get_node(client), ttb_helper:get_node(server)],
+								   [{file, ?FNAME}, shell])
+						   catch
+						       exit:local_client_required_on_shell_tracing ->
+							   local_client_required_on_shell_tracing
+						   end.
+
+only_one_state_for_format_handler(suite) ->
+    [];
+only_one_state_for_format_handler(doc) ->
+    ["Only one state for format handler"];
+only_one_state_for_format_handler(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_local(ServerNode, ClientNode, ?FNAME),
+    ?line ttb_helper:msgs(2),
+    ?line {_, D} = ttb:stop([return_fetch_dir]),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, counter_call_handler()}]),
+    ?line {ok, Ret} = file:consult(?OUTPUT),
+    ?line [5] = Ret.
+
+only_one_state_with_default_format_handler(suite) ->
+    [];
+only_one_state_with_default_format_handler(doc) ->
+    ["Only one state with default format handler"];
+only_one_state_with_default_format_handler(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_local(ServerNode, ClientNode, ?FNAME),
+    ?line ttb_helper:msgs(2),
+    ?line {_, D} = ttb:stop([return_fetch_dir]),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line ttb:format(D, [{out, ?OUTPUT}]),
+    ?line true = filelib:is_file(?OUTPUT).
+
+only_one_state_with_initial_format_handler(suite) ->
+    [];
+only_one_state_with_initial_format_handler(doc) ->
+    ["Only one state with initial format handler"];
+only_one_state_with_initial_format_handler(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line {ok, _} =
+	ttb:tracer([ServerNode,ClientNode],[{file, ?FNAME}, {handler, counter_call_handler()}]),
+    ?line ttb:p(all, call),
+    ?line ttb:tpl(server, received, []),
+    ?line ttb:tpl(client, put, []),
+    ?line ttb:tpl(client, get, []),
+    ?line ttb_helper:msgs(2),
+    ?line {_, D} = ttb:stop([return_fetch_dir]),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line ttb:format(D, [{out, ?OUTPUT}]),
+    ?line {ok, Ret} = file:consult(?OUTPUT),
+    ?line [5] = Ret.
+
+run_trace_with_shortcut(Shortcut, Ret, F) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line {ok, _} =
+	ttb:tracer([ServerNode,ClientNode],[{file, ?FNAME}]),
+    ?line ttb:p(all, call),
+    ?line ttb:F(client, put, Shortcut),
+    ?line ttb_helper:msgs(2),
+    ?line {_, D} = ttb:stop([return_fetch_dir]),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, ret_caller_call_handler()}]),
+    ?line {ok, Ret} =file:consult(?OUTPUT),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode).
+
+fun_for(return) ->
+    {codestr, "fun(_) -> return_trace() end"};
+fun_for(msg_false) ->
+    {codestr, "fun(_) -> message(false) end"}.
+
+run_trace_with_shortcut1(suite) ->
+    [];
+run_trace_with_shortcut1(doc) ->
+    ["Run trace with shortcut 1"];
+run_trace_with_shortcut1(Config) when is_list(Config) ->
+    ?line run_trace_with_shortcut(caller, [ok,ok], tp),
+    ?line run_trace_with_shortcut(caller, [ok,ok], tpl).
+
+run_trace_with_shortcut2(suite) ->
+    [];
+run_trace_with_shortcut2(doc) ->
+    ["Run trace with shortcut 2"];
+run_trace_with_shortcut2(Config) when is_list(Config) ->
+    ?line run_trace_with_shortcut(return, [ok,ok], tp),
+    ?line run_trace_with_shortcut(return, [ok,ok], tpl).
+
+run_trace_with_shortcut3(suite) ->
+    [];
+run_trace_with_shortcut3(doc) ->
+    ["Run trace with shortcut 3"];
+run_trace_with_shortcut3(Config) when is_list(Config) ->
+    ?line run_trace_with_shortcut(fun_for(return), [ok,ok], tp),
+    ?line run_trace_with_shortcut(fun_for(return), [ok,ok], tpl).
+
+run_trace_with_shortcut4(suite) ->
+    [];
+run_trace_with_shortcut4(doc) ->
+    ["Run trace with shortcut 4"];
+run_trace_with_shortcut4(Config) when is_list(Config) ->
+    ?line run_trace_with_shortcut(fun_for(msg_false), [], tp),
+    ?line run_trace_with_shortcut(fun_for(msg_false), [], tpl).
+
+cant_specify_local_and_flush(suite) ->
+    [];
+cant_specify_local_and_flush(doc) ->
+    ["Can't specify local and flush"];
+cant_specify_local_and_flush(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line flush_unsupported_with_ip_trace_port = try ttb:tracer([ServerNode, ClientNode], [{flush, 1000}, {file, {local, ?FNAME}}])
+						 catch
+						     exit:flush_unsupported_with_ip_trace_port ->
+							 flush_unsupported_with_ip_trace_port
+						 end,
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode).
+
+trace_sorted_by_default(suite) ->
+    [];
+trace_sorted_by_default(doc) ->
+    ["Trace sorted by default"];
+trace_sorted_by_default(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_local(ServerNode, ClientNode, ?FILE),
+    ?line ttb_helper:msgs(2),
+    ?line {_, D} = ttb:stop([return_fetch_dir]),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, node_call_handler()}, {disable_sort, false}]),
+    {ok, Ret} = file:consult(?OUTPUT),
+    ?line [ClientNode,ServerNode,ClientNode,ServerNode,ServerNode] = Ret.
+
+disable_sorting(suite) ->
+    [];
+disable_sorting(doc) ->
+    ["Disable sorting"];
+disable_sorting(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_local(ServerNode, ClientNode, ?FILE),
+    ?line ttb_helper:msgs(2),
+    ?line {_, D} = ttb:stop([return_fetch_dir]),
+    ?line ?t:stop_node(ServerNode),
+    ?line ?t:stop_node(ClientNode),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, node_call_handler()}, {disable_sort, true}]),
+    {ok, Ret} = file:consult(?OUTPUT),
+    ?line [ClientNode,ClientNode,ServerNode,ServerNode,ServerNode] = Ret.
+
+%% -----------------------------------------------------------------------------
+%% tests for autoresume of tracing
+%% -----------------------------------------------------------------------------
+
+trace_resumed_after_node_restart(suite) ->
+    [];
+trace_resumed_after_node_restart(doc) ->
+    ["Test trace resumed after node restart, trace to files on remote node."];
+trace_resumed_after_node_restart(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_with_resume(ServerNode, ClientNode, ?FNAME),
+    ?line logic(2,6,file).
+
+trace_resumed_after_node_restart_ip(suite) ->
+    [];
+trace_resumed_after_node_restart_ip(doc) ->
+    ["Test trace resumed after node restart, trace via tcp/ip to local node."];
+trace_resumed_after_node_restart_ip(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_with_resume(ServerNode, ClientNode, {local, ?FNAME}),
+    ?line logic(2,6,local).
+
+trace_resumed_after_node_restart_wrap(suite) ->
+    [];
+trace_resumed_after_node_restart_wrap(doc) ->
+    ["Test trace resumed after node restart, wrap option."];
+trace_resumed_after_node_restart_wrap(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_with_resume(ServerNode, ClientNode, {wrap, ?FNAME, 10, 4}),
+    ?line logic(1,4,file).
+
+trace_resumed_after_node_restart_wrap_mult(suite) ->
+    [];
+trace_resumed_after_node_restart_wrap_mult(doc) ->
+    ["Test trace resumed after node restart, wrap option, multiple files."];
+trace_resumed_after_node_restart_wrap_mult(Config) when is_list(Config) ->
+    ?line {ServerNode, ClientNode} = start_client_and_server(),
+    ?line begin_trace_with_resume(ServerNode, ClientNode, {wrap, ?FNAME, 10, 4}),
+    ?line logic(20,8,file).
+
+logic(N, M, TracingType) ->
+    helper_msgs(N, TracingType),
+    ?t:stop_node(ttb_helper:get_node(client)),
+    timer:sleep(2500),
+    ?line {ok,ClientNode} = ?t:start_node(client,slave,[]),
+    ?line ok = ttb_helper:c(code, add_paths, [code:get_path()]),
+    ?line ttb_helper:c(client, init, []),
+    ?line helper_msgs(N, TracingType),
+    ?line {_, D} = ttb:stop([return_fetch_dir]),
+    ?line ?t:stop_node(ttb_helper:get_node(server)),
+    ?line ?t:stop_node(ClientNode),
+    ?line ttb:format(D, [{out, ?OUTPUT}, {handler, ret_caller_call_handler2()}]),
+    ?line {ok, Ret} = file:consult(?OUTPUT),
+    ?line M = length(Ret).
+
+begin_trace_with_resume(ServerNode, ClientNode, Dest) ->
+    ?line {ok, _} = ttb:tracer([ServerNode,ClientNode], [{file, Dest}, resume]),
+    ?line ttb:p(all, [call, timestamp]),
+    ?line ttb:tp(server, received, []),
+    ?line ttb:tp(client, put, []),
+    ?line ttb:tp(client, get, []).
+
+ret_caller_call_handler2() ->
+    {fun(A, {trace_ts, _, call, _, _} ,_,_) -> io:format(A, "ok.~n", []);
+	(_, _, _, _) -> ok end, []}.
+
+helper_msgs(N, TracingType) ->
+    case TracingType of
+        local ->
+            ttb_helper:msgs_ip(N);
+        _ ->
+            ttb_helper:msgs(N)
+    end.
diff --git a/lib/observer/test/ttb_helper.erl b/lib/observer/test/ttb_helper.erl
new file mode 100644
index 0000000000..19fdc0e159
--- /dev/null
+++ b/lib/observer/test/ttb_helper.erl
@@ -0,0 +1,157 @@
+-module(ttb_helper). %%Nodes control
+-compile(export_all).
+
+%%API
+%%get() -> client:get()
+%%put(X) -> client:put(X)
+%%msgs(N) -> N times client:put(test_msg)
+%%clear() -> restart server
+%%ensure_running() / stop() -> start/stop nodes
+%%get_node(atom) -> return atom@hostname
+
+-define(NODE_CMD(Name),
+	"erl -sname " ++ atom_to_list(Name) ++
+	" -pa .. -pa . -detached -run ttb_helper send_ok").
+-define(REG_NAME, nc_testing).
+
+new_fun() ->
+    fun(_, end_of_trace, _, Dict) -> io:format("~p~n", [dict:to_list(Dict)]);
+       (_, T, _, Dict) -> case element(2, T) of
+                              {Pid, _, _} ->
+                                  dict:update_counter(Pid, 1, Dict);
+                              Pid ->
+                                  dict:update_counter(Pid, 1, Dict)
+                          end
+    end.
+
+new_fun_2() ->
+    fun(_, end_of_trace, _, Dict) -> io:format("~p~n", [dict:to_list(Dict)]);
+       (_, T, _, Dict) ->  case element(2, T) of
+                               {_, Name, _} when is_atom(Name)->
+                                  dict:update_counter(Name, 1, Dict);
+                              Pid ->
+                                  dict:update_counter(Pid, 1, Dict)
+                          end
+
+    end.
+
+
+ensure_running() ->
+    try_start_node(server),
+    try_start_node(client),
+    clear().
+
+try_start_node(Node) ->
+    global:unregister_name(?REG_NAME),
+    global:register_name(?REG_NAME, self()),
+    global:sync(),
+    N = get_node(Node),
+    case net_adm:ping(N) of
+	pong ->
+	    io:format("Node ~p already running~n", [N]);
+	_ ->
+	    io:format("Starting node ~p... ~p ", [Node, os:cmd(?NODE_CMD(Node))]),
+	    recv()
+    end.
+
+clear() ->
+    s(server, stop, []),
+    init().
+
+stop() ->
+    s(init, stop, []),
+    c(init, stop, []).
+
+msgs(N) ->
+    [c(client, put, [test_msg]) || _ <- lists:seq(1, N)],
+    s(server, received, [a,b]),
+    [dbg:flush_trace_port(Node) || Node <- [get_node(client), get_node(server)]].
+
+msgs_ip(N) ->
+    [c(client, put, [test_msg]) || _ <- lists:seq(1, N)],
+    s(server, received, [a,b]),
+    timer:sleep(100). %% allow trace messages to arrive over tcp/ip
+
+run() ->
+    ttb({local, "A"}),
+    msgs(2),
+    c(erlang, whereis, [ttbt]).
+
+get() -> c(client, get, []).
+put(Thing) -> c(client, put, [Thing]).
+
+get_node(Node) ->
+    {ok, Host} = inet:gethostname(),
+    list_to_atom(atom_to_list(Node) ++ "@" ++ Host).
+
+trace_setup() ->
+    ttb:p(all, call),
+    ttb:tp(server, received, []),
+    ttb:tp(client, put, []),
+    ttb:tp(client, get, []).
+
+ttb() -> ttb("A").
+ttb(File) ->
+    ttb:tracer([get_node(client), get_node(server)], [{file, File}, resume]),
+    ttb:p(all, [call, timestamp]),
+    ttb:tp(client, put, []),
+    ttb:tp(client, get, []),
+    ttb:tp(server, received, []).
+
+tc() ->
+    TC = example_config_gen:create_trace_case("dummy comment"),
+    Patterns = example_config_gen:create_pattern(client, put, 1, return),
+    Flags = example_config_gen:create_flags(all, call),
+    Merge = example_config_gen:create_merge_conf(show_handler(), "dummy merge comment"),
+    Merge2 = example_config_gen:create_merge_conf(undefined, "dummy merge comment"),
+    TC2 = example_config_gen:add_pattern(Patterns, TC),
+    TC3 = example_config_gen:add_flags(Flags, TC2),
+    TC4 = example_config_gen:add_merge_conf(Merge, TC3),
+    TC5 = example_config_gen:add_merge_conf(Merge2, TC4),
+    example_config_gen:add_nodes([get_node(client), get_node(server)], TC5).
+
+
+show(X) ->
+    io:format(user, "Showing: ~p~n", [X]).
+
+state_handler() ->
+    {fun(_,_,I,S) -> io:format(user, "Got from ~p: ~p~n", [I,S]), S+1 end, 0}.
+
+show_handler() ->
+    {fun(A,B,_,_) -> io:format(A, "~p~n", [B]) end, []}.
+
+opts() ->
+    [[get_node(client), get_node(server)],
+     [{server, received, '_', []},
+      {client, put, '_', []},
+      {client, get, '_', []}],
+     {all, call},
+     [{file, "TEST"}]].
+
+overload_check(check) ->
+    true;
+overload_check(_) ->
+    ok.
+%%%Internal
+s(M, F, A) -> rpc:call(get_node(server), M, F, A).
+c(M, F, A) -> rpc:call(get_node(client), M, F, A).
+
+send_ok() ->
+    pong = net_adm:ping(get_node(test)),
+    global:sync(),
+    global:send(?REG_NAME, node()).
+
+init() ->
+    True = s(server, start, []),
+    io:format("ok1: ~p~n", [True]),
+    true = c(client, init, [get_node(server)]).
+
+recv() ->
+    receive
+	Node ->
+	    io:format("Node ~p ready.~n", [Node]),
+            ok
+    after 5000 ->
+	    io:format("Startup failed~n",[]),
+	    throw(startup_failed)
+    end.
diff --git a/lib/orber/include/Makefile b/lib/orber/include/Makefile
deleted file mode 100644
index 219b7085e6..0000000000
--- a/lib/orber/include/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1998-2009. 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
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/orber-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-EXTERNAL_HRL_FILES= ../include/corba.hrl \
-	../include/ifr_types.hrl \
-	../include/orber_pi.hrl
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-debug opt clean docs:
-
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-
-release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
-
-
-release_docs_spec:
-
-
diff --git a/lib/os_mon/c_src/cpu_sup.c b/lib/os_mon/c_src/cpu_sup.c
index fbf318c614..e3bdbd1489 100644
--- a/lib/os_mon/c_src/cpu_sup.c
+++ b/lib/os_mon/c_src/cpu_sup.c
@@ -191,7 +191,10 @@ int main(int argc, char** argv) {
 static cpu_t *read_procstat(FILE *fp, cpu_t *cpu) {
     char buffer[BUFFERSIZE];
 
-    fgets(buffer, BUFFERSIZE, fp);
+    if (fgets(buffer, BUFFERSIZE, fp) == NULL) {
+	memset(cpu, 0, sizeof(cpu_t));
+	return cpu;
+    }
     sscanf(buffer, "cpu%u %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
 	&(cpu->id),
 	&(cpu->user),
@@ -223,7 +226,11 @@ static void util_measure(unsigned int **result_vec, int *result_sz) {
 	return;
     }
 
-    fgets(buffer, BUFFERSIZE, fp); /*ignore read*/
+	/*ignore read*/
+    if (fgets(buffer, BUFFERSIZE, fp) == NULL) {
+	*result_sz = 0;
+	return;
+    }
     rv = *result_vec; 
     rv[0] = no_of_cpus;
     rv[1] = CU_VALUES;
@@ -447,8 +454,12 @@ static void sendv(unsigned int data[], int ints) {
 }
 
 static void error(char* err_msg) {
-  write(FD_ERR, err_msg, strlen(err_msg));
-  write(FD_ERR, "\n", 1);
+  /* 
+   * if we get error here we have trouble,
+   * silence unnecessary warnings
+   */
+  if(write(FD_ERR, err_msg, strlen(err_msg)));
+  if(write(FD_ERR, "\n", 1));
   exit(-1);
 }
 
diff --git a/lib/parsetools/src/leex.erl b/lib/parsetools/src/leex.erl
index 942e9928b1..cdf20461d9 100644
--- a/lib/parsetools/src/leex.erl
+++ b/lib/parsetools/src/leex.erl
@@ -73,12 +73,15 @@
 %%% Interface to erl_compile.
 
 compile(Input0, Output0,
-        #options{warning = WarnLevel, verbose=Verbose, includes=Includes}) ->
+        #options{warning = WarnLevel, verbose=Verbose, includes=Includes,
+		 specific=Specific}) ->
     Input = assure_extension(shorten_filename(Input0), ".xrl"),
     Output = assure_extension(shorten_filename(Output0), ".erl"),
     Includefile = lists:sublist(Includes, 1),
+    Werror = proplists:get_bool(warnings_as_errors, Specific),
     Opts = [{scannerfile,Output},{includefile,Includefile},{verbose,Verbose},
-            {report_errors,true},{report_warnings,WarnLevel > 0}],
+            {report_errors,true},{report_warnings,WarnLevel > 0},
+	    {warnings_as_errors, Werror}],
     case file(Input, Opts) of
         {ok, _} ->
             ok;
@@ -107,7 +110,7 @@ file(File, Opts0) ->
     St = try
              {ok,REAs,Actions,Code,St2} = parse_file(St1),
              {DFA,DF} = make_dfa(REAs, St2),
-             case werr(St2) of
+             case werror(St2) of
                  false ->
                      St3 = out_file(St2, DFA, DF, Actions, Code),
                      case lists:member(dfa_graph, St3#leex.opts) of
@@ -259,9 +262,9 @@ leex_ret(St) ->
     report_warnings(St),
     Es = pack_errors(St#leex.errors),
     Ws = pack_warnings(St#leex.warnings),
-    Werr = werr(St),
+    Werror = werror(St),
     if 
-        Werr ->
+        Werror ->
             do_error_return(St, Es, Ws);
         Es =:= [] -> 
             case member(return_warnings, St#leex.opts) of
@@ -278,9 +281,9 @@ do_error_return(St, Es, Ws) ->
         false -> error
     end.
 
-werr(St) ->
-    member(warnings_as_errors, St#leex.opts)
-        andalso length(St#leex.warnings) > 0.
+werror(St) ->
+    St#leex.warnings =/= []
+	andalso member(warnings_as_errors, St#leex.opts).
 
 pack_errors([{File,_} | _] = Es) ->
     [{File, flatmap(fun({_,E}) -> [E] end, sort(Es))}];
@@ -304,15 +307,24 @@ report_errors(St) ->
              end, report_errors, St#leex.opts).
 
 report_warnings(St) ->
-    when_opt(fun () ->
-                     foreach(fun({File,{none,Mod,W}}) -> 
-                                     io:fwrite("~s: Warning: ~s\n",
-                                               [File,Mod:format_error(W)]);
-                                ({File,{Line,Mod,W}}) -> 
-                                     io:fwrite("~s:~w: Warning: ~s\n",
-                                               [File,Line,Mod:format_error(W)])
-                             end, sort(St#leex.warnings))
-             end, report_warnings, St#leex.opts).
+    Werror = member(warnings_as_errors, St#leex.opts),
+    Prefix = case Werror of
+		 true -> "";
+		 false -> "Warning: "
+	     end,
+    ReportWerror = Werror andalso member(report_errors, St#leex.opts),
+    ShouldReport = member(report_warnings, St#leex.opts) orelse ReportWerror,
+    when_bool(fun () ->
+		      foreach(fun({File,{none,Mod,W}}) ->
+				      io:fwrite("~s: ~s~s\n",
+						[File,Prefix,
+						 Mod:format_error(W)]);
+				 ({File,{Line,Mod,W}}) ->
+				      io:fwrite("~s:~w: ~s~s\n",
+						[File,Line,Prefix,
+						 Mod:format_error(W)])
+			      end, sort(St#leex.warnings))
+	      end, ShouldReport).
 
 -spec add_error(_, #leex{}) -> no_return().
 add_error(E, St) ->
@@ -360,6 +372,12 @@ when_opt(Do, Opt, Opts) ->
         false -> ok
     end.
 
+when_bool(Do, Bool) ->
+    case Bool of
+	true -> Do();
+	false -> ok
+    end.
+
 verbose_print(St, Format, Args) ->
     when_opt(fun () -> io:fwrite(Format, Args) end, verbose, St#leex.opts).
 
diff --git a/lib/parsetools/src/yecc.erl b/lib/parsetools/src/yecc.erl
index 72cff3af92..354d56527d 100644
--- a/lib/parsetools/src/yecc.erl
+++ b/lib/parsetools/src/yecc.erl
@@ -133,12 +133,15 @@
 %%% Interface to erl_compile.
 
 compile(Input0, Output0, 
-        #options{warning = WarnLevel, verbose=Verbose, includes=Includes}) ->
+        #options{warning = WarnLevel, verbose=Verbose, includes=Includes,
+		 specific=Specific}) ->
     Input = shorten_filename(Input0),
     Output = shorten_filename(Output0),
     Includefile = lists:sublist(Includes, 1),
+    Werror = proplists:get_bool(warnings_as_errors, Specific),
     Opts = [{parserfile,Output}, {includefile,Includefile}, {verbose,Verbose},
-            {report_errors, true}, {report_warnings, WarnLevel > 0}],
+            {report_errors, true}, {report_warnings, WarnLevel > 0},
+	    {warnings_as_errors, Werror}],
     case file(Input, Opts) of
         {ok, _OutFile} ->
             ok;
@@ -411,15 +414,15 @@ infile(Parent, Infilex, Options) ->
              {error, Reason} ->
                  add_error(St0#yecc.infile, none, {file_error, Reason}, St0)
          end,
-    case {St#yecc.errors, werr(St)} of
+    case {St#yecc.errors, werror(St)} of
         {[], false} -> ok;
         _ -> _ = file:delete(St#yecc.outfile)
     end,
     Parent ! {self(), yecc_ret(St)}.
 
-werr(St) ->
-    member(warnings_as_errors, St#yecc.options)
-        andalso length(St#yecc.warnings) > 0.
+werror(St) ->
+    St#yecc.warnings =/= []
+	andalso member(warnings_as_errors, St#yecc.options).
 
 outfile(St0) ->
     case file:open(St0#yecc.outfile, [write, delayed_write]) of
@@ -783,9 +786,9 @@ yecc_ret(St0) ->
     report_warnings(St),
     Es = pack_errors(St#yecc.errors),
     Ws = pack_warnings(St#yecc.warnings),
-    Werr = werr(St),
+    Werror = werror(St),
     if 
-        Werr ->
+        Werror ->
             do_error_return(St, Es, Ws);
         Es =:= [] -> 
             case member(return_warnings, St#yecc.options) of
@@ -849,14 +852,22 @@ report_errors(St) ->
     end.
 
 report_warnings(St) ->
-    case member(report_warnings, St#yecc.options) of
+    Werror = member(warnings_as_errors, St#yecc.options),
+    Prefix = case Werror of
+		 true -> "";
+		 false -> "Warning: "
+	     end,
+    ReportWerror = Werror andalso member(report_errors, St#yecc.options),
+    case member(report_warnings, St#yecc.options) orelse ReportWerror of
         true ->
             foreach(fun({File,{none,Mod,W}}) -> 
-                            io:fwrite(<<"~s: Warning: ~s\n">>, 
-                                      [File,Mod:format_error(W)]);
+                            io:fwrite(<<"~s: ~s~s\n">>,
+                                      [File,Prefix,
+				       Mod:format_error(W)]);
                        ({File,{Line,Mod,W}}) -> 
-                            io:fwrite(<<"~s:~w: Warning: ~s\n">>, 
-                                      [File,Line,Mod:format_error(W)])
+                            io:fwrite(<<"~s:~w: ~s~s\n">>,
+                                      [File,Line,Prefix,
+				       Mod:format_error(W)])
                     end, sort(St#yecc.warnings));
         false -> 
             ok
diff --git a/lib/parsetools/test/leex_SUITE.erl b/lib/parsetools/test/leex_SUITE.erl
index 48312445ef..1e50aedf07 100644
--- a/lib/parsetools/test/leex_SUITE.erl
+++ b/lib/parsetools/test/leex_SUITE.erl
@@ -152,6 +152,7 @@ file(Config) when is_list(Config) ->
     ?line writable(Dotfile),
     file:delete(Dotfile),
 
+    ok = file:delete(Scannerfile),
     Warn = <<"Definitions.1998\n"
              "D  = [0-9]\n"
              "Rules.\n"
@@ -159,11 +160,15 @@ file(Config) when is_list(Config) ->
              "Erlang code.\n">>,
     ok = file:write_file(Filename, Warn),
     error = leex:file(Filename, [warnings_as_errors]),
+    false = filelib:is_regular(Scannerfile),
     error = leex:file(Filename, [return_warnings,warnings_as_errors]),
-    {ok,Scannerfile,[{Filename,[{1,leex,ignored_characters}]}]} =
-	leex:file(Filename, [return_warnings]),
+    false = filelib:is_regular(Scannerfile),
     {error,_,[{Filename,[{1,leex,ignored_characters}]}]} =
-	leex:file(Filename, [return_errors,warnings_as_errors]),
+        leex:file(Filename, [return_errors,warnings_as_errors]),
+    false = filelib:is_regular(Scannerfile),
+    {ok,Scannerfile,[{Filename,[{1,leex,ignored_characters}]}]} =
+        leex:file(Filename, [return_warnings]),
+    true = filelib:is_regular(Scannerfile),
 
     file:delete(Filename),
     ok.
diff --git a/lib/parsetools/test/yecc_SUITE.erl b/lib/parsetools/test/yecc_SUITE.erl
index 0133524950..a5f66b48e9 100644
--- a/lib/parsetools/test/yecc_SUITE.erl
+++ b/lib/parsetools/test/yecc_SUITE.erl
@@ -173,6 +173,7 @@ syntax(Config) when is_list(Config) ->
     %% Report errors. Very simple test of format_error/1.
     Ret = [return, {report, true}],
     Filename = filename:join(Dir, "file.yrl"),
+    Parserfile = filename:join(Dir, "file.erl"),
     Parserfile1 = filename:join(Dir, "a file"),
 
     ?line ok = file:write_file(Filename, <<"">>),
@@ -248,12 +249,17 @@ syntax(Config) when is_list(Config) ->
         yecc:file(Filename, Ret),
 
     %% Bad declaration with warnings_as_errors.
+    ok = file:delete(Parserfile),
     error = yecc:file(Filename, [warnings_as_errors]),
+    false = filelib:is_regular(Parserfile),
     error = yecc:file(Filename, [return_warnings,warnings_as_errors]),
-    {ok,_,[{_,[{2,yecc,bad_declaration}]}]} =
-        yecc:file(Filename, [return_warnings]),
+    false = filelib:is_regular(Parserfile),
     {error,_,[{_,[{2,yecc,bad_declaration}]}]} =
         yecc:file(Filename, [return_errors,warnings_as_errors]),
+    false = filelib:is_regular(Parserfile),
+    {ok,_,[{_,[{2,yecc,bad_declaration}]}]} =
+        yecc:file(Filename, [return_warnings]),
+    true = filelib:is_regular(Parserfile),
 
     %% Bad declaration.
     ?line ok = file:write_file(Filename, 
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index 9a3832c68b..b3ce49e2ca 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -79,7 +79,7 @@
     <p><code> rsa_padding() =  'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding'
     | 'rsa_no_padding'</code></p>
     
-    <p><code> rsa_digest_type()  = 'md5' | 'sha' </code></p>
+    <p><code> rsa_digest_type()  = 'md2' | 'md5' | 'sha' </code></p>
 
     <p><code> dss_digest_type()  = 'none' | 'sha' </code></p>
 
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl
index 5ab9642279..61082a1ec5 100644
--- a/lib/public_key/src/pubkey_cert.erl
+++ b/lib/public_key/src/pubkey_cert.erl
@@ -38,7 +38,7 @@
 %%====================================================================
 
 %%--------------------------------------------------------------------
--spec verify_data(DER::binary()) -> {md5 | sha,  binary(), binary()}.
+-spec verify_data(DER::binary()) -> {md2 | md5 | sha,  binary(), binary()}.
 %%
 %% Description: Extracts data from DerCert needed to call public_key:verify/4.
 %%--------------------------------------------------------------------	 
@@ -378,6 +378,8 @@ digest_type(?sha1WithRSAEncryption) ->
     sha;
 digest_type(?md5WithRSAEncryption) ->
     md5;
+digest_type(?md2WithRSAEncryption) ->
+    md2;
 digest_type(?'id-dsa-with-sha1') ->
     sha.
 
diff --git a/lib/public_key/src/public_key.appup.src b/lib/public_key/src/public_key.appup.src
index 4986801dad..18fae54d18 100644
--- a/lib/public_key/src/public_key.appup.src
+++ b/lib/public_key/src/public_key.appup.src
@@ -1,6 +1,12 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
+  {"0.12",
+   [
+    {update, public_key, soft, soft_purge, soft_purge, []},
+    {update, pubkey_cert, soft, soft_purge, soft_purge, []},
+   ]
+  },
  {"0.11",
    [
     {update, public_key, soft, soft_purge, soft_purge, []},
@@ -35,6 +41,12 @@
   }
  ],
  [
+  {"0.12",
+   [
+    {update, public_key, soft, soft_purge, soft_purge, []},
+    {update, pubkey_cert, soft, soft_purge, soft_purge, []},
+   ]
+  },
   {"0.11",
    [
     {update, public_key, soft, soft_purge, soft_purge, []},
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index 33fcce2c44..940efffcd0 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -55,7 +55,7 @@
 -type rsa_padding()          :: 'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding' 
 			      | 'rsa_no_padding'.
 -type public_crypt_options() :: [{rsa_pad, rsa_padding()}].
--type rsa_digest_type()      :: 'md5' | 'sha'.
+-type rsa_digest_type()      :: 'md2' | 'md5' | 'sha'.
 -type dss_digest_type()      :: 'none' | 'sha'.
 
 -define(UINT32(X), X:32/unsigned-big-integer).
@@ -307,7 +307,8 @@ encrypt_private(PlainText, #'RSAPrivateKey'{modulus = N,
 sign(PlainText, DigestType,  #'RSAPrivateKey'{modulus = N,  publicExponent = E,
 					      privateExponent = D}) 
   when is_binary(PlainText),
-       (DigestType == md5 orelse
+       (DigestType == md2 orelse
+	DigestType == md5 orelse
 	DigestType == sha) ->
     
     crypto:rsa_sign(DigestType, sized_binary(PlainText), [crypto:mpint(E),
@@ -335,7 +336,10 @@ sign(PlainText, sha, #'DSAPrivateKey'{p = P, q = Q, g = G, x = X})
 %%--------------------------------------------------------------------
 verify(PlainText, DigestType, Signature, 
        #'RSAPublicKey'{modulus = Mod, publicExponent = Exp}) 
-  when is_binary (PlainText), DigestType == sha; DigestType == md5 ->
+  when is_binary(PlainText),
+       (DigestType == md2 orelse
+	DigestType == md5 orelse
+	DigestType == sha) ->
     crypto:rsa_verify(DigestType,
 		      sized_binary(PlainText), 
 		      sized_binary(Signature), 
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index b11e4d092a..a9c198c581 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -537,7 +537,10 @@ rsa_sign_verify(Config) when is_list(Config) ->
     false = public_key:verify(Msg, sha, <<1:8, RSASign/binary>>, PublicRSA), 
 
     RSASign1 = public_key:sign(Msg, md5, PrivateRSA),
-    true = public_key:verify(Msg, md5, RSASign1, PublicRSA).
+    true = public_key:verify(Msg, md5, RSASign1, PublicRSA),
+
+    RSASign2 = public_key:sign(Msg, md2, PrivateRSA),
+    true = public_key:verify(Msg, md2, RSASign2, PublicRSA).
     
 %%--------------------------------------------------------------------
 
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 3c6b012152..66ac78a65d 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 0.12
+PUBLIC_KEY_VSN = 0.13
diff --git a/lib/runtime_tools/doc/src/dbg.xml b/lib/runtime_tools/doc/src/dbg.xml
index a17896e4ff..c7c5cd4ff0 100644
--- a/lib/runtime_tools/doc/src/dbg.xml
+++ b/lib/runtime_tools/doc/src/dbg.xml
@@ -723,7 +723,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard) c
           value from the last invocation of the fun. The initial value
           of the second parameter is specified in the <c>InitialData</c>
           part of the <c>HandlerSpec</c>. The <c>HandlerFun</c> may
-          chose any appropriate action to take when invoked, and can
+          choose any appropriate action to take when invoked, and can
           save a state for the next invocation by returning it.
           </p>
         <p>If <c>Type</c> is a port, then the second parameter should
@@ -783,7 +783,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard) c
         <p>This function creates a trace port generating <em>fun</em>.
           The <em>fun</em> takes no arguments and returns a newly opened
           trace port. The return value from this function is suitable as
-          a second parameter to tracer/2, i. e. <c>dbg:tracer(port, dbg:trace_port(ip, 4711))</c>. </p>
+          a second parameter to tracer/2, i.e. <c>dbg:tracer(port, dbg:trace_port(ip, 4711))</c>. </p>
         <p>A trace port is an
           Erlang port to a dynamically linked in driver that handles
           trace messages directly, without the overhead of sending them
@@ -869,9 +869,9 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard) c
       <desc>
         <p>This function is used to do a control operation on the
           active trace port driver on the given node
-          (<c>Nodename</c>). Which operations that are allowed as well
-          as their return values are depending on which trace driver
-          that is used.</p>
+          (<c>Nodename</c>). Which operations are allowed as well
+          as their return values depend on which trace driver
+          is used.</p>
         <p>Returns either <c>ok</c> or <c>{ok, Result}</c> 
           if the operation was successful, or <c>{error, Reason}</c> 
           if the current tracer is a process 
diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile
index 4f831f3dd8..46b570210a 100644
--- a/lib/runtime_tools/src/Makefile
+++ b/lib/runtime_tools/src/Makefile
@@ -46,7 +46,8 @@ MODULES= \
 	runtime_tools_sup \
 	dbg \
 	percept_profile \
-	observer_backend
+	observer_backend \
+	ttb_autostart
 HRL_FILES= ../include/observer_backend.hrl
 
 ERL_FILES= $(MODULES:%=%.erl)
diff --git a/lib/runtime_tools/src/observer_backend.erl b/lib/runtime_tools/src/observer_backend.erl
index 0f428de07a..9c1f9da5b1 100644
--- a/lib/runtime_tools/src/observer_backend.erl
+++ b/lib/runtime_tools/src/observer_backend.erl
@@ -31,6 +31,7 @@
 	 ttb_write_binary/2,
 	 ttb_stop/1,
 	 ttb_fetch/2,
+         ttb_resume_trace/0,
 	 ttb_get_filenames/1]).
 -define(CHUNKSIZE,8191). % 8 kbytes - 1 byte
 
@@ -92,16 +93,22 @@ etop_collect([], Acc) -> Acc.
 %%
 %% ttb backend
 %%
-ttb_init_node(MetaFile,PI,Traci) ->
+ttb_init_node(MetaFile_0,PI,Traci) ->
     if
-	is_list(MetaFile);
-	is_atom(MetaFile) ->
+	is_list(MetaFile_0);
+	is_atom(MetaFile_0) ->
+	    {ok, Cwd} = file:get_cwd(),
+	    MetaFile = filename:join(Cwd, MetaFile_0),
 	    file:delete(MetaFile);
 	true -> 				% {local,_,_}
-	    ok
+	    MetaFile = MetaFile_0
+    end,
+    case proplists:get_value(resume, Traci) of
+        {true, _} -> (autostart_module()):write_config(Traci);
+        _    -> ok
     end,
     Self = self(),
-    MetaPid = spawn(fun() -> ttb_meta_tracer(MetaFile,PI,Self) end),
+    MetaPid = spawn(fun() -> ttb_meta_tracer(MetaFile,PI,Self,Traci) end),
     receive {MetaPid,started} -> ok end,
     MetaPid ! {metadata,Traci},
     case PI of
@@ -111,13 +118,14 @@ ttb_init_node(MetaFile,PI,Traci) ->
 	false ->
 	    ok
     end,
-    {ok,MetaPid}.
+    {ok,MetaFile,MetaPid}.
 
 ttb_write_trace_info(MetaPid,Key,What) ->
     MetaPid ! {metadata,Key,What},
     ok.
 
-ttb_meta_tracer(MetaFile,PI,Parent) ->
+ttb_meta_tracer(MetaFile,PI,Parent,SessionData) ->
+    erlang:monitor(process, proplists:get_value(ttb_control, SessionData)),
     case PI of
 	true ->
 	    ReturnMS = [{'_',[],[{return_trace}]}],
@@ -130,22 +138,29 @@ ttb_meta_tracer(MetaFile,PI,Parent) ->
 	    ok
     end,
     Parent ! {self(),started},
-    ttb_meta_tracer_loop(MetaFile,PI,dict:new()).
+    case proplists:get_value(overload_check, SessionData) of
+        {Ms, M, F} ->
+            catch M:F(init),
+            erlang:send_after(Ms, self(), overload_check);
+        _ ->
+            ok
+    end,
+    ttb_meta_tracer_loop(MetaFile,PI,dict:new(),SessionData).
 
-ttb_meta_tracer_loop(MetaFile,PI,Acc) ->
+ttb_meta_tracer_loop(MetaFile,PI,Acc,State) ->
     receive
 	{trace_ts,_,call,{erlang,register,[Name,Pid]},_} ->
 	    ttb_store_meta({pid,{Pid,Name}},MetaFile),
-	    ttb_meta_tracer_loop(MetaFile,PI,Acc);
+	    ttb_meta_tracer_loop(MetaFile,PI,Acc,State);
 	{trace_ts,_,call,{global,register_name,[Name,Pid]},_} ->
 	    ttb_store_meta({pid,{Pid,{global,Name}}},MetaFile),
-	    ttb_meta_tracer_loop(MetaFile,PI,Acc);
+	    ttb_meta_tracer_loop(MetaFile,PI,Acc,State);
 	{trace_ts,CallingPid,call,{erlang,spawn_opt,[{M,F,Args,_}]},_} ->
 	    MFA = {M,F,length(Args)},
 	    NewAcc = dict:update(CallingPid,
 				 fun(Old) -> [MFA|Old] end, [MFA], 
 				 Acc),
-	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc);
+	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc,State);
 	{trace_ts,CallingPid,return_from,{erlang,spawn_opt,_Arity},Ret,_} ->
 	    case Ret of
 		{NewPid,_Mref} when is_pid(NewPid) -> ok;
@@ -158,14 +173,14 @@ ttb_meta_tracer_loop(MetaFile,PI,Acc) ->
 				    T 
 			    end,
 			    Acc),
-	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc);
+	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc,State);
 	{trace_ts,CallingPid,call,{erlang,Spawn,[M,F,Args]},_} 
 	when Spawn==spawn;Spawn==spawn_link ->
 	    MFA = {M,F,length(Args)},
 	    NewAcc = dict:update(CallingPid,
 				 fun(Old) -> [MFA|Old] end, [MFA], 
 				 Acc),
-	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc);
+	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc,State);
 
 	{trace_ts,CallingPid,return_from,{erlang,Spawn,_Arity},NewPid,_} 
 	when Spawn==spawn;Spawn==spawn_link ->
@@ -176,28 +191,53 @@ ttb_meta_tracer_loop(MetaFile,PI,Acc) ->
 				    T
 			    end,
 			    Acc),
-	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc);
+	    ttb_meta_tracer_loop(MetaFile,PI,NewAcc,State);
 
 	{metadata,Data} when is_list(Data) ->
 	    ttb_store_meta(Data,MetaFile),
-	    ttb_meta_tracer_loop(MetaFile,PI,Acc);
+	    ttb_meta_tracer_loop(MetaFile,PI,Acc,State);
 
 	{metadata,Key,Fun} when is_function(Fun) ->
 	    ttb_store_meta([{Key,Fun()}],MetaFile),
-	    ttb_meta_tracer_loop(MetaFile,PI,Acc);
+	    ttb_meta_tracer_loop(MetaFile,PI,Acc,State);
 
 	{metadata,Key,What} ->
 	    ttb_store_meta([{Key,What}],MetaFile),
-	    ttb_meta_tracer_loop(MetaFile,PI,Acc);
-
-	stop when PI=:=true ->
-	    erlang:trace_pattern({erlang,spawn,3},false,[meta]),
+	    ttb_meta_tracer_loop(MetaFile,PI,Acc,State);
+        overload_check ->
+            {Ms, M, F} = proplists:get_value(overload_check, State),
+            case catch M:F(check) of
+                true ->
+                    erlang:trace(all, false, [all]),
+                    ControlPid = proplists:get_value(ttb_control, State),
+                    ControlPid ! {node_overloaded, node()},
+                    catch M:F(stop),
+                    ttb_meta_tracer_loop(MetaFile,PI,Acc,lists:keydelete(overload_check, 1, State));
+                _ ->
+                    erlang:send_after(Ms, self(), overload_check),
+                    ttb_meta_tracer_loop(MetaFile,PI,Acc, State)
+            end;
+     {'DOWN', _, _, _, _} ->
+            stop_seq_trace(),
+            self() ! stop,
+            ttb_meta_tracer_loop(MetaFile,PI,Acc, State);
+     stop when PI=:=true ->
+            try_stop_resume(State),
+            try_stop_overload_check(State),
+            erlang:trace_pattern({erlang,spawn,3},false,[meta]),
 	    erlang:trace_pattern({erlang,spawn_link,3},false,[meta]),
 	    erlang:trace_pattern({erlang,spawn_opt,1},false,[meta]),
 	    erlang:trace_pattern({erlang,register,2},false,[meta]),
 	    erlang:trace_pattern({global,register_name,2},false,[meta]);
 	stop ->
-	    ok
+            try_stop_resume(State),
+            try_stop_overload_check(State)
+    end.
+
+try_stop_overload_check(State) ->
+    case proplists:get_value(overload, State) of
+        undefined -> ok;
+        {_, M, F} -> catch M:F(stop)
     end.
 
 pnames() ->
@@ -222,6 +262,40 @@ pinfo(P,Globals) ->
 	undefined -> [] % the process has terminated
     end.
 
+autostart_module() ->
+    element(2, application:get_env(runtime_tools, ttb_autostart_module)).
+
+try_stop_resume(State) ->
+    case proplists:get_value(resume, State) of
+        true -> (autostart_module()):delete_config();
+        _    -> ok
+    end.
+
+ttb_resume_trace() ->
+    case (autostart_module()):read_config() of
+        {error, _} ->
+            ok;
+        {ok, Data} ->
+            Pid = proplists:get_value(ttb_control, Data),
+            {_, Timeout} = proplists:get_value(resume, Data),
+            case rpc:call(node(Pid), erlang, whereis, [ttb]) of
+                Pid ->
+                    Pid ! {noderesumed, node(), self()},
+                    wait_for_fetch_ready(Timeout);
+                _ ->
+                    ok
+            end,
+            (autostart_module()):delete_config(),
+            ok
+    end.
+
+wait_for_fetch_ready(Timeout) ->
+    receive
+        trace_resumed ->
+            ok
+    after Timeout ->
+            ok
+    end.
 
 ttb_store_meta(Data,{local,MetaFile,Port}) when is_list(Data) ->
     ttb_send_to_port(Port,MetaFile,Data);
@@ -273,6 +347,9 @@ ttb_stop(MetaPid) ->
     %% returns, and then the Port (in {local,MetaFile,Port})
     %% cannot be accessed any more.
     receive {'DOWN', Ref, process, MetaPid, _Info} -> ok end,
+    stop_seq_trace().
+
+stop_seq_trace() ->
     seq_trace:reset_trace(),
     seq_trace:set_system_tracer(false).
 
@@ -287,7 +364,7 @@ ttb_fetch(MetaFile,{Port,Host}) ->
 
 send_files({Sock,Host},[File|Files]) ->
     {ok,Fd} = file:open(File,[raw,read,binary]),
-    gen_tcp:send(Sock,<<1,(list_to_binary(File))/binary>>),
+    gen_tcp:send(Sock,<<1,(list_to_binary(filename:basename(File)))/binary>>),
     send_chunks(Sock,Fd),
     file:delete(File),
     send_files({Sock,Host},Files);
diff --git a/lib/runtime_tools/src/runtime_tools.app.src b/lib/runtime_tools/src/runtime_tools.app.src
index e6dc7a21d4..095567b165 100644
--- a/lib/runtime_tools/src/runtime_tools.app.src
+++ b/lib/runtime_tools/src/runtime_tools.app.src
@@ -22,7 +22,8 @@
     {modules,      [dbg,observer_backend,percept_profile,
 		    inviso_rt,inviso_rt_lib,inviso_rt_meta,
 		    inviso_as_lib,inviso_autostart,inviso_autostart_server,
-		    runtime_tools,runtime_tools_sup,erts_alloc_config]},
+		    runtime_tools,runtime_tools_sup,erts_alloc_config,
+		    ttb_autostart]},
     {registered,   [runtime_tools_sup,inviso_rt,inviso_rt_meta]},
     {applications, [kernel, stdlib]},
 %    {env,          [{inviso_autostart_mod,your_own_autostart_module}]},
diff --git a/lib/runtime_tools/src/runtime_tools_sup.erl b/lib/runtime_tools/src/runtime_tools_sup.erl
index 1a872c355d..4fcb2292d0 100644
--- a/lib/runtime_tools/src/runtime_tools_sup.erl
+++ b/lib/runtime_tools/src/runtime_tools_sup.erl
@@ -38,6 +38,8 @@
 init(AutoModArgs) ->
     Flags = {one_for_one, 0, 3600},
     Children = [{inviso_rt, {inviso_rt, start_link_auto, [AutoModArgs]}, 
-		 temporary, 3000, worker, [inviso_rt]}],
+		 temporary, 3000, worker, [inviso_rt]},
+                {ttb_autostart, {ttb_autostart, start_link, []},
+                 temporary, 3000, worker, [ttb_autostart]}],
     {ok, {Flags, Children}}.
 %% -----------------------------------------------------------------------------
diff --git a/lib/runtime_tools/src/ttb_autostart.erl b/lib/runtime_tools/src/ttb_autostart.erl
new file mode 100644
index 0000000000..4c6971c119
--- /dev/null
+++ b/lib/runtime_tools/src/ttb_autostart.erl
@@ -0,0 +1,55 @@
+%%%-------------------------------------------------------------------
+%%% File    : ttb_autostart.erl
+%%% Author  : Bartłomiej Puzoń <[email protected]>
+%%% Description : This supervisor is used to resume ttb tracing
+%%% Users are able to provide custom restart modules for *_config, as
+%%% file:write/read/delete may not be possible on diskless nodes.
+%%%
+%%% Created : 31 Jul 2010 by <[email protected]>
+%%%-------------------------------------------------------------------
+-module(ttb_autostart).
+
+-behaviour(gen_server).
+
+%% API
+-export([start_link/0,
+         read_config/0,
+         write_config/1,
+         delete_config/0]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+         terminate/2, code_change/3]).
+
+-define(DEF_AUTOSTART_MODULE, ?MODULE).
+-define(AUTOSTART_FILENAME, "ttb_autostart.bin").
+
+start_link() ->
+    gen_server:start_link(?MODULE, no_args, []).
+
+delete_config() ->
+    file:delete(?AUTOSTART_FILENAME).
+
+read_config() ->
+    case file:read_file(?AUTOSTART_FILENAME) of
+        {ok, Data} -> {ok, binary_to_term(Data)};
+        Error      -> Error
+    end.
+
+write_config(Data) ->
+    file:write_file(?AUTOSTART_FILENAME, term_to_binary(Data)).
+
+init(no_args) ->
+    case application:get_env(runtime_tools, ttb_autostart_module) of
+        {ok, _} ->  ok;
+        undefined -> application:set_env(runtime_tools, ttb_autostart_module, ?DEF_AUTOSTART_MODULE)
+    end,
+    observer_backend:ttb_resume_trace(),
+    %%As the process is not needed any more, it will shut itself down
+    {ok, no_args, 10000}.
+
+handle_call(_,_,_)       -> {noreply, no_args}.
+handle_cast(_,_)         -> {noreply, no_args}.
+handle_info(timeout,_)   -> {stop, normal, no_args}.
+terminate(_,_)           -> ok.
+code_change(_,_,_)       -> {ok, no_args}.
diff --git a/lib/sasl/doc/src/release_handler.xml b/lib/sasl/doc/src/release_handler.xml
index 4a973bc5ed..5ac0dc1acc 100644
--- a/lib/sasl/doc/src/release_handler.xml
+++ b/lib/sasl/doc/src/release_handler.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -159,9 +159,12 @@ old        reboot_old            permanent
   <funcs>
     <func>
       <name>check_install_release(Vsn) -> {ok, OtherVsn, Descr} | {error, Reason}</name>
+      <name>check_install_release(Vsn,Opts) -> {ok, OtherVsn, Descr} | {error, Reason}</name>
       <fsummary>Check installation of a release in the system.</fsummary>
       <type>
         <v>Vsn = OtherVsn = string()</v>
+	<v>Opts = [Opt]</v>
+	<v>Opt = purge</v>
         <v>Descr = term()</v>
         <v>Reason = term()</v>
       </type>
@@ -179,6 +182,11 @@ old        reboot_old            permanent
           upgrade script.</p>
         <p>Returns the same as <c>install_release/1</c>. <c>Descr</c>
           defaults to "" if no <c>relup</c> file is found.</p>
+	<p>If the option <c>purge</c> is given, all old code that can
+          be soft purged will be purged after all other checks are
+          successfully completed. This can be useful in order to
+          reduce the time needed by <seealso
+          marker="#install_release/1">install_release</seealso>.</p>
       </desc>
     </func>
     <func>
@@ -299,6 +307,24 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
           <c>{update_paths,true}</c>, afterwards
           <c>code:lib_dir(myapp)</c> will return
           <c>/home/user/myapp-1.0</c>.</p>
+	<note>
+	  <p>Installing a new release might be quite time consuming if
+	  there are many processes in the system. The reason is that
+	  each process must be checked for references to old code
+	  before a module can be purged. This check might lead to
+	  garbage collections and copying of data.</p>
+	  <p>If you wish to speed up the execution of
+	  <c>install_release</c>, then you may call <seealso
+	  marker="#check_install_release/1">check_install_release</seealso>
+	  first, using the option <c>purge</c>. This will do the same
+	  check for old code, and then purge all modules that can be
+	  soft purged. The purged modules will then no longer have any
+	  old code, and <c>install_release</c> will not need to do the
+	  checks.</p>
+	  <p>Obviously, this will not reduce the overall time for the
+	  upgrade, but it will allow checks and purge to be executed
+	  in the background before the real upgrade is started.</p>
+	</note>
       </desc>
     </func>
     <func>
diff --git a/lib/sasl/doc/src/systools.xml b/lib/sasl/doc/src/systools.xml
index 883c9c372b..8c1c327d74 100644
--- a/lib/sasl/doc/src/systools.xml
+++ b/lib/sasl/doc/src/systools.xml
@@ -45,7 +45,8 @@
         <v>Name = string()</v>
         <v>UpFrom = DownTo = [Name | {Name,Descr}]</v>
         <v>&nbsp;Descr = term()</v>
-        <v>Opt = {path,[Dir]} | restart_emulator | silent | noexec | {outdir,Dir}</v>
+        <v>Opt = {path,[Dir]} | restart_emulator | silent | noexec | {outdir,Dir}
+	| warnings_as_errors</v>
         <v>&nbsp;Dir = string()</v>
         <v>Result = ok | error | {ok,Relup,Module,Warnings} | {error,Module,Error}</v>
         <v>&nbsp;Relup - see relup(4)</v>
@@ -122,6 +123,8 @@
         <p>If the option <c>noexec</c> is provided, the function returns
           the same values as for <c>silent</c> but no <c>relup</c> file
           is created.</p>
+	<p>If the option <c>warnings_as_errors</c> is provided, warnings
+	   are treated as errors.</p>
       </desc>
     </func>
     <func>
@@ -130,7 +133,8 @@
       <fsummary>Generate a boot script <c>.script/.boot</c>.</fsummary>
       <type>
         <v>Name = string()</v>
-        <v>Opt = src_tests | {path,[Dir]} | local | {variables,[Var]} | exref | {exref,[App]}] | silent | {outdir,Dir}</v>
+        <v>Opt = src_tests | {path,[Dir]} | local | {variables,[Var]} | exref | {exref,[App]}]
+	| silent | {outdir,Dir} | warnings_as_errors</v>
         <v>&nbsp;Dir = string()</v>
         <v>&nbsp;Var = {VarName,Prefix}</v>
         <v>&nbsp;&nbsp;VarName = Prefix = string()</v>
@@ -232,6 +236,8 @@
           Warnings and errors can be converted to strings by calling
           <c>Module:format_warning(Warnings)</c> or
           <c>Module:format_error(Error)</c>.</p>
+	<p>If the option <c>warnings_as_errors</c> is provided, warnings
+	   are treated as errors.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl
index ab54b1d00b..bc08f94dff 100644
--- a/lib/sasl/src/release_handler.erl
+++ b/lib/sasl/src/release_handler.erl
@@ -25,8 +25,8 @@
 -export([start_link/0,
 	 create_RELEASES/1, create_RELEASES/2, create_RELEASES/4,
 	 unpack_release/1,
-	 check_install_release/1, install_release/1, install_release/2,
-	 remove_release/1, 
+	 check_install_release/1, check_install_release/2,
+	 install_release/1, install_release/2, remove_release/1,
 	 which_releases/0, make_permanent/1, reboot_old_release/1,
 	 set_unpacked/2, set_removed/1, install_file/2]).
 -export([upgrade_app/2, downgrade_app/2, downgrade_app/3,
@@ -149,15 +149,35 @@ unpack_release(ReleaseName) ->
 %%-----------------------------------------------------------------
 %% Purpose: Checks the relup script for the specified version.
 %%          The release must be unpacked.
+%%          Options = [purge] - all old code that can be soft purged
+%%          will be purged if all checks succeeds. This can be usefull
+%%          in order to reduce time needed in the following call to
+%%          install_release.
 %% Returns: {ok, FromVsn, Descr} | {error, Reason}
-%%          Reason = {already_installed, Vsn} |
+%%          Reason = {illegal_option, IllegalOpt} |
+%%                   {already_installed, Vsn} |
 %%                   {bad_relup_file, RelFile} |
 %%                   {no_such_release, Vsn} |
 %%                   {no_such_from_vsn, Vsn} |
 %%                   exit_reason()
 %%-----------------------------------------------------------------
 check_install_release(Vsn) ->
-    call({check_install_release, Vsn}).
+    check_install_release(Vsn, []).
+
+check_install_release(Vsn, Opts) ->
+    case check_check_install_options(Opts, false) of
+	{ok,Purge} ->
+	    call({check_install_release, Vsn, Purge});
+	Error ->
+	    Error
+    end.
+
+check_check_install_options([purge|Opts], _) ->
+    check_check_install_options(Opts, true);
+check_check_install_options([Illegal|_],_Purge) ->
+    {error,{illegal_option,Illegal}};
+check_check_install_options([],Purge) ->
+    {ok,Purge}.
 
 
 %%-----------------------------------------------------------------
@@ -541,11 +561,12 @@ handle_call({unpack_release, ReleaseName}, _From, S)
 handle_call({unpack_release, _ReleaseName}, _From, S) ->
     {reply, {error, client_node}, S};
 
-handle_call({check_install_release, Vsn}, _From, S) ->
+handle_call({check_install_release, Vsn, Purge}, _From, S) ->
     case catch do_check_install_release(S#state.rel_dir,
 					Vsn,
 					S#state.releases,
-					S#state.masters) of
+					S#state.masters,
+					Purge) of
 	{ok, CurrentVsn, Descr} -> 
 	    {reply, {ok, CurrentVsn, Descr}, S};
 	{error, Reason}   ->
@@ -855,7 +876,7 @@ check_path_response(Path, {ok, _Info}) ->
 check_path_response(Path, {error, _Reason}) ->
 	throw({error, {no_such_directory, Path}}).
 
-do_check_install_release(RelDir, Vsn, Releases, Masters) ->
+do_check_install_release(RelDir, Vsn, Releases, Masters, Purge) ->
     case lists:keysearch(Vsn, #release.vsn, Releases) of
 	{value, #release{status = current}} ->
 	    {error, {already_installed, Vsn}};
@@ -880,7 +901,20 @@ do_check_install_release(RelDir, Vsn, Releases, Masters) ->
 		    case get_rh_script(LatestRelease, Release, RelDir, Masters) of
 			{ok, {CurrentVsn, Descr, Script}} ->
 			    case catch check_script(Script, Libs) of
-				ok ->
+				{ok,SoftPurgeMods} when Purge=:=true ->
+				    %% Get modules with brutal_purge
+				    %% instructions, but that can be
+				    %% soft purged
+				    {ok,BrutalPurgeMods} =
+					release_handler_1:check_old_processes(
+					  Script,brutal_purge),
+				    lists:foreach(
+				      fun(Mod) ->
+					      catch erlang:purge_module(Mod)
+				      end,
+				      SoftPurgeMods ++ BrutalPurgeMods),
+				    {ok, CurrentVsn, Descr};
+				{ok,_} ->
 				    {ok, CurrentVsn, Descr};
 				Else ->
 				    Else
@@ -1967,7 +2001,7 @@ safe_write_file_m(File, Data, Masters) ->
 %% 'update_paths' option to release_handler:install_release/2 if the
 %% code path shall be updated then.
 %% -----------------------------------------------------------------
-get_new_libs([{App,Vsn,LibDir}|CurrentLibs], NewLibs) ->
+get_new_libs([{App,Vsn,_LibDir}|CurrentLibs], NewLibs) ->
     case lists:keyfind(App,1,NewLibs) of
 	{App,NewVsn,_} = LibInfo when NewVsn =/= Vsn ->
 	    [LibInfo | get_new_libs(CurrentLibs,NewLibs)];
diff --git a/lib/sasl/src/release_handler_1.erl b/lib/sasl/src/release_handler_1.erl
index ff62f847ac..8d0baf3ab1 100644
--- a/lib/sasl/src/release_handler_1.erl
+++ b/lib/sasl/src/release_handler_1.erl
@@ -19,8 +19,9 @@
 -module(release_handler_1).
 
 %% External exports
--export([eval_script/1, eval_script/5, check_script/2]).
--export([get_current_vsn/1]). %% exported because used in a test case
+-export([eval_script/1, eval_script/5,
+	 check_script/2, check_old_processes/2]).
+-export([get_current_vsn/1, get_supervised_procs/0]). %% exported because used in a test case
 
 -record(eval_state, {bins = [], stopped = [], suspended = [], apps = [],
 		     libdirs, unpurged = [], vsns = [], newlibs = [],
@@ -47,17 +48,20 @@
 %%% This is a low-level release handler.
 %%%-----------------------------------------------------------------
 check_script(Script, LibDirs) ->
-    case catch check_old_processes(Script) of
-	ok ->
+    case catch check_old_processes(Script,soft_purge) of
+	{ok, PurgeMods} ->
 	    {Before, _After} = split_instructions(Script),
 	    case catch lists:foldl(fun(Instruction, EvalState1) ->
 					   eval(Instruction, EvalState1)
 				   end,
 				   #eval_state{libdirs = LibDirs},
 				   Before) of
-		EvalState2 when is_record(EvalState2, eval_state) -> ok;
-		{error, Error} -> {error, Error};
-		Other -> {error, Other}
+		EvalState2 when is_record(EvalState2, eval_state) ->
+		    {ok,PurgeMods};
+		{error, Error} ->
+		    {error, Error};
+		Other ->
+		    {error, Other}
 	    end;
 	{error, Mod} ->
 	    {error, {old_processes, Mod}}
@@ -68,8 +72,8 @@ eval_script(Script) ->
     eval_script(Script, [], [], [], []).
 
 eval_script(Script, Apps, LibDirs, NewLibs, Opts) ->
-    case catch check_old_processes(Script) of
-	ok ->
+    case catch check_old_processes(Script,soft_purge) of
+	{ok,_} ->
 	    {Before, After} = split_instructions(Script),
 	    case catch lists:foldl(fun(Instruction, EvalState1) ->
 					   eval(Instruction, EvalState1)
@@ -112,32 +116,63 @@ split_instructions([], Before) ->
     {[], lists:reverse(Before)}.
 
 %%-----------------------------------------------------------------
-%% Func: check_old_processes/1
+%% Func: check_old_processes/2
 %% Args: Script = [instruction()]
+%%       PrePurgeMethod = soft_purge | brutal_purge
 %% Purpose: Check if there is any process that runs an old version
-%%          of a module that should be soft_purged, (i.e. not purged
-%%          at all if there is any such process).  Returns {error, Mod}
-%%          if so, ok otherwise.
-%% Returns: ok | {error, Mod}
+%%          of a module that should be purged according to PrePurgeMethod.
+%%          Returns a list of modules that can be soft_purged.
+%%
+%%          If PrePurgeMethod == soft_purge, the function will succeed
+%%          only if there is no process running old code of any of the
+%%          modules. Else it will throw {error,Mod}, where Mod is the
+%%          first module found that can not be soft_purged.
+%%
+%%          If PrePurgeMethod == brutal_purge, the function will
+%%          always succeed and return a list of all modules that are
+%%          specified in the script with PrePurgeMethod brutal_purge,
+%%          but that can be soft_purged.
+%%
+%% Returns: {ok,PurgeMods} | {error, Mod}
+%%          PurgeMods = [Mod]
 %%          Mod = atom()  
 %%-----------------------------------------------------------------
-check_old_processes(Script) ->
-    lists:foreach(fun({load, {Mod, soft_purge, _PostPurgeMethod}}) ->
-			  check_old_code(Mod);
-		     ({remove, {Mod, soft_purge, _PostPurgeMethod}}) ->
-			  check_old_code(Mod);
-		     (_) -> ok
-		  end,
-		  Script).
+check_old_processes(Script,PrePurgeMethod) ->
+    Procs = erlang:processes(),
+    {ok,lists:flatmap(
+	  fun({load, {Mod, PPM, _PostPurgeMethod}}) when PPM==PrePurgeMethod ->
+		  check_old_code(Mod,Procs,PrePurgeMethod);
+	     ({remove, {Mod, PPM, _PostPurgeMethod}}) when PPM==PrePurgeMethod ->
+		  check_old_code(Mod,Procs,PrePurgeMethod);
+	     (_) -> []
+	  end,
+	  Script)}.
+
+check_old_code(Mod,Procs,PrePurgeMethod) ->
+    case erlang:check_old_code(Mod) of
+	true when PrePurgeMethod==soft_purge ->
+	    do_check_old_code(Mod,Procs);
+	true when PrePurgeMethod==brutal_purge ->
+	    case catch do_check_old_code(Mod,Procs) of
+		{error,Mod} -> [];
+		R -> R
+	    end;
+	false ->
+	    []
+    end.
+
+
+do_check_old_code(Mod,Procs) ->
+    lists:foreach(
+      fun(Pid) ->
+	      case erlang:check_process_code(Pid, Mod) of
+		  false -> ok;
+		  true -> throw({error, Mod})
+	      end
+      end,
+      Procs),
+    [Mod].
 
-check_old_code(Mod) ->
-    lists:foreach(fun(Pid) ->
-			  case erlang:check_process_code(Pid, Mod) of
-			      false -> ok;
-			      true -> throw({error, Mod})
-			  end
-		  end,
-		  erlang:processes()).
 
 %%-----------------------------------------------------------------
 %% An unpurged module is a module for which there exist an old
@@ -458,6 +493,19 @@ start(Procs) ->
 %%       supervisor module, we should load the new version, and then
 %%       delete the old.  Then we should perform the start changes
 %%       manually, by adding/deleting children.
+%%
+%%       Recent changes to this code cause the upgrade error out and
+%%       log the case where a suspended supervisor has which_children
+%%       called against it. This retains the behavior of causing a VM
+%%       restart to the *old* version of a release but has the
+%%       advantage of logging the pid and supervisor that had the
+%%       issue.
+%%
+%%       A second case where this can occur is if a child spec is
+%%       incorrect and get_modules is called against a process that
+%%       can't respond to the gen:call. Again an error is logged,
+%%       an error returned and a VM restart is issued.
+%%
 %% Returns: [{SuperPid, ChildName, ChildPid, Mods}]
 %%-----------------------------------------------------------------
 %% OTP-3452. For each application the first item contains the pid
@@ -467,49 +515,81 @@ start(Procs) ->
 get_supervised_procs() ->
     lists:foldl(
       fun(Application, Procs) ->
-	      case application_controller:get_master(Application) of
-		  Pid when is_pid(Pid) ->
-		      {Root, _AppMod} = application_master:get_child(Pid),
-		      case get_supervisor_module(Root) of
-			  {ok, SupMod} ->
-			      get_procs(supervisor:which_children(Root), 
-					Root) ++
-				  [{undefined, undefined, Root, [SupMod]} | 
-				   Procs];
-			  {error, _} ->
-			      error_logger:error_msg("release_handler: "
-						     "cannot find top "
-						     "supervisor for "
-						    "application ~w~n", 
-						    [Application]),
-			      get_procs(supervisor:which_children(Root), 
-					Root) ++ Procs
-		      end;
-		  _ -> Procs
-	      end
+              get_master_procs(Application,
+                               Procs,
+                               application_controller:get_master(Application))
       end,
       [],
-      lists:map(fun({Application, _Name, _Vsn}) ->
-			Application
-		end,
-		application:which_applications())).
+      get_application_names()).
+
+get_supervised_procs(_, Root, Procs, {ok, SupMod}) ->
+    get_procs(maybe_supervisor_which_children(get_proc_state(Root), SupMod, Root), Root) ++
+        [{undefined, undefined, Root, [SupMod]} |  Procs];
+get_supervised_procs(Application, Root, Procs, {error, _}) ->
+    error_logger:error_msg("release_handler: cannot find top supervisor for "
+                           "application ~w~n", [Application]),
+    get_procs(maybe_supervisor_which_children(get_proc_state(Root), Application, Root), Root) ++ Procs.
+
+get_application_names() ->
+    lists:map(fun({Application, _Name, _Vsn}) ->
+                      Application
+              end,
+              application:which_applications()).
+
+get_master_procs(Application, Procs, Pid) when is_pid(Pid) ->
+    {Root, _AppMod} = application_master:get_child(Pid),
+    get_supervised_procs(Application, Root, Procs, get_supervisor_module(Root));
+get_master_procs(_, Procs, _) ->
+    Procs.
 
 get_procs([{Name, Pid, worker, dynamic} | T], Sup) when is_pid(Pid) ->
-    Mods = get_dynamic_mods(Pid),
+    Mods = maybe_get_dynamic_mods(Name, Pid),
     [{Sup, Name, Pid, Mods} | get_procs(T, Sup)];
 get_procs([{Name, Pid, worker, Mods} | T], Sup) when is_pid(Pid), is_list(Mods) ->
     [{Sup, Name, Pid, Mods} | get_procs(T, Sup)];
 get_procs([{Name, Pid, supervisor, Mods} | T], Sup) when is_pid(Pid) ->
-    [{Sup, Name, Pid, Mods} | get_procs(T, Sup)] ++ 
-	get_procs(supervisor:which_children(Pid), Pid);
+    [{Sup, Name, Pid, Mods} | get_procs(T, Sup)] ++
+        get_procs(maybe_supervisor_which_children(get_proc_state(Pid), Name, Pid), Pid);
 get_procs([_H | T], Sup) ->
     get_procs(T, Sup);
 get_procs(_, _Sup) ->
     [].
 
-get_dynamic_mods(Pid) ->
-    {ok,Res} = gen:call(Pid, self(), get_modules),
-    Res.
+get_proc_state(Proc) ->
+    {status, _, {module, _}, [_, State, _, _, _]} = sys:get_status(Proc),
+    State.
+
+maybe_supervisor_which_children(suspended, Name, Pid) ->
+    error_logger:error_msg("release_handler: a which_children call"
+                           " to ~p (~p) was avoided. This supervisor"
+                           " is suspended and should likely be upgraded"
+                           " differently. Exiting ...~n", [Name, Pid]),
+    error(suspended_supervisor);
+
+maybe_supervisor_which_children(State, Name, Pid) ->
+    case catch supervisor:which_children(Pid) of
+        Res when is_list(Res) ->
+            Res;
+        Other ->
+            error_logger:error_msg("release_handler: ~p~nerror during"
+                                   " a which_children call to ~p (~p)."
+                                   " [State: ~p] Exiting ... ~n",
+                                   [Other, Name, Pid, State]),
+            error(which_children_failed)
+    end.
+
+maybe_get_dynamic_mods(Name, Pid) ->
+    case catch gen:call(Pid, self(), get_modules) of
+        {ok, Res} ->
+            Res;
+        Other ->
+            error_logger:error_msg("release_handler: ~p~nerror during a"
+                                   " get_modules call to ~p (~p),"
+                                   " there may be an error in it's"
+                                   " childspec. Exiting ...~n",
+                                   [Other, Name, Pid]),
+            error(get_modules_failed)
+    end.
 
 %% XXXX
 %% Note: The following is a terrible hack done in order to resolve the
diff --git a/lib/sasl/src/systools_lib.erl b/lib/sasl/src/systools_lib.erl
index f951647b79..1b6ea125d9 100644
--- a/lib/sasl/src/systools_lib.erl
+++ b/lib/sasl/src/systools_lib.erl
@@ -24,7 +24,7 @@
 %%         
 
 -export([file_term2binary/2, read_term/1, read_term_from_stream/2,
-	 get_dirs/1, get_path/1]).
+	 get_dirs/1, get_path/1, werror/2]).
 
 -include_lib("kernel/include/file.hrl").
 
@@ -219,6 +219,7 @@ flat([H|T], Ack) ->
     flat(T, [H|Ack]);
 flat([], Ack) ->
     lists:reverse(Ack).
-    
-			       
+
+werror(Options, Warnings) ->
+    lists:member(warnings_as_errors, Options) andalso Warnings =/= [].
 
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index 7489ee58d2..7f400f5cce 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -44,10 +44,12 @@
 
 %%-----------------------------------------------------------------
 %% Create a boot script from a release file.
-%% Options is a list of {path, Path} | silent | local where path sets
-%% the search path, silent supresses error message printing on console,
-%% local generates a script with references to the directories there
-%% the applications are found.
+%% Options is a list of {path, Path} | silent | local
+%%         | warnings_as_errors
+%% where path sets the search path, silent supresses error message
+%% printing on console, local generates a script with references
+%% to the directories there the applications are found,
+%% and warnings_as_errors treats warnings as errors.
 %%
 %% New options: {path,Path} can contain wildcards
 %%              src_tests
@@ -85,11 +87,16 @@ make_script(RelName, Output, Flags) when is_list(RelName),
 	    ModTestP = {member(src_tests, Flags),xref_p(Flags)},
 	    case get_release(RelName, Path, ModTestP, machine(Flags)) of
 		{ok, Release, Appls, Warnings} ->
-		    case generate_script(Output,Release,Appls,Flags) of
-			ok ->
+		    case systools_lib:werror(Flags, Warnings) of
+			true ->
 			    return(ok,Warnings,Flags);
-			Error ->
-			    return(Error,Warnings,Flags)
+			false ->
+			    case generate_script(Output,Release,Appls,Flags) of
+				ok ->
+				    return(ok,Warnings,Flags);
+				Error ->
+				    return(Error,Warnings,Flags)
+			    end
 		    end;
 		Error ->
 		    return(Error,[],Flags)
@@ -130,10 +137,21 @@ get_outdir(Flags) ->
 return(ok,Warnings,Flags) ->
     case member(silent,Flags) of
 	true ->
-	    {ok,?MODULE,Warnings};
+	    case systools_lib:werror(Flags, Warnings) of
+		true ->
+		    error;
+		false ->
+		    {ok,?MODULE,Warnings}
+	    end;
 	_ ->
-	    io:format("~s",[format_warning(Warnings)]),
-	    ok
+	    case member(warnings_as_errors,Flags) of
+		true ->
+		    io:format("~s",[format_warning(Warnings, true)]),
+		    error;
+		false ->
+		    io:format("~s",[format_warning(Warnings)]),
+		    ok
+	    end
     end;
 return({error,Mod,Error},_,Flags) ->
     case member(silent,Flags) of
@@ -1612,9 +1630,9 @@ var_dir(_Dir, _, _, []) ->
     false.
 
 appDir(AppDir) ->
-    case reverse(filename:split(AppDir)) of
-	["ebin"|Dir] -> filename:join(reverse(Dir));
-	_            -> AppDir
+    case filename:basename(AppDir) of
+	"ebin" -> filename:dirname(AppDir);
+	_ -> AppDir
     end.
 
 add_modules(Modules, Tar, AppDir, ToDir, Ext) ->
@@ -1833,78 +1851,89 @@ get_flag(_,_)         -> false.
 %% Check Options for make_script
 check_args_script(Args) ->
     cas(Args,
-	{undef, undef, undef, undef, undef, undef, undef, undef, []}). 
+	{undef, undef, undef, undef, undef, undef, undef, undef,
+	 undef, []}).
 
-cas([], {_Path,_Sil,_Loc,_Test,_Var,_Mach,_Xref,_XrefApps, X}) ->
+cas([], {_Path,_Sil,_Loc,_Test,_Var,_Mach,_Xref,_XrefApps,_Werror, X}) ->
     X;
 %%% path ---------------------------------------------------------------
-cas([{path, P} | Args], {Path, Sil, Loc, Test, Var, Mach, 
-			 Xref, XrefApps, X}) when is_list(P) -> 
+cas([{path, P} | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+			 XrefApps, Werror, X}) when is_list(P) ->
     case check_path(P) of
 	ok ->
-	    cas(Args, {P, Sil, Loc, Test, Var, Mach, Xref, XrefApps,X});
+	    cas(Args, {P, Sil, Loc, Test, Var, Mach, Xref, XrefApps,
+		       Werror, X});
 	error ->
 	    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps,
-		       X++[{path,P}]})
+		       Werror, X++[{path,P}]})
     end;
 %%% silent -------------------------------------------------------------
-cas([silent | Args], {Path, _Sil, Loc, Test, Var, Mach,
-		      Xref, XrefApps, X}) ->
-    cas(Args, {Path, silent, Loc, Test, Var, Mach, Xref, XrefApps, X});
+cas([silent | Args], {Path, _Sil, Loc, Test, Var, Mach, Xref,
+		      XrefApps, Werror, X}) ->
+    cas(Args, {Path, silent, Loc, Test, Var, Mach, Xref, XrefApps,
+	       Werror, X});
 %%% local --------------------------------------------------------------
-cas([local | Args], {Path, Sil, _Loc, Test, Var, Mach,
-		     Xref, XrefApps, X}) ->
-    cas(Args, {Path, Sil, local, Test, Var, Mach, Xref, XrefApps, X});
+cas([local | Args], {Path, Sil, _Loc, Test, Var, Mach, Xref,
+		     XrefApps, Werror, X}) ->
+    cas(Args, {Path, Sil, local, Test, Var, Mach, Xref, XrefApps,
+	       Werror, X});
 %%% src_tests -------------------------------------------------------
-cas([src_tests | Args], {Path, Sil, Loc, _Test, Var, Mach,
-			    Xref, XrefApps, X}) ->
+cas([src_tests | Args], {Path, Sil, Loc, _Test, Var, Mach, Xref,
+			 XrefApps, Werror, X}) ->
     cas(Args,
-	{Path, Sil, Loc, src_tests, Var, Mach, Xref, XrefApps,X});
+	{Path, Sil, Loc, src_tests, Var, Mach, Xref, Werror, XrefApps,X});
 %%% variables ----------------------------------------------------------
-cas([{variables, V} | Args], {Path, Sil, Loc, Test, Var, Mach, 
-				 Xref, XrefApps, X}) when is_list(V) ->
+cas([{variables, V} | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+			      XrefApps, Werror, X}) when is_list(V) ->
     case check_vars(V) of
 	ok ->
 	    cas(Args,
-		{Path, Sil, Loc, Test, V, Mach, Xref, XrefApps, X});
+		{Path, Sil, Loc, Test, V, Mach, Xref, XrefApps, Werror, X});
 	error ->
 	    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps,
-		       X++[{variables, V}]})
+		       Werror, X++[{variables, V}]})
     end;
 %%% machine ------------------------------------------------------------
-cas([{machine, M} | Args], {Path, Sil, Loc, Test, Var, Mach, 
-			    Xref, XrefApps, X}) when is_atom(M) ->
-    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, X});
+cas([{machine, M} | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+			    XrefApps, Werror, X}) when is_atom(M) ->
+    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, Werror, X});
 %%% exref --------------------------------------------------------------
-cas([exref | Args], {Path, Sil, Loc, Test, Var, Mach,
-		     _Xref, XrefApps, X})  ->
-    cas(Args, {Path, Sil, Loc, Test, Var, Mach, exref, XrefApps, X});
+cas([exref | Args], {Path, Sil, Loc, Test, Var, Mach, _Xref,
+		     XrefApps, Werror, X})  ->
+    cas(Args, {Path, Sil, Loc, Test, Var, Mach, exref, XrefApps, Werror, X});
 %%% exref Apps ---------------------------------------------------------
-cas([{exref, Apps} | Args], {Path, Sil, Loc, Test, Var, Mach, 
-			     Xref, XrefApps, X}) when is_list(Apps) ->
+cas([{exref, Apps} | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+			     XrefApps, Werror, X}) when is_list(Apps) ->
     case check_apps(Apps) of 
 	ok ->
 	    cas(Args, {Path, Sil, Loc, Test, Var, Mach, 
-			     Xref, Apps, X});
+		       Xref, Apps, Werror, X});
 	error ->
 	    cas(Args, {Path, Sil, Loc, Test, Var, Mach, 
-			     Xref, XrefApps, X++[{exref, Apps}]})
+		       Xref, XrefApps, Werror, X++[{exref, Apps}]})
     end;
 %%% outdir Dir ---------------------------------------------------------
-cas([{outdir, Dir} | Args], {Path, Sil, Loc, Test, Var, Mach,
-			     Xref, XrefApps, X}) when is_list(Dir) ->
-    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, X});
+cas([{outdir, Dir} | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+			     XrefApps, Werror, X}) when is_list(Dir) ->
+    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, Werror, X});
 %%% otp_build (secret, not documented) ---------------------------------
-cas([otp_build | Args], {Path, Sil, Loc, Test, Var, Mach,
-			 Xref, XrefApps, X}) ->
-    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, X});
+cas([otp_build | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+			 XrefApps, Werror, X}) ->
+    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, Werror, X});
 %%% no_module_tests (kept for backwards compatibility, but ignored) ----
-cas([no_module_tests | Args], {Path, Sil, Loc, Test, Var, Mach,
-			       Xref, XrefApps, X}) ->
-    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps,X});
+cas([no_module_tests | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+			       XrefApps, Werror, X}) ->
+    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, Werror, X});
+%%% warnings_as_errors (kept for backwards compatibility, but ignored) ----
+cas([warnings_as_errors | Args], {Path, Sil, Loc, Test, Var, Mach, Xref,
+				  XrefApps, _Werror, X}) ->
+    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps,
+	       warnings_as_errors, X});
 %%% ERROR --------------------------------------------------------------
-cas([Y | Args], {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, X}) ->
-    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps,X++[Y]}).
+cas([Y | Args], {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps,
+		 Werror, X}) ->
+    cas(Args, {Path, Sil, Loc, Test, Var, Mach, Xref, XrefApps, Werror,
+	       X++[Y]}).
 
 
 
@@ -2030,7 +2059,6 @@ check_apps([H|T]) when is_atom(H) ->
 check_apps(_) ->
     error.
 
-
 %% Format error
 
 format_error(badly_formatted_release) ->
@@ -2144,21 +2172,31 @@ form_tar_err({add, File, Error}) ->
 %% Format warning
 
 format_warning(Warnings) ->
-    map(fun({warning,W}) -> form_warn(W) end, Warnings).
-
-form_warn({source_not_found,{Mod,_,App,_,_}}) ->
-    io_lib:format("*WARNING* ~p: Source code not found: ~p.erl~n",
-		  [App,Mod]);
-form_warn({{parse_error, File},{_,_,App,_,_}}) ->
-    io_lib:format("*WARNING* ~p: Parse error: ~p~n",
-		  [App,File]);
-form_warn({obj_out_of_date,{Mod,_,App,_,_}}) ->
-    io_lib:format("*WARNING* ~p: Object code (~p) out of date~n",[App,Mod]);
-form_warn({exref_undef, Undef}) ->
-    F = fun({M,F,A}) -> 
-		io_lib:format("*WARNING* Undefined function ~p:~p/~p~n", 
-			      [M,F,A])
+    format_warning(Warnings, false).
+
+format_warning(Warnings, Werror) ->
+    Prefix = case Werror of
+		 true ->
+		     "";
+		 false ->
+		     "*WARNING* "
+	     end,
+    map(fun({warning,W}) -> form_warn(Prefix, W) end, Warnings).
+
+form_warn(Prefix, {source_not_found,{Mod,_,App,_,_}}) ->
+    io_lib:format("~s~p: Source code not found: ~p.erl~n",
+		  [Prefix,App,Mod]);
+form_warn(Prefix, {{parse_error, File},{_,_,App,_,_}}) ->
+    io_lib:format("~s~p: Parse error: ~p~n",
+		  [Prefix,App,File]);
+form_warn(Prefix, {obj_out_of_date,{Mod,_,App,_,_}}) ->
+    io_lib:format("~s~p: Object code (~p) out of date~n",
+		  [Prefix,App,Mod]);
+form_warn(Prefix, {exref_undef, Undef}) ->
+    F = fun({M,F,A}) ->
+		io_lib:format("~sUndefined function ~p:~p/~p~n",
+			      [Prefix,M,F,A])
 	end,
     map(F, Undef);
-form_warn(What) ->
-    io_lib:format("*WARNING* ~p~n", [What]).
+form_warn(Prefix, What) ->
+    io_lib:format("~s ~p~n", [Prefix,What]).
diff --git a/lib/sasl/src/systools_relup.erl b/lib/sasl/src/systools_relup.erl
index ec5486226c..6d9e922900 100644
--- a/lib/sasl/src/systools_relup.erl
+++ b/lib/sasl/src/systools_relup.erl
@@ -122,7 +122,7 @@
 %% rel_filename() = description() = string()
 %% Opts = [opt()]
 %% opt() = {path, [path()]} | silent | noexec | restart_emulator
-%%       | {outdir, string()}
+%%       | {outdir, string()} | warnings_as_errors
 %% path() = [string()]
 %% Ret = ok | error | {ok, Relup, Module, Warnings} | {error, Module, Error}
 %%
@@ -139,8 +139,9 @@
 %% 
 %% The option `path' sets search path, `silent' suppresses printing of
 %% error messages to the console, `noexec' inhibits the creation of
-%% the output "relup" file, and restart_emulator ensures that the new
-%% emulator is restarted (as the final step).
+%% the output "relup" file, restart_emulator ensures that the new
+%% emulator is restarted (as the final step), and `warnings_as_errors'
+%% treats warnings as errors.
 %% ----------------------------------------------------------------
 mk_relup(TopRelFile, BaseUpRelDcs, BaseDnRelDcs) ->
     mk_relup(TopRelFile, BaseUpRelDcs, BaseDnRelDcs, []).
@@ -153,14 +154,29 @@ mk_relup(TopRelFile, BaseUpRelDcs, BaseDnRelDcs, Opts) ->
 		{false, false} ->
 		    case R of
 			{ok, _Res, _Mod, Ws} -> 
-			    print_warnings(Ws),
-			    ok;
+			    print_warnings(Ws, Opts),
+			    case systools_lib:werror(Opts, Ws) of
+				true ->
+				    error;
+				false ->
+				    ok
+			    end;
 			Other -> 
 			    print_error(Other),
 			    error
 		    end;
-		_ -> 
-		    R
+		_ ->
+		    case R of
+			{ok, _Res, _Mod, Ws} ->
+			    case systools_lib:werror(Opts, Ws) of
+				true ->
+				    error;
+				false ->
+				    R
+			    end;
+			R ->
+			    R
+		    end
 	    end;
 	BadArg ->
 	    erlang:error({badarg, BadArg})
@@ -195,7 +211,12 @@ do_mk_relup(TopRelFile, BaseUpRelDcs, BaseDnRelDcs, Path, Opts) ->
 	    {Dn, Ws2} = foreach_baserel_dn(TopRel, TopApps, BaseDnRelDcs, 
 					  Path, Opts, Ws1),
 	    Relup = {TopRel#release.vsn, Up, Dn},
-	    write_relup_file(Relup, Opts),
+	    case systools_lib:werror(Opts, Ws2) of
+		true ->
+		    ok;
+		false ->
+		    write_relup_file(Relup, Opts)
+	    end,
 	    {ok, Relup, ?MODULE, Ws2};
 	Other -> 
 	    throw(Other)
@@ -527,20 +548,29 @@ format_error(Error) ->
     io:format("~p~n", [Error]).
 
 
-print_warnings(Ws) when is_list(Ws) ->
-    lists:foreach(fun(W) -> print_warning(W) end, Ws);
-print_warnings(W) ->
-    print_warning(W).
+print_warnings(Ws, Opts) when is_list(Ws) ->
+    lists:foreach(fun(W) -> print_warning(W, Opts) end, Ws);
+print_warnings(W, Opts) ->
+    print_warning(W, Opts).
 
-print_warning(W) ->
-    S = format_warning(W),
+print_warning(W, Opts) ->
+    Prefix = case lists:member(warnings_as_errors, Opts) of
+		 true ->
+		     "";
+		 false ->
+		     "*WARNING* "
+	     end,
+    S = format_warning(Prefix, W),
     io:format("~s", [S]).
 
-format_warning({erts_vsn_changed, {Rel1, Rel2}}) ->
-    io_lib:format("*WARNING* The ERTS version changed between ~p and ~p~n",
-		  [Rel1, Rel2]);
-format_warning(What) ->
-    io_lib:format("*WARNING* ~p~n",[What]).
+format_warning(W) ->
+    format_warning("*WARNING* ", W).
+
+format_warning(Prefix, {erts_vsn_changed, {Rel1, Rel2}}) ->
+    io_lib:format("~sThe ERTS version changed between ~p and ~p~n",
+		  [Prefix, Rel1, Rel2]);
+format_warning(Prefix, What) ->
+    io_lib:format("~s~p~n",[Prefix, What]).
 
 
 get_reason({error, {open, _, _}}) -> open;
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index 9c7733b7ec..af2183bfff 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -55,7 +55,10 @@ win32_cases() ->
 
 %% Cases that can be run on all platforms
 cases() ->
-    [otp_2740, otp_2760, otp_5761, otp_9402, otp_9417, instructions, eval_appup].
+    [otp_2740, otp_2760, otp_5761, otp_9402, otp_9417,
+     otp_9395_check_old_code, otp_9395_check_and_purge,
+     otp_9395_update_many_mods, otp_9395_rm_many_mods,
+     instructions, eval_appup, supervisor_which_children_timeout].
 
 groups() ->
     [{release,[],
@@ -520,6 +523,29 @@ no_cc() ->
 %%%-----------------------------------------------------------------
 
 %%-----------------------------------------------------------------
+%% release_handler_1:get_supervised_procs/0 test
+%%-----------------------------------------------------------------
+supervisor_which_children_timeout(Conf) ->
+    PrivDir = priv_dir(Conf),
+    Dir = filename:join(PrivDir,"supervisor_which_children_timeout"),
+    DataDir = ?config(data_dir,Conf),
+    LibDir = filename:join([DataDir,release_handler_timeouts]),
+
+    Rel1 = create_and_install_fake_first_release(Dir,[{dummy,"0.1",LibDir}]),
+
+    {ok, Node} = t_start_node(supervisor_which_children_timeout, Rel1, []),
+    Proc = rpc:call(Node, erlang, whereis, [dummy_sup_2]),
+    ok = rpc:call(Node, sys, suspend, [Proc]),
+    Result = {badrpc, {'EXIT', {suspended_supervisor, _}}} =
+        rpc:call(Node, release_handler_1, get_supervised_procs, []),
+    ?t:format("release_handler_1:get_supervised_procs/0: ~p~n", [Result]),
+
+    ok.
+
+supervisor_which_children_timeout(cleanup, Conf) ->
+    stop_node(node_name(supervisor_which_children_timeout)).
+
+%%-----------------------------------------------------------------
 %% Ticket: OTP-2740
 %% Slogan: vsn not numeric doesn't work so good in release_handling
 %%-----------------------------------------------------------------
@@ -556,7 +582,7 @@ otp_2760(Conf) ->
     LibDir = filename:join([DataDir,app1_app2,lib1]),
 
     Rel1 = create_and_install_fake_first_release(Dir,[{app1,"1.0",LibDir}]),
-    Rel2 = create_fake_upgrade_release(Dir,"after",[],{Rel1,Rel1,[LibDir]}),
+    Rel2 = create_fake_upgrade_release(Dir,"after",[],{[Rel1],[Rel1],[LibDir]}),
     Rel2Dir = filename:dirname(Rel2),
 
     %% Start a node with Rel1.boot and check that the app1 module is loaded
@@ -569,9 +595,12 @@ otp_2760(Conf) ->
     {ok, []} = rpc:call(Node, release_handler_1, eval_script, [Script]),
     false = rpc:call(Node, code, is_loaded, [app1]),
 
-    true = stop_node(Node),
     ok.
 
+otp_2760(cleanup,_Conf) ->
+    stop_node(node_name(otp_2760)).
+
+
 %% Test upgrade using other filesystem than the defined in OTP and
 %% option {update_paths, true}
 otp_5761(Conf) when is_list(Conf) ->
@@ -597,7 +626,7 @@ otp_5761(Conf) when is_list(Conf) ->
 				       "2",
 				       [{app1,"2.0",LibDir2},
 					{app2,"1.0",LibDir2}],
-				       {Rel1,Rel1,[LibDir1]}),
+				       {[Rel1],[Rel1],[LibDir1]}),
     Rel1Dir = filename:dirname(Rel1),
     Rel2Dir = filename:dirname(Rel2),
     
@@ -653,10 +682,11 @@ otp_5761(Conf) when is_list(Conf) ->
     App11Dir = rpc:call(Node, code, lib_dir, [app1]),
     App2aDir = rpc:call(Node, code, lib_dir, [app2]),
 
-    %% Stop the slave node
-    true = stop_node(Node),
     ok.
 
+otp_5761(cleanup,_Conf) ->
+    stop_node(node_name(otp_5761)).
+
 
 %% When a new version of an application is added, but no module is
 %% changed - the path was not updated - i.e. code:priv_dir would point
@@ -673,7 +703,7 @@ otp_9402(Conf) when is_list(Conf) ->
     Rel2 = create_fake_upgrade_release(Dir,
 				       "2",
 				       [{a,"1.2",LibDir}],
-				       {Rel1,Rel1,[LibDir]}),
+				       {[Rel1],[Rel1],[LibDir]}),
     Rel1Dir = filename:dirname(Rel1),
     Rel2Dir = filename:dirname(Rel2),
 
@@ -722,6 +752,9 @@ otp_9402(Conf) when is_list(Conf) ->
 
     ok.
 
+otp_9402(cleanup,_Conf) ->
+    stop_node(node_name(otp_9402)).
+
 
 %% When a module is deleted in an appup instruction, the upgrade
 %% failed if the module was not loaded.
@@ -737,7 +770,7 @@ otp_9417(Conf) when is_list(Conf) ->
     Rel2 = create_fake_upgrade_release(Dir,
 				       "2",
 				       [{b,"2.0",LibDir}],
-				       {Rel1,Rel1,[LibDir]}),
+				       {[Rel1],[Rel1],[LibDir]}),
     Rel1Dir = filename:dirname(Rel1),
     Rel2Dir = filename:dirname(Rel2),
 
@@ -777,6 +810,282 @@ otp_9417(Conf) when is_list(Conf) ->
     {file,BServerBeam} = rpc:call(Node,code,is_loaded,[b_server]),
     ok.
 
+otp_9417(cleanup,_Conf) ->
+    stop_node(node_name(otp_9417)).
+
+
+%% OTP-9395 - performance problems when there are MANY processes
+%% Test that the procedure of checking for old code before an upgrade
+%% can be started is "very much faster" when there is no old code in
+%% the system.
+otp_9395_check_old_code(Conf) when is_list(Conf) ->
+
+    NProcs = 1000,
+    MPath = filename:join([?config(data_dir,Conf),"lib","many_mods-1.0","ebin"]),
+    code:add_path(MPath),
+
+    %% Start NProc processes, each referencing each module
+    {Modules,Pids} = m:start(NProcs),
+
+    %% Load each module again in order to get old code
+    [code:load_file(Mod) || Mod <- Modules],
+    true = erlang:check_old_code(m10),
+
+    S = [point_of_no_return |
+	 [{remove,{M,soft_purge,soft_purge}} || M <- Modules]],
+
+    %% Do the old code check, then purge, and redo
+    {T1,{ok,PurgeMods}} = timer:tc(release_handler_1,check_script,[S,[]]),
+    true = (lists:sort(PurgeMods) == lists:sort(Modules)),
+    [code:purge(M) || M <- PurgeMods],
+    {T2,{ok,[]}} = timer:tc(release_handler_1,check_script,[S,[]]),
+
+    %% Cleanup
+    lists:foreach(fun(Pid) -> Pid ! stop end, Pids),
+    lists:foreach(fun(Mod) -> code:purge(Mod),
+			      code:delete(Mod),
+			      code:purge(Mod)
+		  end, Modules),
+    code:del_path(MPath),
+
+    %% Test that second run was much faster than the first
+    if T2 > 0 ->
+	    X = T1/T2,
+	    ct:log("~p procs, ~p mods -> ~n"
+		   "\tWith old code: ~.2f sec~n"
+		   "\tAfter purge: ~.2f sec~n"
+		   "\tT1/T2: ~.2f",
+		   [NProcs,length(Modules),T1/1000000,T2/1000000,X]),
+	    if X < 1000 ->
+		    ct:fail({not_enough_improvement_after_purge,round(X)});
+	       true ->
+		    ok
+	    end;
+       T1 > 0 -> %% Means T1/T2 = infinite
+	    ok;
+       true ->
+	    ct:fail({unexpected_values,T1,T2})
+    end,
+    ok.
+
+
+%% OTP-9395 - performance problems when there are MANY processes
+%% Added option 'purge' to check_install_release
+otp_9395_check_and_purge(Conf) when is_list(Conf) ->
+    %% Set some paths
+    PrivDir = priv_dir(Conf),
+    Dir = filename:join(PrivDir,"otp_9395_check_and_purge"),
+    LibDir = filename:join(?config(data_dir, Conf), "lib"),
+
+    %% Create the releases
+    Rel1 = create_and_install_fake_first_release(Dir,
+						 [{b,"1.0",LibDir}]),
+    Rel2 = create_fake_upgrade_release(Dir,
+				       "2",
+				       [{b,"2.0",LibDir}],
+				       {[Rel1],[Rel1],[LibDir]}),
+    Rel1Dir = filename:dirname(Rel1),
+    Rel2Dir = filename:dirname(Rel2),
+
+    %% Start a slave node
+    {ok, Node} = t_start_node(otp_9395_check_and_purge, Rel1,
+			      filename:join(Rel1Dir,"sys.config")),
+
+    %% Make sure there is old code for b_lib and b_server
+    rpc:call(Node,code,load_file,[b_lib]),
+    rpc:call(Node,code,load_file,[b_lib]),
+    rpc:call(Node,code,load_file,[b_server]),
+    rpc:call(Node,code,load_file,[b_server]),
+    true = rpc:call(Node,erlang,check_old_code,[b_lib]),
+    true = rpc:call(Node,erlang,check_old_code,[b_server]),
+
+    %% Unpack second release, which removes b_lib module and loads b_server
+    {ok, RelVsn2} =
+	rpc:call(Node, release_handler, set_unpacked,
+		 [Rel2++".rel", [{b,"2.0",LibDir}]]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "relup")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "start.boot")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "sys.config")]),
+
+    %% Do check_install_release, and check that old code still exists
+    {ok, _RelVsn1, []} =
+	rpc:call(Node, release_handler, check_install_release, [RelVsn2]),
+    true = rpc:call(Node,erlang,check_old_code,[b_lib]),
+    true = rpc:call(Node,erlang,check_old_code,[b_server]),
+
+    %% Do check_install_release with option 'purge' and check that old
+    %% code is gone
+    {ok, _RelVsn1, []} =
+	rpc:call(Node, release_handler, check_install_release, [RelVsn2,[purge]]),
+    false = rpc:call(Node,erlang,check_old_code,[b_lib]),
+    false = rpc:call(Node,erlang,check_old_code,[b_server]),
+
+    ok.
+
+otp_9395_check_and_purge(cleanup,_Conf) ->
+    stop_node(node_name(otp_9395_check_and_purge)).
+
+
+%% OTP-9395 - performance problems when there are MANY processes
+%% Upgrade which updates many modules (brutal_purge)
+otp_9395_update_many_mods(Conf) when is_list(Conf) ->
+    %% Set some paths
+    PrivDir = priv_dir(Conf),
+    Dir = filename:join(PrivDir,"otp_9395_update_many_mods"),
+    LibDir = filename:join(?config(data_dir, Conf), "lib"),
+
+    %% Create the releases
+    Rel1 = create_and_install_fake_first_release(Dir,
+						 [{many_mods,"1.0",LibDir}]),
+    Rel2 = create_fake_upgrade_release(Dir,
+				       "2",
+				       [{many_mods,"1.1",LibDir}],
+				       {[Rel1],[Rel1],[LibDir]}),
+    Rel1Dir = filename:dirname(Rel1),
+    Rel2Dir = filename:dirname(Rel2),
+
+    %% Start a slave node
+    {ok, Node} = t_start_node(otp_9395_update_many_mods, Rel1,
+			      filename:join(Rel1Dir,"sys.config")),
+
+    %% Start a lot of processes on the new node, all with refs to each
+    %% module that will be updated
+    NProcs = 1000,
+    {Modules,Pids1} = rpc:call(Node,m,start,[NProcs]),
+
+    %% Then load modules in order to get old code
+    [rpc:call(Node,code,load_file,[Mod]) || Mod <- Modules],
+    true = rpc:call(Node,erlang,check_old_code,[m10]),
+
+    %% Unpack second release, which updates all mX modules
+    {ok, RelVsn2} =
+	rpc:call(Node, release_handler, set_unpacked,
+		 [Rel2++".rel", [{many_mods,"1.1",LibDir}]]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "relup")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "start.boot")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "sys.config")]),
+
+    %% First, install release directly and check how much time it takes
+    {TInst0,{ok, _, []}} =
+	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
+    ct:log("install_release: ~.2f",[TInst0/1000000]),
+
+    %% Restore to old release, spawn processes again and load to get old code
+    {_,RelVsn1} = init:script_id(),
+    {_TInst1,{ok, _, []}} =
+	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn1]]),
+%    ct:log("install_release: ~.2f",[_TInst1/1000000]),
+
+    [exit(Pid,kill) || Pid <- Pids1],
+    {Modules,_Pids2} = rpc:call(Node,m,start,[NProcs]),
+    [rpc:call(Node,code,load_file,[Mod]) || Mod <- Modules],
+    true = rpc:call(Node,erlang,check_old_code,[m10]),
+
+    %% Run check_install_release with purge before install this time
+    {TCheck,{ok, _RelVsn1, []}} =
+	timer:tc(rpc,call,[Node, release_handler, check_install_release,
+			   [RelVsn2,[purge]]]),
+    ct:log("check_install_release with purge: ~.2f",[TCheck/1000000]),
+
+    %% Finally install release after check and purge, and check that
+    %% this install was faster than the first.
+    {TInst2,{ok, _RelVsn1, []}} =
+	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
+    ct:log("install_release: ~.2f",[TInst2/1000000]),
+
+    true = (TInst2 < TInst0),
+
+    ok.
+
+otp_9395_update_many_mods(cleanup,_Conf) ->
+    stop_node(node_name(otp_9395_update_many_mods)).
+
+
+%% OTP-9395 - performance problems when there are MANY processes
+%% Upgrade which removes many modules (brutal_purge)
+otp_9395_rm_many_mods(Conf) when is_list(Conf) ->
+    %% Set some paths
+    PrivDir = priv_dir(Conf),
+    Dir = filename:join(PrivDir,"otp_9395_rm_many_mods"),
+    LibDir = filename:join(?config(data_dir, Conf), "lib"),
+
+    %% Create the releases
+    Rel1 = create_and_install_fake_first_release(Dir,
+						 [{many_mods,"1.0",LibDir}]),
+    Rel2 = create_fake_upgrade_release(Dir,
+				       "2",
+				       [{many_mods,"2.0",LibDir}],
+				       {[Rel1],[Rel1],[LibDir]}),
+    Rel1Dir = filename:dirname(Rel1),
+    Rel2Dir = filename:dirname(Rel2),
+
+    %% Start a slave node
+    {ok, Node} = t_start_node(otp_9395_rm_many_mods, Rel1,
+			      filename:join(Rel1Dir,"sys.config")),
+
+    %% Start a lot of processes on the new node, all with refs to each
+    %% module that will be updated
+    NProcs = 1000,
+    {Modules,Pids1} = rpc:call(Node,m,start,[NProcs]),
+
+    %% Then load modules in order to get old code
+    [rpc:call(Node,code,load_file,[Mod]) || Mod <- Modules],
+    true = rpc:call(Node,erlang,check_old_code,[m10]),
+
+    %% Unpack second release, which removes all mX modules
+    {ok, RelVsn2} =
+	rpc:call(Node, release_handler, set_unpacked,
+		 [Rel2++".rel", [{many_mods,"2.0",LibDir}]]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "relup")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "start.boot")]),
+    ok = rpc:call(Node, release_handler, install_file,
+		  [RelVsn2, filename:join(Rel2Dir, "sys.config")]),
+
+    %% First, install release directly and check how much time it takes
+    {TInst0,{ok, _, []}} =
+	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
+    ct:log("install_release: ~.2f",[TInst0/1000000]),
+
+    %% Restore to old release, spawn processes again and load to get old code
+    {_,RelVsn1} = init:script_id(),
+    {_TInst1,{ok, _, []}} =
+	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn1]]),
+%    ct:log("install_release: ~.2f",[_TInst1/1000000]),
+
+    [exit(Pid,kill) || Pid <- Pids1],
+    {Modules,_Pids2} = rpc:call(Node,m,start,[NProcs]),
+    [rpc:call(Node,code,load_file,[Mod]) || Mod <- Modules],
+    true = rpc:call(Node,erlang,check_old_code,[m10]),
+
+    %% Run check_install_release with purge before install this time
+    {TCheck,{ok, _RelVsn1, []}} =
+	timer:tc(rpc,call,[Node, release_handler, check_install_release,
+			   [RelVsn2,[purge]]]),
+    ct:log("check_install_release with purge: ~.2f",[TCheck/1000000]),
+
+    %% Finally install release after check and purge, and check that
+    %% this install was faster than the first.
+    {TInst2,{ok, _RelVsn1, []}} =
+	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
+    ct:log("install_release: ~.2f",[TInst2/1000000]),
+
+    true = (TInst2 =< TInst0),
+
+    ok.
+
+otp_9395_rm_many_mods(cleanup,_Conf) ->
+    stop_node(node_name(otp_9395_rm_many_mods)).
+
+
+
 %% Test upgrade and downgrade of applications
 eval_appup(Conf) when is_list(Conf) ->
 
@@ -1838,9 +2147,8 @@ create_fake_upgrade_release(Dir,RelVsn,AppDirs,{UpFrom,DownTo,ExtraLibs}) ->
 
     %% And a relup file so it can be upgraded to
     RelupPath = Paths ++ [filename:join([Lib,"*","ebin"]) || Lib <- ExtraLibs],
-    ok = systools:make_relup(Rel,[UpFrom],[DownTo],
-				   [{path,RelupPath},
-				    {outdir,RelDir}]),
+    ok = systools:make_relup(Rel,UpFrom,DownTo,[{path,RelupPath},
+						{outdir,RelDir}]),
     
     Rel.
 
diff --git a/lib/sasl/test/release_handler_SUITE_data/Makefile.src b/lib/sasl/test/release_handler_SUITE_data/Makefile.src
index a12e526d2e..edb446413d 100644
--- a/lib/sasl/test/release_handler_SUITE_data/Makefile.src
+++ b/lib/sasl/test/release_handler_SUITE_data/Makefile.src
@@ -13,7 +13,30 @@ LIB= \
      lib/a-1.0/ebin/a_sup.@EMULATOR@ \
      lib/b-1.0/ebin/b_server.@EMULATOR@ \
      lib/b-1.0/ebin/b_lib.@EMULATOR@ \
-     lib/b-2.0/ebin/b_server.@EMULATOR@
+     lib/b-2.0/ebin/b_server.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m1.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m2.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m3.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m4.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m5.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m6.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m7.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m8.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m9.@EMULATOR@ \
+     lib/many_mods-1.0/ebin/m10.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m1.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m2.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m3.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m4.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m5.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m6.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m7.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m8.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m9.@EMULATOR@ \
+     lib/many_mods-1.1/ebin/m10.@EMULATOR@ \
+     lib/many_mods-2.0/ebin/m.@EMULATOR@
 
 APP= \
      app1_app2/lib1/app1-1.0/ebin/app1_sup.@EMULATOR@ \
@@ -41,8 +64,13 @@ C= \
      c/b.@EMULATOR@ \
      c/c_sup.@EMULATOR@
     
+SUP= \
+	 release_handler_timeouts/dummy-0.1/ebin/dummy_app.@EMULATOR@ \
+	 release_handler_timeouts/dummy-0.1/ebin/dummy_server.@EMULATOR@ \
+	 release_handler_timeouts/dummy-0.1/ebin/dummy_sup.@EMULATOR@ \
+	 release_handler_timeouts/dummy-0.1/ebin/dummy_sup_2.@EMULATOR@
 
-all: $(P2B) $(LIB) $(APP) $(OTP2740) $(C)
+all: $(P2B) $(LIB) $(APP) $(OTP2740) $(C) $(SUP)
 
 P2B/a-2.0/ebin/a.@EMULATOR@: P2B/a-2.0/src/a.erl
 	erlc $(EFLAGS) -oP2B/a-2.0/ebin P2B/a-2.0/src/a.erl
@@ -75,6 +103,52 @@ lib/b-1.0/ebin/b_lib.@EMULATOR@: lib/b-1.0/src/b_lib.erl
 lib/b-2.0/ebin/b_server.@EMULATOR@: lib/b-2.0/src/b_server.erl
 	erlc $(EFLAGS) -olib/b-2.0/ebin lib/b-2.0/src/b_server.erl
 
+lib/many_mods-1.0/ebin/m.@EMULATOR@: lib/many_mods-1.0/src/m.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m.erl
+lib/many_mods-1.0/ebin/m1.@EMULATOR@: lib/many_mods-1.0/src/m1.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m1.erl
+lib/many_mods-1.0/ebin/m2.@EMULATOR@: lib/many_mods-1.0/src/m2.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m2.erl
+lib/many_mods-1.0/ebin/m3.@EMULATOR@: lib/many_mods-1.0/src/m3.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m3.erl
+lib/many_mods-1.0/ebin/m4.@EMULATOR@: lib/many_mods-1.0/src/m4.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m4.erl
+lib/many_mods-1.0/ebin/m5.@EMULATOR@: lib/many_mods-1.0/src/m5.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m5.erl
+lib/many_mods-1.0/ebin/m6.@EMULATOR@: lib/many_mods-1.0/src/m6.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m6.erl
+lib/many_mods-1.0/ebin/m7.@EMULATOR@: lib/many_mods-1.0/src/m7.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m7.erl
+lib/many_mods-1.0/ebin/m8.@EMULATOR@: lib/many_mods-1.0/src/m8.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m8.erl
+lib/many_mods-1.0/ebin/m9.@EMULATOR@: lib/many_mods-1.0/src/m9.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m9.erl
+lib/many_mods-1.0/ebin/m10.@EMULATOR@: lib/many_mods-1.0/src/m10.erl
+	erlc $(EFLAGS) -olib/many_mods-1.0/ebin lib/many_mods-1.0/src/m10.erl
+lib/many_mods-1.1/ebin/m.@EMULATOR@: lib/many_mods-1.1/src/m.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m.erl
+lib/many_mods-1.1/ebin/m1.@EMULATOR@: lib/many_mods-1.1/src/m1.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m1.erl
+lib/many_mods-1.1/ebin/m2.@EMULATOR@: lib/many_mods-1.1/src/m2.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m2.erl
+lib/many_mods-1.1/ebin/m3.@EMULATOR@: lib/many_mods-1.1/src/m3.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m3.erl
+lib/many_mods-1.1/ebin/m4.@EMULATOR@: lib/many_mods-1.1/src/m4.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m4.erl
+lib/many_mods-1.1/ebin/m5.@EMULATOR@: lib/many_mods-1.1/src/m5.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m5.erl
+lib/many_mods-1.1/ebin/m6.@EMULATOR@: lib/many_mods-1.1/src/m6.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m6.erl
+lib/many_mods-1.1/ebin/m7.@EMULATOR@: lib/many_mods-1.1/src/m7.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m7.erl
+lib/many_mods-1.1/ebin/m8.@EMULATOR@: lib/many_mods-1.1/src/m8.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m8.erl
+lib/many_mods-1.1/ebin/m9.@EMULATOR@: lib/many_mods-1.1/src/m9.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m9.erl
+lib/many_mods-1.1/ebin/m10.@EMULATOR@: lib/many_mods-1.1/src/m10.erl
+	erlc $(EFLAGS) -olib/many_mods-1.1/ebin lib/many_mods-1.1/src/m10.erl
+lib/many_mods-2.0/ebin/m.@EMULATOR@: lib/many_mods-2.0/src/m.erl
+	erlc $(EFLAGS) -olib/many_mods-2.0/ebin lib/many_mods-2.0/src/m.erl
 
 
 app1_app2/lib1/app1-1.0/ebin/app1_sup.@EMULATOR@: app1_app2/lib1/app1-1.0/src/app1_sup.erl
@@ -126,3 +200,12 @@ c/b.@EMULATOR@: c/b.erl
 	erlc $(EFLAGS) -oc c/b.erl
 c/c_sup.@EMULATOR@: c/c_sup.erl
 	erlc $(EFLAGS) -oc c/c_sup.erl
+
+release_handler_timeouts/dummy-0.1/ebin/dummy_app.@EMULATOR@: release_handler_timeouts/dummy-0.1/src/dummy_app.erl
+	erlc $(EFLAGS) -orelease_handler_timeouts/dummy-0.1/ebin release_handler_timeouts/dummy-0.1/src/dummy_app.erl
+release_handler_timeouts/dummy-0.1/ebin/dummy_server.@EMULATOR@: release_handler_timeouts/dummy-0.1/src/dummy_server.erl
+	erlc $(EFLAGS) -orelease_handler_timeouts/dummy-0.1/ebin release_handler_timeouts/dummy-0.1/src/dummy_server.erl
+release_handler_timeouts/dummy-0.1/ebin/dummy_sup.@EMULATOR@: release_handler_timeouts/dummy-0.1/src/dummy_sup.erl
+	erlc $(EFLAGS) -orelease_handler_timeouts/dummy-0.1/ebin release_handler_timeouts/dummy-0.1/src/dummy_sup.erl
+release_handler_timeouts/dummy-0.1/ebin/dummy_sup_2.@EMULATOR@: release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl
+	erlc $(EFLAGS) -orelease_handler_timeouts/dummy-0.1/ebin release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/README b/lib/sasl/test/release_handler_SUITE_data/lib/README
index 667d21d4cf..639a4ca0fb 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/README
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/README
@@ -13,4 +13,21 @@ start version, includes b_lib and b_server
 
 b-2.0:
 can be upgraded to from b-1.0.
-Removes b_lib and updates b_server
+Removes b_lib (soft_purge) and updates b_server (brutal_purge)
+* The diff in purge method is important for test "check_and_purge", in
+  order to check that the purge option to check_install_release works
+  for both methods.
+
+many_mods-1.0:
+start version.
+m:start/1 starts N procs, each calling Mod:bar() in all other modules (m1-m10).
+m1-m10: implements bar() which returns a big constant.
+The point is to get many processes with references to many modules,
+and then load the modules again so that old code exists. See tests
+otp_9395_update_many_mods and otp_9395_rm_many_mods.
+
+many_mods-1.1:
+can be upgraded to from many_mods-1.0. Updates modules m1-m10.
+
+many_mods-2.0:
+can be upgraded to from many_mods-1.0. Removes modules m1-m10.
\ No newline at end of file
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.appup b/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.appup
index d261a37732..001255a88c 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.appup
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.appup
@@ -1,3 +1,6 @@
+%% -*- erlang -*-
 {"2.0",
- [{"1.0",[{delete_module,b_lib}, {update,b_server,{advanced,[]}}]}],
- [{"1.0",[{add_module,b_lib},{update,b_server,{advanced,[]}}]}]}.
+ [{"1.0",[{remove_module,b_lib,soft_purge,soft_purge,[]},
+	  {update,b_server,{advanced,[]}}]}],
+ [{"1.0",[{add_module,b_lib},
+	  {update,b_server,{advanced,[]}}]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app
new file mode 100644
index 0000000000..aa39adfffa
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app
@@ -0,0 +1,17 @@
+%% -*- erlang -*-
+{application, many_mods,
+ [{description, "Application with many modules  CXC 138 11"},
+  {vsn, "1.0"},
+  {modules, [{m, 1},
+	     {m1,1},
+	     {m2,1},
+	     {m3,1},
+	     {m4,1},
+	     {m5,1},
+	     {m6,1},
+	     {m7,1},
+	     {m8,1},
+	     {m9,1},
+	     {m10,1}]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m.erl
new file mode 100644
index 0000000000..418102bebb
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m.erl
@@ -0,0 +1,11 @@
+-module(m).
+-compile(export_all).
+
+start(NProcs) ->
+    Modules = [m1,m2,m3,m4,m5,m6,m7,m8,m9,m10],
+    Pids = [spawn_link(fun() ->
+			       Cs = [M:bar() || M <- Modules],
+			       receive stop -> Cs end
+		       end) ||
+	       _ <- lists:seq(1,NProcs)],
+    {Modules,Pids}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m1.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m1.erl
new file mode 100644
index 0000000000..cacc13f5d7
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m1.erl
@@ -0,0 +1,4 @@
+-module(m1).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m10.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m10.erl
new file mode 100644
index 0000000000..81e120b891
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m10.erl
@@ -0,0 +1,4 @@
+-module(m10).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m2.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m2.erl
new file mode 100644
index 0000000000..481276ba7b
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m2.erl
@@ -0,0 +1,4 @@
+-module(m2).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m3.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m3.erl
new file mode 100644
index 0000000000..9a04ed5fc9
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m3.erl
@@ -0,0 +1,4 @@
+-module(m3).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m4.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m4.erl
new file mode 100644
index 0000000000..90de9a30c9
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m4.erl
@@ -0,0 +1,4 @@
+-module(m4).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m5.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m5.erl
new file mode 100644
index 0000000000..8a9b690dfa
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m5.erl
@@ -0,0 +1,4 @@
+-module(m5).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m6.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m6.erl
new file mode 100644
index 0000000000..cd0d3977ed
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m6.erl
@@ -0,0 +1,4 @@
+-module(m6).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m7.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m7.erl
new file mode 100644
index 0000000000..1f79918d6e
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m7.erl
@@ -0,0 +1,4 @@
+-module(m7).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m8.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m8.erl
new file mode 100644
index 0000000000..2ce03a0b7e
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m8.erl
@@ -0,0 +1,4 @@
+-module(m8).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m9.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m9.erl
new file mode 100644
index 0000000000..1c5f72e628
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m9.erl
@@ -0,0 +1,4 @@
+-module(m9).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app
new file mode 100644
index 0000000000..36c50caf2f
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app
@@ -0,0 +1,17 @@
+%% -*- erlang -*-
+{application, many_mods,
+ [{description, "Application with many modules  CXC 138 11"},
+  {vsn, "1.1"},
+  {modules, [{m, 1},
+	     {m1,1},
+	     {m2,1},
+	     {m3,1},
+	     {m4,1},
+	     {m5,1},
+	     {m6,1},
+	     {m7,1},
+	     {m8,1},
+	     {m9,1},
+	     {m10,1}]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.appup b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.appup
new file mode 100644
index 0000000000..696435e06f
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.appup
@@ -0,0 +1,22 @@
+%% -*- erlang -*-
+{"1.1",
+ [{"1.0",[{update,m1},
+	  {update,m2},
+	  {update,m3},
+	  {update,m4},
+	  {update,m5},
+	  {update,m6},
+	  {update,m7},
+	  {update,m8},
+	  {update,m9},
+	  {update,m10}]}],
+ [{"1.0",[{update,m1},
+	  {update,m2},
+	  {update,m3},
+	  {update,m4},
+	  {update,m5},
+	  {update,m6},
+	  {update,m7},
+	  {update,m8},
+	  {update,m9},
+	  {update,m10}]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m.erl
new file mode 100644
index 0000000000..418102bebb
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m.erl
@@ -0,0 +1,11 @@
+-module(m).
+-compile(export_all).
+
+start(NProcs) ->
+    Modules = [m1,m2,m3,m4,m5,m6,m7,m8,m9,m10],
+    Pids = [spawn_link(fun() ->
+			       Cs = [M:bar() || M <- Modules],
+			       receive stop -> Cs end
+		       end) ||
+	       _ <- lists:seq(1,NProcs)],
+    {Modules,Pids}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m1.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m1.erl
new file mode 100644
index 0000000000..cacc13f5d7
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m1.erl
@@ -0,0 +1,4 @@
+-module(m1).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m10.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m10.erl
new file mode 100644
index 0000000000..81e120b891
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m10.erl
@@ -0,0 +1,4 @@
+-module(m10).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m2.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m2.erl
new file mode 100644
index 0000000000..481276ba7b
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m2.erl
@@ -0,0 +1,4 @@
+-module(m2).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m3.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m3.erl
new file mode 100644
index 0000000000..9a04ed5fc9
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m3.erl
@@ -0,0 +1,4 @@
+-module(m3).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m4.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m4.erl
new file mode 100644
index 0000000000..90de9a30c9
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m4.erl
@@ -0,0 +1,4 @@
+-module(m4).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m5.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m5.erl
new file mode 100644
index 0000000000..8a9b690dfa
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m5.erl
@@ -0,0 +1,4 @@
+-module(m5).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m6.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m6.erl
new file mode 100644
index 0000000000..cd0d3977ed
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m6.erl
@@ -0,0 +1,4 @@
+-module(m6).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m7.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m7.erl
new file mode 100644
index 0000000000..1f79918d6e
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m7.erl
@@ -0,0 +1,4 @@
+-module(m7).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m8.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m8.erl
new file mode 100644
index 0000000000..2ce03a0b7e
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m8.erl
@@ -0,0 +1,4 @@
+-module(m8).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m9.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m9.erl
new file mode 100644
index 0000000000..1c5f72e628
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m9.erl
@@ -0,0 +1,4 @@
+-module(m9).
+-compile(export_all).
+%% A module with a big constant...
+bar() -> {now(),[{1,'1',"1"},{2,'2',"2"},{3,'3',"3"},{4,'4',"4"},{5,'5',"5"},{6,'6',"6"},{7,'7',"7"},{8,'8',"8"},{9,'9',"9"},{10,'10',"10"},{11,'11',"11"},{12,'12',"12"},{13,'13',"13"},{14,'14',"14"},{15,'15',"15"},{16,'16',"16"},{17,'17',"17"},{18,'18',"18"},{19,'19',"19"},{20,'20',"20"},{21,'21',"21"},{22,'22',"22"},{23,'23',"23"},{24,'24',"24"},{25,'25',"25"},{26,'26',"26"},{27,'27',"27"},{28,'28',"28"},{29,'29',"29"},{30,'30',"30"},{31,'31',"31"},{32,'32',"32"},{33,'33',"33"},{34,'34',"34"},{35,'35',"35"},{36,'36',"36"},{37,'37',"37"},{38,'38',"38"},{39,'39',"39"},{40,'40',"40"},{41,'41',"41"},{42,'42',"42"},{43,'43',"43"},{44,'44',"44"},{45,'45',"45"},{46,'46',"46"},{47,'47',"47"},{48,'48',"48"},{49,'49',"49"},{50,'50',"50"},{51,'51',"51"},{52,'52',"52"},{53,'53',"53"},{54,'54',"54"},{55,'55',"55"},{56,'56',"56"},{57,'57',"57"},{58,'58',"58"},{59,'59',"59"},{60,'60',"60"},{61,'61',"61"},{62,'62',"62"},{63,'63',"63"},{64,'64',"64"},{65,'65',"65"},{66,'66',"66"},{67,'67',"67"},{68,'68',"68"},{69,'69',"69"},{70,'70',"70"},{71,'71',"71"},{72,'72',"72"},{73,'73',"73"},{74,'74',"74"},{75,'75',"75"},{76,'76',"76"},{77,'77',"77"},{78,'78',"78"},{79,'79',"79"},{80,'80',"80"},{81,'81',"81"},{82,'82',"82"},{83,'83',"83"},{84,'84',"84"},{85,'85',"85"},{86,'86',"86"},{87,'87',"87"},{88,'88',"88"},{89,'89',"89"},{90,'90',"90"},{91,'91',"91"},{92,'92',"92"},{93,'93',"93"},{94,'94',"94"},{95,'95',"95"},{96,'96',"96"},{97,'97',"97"},{98,'98',"98"},{99,'99',"99"},{100,'100',"100"}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app
new file mode 100644
index 0000000000..98f6527750
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app
@@ -0,0 +1,7 @@
+%% -*- erlang -*-
+{application, many_mods,
+ [{description, "Application with many modules  CXC 138 11"},
+  {vsn, "2.0"},
+  {modules, [{m, 1}]},
+  {registered, []},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.appup b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.appup
new file mode 100644
index 0000000000..3a34db78c1
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.appup
@@ -0,0 +1,24 @@
+%% -*- erlang -*-
+{"2.0",
+ [{"1.0",[{update,m},
+	  {delete_module,m1},
+	  {delete_module,m2},
+	  {delete_module,m3},
+	  {delete_module,m4},
+	  {delete_module,m5},
+	  {delete_module,m6},
+	  {delete_module,m7},
+	  {delete_module,m8},
+	  {delete_module,m9},
+	  {delete_module,m10}]}],
+ [{"1.0",[{update,m},
+	  {add_module,m1},
+	  {add_module,m2},
+	  {add_module,m3},
+	  {add_module,m4},
+	  {add_module,m5},
+	  {add_module,m6},
+	  {add_module,m7},
+	  {add_module,m8},
+	  {add_module,m9},
+	  {add_module,m10}]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/src/m.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/src/m.erl
new file mode 100644
index 0000000000..2edc1e6be4
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/src/m.erl
@@ -0,0 +1,11 @@
+-module(m).
+-compile(export_all).
+
+start(NProcs) ->
+    Modules = [],
+    Pids = [spawn_link(fun() ->
+			       Cs = [M:bar() || M <- Modules],
+			       receive stop -> Cs end
+		       end) ||
+	       _ <- lists:seq(1,NProcs)],
+    {Modules,Pids}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/ebin/dummy.app b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/ebin/dummy.app
new file mode 100644
index 0000000000..9efdc2e5da
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/ebin/dummy.app
@@ -0,0 +1,7 @@
+{application,dummy,
+             [{description,"a dummy app"},
+              {vsn,"0.1"},
+              {registered,[dummy_app]},
+              {mod,{dummy_app,[]}},
+              {applications,[kernel,stdlib,sasl]},
+              {modules,[dummy_app,dummy_server,dummy_sup,dummy_sup_2]}]}.
\ No newline at end of file
diff --git a/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_app.erl b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_app.erl
new file mode 100644
index 0000000000..51363b3630
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_app.erl
@@ -0,0 +1,9 @@
+-module(dummy_app).
+-behaviour(application).
+
+-export([start/2, stop/1]).
+
+start(_,_) ->
+    dummy_sup:start_link().
+
+stop(_) -> ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_server.erl b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_server.erl
new file mode 100644
index 0000000000..382251eba7
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_server.erl
@@ -0,0 +1,56 @@
+-module(dummy_server).
+-behaviour(gen_server).
+
+-export([start_link/0, set_state/1, get_state/0]).
+
+-export([init/1,
+         handle_call/3,
+         handle_cast/2,
+         handle_info/2,
+         terminate/2,
+         code_change/3]).
+
+%%
+
+start_link() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+set_state(What) ->
+    gen_server:call(?MODULE, {set_state, What}).
+
+get_state() ->
+    gen_server:call(?MODULE, get_state).
+
+
+%%
+
+init([]) ->
+    say("init, setting state to 0", []),
+    {ok, 0}.
+
+
+handle_call({set_state, NewState}, _From, _State) ->
+    {reply, {ok, NewState}, NewState};
+
+handle_call(get_state, _From, State) ->
+    {reply, State, State}.
+
+handle_cast('__not_implemented', State) ->
+    {noreply, State}.
+
+handle_info(_Info, State) ->
+    say("info ~p, ~p.", [_Info, State]),
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    say("terminate ~p, ~p", [_Reason, _State]),
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    say("code_change ~p, ~p, ~p", [_OldVsn, State, _Extra]),
+    {ok, State}.
+
+%% Internal
+
+say(Format, Data) ->
+    io:format("~p:~p: ~s~n", [?MODULE, self(), io_lib:format(Format, Data)]).
diff --git a/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup.erl b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup.erl
new file mode 100644
index 0000000000..3d7b5060df
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup.erl
@@ -0,0 +1,15 @@
+-module(dummy_sup).
+-behaviour(supervisor).
+
+-export([start_link/0]).
+-export([init/1]).
+
+start_link() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+init([]) ->
+    DummySup2 = {dummy_sup_2,
+                {dummy_sup_2, start_link, []},
+                permanent, 5000, supervisor, [dummy_sup_2]},
+
+    {ok, {{one_for_one, 10, 10}, [DummySup2]}}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl
new file mode 100644
index 0000000000..d936cbcbd6
--- /dev/null
+++ b/lib/sasl/test/release_handler_SUITE_data/release_handler_timeouts/dummy-0.1/src/dummy_sup_2.erl
@@ -0,0 +1,15 @@
+-module(dummy_sup_2).
+-behaviour(supervisor).
+
+-export([start_link/0]).
+-export([init/1]).
+
+start_link() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+init([]) ->
+    Dummy = {dummy_server,
+             {dummy_server, start_link, []},
+             permanent, 5000, worker, [dummy_server]},
+
+    {ok, {{one_for_one, 10, 10}, [Dummy]}}.
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl
index 9190b111ef..e352247d44 100644
--- a/lib/sasl/test/systools_SUITE.erl
+++ b/lib/sasl/test/systools_SUITE.erl
@@ -48,7 +48,7 @@
 	  included_fail_script/1, included_bug_script/1, exref_script/1]).
 -export([ tar_options/1, normal_tar/1, no_mod_vsn_tar/1, variable_tar/1,
 	  src_tests_tar/1, shadow_tar/1, var_tar/1,
-	  exref_tar/1, link_tar/1]).
+	  exref_tar/1, link_tar/1, otp_9507/1]).
 -export([ normal_relup/1, abnormal_relup/1, no_appup_relup/1,
 	  bad_appup_relup/1, app_start_type_relup/1, otp_3065/1]).
 -export([
@@ -81,7 +81,7 @@ groups() ->
      {tar, [],
       [tar_options, normal_tar, no_mod_vsn_tar, variable_tar,
        src_tests_tar, shadow_tar, var_tar,
-       exref_tar, link_tar]},
+       exref_tar, link_tar, otp_9507]},
      {relup, [],
       [normal_relup, abnormal_relup, no_appup_relup,
        bad_appup_relup, app_start_type_relup]},
@@ -396,6 +396,7 @@ src_tests_script(Config) when is_list(Config) ->
     ?line PSAVE = code:get_path(),		% Save path
 
     ?line {LatestDir, LatestName} = create_script(latest,Config),
+    ?line BootFile = LatestName ++ ".boot",
 
     ?line DataDir = filename:absname(?copydir),
     ?line LibDir = fname([DataDir, d_missing_src, lib]),
@@ -416,14 +417,32 @@ src_tests_script(Config) when is_list(Config) ->
     ?line Erl2 = filename:join([P1,"..","src","db2.erl"]),
     ?line file:delete(Erl2),
 
-    %% Then make script - two warnings should be issued when
-    %% src_tests is given
+    %% Then make script
+
+    %% .boot file should not exist
+    ?line ok = file:delete(BootFile),
+    ?line false = filelib:is_regular(BootFile),
+    %% With warnings_as_errors and src_tests option, an error should be issued
+    ?line error =
+	systools:make_script(LatestName, [silent, {path, N}, src_tests,
+					  warnings_as_errors]),
+    ?line error =
+	systools:make_script(LatestName, [{path, N}, src_tests,
+					  warnings_as_errors]),
+
+    %% due to warnings_as_errors .boot file should still not exist
+    ?line false = filelib:is_regular(BootFile),
+
+    %% Two warnings should be issued when src_tests is given
     %% 1. old object code for db1.beam
     %% 2. missing source code for db2.beam
     ?line {ok, _, [{warning,{obj_out_of_date,_}},
 		   {warning,{source_not_found,_}}]} =
 	systools:make_script(LatestName, [silent, {path, N}, src_tests]),
 
+    %% .boot file should exist now
+    ?line true = filelib:is_regular(BootFile),
+
     %% Without the src_tests option, no warning should be issued
     ?line {ok, _, []} =
 	systools:make_script(LatestName, [silent, {path, N}]),
@@ -1066,6 +1085,48 @@ exref_tar(Config) when is_list(Config) ->
     ?line ok = file:set_cwd(OldDir),
     ok.
 
+
+
+%% otp_9507
+%%
+otp_9507(suite) -> [];
+otp_9507(doc) ->
+    ["make_tar failed when path given as just 'ebin'."];
+otp_9507(Config) when is_list(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+
+    ?line {LatestDir, LatestName} = create_script(latest_small,Config),
+
+    ?line DataDir = filename:absname(?copydir),
+    ?line LibDir = fname([DataDir, d_normal, lib]),
+    ?line FeDir = fname([LibDir, 'fe-3.1']),
+
+    ?line ok = file:set_cwd(FeDir),
+
+    RelName = fname([LatestDir,LatestName]),
+
+    ?line P1 = ["./ebin",
+	       fname([DataDir, lib, kernel, ebin]),
+	       fname([DataDir, lib, stdlib, ebin])],
+    ?line {ok, _, _} = systools:make_script(RelName, [silent, {path, P1}]),
+    ?line ok = systools:make_tar(RelName, [{path, P1}]),
+    ?line Content1 = tar_contents(RelName),
+
+    ?line P2 = ["ebin",
+	       fname([DataDir, lib, kernel, ebin]),
+	       fname([DataDir, lib, stdlib, ebin])],
+
+    %% Tickets solves the following line - it used to fail with
+    %% {function_clause,[{filename,join,[[]]},...}
+    ?line ok = systools:make_tar(RelName, [{path, P2}]),
+    ?line Content2 = tar_contents(RelName),
+    true = (Content1 == Content2),
+
+    ?line ok = file:set_cwd(OldDir),
+
+    ok.
+
+
 %% The relup stuff.
 %%
 %%
@@ -1108,6 +1169,21 @@ normal_relup(Config) when is_list(Config) ->
 			    [{path, P}, silent]),
     ?line ok = check_relup([{db, "2.1"}], [{db, "1.0"}]),
 
+    %% file should not be written if warnings_as_errors is enabled.
+    %% delete before running tests.
+    ?line ok = file:delete("relup"),
+
+    %% Check that warnings are treated as errors
+    ?line error =
+	systools:make_relup(LatestName, [LatestName2], [LatestName1],
+			    [{path, P}, warnings_as_errors]),
+    ?line error =
+	systools:make_relup(LatestName, [LatestName2], [LatestName1],
+			    [{path, P}, silent, warnings_as_errors]),
+
+    %% relup file should not exist
+    ?line false = filelib:is_regular("relup"),
+
     %% Check that warnings get through
     ?line ok = systools:make_relup(LatestName, [LatestName2], [LatestName1],
 				   [{path, P}]),
@@ -1117,6 +1193,9 @@ normal_relup(Config) when is_list(Config) ->
 			    [{path, P}, silent]),
     ?line ok = check_relup([{fe, "3.1"}, {db, "2.1"}], [{db, "1.0"}]),
 
+    %% relup file should exist now
+    ?line true = filelib:is_regular("relup"),
+
     ?line ok = file:set_cwd(OldDir),
     ok.
 
diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index cee11ba97a..c964b08168 100644
--- a/lib/snmp/test/snmp_compiler_test.erl
+++ b/lib/snmp/test/snmp_compiler_test.erl
@@ -47,7 +47,7 @@
 	 module_identity/1,
 	 agent_capabilities/1,
 	 module_compliance/1, 
-	 warnings_as_errors/1, 
+	 warnings_as_errors/1,
 
 	 otp_6150/1,
 	 otp_8574/1, 
@@ -101,7 +101,7 @@ all() ->
      module_identity, 
      agent_capabilities, 
      module_compliance, 
-     warnings_as_errors, 
+     warnings_as_errors,
      {group, tickets}
     ].
 
@@ -282,8 +282,8 @@ warnings_as_errors(Config) when is_list(Config) ->
     MibDir  = ?config(mib_dir,  Config),
     MibFile = join(MibDir, "OTP8574-MIB.mib"),
     OutFile = join(Dir, "OTP8574-MIB.bin"),
-    Opts =  [{group_check, false}, 
-	     {outdir,      Dir}, 
+    Opts =  [{group_check, false},
+	     {outdir,      Dir},
 	     {verbosity,   trace},
 	     relaxed_row_name_assign_check],
     {error, compilation_failed} =
@@ -291,6 +291,7 @@ warnings_as_errors(Config) when is_list(Config) ->
     false = filelib:is_regular(OutFile),
     {ok, _} = snmpc:compile(MibFile, Opts),
     true = filelib:is_regular(OutFile),
+    ok = file:delete(OutFile),
     ok.
 
 
diff --git a/lib/ssl/doc/src/ssl_distribution.xml b/lib/ssl/doc/src/ssl_distribution.xml
index 7bcc12eb5f..a2c7370ddc 100644
--- a/lib/ssl/doc/src/ssl_distribution.xml
+++ b/lib/ssl/doc/src/ssl_distribution.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2010</year>
+      <year>2000</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,36 +33,32 @@
   </header>
   <p>This chapter describes how the Erlang distribution can use 
     SSL to get additional verification and security.
-
-    <note><p>Note this
-    documentation is written for the old ssl implementation and
-    will be updated for the new one once this functionality is
-    supported by the new implementation.</p></note>
   </p>
 
   <section>
     <title>Introduction</title>
     <p>The Erlang distribution can in theory use almost any connection
       based protocol as bearer. A module that implements the protocol
-      specific parts of connection setup is however needed. The
+      specific parts of the connection setup is however needed. The
       default distribution module is <c>inet_tcp_dist</c> which is
       included in the Kernel application. When starting an
       Erlang node distributed, <c>net_kernel</c> uses this module to
       setup listen ports and connections. </p>
-    <p>In the SSL application there is an additional distribution
-      module, <c>inet_ssl_dist</c> which can be used as an
+
+      <p>In the SSL application there is an additional distribution
+      module, <c>inet_tls_dist</c> which can be used as an
       alternative. All distribution connections will be using SSL and
       all participating Erlang nodes in a distributed system must use
       this distribution module.</p>
-    <p>The security depends on how the connections are set up, one can
-      use key files or certificates to just get a encrypted
-      connection. One can also make the SSL package verify the
-      certificates of other nodes to get additional security. 
-      Cookies are however always used as they can be used to
-      differentiate between two different Erlang networks.</p>
+
+      <p>The security level depends on the parameters provided to the
+      SSL connection setup. Erlang node cookies are however always
+      used, as they can be used to differentiate between two different
+      Erlang networks.</p>
     <p>Setting up Erlang distribution over SSL involves some simple but
       necessary steps:</p>
-    <list type="bulleted">
+
+      <list type="bulleted">
       <item>Building boot scripts including the SSL application</item>
       <item>Specifying the distribution module for net_kernel</item>
       <item>Specifying security options and other SSL options</item>
@@ -77,122 +73,135 @@
       SASL application. Refer to the SASL documentations
       for more information on systools. This is only an example of
       what can be done.</p>
-    <p>The simplest boot script possible includes only the Kernel
+
+      <p>The simplest boot script possible includes only the Kernel
       and STDLIB applications. Such a script is located in the
       Erlang distributions bin directory. The source for the script
       can be found under the Erlang installation top directory under
-      <c><![CDATA[releases/<OTP version>start_clean.rel]]></c>. Copy that
+      <c><![CDATA[releases/<OTP version>/start_clean.rel]]></c>. Copy that
       script to another location (and preferably another name) 
-      and add the SSL application with its current version number
+      and add the applications crypto, public_key and SSL with their current version numbers
       after the STDLIB application.</p>
     <p>An example .rel file with SSL added may look like this:</p>
+
     <code type="none">
-{release, {"OTP  APN 181 01","P7A"}, {erts, "5.0"},
- [{kernel,"2.5"},
-  {stdlib,"1.8.1"},
-  {ssl,"2.2.1"}]}.    </code>
-    <p>Note that the version numbers surely will differ in your system.
-      Whenever one of the applications included in the script is
-      upgraded, the script has to be changed.</p>
-    <p>Assuming the above .rel file is stored in a file
-      <c>start_ssl.rel</c> in the current directory, a boot script 
-      can be built like this:</p>
-    <code type="none">
-1> systools:make_script("start_ssl",[]).    </code>
-    <p>There will now be a file <c>start_ssl.boot</c> in the current
-      directory. To test the boot script, start Erlang with the
-      <c>-boot</c> command line parameter specifying this boot script
-      (with its full path but without the <c>.boot</c> suffix), in
-      Unix it could look like this:</p>
-    <p></p>
-    <code type="none"><![CDATA[
+      {release, {"OTP  APN 181 01","R15A"}, {erts, "5.9"},
+      [{kernel,"2.15"},
+      {stdlib,"1.18"},
+      {crypto, "2.0.3"},
+      {public_key, "0.12"},
+      {ssl, "5.0"}
+      ]}.
+   </code>
+
+   <p>Note that the version numbers surely will differ in your system.
+   Whenever one of the applications included in the script is
+   upgraded, the script has to be changed.</p>
+   <p>Assuming the above .rel file is stored in a file
+   <c>start_ssl.rel</c> in the current directory, a boot script
+   can be built like this:</p>
+
+   <code type="none">
+   1> systools:make_script("start_ssl",[]).    </code>
+
+   <p>There will now be a file <c>start_ssl.boot</c> in the current
+   directory. To test the boot script, start Erlang with the
+   <c>-boot</c> command line parameter specifying this boot script
+   (with its full path but without the <c>.boot</c> suffix), in
+   Unix it could look like this:</p>
+   <p></p>
+
+   <code type="none"><![CDATA[
 $ erl -boot /home/me/ssl/start_ssl
 Erlang (BEAM) emulator version 5.0
  
 Eshell V5.0  (abort with ^G)
-1> whereis(ssl_server).
-<0.32.0>    ]]></code>
+1> whereis(ssl_manager).
+<0.41.0>    ]]></code>
     <p>The <c>whereis</c> function call verifies that the SSL
       application is really started.</p>
-    <p>As an alternative to building a bootscript, one can explicitly
-      add the path to the ssl <c>ebin</c> directory on the command
+
+      <p>As an alternative to building a bootscript, one can explicitly
+      add the path to the SSL <c>ebin</c> directory on the command
       line. This is done with the command line option <c>-pa</c>. This
-      works as the ssl application really need not be started for the
-      distribution to come up, a primitive version of the ssl server
-      is started by the distribution module itself, so as long as the
-      primitive code server can reach the code, the distribution will
+      works as the SSL application does not need to be started for the
+      distribution to come up, as a clone of the SSL application is
+      hooked into the kernel application, so as long as the
+      SSL applications code can be reached, the distribution will
       start. The <c>-pa</c> method is only recommended for testing
       purposes.</p>
+
+      <note><p>Note that the clone of the SSL application is necessary to
+      enable the use of the SSL code in such an early bootstage as
+      needed to setup the distribution, however this will make it
+      impossible to soft upgrade the SSL application.</p></note>
   </section>
 
   <section>
     <title>Specifying distribution module for net_kernel</title>
-    <p>The distribution module for SSL is named <c>inet_ssl_dist</c>
-      and is specified on the command line whit the <c>-proto_dist</c>
+    <p>The distribution module for SSL is named <c>inet_tls_dist</c>
+      and is specified on the command line with the <c>-proto_dist</c>
       option. The argument to <c>-proto_dist</c> should be the module
       name without the <c>_dist</c> suffix, so this distribution
-      module is specified with <c>-proto_dist inet_ssl</c> on the
+      module is specified with <c>-proto_dist inet_tls</c> on the
       command line.</p>
     <p></p>
+
     <p>Extending the command line from above gives us the following:</p>
     <code type="none">
-$ erl -boot /home/me/ssl/start_ssl -proto_dist inet_ssl    </code>
-    <p>For the distribution to actually be started, we need to give
-      the emulator a name as well:</p>
+$ erl -boot /home/me/ssl/start_ssl -proto_dist inet_tls    </code>
+
+<p>For the distribution to actually be started, we need to give
+the emulator a name as well:</p>
     <code type="none">
-$ erl -boot /home/me/ssl/start_ssl -proto_dist inet_ssl -sname ssl_test
+$ erl -boot /home/me/ssl/start_ssl -proto_dist inet_tls -sname ssl_test
 Erlang (BEAM) emulator version 5.0 [source]
  
 Eshell V5.0  (abort with ^G)
 (ssl_test@myhost)1>     </code>
     <p>Note however that a node started in this way will refuse to talk
-      to other nodes, as no certificates or key files are supplied
+      to other nodes, as no ssl parameters are supplied
       (see below).</p>
-    <p>When the SSL distribution starts, the OTP system is in its
-      early boot stage, why neither <c>application</c> nor <c>code</c>
-      are usable. As SSL needs to start a port program in this early
-      stage, it tries to determine the path to that program from the
-      primitive code loaders code path. If this fails, one need to
-      specify the directory where the port program resides. This can
-      be done either with an environment variable 
-      <c>ERL_SSL_PORTPROGRAM_DIR</c> or with the command line option
-      <c>-ssl_portprogram_dir</c>. The value should be the directory
-      where the <c>ssl_esock</c> port program is located. Note that
-      this option is never needed in a normal Erlang installation.</p>
   </section>
 
   <section>
-    <title>Specifying security options and other SSL options</title>
-    <p>For SSL to work, you either need certificate files or a
-      key file. Certificate files can be specified both when working as
-      client and as server (connecting or accepting). </p>
-    <p></p>
+    <title>Specifying SSL options</title> <p>For SSL to work, at least
+    a public key and certificate needs to be specified for the server
+    side.  In the following example the PEM-files consists of two
+    entries the servers certificate and its private key.</p>
+
     <p>On the <c>erl</c> command line one can specify options that the
-      ssl distribution will add when creation a socket. It is
-      mandatory to specify at least a key file or client and server
-      certificates. One can specify any <em>SSL option</em> on the
-      command line, but must not specify any socket options (like
-      packet size and such). The SSL options are listed in the
-      Reference Manual. The only difference between the
-      options in the reference manual and the ones that can be
-      specified to the distribution on the command line is that
-      <c>certfile</c> can (and usually needs to) be specified as
-      <c>client_certfile</c> and <c>server_certfile</c>. The
-      <c>client_certfile</c> is used when the distribution initiates a
-      connection to another node and the <c>server_certfile</c> is used
-      when accepting a connection from a remote node. </p>
-    <p>The command line argument for specifying the SSL options is named 
-      <c>-ssl_dist_opt</c> and should be followed by an even number of
-      SSL options/option values. The <c>-ssl_dist_opt</c> argument can
-      be repeated any number of times.</p>
-    <p>An example command line would now look something like this
+    SSL distribution will add when creating a socket.</p>
+
+    <p>One can specify the simpler SSL options certfile, keyfile,
+    password, cacertfile, verify, reuse_sessions,
+    secure_renegotiation, depth, hibernate_after and ciphers (use old
+    string format) by adding the prefix server_ or client_ to the
+    option name. The server can also take the options dhfile and
+    fail_if_no_peer_cert (also prefixed).
+    <c>client_</c>-prfixed options are used when the distribution initiates a
+    connection to another node and the <c>server_</c>-prefixed options are used
+    when accepting a connection from a remote node. </p>
+
+    <p> More complex options such as verify_fun are not available at
+    the moment but a mechanism to handle such options may be added in
+    a future release. </p>
+
+    <p> Raw socket options such as packet and size must not be specified on
+    the command line</p>.
+
+    <p>The command line argument for specifying the SSL options is named
+    <c>-ssl_dist_opt</c> and should be followed by pairs of
+    SSL options and their values. The <c>-ssl_dist_opt</c> argument can
+    be repeated any number of times.</p>
+
+      <p>An example command line would now look something like this
       (line breaks in the command are for readability, 
       they should not be there when typed):</p>
     <code type="none">
-$ erl -boot /home/me/ssl/start_ssl -proto_dist inet_ssl 
-  -ssl_dist_opt client_certfile "/home/me/ssl/erlclient.pem" 
+$ erl -boot /home/me/ssl/start_ssl -proto_dist inet_tls
   -ssl_dist_opt server_certfile "/home/me/ssl/erlserver.pem" 
-  -ssl_dist_opt verify 1 depth 1     
+  -ssl_dist_opt server_secure_renegotiation true client_secure_renegotiate true
   -sname ssl_test
 Erlang (BEAM) emulator version 5.0 [source]
  
@@ -211,12 +220,11 @@ Eshell V5.0  (abort with ^G)
       subsequent invocations of Erlang.</p>
     <p></p>
     <p>In a Unix (Bourne) shell it could look like this (line breaks for
-      readability):</p>
+      readability, they should not be there when typed):</p>
     <code type="none">
-$ ERL_FLAGS="-boot \\"/home/me/ssl/start_ssl\\" -proto_dist inet_ssl 
-  -ssl_dist_opt client_certfile \\"/home/me/ssl/erlclient.pem\\" 
-  -ssl_dist_opt server_certfile \\"/home/me/ssl/erlserver.pem\\" 
-  -ssl_dist_opt verify 1 -ssl_dist_opt depth 1"
+$ ERL_FLAGS="-boot /home/me/ssl/start_ssl -proto_dist inet_tls
+  -ssl_dist_opt server_certfile /home/me/ssl/erlserver.pem
+  -ssl_dist_opt server_secure_renegotiation true client_secure_renegotiate true"
 $ export ERL_FLAGS
 $ erl -sname ssl_test
 Erlang (BEAM) emulator version 5.0 [source]
@@ -227,15 +235,12 @@ Eshell V5.0  (abort with ^G)
  {progname,["erl "]},
  {sname,["ssl_test"]},
  {boot,["/home/me/ssl/start_ssl"]},
- {proto_dist,["inet_ssl"]},
- {ssl_dist_opt,["client_certfile","/home/me/ssl/erlclient.pem"]},
+ {proto_dist,["inet_tls"]},
  {ssl_dist_opt,["server_certfile","/home/me/ssl/erlserver.pem"]},
- {ssl_dist_opt,["verify","1"]},
- {ssl_dist_opt,["depth","1"]},
+ {ssl_dist_opt,["server_secure_renegotiation","true",
+                "client_secure_renegotiate","true"]
  {home,["/home/me"]}]    </code>
     <p>The <c>init:get_arguments()</c> call verifies that the correct
       arguments are supplied to the emulator. </p>
   </section>
 </chapter>
-
-
diff --git a/lib/ssl/doc/src/ssl_protocol.xml b/lib/ssl/doc/src/ssl_protocol.xml
index ca5cc8bc7a..17268a634d 100644
--- a/lib/ssl/doc/src/ssl_protocol.xml
+++ b/lib/ssl/doc/src/ssl_protocol.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2010</year>
+      <year>2003</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -25,18 +25,18 @@
     <file>ssl_protocol.xml</file>
   </header>
   
-  <p>The erlang ssl application currently supports SSL 3.0 and TLS 1.0
+  <p>The erlang SSL application currently supports SSL 3.0 and TLS 1.0
   RFC 2246, and will in the future also support later versions of TLS.
   SSL 2.0 is not supported.
   </p>
 
-  <p>By default erlang ssl is run over the TCP/IP protocol even
+  <p>By default erlang SSL is run over the TCP/IP protocol even
   though you could plug in any other reliable transport protocol
   with the same API as gen_tcp.</p>
   
   <p>If a client and server wants to use an upgrade mechanism, such as
-  defined by RFC2817, to upgrade a regular TCP/IP connection to an ssl
-  connection the erlang ssl API supports this. This can be useful for
+  defined by RFC2817, to upgrade a regular TCP/IP connection to an SSL
+  connection the erlang SSL API supports this. This can be useful for
   things such as supporting HTTP and HTTPS on the same port and
   implementing virtual hosting.
   </p>
@@ -131,7 +131,7 @@
      connections. Sessions are used to avoid the expensive negotiation
      of new security parameters for each connection."</p>
 
-     <p>Session data is by default kept by the ssl application in a
+     <p>Session data is by default kept by the SSL application in a
      memory storage hence session data will be lost at application
      restart or takeover. Users may define their own callback module
      to handle session data storage if persistent data storage is
@@ -140,8 +140,8 @@
      possible to configure the amount of time the session data should be
      saved.</p>
 
-     <p>Ssl clients will by default try to reuse an available session,
-     ssl servers will by default agree to reuse sessions when clients
+     <p>SSL clients will by default try to reuse an available session,
+     SSL servers will by default agree to reuse sessions when clients
      ask to do so.</p>
 
    </section>
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index 7514ad2aa2..9c40d4ea53 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2010. All Rights Reserved.
+# Copyright Ericsson AB 1999-2011. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -43,10 +43,12 @@ MODULES= \
 	ssl_app \
 	ssl_broker \
 	ssl_broker_sup \
+	ssl_dist_sup\
 	ssl_server \
 	ssl_sup \
 	ssl_prim \
 	inet_ssl_dist \
+	inet_tls_dist \
 	ssl_certificate\
 	ssl_certificate_db\
 	ssl_cipher \
@@ -62,6 +64,7 @@ MODULES= \
 	ssl_ssl2 \
 	ssl_ssl3 \
 	ssl_tls1 \
+	ssl_tls_dist_proxy
 
 INTERNAL_HRL_FILES = \
 	 ssl_int.hrl ssl_broker_int.hrl ssl_debug.hrl \
diff --git a/lib/ssl/src/inet_ssl_dist.erl b/lib/ssl/src/inet_ssl_dist.erl
index 6c0fbc0618..42a03a4879 100644
--- a/lib/ssl/src/inet_ssl_dist.erl
+++ b/lib/ssl/src/inet_ssl_dist.erl
@@ -31,9 +31,7 @@
 
 -import(error_logger,[error_msg/2]).
 
--include("net_address.hrl").
-
-
+-include_lib("kernel/include/net_address.hrl").
 
 -define(to_port(Socket, Data, Opts),
 	case ssl_prim:send(Socket, Data, Opts) of
@@ -44,9 +42,8 @@
 	        R
         end).
 
-
--include("dist.hrl").
--include("dist_util.hrl").
+-include_lib("kernel/include/dist.hrl").
+-include_lib("kernel/include/dist_util.hrl").
 
 %% -------------------------------------------------------------
 %% This function should return a valid childspec, so that 
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl
new file mode 100644
index 0000000000..f42c076460
--- /dev/null
+++ b/lib/ssl/src/inet_tls_dist.erl
@@ -0,0 +1,275 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2011. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+-module(inet_tls_dist).
+
+-export([childspecs/0, listen/1, accept/1, accept_connection/5,
+	 setup/5, close/1, select/1, is_node_name/1]).
+
+-include_lib("kernel/include/net_address.hrl").
+-include_lib("kernel/include/dist.hrl").
+-include_lib("kernel/include/dist_util.hrl").
+
+childspecs() ->
+    {ok, [{ssl_dist_sup,{ssl_dist_sup, start_link, []},
+	   permanent, 2000, worker, [ssl_dist_sup]}]}.
+
+select(Node) ->
+    case split_node(atom_to_list(Node), $@, []) of
+	[_,_Host] -> 
+	    true;
+	_ -> 
+	    false
+    end.
+
+is_node_name(Node) when is_atom(Node) ->
+    select(Node);
+is_node_name(_) ->
+    false.
+
+listen(Name) ->
+    ssl_tls_dist_proxy:listen(Name).
+
+accept(Listen) ->
+    ssl_tls_dist_proxy:accept(Listen).
+
+accept_connection(AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
+    Kernel = self(),
+    spawn_link(fun() -> do_accept(Kernel, AcceptPid, Socket, 
+				  MyNode, Allowed, SetupTime) end).
+
+setup(Node, Type, MyNode, LongOrShortNames,SetupTime) ->
+    Kernel = self(),
+    spawn(fun() -> do_setup(Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) end).
+		   
+do_setup(Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
+    [Name, Address] = splitnode(Node, LongOrShortNames),
+    case inet:getaddr(Address, inet) of
+	{ok, Ip} ->
+	    Timer = dist_util:start_timer(SetupTime),
+	    case erl_epmd:port_please(Name, Ip) of
+		{port, TcpPort, Version} ->
+		    ?trace("port_please(~p) -> version ~p~n", 
+			   [Node,Version]),
+		    dist_util:reset_timer(Timer),
+		    case ssl_tls_dist_proxy:connect(Ip, TcpPort) of
+			{ok, Socket} ->
+			    HSData = connect_hs_data(Kernel, Node, MyNode, Socket, 
+						     Timer, Version, Ip, TcpPort, Address,
+						     Type),
+			    dist_util:handshake_we_started(HSData);
+			_ ->
+			    %% Other Node may have closed since 
+			    %% port_please !
+			    ?trace("other node (~p) "
+				   "closed since port_please.~n", 
+				   [Node]),
+			    ?shutdown(Node)
+		    end;
+		_ ->
+		    ?trace("port_please (~p) "
+			   "failed.~n", [Node]),
+		    ?shutdown(Node)
+	    end;
+	_Other ->
+	    ?trace("inet_getaddr(~p) "
+		   "failed (~p).~n", [Node,Other]),
+	    ?shutdown(Node)
+    end.
+
+close(Socket) ->
+    try
+	erlang:error(foo)
+    catch _:_ ->
+	    io:format("close called ~p ~p~n",[Socket, erlang:get_stacktrace()])
+    end,
+    gen_tcp:close(Socket),
+    ok.
+
+do_accept(Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
+    process_flag(priority, max),
+    receive
+	{AcceptPid, controller} ->
+	    Timer = dist_util:start_timer(SetupTime),
+	    case check_ip(Socket) of
+		true ->
+		    HSData = accept_hs_data(Kernel, MyNode, Socket, Timer, Allowed),
+		    dist_util:handshake_other_started(HSData);
+		{false,IP} ->
+		    error_logger:error_msg("** Connection attempt from "
+					   "disallowed IP ~w ** ~n", [IP]),
+		    ?shutdown(no_node)
+	    end
+    end.
+%% ------------------------------------------------------------
+%% Do only accept new connection attempts from nodes at our
+%% own LAN, if the check_ip environment parameter is true.
+%% ------------------------------------------------------------
+check_ip(Socket) ->
+    case application:get_env(check_ip) of
+	{ok, true} ->
+	    case get_ifs(Socket) of
+		{ok, IFs, IP} ->
+		    check_ip(IFs, IP);
+		_ ->
+		    ?shutdown(no_node)
+	    end;
+	_ ->
+	    true
+    end.
+
+get_ifs(Socket) ->
+    case ssl_prim:peername(Socket) of
+	{ok, {IP, _}} ->
+	    case ssl_prim:getif(Socket) of
+		{ok, IFs} -> {ok, IFs, IP};
+		Error     -> Error
+	    end;
+	Error ->
+	    Error
+    end.
+
+check_ip([{OwnIP, _, Netmask}|IFs], PeerIP) ->
+    case {mask(Netmask, PeerIP), mask(Netmask, OwnIP)} of
+	{M, M} -> true;
+	_      -> check_ip(IFs, PeerIP)
+    end;
+check_ip([], PeerIP) ->
+    {false, PeerIP}.
+
+mask({M1,M2,M3,M4}, {IP1,IP2,IP3,IP4}) ->
+    {M1 band IP1,
+     M2 band IP2,
+     M3 band IP3,
+     M4 band IP4};
+
+mask({M1,M2,M3,M4, M5, M6, M7, M8}, {IP1,IP2,IP3,IP4, IP5, IP6, IP7, IP8}) ->
+    {M1 band IP1,
+     M2 band IP2,
+     M3 band IP3,
+     M4 band IP4,
+     M5 band IP5,
+     M6 band IP6,
+     M7 band IP7,
+     M8 band IP8}.
+
+
+%% If Node is illegal terminate the connection setup!!
+splitnode(Node, LongOrShortNames) ->
+    case split_node(atom_to_list(Node), $@, []) of
+	[Name|Tail] when Tail =/= [] ->
+	    Host = lists:append(Tail),
+	    check_node(Name, Node, Host, LongOrShortNames);
+	[_] ->
+	    error_logger:error_msg("** Nodename ~p illegal, no '@' character **~n",
+		      [Node]),
+	    ?shutdown(Node);
+	_ ->
+	    error_logger:error_msg("** Nodename ~p illegal **~n", [Node]),
+	    ?shutdown(Node)
+    end.
+
+check_node(Name, Node, Host, LongOrShortNames) ->
+    case split_node(Host, $., []) of
+	[_] when LongOrShortNames == longnames ->
+	    error_logger:error_msg("** System running to use "
+		      "fully qualified "
+		      "hostnames **~n"
+		      "** Hostname ~s is illegal **~n",
+		      [Host]),
+	    ?shutdown(Node);
+	[_, _ | _] when LongOrShortNames == shortnames ->
+	    error_logger:error_msg("** System NOT running to use fully qualified "
+			      "hostnames **~n"
+		      "** Hostname ~s is illegal **~n",
+		      [Host]),
+	    ?shutdown(Node);
+	_ ->
+	    [Name, Host]
+    end.
+
+split_node([Chr|T], Chr, Ack) -> 
+    [lists:reverse(Ack)|split_node(T, Chr, [])];
+split_node([H|T], Chr, Ack) -> 
+    split_node(T, Chr, [H|Ack]);
+split_node([], _, Ack) -> 
+    [lists:reverse(Ack)].
+
+connect_hs_data(Kernel, Node, MyNode, Socket, Timer, Version, Ip, TcpPort, Address, Type) ->
+    common_hs_data(Kernel, MyNode, Socket, Timer, 
+		   #hs_data{other_node = Node,
+			    other_version = Version,
+			    f_address = 
+				fun(_,_) ->
+					#net_address{address = {Ip,TcpPort},
+						     host = Address,
+						     protocol = proxy,
+						     family = inet}
+				end,
+			    request_type = Type
+			   }).
+
+accept_hs_data(Kernel, MyNode, Socket, Timer, Allowed) ->
+    common_hs_data(Kernel, MyNode, Socket, Timer, #hs_data{
+					     allowed = Allowed,
+					     f_address = fun(S, N) -> 
+								 ssl_tls_dist_proxy:get_remote_id(S, N)
+							 end
+					    }).
+
+common_hs_data(Kernel, MyNode, Socket, Timer, HsData) ->
+    HsData#hs_data{
+      kernel_pid = Kernel,
+      this_node = MyNode,
+      socket = Socket,
+      timer = Timer,
+      this_flags = 0,
+      f_send = 
+	  fun(S,D) -> 
+		  gen_tcp:send(S,D) 
+	  end,
+      f_recv = 
+	  fun(S,N,T) -> 
+		  gen_tcp:recv(S,N,T) 
+	  end,
+      f_setopts_pre_nodeup = 
+	  fun(S) ->
+		  inet:setopts(S, [{active, false}, {packet, 4}])
+	  end,
+		   f_setopts_post_nodeup = 
+	  fun(S) -> 
+		  inet:setopts(S, [{deliver, port},{active, true}])
+	  end,
+      f_getll = 
+	  fun(S) -> 
+		  inet:getll(S) 
+	  end,
+      mf_tick = 
+	  fun(S) -> 
+		  gen_tcp:send(S, <<>>)
+	  end,
+      mf_getstat = 
+	  fun(S) ->
+		  {ok, Stats} = inet:getstat(S, [recv_cnt, send_cnt, send_pend]),
+		  R = proplists:get_value(recv_cnt, Stats, 0),
+		  W = proplists:get_value(send_cnt, Stats, 0),
+		  P = proplists:get_value(send_pend, Stats, 0),
+		  {ok, R,W,P}
+	  end}.
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index b9716786e6..afe19da900 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -8,6 +8,9 @@
 	       ssl_broker,
 	       ssl_broker_sup,
 	       ssl_prim,
+	       inet_tls_dist,
+	       ssl_tls_dist_proxy,
+	       ssl_dist_sup,
 	       inet_ssl_dist,
 	       ssl_tls1,
 	       ssl_ssl3,
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 6074dab3ca..57e0570bee 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -99,11 +99,11 @@ stop() ->
     application:stop(ssl).
 
 %%--------------------------------------------------------------------
--spec connect(host() | inet:port_number(), [connect_option()]) -> {ok, #sslsocket{}} |
+-spec connect(host() | port(), [connect_option()]) -> {ok, #sslsocket{}} |
 					      {error, reason()}.
--spec connect(host() | inet:port_number(), [connect_option()] | inet:port_number(), timeout() | list()) ->
+-spec connect(host() | port(), [connect_option()] | inet:port_number(), timeout() | list()) ->
 		     {ok, #sslsocket{}} | {error, reason()}.
--spec connect(host() | inet:port_number(), inet:port_number(), list(), timeout()) ->
+-spec connect(host() | port(), inet:port_number(), list(), timeout()) ->
 		     {ok, #sslsocket{}} | {error, reason()}.
 
 %%
@@ -742,7 +742,8 @@ handle_options(Opts0, _Role) ->
       secure_renegotiate = handle_option(secure_renegotiate, Opts, false),
       renegotiate_at = handle_option(renegotiate_at, Opts, ?DEFAULT_RENEGOTIATE_AT),
       debug      = handle_option(debug, Opts, []),
-      hibernate_after = handle_option(hibernate_after, Opts, undefined)
+      hibernate_after = handle_option(hibernate_after, Opts, undefined),
+      erl_dist = handle_option(erl_dist, Opts, false)
      },
 
     CbInfo  = proplists:get_value(cb_info, Opts, {gen_tcp, tcp, tcp_closed, tcp_error}),    
@@ -751,7 +752,7 @@ handle_options(Opts0, _Role) ->
 		  depth, cert, certfile, key, keyfile,
 		  password, cacerts, cacertfile, dh, dhfile, ciphers,
 		  debug, reuse_session, reuse_sessions, ssl_imp,
-		  cb_info, renegotiate_at, secure_renegotiate, hibernate_after],
+		  cb_info, renegotiate_at, secure_renegotiate, hibernate_after, erl_dist],
     
     SockOpts = lists:foldl(fun(Key, PropList) -> 
 				   proplists:delete(Key, PropList)
@@ -862,6 +863,9 @@ validate_option(hibernate_after, undefined) ->
     undefined;
 validate_option(hibernate_after, Value) when is_integer(Value), Value >= 0 ->
     Value;
+validate_option(erl_dist,Value) when Value == true; 
+				     Value == false ->
+    Value;
 validate_option(Opt, Value) ->
     throw({error, {eoptions, {Opt, Value}}}).
     
@@ -1007,7 +1011,7 @@ version() ->
                                 
 %% Only used to remove exit messages from old ssl
 %% First is a nonsense clause to provide some
-%% backward compability for orber that uses this
+%% backward compatibility for orber that uses this
 %% function in a none recommended way, but will
 %% work correctly if a valid pid is returned.
 pid(#sslsocket{fd = new_ssl}) ->
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 5187d0f78f..79ee054200 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -1033,7 +1033,8 @@ code_change(_OldVsn, StateName, State, _Extra) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-start_fsm(Role, Host, Port, Socket, Opts,  User, {CbModule, _,_, _} = CbInfo, 
+start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_} = Opts,
+	  User, {CbModule, _,_, _} = CbInfo, 
 	  Timeout) -> 
     try 
 	{ok, Pid} = ssl_connection_sup:start_child([Role, Host, Port, Socket, 
@@ -1044,9 +1045,26 @@ start_fsm(Role, Host, Port, Socket, Opts,  User, {CbModule, _,_, _} = CbInfo,
     catch
 	error:{badmatch, {error, _} = Error} ->
 	    Error
+    end;
+
+start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = true},_} = Opts,
+	  User, {CbModule, _,_, _} = CbInfo, 
+	  Timeout) -> 
+    try 
+	{ok, Pid} = ssl_connection_sup:start_child_dist([Role, Host, Port, Socket, 
+							 Opts, User, CbInfo]), 
+	{ok, SslSocket} = socket_control(Socket, Pid, CbModule),
+	ok = handshake(SslSocket, Timeout),
+	{ok, SslSocket} 
+    catch
+	error:{badmatch, {error, _} = Error} ->
+	    Error
     end.
 
 ssl_init(SslOpts, Role) ->
+    
+    init_manager_name(SslOpts#ssl_options.erl_dist),
+
     {ok, CertDbRef, CertDbHandle, CacheHandle, OwnCert} = init_certificates(SslOpts, Role),
     PrivateKey =
 	init_private_key(CertDbHandle, SslOpts#ssl_options.key, SslOpts#ssl_options.keyfile,
@@ -1054,6 +1072,10 @@ ssl_init(SslOpts, Role) ->
     DHParams = init_diffie_hellman(CertDbHandle, SslOpts#ssl_options.dh, SslOpts#ssl_options.dhfile, Role),
     {ok, CertDbRef, CertDbHandle, CacheHandle, OwnCert, PrivateKey, DHParams}.
 
+init_manager_name(false) ->
+    put(ssl_manager, ssl_manager);
+init_manager_name(true) ->
+    put(ssl_manager, ssl_manager_dist).
 
 init_certificates(#ssl_options{cacerts = CaCerts,
 			       cacertfile = CACertFile,
@@ -1778,7 +1800,8 @@ format_reply(binary, _, N, Data) when N > 0 ->  % Header mode
 format_reply(binary, _, _, Data) ->  
     Data;
 format_reply(list, Packet, _, Data)
-  when Packet == http; Packet == {http, headers};  Packet == http_bin; Packet == {http_bin, headers} ->
+  when Packet == http; Packet == {http, headers};  Packet == http_bin; Packet == {http_bin, headers}; Packet == httph;
+       Packet == httph_bin->
     Data;
 format_reply(list, _,_, Data) ->
     binary_to_list(Data).
@@ -2090,7 +2113,9 @@ set_socket_opts(Socket, [{packet, Packet}| Opts], SockOpts, Other) when Packet =
 									Packet == tpkt;
 									Packet == line;
 									Packet == http;
-									Packet == http_bin ->
+									Packet == httph;
+									Packet == http_bin;
+									Packet == httph_bin ->
     set_socket_opts(Socket, Opts, 
 		    SockOpts#socket_options{packet = Packet}, Other);
 set_socket_opts(_, [{packet, _} = Opt| _], SockOpts, _) ->
diff --git a/lib/ssl/src/ssl_connection_sup.erl b/lib/ssl/src/ssl_connection_sup.erl
index e9328d5f7c..78cfda5e63 100644
--- a/lib/ssl/src/ssl_connection_sup.erl
+++ b/lib/ssl/src/ssl_connection_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -26,8 +26,8 @@
 -behaviour(supervisor).
 
 %% API
--export([start_link/0]).
--export([start_child/1]).
+-export([start_link/0, start_link_dist/0]).
+-export([start_child/1, start_child_dist/1]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -38,9 +38,15 @@
 start_link() ->
     supervisor:start_link({local, ?MODULE}, ?MODULE, []).
 
+start_link_dist() ->
+    supervisor:start_link({local, ssl_connection_sup_dist}, ?MODULE, []).
+
 start_child(Args) ->
     supervisor:start_child(?MODULE, Args).
     
+start_child_dist(Args) ->
+    supervisor:start_child(ssl_connection_sup_dist, Args).
+    
 %%%=========================================================================
 %%%  Supervisor callback
 %%%=========================================================================
diff --git a/lib/ssl/src/ssl_dist_sup.erl b/lib/ssl/src/ssl_dist_sup.erl
new file mode 100644
index 0000000000..c1912401d7
--- /dev/null
+++ b/lib/ssl/src/ssl_dist_sup.erl
@@ -0,0 +1,84 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2011. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+-module(ssl_dist_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+
+%% Supervisor callback
+-export([init/1]).
+
+%%%=========================================================================
+%%%  API
+%%%=========================================================================
+
+-spec start_link() -> {ok, pid()} | ignore | {error, term()}.
+			
+start_link() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+%%%=========================================================================
+%%%  Supervisor callback
+%%%=========================================================================
+-spec init([]) -> {ok,  {SupFlags :: tuple(),  [ChildSpec :: tuple()]}}.
+
+init([]) ->    
+    SessionCertManager = session_and_cert_manager_child_spec(),
+    ConnetionManager = connection_manager_child_spec(),
+    ProxyServer = proxy_server_child_spec(),
+
+    {ok, {{one_for_all, 10, 3600}, [SessionCertManager, ConnetionManager,
+				    ProxyServer]}}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+session_and_cert_manager_child_spec() ->
+    Opts = ssl_sup:manager_opts(),
+    Name = ssl_manager_dist,  
+    StartFunc = {ssl_manager, start_link_dist, [Opts]},
+    Restart = permanent, 
+    Shutdown = 4000,
+    Modules = [ssl_manager],
+    Type = worker,
+    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
+
+connection_manager_child_spec() ->
+    Name = ssl_connection_dist,  
+    StartFunc = {ssl_connection_sup, start_link_dist, []},
+    Restart = permanent, 
+    Shutdown = 4000,
+    Modules = [ssl_connection],
+    Type = supervisor,
+    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
+
+proxy_server_child_spec() ->
+    Name = ssl_tls_dist_proxy,  
+    StartFunc = {ssl_tls_dist_proxy, start_link, []},
+    Restart = permanent, 
+    Shutdown = 4000,
+    Modules = [ssl_tls_dist_proxy],
+    Type = worker,
+    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
+
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
index 6bf1edc452..483e06067c 100644
--- a/lib/ssl/src/ssl_internal.hrl
+++ b/lib/ssl/src/ssl_internal.hrl
@@ -98,10 +98,12 @@
 	  renegotiate_at,
 	  secure_renegotiate,
 	  debug,
-	  hibernate_after % undefined if not hibernating,
+	  hibernate_after,% undefined if not hibernating,
                           % or number of ms of inactivity
 			  % after which ssl_connection will
                           % go into hibernation
+	  %% This option should only be set to true by inet_tls_dist
+	  erl_dist = false 
 	  }).
 
 -record(socket_options,
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index 725a085d1f..dcf310c535 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -27,7 +27,7 @@
 -include("ssl_internal.hrl").
 
 %% Internal application API
--export([start_link/1, 
+-export([start_link/1, start_link_dist/1,
 	 connection_init/2, cache_pem_file/2,
 	 lookup_trusted_cert/4, issuer_candidate/2, client_session_id/4,
 	 server_session_id/4,
@@ -66,10 +66,20 @@
 %%--------------------------------------------------------------------
 -spec start_link(list()) -> {ok, pid()} | ignore | {error, term()}.
 %%
-%% Description: Starts the server
+%% Description: Starts the ssl manager that takes care of sessions
+%% and certificate caching.
 %%--------------------------------------------------------------------
 start_link(Opts) ->
-    gen_server:start_link({local, ?MODULE}, ?MODULE, [Opts], []).
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [?MODULE, Opts], []).
+
+%%--------------------------------------------------------------------
+-spec start_link_dist(list()) -> {ok, pid()} | ignore | {error, term()}.
+%%
+%% Description: Starts a special instance of the ssl manager to
+%% be used by the erlang distribution. Note disables soft upgrade!
+%%--------------------------------------------------------------------
+start_link_dist(Opts) ->
+    gen_server:start_link({local, ssl_manager_dist}, ?MODULE, [ssl_manager_dist, Opts], []).
 
 %%--------------------------------------------------------------------
 -spec connection_init(string()| {der, list()}, client | server) ->
@@ -166,7 +176,8 @@ invalidate_session(Port, Session) ->
 %%
 %% Description: Initiates the server
 %%--------------------------------------------------------------------
-init([Opts]) ->
+init([Name, Opts]) ->
+    put(ssl_manager, Name),
     process_flag(trap_exit, true),
     CacheCb = proplists:get_value(session_cb, Opts, ssl_session_cache),
     SessionLifeTime =  
@@ -376,10 +387,10 @@ code_change(_OldVsn, State, _Extra) ->
 %%% Internal functions
 %%--------------------------------------------------------------------
 call(Msg) ->
-    gen_server:call(?MODULE, {Msg, self()}, infinity).
+    gen_server:call(get(ssl_manager), {Msg, self()}, infinity).
 
 cast(Msg) ->
-    gen_server:cast(?MODULE, Msg).
+    gen_server:cast(get(ssl_manager), Msg).
  
 validate_session(Host, Port, Session, LifeTime) ->
     case ssl_session:valid_session(Session, LifeTime) of
@@ -399,9 +410,10 @@ validate_session(Port, Session, LifeTime) ->
 		    
 start_session_validator(Cache, CacheCb, LifeTime) ->
     spawn_link(?MODULE, init_session_validator, 
-	       [[Cache, CacheCb, LifeTime]]).
+	       [[get(ssl_manager), Cache, CacheCb, LifeTime]]).
 
-init_session_validator([Cache, CacheCb, LifeTime]) ->
+init_session_validator([SslManagerName, Cache, CacheCb, LifeTime]) ->
+    put(ssl_manager, SslManagerName),
     CacheCb:foldl(fun session_validation/2,
 		  LifeTime, Cache).
 
diff --git a/lib/ssl/src/ssl_sup.erl b/lib/ssl/src/ssl_sup.erl
index 316ed8a4e9..a008682b89 100644
--- a/lib/ssl/src/ssl_sup.erl
+++ b/lib/ssl/src/ssl_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -24,7 +24,7 @@
 -behaviour(supervisor).
 
 %% API
--export([start_link/0]).
+-export([start_link/0, manager_opts/0]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -62,6 +62,22 @@ init([]) ->
     {ok, {{one_for_all, 10, 3600}, [Child2, SessionCertManager,
 				    ConnetionManager]}}.
 
+
+manager_opts() ->
+    CbOpts = case application:get_env(ssl, session_cb) of
+		 {ok, Cb} when is_atom(Cb) ->
+		     InitArgs = session_cb_init_args(),
+		     [{session_cb, Cb}, {session_cb_init_args, InitArgs}];
+		 _  ->
+		     []
+	     end,
+    case application:get_env(ssl, session_lifetime) of
+	{ok, Time} when is_integer(Time) ->
+	    [{session_lifetime, Time}| CbOpts];
+	_  ->
+	    CbOpts
+    end.
+    
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
@@ -86,21 +102,6 @@ connection_manager_child_spec() ->
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
 
-manager_opts() ->
-    CbOpts = case application:get_env(ssl, session_cb) of
-		 {ok, Cb} when is_atom(Cb) ->
-		     InitArgs = session_cb_init_args(),
-		     [{session_cb, Cb}, {session_cb_init_args, InitArgs}];
-		 _  ->
-		     []
-	     end,
-    case application:get_env(ssl, session_lifetime) of
-	{ok, Time} when is_integer(Time) ->
-	    [{session_lifetime, Time}| CbOpts];
-	_  ->
-	    CbOpts
-    end.
-    
 session_cb_init_args() ->
     case application:get_env(ssl, session_cb_init_args) of
 	{ok, Args} when is_list(Args) ->
diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl
new file mode 100644
index 0000000000..1a998a0f34
--- /dev/null
+++ b/lib/ssl/src/ssl_tls_dist_proxy.erl
@@ -0,0 +1,326 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2011. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(ssl_tls_dist_proxy).
+
+
+-export([listen/1, accept/1, connect/2, get_remote_id/2]).
+-export([init/1, start_link/0, handle_call/3, handle_cast/2, handle_info/2, 
+	 terminate/2, code_change/3, ssl_options/2]).
+
+-include_lib("kernel/include/net_address.hrl").
+
+-record(state, 
+	{listen,
+	 accept_loop
+	}).
+
+-define(PPRE, 4).
+-define(PPOST, 4).
+
+
+%%====================================================================
+%% Internal application API
+%%====================================================================
+
+listen(Name) ->
+    gen_server:call(?MODULE, {listen, Name}, infinity). 
+
+accept(Listen) ->
+    gen_server:call(?MODULE, {accept, Listen}, infinity).
+
+connect(Ip, Port) ->
+    gen_server:call(?MODULE, {connect, Ip, Port}, infinity).
+
+get_remote_id(Socket, Node) ->
+    gen_server:call(?MODULE, {get_remote_id, {Socket,Node}}, infinity).
+
+%%====================================================================
+%% gen_server callbacks
+%%====================================================================
+
+start_link() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+init([]) ->
+    process_flag(priority, max),
+    {ok, #state{}}.
+
+handle_call({listen, Name}, _From, State) ->
+    case gen_tcp:listen(0, [{active, false}, {packet,?PPRE}]) of
+	{ok, Socket} ->
+	    {ok, World} = gen_tcp:listen(0, [{active, false}, binary, {packet,?PPRE}]),
+	    TcpAddress = get_tcp_address(Socket),
+	    WorldTcpAddress = get_tcp_address(World),
+	    {_,Port} = WorldTcpAddress#net_address.address,
+	    {ok, Creation} = erl_epmd:register_node(Name, Port),
+	    {reply, {ok, {Socket, TcpAddress, Creation}},
+	     State#state{listen={Socket, World}}};
+	Error ->
+	    {reply, Error, State}
+    end;
+
+handle_call({accept, Listen}, {From, _}, State = #state{listen={_, World}}) ->
+    Self = self(),
+    ErtsPid = spawn_link(fun() -> accept_loop(Self, erts, Listen, From) end),
+    WorldPid = spawn_link(fun() -> accept_loop(Self, world, World, Listen) end),
+    {reply, ErtsPid, State#state{accept_loop={ErtsPid, WorldPid}}};
+
+handle_call({connect, Ip, Port}, {From, _}, State) ->
+    Me = self(),
+    Pid = spawn_link(fun() -> setup_proxy(Ip, Port, Me) end),
+    receive 
+	{Pid, go_ahead, LPort} -> 
+	    Res = {ok, Socket} = try_connect(LPort),
+	    ok = gen_tcp:controlling_process(Socket, From),
+	    flush_old_controller(From, Socket),
+	    {reply, Res, State};
+	{Pid, Error} ->
+	    {reply, Error, State}
+    end;
+
+handle_call({get_remote_id, {Socket,_Node}}, _From, State) ->
+    Address = get_tcp_address(Socket),
+    {reply, Address, State};
+
+handle_call(_What, _From, State) ->
+    {reply, ok, State}.
+
+handle_cast(_What, State) ->
+    {noreply, State}.
+
+handle_info(_What, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _St) ->
+    ok.
+
+code_change(_OldVsn, St, _Extra) ->
+    {ok, St}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+get_tcp_address(Socket) ->
+    {ok, Address} = inet:sockname(Socket),
+    {ok, Host} = inet:gethostname(),
+    #net_address{
+		  address = Address,
+		  host = Host,
+		  protocol = proxy,
+		  family = inet
+		}.
+
+accept_loop(Proxy, Type, Listen, Extra) ->
+    process_flag(priority, max),
+    case Type of
+	erts ->
+	    case gen_tcp:accept(Listen) of
+		{ok, Socket} ->
+		    Extra ! {accept,self(),Socket,inet,proxy},
+		    receive 
+			{_Kernel, controller, Pid} ->
+			    ok = gen_tcp:controlling_process(Socket, Pid),
+			    flush_old_controller(Pid, Socket),
+			    Pid ! {self(), controller};
+			{_Kernel, unsupported_protocol} ->
+			    exit(unsupported_protocol)
+		    end;
+		Error ->
+		    exit(Error)
+	    end;
+	world ->
+	    case gen_tcp:accept(Listen) of
+		{ok, Socket} ->
+		    Opts = get_ssl_options(server),
+		    case ssl:ssl_accept(Socket, Opts) of
+			{ok, SslSocket} ->
+			    PairHandler =
+				spawn_link(fun() ->
+						   setup_connection(SslSocket, Extra)
+					   end),
+			    ok = ssl:controlling_process(SslSocket, PairHandler),
+			    flush_old_controller(PairHandler, SslSocket);
+			_ ->
+			    gen_tcp:close(Socket)
+		    end;
+		Error ->
+		    exit(Error)
+	    end
+    end,
+    accept_loop(Proxy, Type, Listen, Extra).
+
+
+try_connect(Port) ->
+    case gen_tcp:connect({127,0,0,1}, Port, [{active, false}, {packet,?PPRE}]) of
+	R = {ok, _S} ->
+	    R;
+	{error, _R} ->
+	    try_connect(Port)
+    end.
+
+setup_proxy(Ip, Port, Parent) ->
+    process_flag(trap_exit, true),
+    Opts = get_ssl_options(client),
+    case ssl:connect(Ip, Port, [{active, true}, binary, {packet,?PPRE}] ++ Opts) of
+	{ok, World} ->
+	    {ok, ErtsL} = gen_tcp:listen(0, [{active, true}, binary, {packet,?PPRE}]),
+	    #net_address{address={_,LPort}} = get_tcp_address(ErtsL),
+	    Parent ! {self(), go_ahead, LPort},
+	    case gen_tcp:accept(ErtsL) of
+		{ok, Erts} ->
+		    %% gen_tcp:close(ErtsL),
+		    loop_conn_setup(World, Erts);
+		Err ->
+		    Parent ! {self(), Err}
+	    end;
+	Err ->
+	    Parent ! {self(), Err}
+    end.
+
+setup_connection(World, ErtsListen) ->
+    process_flag(trap_exit, true),
+    TcpAddress = get_tcp_address(ErtsListen),
+    {_Addr,Port} = TcpAddress#net_address.address,
+    {ok, Erts} = gen_tcp:connect({127,0,0,1}, Port, [{active, true}, binary, {packet,?PPRE}]),
+    ssl:setopts(World, [{active,true}, {packet,?PPRE}]),
+    loop_conn_setup(World, Erts).
+
+loop_conn_setup(World, Erts) ->
+    receive 
+	{ssl, World, Data = <<$a, _/binary>>} ->
+	    gen_tcp:send(Erts, Data),
+	    ssl:setopts(World, [{packet,?PPOST}]),
+	    inet:setopts(Erts, [{packet,?PPOST}]),
+	    loop_conn(World, Erts);
+	{tcp, Erts, Data = <<$a, _/binary>>} ->
+	    ssl:send(World, Data),
+	    ssl:setopts(World, [{packet,?PPOST}]),
+	    inet:setopts(Erts, [{packet,?PPOST}]),
+	    loop_conn(World, Erts);
+	{ssl, World, Data = <<_, _/binary>>} ->
+	    gen_tcp:send(Erts, Data),
+	    loop_conn_setup(World, Erts);
+	{tcp, Erts, Data = <<_, _/binary>>} ->
+	    ssl:send(World, Data),
+	    loop_conn_setup(World, Erts);
+	{ssl, World, Data} ->
+	    gen_tcp:send(Erts, Data),
+	    loop_conn_setup(World, Erts);
+	{tcp, Erts, Data} ->
+	    ssl:send(World, Data),
+	    loop_conn_setup(World, Erts)
+    end.
+
+loop_conn(World, Erts) ->
+    receive 
+	{ssl, World, Data} ->
+	    gen_tcp:send(Erts, Data),
+	    loop_conn(World, Erts);
+	{tcp, Erts, Data} ->
+	    ssl:send(World, Data),
+	    loop_conn(World, Erts);
+	{tcp_closed, Erts} ->
+	    ssl:close(World);
+	{ssl_closed,  World} ->
+	    gen_tcp:close(Erts)
+	end.
+
+get_ssl_options(Type) ->
+    case init:get_argument(ssl_dist_opt) of
+	{ok, Args} ->
+	    [{erl_dist, true} | ssl_options(Type, Args)];
+	_ ->
+	    [{erl_dist, true}]
+    end.
+
+ssl_options(_,[]) ->
+    [];
+ssl_options(server, [["client_" ++ _, _Value]|T]) ->
+     ssl_options(server,T);
+ssl_options(client, [["server_" ++ _, _Value]|T]) ->
+    ssl_options(client,T);
+ssl_options(server, [["server_certfile", Value]|T]) ->
+    [{certfile, Value} | ssl_options(server,T)];
+ssl_options(client, [["client_certfile", Value]|T]) ->
+    [{certfile, Value} | ssl_options(client,T)];
+ssl_options(server, [["server_cacertfile", Value]|T]) ->
+    [{cacertfile, Value} | ssl_options(server,T)];
+ssl_options(client, [["client_cacertfile", Value]|T]) ->
+     [{cacertfile, Value} | ssl_options(client,T)];
+ssl_options(server, [["server_keyfile", Value]|T]) ->
+    [{keyfile, Value} | ssl_options(server,T)];
+ssl_options(client, [["client_keyfile", Value]|T]) ->
+    [{keyfile, Value} | ssl_options(client,T)];
+ssl_options(server, [["server_password", Value]|T]) ->
+    [{password, Value} | ssl_options(server,T)];
+ssl_options(client, [["client_password", Value]|T]) ->
+    [{password, Value} | ssl_options(client,T)];
+ssl_options(server, [["server_verify", Value]|T]) ->
+    [{verify, atomize(Value)} | ssl_options(server,T)];
+ssl_options(client, [["client_verify", Value]|T]) ->
+     [{verify, atomize(Value)} | ssl_options(client,T)];
+ssl_options(server, [["server_reuse_sessions", Value]|T]) ->
+    [{reuse_sessions, atomize(Value)} | ssl_options(server,T)];
+ssl_options(client, [["client_reuse_sessions", Value]|T]) ->
+    [{reuse_sessions, atomize(Value)} | ssl_options(client,T)];
+ssl_options(server, [["server_secure_renegotiation", Value]|T]) ->
+    [{secure_renegotiation, atomize(Value)} | ssl_options(server,T)];
+ssl_options(client, [["client_secure_renegotiation", Value]|T]) ->
+    [{secure_renegotiation, atomize(Value)} | ssl_options(client,T)];
+ssl_options(server, [["server_depth", Value]|T]) ->
+    [{depth, list_to_integer(Value)} | ssl_options(server,T)];
+ssl_options(client, [["client_depth", Value]|T]) ->
+    [{depth, list_to_integer(Value)} | ssl_options(client,T)];
+ssl_options(server, [["server_hibernate_after", Value]|T]) ->
+    [{hibernate_after, list_to_integer(Value)} | ssl_options(server,T)];
+ssl_options(client, [["client_hibernate_after", Value]|T]) ->
+    [{hibernate_after, list_to_integer(Value)} | ssl_options(client,T)];
+ssl_options(server, [["server_ciphers", Value]|T]) ->
+     [{ciphers, Value} | ssl_options(server,T)];
+ssl_options(client, [["client_ciphers", Value]|T]) ->
+    [{ciphers, Value} | ssl_options(client,T)];
+ssl_options(server, [["server_dhfile", Value]|T]) ->
+     [{dhfile, Value} | ssl_options(server,T)];
+ssl_options(server, [["server_fail_if_no_peer_cert", Value]|T]) ->
+    [{fail_if_no_peer_cert, atomize(Value)} | ssl_options(server,T)];
+ssl_options(_,_) ->
+    exit(malformed_ssl_dist_opt).
+
+atomize(List) when is_list(List) ->
+    list_to_atom(List);
+atomize(Atom) when is_atom(Atom) ->
+    Atom.
+
+flush_old_controller(Pid, Socket) ->
+    receive
+	{tcp, Socket, Data} ->
+	    Pid ! {tcp, Socket, Data},
+	    flush_old_controller(Pid, Socket);
+	{tcp_closed, Socket} ->
+	    Pid ! {tcp_closed, Socket},
+	    flush_old_controller(Pid, Socket);
+	{ssl, Socket, Data} ->
+	    Pid ! {ssl, Socket, Data},
+	    flush_old_controller(Pid, Socket);
+	{ssl_closed, Socket} ->
+	    Pid ! {ssl_closed, Socket},
+	    flush_old_controller(Pid, Socket)
+    after 0 ->
+	    ok
+    end.
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile
index 5be07cad2c..45a401aa68 100644
--- a/lib/ssl/test/Makefile
+++ b/lib/ssl/test/Makefile
@@ -41,6 +41,7 @@ MODULES = \
 	ssl_payload_SUITE \
 	ssl_to_openssl_SUITE \
 	ssl_session_cache_SUITE	\
+	ssl_dist_SUITE \
 	ssl_test_MACHINE \
 	old_ssl_active_SUITE \
 	old_ssl_active_once_SUITE \
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 37a021e7cf..8da1d947d3 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -253,7 +253,7 @@ all() ->
      unknown_server_ca_fail, der_input,
      unknown_server_ca_accept_verify_none,
      unknown_server_ca_accept_verify_peer,
-     unknown_server_ca_accept_backwardscompatibilty,
+     unknown_server_ca_accept_backwardscompatibility,
      %%different_ca_peer_sign,
      no_reuses_session_server_restart_new_cert,
      no_reuses_session_server_restart_new_cert_file, reuseaddr,
@@ -3282,11 +3282,11 @@ unknown_server_ca_accept_verify_peer(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-unknown_server_ca_accept_backwardscompatibilty(doc) ->
+unknown_server_ca_accept_backwardscompatibility(doc) ->
     ["Test that old style verify_funs will work"];
-unknown_server_ca_accept_backwardscompatibilty(suite) ->
+unknown_server_ca_accept_backwardscompatibility(suite) ->
     [];
-unknown_server_ca_accept_backwardscompatibilty(Config) when is_list(Config) ->
+unknown_server_ca_accept_backwardscompatibility(Config) when is_list(Config) ->
     ClientOpts =  ?config(client_opts, Config),
     ServerOpts =  ?config(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl
new file mode 100644
index 0000000000..7325e97ff5
--- /dev/null
+++ b/lib/ssl/test/ssl_dist_SUITE.erl
@@ -0,0 +1,603 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(ssl_dist_SUITE).
+
+-include_lib("test_server/include/test_server.hrl").
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-define(DEFAULT_TIMETRAP_SECS, 240).
+
+-define(AWAIT_SLL_NODE_UP_TIMEOUT, 30000).
+
+-record(node_handle,
+	{connection_handler,
+	 socket,
+	 name,
+	 nodename}
+       ).
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [basic].
+
+groups() ->
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+init_per_suite(Config) ->
+    try crypto:start() of
+	ok ->
+	    add_ssl_opts_config(Config)
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(Config) ->
+    application:stop(crypto),
+    Config.
+
+init_per_testcase(Case, Config) when list(Config) ->
+    Dog = ?t:timetrap(?t:seconds(?DEFAULT_TIMETRAP_SECS)),
+    [{watchdog, Dog},{testcase, Case}|Config].
+
+end_per_testcase(_Case, Config) when list(Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                       %%
+%% Testcases                                                             %%
+%%                                                                       %%
+
+basic(doc) ->
+    ["Test that two nodes can connect via ssl distribution"];
+basic(suite) ->
+    [];
+basic(Config) when is_list(Config) ->
+    NH1 = start_ssl_node(Config),
+    Node1 = NH1#node_handle.nodename,
+    NH2 = start_ssl_node(Config),
+    Node2 = NH2#node_handle.nodename,
+
+    pong = apply_on_ssl_node(NH1, fun () -> net_adm:ping(Node2) end),
+
+    [Node2] = apply_on_ssl_node(NH1, fun () -> nodes() end),
+    [Node1] = apply_on_ssl_node(NH2, fun () -> nodes() end),
+
+    %% The test_server node has the same cookie as the ssl nodes
+    %% but it should not be able to communicate with the ssl nodes
+    %% via the erlang distribution.
+    pang = net_adm:ping(Node1),
+    pang = net_adm:ping(Node2),
+
+    %%
+    %% Check that we are able to communicate over the erlang
+    %% distribution between the ssl nodes.
+    %%
+    Ref = make_ref(),
+    spawn(fun () ->
+		  apply_on_ssl_node(
+		    NH1,
+		    fun () ->
+			    tstsrvr_format("Hi from ~p!~n", [node()]),
+			    send_to_tstcntrl({Ref, self()}),
+			    receive
+				{From, ping} ->
+				    tstsrvr_format("Received ping ~p!~n", [node()]),
+				    From ! {self(), pong}
+			    end
+		    end)
+	  end),
+     receive
+	 {Ref, SslPid} ->
+	     ok = apply_on_ssl_node(
+		    NH2,
+		    fun () ->
+			    tstsrvr_format("Hi from ~p!~n", [node()]),
+			    SslPid ! {self(), ping},
+			    receive
+				{SslPid, pong} ->
+				    ok
+			    end
+		    end)
+     end,
+    stop_ssl_node(NH1),
+    stop_ssl_node(NH2),
+    success(Config).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                       %%
+%% Internal functions                                                    %%
+%%                                                                       %%
+
+%%
+%% ssl_node side api
+%%
+
+tstsrvr_format(Fmt, ArgList) ->
+    send_to_tstsrvr({format, Fmt, ArgList}).
+
+send_to_tstcntrl(Message) ->
+    send_to_tstsrvr({message, Message}).
+
+
+%%
+%% test_server side api
+%%
+
+apply_on_ssl_node(Node, M, F, A) when atom(M), atom(F), list(A) ->
+    Ref = make_ref(),
+    send_to_ssl_node(Node, {apply, self(), Ref, M, F, A}),
+    receive
+	{Ref, Result} ->
+	    Result
+    end.
+
+apply_on_ssl_node(Node, Fun) when is_function(Fun, 0) ->
+    Ref = make_ref(),
+    send_to_ssl_node(Node, {apply, self(), Ref, Fun}),
+    receive
+	{Ref, Result} ->
+	    Result
+    end.
+
+stop_ssl_node(#node_handle{connection_handler = Handler,
+			   socket = Socket,
+			   name = Name}) ->
+    ?t:format("Trying to stop ssl node ~s.~n", [Name]),
+    Mon = erlang:monitor(process, Handler),
+    unlink(Handler),
+    case gen_tcp:send(Socket, term_to_binary(stop)) of
+	ok ->
+	    receive
+		{'DOWN', Mon, process, Handler, Reason} ->
+		    case Reason of
+			normal -> ok;
+			_ -> exit(Reason)
+		    end
+	    end;
+	Error ->
+	    erlang:demonitor(Mon, [flush]),
+	    exit(Error)
+    end.
+
+start_ssl_node(Config) ->
+    start_ssl_node(Config, "").
+
+start_ssl_node(Config, XArgs) ->
+    Name = mk_node_name(Config),
+    SSL = ?config(ssl_opts, Config),
+    SSLDistOpts = setup_dist_opts(Name, ?config(priv_dir, Config)),
+    start_ssl_node_raw(Name, SSL ++ " " ++ SSLDistOpts ++ XArgs).
+
+start_ssl_node_raw(Name, Args) ->
+    {ok, LSock} = gen_tcp:listen(0,
+				 [binary, {packet, 4}, {active, false}]),
+    {ok, ListenPort} = inet:port(LSock),
+    CmdLine = mk_node_cmdline(ListenPort, Name, Args),
+    ?t:format("Attempting to start ssl node ~s: ~s~n", [Name, CmdLine]),
+    case open_port({spawn, CmdLine}, []) of
+	Port when port(Port) ->
+	    unlink(Port),
+	    erlang:port_close(Port),
+	    case await_ssl_node_up(Name, LSock) of
+		#node_handle{} = NodeHandle ->
+		    ?t:format("Ssl node ~s started.~n", [Name]),
+		    NodeName = list_to_atom(Name ++ "@" ++ host_name()),
+		    NodeHandle#node_handle{nodename = NodeName};
+		Error ->
+		    exit({failed_to_start_node, Name, Error})
+	    end;
+	Error ->
+	    exit({failed_to_start_node, Name, Error})
+    end.
+
+%%
+%% command line creation
+%%
+
+host_name() ->
+    [$@ | Host] = lists:dropwhile(fun ($@) -> false; (_) -> true end,
+				  atom_to_list(node())),
+    Host.
+
+mk_node_name(Config) ->
+    {A, B, C} = erlang:now(),
+    Case = ?config(testcase, Config),
+    atom_to_list(?MODULE)
+	++ "_"
+	++ atom_to_list(Case)
+	++ "_"
+	++ integer_to_list(A)
+	++ "-"
+	++ integer_to_list(B)
+	++ "-"
+	++ integer_to_list(C).
+
+mk_node_cmdline(ListenPort, Name, Args) ->
+    Static = "-detached -noinput",
+    Pa = filename:dirname(code:which(?MODULE)),
+    Prog = case catch init:get_argument(progname) of
+	       {ok,[[P]]} -> P;
+	       _ -> exit(no_progname_argument_found)
+	   end,
+    NameSw = case net_kernel:longnames() of
+		 false -> "-sname ";
+		 _ -> "-name "
+	     end,
+    {ok, Pwd} = file:get_cwd(),
+    Prog ++ " "
+	++ Static ++ " "
+	++ NameSw ++ " " ++ Name ++ " "
+	++ "-pa " ++ Pa ++ " "
+	++ "-run application start crypto -run application start public_key "
+	++ "-run " ++ atom_to_list(?MODULE) ++ " cnct2tstsrvr "
+	++ host_name() ++ " "
+	++ integer_to_list(ListenPort) ++ " "
+	++ Args ++ " "
+	++ "-env ERL_CRASH_DUMP " ++ Pwd ++ "/erl_crash_dump." ++ Name ++ " "
+	++ "-setcookie " ++ atom_to_list(erlang:get_cookie()).
+
+%%
+%% Connection handler test_server side
+%%
+
+await_ssl_node_up(Name, LSock) ->
+    case gen_tcp:accept(LSock, ?AWAIT_SLL_NODE_UP_TIMEOUT) of
+	timeout ->
+	    gen_tcp:close(LSock),
+	    ?t:format("Timeout waiting for ssl node ~s to come up~n",
+		      [Name]),
+	    timeout;
+	{ok, Socket} ->
+	    gen_tcp:close(LSock),
+	    case gen_tcp:recv(Socket, 0) of
+		{ok, Bin} ->
+		    check_ssl_node_up(Socket, Name, Bin);
+		{error, closed} ->
+		    gen_tcp:close(Socket),
+		    exit({lost_connection_with_ssl_node_before_up, Name})
+	    end;
+	{error, Error} ->
+	    gen_tcp:close(LSock),
+	    exit({accept_failed, Error})
+    end.
+
+check_ssl_node_up(Socket, Name, Bin) ->
+    case catch binary_to_term(Bin) of
+	{'EXIT', _} ->
+	    gen_tcp:close(Socket),
+	    exit({bad_data_received_from_ssl_node, Name, Bin});
+	{ssl_node_up, NodeName} ->
+	    case list_to_atom(Name++"@"++host_name()) of
+		NodeName ->
+		    Parent = self(),
+		    Go = make_ref(),
+		    %% Spawn connection handler on test server side
+		    Pid = spawn_link(
+			    fun () ->
+				    receive Go -> ok end,
+				    tstsrvr_con_loop(Name, Socket, Parent)
+			    end),
+		    ok = gen_tcp:controlling_process(Socket, Pid),
+		    Pid ! Go,
+		    #node_handle{connection_handler = Pid,
+				 socket = Socket,
+				 name = Name};
+		_ ->
+		    exit({unexpected_ssl_node_connected, NodeName})
+	    end;
+	Msg ->
+	    exit({unexpected_msg_instead_of_ssl_node_up, Name, Msg})
+    end.
+
+send_to_ssl_node(#node_handle{connection_handler = Hndlr}, Term) ->
+    Hndlr ! {relay_to_ssl_node, term_to_binary(Term)},
+    ok.
+
+tstsrvr_con_loop(Name, Socket, Parent) ->
+    inet:setopts(Socket,[{active,once}]),
+    receive
+	{relay_to_ssl_node, Data} when is_binary(Data) ->
+	    case gen_tcp:send(Socket, Data) of
+		ok ->
+		    ok;
+		_Error ->
+		    gen_tcp:close(Socket),
+		    exit({failed_to_relay_data_to_ssl_node, Name, Data})
+	    end;
+	{tcp, Socket, Bin} ->
+	    case catch binary_to_term(Bin) of
+		{'EXIT', _} ->
+		    gen_tcp:close(Socket),
+		    exit({bad_data_received_from_ssl_node, Name, Bin});
+		{format, FmtStr, ArgList} ->
+		    ?t:format(FmtStr, ArgList);
+		{message, Msg} ->
+		    ?t:format("Got message ~p", [Msg]),
+		    Parent ! Msg;
+		{apply_res, To, Ref, Res} ->
+		    To ! {Ref, Res};
+		bye ->
+		    ?t:format("Ssl node ~s stopped.~n", [Name]),
+		    gen_tcp:close(Socket),
+		    exit(normal);
+		Unknown ->
+		    exit({unexpected_message_from_ssl_node, Name, Unknown})
+	    end;
+	{tcp_closed, Socket} ->
+	    gen_tcp:close(Socket),
+	    exit({lost_connection_with_ssl_node, Name})
+    end,
+    tstsrvr_con_loop(Name, Socket, Parent).
+
+%%
+%% Connection handler ssl_node side
+%%
+
+% cnct2tstsrvr() is called via command line arg -run ...
+cnct2tstsrvr([Host, Port]) when list(Host), list(Port) ->
+    %% Spawn connection handler on ssl node side
+    ConnHandler
+	= spawn(fun () ->
+			case catch gen_tcp:connect(Host,
+						   list_to_integer(Port),
+						   [binary,
+						    {packet, 4},
+						    {active, false}]) of
+			    {ok, Socket} ->
+				notify_ssl_node_up(Socket),
+				ets:new(test_server_info,
+					[set,
+					 public,
+					 named_table,
+					 {keypos, 1}]),
+				ets:insert(test_server_info,
+					   {test_server_handler, self()}),
+				ssl_node_con_loop(Socket);
+			    _Error ->
+				halt("Failed to connect to test server")
+			end
+		end),
+    spawn(fun () ->
+		  Mon = erlang:monitor(process, ConnHandler),
+		  receive
+		      {'DOWN', Mon, process, ConnHandler, Reason} ->
+			  receive after 1000 -> ok end,
+			  halt("test server connection handler terminated: "
+			       ++
+			       lists:flatten(io_lib:format("~p", [Reason])))
+		  end
+	  end).
+
+notify_ssl_node_up(Socket) ->
+    case catch gen_tcp:send(Socket,
+			    term_to_binary({ssl_node_up, node()})) of
+	ok -> ok;
+	_ -> halt("Failed to notify test server that I'm up")
+    end.
+
+send_to_tstsrvr(Term) ->
+    case catch ets:lookup_element(test_server_info, test_server_handler, 2) of
+	Hndlr when pid(Hndlr) ->
+	    Hndlr ! {relay_to_test_server, term_to_binary(Term)}, ok;
+	_ ->
+	    receive after 200 -> ok end,
+	    send_to_tstsrvr(Term)
+    end.
+
+ssl_node_con_loop(Socket) ->
+    inet:setopts(Socket,[{active,once}]),
+    receive
+	{relay_to_test_server, Data} when is_binary(Data) ->
+	    case gen_tcp:send(Socket, Data) of
+		ok ->
+		    ok;
+		_Error ->
+		    gen_tcp:close(Socket),
+		    halt("Failed to relay data to test server")
+	    end;
+	{tcp, Socket, Bin} ->
+	    case catch binary_to_term(Bin) of
+		{'EXIT', _} ->
+		    gen_tcp:close(Socket),
+		    halt("test server sent me bad data");
+		{apply, From, Ref, M, F, A} ->
+		    spawn_link(
+		      fun () ->
+			      send_to_tstsrvr({apply_res,
+					       From,
+					       Ref,
+					       (catch apply(M, F, A))})
+			  end);
+		{apply, From, Ref, Fun} ->
+		    spawn_link(fun () ->
+				       send_to_tstsrvr({apply_res,
+							From,
+							Ref,
+							(catch Fun())})
+			       end);
+		stop ->
+		    gen_tcp:send(Socket, term_to_binary(bye)),
+		    gen_tcp:close(Socket),
+		    init:stop(),
+		    receive after infinity -> ok end;
+		_Unknown ->
+		    halt("test server sent me an unexpected message")
+	    end;
+	{tcp_closed, Socket} ->
+	    halt("Lost connection to test server")
+    end,
+    ssl_node_con_loop(Socket).
+
+%%
+%% Setup ssl dist info
+%%
+
+rand_bin(N) ->
+    rand_bin(N, []).
+
+rand_bin(0, Acc) ->
+    Acc;
+rand_bin(N, Acc) ->
+    rand_bin(N-1, [random:uniform(256)-1|Acc]).
+
+make_randfile(Dir) ->
+    {ok, IoDev} = file:open(filename:join([Dir, "RAND"]), [write]),
+    {A, B, C} = erlang:now(),
+    random:seed(A, B, C),
+    ok = file:write(IoDev, rand_bin(1024)),
+    file:close(IoDev).
+
+append_files(FileNames, ResultFileName) ->
+    {ok, ResultFile} = file:open(ResultFileName, [write]),
+    do_append_files(FileNames, ResultFile).
+
+do_append_files([], RF) ->
+    ok = file:close(RF);
+do_append_files([F|Fs], RF) ->
+    {ok, Data} = file:read_file(F),
+    ok = file:write(RF, Data),
+    do_append_files(Fs, RF).
+
+setup_dist_opts(Name, PrivDir) ->
+    NodeDir = filename:join([PrivDir, Name]),
+    RGenDir = filename:join([NodeDir, "rand_gen"]),
+    ok = file:make_dir(NodeDir),
+    ok = file:make_dir(RGenDir),
+    make_randfile(RGenDir),
+    make_certs:all(RGenDir, NodeDir),
+    SDir = filename:join([NodeDir, "server"]),
+    SC = filename:join([SDir, "cert.pem"]),
+    SK = filename:join([SDir, "key.pem"]),
+    SKC = filename:join([SDir, "keycert.pem"]),
+    append_files([SK, SC], SKC),
+    CDir = filename:join([NodeDir, "client"]),
+    CC = filename:join([CDir, "cert.pem"]),
+    CK = filename:join([CDir, "key.pem"]),
+    CKC = filename:join([CDir, "keycert.pem"]),
+    append_files([CK, CC], CKC),
+    "-proto_dist inet_tls "
+	++ "-ssl_dist_opt server_certfile " ++ SKC ++ " "
+	++ "-ssl_dist_opt client_certfile " ++ CKC ++ " ".
+
+%%
+%% Start scripts etc...
+%%
+
+add_ssl_opts_config(Config) ->
+    %%
+    %% Start with boot scripts if on an installed system; otherwise,
+    %% just point out ssl ebin with -pa.
+    %%
+    try
+	Dir = ?config(priv_dir, Config),
+	LibDir = code:lib_dir(),
+	Apps = application:which_applications(),
+	{value, {stdlib, _, STDL_VSN}} = lists:keysearch(stdlib, 1, Apps),
+	{value, {kernel, _, KRNL_VSN}} = lists:keysearch(kernel, 1, Apps),
+	StdlDir = filename:join([LibDir, "stdlib-" ++ STDL_VSN]),
+	KrnlDir = filename:join([LibDir, "kernel-" ++ KRNL_VSN]),
+	{ok, _} = file:read_file_info(StdlDir),
+	{ok, _} = file:read_file_info(KrnlDir),
+	SSL_VSN = vsn(ssl),
+	VSN_CRYPTO = vsn(crypto),
+	VSN_PKEY = vsn(public_key),
+
+	SslDir = filename:join([LibDir, "ssl-" ++ SSL_VSN]),
+	{ok, _} = file:read_file_info(SslDir),
+	%% We are using an installed otp system, create the boot script.
+	Script = filename:join(Dir, atom_to_list(?MODULE)),
+	{ok, RelFile} = file:open(Script ++ ".rel", [write]),
+        io:format(RelFile,
+		  "{release, ~n"
+		  " {\"SSL distribution test release\", \"~s\"},~n"
+		  " {erts, \"~s\"},~n"
+		  " [{kernel, \"~s\"},~n"
+		  "  {stdlib, \"~s\"},~n"
+		  "  {crypto, \"~s\"},~n"
+		  "  {public_key, \"~s\"},~n"
+		  "  {ssl, \"~s\"}]}.~n",
+		  [case catch erlang:system_info(otp_release) of
+		       {'EXIT', _} -> "R11B";
+		       Rel -> Rel
+		   end,
+		   erlang:system_info(version),
+		   KRNL_VSN,
+		   STDL_VSN,
+		   VSN_CRYPTO,
+		   VSN_PKEY,
+		   SSL_VSN]),
+	ok = file:close(RelFile),
+	ok = systools:make_script(Script, []),
+	[{ssl_opts, "-boot " ++ Script} | Config]
+    catch
+	_:_ ->
+	    [{ssl_opts, "-pa " ++ filename:dirname(code:which(ssl))}
+	     | add_comment_config(
+		 "Bootscript wasn't used since the test wasn't run on an "
+		 "installed OTP system.",
+		 Config)]
+    end.
+
+%%
+%% Add common comments to config
+%%
+
+add_comment_config(Comment, []) ->
+    [{comment, Comment}];
+add_comment_config(Comment, [{comment, OldComment} | Cs]) ->
+    [{comment, Comment ++ " " ++ OldComment} | Cs];
+add_comment_config(Comment, [C|Cs]) ->
+    [C|add_comment_config(Comment, Cs)].
+
+%%
+%% Call when test case success
+%%
+
+success(Config) ->
+    case lists:keysearch(comment, 1, Config) of
+	{value, {comment, _} = Res} -> Res;
+	_ -> ok
+    end.
+
+vsn(App) ->
+    application:start(App),
+    try
+	{value,
+	 {ssl,
+	  _,
+	  VSN}} = lists:keysearch(App,
+				  1,
+				  application:which_applications()),
+	VSN
+     after
+	 application:stop(ssl)
+     end.
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl
index d22d5d2954..9d2599b778 100644
--- a/lib/ssl/test/ssl_packet_SUITE.erl
+++ b/lib/ssl/test/ssl_packet_SUITE.erl
@@ -151,6 +151,9 @@ all() ->
      packet_cdr_decode, packet_cdr_decode_list,
      packet_http_decode, packet_http_decode_list,
      packet_http_bin_decode_multi, packet_http_error_passive,
+     packet_httph_active, packet_httph_bin_active,
+     packet_httph_active_once, packet_httph_bin_active_once,
+     packet_httph_passive, packet_httph_bin_passive,
      packet_line_decode, packet_line_decode_list,
      packet_asn1_decode, packet_asn1_decode_list,
      packet_tpkt_decode, packet_tpkt_decode_list,
@@ -1594,7 +1597,7 @@ client_http_decode(Socket, HttpRequest) ->
 %%--------------------------------------------------------------------
 packet_http_decode_list(doc) ->
     ["Test setting the packet option {packet, http}, {mode, list}"
-     "(Body will be litst too)"];
+     "(Body will be list too)"];
 packet_http_decode_list(suite) ->
     [];
 packet_http_decode_list(Config) when is_list(Config) ->
@@ -1804,7 +1807,304 @@ server_http_decode_error(Socket, HttpResponse) ->
     assert_packet_opt(Socket, http),
     ok = ssl:send(Socket, HttpResponse),
     ok.
+%%--------------------------------------------------------------------
+packet_httph_active(doc) ->
+    ["Test setting the packet option {packet, httph}"];
+packet_httph_active(suite) ->
+    [];
+packet_httph_active(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Trailer = "Content-Encoding: gzip\r\n"
+	"\r\n",
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_send_trailer,
+					       [Trailer]}},
+					{options, [{active, true}, binary |
+						   ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_http_decode_trailer_active,
+					       []}},
+					{options, [{active, true},
+						   {packet, httph},
+						   list |
+						   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
 
+server_send_trailer(Socket, Trailer)->
+    ssl:send(Socket, Trailer),
+    ok.
+
+client_http_decode_trailer_active(Socket) ->
+    receive
+	{ssl, Socket,
+	 {http_header,36,'Content-Encoding',undefined,"gzip"}} ->
+	    ok;
+	Other1 ->
+	    exit({?LINE, Other1})
+    end,
+    receive
+	{ssl, Socket, http_eoh}  ->
+	    ok;
+	Other2 ->
+	    exit({?LINE, Other2})
+    end,
+    ok.
+
+%%--------------------------------------------------------------------
+packet_httph_bin_active(doc) ->
+    ["Test setting the packet option {packet, httph_bin}"];
+packet_httph_bin_active(suite) ->
+    [];
+packet_httph_bin_active(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Trailer = "Content-Encoding: gzip\r\n"
+	"\r\n",
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_send_trailer,
+					       [Trailer]}},
+					{options, [{active, true}, binary |
+						   ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_http_decode_trailer_bin_active,
+					       []}},
+					{options, [{active, true},
+						   {packet, httph_bin},
+						   list |
+						   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+client_http_decode_trailer_bin_active(Socket) ->
+    receive
+	{ssl, Socket,
+	 {http_header,36,'Content-Encoding',undefined, <<"gzip">>}} ->
+	    ok;
+	Other1 ->
+	    exit({?LINE, Other1})
+    end,
+    receive
+	{ssl, Socket, http_eoh}  ->
+	    ok;
+	Other2 ->
+	    exit({?LINE, Other2})
+    end,
+    ok.
+%%--------------------------------------------------------------------
+packet_httph_active_once(doc) ->
+    ["Test setting the packet option {packet, httph}"];
+packet_httph_active_once(suite) ->
+    [];
+packet_httph_active_once(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Trailer = "Content-Encoding: gzip\r\n"
+	"\r\n",
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_send_trailer,
+					       [Trailer]}},
+					{options, [{active, true}, binary |
+						   ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_http_decode_trailer_active_once,
+					       []}},
+					{options, [{active, false},
+						   {packet, httph},
+						   list |
+						   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+
+client_http_decode_trailer_active_once(Socket) ->
+    ssl:setopts(Socket, [{active, once}]),
+    receive
+	{ssl, Socket,
+	 {http_header,36,'Content-Encoding',undefined,"gzip"}} ->
+	    ok;
+	Other1 ->
+	    exit({?LINE, Other1})
+    end,
+    ssl:setopts(Socket, [{active, once}]),
+    receive
+	{ssl, Socket, http_eoh}  ->
+	    ok;
+	Other2 ->
+	    exit({?LINE, Other2})
+    end,
+    ok.
+%%--------------------------------------------------------------------
+packet_httph_bin_active_once(doc) ->
+    ["Test setting the packet option {packet, httph_bin}"];
+packet_httph_bin_active_once(suite) ->
+    [];
+packet_httph_bin_active_once(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Trailer = "Content-Encoding: gzip\r\n"
+	"\r\n",
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_send_trailer,
+					       [Trailer]}},
+					{options, [{active, true}, binary |
+						   ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_http_decode_trailer_bin_active_once,
+					       []}},
+					{options, [{active, false},
+						   {packet, httph_bin},
+						   list |
+						   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+client_http_decode_trailer_bin_active_once(Socket) ->
+    ssl:setopts(Socket, [{active, once}]),
+    receive
+	{ssl, Socket,
+	 {http_header,36,'Content-Encoding',undefined, <<"gzip">>}} ->
+	    ok;
+	Other1 ->
+	    exit({?LINE, Other1})
+    end,
+    ssl:setopts(Socket, [{active, once}]),
+    receive
+	{ssl, Socket, http_eoh}  ->
+	    ok;
+	Other2 ->
+	    exit({?LINE, Other2})
+    end,
+    ok.
+
+%%--------------------------------------------------------------------
+
+packet_httph_passive(doc) ->
+    ["Test setting the packet option {packet, httph}"];
+packet_httph_passive(suite) ->
+    [];
+packet_httph_passive(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Trailer = "Content-Encoding: gzip\r\n"
+	"\r\n",
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_send_trailer,
+					       [Trailer]}},
+					{options, [{active, true}, binary |
+						   ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_http_decode_trailer_passive,
+					       []}},
+					{options, [{active, false},
+						   {packet, httph},
+						   list |
+						   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+client_http_decode_trailer_passive(Socket) ->
+    {ok,{http_header,36,'Content-Encoding',undefined,"gzip"}} = ssl:recv(Socket, 0),
+    {ok, http_eoh} = ssl:recv(Socket, 0),
+    ok.
+
+%%--------------------------------------------------------------------
+packet_httph_bin_passive(doc) ->
+    ["Test setting the packet option {packet, httph_bin}"];
+packet_httph_bin_passive(suite) ->
+    [];
+packet_httph_bin_passive(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Trailer = "Content-Encoding: gzip\r\n"
+	"\r\n",
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_send_trailer,
+					       [Trailer]}},
+					{options, [{active, true}, binary |
+						   ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_http_decode_trailer_bin_passive,
+					       []}},
+					{options, [{active, false},
+						   {packet, httph_bin},
+						   list |
+						   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+client_http_decode_trailer_bin_passive(Socket) ->
+    {ok,{http_header,36,'Content-Encoding',undefined,<<"gzip">>}} = ssl:recv(Socket, 0),
+    {ok, http_eoh} = ssl:recv(Socket, 0),
+    ok.
 
 %%--------------------------------------------------------------------
 packet_line_decode(doc) ->
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 8c952708c5..f19f92be6f 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -513,6 +513,9 @@ Error: fun containing local Erlang function calls
               the table has been fixed by the process.</p>
             <p>If the table never has been fixed, the call returns
               <c>false</c>.</p>
+          <item><c>Item=stats, Value=tuple()</c>          <br></br>
+	  Returns internal statistics about set, bag and duplicate_bag tables on an internal format used by OTP test suites.
+	  Not for production use.</item>
           </item>
         </list>
       </desc>
diff --git a/lib/stdlib/src/dets_v8.erl b/lib/stdlib/src/dets_v8.erl
index af36958c1c..299b037c28 100644
--- a/lib/stdlib/src/dets_v8.erl
+++ b/lib/stdlib/src/dets_v8.erl
@@ -163,7 +163,7 @@
 %% The 8(c) version uses a different hashing algorithm, erlang:phash
 %% (former versions use erlang:hash).
 %% Version 8(b) files are only converted to version 8(c) if repair is
-%% done, so we need compatability with 8(b) for a _long_ time.
+%% done, so we need compatibility with 8(b) for a _long_ time.
 %%
 %% There are known bugs due to the fact that keys and objects are
 %% sometimes compared (==) and sometimes matched (=:=). The version
diff --git a/lib/stdlib/src/erl_compile.erl b/lib/stdlib/src/erl_compile.erl
index abff37e4bc..d833f626bf 100644
--- a/lib/stdlib/src/erl_compile.erl
+++ b/lib/stdlib/src/erl_compile.erl
@@ -41,7 +41,6 @@ compiler(".idl") ->    {ic,              compile};
 compiler(".asn1") ->   {asn1ct,          compile_asn1};
 compiler(".asn") ->    {asn1ct,          compile_asn};
 compiler(".py") ->     {asn1ct,          compile_py};
-compiler(".xml") ->    {xmerl_scan,      process};
 compiler(_) ->         no.
 
 %% Entry from command line.
diff --git a/lib/stdlib/src/erl_expand_records.erl b/lib/stdlib/src/erl_expand_records.erl
index eada563914..20fd247cea 100644
--- a/lib/stdlib/src/erl_expand_records.erl
+++ b/lib/stdlib/src/erl_expand_records.erl
@@ -35,7 +35,7 @@
 		 trecords=sets:new(), % Typed records
 		 uses_types=false,    % Are there -spec or -type in the module
                  strict_ra=[],        % strict record accesses
-                 checked_ra=[]        % succesfully accessed records
+                 checked_ra=[]        % successfully accessed records
                 }).
 
 -spec(module(AbsForms, CompileOptions) -> AbsForms when
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 02e97fb3a8..e048764a55 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -819,6 +819,14 @@ t_delete_all_objects(Config) when is_list(Config) ->
     repeat_for_opts(t_delete_all_objects_do),
     ?line verify_etsmem(EtsMem).
 
+get_kept_objects(T) ->
+    case ets:info(T,stats) of
+	false ->
+	    0;
+	{_,_,_,_,_,_,KO}  ->
+	    KO
+    end.
+
 t_delete_all_objects_do(Opts) ->
     ?line T=ets_new(x,Opts),
     ?line filltabint(T,4000),
@@ -828,10 +836,10 @@ t_delete_all_objects_do(Opts) ->
     ?line true = ets:delete_all_objects(T),
     ?line '$end_of_table' = ets:next(T,O),
     ?line 0 = ets:info(T,size),
-    ?line 4000 = ets:info(T,kept_objects),
+    ?line 4000 = get_kept_objects(T),
     ?line ets:safe_fixtable(T,false),
     ?line 0 = ets:info(T,size),
-    ?line 0 = ets:info(T,kept_objects),
+    ?line 0 = get_kept_objects(T),
     ?line filltabint(T,4000),
     ?line 4000 = ets:info(T,size),
     ?line true = ets:delete_all_objects(T),
@@ -861,10 +869,10 @@ t_delete_object_do(Opts) ->
     ?line ets:delete_object(T,{First, integer_to_list(First)}),
     ?line Next = ets:next(T,First),
     ?line 3999 = ets:info(T,size),
-    ?line 1 = ets:info(T,kept_objects),
+    ?line 1 = get_kept_objects(T),
     ?line ets:safe_fixtable(T,false),
     ?line 3999 = ets:info(T,size),
-    ?line 0 = ets:info(T,kept_objects),
+    ?line 0 = get_kept_objects(T),
     ?line ets:delete(T),
     ?line T1 = ets_new(x,[ordered_set | Opts]),
     ?line filltabint(T1,4000),
@@ -2717,7 +2725,8 @@ ordered_do(Opts) ->
 		      9,10,11,12,
 		      1,2,3,4,
 		      17,18,19,20,
-		      13,14,15,16
+		      13,14,15,16,
+		      1 bsl 33
 		     ],
     ?line lists:foreach(fun(X) ->
 			  ets:insert(T,{X,integer_to_list(X)})
@@ -2732,13 +2741,14 @@ ordered_do(Opts) ->
     ?line S2 = L2,
     ?line [{1,"1"}] = ets:slot(T,0),
     ?line [{28,"28"}] = ets:slot(T,27),
+    ?line [{1 bsl 33,_}] = ets:slot(T,28),
     ?line 27 = ets:prev(T,28),
     ?line [{7,"7"}] = ets:slot(T,6),
-    ?line '$end_of_table' = ets:next(T,28),
+    ?line '$end_of_table' = ets:next(T,1 bsl 33),
     ?line [{12,"12"}] = ets:slot(T,11),
-    ?line '$end_of_table' = ets:slot(T,28),
+    ?line '$end_of_table' = ets:slot(T,29),
     ?line [{1,"1"}] = ets:slot(T,0),
-    ?line 28 = ets:prev(T,29),
+    ?line 28 = ets:prev(T,1 bsl 33),
     ?line 1 = ets:next(T,0),
     ?line pick_all_forward(T),
     ?line [{7,"7"}] = ets:slot(T,6),
@@ -4969,7 +4979,7 @@ grow_pseudo_deleted_do(Type) ->
 				     [true]}]),
     Left = Mult*(Mod-1),
     ?line Left = ets:info(T,size),
-    ?line Mult = ets:info(T,kept_objects),
+    ?line Mult = get_kept_objects(T),
     filltabstr(T,Mult),
     spawn_opt(fun()-> ?line true = ets:info(T,fixed),
 		       Self ! start,
@@ -4983,7 +4993,7 @@ grow_pseudo_deleted_do(Type) ->
     ?line true = ets:safe_fixtable(T,false),
     io:format("Unfix table done. ~p nitems=~p\n",[now(),ets:info(T,size)]),
     ?line false = ets:info(T,fixed),
-    ?line 0 = ets:info(T,kept_objects),
+    ?line 0 = get_kept_objects(T),
     ?line done = receive_any(),
     %%verify_table_load(T), % may fail if concurrency is poor (genny)
     ets:delete(T),
@@ -5010,7 +5020,7 @@ shrink_pseudo_deleted_do(Type) ->
 				     [{'>', '$1', Half}],
 				     [true]}]),    
     ?line Half = ets:info(T,size),
-    ?line Half = ets:info(T,kept_objects),
+    ?line Half = get_kept_objects(T),
     spawn_opt(fun()-> ?line true = ets:info(T,fixed),
 		      Self ! start,
 		      io:format("Starting to delete... ~p\n",[now()]),
@@ -5023,7 +5033,7 @@ shrink_pseudo_deleted_do(Type) ->
     ?line true = ets:safe_fixtable(T,false),
     io:format("Unfix table done. ~p nitems=~p\n",[now(),ets:info(T,size)]),
     ?line false = ets:info(T,fixed),
-    ?line 0 = ets:info(T,kept_objects),
+    ?line 0 = get_kept_objects(T),
     ?line done = receive_any(),
     %%verify_table_load(T), % may fail if concurrency is poor (genny)
     ets:delete(T),
@@ -5139,7 +5149,7 @@ smp_fixed_delete_do() ->
     ?line 0 = ets:info(T,size),
     ?line true = ets:info(T,fixed),
     ?line Buckets = num_of_buckets(T),
-    ?line NumOfObjs = ets:info(T,kept_objects),
+    ?line NumOfObjs = get_kept_objects(T),
     ets:safe_fixtable(T,false),
     %% Will fail as unfix does not shrink the table:
     %%?line Mem = ets:info(T,memory),
@@ -5171,7 +5181,7 @@ smp_unfix_fix_do() ->
     Left = NumOfObjs - Deleted,
     ?line Left = ets:info(T,size),
     ?line true = ets:info(T,fixed),
-    ?line Deleted = ets:info(T,kept_objects),
+    ?line Deleted = get_kept_objects(T),
     
     {Child, Mref} = 
 	spawn_opt(fun()-> ?line true = ets:info(T,fixed),
@@ -5188,7 +5198,7 @@ smp_unfix_fix_do() ->
 				       end,
 				       Deleted),
 			  ?line 0 = ets:info(T,size),
-			  ?line true = ets:info(T,kept_objects) >= Left,		      
+			  ?line true = get_kept_objects(T) >= Left,		      
 			  ?line done = receive_any()
 		  end, 
 		  [link, monitor, {scheduler,2}]),
@@ -5201,7 +5211,7 @@ smp_unfix_fix_do() ->
     Child ! done,
     {'DOWN', Mref, process, Child, normal} = receive_any(),
     ?line false = ets:info(T,fixed),
-    ?line 0 = ets:info(T,kept_objects),
+    ?line 0 = get_kept_objects(T),
     %%verify_table_load(T),
     ets:delete(T),
     process_flag(scheduler,0).
@@ -5239,7 +5249,7 @@ otp_8166_do(WC) ->
     ZombieCrPid ! quit,    
     {'DOWN', ZombieCrMref, process, ZombieCrPid, normal} = receive_any(),
     ?line false = ets:info(T,fixed),
-    ?line 0 = ets:info(T,kept_objects),
+    ?line 0 = get_kept_objects(T),
     %%verify_table_load(T),
     ets:delete(T),
     process_flag(scheduler,0).
@@ -5306,7 +5316,7 @@ otp_8166_zombie_creator(T,Deleted) ->
 
 verify_table_load(T) ->
     ?line Stats = ets:info(T,stats),
-    ?line {Buckets,AvgLen,StdDev,ExpSD,_MinLen,_MaxLen} = Stats,
+    ?line {Buckets,AvgLen,StdDev,ExpSD,_MinLen,_MaxLen,_} = Stats,
     ?line ok = if
 		   AvgLen > 7 ->
 		       io:format("Table overloaded: Stats=~p\n~p\n",
@@ -5918,7 +5928,7 @@ very_big_num(0, Result) ->
     ?line Result.
 
 make_port() ->
-    ?line open_port({spawn, efile}, [eof]).
+    ?line open_port({spawn, "efile"}, [eof]).
 
 make_pid() ->
     ?line spawn_link(?MODULE, sleeper, []).
diff --git a/lib/stdlib/test/tar_SUITE.erl b/lib/stdlib/test/tar_SUITE.erl
index 48f58cd05d..9ad3936928 100644
--- a/lib/stdlib/test/tar_SUITE.erl
+++ b/lib/stdlib/test/tar_SUITE.erl
@@ -283,17 +283,16 @@ long_names(doc) ->
 long_names(Config) when is_list(Config) ->
     ?line DataDir = ?config(data_dir, Config),
     ?line Long = filename:join(DataDir, "long_names.tar"),
+    run_in_short_tempdir(Config,
+			 fun() -> do_long_names(Long) end).
 
+do_long_names(Long) ->
     %% Try table/2 and extract/2.
     ?line case erl_tar:table(Long, [verbose]) of
 	      {ok,List} when is_list(List) ->
 		  ?line io:format("~p\n", [List])
 	  end,
 
-
-    %% To avoid getting too long paths for Windows to handle, extract into
-    %% the current directory (which is the test_server directory). Its path
-    %% is quite a bit shorter than the path to priv_dir.
     ?line {ok,Cwd} = file:get_cwd(),
     ?line ok = erl_tar:extract(Long),
     ?line Base = filename:join([Cwd, "original_software", "written_by",
@@ -312,17 +311,16 @@ long_names(Config) when is_list(Config) ->
     ?line "Here"++_ = binary_to_list(First),
     ?line "And"++_ = binary_to_list(Second),
 
-    %% Clean up.
-    ?line delete_files([filename:join(Cwd, "original_software"),EmptyDir]),
-
     ok.
 
 create_long_names(doc) ->
     ["Creates a tar file from a deep directory structure (filenames are ",
      "longer than 100 characters)."];
 create_long_names(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line ok = file:set_cwd(PrivDir),
+    run_in_short_tempdir(Config, fun create_long_names/0).
+    
+create_long_names() ->
+    ?line {ok,Dir} = file:get_cwd(),
     Dirs = ["aslfjkshjkhliuf",
 	    "asdhjfehnbfsky",
 	    "sahajfskdfhsz",
@@ -334,7 +332,7 @@ create_long_names(Config) when is_list(Config) ->
     ?line AFile = filename:join(DeepDir, "a_file"),
     ?line Hello = "hello, world\n",
     ?line ok = file:write_file(AFile, Hello),
-    ?line TarName = filename:join(PrivDir,  "my_tar_with_long_names.tar"),
+    ?line TarName = filename:join(Dir,  "my_tar_with_long_names.tar"),
     ?line ok = erl_tar:create(TarName, [AFile]),
 
     %% Print contents.
@@ -347,9 +345,6 @@ create_long_names(Config) when is_list(Config) ->
     ?line {ok, Bin} = file:read_file(filename:join(ExtractDir, AFile)),
     ?line Hello = binary_to_list(Bin),
 
-    %% Clean up.
-    ?line delete_files([ExtractDir,TarName,hd(Dirs)]),
-
     ok.
 
 make_dirs([Dir|Rest], []) ->
@@ -734,3 +729,42 @@ delete_files([Item|Rest]) ->
     end,
     delete_files(Rest).
 
+%% Move to a temporary directory with as short name as possible and
+%% execute Fun. Remove the directory and any files in it afterwards.
+%% This is necessary because pathnames on Windows may be limited to
+%% 260 characters.
+run_in_short_tempdir(Config, Fun) ->
+    {ok,Cwd} = file:get_cwd(),
+    PrivDir0 = ?config(priv_dir, Config),
+
+    %% Normalize name to make sure that there is no slash at the end.
+    PrivDir = filename:absname(PrivDir0),
+
+    %% We need a base directory with a much shorter pathname than
+    %% priv_dir. We KNOW that priv_dir is located four levels below
+    %% the directory that common_test puts the ct_run.* directories
+    %% in. That fact is not documented, but an usually reliable source
+    %% assured me that the directory structure is unlikely to change
+    %% in future versions of common_test because of backward
+    %% compatibility (tools developed by users of common_test depend
+    %% on the current directory layout).
+    Base = lists:foldl(fun(_, D) ->
+			       filename:dirname(D)
+		       end, PrivDir, [1,2,3,4]),
+
+    Dir = make_temp_dir(Base, 0),
+    ok = file:set_cwd(Dir),
+    io:format("Running test in ~s\n", [Dir]),
+    try
+	Fun()
+    after
+	file:set_cwd(Cwd),
+	delete_files([Dir])
+    end.
+
+make_temp_dir(Base, I) ->
+    Name = filename:join(Base, integer_to_list(I, 36)),
+    case file:make_dir(Name) of
+	ok -> Name;
+	{error,eexist} -> make_temp_dir(Base, I+1)
+    end.
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index de9b962dfc..f3445b742b 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -4674,13 +4674,13 @@ collect_subcases(Mod, Case, MFA, St, Suite) ->
 	[] when Case == all -> {ok,[],St};
 	[] when element(1, Case) == conf -> {ok,[],St};
 	[] -> {ok,[MFA],St};
-%%%! --- START Kept for backwards compatibilty ---
+%%%! --- START Kept for backwards compatibility ---
 %%%! Requirements are not used
 	{req,ReqList} ->
 	    collect_case_deny(Mod, Case, MFA, ReqList, [], St);
 	{req,ReqList,SubCases} ->
 	    collect_case_deny(Mod, Case, MFA, ReqList, SubCases, St);
-%%%! --- END Kept for backwards compatibilty ---
+%%%! --- END Kept for backwards compatibility ---
 	{Skip,Reason} when Skip==skip; Skip==skipped ->
 	    {ok,[{skip_case,{MFA,Reason}}],St};
 	{error,Reason} ->
diff --git a/lib/test_server/src/ts.config b/lib/test_server/src/ts.config
index f021f5958b..cf3d269616 100644
--- a/lib/test_server/src/ts.config
+++ b/lib/test_server/src/ts.config
@@ -12,7 +12,7 @@
 %  "10.10.0.1",				        %IP string
 %  {10,10,0,1},				        %IP tuple
 %  ["my_ip4_host"],				%Any aliases
-%  "::ffff:10.10.0.1",			        %IPv6 string (compatibilty addr)
+%  "::ffff:10.10.0.1",			        %IPv6 string (compatibility addr)
 %  {0,0,0,0,0,65535,2570,1}		        %IPv6 tuple
 % }}.
 
diff --git a/lib/toolbar/src/toolbar_toolconfig.erl b/lib/toolbar/src/toolbar_toolconfig.erl
index 7d8f2b4d21..693a7b4570 100644
--- a/lib/toolbar/src/toolbar_toolconfig.erl
+++ b/lib/toolbar/src/toolbar_toolconfig.erl
@@ -126,7 +126,7 @@ loop(S,Window) ->
 				    show_info(Window,Info),
 				    move_focus(Window,file);
 				
-				%% Erronous version number -- Notify user
+				%% Erroneous version number -- Notify user
 				{error,version} ->
 				    Win = Window#tfwindow.window,
 				    tool_utils:notify(Win,[FileName,
@@ -136,7 +136,7 @@ loop(S,Window) ->
 				_Error ->
 				    Win = Window#tfwindow.window,
 				    tool_utils:notify(Win,[FileName,
-				       "File is on erronous format"])
+				       "File is in erroneous format"])
 			    end;
 				
 			%% The file can not be read, show default values
diff --git a/lib/tools/doc/src/instrument.xml b/lib/tools/doc/src/instrument.xml
index 12877994de..a7c62c8770 100644
--- a/lib/tools/doc/src/instrument.xml
+++ b/lib/tools/doc/src/instrument.xml
@@ -342,7 +342,7 @@
         <p>Stores the current memory allocation map on the file
           <c>File</c>. Returns <c>true</c> if the emulator has been
           started with the "<c>+Mim true</c>" command-line argument, and
-          the map was successfuly stored; otherwise, <c>false</c>. The
+          the map was successfully stored; otherwise, <c>false</c>. The
           contents of the file can later be read using
           <seealso marker="#read_memory_data/1">read_memory_data/1</seealso>.
           <em>NOTE:</em><c>store_memory_data/0</c> blocks execution of
@@ -360,7 +360,7 @@
         <p>Stores the current memory status on the file
           <c>File</c>. Returns <c>true</c> if the emulator has been
           started with the "<c>+Mis true</c>", or "<c>+Mim true</c>"
-          command-line arguments, and the data was successfuly stored;
+          command-line arguments, and the data was successfully stored;
           otherwise, <c>false</c>. The contents of the file can later be
           read using
           <seealso marker="#read_memory_status/1">read_memory_status/1</seealso>.</p>
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index a8dd3ec3ac..bc7a190fb4 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -1225,7 +1225,7 @@ Lock syntax table.  The effect is that `apply' in the atom
       `( (char-after (1- (or ,pos (point)))))))
 
 ;; defvar some obsolete variables, which we still support for
-;; backwardscompatibility reasons.
+;; backwards compatibility reasons.
 (eval-when-compile
   (defvar comment-indent-hook)
   (defvar dabbrev-case-fold-search)
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 905ad895c9..fb9744d759 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -55,14 +55,14 @@
 %% compiled module. This is necessary so that the code can be loaded
 %% on remote nodes that are started after the compilation.
 %%
-%% PARELLALISM
+%% PARALLELISM
 %% To take advantage of SMP when doing the cover analysis both the data 
 %% collection and analysis has been parallelized. One process is spawned for
 %% each node when collecting data, and on the remote node when collecting data
 %% one process is spawned per module. 
 %% 
 %% When analyzing data it is possible to issue multiple analyse(_to_file)/X 
-%% calls at once. They are however all calls (for backwardscompatability 
+%% calls at once. They are however all calls (for backwards compatibility
 %% reasons) so the user of cover will have to spawn several processes to to the
 %% calls ( or use async_analyse_to_file ). 
 %%
diff --git a/lib/typer/src/typer.erl b/lib/typer/src/typer.erl
index e40c4f39cd..fd906c8c46 100644
--- a/lib/typer/src/typer.erl
+++ b/lib/typer/src/typer.erl
@@ -539,7 +539,7 @@ get_type_string(F, A, Info, Mode) ->
       case {Mode, Type} of
 	{file, {contract, _}} -> "";
 	_ ->
-	  Prefix = lists:concat(["-spec ", F]),
+	  Prefix = lists:concat(["-spec ", erl_types:atom_to_string(F)]),
 	  lists:concat([Prefix, TypeStr, "."])
       end;
     true ->
diff --git a/lib/wx/api_gen/gen_util.erl b/lib/wx/api_gen/gen_util.erl
index b53f817ce0..df5b4c3405 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-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -43,23 +43,27 @@ strip_name(String,[]) -> String.
 
 get_hook(_Type, undefined) -> ignore;
 get_hook(Type, List) -> proplists:get_value(Type, List, ignore).
-  
+
+get_taylor_made(Str, Name) ->
+    re:run(Str, "<<"++Name++"(.*)"++Name++">>",
+	   [dotall, {capture, all_but_first, list}]).
+
 open_write(File) ->
     %% io:format("Generating ~s~n",[File]),
     {ok, Fd} = file:open(File++".temp", [write]),
     put(current_file, {Fd,File}).
-    
+
 
 close() ->
     case get(current_file) of
-	undefined -> 
+	undefined ->
 	    ok;
 	{closed, File} ->
 	    io:format("Closing twice ~s~n",[File]);
 	{Fd,File} ->
 	    file:close(Fd),
 	    case os:cmd("diff " ++ File ++ " " ++ File ++ ".temp" ++ "| head -30") of
-		[] -> 
+		[] ->
 		    ok = file:delete(File ++ ".temp"),
 		    %% So that make understands that we have made this
 		    %% case os:getenv("CLEARCASE_ROOT") of
@@ -71,11 +75,11 @@ close() ->
 		    case check_diff(Diff) of
 			copyright -> %% We ignore copyright changes only
 			    ok = file:delete(File ++ ".temp");
-			_ ->		    
+			_ ->
 			    io:format("Diff in ~s~n~s ~n", [File, Diff]),
 			    case file:rename(File ++ ".temp", File) of
 				ok -> ok;
-				_ -> 
+				_ ->
 				    io:format("*****  Failed to save file ~p ~n",[File])
 			    end
 		    end
@@ -85,9 +89,9 @@ close() ->
 
 
 check_diff(Diff) ->
-    try 
+    try
 	[_,D1,_,D2|Tail] = re:split(Diff, "\n"),
-	case Tail of 
+	case Tail of
 	    [] -> ok;
 	    [<<>>] -> ok;
 	    _ -> throw(diff)
@@ -117,29 +121,29 @@ args(Fun, Limit, List, Max) ->
     args(Fun, Limit, List, Max, 0).
 
 args(_Fun, _Limit, [], _Max, _) -> "";  %% No args
-args(Fun, _Limit, [Last], _Max, _Pos) -> 
-    case Fun(Last) of 
+args(Fun, _Limit, [Last], _Max, _Pos) ->
+    case Fun(Last) of
 	skip -> ""; %% FIXME bug if last skips
 	Str  -> Str
     end;
 args(Fun, Limit, [H|R], Max, Pos) ->
-    case Fun(H) of 
+    case Fun(H) of
 	skip -> args(Fun,Limit,R, Max, Pos);
-	Str  -> 
-	    {NL, NewPos} = 
+	Str  ->
+	    {NL, NewPos} =
 		case length(Str) + Pos of
 		    Curr when Curr > Max ->
 			{"\n  ", 0};
-		    Curr -> 
+		    Curr ->
 			{"", Curr}
 		end,
-	    case args(Fun,Limit,R, Max, NewPos) of 
+	    case args(Fun,Limit,R, Max, NewPos) of
 		"" -> Str;
 		End -> Str ++ Limit ++ NL ++ End
 	    end
     end.
 
-    
+
 
 
 tokens(S) ->
@@ -167,11 +171,11 @@ replace_and_remove([E|R], Acc) when is_list(E) -> %% Keep everything that is a w
     replace_and_remove(R, [E|Acc]);
 replace_and_remove([$\n | R], Acc) ->   %% It is semi line oriented so keep eol
     replace_and_remove(R, [eol|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]);
 replace_and_remove([$} | R], Acc) ->
     replace_and_remove(R, ["}"|Acc]);
@@ -187,7 +191,7 @@ replace_and_remove([$, | R], Acc) ->
     replace_and_remove(R, [cont|Acc]);
 replace_and_remove([$; | R], Acc) ->
     replace_and_remove(R, [eoe|Acc]);
-replace_and_remove([$@ | R], Acc) ->    
+replace_and_remove([$@ | R], Acc) ->
     replace_and_remove(R, [directive|Acc]);
 
 replace_and_remove([_E|R], Acc) ->       %% Ignore everthing else
@@ -213,7 +217,7 @@ erl_copyright() ->
     w("%%~n",[]),
     w("%% %CopyrightBegin%~n",[]),
     w("%%~n",[]),
-    w("%% Copyright Ericsson AB ~p-2010. All Rights Reserved.~n",
+    w("%% Copyright Ericsson AB ~p-2011. All Rights Reserved.~n",
       [StartYear]),
     w("%%~n",[]),
     w("%% The contents of this file are subject to the Erlang Public License,~n",[]),
@@ -229,11 +233,11 @@ erl_copyright() ->
     w("%%~n",[]),
     w("%% %CopyrightEnd%~n",[]).
 
-c_copyright() -> 
+c_copyright() ->
     w("/*~n",[]),
     w(" * %CopyrightBegin%~n",[]),
     w(" *~n",[]),
-    w(" * Copyright Ericsson AB 2008-2010. All Rights Reserved.~n",[]),
+    w(" * Copyright Ericsson AB 2008-2011. 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 374e0bd12b..b665d949b3 100644
--- a/lib/wx/api_gen/gl_gen.erl
+++ b/lib/wx/api_gen/gl_gen.erl
@@ -44,7 +44,7 @@ devcode() -> spawn(fun() -> safe(fun gen_code/0,false) end).
 safe(What, QuitOnErr) ->
     try 
 	What(),
-	io:format("Completed succesfully~n~n", []),
+	io:format("Completed successfully~n~n", []),
 	QuitOnErr andalso gen_util:halt(0)
     catch Err:Reason ->
 	    io:format("Error ~p: ~p:~p~n  ~p~n", 
diff --git a/lib/wx/api_gen/wx_extra/wxListCtrl.c_src b/lib/wx/api_gen/wx_extra/wxListCtrl.c_src
index cd3074e481..54d6fafd01 100644
--- a/lib/wx/api_gen/wx_extra/wxListCtrl.c_src
+++ b/lib/wx/api_gen/wx_extra/wxListCtrl.c_src
@@ -1,3 +1,161 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+
+<<wxListCtrl_class
+class EwxListCtrl : public wxListCtrl {
+ public: ~EwxListCtrl();
+ EwxListCtrl(wxWindow * parent,wxWindowID winid,const wxPoint& pos,const wxSize& size,long style,const wxValidator& validator) : wxListCtrl(parent,winid,pos,size,style,validator) {};
+ EwxListCtrl() : wxListCtrl() {};
+
+ int onGetItemText;
+ int onGetItemAttr;
+ int onGetItemColumnImage;
+ ErlDrvPort port;
+
+ private:
+ virtual wxString OnGetItemText(long item, long col) const;
+ virtual wxListItemAttr* OnGetItemAttr(long item) const;
+ virtual int OnGetItemImage(long item) const;
+ virtual int OnGetItemColumnImage(long item, long column) const;
+};
+wxListCtrl_class>>
+
+<<wxListCtrl_new_0
+case ~s: { // wxListCtrl::wxListCtrl
+ wxListCtrl * Result = new EwxListCtrl();
+ newPtr((void *) Result, 0, memenv);
+ rt.addRef(getRef((void *)Result,memenv), "wxListCtrl");
+ break;
+}
+wxListCtrl_new_0>>
+
+<<wxListCtrl_new_2
+case ~s: { // wxListCtrl::wxListCtrl
+ wxWindowID winid=wxID_ANY;
+ wxPoint pos= wxDefaultPosition;
+ wxSize size= wxDefaultSize;
+ long style=wxLC_ICON;
+ const wxValidator * validator= &wxDefaultValidator;
+ wxWindow *parent = (wxWindow *) getPtr(bp,memenv); bp += 4;
+ int onGetItemText = 0, onGetItemAttr = 0, onGetItemColumnImage = 0;
+
+ bp += 4; /* Align */
+ while( * (int*) bp) { switch (* (int*) bp) {
+  case 1: {bp += 4;
+ winid = (wxWindowID)*(int *) bp; bp += 4;
+  } break;
+  case 2: {bp += 4;
+ int * posX = (int *) bp; bp += 4;
+ int * posY = (int *) bp; bp += 4;
+ pos = wxPoint(*posX,*posY);
+ bp += 4; /* Align */
+  } break;
+  case 3: {bp += 4;
+ int * sizeW = (int *) bp; bp += 4;
+ int * sizeH = (int *) bp; bp += 4;
+ size = wxSize(*sizeW,*sizeH);
+ bp += 4; /* Align */
+  } break;
+  case 4: {bp += 4;
+ style = (long)*(int *) bp; bp += 4;
+  } break;
+  case 5: {bp += 4;
+validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
+  } break;
+  case 6: {bp += 4;
+    onGetItemText = *(int *) bp; bp += 4;
+  } break;
+  case 7: {bp += 4;
+    onGetItemAttr = *(int *) bp; bp += 4;
+  } break;
+  case 8: {bp += 4;
+    onGetItemColumnImage = *(int *) bp; bp += 4;
+  } break;
+ }};
+ EwxListCtrl * Result = new EwxListCtrl(parent,winid,pos,size,style,*validator);
+ Result->onGetItemText = onGetItemText;
+ Result->onGetItemAttr = onGetItemAttr;
+ Result->onGetItemColumnImage = onGetItemColumnImage;
+ Result->port = Ecmd.port;
+ newPtr((void *) Result, 0, memenv);
+ rt.addRef(getRef((void *)Result,memenv), "wxListCtrl");
+ break;
+}
+wxListCtrl_new_2>>
+
+<<Create
+case ~s: { // wxListCtrl::Create
+ wxWindowID winid=wxID_ANY;
+ wxPoint pos= wxDefaultPosition;
+ wxSize size= wxDefaultSize;
+ long style=wxLC_ICON;
+ const wxValidator * validator= &wxDefaultValidator;
+ EwxListCtrl *This = (EwxListCtrl *) getPtr(bp,memenv); bp += 4;
+ wxWindow *parent = (wxWindow *) getPtr(bp,memenv); bp += 4;
+ int onGetItemText = 0, onGetItemAttr = 0, onGetItemColumnImage = 0;
+
+ bp += 4; /* Align */
+ while( * (int*) bp) { switch (* (int*) bp) {
+  case 1: {bp += 4;
+ winid = (wxWindowID)*(int *) bp; bp += 4;
+  } break;
+  case 2: {bp += 4;
+ int * posX = (int *) bp; bp += 4;
+ int * posY = (int *) bp; bp += 4;
+ pos = wxPoint(*posX,*posY);
+ bp += 4; /* Align */
+  } break;
+  case 3: {bp += 4;
+ int * sizeW = (int *) bp; bp += 4;
+ int * sizeH = (int *) bp; bp += 4;
+ size = wxSize(*sizeW,*sizeH);
+ bp += 4; /* Align */
+  } break;
+  case 4: {bp += 4;
+ style = (long)*(int *) bp; bp += 4;
+  } break;
+  case 5: {bp += 4;
+validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
+  } break;
+  case 6: {bp += 4;
+    onGetItemText = *(int *) bp; bp += 4;
+  } break;
+  case 7: {bp += 4;
+    onGetItemAttr = *(int *) bp; bp += 4;
+  } break;
+  case 8: {bp += 4;
+    onGetItemColumnImage = *(int *) bp; bp += 4;
+  } break;
+ }};
+ if(!This) throw wxe_badarg(0);
+ bool Result = This->Create(parent,winid,pos,size,style,*validator);
+ This->onGetItemText = onGetItemText;
+ This->onGetItemAttr = onGetItemAttr;
+ This->onGetItemColumnImage = onGetItemColumnImage;
+ This->port = Ecmd.port;
+
+ rt.addBool(Result);
+ break;
+}
+Create>>
+
 <<SortItems
 case ~s: { // wxListCtrl::SortItems taylormade
   wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
@@ -22,3 +180,6 @@ case ~s: { // wxListCtrl::SortItems taylormade
   break;
 }
 SortItems>>
+
+
+
diff --git a/lib/wx/api_gen/wx_extra/wxListCtrl.erl b/lib/wx/api_gen/wx_extra/wxListCtrl.erl
index e6470182cb..99255bc53f 100644
--- a/lib/wx/api_gen/wx_extra/wxListCtrl.erl
+++ b/lib/wx/api_gen/wx_extra/wxListCtrl.erl
@@ -1,32 +1,33 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2011. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
+
 <<EXPORT:SortItems sortItems/2 SortItems:EXPORT>>
 
 <<SortItems
 %% @spec (This::wxListCtrl(), SortCallBack::function()) -> boolean()
 %% @doc Sort the items in the list control<br />
-%%   <pre>SortCalBack(Item1,Item2) -> integer()</pre>
+%%   <pre>SortCallBack(Item1,Item2) -> integer()</pre>
 %%  <br /> SortCallBack receives the client data associated with two items
 %%         to compare, and should return 0 if the items are equal, a negative
 %%         value if the first item is less than the second one and a positive
 %%         value if the first item is greater than the second one.
-%%  <br /> NOTE: The callback may not call other processes.
+%%  <br /> NOTE: The callback may not call other (wx) processes.
 sortItems(#wx_ref{type=ThisT,ref=ThisRef}, SortCallBack)
   when is_function(SortCallBack, 2) ->
 	?CLASS(ThisT,wxListCtrl),
@@ -37,3 +38,100 @@ sortItems(#wx_ref{type=ThisT,ref=ThisRef}, SortCallBack)
 	SortId = wxe_util:get_cbId(Sort),
 	wxe_util:call(~s, <<ThisRef:32/?UI,SortId:32/?UI>>).
 SortItems>>
+
+<<EXPORT:wxListCtrl new/0, new/1, new/2 wxListCtrl:EXPORT>>
+
+<<wxListCtrl_new_0
+%% @spec () -> wxListCtrl()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlwxlistctrl">external documentation</a>.
+new() ->
+    wxe_util:construct(~s, <<>>).
+wxListCtrl_new_0>>
+
+<<wxListCtrl_new_2
+%% @spec (Parent::wxWindow:wxWindow()) -> wxListCtrl()
+%% @equiv new(Parent, [])
+new(Parent)
+ when is_record(Parent, wx_ref) ->
+  new(Parent, []).
+
+%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxListCtrl()
+%% Option = {winid, integer()} |
+%%          {pos, {X::integer(),Y::integer()}} |
+%%          {size, {W::integer(),H::integer()}} |
+%%          {style, integer()} |
+%%          {validator, wx:wx()} |
+%%          {onGetItemText, OnGetItemText} |
+%%          {onGetItemAttr, OnGetItemAttr} |
+%%          {onGetItemColumnImage, OnGetItemColumnImage}
+%%
+%% OnGetItemText = (This, Item, Column) -> wxString()
+%% OnGetItemAttr = (This, Item) -> wxListItemAttr()
+%% OnGetItemColumnImage = (This, Item, Column) -> integer()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlwxlistctrl">external documentation</a>.
+
+new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
+  when is_list(Options)->
+    ?CLASS(ParentT,wxWindow),
+    MOpts = fun({winid, Winid}, Acc) -> [<<1:32/?UI,Winid:32/?UI>>|Acc];
+	       ({pos, {PosX,PosY}}, Acc) -> [<<2:32/?UI,PosX:32/?UI,PosY:32/?UI,0:32>>|Acc];
+	       ({size, {SizeW,SizeH}}, Acc) -> [<<3:32/?UI,SizeW:32/?UI,SizeH:32/?UI,0:32>>|Acc];
+	       ({style, Style}, Acc) -> [<<4:32/?UI,Style:32/?UI>>|Acc];
+	       ({validator, #wx_ref{type=ValidatorT,ref=ValidatorRef}}, Acc) ->
+		    ?CLASS(ValidatorT,wx),[<<5:32/?UI,ValidatorRef:32/?UI>>|Acc];
+	       ({onGetItemText, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item,Col]) -> unicode:characters_to_binary([F(This,Item,Col),0]) end,
+		    [<<6:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       ({onGetItemAttr, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item]) ->
+				  #wx_ref{type=wxListItemAttr,ref=ThisRef} = F(This,Item),
+				  <<ThisRef:32/?UI>>
+			  end,
+		    [<<7:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       ({onGetItemColumnImage, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item, Col]) -> <<(F(This,Item,Col)):32/?I>> end,
+		    [<<8:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
+    BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
+    wxe_util:construct(~s, <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
+
+wxListCtrl_new_2>>
+
+<<EXPORT:Create create/2, create/3 Create:EXPORT>>
+
+<<Create
+%% @spec (This::wxListCtrl(), Parent::wxWindow:wxWindow()) -> bool()
+%% @equiv create(This,Parent, [])
+create(This,Parent)
+ when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
+  create(This,Parent, []).
+
+%% @spec (This::wxListCtrl(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
+%% Option = {winid, integer()} |
+%%          {pos, {X::integer(),Y::integer()}} |
+%%          {size, {W::integer(),H::integer()}} |
+%%          {style, integer()} |
+%%          {validator, wx:wx()} |
+%%          {onGetItemText, OnGetItemText} |
+%%          {onGetItemAttr, OnGetItemAttr} |
+%%          {onGetItemColumnImage, OnGetItemColumnImage}
+%%
+%% OnGetItemText = (This, Item, Column) -> wxString()
+%% OnGetItemAttr = (This, Item) -> wxListItemAttr()
+%% OnGetItemColumnImage = (This, Item, Column) -> integer()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlcreate">external documentation</a>.
+create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
+ when is_list(Options) ->
+  ?CLASS(ThisT,wxListCtrl),
+  ?CLASS(ParentT,wxWindow),
+  MOpts = fun({winid, Winid}, Acc) -> [<<1:32/?UI,Winid:32/?UI>>|Acc];
+          ({pos, {PosX,PosY}}, Acc) -> [<<2:32/?UI,PosX:32/?UI,PosY:32/?UI,0:32>>|Acc];
+          ({size, {SizeW,SizeH}}, Acc) -> [<<3:32/?UI,SizeW:32/?UI,SizeH:32/?UI,0:32>>|Acc];
+          ({style, Style}, Acc) -> [<<4:32/?UI,Style:32/?UI>>|Acc];
+          ({validator, #wx_ref{type=ValidatorT,ref=ValidatorRef}}, Acc) ->   ?CLASS(ValidatorT,wx),[<<5:32/?UI,ValidatorRef:32/?UI>>|Acc];
+          (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
+  BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
+  wxe_util:call(~s,
+  <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
+
+Create>>
diff --git a/lib/wx/api_gen/wx_gen.erl b/lib/wx/api_gen/wx_gen.erl
index 2f20c42a5d..b36653c570 100644
--- a/lib/wx/api_gen/wx_gen.erl
+++ b/lib/wx/api_gen/wx_gen.erl
@@ -38,7 +38,7 @@ devcode() -> erase(),safe(fun gen_code/0,false).
 safe(What, QuitOnErr) ->
     try 
 	What(),
-	io:format("Completed succesfully~n~n", []),
+	io:format("Completed successfully~n~n", []),
 	QuitOnErr andalso gen_util:halt(0)
     catch Err:Reason ->
 	    io:format("Error in ~p ~p~n", [get(current_class),get(current_func)]),
diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl
index 4b33068d8f..4632fdbffe 100644
--- a/lib/wx/api_gen/wx_gen_cpp.erl
+++ b/lib/wx/api_gen/wx_gen_cpp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -19,7 +19,7 @@
 %%%-------------------------------------------------------------------
 %%% File    : wx_gen_cpp.erl
 %%% Author  : Dan Gudmundsson <[email protected]>
-%%% Description : 
+%%% Description :
 %%%
 %%% Created : 19 Feb 2007 by Dan Gudmundsson <[email protected]>
 %%%-------------------------------------------------------------------
@@ -35,7 +35,7 @@
 		   args/3, strip_name/2]).
 -import(wx_gen, [next_id/1]).
 
-gen(Defs) ->   
+gen(Defs) ->
     open_write("../c_src/gen/wxe_derived_dest.h"),
     c_copyright(),
     w("~n/***** This file is generated do not edit ****/~n~n", []),
@@ -49,48 +49,26 @@ gen(Defs) ->
 
     open_write("../c_src/gen/wxe_macros.h"),
     c_copyright(),
-    gen_macros(), 
+    gen_macros(),
     close(),
 
     open_write("../c_src/gen/wxe_init.cpp"),
     c_copyright(),
     build_enums(),
     close(),
-    
+
     build_events(),
     Res.
-	    
+
 gen_derived_dest(Defs) ->
     [gen_derived_dest_2(Class) || Class <- Defs],
-    
-    UglySkipList = ["wxCaret", "wxCalendarDateAttr", 
-		    "wxFileDataObject", "wxTextDataObject", "wxBitmapDataObject"
-		   ],
-
-    ?WTC("gen_derived_dest"),
-    w("void WxeApp::delete_object(void *ptr, wxeRefData *refd) {~n", []),
-    w(" switch(refd->type) {~n", []),
-    Case = fun(#class{name=Class, id=Id, abstract=IsAbs, parent=P}) when P /= "static" ->
-		   UglyWorkaround = lists:member(Class, UglySkipList),
-		   case hd(reverse(wx_gen_erl:parents(Class))) of
-		       root when IsAbs == false, UglyWorkaround == false ->
-			   w("  case ~p: delete (~s *) ptr; break;~n", [Id, Class]);
-		       root when IsAbs == false, UglyWorkaround == true ->
-			   w("  case ~p: /* delete (~s *) ptr;"
-			     "These objects must be deleted by owner object */ "
-			     "break;~n", [Id, Class]);
-		       _ -> ok
-		   end;
-	      (_) -> ok
-	   end,
-    [Case(Class) || Class <- Defs],
-    w("  default: delete (wxObject *) ptr;~n", []),
-    w("}}~n~n", []).
+    ok.
 
 gen_derived_dest_2(C=#class{name=Class}) ->
-    case is_derived(C) of
-	true -> 
-	    ?WTC("gen_derived_dest_2"),
+    ?WTC("gen_derived_dest_2"),
+    Derived = is_derived(C),
+    TaylorMade = taylormade_class(C),
+    if Derived andalso (TaylorMade =:= false) ->
 	    w("class E~s : public ~s {~n",[Class,Class]),
 	    case Class of
 		"wxGLCanvas" ->  %% Special for cleaning up gl context
@@ -101,15 +79,32 @@ gen_derived_dest_2(C=#class{name=Class}) ->
 	    end,
 	    gen_constructors(C),
 	    w("};~n~n", []);
-	false ->
+       TaylorMade /= false ->
+	    w("~s~n", [TaylorMade]);
+       true ->
 	    ignore
     end.
 
+taylormade_class(#class{name=CName, methods=Ms}) ->
+    TaylorMade = lists:any(fun([#method{where=taylormade}|_]) -> true;
+			      (_) -> false
+			   end, Ms),
+    case TaylorMade  of
+	false -> false;
+	true ->
+	    {ok, Bin} = file:read_file(filename:join([wx_extra, CName ++".c_src"])),
+	    Src = binary_to_list(Bin),
+	    case gen_util:get_taylor_made(Src, CName ++ "_class") of
+		nomatch ->   false;
+		{match, [Str0]} -> Str0
+	    end
+    end.
+
 gen_constructors(#class{name=Class, methods=Ms0}) ->
     Ms = lists:append(Ms0),
     Cs = lists:filter(fun(#method{method_type=MT}) -> MT =:= constructor end, Ms),
     [gen_constructor(Class, Const) || Const <- Cs].
-    
+
 gen_constructor(_Class, #method{where=merged_c}) -> ok;
 gen_constructor(_Class, #method{where=erl_no_opt}) -> ok;
 gen_constructor(Class, _M=#method{params=Ps}) ->
@@ -119,7 +114,7 @@ gen_constructor(Class, _M=#method{params=Ps}) ->
     HaveMergedType = fun(#param{type={merged,_,_,_,_,_,_}}) -> true; (_) -> false end,
     ?WTC("gen_constructor"),
     case lists:any(HaveMergedType, Ps) of
-	false -> 
+	false ->
 	    w(" E~s(~s) : ~s(~s) {};~n",
 	      [Class,args(Gen1,",",Ps),Class,args(CallA,",",Ps)]);
 	true ->
@@ -141,9 +136,9 @@ gen_type(#type{name=Type, ref=undefined, single=array, mod=Mod},_) ->
     mods(Mod) ++ to_string(Type) ++ " * ";
 gen_type(#type{name=Type, ref=undefined, mod=Mod},_) ->
     mods(Mod) ++ to_string(Type) ++ " ";
-gen_type({merged, _, T1, _,_, _T2,_}, 1) -> 
+gen_type({merged, _, T1, _,_, _T2,_}, 1) ->
     gen_type(T1,error);
-gen_type({merged, _, _T1,_, _, T2,_}, 2) -> 
+gen_type({merged, _, _T1,_, _, T2,_}, 2) ->
     gen_type(T2,error).
 
 gen_funcs(Defs) ->
@@ -168,7 +163,7 @@ gen_funcs(Defs) ->
 %%     w("  case WXE_REMOVE_PORT:~n", []),
 %%     w("   { destroyMemEnv(Ecmd.port); } break;~n", []),
     w("  case DESTROY_OBJECT: {~n"),
-    w("     wxObject *This = (wxObject *) getPtr(bp,memenv); "),   
+    w("     wxObject *This = (wxObject *) getPtr(bp,memenv); "),
     w("     if(This) {"),
     w("       ((WxeApp *) wxTheApp)->clearPtr((void *) This);~n"),
     w("       delete This; }~n  } break;~n"),
@@ -203,16 +198,39 @@ gen_funcs(Defs) ->
     w("    error.addTupleCount(2);~n"),
     w("    error.addTupleCount(3);~n"),
     w("    error.send();~n"),
-    w("}} /* The End */~n"),
+    w("}} /* The End */~n~n~n"),
+
+    UglySkipList = ["wxCaret", "wxCalendarDateAttr",
+		    "wxFileDataObject", "wxTextDataObject", "wxBitmapDataObject"
+		   ],
+
+    w("void WxeApp::delete_object(void *ptr, wxeRefData *refd) {~n", []),
+    w(" switch(refd->type) {~n", []),
+    Case = fun(#class{name=Class, id=Id, abstract=IsAbs, parent=P}) when P /= "static" ->
+		   UglyWorkaround = lists:member(Class, UglySkipList),
+		   case hd(reverse(wx_gen_erl:parents(Class))) of
+		       root when IsAbs == false, UglyWorkaround == false ->
+			   w("  case ~p: delete (~s *) ptr; break;~n", [Id, Class]);
+		       root when IsAbs == false, UglyWorkaround == true ->
+			   w("  case ~p: /* delete (~s *) ptr;"
+			     "These objects must be deleted by owner object */ "
+			     "break;~n", [Id, Class]);
+		       _ -> ok
+		   end;
+	      (_) -> ok
+	   end,
+    [Case(Class) || Class <- Defs],
+    w("  default: delete (wxObject *) ptr;~n", []),
+    w("}}~n~n", []),
     Res.
-		 
+
 gen_class(C=#class{name=Name,methods=Ms,options=Opts}) ->
     put(current_class, Name),
-    NewMs = 
+    NewMs =
 	case lists:member(taylormade, Opts) of
 	    true ->
 		{ok, Bin} = file:read_file(filename:join([wx_extra,Name++".c_src"])),
-        ?WTC("gen_class"),
+		?WTC("gen_class"),
 		w("~s~n", [binary_to_list(Bin)]),
 		Ms;
 	    false ->
@@ -220,13 +238,13 @@ gen_class(C=#class{name=Name,methods=Ms,options=Opts}) ->
 		    {value, {ifdef, What}} ->
 			w("#if ~p~n",[What]),
 			Methods = lists:flatten(Ms),
-			MsR = [gen_method(Name,M) || 
+			MsR = [gen_method(Name,M) ||
 				  M <- lists:keysort(#method.id, Methods)],
 			w("#endif // ~p~n",[What]),
 			MsR;
 		    false ->
 			Methods = lists:flatten(Ms),
-			[gen_method(Name,M) || 
+			[gen_method(Name,M) ||
 			    M <- lists:keysort(#method.id, Methods)]
 		end
 	end,
@@ -234,15 +252,19 @@ gen_class(C=#class{name=Name,methods=Ms,options=Opts}) ->
     C#class{methods=NewMs}.
 
 gen_method(_CName, M=#method{where=erl_no_opt}) ->     M;
-gen_method(CName, M=#method{where=taylormade, name=Name, id=Id}) ->     
+gen_method(CName, M=#method{where=taylormade, name=Name, id=Id}) ->
     {ok, Bin} = file:read_file(filename:join([wx_extra, CName ++".c_src"])),
-    Str0 = binary_to_list(Bin),
+    Src = binary_to_list(Bin),
     %%    io:format("C++ Class ~p ~p~n", [CName, Name]),
-    
-    {match, [Str1]} = re:run(Str0, "<<"++Name++"(.*)"++Name++">>",
-			   [dotall, {capture, all_but_first, list}]),
+    Str = case gen_util:get_taylor_made(Src, Name) of
+	      nomatch ->
+		  {match, [Str0]} = gen_util:get_taylor_made(Src, wx_gen_erl:get_unique_name(Id)),
+		  Str0;
+	      {match, [Str0]} ->
+		  Str0
+	  end,
     ?WTC("gen_method"),
-    w(Str1, [wx_gen_erl:get_unique_name(Id)]),
+    w(Str, [wx_gen_erl:get_unique_name(Id)]),
     M;
 gen_method(CName, M=#method{name=N,params=[Ps],method_type=destructor,id=MethodId}) ->
     case hd(reverse(wx_gen_erl:parents(CName))) of
@@ -253,7 +275,7 @@ gen_method(CName, M=#method{name=N,params=[Ps],method_type=destructor,id=MethodI
 	    w(" if(This) {", []),
 	    w("   ((WxeApp *) wxTheApp)->clearPtr((void *) This);~n", []),
 	    w("   delete This;}~n", []),
-	    free_args(), 
+	    free_args(),
 	    w(" break;~n}~n", []);
 	object ->  %% Use default
 	    ignore
@@ -266,7 +288,7 @@ gen_method(CName,  M=#method{name=N,params=Ps0,type=T,method_type=MT,id=MethodId
     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),
-    Opts = [Opt || Opt = #param{def=Def,in=In,where=Where} <- Ps2, 
+    Opts = [Opt || Opt = #param{def=Def,in=In,where=Where} <- Ps2,
 		   Def =/= none, In =/= false, Where =/= c],
     decode_options(Opts, Align),
     case gen_util:get_hook(c, M#method.pre_hook) of
@@ -292,7 +314,7 @@ declare_variables(T, Ps) ->
 
 declare_var(P = #param{where=erl}) -> P;
 declare_var(P = #param{where=this}) -> P;
-declare_var(P = #param{name=Name,def=Def,type=Type,in=true}) when Def =/= none -> 
+declare_var(P = #param{name=Name,def=Def,type=Type,in=true}) when Def =/= none ->
     declare_type(Name, true, Def, Type),
     P;
 declare_var(P = #param{in=In}) when In =/= false -> P;
@@ -304,7 +326,7 @@ declare_type(N,false,_,#type{name="wxArrayInt"}) ->
     w(" wxArrayInt ~s;~n", [N]);
 declare_type(N,false,_,#type{name="wxArrayString"}) ->
     w(" wxArrayString ~s;~n", [N]);
-declare_type(N,false,_,#type{base=Base,single=true,name=Type,by_val=false,mod=Mod}) 
+declare_type(N,false,_,#type{base=Base,single=true,name=Type,by_val=false,mod=Mod})
   when Base =:= int; Base =:= long; Base =:= float; Base =:= double ->
     w(" ~s~s ~s;~n", [mods(Mod),Type,N]);
 declare_type(N,false,_,#type{base={enum,_},single=true,name=Type,by_val=false,mod=Mod}) ->
@@ -315,7 +337,7 @@ declare_type(N,false,_,#type{name="wxDateTime"}) ->
     w(" wxDateTime ~s;~n", [N]);
 declare_type(N,false,_,#type{name=Type, base=int64, ref=reference}) ->
     w(" ~s ~s;~n", [Type,N]);
-declare_type(N,true,Def,#type{base=Base,single=true,name=Type,by_val=true}) 
+declare_type(N,true,Def,#type{base=Base,single=true,name=Type,by_val=true})
   when Base =:= int; Base =:= long; Base =:= float; Base =:= double; Base =:= bool ->
     w(" ~s ~s=~s;~n", [Type,N,Def]);
 declare_type(N,true,Def,#type{base={comp,_,_},single=true,name=Type,mod=Mod,ref={pointer,1}}) ->
@@ -328,7 +350,7 @@ declare_type(N,true,Def,#type{base={class,_},single=true,name=Type,ref={pointer,
     w(" ~s~s * ~s=~s;~n", [mods(Mod),Type,N,Def]);
 declare_type(N,true,Def,#type{base={class,_},single=true,name=Type,ref=reference,mod=Mod}) ->
     w(" ~s~s * ~s= &~s;~n", [mods(Mod),Type,N,Def]);
-declare_type(N,true,Def,#type{base=Base,single=true,name=Type,by_val=false,ref={pointer,1}}) 
+declare_type(N,true,Def,#type{base=Base,single=true,name=Type,by_val=false,ref={pointer,1}})
   when Base =:= int; Base =:= long; Base =:= float; Base =:= double; Base =:= bool ->
     w(" ~s *~s=~s;~n", [Type,N,Def]);
 declare_type(N,true,Def,#type{single=true,name="wxArtClient"}) ->
@@ -345,7 +367,7 @@ declare_type(N,true,Def,#type{name=Type, ref={pointer,2}}) ->
     %% xxxx
     w(" ~s ** ~s = ~s;~n", [Type,N,Def]);
 declare_type(N,true,Def,#type{name=Type, single=array, ref={pointer,1}}) ->
-    w(" int * ~sLen = 0;~n", [N]),    
+    w(" int * ~sLen = 0;~n", [N]),
     w(" ~s * ~s = ~s;~n", [Type,N,Def]);
 declare_type(N,true,"",#type{name="wxArrayString", single=array, ref=reference}) ->
     w(" wxArrayString ~s;~n", [N]);
@@ -363,12 +385,12 @@ decode_options(Opts, Align) ->
 
 decode_opt(#param{name=Name,type=Type}, N) ->
     w("  case ~p: {bp += 4;~n", [N]),
-    Align = decode_arg(Name,Type,opt,1), 
+    Align = decode_arg(Name,Type,opt,1),
     align(Align, 64),
     w("  } break;~n", []),
     N+1.
 
-decode_arguments(Ps0) -> 
+decode_arguments(Ps0) ->
     lists:mapfoldl(fun decode_arg/2,0,Ps0).
 
 store_free(N) ->
@@ -380,7 +402,7 @@ store_free(N) ->
 free_args() ->
     case get(free_args) of
         undefined -> ignore;
-        List -> 
+        List ->
 	    erase(free_args),
             [w(" driver_free(~s);~n", [Arg]) || Arg <- List]
     end.
@@ -388,7 +410,7 @@ free_args() ->
 decode_arg(P = #param{where=erl},A) -> {P,A};
 decode_arg(P = #param{where=c},A) ->  {P,A};
 decode_arg(P = #param{in=false},A) -> {P,A};
-decode_arg(P = #param{def=Def},A) when Def =/= none -> {P,A}; 
+decode_arg(P = #param{def=Def},A) when Def =/= none -> {P,A};
 decode_arg(P = #param{name=Name,type=Type},A0) ->
     A = decode_arg(Name, Type, arg, A0),
     {P, A}.
@@ -426,22 +448,22 @@ decode_arg(N,#type{base=float,single=true,name=Type},arg,A0) ->
     align(A0,32);
 decode_arg(N,#type{base=double,single=true,name=Type},Arg,A0) ->
     A = align(A0,64),
-    case Arg of 
+    case Arg of
 	arg -> w(" ~s * ~s = (~s *) bp; bp += 8;~n", [Type,N,Type]);
 	opt -> w(" ~s = * (~s *) bp; bp += 8;~n",    [N,Type])
     end,
     A;
 decode_arg(N,#type{base=bool,single=true,name=Type},Arg,A0) ->
-    case Arg of 
+    case Arg of
 	arg -> w(" bool * ~s = (~s *) bp; bp += 4;~n", [N,Type]);
 	opt -> w(" ~s = *(~s *) bp; bp += 4;~n", [N,Type])
     end,
     align(A0,32);
 decode_arg(N,#type{base={enum,Type},single=true},Arg,A0) ->
-    wa(" ~s ", [enum_type(Type)], "~s = *(~s *) bp; bp += 4;;~n",[N, enum_type(Type)], Arg), 
+    wa(" ~s ", [enum_type(Type)], "~s = *(~s *) bp; bp += 4;;~n",[N, enum_type(Type)], Arg),
     align(A0,32);
 decode_arg(N,#type{base={comp,"wxDateTime",List},single=true,name=Type,ref=Ref},Arg,A0) ->
-    Decl = fun({int,Spec}) -> 
+    Decl = fun({int,Spec}) ->
 		   w(" int * ~s~s = (int *) bp; bp += 4;~n", [N,Spec])
 	   end,
     align(A0,32),
@@ -452,15 +474,15 @@ decode_arg(N,#type{base={comp,"wxDateTime",List},single=true,name=Type,ref=Ref},
 	   end,
     case Arg of
 	arg -> w(" ~s ~s = ~s(~s);~n", [Type,N,Type,args(Name, ",", List)]);
-	opt when Ref =:= {pointer,1} -> 
-	    w(" ~sTmp = ~s(~s); ~s = & ~sTmp;~n", 
+	opt when Ref =:= {pointer,1} ->
+	    w(" ~sTmp = ~s(~s); ~s = & ~sTmp;~n",
 	      [N,Type,args(Name, ",", List), N,N]);
 	opt ->
 	    w(" ~s = ~s(~s);~n", [N,Type,args(Name, ",", List)])
     end,
     (A0+length(List)) rem 2;
 decode_arg(N,#type{base={comp,_,List},single=true,name=Type,ref=Ref},Arg,A0) ->
-    Decl = fun({int,Spec}) -> 
+    Decl = fun({int,Spec}) ->
 		   w(" int * ~s~s = (int *) bp; bp += 4;~n", [N,Spec]);
 	      ({double, Spec}) ->
 		   w(" wxDouble * ~s~s = (wxDouble *) bp; bp += 8;~n", [N,Spec])
@@ -473,8 +495,8 @@ decode_arg(N,#type{base={comp,_,List},single=true,name=Type,ref=Ref},Arg,A0) ->
     Name = fun({_,Spec}) -> "*"++N++Spec end,
     case Arg of
 	arg -> w(" ~s ~s = ~s(~s);~n", [Type,N,Type,args(Name, ",", List)]);
-	opt when Ref =:= {pointer,1} -> 
-	    w(" ~sTmp = ~s(~s); ~s = & ~sTmp;~n", 
+	opt when Ref =:= {pointer,1} ->
+	    w(" ~sTmp = ~s(~s); ~s = & ~sTmp;~n",
 	      [N,Type,args(Name, ",", List), N,N]);
 	opt ->
 	    w(" ~s = ~s(~s);~n", [N,Type,args(Name, ",", List)])
@@ -483,7 +505,7 @@ decode_arg(N,#type{base={comp,_,List},single=true,name=Type,ref=Ref},Arg,A0) ->
 	{int, _} ->    (A0+length(List)) rem 2;
 	{double, _} -> 0
     end;
-  
+
 decode_arg(N,#type{name=Class="wxTreeItemId",single=true},Arg,A0) ->
     A = align(A0,64),
     wa(" ~s ",[Class],"~s = wxTreeItemId((void *) *(wxUint64 *) bp); bp += 8;~n",[N],Arg),
@@ -492,7 +514,7 @@ decode_arg(N,#type{name=Class="wxTreeItemIdValue",single=true},Arg,A0) ->
     A = align(A0,64),
     wa(" ~s ",[Class],"~s = (~s) * (wxUint64 *) bp; bp += 8;~n",[N,Class],Arg),
     A;
-decode_arg(N,#type{name="wxChar", single=S},Arg,A0) 
+decode_arg(N,#type{name="wxChar", single=S},Arg,A0)
   when S =/= true ->
     w(" int * ~sLen = (int *) bp; bp += 4;~n", [N]),
     wa(" wxString", []," ~s = wxString(bp, wxConvUTF8);~n", [N],Arg),
@@ -501,7 +523,7 @@ decode_arg(N,#type{name="wxChar", single=S},Arg,A0)
 decode_arg(N,#type{base=string, name="wxFileName"},Arg,A0)  ->
     w(" int * ~sLen = (int *) bp; bp += 4;~n", [N]),
     wa(" wxString", []," ~sStr = wxString(bp, wxConvUTF8);~n", [N],Arg),
-    w(" bp += *~sLen+((8-((~p+ *~sLen) & 7)) & 7);~n", [N,4*((A0+1) rem 2),N]),    
+    w(" bp += *~sLen+((8-((~p+ *~sLen) & 7)) & 7);~n", [N,4*((A0+1) rem 2),N]),
     w(" wxFileName ~s = wxFileName(~sStr);~n",[N,N]),
     0;
 decode_arg(N,#type{base=string},Arg,A0)  ->
@@ -541,7 +563,7 @@ decode_arg(N,#type{name="wxArrayDouble"},arg,A0) ->
 decode_arg(_N,#type{base=eventType},_Arg,A0) ->
 %%     w(" int * ~sLen = (int *) bp; bp += 4;~n", [N]),
 %%     case Arg of
-%% 	arg -> 
+%% 	arg ->
 %% 	    w(" int ~s = wxeEventTypeFromAtom(bp);bp += *~sLen;~n",[N,N]),
 %% 	    w(" char *class_name = bp;~n", []),
 %% 	    w(" wxeCallbackData * Evt_cb = new wxeCallbackData(Ecmd.caller,This,class_name);~n",
@@ -551,7 +573,7 @@ decode_arg(_N,#type{base=eventType},_Arg,A0) ->
 decode_arg(N,#type{name=Type,base=binary,mod=Mod0},Arg,A0) ->
     Mod = mods([M || M <- Mod0]),
     case Arg of
-	arg -> 
+	arg ->
 	    w(" ~s~s * ~s = (~s~s*) Ecmd.bin[~p]->base;~n",
 	      [Mod,Type,N,Mod,Type, next_id(bin_count)]);
 	opt ->
@@ -564,10 +586,10 @@ decode_arg(N,#type{base={term,"wxTreeItemData"},mod=Mod0},Arg,A0) ->
     Type = "wxETreeItemData",
     BinCnt = next_id(bin_count),
     case Arg of
-	arg -> 
+	arg ->
 	    w(" ~s~s * ~s =  new ~s(Ecmd.bin[~p]->size, Ecmd.bin[~p]->base);~n",
 	      [Mod,Type,N,Type,BinCnt,BinCnt]);
-	opt -> 
+	opt ->
 	    w(" ~s = new ~s(Ecmd.bin[~p]->size, Ecmd.bin[~p]->base);~n",
 	      [N,Type,BinCnt,BinCnt])
     end,
@@ -576,10 +598,10 @@ decode_arg(N,#type{name=Type,base={term,_},mod=Mod0},Arg,A0) ->
     Mod = mods([M || M <- Mod0]),
     BinCnt = next_id(bin_count),
     case Arg of
-	arg -> 
+	arg ->
 	    w(" ~s~s * ~s =  new ~s(Ecmd.bin[~p]);~n",
 	      [Mod,Type,N,Type,BinCnt]);
-	opt -> 
+	opt ->
 	    w(" ~s = new ~s(Ecmd.bin[~p]);~n",
 	      [N,Type,BinCnt])
     end,
@@ -588,17 +610,17 @@ decode_arg(N,#type{single=array,base=int},Arg,A0)  ->
     case Arg of
 	arg ->
 	    w(" int * ~sLen = (int *) bp; bp += 4;~n", [N]),
-	    w(" int * ~s = (int *) bp; bp += *~sLen*4+((~p+ *~sLen)%2 )*4;~n", 
+	    w(" int * ~s = (int *) bp; bp += *~sLen*4+((~p+ *~sLen)%2 )*4;~n",
 	      [N,N,(A0+1) rem 2,N]);
-	opt ->	
+	opt ->
 	    w(" ~sLen = (int *) bp; bp += 4;~n", [N]),
-	    w(" ~s = (int *) bp; bp += *~sLen*4+((~p+ *~sLen)%2 )*4;~n", 
+	    w(" ~s = (int *) bp; bp += *~sLen*4+((~p+ *~sLen)%2 )*4;~n",
 	      [N,N,(A0+1) rem 2,N])
     end,
     0;
 decode_arg(N,#type{by_val=true,single=array,base={comp,Class="wxPoint",_}},arg,A0) ->
-    w(" int * ~sLen = (int *) bp; bp += 4;~n", [N]),    
-    w(" ~s *~s;~n",[Class,N]), 
+    w(" int * ~sLen = (int *) bp; bp += 4;~n", [N]),
+    w(" ~s *~s;~n",[Class,N]),
     w(" ~s = (~s *) driver_alloc(sizeof(~s) * *~sLen);~n",[N,Class,Class,N]),
     store_free(N),
     w(" for(int i=0; i < *~sLen; i++) {~n", [N]),
@@ -629,13 +651,13 @@ decode_arg(Name,T, Arg,_A) ->
 align(0, 32) -> 1;
 align(1, 32) -> 0;
 align(0, 64) -> 0;
-align(1, 64) -> 
+align(1, 64) ->
     w(" bp += 4; /* Align */~n"),
     0;
 align(N,Sz) ->
     align(N rem 2, Sz).
 
-call_wx(_N,{constructor,_},#type{base={class,RClass}},Ps) -> 
+call_wx(_N,{constructor,_},#type{base={class,RClass}},Ps) ->
     #class{id=Id} = ClassDef = get({class,RClass}),
     Class = case is_derived(ClassDef) of
 		true ->  "E" ++ RClass;
@@ -648,8 +670,8 @@ call_wx(_N,{constructor,_},#type{base={class,RClass}},Ps) ->
 		    case is_dialog(RClass) of
 			true -> 2;   %% Dialogs must be closed first event before windows
 			false -> 0
-		    end;			
-		false -> 
+		    end;
+		false ->
 		    case hd(reverse(wx_gen_erl:parents(RClass))) of
 			root -> Id;
 			_ -> 1
@@ -682,10 +704,10 @@ call_wx(N,{static,Class},Type,Ps) ->
 return_res(void) -> {"", ""};
 return_res(Type = #type{mod=Mod}) ->
     case lists:member(const, Mod) of
- 	true -> 
-	    {Beg, End} = return_res1(Type), 
+	true ->
+	    {Beg, End} = return_res1(Type),
  	    {"const " ++ Beg, End};
-	_ -> 
+	_ ->
 	    return_res1(Type)
     end.
 
@@ -695,8 +717,8 @@ return_res1(#type{name=Type,ref={pointer,_}}) ->
     {Type ++ " * Result = (" ++ Type ++ "*)", ""};
 return_res1(#type{name=Type,single=true,ref=reference}) ->
     {Type ++ " * Result = &", ""};
-return_res1(#type{name=Type,single=true,by_val=true}) 
-  when is_atom(Type) -> 
+return_res1(#type{name=Type,single=true,by_val=true})
+  when is_atom(Type) ->
     {atom_to_list(Type) ++ " Result = ", ""};
 return_res1(#type{name=Type="wxArrayInt"}) ->
     {Type ++ " Result = ", ""};
@@ -705,19 +727,19 @@ 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!!    
-    case Type of 
+    %% Memory leak !!!!!!   XXXX BUGBUG FIXME or doument!!
+    case Type of
 	"wxImage" ->  ok;
 	"wxFont"  ->  ok;
 	"wxBitmap" -> ok;
 	"wxIcon" ->   ok;
 	"wxGraphics" ++ _ -> ok;
 	_ ->
-	    io:format("~s::~s Building return value of temp ~s~n", 
+	    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," 
+    {Type ++ " * Result = new " ++ Type ++ "(", "); newPtr((void *) Result,"
      ++ "3, memenv);"};
 return_res1(#type{base={enum,_Type},single=true,by_val=true}) ->
     {"int Result = " , ""};
@@ -730,7 +752,7 @@ return_res1(#type{name=Type,single=true,by_val=true}) ->
 
 filter(Ps) ->
     lists:filter(fun filter_arg/1, Ps).
-filter_arg(#param{where=erl}) -> false;	   
+filter_arg(#param{where=erl}) -> false;
 filter_arg(#param{where=this}) -> false;
 filter_arg(#param{}) -> true.
 %%filter_arg(#param{def=Def, in=In}) -> Def =:= none orelse In =:= false.
@@ -739,20 +761,20 @@ filter_arg(#param{}) -> true.
 call_arg(#param{where=c, alt={length,Alt}}) when is_list(Alt) ->
     "*" ++ Alt ++ "Len";
 call_arg(#param{where=c, alt={size,Id}}) when is_integer(Id) ->
-    %% It's a binary 
+    %% 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}}) 
-  when Base =:= int; Base =:= long; Base =:= float; Base =:= double; Base =:= bool -> 
+call_arg(#param{name=N,def=Def,type=#type{name=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;
 	_ ->  N
     end;
 
-call_arg(#param{name=N,type=#type{base={enum,Type}, by_val=true,single=true}}) -> 
+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={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}}) -> 
+call_arg(#param{name=N,type=#type{base=eventType}}) ->
     N ++ ", (wxObjectEventFunction)(wxEventFunction) &WxeApp::handle_evt, Evt_cb, this";
 call_arg(#param{name=N,type=#type{by_val=true, single=_False}}) -> N;
 call_arg(#param{name=N,def=Def,type=#type{by_val=false, ref={pointer,2}}})
@@ -760,20 +782,20 @@ call_arg(#param{name=N,def=Def,type=#type{by_val=false, ref={pointer,2}}})
 call_arg(#param{name=N,type=#type{by_val=false, ref={pointer,2}}}) -> "&" ++ N;
 call_arg(#param{name=N,in=false,type=#type{ref=reference, single=true}}) -> N;
 call_arg(#param{name=N,in=false,type=#type{by_val=false, single=true}}) -> "&" ++ N;
-call_arg(#param{name=N,def=Def,type=#type{base={comp,_,_},ref={pointer,1},single=true}}) 
+call_arg(#param{name=N,def=Def,type=#type{base={comp,_,_},ref={pointer,1},single=true}})
   when Def =:= none ->
     "&" ++N;
 call_arg(#param{name=N,type=#type{by_val=false}}) -> N;
 call_arg(#param{name=N,type={merged,_,#type{base={class,_},single=true,
 					    by_val=ByVal,
-					    ref=Ref},_,_,_,_}}) 
-  when ByVal =:= true; Ref =:= reference -> 
+					    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=void}) when Def =/= none -> Def;
 call_arg(#param{name=N,type=#type{base={ref,_},by_val=true,single=true}}) -> N;
 call_arg(#param{name=N,type={merged,_,_,_,_,_,_}}) -> N.
 
-%% call_arg(#param{name=N,type=#type{base=Tuple,ref=reference}}) 
+%% call_arg(#param{name=N,type=#type{base=Tuple,ref=reference}})
 %%   when is_tuple(Tuple) -> "&" ++ N;
 
 to_string(Type) when is_atom(Type) -> atom_to_list(Type);
@@ -781,19 +803,19 @@ to_string(Type) when is_list(Type) -> Type.
 
 virtual_dest(#class{abstract=true, parent="root"}) -> false;
 virtual_dest(#class{abstract=true, parent="object"}) -> true;
-virtual_dest(#class{abstract=true, parent=Parent}) ->  
+virtual_dest(#class{abstract=true, parent=Parent}) ->
     virtual_dest(get({class,Parent}));
 virtual_dest(#class{methods=Ms, parent=Parent}) ->
     case lists:keysearch(destructor,#method.method_type, lists:append(Ms)) of
 	{value, #method{method_type=destructor, virtual=Virtual}} ->
 	    case Virtual of
-		undefined -> 
+		undefined ->
 		    case get({class,Parent}) of
-			undefined -> 
+			undefined ->
 			    case Parent of
-				"object" -> 
+				"object" ->
 				    true;
-				"root"   -> 
+				"root"   ->
 				    false;
 				_ ->
 				    io:format("Error: ~p~n",[Parent]),
@@ -802,10 +824,10 @@ virtual_dest(#class{methods=Ms, parent=Parent}) ->
 			PClass ->
 			    virtual_dest(PClass)
 		    end;
-		_ -> 
+		_ ->
 		    Virtual
 	    end;
-	false -> 
+	false ->
 	    false
     end.
 
@@ -819,24 +841,24 @@ is_derived(#class{abstract=true}) -> false;
 is_derived(C = #class{}) -> virtual_dest(C).
 
 is_window(Class) ->
-    lists:member("wxWindow", wx_gen_erl:parents(Class)).    
+    lists:member("wxWindow", wx_gen_erl:parents(Class)).
 
 is_dialog(Class) ->
     lists:member("wxDialog", wx_gen_erl:parents(Class)).
-   
+
 build_return_vals(Type,Ps) ->
     HaveType = case Type of  void -> 0; _ -> 1 end,
     NoOut = lists:sum([1 || #param{in=In} <- Ps, In =/= true]) + HaveType,
     OutTupSz = if NoOut > 1 -> NoOut; true -> 0 end,
-    
+
     build_ret_types(Type,Ps),
-    if 
+    if
 	OutTupSz > 1 -> w(" rt.addTupleCount(~p);~n",[OutTupSz]);
 	true -> ignore
-    end,	    
+    end,
     Ps.
 
-build_ret_types(void,Ps) -> 
+build_ret_types(void,Ps) ->
     Calc = fun(#param{name=N,in=False,type=T}, Free) when False =/= true ->
 		   case build_ret(N, False, T) of
 		       ok -> Free;
@@ -845,7 +867,7 @@ build_ret_types(void,Ps) ->
 	      (_, Free) -> Free
 	   end,
     lists:foldl(Calc, [], Ps);
-build_ret_types(Type,Ps) -> 
+build_ret_types(Type,Ps) ->
     Free = case build_ret("Result", out, Type) of
 	       ok -> [];
 	       FreeStr -> [FreeStr]
@@ -854,8 +876,8 @@ build_ret_types(Type,Ps) ->
 		   case build_ret(N, False, T) of
 		       ok -> FreeAcc;
 		       FreeMe -> [FreeMe|FreeAcc]
-		   end;	      
-	      (_, FreeAcc) -> FreeAcc 
+		   end;
+	      (_, FreeAcc) -> FreeAcc
 	   end,
     lists:foldl(Calc, Free, Ps).
 
@@ -898,17 +920,17 @@ build_ret(Name,_,#type{name="wxArrayInt"}) ->
 build_ret(Name,_,#type{base={comp,_,_},single=array}) ->
     w(" for(unsigned int i=0; i < ~s.GetCount(); i++) {~n", [Name]),
     w("  rt.add(~s[i]);~n }~n",[Name]),
-    w(" rt.endList(~s.GetCount());~n",[Name]);    
+    w(" rt.endList(~s.GetCount());~n",[Name]);
 build_ret(Name,_,#type{name=List,single=list,base={class,Class}}) ->
     w(" int i=0;~n"),
     w(" for(~s::const_iterator it = ~s.begin(); it != ~s.end(); ++it) {~n",
       [List, Name, Name]),
     w("   ~s * ~sTmp = *it;~n", [Class,Name]),
     w("   rt.addRef(getRef((void *)~sTmp,memenv), \"~s\"); i++;}~n",[Name,Class]),
-    w(" rt.endList(~s.GetCount());~n",[Name]);    
-    
+    w(" rt.endList(~s.GetCount());~n",[Name]);
+
 build_ret(Name,_,#type{name="wxArrayTreeItemIds"}) ->
-    w(" for(unsigned int i=0; i < ~s.GetCount(); i++) {~n", [Name]),   
+    w(" for(unsigned int i=0; i < ~s.GetCount(); i++) {~n", [Name]),
     w("    rt.add((wxUIntPtr *)~s[i].m_pItem);}~n",[Name]),
     w(" rt.endList(~s.GetCount());~n",[Name]);
 
@@ -923,10 +945,10 @@ build_ret(Name,_,#type{name="wxArrayString", single=array}) ->
     w(" rt.add(~s);~n", [Name]);
 build_ret(Name,In,T) ->
     ?error({nyi, Name,In, T}).
-		 
+
 mods([const|R]) -> "const " ++ mods(R);
 mods([unsigned|R]) -> "unsigned " ++ mods(R);
-mods([]) -> "".   
+mods([]) -> "".
 
 build_enums() ->
     Tree = get(consts),
@@ -935,13 +957,13 @@ build_enums() ->
     w("#include \"../wxe_impl.h\"~n"),
     w("#include \"wxe_macros.h\"~n"),
     w("#include \"../wxe_return.h\"~n"),
-    w("void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) {~n"), 
+    w("void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) {~n"),
     NotConsts = [NC || NC = #const{is_const=false} <- gb_trees:values(Tree)],
     Size = length(NotConsts),
     GVars = get(gvars),
     GSize = length(GVars),
     w("  wxeReturn rt = wxeReturn(WXE_DRV_PORT, caller);~n"),
-    w(" rt.addAtom((char*)\"wx_consts\");~n"),    
+    w(" rt.addAtom((char*)\"wx_consts\");~n"),
     [build_enum(NConst) || NConst <- lists:keysort(#const.val, NotConsts)],
     _Cnt = foldl(fun(Gvar, I) -> build_gvar(Gvar,I) end, 0, lists:sort(GVars)),
     w(" rt.endList(~p);~n", [Size+GSize]),
@@ -968,9 +990,9 @@ build_gvar({Name, Class, _Id}, Cnt) ->
     Cnt+1.
 
 gen_macros() ->
-    w("#include <wx/caret.h>~n"),   %% Arrg wxw forgot?? some files 
-    w("#include <wx/tooltip.h>~n"), 
-    w("#include <wx/gbsizer.h>~n"), 
+    w("#include <wx/caret.h>~n"),   %% Arrg wxw forgot?? some files
+    w("#include <wx/tooltip.h>~n"),
+    w("#include <wx/gbsizer.h>~n"),
     w("#include <wx/splash.h>~n"),
     w("#include <wx/grid.h>~n"),
     w("#include <wx/image.h>~n"),
@@ -995,15 +1017,15 @@ gen_macros() ->
     w("#include <wx/stc/stc.h>~n"),
     w("#include <wx/minifram.h>~n"),
     w("#include <wx/sashwin.h>~n"),
-    w("#include <wx/laywin.h>~n"), 
-    w("#include <wx/graphics.h>~n"), 
-    w("#include <wx/aui/aui.h>~n"), 
-    w("#include <wx/datectrl.h>~n"), 
-    w("#include <wx/filepicker.h>~n"), 
-    w("#include <wx/fontpicker.h>~n"), 
-    w("#include <wx/clrpicker.h>~n"), 
-    w("#include <wx/statline.h>~n"), 
-    w("#include <wx/clipbrd.h>~n"), 
+    w("#include <wx/laywin.h>~n"),
+    w("#include <wx/graphics.h>~n"),
+    w("#include <wx/aui/aui.h>~n"),
+    w("#include <wx/datectrl.h>~n"),
+    w("#include <wx/filepicker.h>~n"),
+    w("#include <wx/fontpicker.h>~n"),
+    w("#include <wx/clrpicker.h>~n"),
+    w("#include <wx/statline.h>~n"),
+    w("#include <wx/clipbrd.h>~n"),
     w("#include <wx/splitter.h>~n"),
     w("#include <wx/choicebk.h>~n"),
     w("#include <wx/toolbook.h>~n"),
@@ -1012,14 +1034,14 @@ gen_macros() ->
     w("#include <wx/html/htmlwin.h>~n"),
     w("#include <wx/html/htmlcell.h>~n"),
     w("#include <wx/filename.h>~n"),
-    
+
     w("~n~n", []),
     w("#ifndef wxICON_DEFAULT_BITMAP_TYPE~n",[]),
     w("  #define wxICON_DEFAULT_BITMAP_TYPE wxBITMAP_TYPE_ICO_RESOURCE~n",[]),
     w("#endif~n", []),
     w("~n~n", []),
 
-    [w("#define ~s_~s ~p~n", [Class,Name,Id]) || 
+    [w("#define ~s_~s ~p~n", [Class,Name,Id]) ||
 	{Class,Name,_,Id} <- wx_gen_erl:get_unique_names()],
     w("~n~n").
 
@@ -1032,29 +1054,29 @@ build_events() ->
     w("#include \"wxe_macros.h\"~n"),
     w("#include \"../wxe_events.h\"~n~n"),
     w("#include \"../wxe_return.h\"~n~n"),
-    
+
     w("wxeEtype::wxeEtype(const char *name, int Id) {eName = name;cID = Id;}~n~n"),
     w("WX_DECLARE_HASH_MAP(int, wxeEtype*, wxIntegerHash, wxIntegerEqual, wxeETmap );~n~n"),
-    
+
     w("wxeETmap etmap;~n~n"),
-    
+
     w(
 "int wxeEventTypeFromAtom(char *etype_atom) {
   wxeETmap::iterator it;
   for(it = etmap.begin(); it != etmap.end(); ++it) {
        wxeEtype * value = it->second;
-       if(strcmp(value->eName, etype_atom) == 0) { 
-	 if(it->first > wxEVT_USER_FIRST) {	   
+       if(strcmp(value->eName, etype_atom) == 0) {
+	 if(it->first > wxEVT_USER_FIRST) {
 	       return it->first - wxEVT_USER_FIRST;
 	    } else {
 	       return it->first;
 	    }
        }
-  }   
-  return -1; 
+  }
+  return -1;
 }
 
-"), 
+"),
 
     Evs0 = [C || {_,C=#class{event=Evs}} <- get(), Evs =/= false],
     Evs = lists:keysort(#class.id, Evs0),
@@ -1067,7 +1089,7 @@ initEventTable(Evs) ->
     w("  struct { ",[]),
     w("int ev_type;  int class_id; const char * ev_name;} event_types[] =~n  {~n",[]),
 
-    lists:foreach(fun(Ev) -> init_event_classes(Ev) end, 
+    lists:foreach(fun(Ev) -> init_event_classes(Ev) end,
 		  [#class{id=0,event=[wxEVT_NULL]}|Evs]),
     w("   {-1, 0, ""}~n  };~n",[]),
     w("  for(int i=0; event_types[i].ev_type != -1; i++) {~n",[]),
@@ -1085,7 +1107,7 @@ initEventTable(Evs) ->
       "     }~n"
       "  }~n", []),
     w("}~n~n").
-    
+
 init_event_classes(#class{event=ETs, id=Id}) ->
     F = fun({Eev, Cev, OtherClass}) ->
 		w("   {~w + wxEVT_USER_FIRST, ~w, ~p},~n",
@@ -1105,7 +1127,7 @@ find_id(OtherClass) ->
     Class = get({class,atom_to_list(OtherClass)}),
     %%{value, Class} = lists:keysearch(atom_to_list(OtherClass), #class.name, All),
     Class#class.id.
-    
+
 encode_events(Evs) ->
     ?WTC("encode_events"),
     w("void wxeEvtListener::forward(wxEvent& event)~n"
@@ -1132,7 +1154,7 @@ encode_events(Evs) ->
       " wxeMemEnv *memenv = app->getMemEnv(port);~n"
       " if(!memenv) return 0;~n~n"
       " wxeReturn rt = wxeReturn(port, cb->listener);~n"),
-    
+
     w("~n rt.addAtom((char*)\"wx\");~n"
       " rt.addInt((int) event->GetId());~n"
       " rt.addRef(getRef((void *)(cb->obj), memenv), cb->class_name);~n"
@@ -1155,15 +1177,15 @@ encode_events(Evs) ->
     w("   app->clearPtr((void *) event);~n"),
     w(" } else {~n"),
     w("   send_res =  rt.send();~n"),
-    w("   if(cb->skip) event->Skip();~n"),  
+    w("   if(cb->skip) event->Skip();~n"),
     w(" };~n"),
     w(" return send_res;~n"),
     w(" }~n").
 
 encode_event(C = #class{name=Class, id=Id, options=Opts}) ->
     ?WTC("encode_event"),
-    case proplists:get_value("mixed_event", Opts) of 
-	undefined -> 
+    case proplists:get_value("mixed_event", Opts) of
+	undefined ->
 	    w("case ~p: {// ~s~n", [Id,Class]),
 	    encode_event2(C),
 	    ok;
@@ -1189,10 +1211,10 @@ encode_event2(Class = #class{name=Name}) ->
 
 build_event_attrs(ClassRec = #class{name=Class}) ->
     Attrs0 = wx_gen_erl:filter_attrs(ClassRec),
-    Rename = 
-	fun(Att = #param{name=Name,prot=public,acc=undefined}, {All,Use}) -> 
+    Rename =
+	fun(Att = #param{name=Name,prot=public,acc=undefined}, {All,Use}) ->
 		{[Att#param{name= "ev->" ++ Name}|All],Use};
-	   (Att = #param{acc=Acc}, {All,_}) -> 
+	   (Att = #param{acc=Acc}, {All,_}) ->
 		{[Att#param{name= "ev->" ++ Acc}|All], true}
 	end,
     case foldr(Rename,{[],false},Attrs0) of
@@ -1202,9 +1224,9 @@ build_event_attrs(ClassRec = #class{name=Class}) ->
 %% 	    Attrs;
 	{Attrs,_} ->
 	    w(" ~s * ev = (~s *) event;~n",[Class,Class]),
-	    FixClass = 
+	    FixClass =
 		fun(P=#param{name=N,acc=Acc,type=#type{single=Single,by_val=ByVal,
-						       base={class,C}}}) 
+						       base={class,C}}})
 		   when Acc =/= undefined ->
 			Var = var_name(N),
 			if Single, ByVal ->
@@ -1215,17 +1237,17 @@ build_event_attrs(ClassRec = #class{name=Class}) ->
 			end,
 			P#param{name=Var};
 		   (P) -> P
-		end, 
+		end,
 	    lists:map(FixClass, Attrs)
     end.
 
-var_name("ev->" ++ Name0) -> 
+var_name("ev->" ++ Name0) ->
     case reverse(Name0) of
 	")(" ++ Name -> reverse(Name);
 	_ -> Name0
     end;
 var_name(Name) -> Name.
-     
+
 enum_name({Class,Type}) ->
     uppercase_all(Class ++ "_" ++ Type);
 enum_name(Type) ->
diff --git a/lib/wx/api_gen/wx_gen_erl.erl b/lib/wx/api_gen/wx_gen_erl.erl
index e1201ab0d4..e882ae87ca 100644
--- a/lib/wx/api_gen/wx_gen_erl.erl
+++ b/lib/wx/api_gen/wx_gen_erl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -19,7 +19,7 @@
 %%%-------------------------------------------------------------------
 %%% File    : wx_gen_erl.erl
 %%% Author  : Dan Gudmundsson <[email protected]>
-%%% Description : 
+%%% Description :
 %%%
 %%% Created : 25 Jan 2007 by Dan Gudmundsson <[email protected]>
 %%%-------------------------------------------------------------------
@@ -32,7 +32,7 @@
 
 -import(lists, [foldl/3,foldr/3,reverse/1, keysearch/3, map/2, filter/2]).
 -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, close/0, erl_copyright/0, w/2,
 		   args/3, args/4, strip_name/2]).
 
 gen(Defs) ->
@@ -42,9 +42,9 @@ gen(Defs) ->
     gen_enums_ints(),
     [gen_class(Class) || Class <- Defs],
     gen_funcnames().
-        
+
 gen_class(Class) ->
-    try 
+    try
 	gen_class1(Class)
     catch throw:skipped ->
 	    Class
@@ -52,10 +52,10 @@ gen_class(Class) ->
 
 gen_class1(C=#class{name=Name,parent="static",methods=Ms,options=_Opts}) ->
     open_write("../src/gen/wx_misc.erl"),
-    put(current_class, Name), 
+    put(current_class, Name),
     erl_copyright(),
     w("", []),
-    w("%% This file is generated DO NOT EDIT~n~n", []),    
+    w("%% This file is generated DO NOT EDIT~n~n", []),
     w("%% @doc See external documentation: "
       "<a href=\"http://www.wxwidgets.org/manuals/stable/wx_miscellany.html\">Misc</a>.\n\n",[]),
 
@@ -67,8 +67,8 @@ 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)]),
-    
-    
+
+
     Gen = fun(M) -> gen_method(Name,M) end,
     NewMs = lists:map(Gen,reverse(Ms)),
     close(),
@@ -79,13 +79,13 @@ gen_class1(C=#class{name=Name,parent=Parent,methods=Ms,options=Opts}) ->
     case Opts of
 	["ignore"] -> throw(skipped);
 	_ -> ok
-    end,    
+    end,
     open_write("../src/gen/"++Name++".erl"),
-    put(current_class, Name), 
+    put(current_class, Name),
     erl_copyright(),
     w("", []),
-    w("%% This file is generated DO NOT EDIT~n~n", []),    
-    
+    w("%% This file is generated DO NOT EDIT~n~n", []),
+
     case lists:member(taylormade, Opts) of
 	true ->
 	    {ok, Bin} = file:read_file(filename:join([wx_extra, Name++".erl"])),
@@ -95,33 +95,33 @@ gen_class1(C=#class{name=Name,parent=Parent,methods=Ms,options=Opts}) ->
 	    w("%% @doc See external documentation: "
 	      "<a href=\"http://www.wxwidgets.org/manuals/stable/wx_~s.html\">~s</a>.\n",
 	      [lowercase_all(Name), Name]),
-	    
+
 	    case C#class.doc of
 		undefined -> ignore;
 		Str -> w("%%~n%% ~s~n~n%%~n", [Str])
 	    end,
-	    
+
 	    case C#class.event of
 		false -> ignore;
 		Evs ->
 		    EvTypes = [event_type_name(Ev) || Ev <- Evs],
 		    EvStr = args(fun(Ev) -> "<em>"++Ev++"</em>" end, ", ", EvTypes),
-		    
+
 		    w("%% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>~n",[]),
 		    w("%% <dd>~s</dd></dl>~n", [EvStr]),
-		    w("%% See also the message variant {@link wxEvtHandler:~s(). #~s{}} event record type.~n", 
+		    w("%% See also the message variant {@link wxEvtHandler:~s(). #~s{}} event record type.~n",
 		      [event_rec_name(Name),event_rec_name(Name)]),
 		    w("%%~n",[]),
 		    ok
 	    end,
-	    
+
 	    Parents = parents(Parent),
 	    case [P || P <- Parents, P =/= root, P =/= object] of
 		[] -> ignore;
-		Ps -> 
+		Ps ->
 		    w("%% <p>This class is derived (and can use functions) from:~n", []),
 		    [w("%% <br />{@link ~s}~n", [P]) || P <- Ps],
-		    w("%% </p>~n",[])		    
+		    w("%% </p>~n",[])
 	    end,
 	    w("%% @type ~s().  An object reference, The representation is internal~n",[Name]),
 	    w("%% and can be changed without notice. It can't be used for comparsion~n", []),
@@ -137,17 +137,17 @@ gen_class1(C=#class{name=Name,parent=Parent,methods=Ms,options=Opts}) ->
 	    Done0 = ["Destroy", "New", "Create", "destroy", "new", "create"],
 	    Done  = gb_sets:from_list(Done0 ++ [M|| #method{name=M} <- lists:append(Ms)]),
 	    {_, InExported} = gen_inherited(Parents, Done, []),
-	    w("-export([~s]).~n~n", [args(fun(EF) -> EF end, ",", 
-					  lists:usort(["parent_class/1"|InExported]), 
+	    w("-export([~s]).~n~n", [args(fun(EF) -> EF end, ",",
+					  lists:usort(["parent_class/1"|InExported]),
 					  60)]),
-    
+
 	    w("%% @hidden~n", []),
 	    parents_check(Parents),
-	    
+
 	    Gen = fun(M) -> gen_method(Name,M) end,
 	    NewMs = lists:map(Gen,reverse(Ms)),
-	    gen_dest(C, Ms),	    
-	    
+	    gen_dest(C, Ms),
+
 	    gen_inherited(Parents, Done, true)
     end,
 
@@ -203,26 +203,26 @@ gen_export(#class{name=Class,abstract=Abs},Ms0) ->
 	[] -> [];
 	[M=#method{where=taylormade}|_] ->
 	    [taylormade_export(Class, M)];
-	Ms -> 
+	Ms ->
 	    GetF = fun(#method{method_type=constructor,where=W,params=Ps}) ->
 			   {Args,Opts} = split_optional(Ps),
-			   OptLen = case Opts of 
-					[] -> 0; 
+			   OptLen = case Opts of
+					[] -> 0;
 					_ when W =:= erl_no_opt -> 0;
-					_ -> 1 
+					_ -> 1
 				    end,
 			   "new/" ++ integer_to_list(length(Args)+OptLen);
 		      (#method{method_type=destructor}) ->
-			   case Abs of 
-			       true -> []; 
+			   case Abs of
+			       true -> [];
 			       _ -> "destroy/1"
 			   end;
 		      (#method{name=N,alias=A,where=W, params=Ps}) ->
 			   {Args,Opts} = split_optional(Ps),
-			   OptLen = case Opts of 
-					[] -> 0; 
+			   OptLen = case Opts of
+					[] -> 0;
 					_ when W =:= erl_no_opt -> 0;
-					_ -> 1 
+					_ -> 1
 				    end,
 			   erl_func_name(N,A) ++ "/" ++ integer_to_list(length(Args) + OptLen)
 		   end,
@@ -235,10 +235,10 @@ gen_method(Class,Ms0) ->
     Res = filter(RemoveC, Ms0),
     case Res of
 	[] -> Ms0;
-	[M=#method{where=taylormade}|_] ->
-	    taylormade_func(Class, M),
+	[#method{where=taylormade}|_] ->
+	    taylormade_func(Class, Res),
 	    Ms0;
-	Ms -> 
+	Ms ->
  	    gen_doc(Class,Ms),
 	    gen_method1(Ms),
 	    Ms0
@@ -279,22 +279,22 @@ gen_method2(M=#method{name=N,alias=A,params=Ps,type=T,method_type=MT,id=MethodId
 	ignore -> skip;
 	_ -> w("  _Result =", [])
     end,
-    
+
     case have_return_vals(T, Ps) of
 	_ when MT =:= constructor ->
 	    w("  wxe_util:construct(~s,~n  <<~s~s>>)", [MId, MArgs,MOpts]);
 	true ->
 	    w("  wxe_util:call(~s,~n  <<~s~s>>)", [MId, MArgs,MOpts]);
-	false -> 
+	false ->
 	    w("  wxe_util:cast(~s,~n  <<~s~s>>)", [MId, MArgs,MOpts])
     end,
     case gen_util:get_hook(erl, M#method.post_hook) of
 	ignore -> skip;
-	Post -> 
+	Post ->
 	    w(",~n  ~s~n", [Post]),
 	    w("  _Result", [])
     end,
-   
+
     erase(current_func),
     M.
 
@@ -306,9 +306,9 @@ gen_dest(#class{name=CName,abstract=Abs}, Ms) ->
 	    case lists:keysearch(destructor,#method.method_type, lists:append(Ms)) of
 		{value, #method{method_type=destructor, id=Id}} ->
 		    case hd(reverse(parents(CName))) of
-			object -> 
+			object ->
 			    gen_dest2(CName, object);
-			root -> 
+			root ->
 			    gen_dest2(CName, Id)
 		    end;
 		false ->
@@ -320,7 +320,7 @@ gen_dest2(Class, Id) ->
     w("%% @spec (This::~s()) -> ok~n", [Class]),
     w("%% @doc Destroys this object, do not use object again~n", []),
     w("destroy(Obj=#wx_ref{type=Type}) ->~n", []),
-    w("  ?CLASS(Type,~s),~n",[Class]), 
+    w("  ?CLASS(Type,~s),~n",[Class]),
     case Id of
 	object ->
 	    w("  wxe_util:destroy(?DESTROY_OBJECT,Obj),~n  ok.~n", []);
@@ -341,14 +341,14 @@ gen_inherited([Parent|Ps], Done0, Exported0) ->
     gen_inherited(Ps, gb_sets:union(Done,Done0), Exported).
 
 gen_inherited_ms([[#method{name=Name,alias=A,params=Ps0,where=W,method_type=MT}|_]|R],
-		 Class,Skip,Done, Exported) 
-  when W =/= merged_c ->    
+		 Class,Skip,Done, Exported)
+  when W =/= merged_c ->
     case gb_sets:is_member(Name,Skip) of
 	false when MT =:= member, Exported =:= true ->
 	    Ps = [patch_param(P,all) || P <- Ps0],
 	    Opts = if W =:= erl_no_opt -> [];
-		      true -> 
-			   [Opt || Opt = #param{def=Def,in=In, where=Where} <- Ps, 
+		      true ->
+			   [Opt || Opt = #param{def=Def,in=In, where=Where} <- Ps,
 				   Def =/= none, In =/= false, Where =/= c]
 		   end,
 	    w("%% @hidden~n", []),
@@ -359,10 +359,10 @@ gen_inherited_ms([[#method{name=Name,alias=A,params=Ps0,where=W,method_type=MT}|
 	    gen_inherited_ms(R,Class, Skip, gb_sets:add(Name,Done), Exported);
 	false when MT =:= member, is_list(Exported) ->
 	    {Args,Opts} = split_optional(Ps0),
-	    OptLen = case Opts of 
-			 [] -> 0; 
+	    OptLen = case Opts of
+			 [] -> 0;
 			 _ when W =:= erl_no_opt -> 0;
-			 _ -> 1 
+			 _ -> 1
 		     end,
 	    Export = erl_func_name(Name,A) ++ "/" ++ integer_to_list(length(Args) + OptLen),
 	    gen_inherited_ms(R,Class,Skip, gb_sets:add(Name,Done), [Export|Exported]);
@@ -374,17 +374,21 @@ gen_inherited_ms([[_|Check]|R],Class,Skip, Done0,Exp) ->
 gen_inherited_ms([[]|R],Class,Skip,Done0,Exp) ->
     gen_inherited_ms(R,Class,Skip,Done0,Exp);
 gen_inherited_ms([], _, _Skip, Done,Exp) -> {Done,Exp}.
-    
+
 
 %%%%%%%%%%%%%%%
 
-taylormade_func(Class, #method{name=Name, id=Id}) ->
+taylormade_func(Class, [#method{name=Name, id=Id}|_]) ->
     {ok, Bin} = file:read_file(filename:join([wx_extra, Class ++".erl"])),
-    Str0 = binary_to_list(Bin),
-    {match, [Str1]} = re:run(Str0, "<<"++Name++"(.*)"++Name++">>",
-			     [dotall, {capture, all_but_first, list}]),
-    
-    w(Str1, ["?" ++ get_unique_name(Id)]),
+    Src = binary_to_list(Bin),
+    Str = case gen_util:get_taylor_made(Src, Name) of
+	      nomatch ->
+		  {match, [Str0]} = gen_util:get_taylor_made(Src, get_unique_name(Id)),
+		  Str0;
+	      {match, [Str0]} ->
+		  Str0
+	  end,
+    w(Str, ["?" ++ get_unique_name(Id)]),
     ok.
 
 taylormade_export(Class, #method{name=Name}) ->
@@ -398,12 +402,12 @@ taylormade_export(Class, #method{name=Name}) ->
 
 arg_type_tests([P|Ps], Mid0) ->
     case arg_type_test(P,"\n",Mid0) of
-	Mid0 -> 
+	Mid0 ->
 	    arg_type_tests(Ps, Mid0);
 	Mid ->  %% Already checked the other args
 	    Mid
     end;
-arg_type_tests([],Mid) -> Mid.        
+arg_type_tests([],Mid) -> Mid.
 
 arg_type_test(#param{where=c}, _, Acc) ->
     Acc;
@@ -412,7 +416,7 @@ arg_type_test(#param{name=Name0,in=In,type=#type{base={class,T},single=true},def
     Name = erl_arg_name(Name0),
     w("  ?CLASS(~sT,~s),~s", [Name,T,EOS]),
     Acc;
-arg_type_test(#param{name=Name0,in=In,type=#type{base={class,T}}, def=none},EOS,Acc) 
+arg_type_test(#param{name=Name0,in=In,type=#type{base={class,T}}, def=none},EOS,Acc)
   when In =/= false ->
     Name = erl_arg_name(Name0),
     w("  [?CLASS(~sT,~s) || #wx_ref{type=~sT} <- ~s],~s", [Name,T,Name,Name,EOS]),
@@ -420,35 +424,35 @@ arg_type_test(#param{name=Name0,in=In,type=#type{base={class,T}}, def=none},EOS,
 arg_type_test(#param{name=Name0,def=none,in=In,
 		     type={merged,
 			   M1, #type{base={class,T1},single=true},Ps1,
-			   M2, #type{base={class,T2},single=true},Ps2}}, EOS, _Acc) 
+			   M2, #type{base={class,T2},single=true},Ps2}}, EOS, _Acc)
   when In =/= false ->
     Name = erl_arg_name(Name0),
     Opname = Name++"OP",
     w("  ~s = case ?CLASS_T(~sT,~s) of~n     true ->\n       ", [Opname,Name,T1]),
-    lists:foreach(fun(Param) -> arg_type_test(Param,"\n       ", ignore) end, 
+    lists:foreach(fun(Param) -> arg_type_test(Param,"\n       ", ignore) end,
 		  element(1,split_optional(Ps1))),
     w("?~s;~n",[get_unique_name(M1)]),
     w("     _ -> ?CLASS(~sT,~s),\n       ",[Name,T2]),
     {Ps21,_} = split_optional(patchArgName(Ps2,Ps1)),
-    lists:foreach(fun(Param) -> arg_type_test(Param,"\n       ", ignore) end, 
+    lists:foreach(fun(Param) -> arg_type_test(Param,"\n       ", ignore) end,
 		  Ps21),
     w("?~s\n     end,~s",[get_unique_name(M2),EOS]),
     Opname;
-arg_type_test(#param{name=Name0, type=#type{base=eventType}}, EOS, Acc) -> 
+arg_type_test(#param{name=Name0, type=#type{base=eventType}}, EOS, Acc) ->
     Name = erl_arg_name(Name0),
     w("  ~sBin = list_to_binary([atom_to_list(~s)|[0]]),~s", [Name,Name,EOS]),
     w("  ThisTypeBin = list_to_binary([atom_to_list(ThisT)|[0]]),~s", [EOS]),
     Acc;
-arg_type_test(#param{name=Name0,def=none,type=#type{base={term,_}}}, EOS, Acc) -> 
+arg_type_test(#param{name=Name0,def=none,type=#type{base={term,_}}}, EOS, Acc) ->
     Name = erl_arg_name(Name0),
     w("  wxe_util:send_bin(term_to_binary(~s)),~s", [Name,EOS]),
     Acc;
-arg_type_test(#param{name=Name0,type=#type{base=binary}},EOS,Acc) -> 
+arg_type_test(#param{name=Name0,type=#type{base=binary}},EOS,Acc) ->
     Name = erl_arg_name(Name0),
     w("  wxe_util:send_bin(~s),~s", [Name,EOS]),
     Acc;
-arg_type_test(#param{name=Name0,type=#type{name=Type,base=Base,single=Single}},EOS,Acc) -> 
-    if 
+arg_type_test(#param{name=Name0,type=#type{name=Type,base=Base,single=Single}},EOS,Acc) ->
+    if
 	Type =:= "wxArtClient", Single =:= true ->
 	    Name = erl_arg_name(Name0),
 	    w("  ~s_UC = unicode:characters_to_binary([~s, $_, $C,0]),~s",
@@ -458,11 +462,11 @@ arg_type_test(#param{name=Name0,type=#type{name=Type,base=Base,single=Single}},E
 	    w("  ~s_UC = unicode:characters_to_binary([~s,0]),~s", [Name,Name,EOS]);
 	Type =:= "wxArrayString" ->
 	    Name = erl_arg_name(Name0),
-	    w("  ~s_UCA = [unicode:characters_to_binary([~sTemp,0]) || ~s", 
+	    w("  ~s_UCA = [unicode:characters_to_binary([~sTemp,0]) || ~s",
 	      [Name,Name, EOS]),
 	    w("              ~sTemp <- ~s],~s", [Name,Name,EOS]);
 	true -> %% Not a string
-	    ignore 
+	    ignore
     end,
     Acc;
 arg_type_test(_,_,Acc) -> Acc.
@@ -476,10 +480,10 @@ have_return_vals(void, Ps) ->
 have_return_vals(#type{}, _) -> true.
 
 gen_function_clause(Name0,MT,Ps,Optional,Variant) ->
-    PArg = fun(Arg) -> 
+    PArg = fun(Arg) ->
 		   case lists:member(name_only, Variant) of
 		       true -> func_arg_name(Arg);
-		       false -> 
+		       false ->
 			   case lists:member(name_type, Variant) of
 			       true ->
 				   Name = func_arg_name(Arg),
@@ -495,17 +499,17 @@ gen_function_clause(Name0,MT,Ps,Optional,Variant) ->
     Args = args(PArg, ",", Ps),
     Name = case MT of constructor -> "new"; _ -> Name0 end,
     w("~s(~s",[Name,Args]),
-    Opts = case Optional of 
+    Opts = case Optional of
 	       [] -> "";
 	       empty_list when Args =:= [] -> "[]";
 	       empty_list -> ", []";
 	       _ when Args =:= [] -> "Options";
-	       _ -> ", Options" 
+	       _ -> ", Options"
 	   end,
     w("~s)", [Opts]),
     case lists:member(no_guards, Variant) of
 	true ->  ok;
-	false -> 
+	false ->
 	    Guards = args(fun guard_test/1, ",", Ps),
 	    if
 		Guards =:= [], Opts =:= "" -> w(" ->~n", []);
@@ -517,10 +521,10 @@ gen_function_clause(Name0,MT,Ps,Optional,Variant) ->
 
 split_optional(Ps) ->
     split_optional(Ps, [], []).
-split_optional([P=#param{def=Def,in=In, where=Where}|Ps], Standard, Opts) 
+split_optional([P=#param{def=Def,in=In, where=Where}|Ps], Standard, Opts)
   when Def =/= none, In =/= false, Where =/= c ->
     split_optional(Ps, Standard, [P|Opts]);
-split_optional([P=#param{def=Def,in=In, where=Where}|Ps], Standard, Opts) 
+split_optional([P=#param{def=Def,in=In, where=Where}|Ps], Standard, Opts)
   when Def =:= none, In =/= false, Where =/= c ->
     split_optional(Ps, [P|Standard], Opts);
 split_optional([_|Ps], Standard, Opts) ->
@@ -532,24 +536,24 @@ patch_param(P=#param{type=#type{base=Tuple}}, all) when is_tuple(Tuple) ->
     P#param{type={class,ignore}};
 patch_param(P=#param{type={merged,_,_,_,_,_,_}}, _) ->
     P#param{type={class,ignore}};
-patch_param(P=#param{type=#type{base={class,_}}},_) -> 
+patch_param(P=#param{type=#type{base={class,_}}},_) ->
     P#param{type={class,ignore}};
-patch_param(P=#param{type=#type{base={ref,_}}},_) -> 
+patch_param(P=#param{type=#type{base={ref,_}}},_) ->
     P#param{type={class,ignore}};
 patch_param(P,_) -> P.
 
 func_arg_name(#param{def=Def}) when Def =/= none -> skip;
 func_arg_name(#param{in=false}) -> skip;
 func_arg_name(#param{where=c}) -> skip;
-func_arg_name(#param{name=Name}) -> 
+func_arg_name(#param{name=Name}) ->
     erl_arg_name(Name).
 
 func_arg(#param{def=Def}) when Def =/= none -> skip;
 func_arg(#param{in=false}) -> skip;
 func_arg(#param{where=c}) -> skip;
-func_arg(#param{name=Name,type=#type{base=string}}) -> 
+func_arg(#param{name=Name,type=#type{base=string}}) ->
     erl_arg_name(Name);
-func_arg(#param{name=Name,type=#type{name="wxArrayString"}}) -> 
+func_arg(#param{name=Name,type=#type{name="wxArrayString"}}) ->
     erl_arg_name(Name);
 func_arg(#param{name=Name0,type=#type{base={class,_CN}, single=true}}) ->
     Name = erl_arg_name(Name0),
@@ -570,7 +574,7 @@ func_arg(#param{name=Name,type=#type{base={comp,"wxDateTime",_Tup}, single=true}
 func_arg(#param{name=Name,type=#type{name="wxArtClient", single=true}}) ->
     erl_arg_name(Name);
 func_arg(#param{name=Name,type=#type{base={comp,_,Tup}, single=true}}) ->
-    N = erl_arg_name(Name),    
+    N = erl_arg_name(Name),
     Doc = fun({_,V}) -> erl_arg_name(N)++V end,
     "{" ++ args(Doc, ",", Tup) ++ "}";
 func_arg(#param{name=Name}) ->
@@ -587,7 +591,7 @@ guard_test(#param{name=N, type=#type{name="wxArtClient"}}) ->
     "is_list(" ++ erl_arg_name(N) ++")";
 guard_test(#param{name=N, type=#type{name="wxArrayString"}}) ->
     "is_list(" ++ erl_arg_name(N) ++")";
-guard_test(#param{name=Name,type=#type{single=Single}}) 
+guard_test(#param{name=Name,type=#type{single=Single}})
   when Single =/= true->
     "is_list(" ++ erl_arg_name(Name) ++  ")";
 guard_test(#param{name=N,type=#type{base=int}}) ->
@@ -637,42 +641,42 @@ gen_doc(_Class,[#method{name=N,alias=A,params=Ps,type=T,where=erl_no_opt,method_
     gen_function_clause(erl_func_name(N,A),MT,Ps,empty_list,[no_guards,name_only]);
 gen_doc(Class,[#method{name=N,params=Ps,type=T}])->
     {_, Optional} = split_optional(Ps),
-    NonDef = [Arg || Arg = #param{def=Def,in=In, where=Where} <- Ps, 
+    NonDef = [Arg || Arg = #param{def=Def,in=In, where=Where} <- Ps,
 		     Def =:= none, In =/= false, Where =/= c],
     OptsType = case Optional of
 		   [] -> "";
 		   _ when NonDef =:= [] -> "[Option]";
-		   _ -> ", [Option]"	       
+		   _ -> ", [Option]"
 	       end,
     w("%% @spec (~s~s) -> ~s~n",
       [doc_arg_types(Ps),OptsType,doc_return_types(T,Ps)]),
     doc_optional(Optional, normal),
-    DocEnum = doc_enum(T,Ps, normal),   
+    DocEnum = doc_enum(T,Ps, normal),
     case Class of
 	"utils" ->
 	    w("%% @doc See <a href=\"http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#~s\">"
-	      "external documentation</a>.~n", 
+	      "external documentation</a>.~n",
 	      [lowercase_all(N)]);
 	_ ->
 	    w("%% @doc See <a href=\"http://www.wxwidgets.org/manuals/stable/wx_~s.html#~s~s\">"
-	      "external documentation</a>.~n", 
+	      "external documentation</a>.~n",
 	      [lowercase_all(Class),lowercase_all(Class),lowercase_all(N)])
     end,
     doc_enum_desc(DocEnum);
 gen_doc(Class, Cs = [#method{name=N, alias=A,method_type=MT}|_]) ->
-    GetRet  = fun(#method{params=Ps,type=T}) -> 
+    GetRet  = fun(#method{params=Ps,type=T}) ->
 		      doc_return_types(T,Ps)
 	      end,
-    GetArgs = fun(#method{params=Ps, where=Where}) -> 
+    GetArgs = fun(#method{params=Ps, where=Where}) ->
 		      Opt = case Where of
 				erl_no_opt -> [];
-				_ -> 
+				_ ->
 				    case split_optional(Ps) of
 					{_, []} -> [];
 					_ ->  ["[Option]"]
 				    end
 			    end,
-		      [doc_arg_type(P) || 
+		      [doc_arg_type(P) ||
 			  P=#param{in=In,def=none,where=W} <- Ps,
 			  In =/= false, W =/= c] ++ Opt
 	      end,
@@ -682,16 +686,16 @@ gen_doc(Class, Cs = [#method{name=N, alias=A,method_type=MT}|_]) ->
     case Class of
 	"utils" ->
 	    w("%% @doc See <a href=\"http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#~s\">"
-	      "external documentation</a>.~n", 
+	      "external documentation</a>.~n",
 	      [lowercase_all(N)]);
 	_ ->
 	    w("%% @doc See <a href=\"http://www.wxwidgets.org/manuals/stable/wx_~s.html#~s~s\">"
-	      "external documentation</a>.~n", 
+	      "external documentation</a>.~n",
 	      [lowercase_all(Class),lowercase_all(Class),lowercase_all(N)])
     end,
     Name = case MT of constructor -> "new"; _ -> erl_func_name(N,A) end,
     w("%% <br /> Alternatives:~n",[]),
-    [gen_doc2(Name, Clause) || Clause <- Cs], 
+    [gen_doc2(Name, Clause) || Clause <- Cs],
     ok.
 
 gen_doc2(Name,#method{params=Ps,where=erl_no_opt,method_type=MT}) ->
@@ -704,11 +708,11 @@ gen_doc2(Name,#method{params=Ps,type=T}) ->
     OptsType = case Optional of
 		   [] -> "";
 		   _ when NonDef =:= [] -> "[Option]";
-		   _ -> ", [Option]"	       
+		   _ -> ", [Option]"
 	       end,
     w("%% <p><c>~n",[]),
     w("%% ~s(~s~s) -> ~s </c>~n",
-      [Name,doc_arg_types(Ps),OptsType,doc_return_types(T,Ps)]),    
+      [Name,doc_arg_types(Ps),OptsType,doc_return_types(T,Ps)]),
     doc_optional(Optional, xhtml),
     DocEnum = doc_enum(T,Ps, xhtml),
     doc_enum_desc(DocEnum),
@@ -717,7 +721,7 @@ gen_doc2(Name,#method{params=Ps,type=T}) ->
 doc_arg(ArgList) ->
     case all_eq(ArgList) of
 	true ->  hd(ArgList);
-	false -> 
+	false ->
 	    Get = fun(Str) ->
 			  [_Name|Types] = string:tokens(Str, ":"),
 			  case Types of
@@ -734,12 +738,12 @@ doc_arg(ArgList) ->
 doc_ret(ArgList) ->
     case all_eq(ArgList) of
 	true ->  hd(ArgList);
-	false -> 
+	false ->
 	    args(fun(A) -> A end, "|", ArgList)
     end.
 
 unique([], U) -> reverse(U);
-unique([H|R], U) -> 
+unique([H|R], U) ->
     case lists:member(H,U) of
 	false -> unique(R,[H|U]);
 	true  -> unique(R,U)
@@ -756,7 +760,7 @@ zip(List) ->
 
 zip([[F|L1]|List], Rest, AccL, Acc) ->
     zip(List, [L1|Rest], [F|AccL], Acc);
-zip(Empty, Rest, AccL, Acc) -> 
+zip(Empty, Rest, AccL, Acc) ->
     true = empty(Empty),
     case empty(Rest) andalso empty(AccL) of
 	true -> reverse(Acc);
@@ -779,7 +783,7 @@ doc_arg_type(_) -> skip.
 
 doc_arg_type2(T=#type{single=Single}) when Single =:= array; Single =:= list ->
     "[" ++ doc_arg_type3(T) ++ "]";
-doc_arg_type2(T) -> 
+doc_arg_type2(T) ->
     doc_arg_type3(T).
 
 doc_arg_type3(#type{base=string}) -> "string()";
@@ -799,8 +803,8 @@ doc_arg_type3(#type{base={binary,_}}) -> "binary()";
 doc_arg_type3(#type{base=eventType}) ->  "atom()";
 doc_arg_type3(#type{base={ref,N}}) ->     N++"()";
 doc_arg_type3(#type{base={term,_N}}) ->  "term()";
-doc_arg_type3(T=#type{base={class,N}}) -> 
-    check_class(T),   
+doc_arg_type3(T=#type{base={class,N}}) ->
+    check_class(T),
     case get(current_class) of
 	N -> N ++ "()";
 	_ ->  N++":" ++ N++"()"
@@ -809,7 +813,7 @@ doc_arg_type3({merged,_,T1=#type{base={class,N1}},_,_,T2=#type{base={class,N2}},
     check_class(T1),
     check_class(T2),
     Curr = get(current_class),
-    if 
+    if
 	N1 =:= Curr, N2 =:= Curr ->  N1++"() | "++ N2++"()";
 	N1 =:= Curr -> N1++"() | "++ N2++":" ++ N2++"()";
 	N2 =:= Curr -> N1++":" ++ N1++"() | "++ N2++"()";
@@ -824,7 +828,7 @@ doc_arg_type3(#type{base={comp,_,{record,Name}}}) ->
     "wx:" ++ atom_to_list(Name) ++ "()";
 doc_arg_type3(#type{base={comp,_,Tup}}) ->
     Doc = fun({int,V}) -> V ++ "::integer()";
-	     ({double,V}) -> V ++ "::float()" 
+	     ({double,V}) -> V ++ "::float()"
 	  end,
     "{" ++ args(Doc, ",", Tup) ++ "}";
 doc_arg_type3(T) -> ?error({unknown_type,T}).
@@ -834,7 +838,7 @@ doc_return_types(T, Ps) ->
 doc_return_types2(void, []) ->    "ok";
 doc_return_types2(void, [#param{type=T}]) ->     doc_arg_type2(T);
 doc_return_types2(T, []) ->                      doc_arg_type2(T);
-doc_return_types2(void, Ps) -> 
+doc_return_types2(void, Ps) ->
     "{" ++ args(fun doc_arg_type/1,",",Ps) ++ "}";
 doc_return_types2(T, Ps) ->
     "{" ++ doc_arg_type2(T) ++ "," ++ args(fun doc_arg_type/1,",",Ps) ++ "}".
@@ -887,7 +891,7 @@ check_name(Name) -> Name.
 
 marshal_opts([], _,_) -> "";     %% No opts skip this!
 marshal_opts(Opts, Align, Args) ->
-    w("  MOpts = fun", []), 
+    w("  MOpts = fun", []),
     marshal_opts1(Opts,1),
     w(";~n          (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,~n", []),
     w("  BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),~n", []),
@@ -896,7 +900,7 @@ marshal_opts(Opts, Align, Args) ->
 	[] -> Str;   % All Args are optional
 	_ ->    ", " ++ Str
     end.
-    
+
 marshal_opts1([P],N) ->
     marshal_opt(P,N);
 marshal_opts1([P|R],N) ->
@@ -909,15 +913,15 @@ marshal_opt(P0=#param{name=Name,type=Type},N) ->
     {Arg,Align} = marshal_arg(Type,erl_arg_name(Name),1),
     AStr = if Align =:= 0 -> "";
 	      Align =:= 1 -> ",0:32"
-	   end,	
-    w("({~s, ~s}, Acc) -> ", [erl_option_name(Name), func_arg(P)]), 
+	   end,
+    w("({~s, ~s}, Acc) -> ", [erl_option_name(Name), func_arg(P)]),
     arg_type_test(P,"",[]),
     case Arg of
-	skip -> 
+	skip ->
 	    w("[<<~p:32/?UI~s>>|Acc]", [N, AStr]);
-	_ -> 
+	_ ->
 	    w("[<<~p:32/?UI,~s~s>>|Acc]", [N, Arg,AStr])
-    end.   
+    end.
 marshal_args(Ps) ->
     marshal_args(Ps, [], 0).
 
@@ -957,23 +961,23 @@ marshal_arg(#type{single=true,base={enum,_Enum}}, Name, Align) ->
 
 marshal_arg(#type{single=true,base=bool}, Name, Align) ->
     align(32, Align, "(wxe_util:from_bool(" ++ Name ++ ")):32/?UI");
-marshal_arg(#type{name="wxChar", single=Single}, Name, Align0)  
+marshal_arg(#type{name="wxChar", single=Single}, Name, Align0)
   when Single =/= true ->
-    {Str,Align} = 
+    {Str,Align} =
 	align(32,Align0, "(byte_size("++Name++"_UC)):32/?UI,(" ++ Name ++ "_UC)/binary"),
     MsgSize = "(" ++ integer_to_list(Align*4)++"+byte_size("++Name++"_UC))",
     {Str++", 0:(((8- (" ++ MsgSize ++" band 16#7)) band 16#7))/unit:8",0};
 marshal_arg(#type{base=string}, Name, Align0) ->
-    {Str,Align} = 
+    {Str,Align} =
 	align(32,Align0, "(byte_size("++Name++"_UC)):32/?UI,(" ++ Name ++ "_UC)/binary"),
     MsgSize = "(" ++ integer_to_list(Align*4)++"+byte_size("++Name++"_UC))",
     {Str++", 0:(((8- (" ++ MsgSize ++" band 16#7)) band 16#7))/unit:8",0};
 marshal_arg(#type{name="wxArrayString"}, Name, Align0) ->
-    InnerBin  = "<<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>", 
+    InnerBin  = "<<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>",
     Outer =  "(<< " ++ InnerBin ++ "|| UC_Str <- "++ Name ++"_UCA>>)/binary",
     Str0  =  "(length("++Name++"_UCA)):32/?UI, " ++ Outer,
     {Str,Align} = align(32,Align0,Str0),
-    MsgSize = "("++integer_to_list(Align*4) ++ 
+    MsgSize = "("++integer_to_list(Align*4) ++
 	" + lists:sum([byte_size(S)+4||S<-" ++ Name ++"_UCA]))",
     AStr = ", 0:(((8- (" ++ MsgSize ++" band 16#7)) band 16#7))/unit:8",
     {Str ++ AStr, 0};
@@ -997,15 +1001,15 @@ marshal_arg(#type{base={term,_}}, _Name, Align0) ->
     {skip,Align0};
 marshal_arg(#type{base=binary}, _Name, Align0) ->
     {skip,Align0};
-marshal_arg(#type{base=Base, single=Single}, Name, Align0) 
+marshal_arg(#type{base=Base, single=Single}, Name, Align0)
   when Single =/= true ->
-    case Base of 
-	int -> 
+    case Base of
+	int ->
 	    Str0 = "(length("++Name++")):32/?UI,\n"
 		"        (<< <<C:32/?I>> || C <- "++Name++">>)/binary",
 	    {Str,Align} = align(32,Align0, Str0),
 	    {Str ++ ", 0:((("++integer_to_list(Align)++"+length("++Name++ ")) rem 2)*32)", 0};
-	{ObjRef,_} when ObjRef =:= class; ObjRef =:= ref -> 
+	{ObjRef,_} when ObjRef =:= class; ObjRef =:= ref ->
 	    Str0 = "(length("++Name++")):32/?UI,",
 	    Str1 = "\n     (<< <<(C#wx_ref.ref):32/?UI>> || C <- "++Name++">>)/binary",
 	    {Str2,Align} = align(32, Align0, Str1),
@@ -1033,7 +1037,7 @@ align(64, 0, Str) -> {Str, 0};
 align(64, 1, Str) -> {"0:32," ++ Str,0};
 align(Sz, W, Str) -> align(Sz, W rem 2, Str).
 
-enum_name(Name) -> 
+enum_name(Name) ->
     case string:tokens(Name, ":") of
 	[Name] -> Name;
 	[C,N] ->  C ++ "_" ++ N
@@ -1053,10 +1057,10 @@ gen_enums_ints() ->
       "        }).~n", []),
     w("~n%% Hardcoded Defines~n", []),
     Enums = [E || {{enum,_},E = #enum{as_atom=false}} <- get()],
-    w("-define(wxDefaultSize, {-1,-1}).~n", []), 
-    w("-define(wxDefaultPosition, {-1,-1}).~n", []), 
+    w("-define(wxDefaultSize, {-1,-1}).~n", []),
+    w("-define(wxDefaultPosition, {-1,-1}).~n", []),
     w("~n%% Global Variables~n", []),
-    [w("-define(~s,  wxe_util:get_const(~s)).~n", [Gvar, Gvar]) || 
+    [w("-define(~s,  wxe_util:get_const(~s)).~n", [Gvar, Gvar]) ||
 	{Gvar,_,_Id} <- get(gvars)],
     w("~n%% Enum and defines~n", []),
     foldl(fun(Enum= #enum{vals=Vals}, Done) when Vals =/= [] ->
@@ -1076,7 +1080,7 @@ build_enum_ints(#enum{from=From, vals=Vals},Done) ->
 	{_File, Class, Name} ->
 	    w("% From class ~s::~s~n",[Class, Name])
     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_integer(Value) ->
@@ -1100,12 +1104,12 @@ build_enum_ints(#enum{from=From, vals=Vals},Done) ->
     Consts = get(consts),
     Write = fun({Name,_What}, Skip) ->
 		    case gb_sets:is_member(Name,Skip) of
-			true -> 
+			true ->
 			    Skip;
 			false ->
 			    case gb_trees:lookup(Name, Consts) of
 				{value, Const} ->
-				    Format(Const), 
+				    Format(Const),
 				    gb_sets:add(Name,Skip);
 				none -> Skip
 			    end
@@ -1119,8 +1123,8 @@ gen_event_recs() ->
     w("", []),
     w("%% This file is generated DO NOT EDIT~n~n", []),
     w("%%  All event messages are encapsulated in a wx record~n"
-      "%%  they contain the widget id and a specialized event record.~n" 
-      "%%  Each event record may be sent for one or more event types.~n" 
+      "%%  they contain the widget id and a specialized event record.~n"
+      "%%  Each event record may be sent for one or more event types.~n"
       "%%  The mapping to wxWidgets is one record per class.~n~n",[]),
     w("%% @type wx() = #wx{id=integer(), obj=wx:wxObject(), userData=term(), event=Rec}. Rec is a event record.~n",[]),
     w("-record(wx, {id,     %% Integer Identity of object.~n"
@@ -1130,7 +1134,7 @@ gen_event_recs() ->
     w("%% Here comes the definitions of all event records.~n"
       "%% they contain the event type and possible some extra information.~n~n",[]),
     Types = [build_event_rec(C) || {_,C=#class{event=Evs}} <- get(), Evs =/= false],
-    w("%% @type wxEventType() = ~s.~n", 
+    w("%% @type wxEventType() = ~s.~n",
       [args(fun(Ev) -> Ev end, " | ", lists:sort(lists:append(Types)))]),
     %% close(), closed in gen_enums_ints
     ok.
@@ -1145,22 +1149,22 @@ find_inherited_attr(Param = {PName,_}, Name) ->
     end.
 
 filter_attrs(#class{name=Name, parent=Parent,attributes=Attrs}) ->
-    Attr1 = lists:foldl(fun(#param{acc=skip},Acc) -> Acc; 
+    Attr1 = lists:foldl(fun(#param{acc=skip},Acc) -> Acc;
 			   (P=#param{prot=public},Acc) -> [P|Acc];
-			   (#param{acc=undefined},Acc) -> Acc; 
+			   (#param{acc=undefined},Acc) -> Acc;
 			   ({inherited, PName},Acc) ->
 				case find_inherited_attr(PName, Parent) of
-				    undefined -> 
+				    undefined ->
 					io:format("~p:~p: Missing Event Attr ~p in ~p~n",
 						  [?MODULE,?LINE, PName, Name]),
 					Acc;
-				    P -> 
+				    P ->
 					[P|Acc]
 				end;
 			   (P, Acc) -> [P|Acc]
 			end, [], Attrs),
     lists:reverse(Attr1).
-   
+
 build_event_rec(Class=#class{name=Name, event=Evs}) ->
     EvTypes = [event_type_name(Ev) || Ev <- Evs],
     Str  = args(fun(Ev) -> "<em>"++Ev++"</em>" end, ", ", EvTypes),
@@ -1168,26 +1172,26 @@ build_event_rec(Class=#class{name=Name, event=Evs}) ->
     Rec = event_rec_name(Name),
     GetName = fun(#param{name=N}) ->event_attr_name(N) end,
     GetType = fun(#param{name=N,type=T}) ->
-		      event_attr_name(N) ++ "=" ++ doc_arg_type2(T) 
+		      event_attr_name(N) ++ "=" ++ doc_arg_type2(T)
 	      end,
     case Attr =:= [] of
-	true -> 
+	true ->
 	    w("%% @type ~s() = #~s{type=wxEventType()}.~n", [Rec,Rec]),
 	    w("%% <dl><dt>EventType:</dt> <dd>~s</dd></dl>~n",[Str]),
-%% 	    case is_command_event(Name) of 
+%% 	    case is_command_event(Name) of
 %% 		true  -> w("%% This event skips other event handlers.~n",[]);
 %% 		false -> w("%% This event will be handled by other handlers~n",[])
 %% 	    end,
 	    w("%% Callback event: {@link ~s}~n", [Name]),
 	    w("-record(~s, {type}).~n~n", [Rec]);
 	false ->
-	    w("%% @type ~s() = #~s{type=wxEventType(),~s}.~n", 
+	    w("%% @type ~s() = #~s{type=wxEventType(),~s}.~n",
 	      [Rec,Rec,args(GetType,",",Attr)]),
 	    w("%% <dl><dt>EventType:</dt> <dd>~s</dd></dl>~n",[Str]),
-%% 	    case is_command_event(Name) of 
+%% 	    case is_command_event(Name) of
 %% 		true -> w("%% This event skips other event handlers.~n",[]);
 %% 		false -> w("%% This event will be handled by other handlers~n",[])
-%% 	    end,	    
+%% 	    end,
 	    w("%% Callback event: {@link ~s}~n", [Name]),
 	    w("-record(~s,{type, ~s}).~n~n", [Rec,args(GetName,",",Attr)])
     end,
@@ -1198,7 +1202,7 @@ is_command_event(Name) ->
 	true -> true;
 	false -> false
     end.
-	    
+
 event_rec_name(Name0 = "wx" ++ _) ->
     "tnevE" ++ Name1 = reverse(Name0),
     reverse(Name1).
@@ -1215,7 +1219,7 @@ event_attr_name(Attr) ->
     lowercase(Attr).
 
 
-gen_funcnames() -> 
+gen_funcnames() ->
     open_write("../src/gen/wxe_debug.hrl"),
     erl_copyright(),
     w("%% This file is generated DO NOT EDIT~n~n", []),
@@ -1257,7 +1261,7 @@ unique_names(Ms0, Class) ->
     Ms  = split_list(fun(#method{name=N}, M) -> {N =:= M, N} end, undefined, Ms2),
     unique_names2(Ms,Class).
 %% by Names
-unique_names2([[#method{id=Id, name=Method,alias=Alias, max_arity=A}]|Ms], Class) -> 
+unique_names2([[#method{id=Id, name=Method,alias=Alias, max_arity=A}]|Ms], Class) ->
     [{Class,uname(alias(Method,Alias),Class),A,Id} | unique_names2(Ms,Class)];
 unique_names2([Ms0|RMs], Class) ->
     Split = fun(#method{max_arity=A}, P) -> {A =:= P, A} end,
@@ -1278,11 +1282,11 @@ unique_names4([], _, _Class) -> [].
 
 alias(Method, undefined) -> Method;
 alias(_, Alias) -> Alias.
-     
+
 uname(Class,Class) ->   "new";
 uname([$~ | _], _  ) -> "destruct";
 uname(Name, _) -> Name.
-       
+
 split_list(F, Keep, List) ->
     split_list(F, Keep, List, []).
 
@@ -1297,5 +1301,5 @@ split_list(F, Keep, [M|Ms], Acc) ->
     end;
 split_list(_, _, [], []) -> [];
 split_list(_, _, [], Acc) -> [lists:reverse(Acc)].
-   
+
 
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index aec8a4944a..8ee4451057 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -756,7 +756,9 @@
   'SetFirstItem']}.
 
 {class, wxListCtrl, wxControl, [],
- ['wxListCtrl','~wxListCtrl','Arrange','AssignImageList','ClearAll','Create',
+ [{'wxListCtrl', [{where, taylormade}]},
+  '~wxListCtrl','Arrange','AssignImageList','ClearAll',
+  {'Create',[{where, taylormade}]},
   'DeleteAllItems','DeleteColumn','DeleteItem',
   {'EditLabel',[{"textControlClass",nowhere}]},
   'EnsureVisible',
@@ -788,6 +790,13 @@
   'SetFont','SetId','SetImage','SetMask','SetState',
   'SetStateMask','SetText','SetTextColour','SetWidth']}.
 
+{class, wxListItemAttr, root, [],
+ ['wxListItemAttr','~wxListItemAttr',
+  'GetBackgroundColour', 'GetFont',
+  'GetTextColour', 'HasBackgroundColour', 'HasFont',
+  'HasTextColour', 'SetBackgroundColour', 'SetFont', 'SetTextColour'
+ ]}.
+
 {class, wxImageList, object, [{skip, [{'Create',1}]}], %% No create/0 on windows
  ['wxImageList','~wxImageList','Add','Create','Draw','GetBitmap','GetIcon','GetImageCount',
   'GetSize','Remove','RemoveAll','Replace']}.
diff --git a/lib/wx/c_src/gen/wxe_derived_dest.h b/lib/wx/c_src/gen/wxe_derived_dest.h
index ad46a98c90..4e4aea098d 100644
--- a/lib/wx/c_src/gen/wxe_derived_dest.h
+++ b/lib/wx/c_src/gen/wxe_derived_dest.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -362,10 +362,22 @@ class EwxListBox : public wxListBox {
  EwxListBox() : wxListBox() {};
 };
 
+
 class EwxListCtrl : public wxListCtrl {
- public: ~EwxListCtrl() {((WxeApp *)wxTheApp)->clearPtr(this);};
+ public: ~EwxListCtrl();
  EwxListCtrl(wxWindow * parent,wxWindowID winid,const wxPoint& pos,const wxSize& size,long style,const wxValidator& validator) : wxListCtrl(parent,winid,pos,size,style,validator) {};
  EwxListCtrl() : wxListCtrl() {};
+
+ int onGetItemText;
+ int onGetItemAttr;
+ int onGetItemColumnImage;
+ ErlDrvPort port;
+
+ private:
+ virtual wxString OnGetItemText(long item, long col) const;
+ virtual wxListItemAttr* OnGetItemAttr(long item) const;
+ virtual int OnGetItemImage(long item) const;
+ virtual int OnGetItemColumnImage(long item, long column) const;
 };
 
 class EwxListItem : public wxListItem {
@@ -715,28 +727,3 @@ class EwxHtmlWindow : public wxHtmlWindow {
  EwxHtmlWindow() : wxHtmlWindow() {};
 };
 
-void WxeApp::delete_object(void *ptr, wxeRefData *refd) {
- switch(refd->type) {
-  case 24: delete (wxGridCellBoolRenderer *) ptr; break;
-  case 25: delete (wxGridCellBoolEditor *) ptr; break;
-  case 26: delete (wxGridCellFloatRenderer *) ptr; break;
-  case 27: delete (wxGridCellFloatEditor *) ptr; break;
-  case 28: delete (wxGridCellStringRenderer *) ptr; break;
-  case 29: delete (wxGridCellTextEditor *) ptr; break;
-  case 30: delete (wxGridCellChoiceEditor *) ptr; break;
-  case 31: delete (wxGridCellNumberRenderer *) ptr; break;
-  case 32: delete (wxGridCellNumberEditor *) ptr; break;
-  case 61: delete (wxIconBundle *) ptr; break;
-  case 69: delete (wxAcceleratorEntry *) ptr; break;
-  case 70: /* delete (wxCaret *) ptr;These objects must be deleted by owner object */ break;
-  case 72: delete (wxSizerFlags *) ptr; break;
-  case 88: /* delete (wxCalendarDateAttr *) ptr;These objects must be deleted by owner object */ break;
-  case 102: delete (wxTextAttr *) ptr; break;
-  case 154: delete (wxAuiPaneInfo *) 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 223: delete (wxLogNull *) ptr; break;
-  default: delete (wxObject *) ptr;
-}}
-
diff --git a/lib/wx/c_src/gen/wxe_events.cpp b/lib/wx/c_src/gen/wxe_events.cpp
index 692eef858c..b9769318af 100644
--- a/lib/wx/c_src/gen/wxe_events.cpp
+++ b/lib/wx/c_src/gen/wxe_events.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -37,15 +37,15 @@ int wxeEventTypeFromAtom(char *etype_atom) {
   wxeETmap::iterator it;
   for(it = etmap.begin(); it != etmap.end(); ++it) {
        wxeEtype * value = it->second;
-       if(strcmp(value->eName, etype_atom) == 0) { 
-	 if(it->first > wxEVT_USER_FIRST) {	   
+       if(strcmp(value->eName, etype_atom) == 0) {
+	 if(it->first > wxEVT_USER_FIRST) {
 	       return it->first - wxEVT_USER_FIRST;
 	    } else {
 	       return it->first;
 	    }
        }
-  }   
-  return -1; 
+  }
+  return -1;
 }
 
 void initEventTable()
@@ -53,254 +53,254 @@ void initEventTable()
   struct { int ev_type;  int class_id; const char * ev_name;} event_types[] =
   {
    {wxEVT_NULL, 0, "null"},
-   {wxEVT_COMMAND_BUTTON_CLICKED, 163, "command_button_clicked"},
-   {wxEVT_COMMAND_CHECKBOX_CLICKED, 163, "command_checkbox_clicked"},
-   {wxEVT_COMMAND_CHOICE_SELECTED, 163, "command_choice_selected"},
-   {wxEVT_COMMAND_LISTBOX_SELECTED, 163, "command_listbox_selected"},
-   {wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, 163, "command_listbox_doubleclicked"},
-   {wxEVT_COMMAND_TEXT_UPDATED, 163, "command_text_updated"},
-   {wxEVT_COMMAND_TEXT_ENTER, 163, "command_text_enter"},
-   {wxEVT_COMMAND_MENU_SELECTED, 163, "command_menu_selected"},
-   {wxEVT_COMMAND_SLIDER_UPDATED, 163, "command_slider_updated"},
-   {wxEVT_COMMAND_RADIOBOX_SELECTED, 163, "command_radiobox_selected"},
-   {wxEVT_COMMAND_RADIOBUTTON_SELECTED, 163, "command_radiobutton_selected"},
-   {wxEVT_COMMAND_SCROLLBAR_UPDATED, 163, "command_scrollbar_updated"},
-   {wxEVT_COMMAND_VLBOX_SELECTED, 163, "command_vlbox_selected"},
-   {wxEVT_COMMAND_COMBOBOX_SELECTED, 163, "command_combobox_selected"},
-   {wxEVT_COMMAND_TOOL_RCLICKED, 163, "command_tool_rclicked"},
-   {wxEVT_COMMAND_TOOL_ENTER, 163, "command_tool_enter"},
-   {wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, 163, "command_checklistbox_toggled"},
-   {wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 163, "command_togglebutton_clicked"},
-   {wxEVT_COMMAND_LEFT_CLICK, 163, "command_left_click"},
-   {wxEVT_COMMAND_LEFT_DCLICK, 163, "command_left_dclick"},
-   {wxEVT_COMMAND_RIGHT_CLICK, 163, "command_right_click"},
-   {wxEVT_COMMAND_SET_FOCUS, 163, "command_set_focus"},
-   {wxEVT_COMMAND_KILL_FOCUS, 163, "command_kill_focus"},
-   {wxEVT_COMMAND_ENTER, 163, "command_enter"},
-   {wxEVT_SCROLL_TOP, 164, "scroll_top"},
-   {wxEVT_SCROLL_BOTTOM, 164, "scroll_bottom"},
-   {wxEVT_SCROLL_LINEUP, 164, "scroll_lineup"},
-   {wxEVT_SCROLL_LINEDOWN, 164, "scroll_linedown"},
-   {wxEVT_SCROLL_PAGEUP, 164, "scroll_pageup"},
-   {wxEVT_SCROLL_PAGEDOWN, 164, "scroll_pagedown"},
-   {wxEVT_SCROLL_THUMBTRACK, 164, "scroll_thumbtrack"},
-   {wxEVT_SCROLL_THUMBRELEASE, 164, "scroll_thumbrelease"},
-   {wxEVT_SCROLL_CHANGED, 164, "scroll_changed"},
-   {wxEVT_SCROLLWIN_TOP, 165, "scrollwin_top"},
-   {wxEVT_SCROLLWIN_BOTTOM, 165, "scrollwin_bottom"},
-   {wxEVT_SCROLLWIN_LINEUP, 165, "scrollwin_lineup"},
-   {wxEVT_SCROLLWIN_LINEDOWN, 165, "scrollwin_linedown"},
-   {wxEVT_SCROLLWIN_PAGEUP, 165, "scrollwin_pageup"},
-   {wxEVT_SCROLLWIN_PAGEDOWN, 165, "scrollwin_pagedown"},
-   {wxEVT_SCROLLWIN_THUMBTRACK, 165, "scrollwin_thumbtrack"},
-   {wxEVT_SCROLLWIN_THUMBRELEASE, 165, "scrollwin_thumbrelease"},
-   {wxEVT_LEFT_DOWN, 166, "left_down"},
-   {wxEVT_LEFT_UP, 166, "left_up"},
-   {wxEVT_MIDDLE_DOWN, 166, "middle_down"},
-   {wxEVT_MIDDLE_UP, 166, "middle_up"},
-   {wxEVT_RIGHT_DOWN, 166, "right_down"},
-   {wxEVT_RIGHT_UP, 166, "right_up"},
-   {wxEVT_MOTION, 166, "motion"},
-   {wxEVT_ENTER_WINDOW, 166, "enter_window"},
-   {wxEVT_LEAVE_WINDOW, 166, "leave_window"},
-   {wxEVT_LEFT_DCLICK, 166, "left_dclick"},
-   {wxEVT_MIDDLE_DCLICK, 166, "middle_dclick"},
-   {wxEVT_RIGHT_DCLICK, 166, "right_dclick"},
-   {wxEVT_MOUSEWHEEL, 166, "mousewheel"},
-   {wxEVT_NC_LEFT_DOWN, 166, "nc_left_down"},
-   {wxEVT_NC_LEFT_UP, 166, "nc_left_up"},
-   {wxEVT_NC_MIDDLE_DOWN, 166, "nc_middle_down"},
-   {wxEVT_NC_MIDDLE_UP, 166, "nc_middle_up"},
-   {wxEVT_NC_RIGHT_DOWN, 166, "nc_right_down"},
-   {wxEVT_NC_RIGHT_UP, 166, "nc_right_up"},
-   {wxEVT_NC_MOTION, 166, "nc_motion"},
-   {wxEVT_NC_ENTER_WINDOW, 166, "nc_enter_window"},
-   {wxEVT_NC_LEAVE_WINDOW, 166, "nc_leave_window"},
-   {wxEVT_NC_LEFT_DCLICK, 166, "nc_left_dclick"},
-   {wxEVT_NC_MIDDLE_DCLICK, 166, "nc_middle_dclick"},
-   {wxEVT_NC_RIGHT_DCLICK, 166, "nc_right_dclick"},
-   {wxEVT_SET_CURSOR, 167, "set_cursor"},
-   {wxEVT_CHAR, 168, "char"},
-   {wxEVT_CHAR_HOOK, 168, "char_hook"},
-   {wxEVT_KEY_DOWN, 168, "key_down"},
-   {wxEVT_KEY_UP, 168, "key_up"},
-   {wxEVT_SIZE, 169, "size"},
-   {wxEVT_MOVE, 170, "move"},
-   {wxEVT_PAINT, 171, "paint"},
-   {wxEVT_PAINT_ICON, 171, "paint_icon"},
-   {wxEVT_NC_PAINT, 172, "nc_paint"},
-   {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, 164, "spin_up"},
-   {wxEVT_SCROLL_LINEDOWN + wxEVT_USER_FIRST, 164, "spin_down"},
-   {wxEVT_SCROLL_THUMBTRACK + wxEVT_USER_FIRST, 164, "spin"},
-   {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, 221, "command_auinotebook_page_close"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 221, "command_auinotebook_page_changed"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 221, "command_auinotebook_page_changing"},
-   {wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 221, "command_auinotebook_button"},
-   {wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 221, "command_auinotebook_begin_drag"},
-   {wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 221, "command_auinotebook_end_drag"},
-   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 221, "command_auinotebook_drag_motion"},
-   {wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 221, "command_auinotebook_allow_dnd"},
+   {wxEVT_COMMAND_BUTTON_CLICKED, 164, "command_button_clicked"},
+   {wxEVT_COMMAND_CHECKBOX_CLICKED, 164, "command_checkbox_clicked"},
+   {wxEVT_COMMAND_CHOICE_SELECTED, 164, "command_choice_selected"},
+   {wxEVT_COMMAND_LISTBOX_SELECTED, 164, "command_listbox_selected"},
+   {wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, 164, "command_listbox_doubleclicked"},
+   {wxEVT_COMMAND_TEXT_UPDATED, 164, "command_text_updated"},
+   {wxEVT_COMMAND_TEXT_ENTER, 164, "command_text_enter"},
+   {wxEVT_COMMAND_MENU_SELECTED, 164, "command_menu_selected"},
+   {wxEVT_COMMAND_SLIDER_UPDATED, 164, "command_slider_updated"},
+   {wxEVT_COMMAND_RADIOBOX_SELECTED, 164, "command_radiobox_selected"},
+   {wxEVT_COMMAND_RADIOBUTTON_SELECTED, 164, "command_radiobutton_selected"},
+   {wxEVT_COMMAND_SCROLLBAR_UPDATED, 164, "command_scrollbar_updated"},
+   {wxEVT_COMMAND_VLBOX_SELECTED, 164, "command_vlbox_selected"},
+   {wxEVT_COMMAND_COMBOBOX_SELECTED, 164, "command_combobox_selected"},
+   {wxEVT_COMMAND_TOOL_RCLICKED, 164, "command_tool_rclicked"},
+   {wxEVT_COMMAND_TOOL_ENTER, 164, "command_tool_enter"},
+   {wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, 164, "command_checklistbox_toggled"},
+   {wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 164, "command_togglebutton_clicked"},
+   {wxEVT_COMMAND_LEFT_CLICK, 164, "command_left_click"},
+   {wxEVT_COMMAND_LEFT_DCLICK, 164, "command_left_dclick"},
+   {wxEVT_COMMAND_RIGHT_CLICK, 164, "command_right_click"},
+   {wxEVT_COMMAND_SET_FOCUS, 164, "command_set_focus"},
+   {wxEVT_COMMAND_KILL_FOCUS, 164, "command_kill_focus"},
+   {wxEVT_COMMAND_ENTER, 164, "command_enter"},
+   {wxEVT_SCROLL_TOP, 165, "scroll_top"},
+   {wxEVT_SCROLL_BOTTOM, 165, "scroll_bottom"},
+   {wxEVT_SCROLL_LINEUP, 165, "scroll_lineup"},
+   {wxEVT_SCROLL_LINEDOWN, 165, "scroll_linedown"},
+   {wxEVT_SCROLL_PAGEUP, 165, "scroll_pageup"},
+   {wxEVT_SCROLL_PAGEDOWN, 165, "scroll_pagedown"},
+   {wxEVT_SCROLL_THUMBTRACK, 165, "scroll_thumbtrack"},
+   {wxEVT_SCROLL_THUMBRELEASE, 165, "scroll_thumbrelease"},
+   {wxEVT_SCROLL_CHANGED, 165, "scroll_changed"},
+   {wxEVT_SCROLLWIN_TOP, 166, "scrollwin_top"},
+   {wxEVT_SCROLLWIN_BOTTOM, 166, "scrollwin_bottom"},
+   {wxEVT_SCROLLWIN_LINEUP, 166, "scrollwin_lineup"},
+   {wxEVT_SCROLLWIN_LINEDOWN, 166, "scrollwin_linedown"},
+   {wxEVT_SCROLLWIN_PAGEUP, 166, "scrollwin_pageup"},
+   {wxEVT_SCROLLWIN_PAGEDOWN, 166, "scrollwin_pagedown"},
+   {wxEVT_SCROLLWIN_THUMBTRACK, 166, "scrollwin_thumbtrack"},
+   {wxEVT_SCROLLWIN_THUMBRELEASE, 166, "scrollwin_thumbrelease"},
+   {wxEVT_LEFT_DOWN, 167, "left_down"},
+   {wxEVT_LEFT_UP, 167, "left_up"},
+   {wxEVT_MIDDLE_DOWN, 167, "middle_down"},
+   {wxEVT_MIDDLE_UP, 167, "middle_up"},
+   {wxEVT_RIGHT_DOWN, 167, "right_down"},
+   {wxEVT_RIGHT_UP, 167, "right_up"},
+   {wxEVT_MOTION, 167, "motion"},
+   {wxEVT_ENTER_WINDOW, 167, "enter_window"},
+   {wxEVT_LEAVE_WINDOW, 167, "leave_window"},
+   {wxEVT_LEFT_DCLICK, 167, "left_dclick"},
+   {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"},
+   {wxEVT_KEY_DOWN, 169, "key_down"},
+   {wxEVT_KEY_UP, 169, "key_up"},
+   {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_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, 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, 221, "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, 221, "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, 221, "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, 221, "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, 221, "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, 221, "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, 221, "command_auinotebook_bg_dclick"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, 222, "command_auinotebook_bg_dclick"},
 #endif
-   {wxEVT_AUI_PANE_BUTTON, 222, "aui_pane_button"},
-   {wxEVT_AUI_PANE_CLOSE, 222, "aui_pane_close"},
-   {wxEVT_AUI_PANE_MAXIMIZE, 222, "aui_pane_maximize"},
-   {wxEVT_AUI_PANE_RESTORE, 222, "aui_pane_restore"},
-   {wxEVT_AUI_RENDER, 222, "aui_render"},
-   {wxEVT_AUI_FIND_MANAGER, 222, "aui_find_manager"},
+   {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"},
    {-1, 0, }
   };
   for(int i=0; event_types[i].ev_type != -1; i++) {
@@ -353,7 +353,7 @@ bool sendevent(wxEvent *event, ErlDrvPort port)
  rt.addRef(getRef((void *)(cb->obj), memenv), cb->class_name);
  rt.addExt2Term(cb->user_data);
  switch(Etype->cID) {
-case 163: {// wxCommandEvent
+case 164: {// wxCommandEvent
  wxCommandEvent * ev = (wxCommandEvent *) event;
     evClass = (char*)"wxCommandEvent";
     rt.addAtom((char*)"wxCommand");
@@ -364,7 +364,7 @@ case 163: {// wxCommandEvent
     rt.addTupleCount(5);
   break;
 }
-case 164: {// wxScrollEvent or wxSpinEvent
+case 165: {// wxScrollEvent or wxSpinEvent
   if(event->IsKindOf(CLASSINFO(wxScrollEvent))) {
  wxScrollEvent * ev = (wxScrollEvent *) event;
     evClass = (char*)"wxScrollEvent";
@@ -384,14 +384,14 @@ case 164: {// wxScrollEvent or wxSpinEvent
   }
   break;
 }
-case 165: {// wxScrollWinEvent
+case 166: {// wxScrollWinEvent
     evClass = (char*)"wxScrollWinEvent";
     rt.addAtom((char*)"wxScrollWin");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 166: {// wxMouseEvent
+case 167: {// wxMouseEvent
  wxMouseEvent * ev = (wxMouseEvent *) event;
     evClass = (char*)"wxMouseEvent";
     rt.addAtom((char*)"wxMouse");
@@ -411,14 +411,14 @@ case 166: {// wxMouseEvent
     rt.addTupleCount(14);
   break;
 }
-case 167: {// wxSetCursorEvent
+case 168: {// wxSetCursorEvent
     evClass = (char*)"wxSetCursorEvent";
     rt.addAtom((char*)"wxSetCursor");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 168: {// wxKeyEvent
+case 169: {// wxKeyEvent
  wxKeyEvent * ev = (wxKeyEvent *) event;
     evClass = (char*)"wxKeyEvent";
     rt.addAtom((char*)"wxKey");
@@ -437,7 +437,7 @@ case 168: {// wxKeyEvent
     rt.addTupleCount(13);
   break;
 }
-case 169: {// wxSizeEvent
+case 170: {// wxSizeEvent
  wxSizeEvent * ev = (wxSizeEvent *) event;
     evClass = (char*)"wxSizeEvent";
     rt.addAtom((char*)"wxSize");
@@ -447,28 +447,28 @@ case 169: {// wxSizeEvent
     rt.addTupleCount(4);
   break;
 }
-case 170: {// wxMoveEvent
+case 171: {// wxMoveEvent
     evClass = (char*)"wxMoveEvent";
     rt.addAtom((char*)"wxMove");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 171: {// wxPaintEvent
+case 172: {// wxPaintEvent
     evClass = (char*)"wxPaintEvent";
     rt.addAtom((char*)"wxPaint");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 172: {// wxNcPaintEvent
+case 173: {// wxNcPaintEvent
     evClass = (char*)"wxNcPaintEvent";
     rt.addAtom((char*)"wxNcPaint");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 173: {// wxEraseEvent
+case 174: {// wxEraseEvent
  wxEraseEvent * ev = (wxEraseEvent *) event;
  wxDC * GetDC = ev->GetDC();
     evClass = (char*)"wxEraseEvent";
@@ -478,105 +478,105 @@ case 173: {// wxEraseEvent
     rt.addTupleCount(3);
   break;
 }
-case 174: {// wxFocusEvent
+case 175: {// wxFocusEvent
     evClass = (char*)"wxFocusEvent";
     rt.addAtom((char*)"wxFocus");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 175: {// wxChildFocusEvent
+case 176: {// wxChildFocusEvent
     evClass = (char*)"wxChildFocusEvent";
     rt.addAtom((char*)"wxChildFocus");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 176: {// wxMenuEvent
+case 177: {// wxMenuEvent
     evClass = (char*)"wxMenuEvent";
     rt.addAtom((char*)"wxMenu");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 177: {// wxCloseEvent
+case 178: {// wxCloseEvent
     evClass = (char*)"wxCloseEvent";
     rt.addAtom((char*)"wxClose");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 178: {// wxShowEvent
+case 179: {// wxShowEvent
     evClass = (char*)"wxShowEvent";
     rt.addAtom((char*)"wxShow");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 179: {// wxIconizeEvent
+case 180: {// wxIconizeEvent
     evClass = (char*)"wxIconizeEvent";
     rt.addAtom((char*)"wxIconize");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 180: {// wxMaximizeEvent
+case 181: {// wxMaximizeEvent
     evClass = (char*)"wxMaximizeEvent";
     rt.addAtom((char*)"wxMaximize");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 181: {// wxJoystickEvent
+case 182: {// wxJoystickEvent
     evClass = (char*)"wxJoystickEvent";
     rt.addAtom((char*)"wxJoystick");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 182: {// wxUpdateUIEvent
+case 183: {// wxUpdateUIEvent
     evClass = (char*)"wxUpdateUIEvent";
     rt.addAtom((char*)"wxUpdateUI");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 183: {// wxSysColourChangedEvent
+case 184: {// wxSysColourChangedEvent
     evClass = (char*)"wxSysColourChangedEvent";
     rt.addAtom((char*)"wxSysColourChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 184: {// wxMouseCaptureChangedEvent
+case 185: {// wxMouseCaptureChangedEvent
     evClass = (char*)"wxMouseCaptureChangedEvent";
     rt.addAtom((char*)"wxMouseCaptureChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 185: {// wxDisplayChangedEvent
+case 186: {// wxDisplayChangedEvent
     evClass = (char*)"wxDisplayChangedEvent";
     rt.addAtom((char*)"wxDisplayChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 186: {// wxPaletteChangedEvent
+case 187: {// wxPaletteChangedEvent
     evClass = (char*)"wxPaletteChangedEvent";
     rt.addAtom((char*)"wxPaletteChanged");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 187: {// wxQueryNewPaletteEvent
+case 188: {// wxQueryNewPaletteEvent
     evClass = (char*)"wxQueryNewPaletteEvent";
     rt.addAtom((char*)"wxQueryNewPalette");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 188: {// wxNavigationKeyEvent
+case 189: {// wxNavigationKeyEvent
  wxNavigationKeyEvent * ev = (wxNavigationKeyEvent *) event;
     evClass = (char*)"wxNavigationKeyEvent";
     rt.addAtom((char*)"wxNavigationKey");
@@ -586,42 +586,42 @@ case 188: {// wxNavigationKeyEvent
     rt.addTupleCount(4);
   break;
 }
-case 189: {// wxWindowCreateEvent
+case 190: {// wxWindowCreateEvent
     evClass = (char*)"wxWindowCreateEvent";
     rt.addAtom((char*)"wxWindowCreate");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 190: {// wxWindowDestroyEvent
+case 191: {// wxWindowDestroyEvent
     evClass = (char*)"wxWindowDestroyEvent";
     rt.addAtom((char*)"wxWindowDestroy");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 191: {// wxHelpEvent
+case 192: {// wxHelpEvent
     evClass = (char*)"wxHelpEvent";
     rt.addAtom((char*)"wxHelp");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 192: {// wxContextMenuEvent
+case 193: {// wxContextMenuEvent
     evClass = (char*)"wxContextMenuEvent";
     rt.addAtom((char*)"wxContextMenu");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 193: {// wxIdleEvent
+case 194: {// wxIdleEvent
     evClass = (char*)"wxIdleEvent";
     rt.addAtom((char*)"wxIdle");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 194: {// wxGridEvent
+case 195: {// wxGridEvent
  wxGridEvent * ev = (wxGridEvent *) event;
     evClass = (char*)"wxGridEvent";
     rt.addAtom((char*)"wxGrid");
@@ -638,7 +638,7 @@ case 194: {// wxGridEvent
     rt.addTupleCount(11);
   break;
 }
-case 196: {// wxSashEvent
+case 197: {// wxSashEvent
  wxSashEvent * ev = (wxSashEvent *) event;
     evClass = (char*)"wxSashEvent";
     rt.addAtom((char*)"wxSash");
@@ -649,7 +649,7 @@ case 196: {// wxSashEvent
     rt.addTupleCount(5);
   break;
 }
-case 197: {// wxListEvent
+case 198: {// wxListEvent
  wxListEvent * ev = (wxListEvent *) event;
     evClass = (char*)"wxListEvent";
     rt.addAtom((char*)"wxList");
@@ -662,7 +662,7 @@ case 197: {// wxListEvent
     rt.addTupleCount(7);
   break;
 }
-case 198: {// wxDateEvent
+case 199: {// wxDateEvent
  wxDateEvent * ev = (wxDateEvent *) event;
     evClass = (char*)"wxDateEvent";
     rt.addAtom((char*)"wxDate");
@@ -671,14 +671,14 @@ case 198: {// wxDateEvent
     rt.addTupleCount(3);
   break;
 }
-case 199: {// wxCalendarEvent
+case 200: {// wxCalendarEvent
     evClass = (char*)"wxCalendarEvent";
     rt.addAtom((char*)"wxCalendar");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 200: {// wxFileDirPickerEvent
+case 201: {// wxFileDirPickerEvent
  wxFileDirPickerEvent * ev = (wxFileDirPickerEvent *) event;
     evClass = (char*)"wxFileDirPickerEvent";
     rt.addAtom((char*)"wxFileDirPicker");
@@ -687,7 +687,7 @@ case 200: {// wxFileDirPickerEvent
     rt.addTupleCount(3);
   break;
 }
-case 201: {// wxColourPickerEvent
+case 202: {// wxColourPickerEvent
  wxColourPickerEvent * ev = (wxColourPickerEvent *) event;
     evClass = (char*)"wxColourPickerEvent";
     rt.addAtom((char*)"wxColourPicker");
@@ -696,7 +696,7 @@ case 201: {// wxColourPickerEvent
     rt.addTupleCount(3);
   break;
 }
-case 202: {// wxFontPickerEvent
+case 203: {// wxFontPickerEvent
  wxFontPickerEvent * ev = (wxFontPickerEvent *) event;
  wxFont * GetFont = new wxFont(ev->GetFont());
  app->newPtr((void *) GetFont,3, memenv);
@@ -707,7 +707,7 @@ case 202: {// wxFontPickerEvent
     rt.addTupleCount(3);
   break;
 }
-case 203: {// wxStyledTextEvent
+case 204: {// wxStyledTextEvent
  wxStyledTextEvent * ev = (wxStyledTextEvent *) event;
     evClass = (char*)"wxStyledTextEvent";
     rt.addAtom((char*)"wxStyledText");
@@ -735,7 +735,7 @@ case 203: {// wxStyledTextEvent
     rt.addTupleCount(22);
   break;
 }
-case 208: {// wxTreeEvent
+case 209: {// wxTreeEvent
  wxTreeEvent * ev = (wxTreeEvent *) event;
     evClass = (char*)"wxTreeEvent";
     rt.addAtom((char*)"wxTree");
@@ -746,14 +746,14 @@ case 208: {// wxTreeEvent
     rt.addTupleCount(5);
   break;
 }
-case 209: {// wxNotebookEvent
+case 210: {// wxNotebookEvent
     evClass = (char*)"wxNotebookEvent";
     rt.addAtom((char*)"wxNotebook");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 215: {// wxSpinEvent
+case 216: {// wxSpinEvent
  wxSpinEvent * ev = (wxSpinEvent *) event;
     evClass = (char*)"wxSpinEvent";
     rt.addAtom((char*)"wxSpin");
@@ -762,14 +762,14 @@ case 215: {// wxSpinEvent
     rt.addTupleCount(3);
   break;
 }
-case 217: {// wxSplitterEvent
+case 218: {// wxSplitterEvent
     evClass = (char*)"wxSplitterEvent";
     rt.addAtom((char*)"wxSplitter");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 219: {// wxHtmlLinkEvent
+case 220: {// wxHtmlLinkEvent
  wxHtmlLinkEvent * ev = (wxHtmlLinkEvent *) event;
     evClass = (char*)"wxHtmlLinkEvent";
     rt.addAtom((char*)"wxHtmlLink");
@@ -778,7 +778,7 @@ case 219: {// wxHtmlLinkEvent
     rt.addTupleCount(3);
   break;
 }
-case 221: {// wxAuiNotebookEvent
+case 222: {// wxAuiNotebookEvent
  wxAuiNotebookEvent * ev = (wxAuiNotebookEvent *) event;
  wxAuiNotebook * GetDragSource = ev->GetDragSource();
     evClass = (char*)"wxAuiNotebookEvent";
@@ -790,7 +790,7 @@ case 221: {// wxAuiNotebookEvent
     rt.addTupleCount(5);
   break;
 }
-case 222: {// wxAuiManagerEvent
+case 223: {// wxAuiManagerEvent
  wxAuiManagerEvent * ev = (wxAuiManagerEvent *) event;
  wxAuiManager * GetManager = ev->GetManager();
  wxAuiPaneInfo * GetPane = ev->GetPane();
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp
index 479d7679a4..afef2990b4 100644
--- a/lib/wx/c_src/gen/wxe_funcs.cpp
+++ b/lib/wx/c_src/gen/wxe_funcs.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -4486,7 +4486,7 @@ case wxGridCellBoolEditor_IsTrueValue: { // wxGridCellBoolEditor::IsTrueValue
  break;
 }
 case wxGridCellBoolEditor_UseStringValues: { // wxGridCellBoolEditor::UseStringValues
- wxString valueTrue= _T("1");
+ wxString valueTrue= wxT("1");
  wxString valueFalse= wxEmptyString;
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
@@ -15143,12 +15143,14 @@ case wxListBox_SetFirstItem_1_1: { // wxListBox::SetFirstItem
  This->SetFirstItem(s);
  break;
 }
+
 case wxListCtrl_new_0: { // wxListCtrl::wxListCtrl
  wxListCtrl * Result = new EwxListCtrl();
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxListCtrl");
  break;
 }
+
 case wxListCtrl_new_2: { // wxListCtrl::wxListCtrl
  wxWindowID winid=wxID_ANY;
  wxPoint pos= wxDefaultPosition;
@@ -15156,6 +15158,8 @@ case wxListCtrl_new_2: { // wxListCtrl::wxListCtrl
  long style=wxLC_ICON;
  const wxValidator * validator= &wxDefaultValidator;
  wxWindow *parent = (wxWindow *) getPtr(bp,memenv); bp += 4;
+ int onGetItemText = 0, onGetItemAttr = 0, onGetItemColumnImage = 0;
+
  bp += 4; /* Align */
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
@@ -15179,8 +15183,21 @@ case wxListCtrl_new_2: { // wxListCtrl::wxListCtrl
   case 5: {bp += 4;
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
+  case 6: {bp += 4;
+    onGetItemText = *(int *) bp; bp += 4;
+  } break;
+  case 7: {bp += 4;
+    onGetItemAttr = *(int *) bp; bp += 4;
+  } break;
+  case 8: {bp += 4;
+    onGetItemColumnImage = *(int *) bp; bp += 4;
+  } break;
  }};
- wxListCtrl * Result = new EwxListCtrl(parent,winid,pos,size,style,*validator);
+ EwxListCtrl * Result = new EwxListCtrl(parent,winid,pos,size,style,*validator);
+ Result->onGetItemText = onGetItemText;
+ Result->onGetItemAttr = onGetItemAttr;
+ Result->onGetItemColumnImage = onGetItemColumnImage;
+ Result->port = Ecmd.port;
  newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxListCtrl");
  break;
@@ -15213,14 +15230,18 @@ case wxListCtrl_ClearAll: { // wxListCtrl::ClearAll
  This->ClearAll();
  break;
 }
+
 case wxListCtrl_Create: { // wxListCtrl::Create
  wxWindowID winid=wxID_ANY;
  wxPoint pos= wxDefaultPosition;
  wxSize size= wxDefaultSize;
  long style=wxLC_ICON;
  const wxValidator * validator= &wxDefaultValidator;
- wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
+ EwxListCtrl *This = (EwxListCtrl *) getPtr(bp,memenv); bp += 4;
  wxWindow *parent = (wxWindow *) getPtr(bp,memenv); bp += 4;
+ int onGetItemText = 0, onGetItemAttr = 0, onGetItemColumnImage = 0;
+
+ bp += 4; /* Align */
  while( * (int*) bp) { switch (* (int*) bp) {
   case 1: {bp += 4;
  winid = (wxWindowID)*(int *) bp; bp += 4;
@@ -15243,9 +15264,23 @@ case wxListCtrl_Create: { // wxListCtrl::Create
   case 5: {bp += 4;
 validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
   } break;
+  case 6: {bp += 4;
+    onGetItemText = *(int *) bp; bp += 4;
+  } break;
+  case 7: {bp += 4;
+    onGetItemAttr = *(int *) bp; bp += 4;
+  } break;
+  case 8: {bp += 4;
+    onGetItemColumnImage = *(int *) bp; bp += 4;
+  } break;
  }};
  if(!This) throw wxe_badarg(0);
  bool Result = This->Create(parent,winid,pos,size,style,*validator);
+ This->onGetItemText = onGetItemText;
+ This->onGetItemAttr = onGetItemAttr;
+ This->onGetItemColumnImage = onGetItemColumnImage;
+ This->port = Ecmd.port;
+
  rt.addBool(Result);
  break;
 }
@@ -16095,6 +16130,106 @@ case wxListItem_SetWidth: { // wxListItem::SetWidth
  This->SetWidth((int) *width);
  break;
 }
+case wxListItemAttr_new_0: { // wxListItemAttr::wxListItemAttr
+ wxListItemAttr * Result = new wxListItemAttr();
+ newPtr((void *) Result, 101, memenv);
+ rt.addRef(getRef((void *)Result,memenv), "wxListItemAttr");
+ break;
+}
+case wxListItemAttr_new_3: { // wxListItemAttr::wxListItemAttr
+ int * colTextR = (int *) bp; bp += 4;
+ int * colTextG = (int *) bp; bp += 4;
+ int * colTextB = (int *) bp; bp += 4;
+ int * colTextA = (int *) bp; bp += 4;
+ wxColour colText = wxColour(*colTextR,*colTextG,*colTextB,*colTextA);
+ int * colBackR = (int *) bp; bp += 4;
+ int * colBackG = (int *) bp; bp += 4;
+ int * colBackB = (int *) bp; bp += 4;
+ int * colBackA = (int *) bp; bp += 4;
+ wxColour colBack = wxColour(*colBackR,*colBackG,*colBackB,*colBackA);
+ wxFont *font = (wxFont *) getPtr(bp,memenv); bp += 4;
+ wxListItemAttr * Result = new wxListItemAttr(colText,colBack,*font);
+ newPtr((void *) Result, 101, memenv);
+ rt.addRef(getRef((void *)Result,memenv), "wxListItemAttr");
+ break;
+}
+case wxListItemAttr_GetBackgroundColour: { // wxListItemAttr::GetBackgroundColour
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ const wxColour * Result = &This->GetBackgroundColour();
+ rt.add((*Result));
+ break;
+}
+case wxListItemAttr_GetFont: { // wxListItemAttr::GetFont
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ const wxFont * Result = &This->GetFont();
+ rt.addRef(getRef((void *)Result,memenv), "wxFont");
+ break;
+}
+case wxListItemAttr_GetTextColour: { // wxListItemAttr::GetTextColour
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ const wxColour * Result = &This->GetTextColour();
+ rt.add((*Result));
+ break;
+}
+case wxListItemAttr_HasBackgroundColour: { // wxListItemAttr::HasBackgroundColour
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ bool Result = This->HasBackgroundColour();
+ rt.addBool(Result);
+ break;
+}
+case wxListItemAttr_HasFont: { // wxListItemAttr::HasFont
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ bool Result = This->HasFont();
+ rt.addBool(Result);
+ break;
+}
+case wxListItemAttr_HasTextColour: { // wxListItemAttr::HasTextColour
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ bool Result = This->HasTextColour();
+ rt.addBool(Result);
+ break;
+}
+case wxListItemAttr_SetBackgroundColour: { // wxListItemAttr::SetBackgroundColour
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ int * colBackR = (int *) bp; bp += 4;
+ int * colBackG = (int *) bp; bp += 4;
+ int * colBackB = (int *) bp; bp += 4;
+ int * colBackA = (int *) bp; bp += 4;
+ wxColour colBack = wxColour(*colBackR,*colBackG,*colBackB,*colBackA);
+ if(!This) throw wxe_badarg(0);
+ This->SetBackgroundColour(colBack);
+ break;
+}
+case wxListItemAttr_SetFont: { // wxListItemAttr::SetFont
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ wxFont *font = (wxFont *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ This->SetFont(*font);
+ break;
+}
+case wxListItemAttr_SetTextColour: { // wxListItemAttr::SetTextColour
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ int * colTextR = (int *) bp; bp += 4;
+ int * colTextG = (int *) bp; bp += 4;
+ int * colTextB = (int *) bp; bp += 4;
+ int * colTextA = (int *) bp; bp += 4;
+ wxColour colText = wxColour(*colTextR,*colTextG,*colTextB,*colTextA);
+ if(!This) throw wxe_badarg(0);
+ This->SetTextColour(colText);
+ break;
+}
+case wxListItemAttr_destroy: { // wxListItemAttr::destroy
+ wxListItemAttr *This = (wxListItemAttr *) getPtr(bp,memenv); bp += 4;
+ if(This) {   ((WxeApp *) wxTheApp)->clearPtr((void *) This);
+   delete This;}
+ break;
+}
 case wxImageList_new_0: { // wxImageList::wxImageList
  wxImageList * Result = new EwxImageList();
  newPtr((void *) Result, 1, memenv);
@@ -16263,7 +16398,7 @@ case wxImageList_Replace_3: { // wxImageList::Replace
 }
 case wxTextAttr_new_0: { // wxTextAttr::wxTextAttr
  wxTextAttr * Result = new wxTextAttr();
- newPtr((void *) Result, 102, memenv);
+ newPtr((void *) Result, 103, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxTextAttr");
  break;
 }
@@ -16293,7 +16428,7 @@ alignment = *(wxTextAttrAlignment *) bp; bp += 4;;
   } break;
  }};
  wxTextAttr * Result = new wxTextAttr(colText,colBack,*font,(wxTextAttrAlignment) alignment);
- newPtr((void *) Result, 102, memenv);
+ newPtr((void *) Result, 103, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxTextAttr");
  break;
 }
@@ -22711,7 +22846,7 @@ case wxPreviewFrame_new: { // wxPreviewFrame::wxPreviewFrame
  wxString title= wxT("Print Preview");
  wxPoint pos= wxDefaultPosition;
  wxSize size= wxDefaultSize;
- long style=wxDEFAULT_FRAME_STYLE;
+ long style=wxDEFAULT_FRAME_STYLE|wxFRAME_FLOAT_ON_PARENT;
  wxPrintPreview *preview = (wxPrintPreview *) getPtr(bp,memenv); bp += 4;
  wxWindow *parent = (wxWindow *) getPtr(bp,memenv); bp += 4;
  while( * (int*) bp) { switch (* (int*) bp) {
@@ -23742,14 +23877,14 @@ case wxAuiManager_Update: { // wxAuiManager::Update
 #if wxUSE_AUI
 case wxAuiPaneInfo_new_0: { // wxAuiPaneInfo::wxAuiPaneInfo
  wxAuiPaneInfo * Result = new wxAuiPaneInfo();
- newPtr((void *) Result, 154, memenv);
+ newPtr((void *) Result, 155, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
 case wxAuiPaneInfo_new_1: { // wxAuiPaneInfo::wxAuiPaneInfo
  wxAuiPaneInfo *c = (wxAuiPaneInfo *) getPtr(bp,memenv); bp += 4;
  wxAuiPaneInfo * Result = new wxAuiPaneInfo(*c);
- newPtr((void *) Result, 154, memenv);
+ newPtr((void *) Result, 155, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxAuiPaneInfo");
  break;
 }
@@ -30292,7 +30427,7 @@ case wxNotebookEvent_SetSelection: { // wxNotebookEvent::SetSelection
 }
 case wxFileDataObject_new: { // wxFileDataObject::wxFileDataObject
  wxFileDataObject * Result = new wxFileDataObject();
- newPtr((void *) Result, 211, memenv);
+ newPtr((void *) Result, 212, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxFileDataObject");
  break;
 }
@@ -30328,7 +30463,7 @@ case wxTextDataObject_new: { // wxTextDataObject::wxTextDataObject
   } break;
  }};
  wxTextDataObject * Result = new wxTextDataObject(text);
- newPtr((void *) Result, 212, memenv);
+ newPtr((void *) Result, 213, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxTextDataObject");
  break;
 }
@@ -30364,7 +30499,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, 213, memenv);
+ newPtr((void *) Result, 214, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmapDataObject");
  break;
 }
@@ -30376,7 +30511,7 @@ bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
   } break;
  }};
  wxBitmapDataObject * Result = new wxBitmapDataObject(*bitmap);
- newPtr((void *) Result, 213, memenv);
+ newPtr((void *) Result, 214, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxBitmapDataObject");
  break;
 }
@@ -31159,7 +31294,7 @@ case wxAuiManagerEvent_CanVeto: { // wxAuiManagerEvent::CanVeto
 }
 case wxLogNull_new: { // wxLogNull::wxLogNull
  wxLogNull * Result = new wxLogNull();
- newPtr((void *) Result, 223, memenv);
+ newPtr((void *) Result, 224, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxLogNull");
  break;
 }
@@ -31188,3 +31323,31 @@ case wxLogNull_destroy: { // wxLogNull::destroy
     error.addTupleCount(3);
     error.send();
 }} /* The End */
+
+
+void WxeApp::delete_object(void *ptr, wxeRefData *refd) {
+ switch(refd->type) {
+  case 24: delete (wxGridCellBoolRenderer *) ptr; break;
+  case 25: delete (wxGridCellBoolEditor *) ptr; break;
+  case 26: delete (wxGridCellFloatRenderer *) ptr; break;
+  case 27: delete (wxGridCellFloatEditor *) ptr; break;
+  case 28: delete (wxGridCellStringRenderer *) ptr; break;
+  case 29: delete (wxGridCellTextEditor *) ptr; break;
+  case 30: delete (wxGridCellChoiceEditor *) ptr; break;
+  case 31: delete (wxGridCellNumberRenderer *) ptr; break;
+  case 32: delete (wxGridCellNumberEditor *) ptr; break;
+  case 61: delete (wxIconBundle *) ptr; break;
+  case 69: delete (wxAcceleratorEntry *) ptr; break;
+  case 70: /* delete (wxCaret *) ptr;These objects must be deleted by owner object */ break;
+  case 72: delete (wxSizerFlags *) ptr; break;
+  case 88: /* delete (wxCalendarDateAttr *) ptr;These objects must be deleted by owner object */ break;
+  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 224: delete (wxLogNull *) ptr; break;
+  default: delete (wxObject *) ptr;
+}}
+
diff --git a/lib/wx/c_src/gen/wxe_init.cpp b/lib/wx/c_src/gen/wxe_init.cpp
index bab3261be4..a75298392b 100644
--- a/lib/wx/c_src/gen/wxe_init.cpp
+++ b/lib/wx/c_src/gen/wxe_init.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
diff --git a/lib/wx/c_src/gen/wxe_macros.h b/lib/wx/c_src/gen/wxe_macros.h
index 4fb76f960b..be0481564f 100644
--- a/lib/wx/c_src/gen/wxe_macros.h
+++ b/lib/wx/c_src/gen/wxe_macros.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -1648,1683 +1648,1695 @@
 #define wxListItem_SetText 1754
 #define wxListItem_SetTextColour 1755
 #define wxListItem_SetWidth 1756
-#define wxImageList_new_0 1757
-#define wxImageList_new_3 1758
-#define wxImageList_Add_1 1759
-#define wxImageList_Add_2_0 1760
-#define wxImageList_Add_2_1 1761
-#define wxImageList_Create 1762
-#define wxImageList_Draw 1764
-#define wxImageList_GetBitmap 1765
-#define wxImageList_GetIcon 1766
-#define wxImageList_GetImageCount 1767
-#define wxImageList_GetSize 1768
-#define wxImageList_Remove 1769
-#define wxImageList_RemoveAll 1770
-#define wxImageList_Replace_2 1771
-#define wxImageList_Replace_3 1772
-#define wxImageList_destroy 1773
-#define wxTextAttr_new_0 1774
-#define wxTextAttr_new_2 1775
-#define wxTextAttr_GetAlignment 1776
-#define wxTextAttr_GetBackgroundColour 1777
-#define wxTextAttr_GetFont 1778
-#define wxTextAttr_GetLeftIndent 1779
-#define wxTextAttr_GetLeftSubIndent 1780
-#define wxTextAttr_GetRightIndent 1781
-#define wxTextAttr_GetTabs 1782
-#define wxTextAttr_GetTextColour 1783
-#define wxTextAttr_HasBackgroundColour 1784
-#define wxTextAttr_HasFont 1785
-#define wxTextAttr_HasTextColour 1786
-#define wxTextAttr_GetFlags 1787
-#define wxTextAttr_IsDefault 1788
-#define wxTextAttr_SetAlignment 1789
-#define wxTextAttr_SetBackgroundColour 1790
-#define wxTextAttr_SetFlags 1791
-#define wxTextAttr_SetFont 1792
-#define wxTextAttr_SetLeftIndent 1793
-#define wxTextAttr_SetRightIndent 1794
-#define wxTextAttr_SetTabs 1795
-#define wxTextAttr_SetTextColour 1796
-#define wxTextAttr_destroy 1797
-#define wxTextCtrl_new_3 1799
-#define wxTextCtrl_new_0 1800
-#define wxTextCtrl_destruct 1802
-#define wxTextCtrl_AppendText 1803
-#define wxTextCtrl_CanCopy 1804
-#define wxTextCtrl_CanCut 1805
-#define wxTextCtrl_CanPaste 1806
-#define wxTextCtrl_CanRedo 1807
-#define wxTextCtrl_CanUndo 1808
-#define wxTextCtrl_Clear 1809
-#define wxTextCtrl_Copy 1810
-#define wxTextCtrl_Create 1811
-#define wxTextCtrl_Cut 1812
-#define wxTextCtrl_DiscardEdits 1813
-#define wxTextCtrl_EmulateKeyPress 1814
-#define wxTextCtrl_GetDefaultStyle 1815
-#define wxTextCtrl_GetInsertionPoint 1816
-#define wxTextCtrl_GetLastPosition 1817
-#define wxTextCtrl_GetLineLength 1818
-#define wxTextCtrl_GetLineText 1819
-#define wxTextCtrl_GetNumberOfLines 1820
-#define wxTextCtrl_GetRange 1821
-#define wxTextCtrl_GetSelection 1822
-#define wxTextCtrl_GetStringSelection 1823
-#define wxTextCtrl_GetStyle 1824
-#define wxTextCtrl_GetValue 1825
-#define wxTextCtrl_IsEditable 1826
-#define wxTextCtrl_IsModified 1827
-#define wxTextCtrl_IsMultiLine 1828
-#define wxTextCtrl_IsSingleLine 1829
-#define wxTextCtrl_LoadFile 1830
-#define wxTextCtrl_MarkDirty 1831
-#define wxTextCtrl_Paste 1832
-#define wxTextCtrl_PositionToXY 1833
-#define wxTextCtrl_Redo 1834
-#define wxTextCtrl_Remove 1835
-#define wxTextCtrl_Replace 1836
-#define wxTextCtrl_SaveFile 1837
-#define wxTextCtrl_SetDefaultStyle 1838
-#define wxTextCtrl_SetEditable 1839
-#define wxTextCtrl_SetInsertionPoint 1840
-#define wxTextCtrl_SetInsertionPointEnd 1841
-#define wxTextCtrl_SetMaxLength 1843
-#define wxTextCtrl_SetSelection 1844
-#define wxTextCtrl_SetStyle 1845
-#define wxTextCtrl_SetValue 1846
-#define wxTextCtrl_ShowPosition 1847
-#define wxTextCtrl_Undo 1848
-#define wxTextCtrl_WriteText 1849
-#define wxTextCtrl_XYToPosition 1850
-#define wxNotebook_new_0 1853
-#define wxNotebook_new_3 1854
-#define wxNotebook_destruct 1855
-#define wxNotebook_AddPage 1856
-#define wxNotebook_AdvanceSelection 1857
-#define wxNotebook_AssignImageList 1858
-#define wxNotebook_Create 1859
-#define wxNotebook_DeleteAllPages 1860
-#define wxNotebook_DeletePage 1861
-#define wxNotebook_RemovePage 1862
-#define wxNotebook_GetCurrentPage 1863
-#define wxNotebook_GetImageList 1864
-#define wxNotebook_GetPage 1866
-#define wxNotebook_GetPageCount 1867
-#define wxNotebook_GetPageImage 1868
-#define wxNotebook_GetPageText 1869
-#define wxNotebook_GetRowCount 1870
-#define wxNotebook_GetSelection 1871
-#define wxNotebook_GetThemeBackgroundColour 1872
-#define wxNotebook_HitTest 1874
-#define wxNotebook_InsertPage 1876
-#define wxNotebook_SetImageList 1877
-#define wxNotebook_SetPadding 1878
-#define wxNotebook_SetPageSize 1879
-#define wxNotebook_SetPageImage 1880
-#define wxNotebook_SetPageText 1881
-#define wxNotebook_SetSelection 1882
-#define wxNotebook_ChangeSelection 1883
-#define wxChoicebook_new_0 1884
-#define wxChoicebook_new_3 1885
-#define wxChoicebook_AddPage 1886
-#define wxChoicebook_AdvanceSelection 1887
-#define wxChoicebook_AssignImageList 1888
-#define wxChoicebook_Create 1889
-#define wxChoicebook_DeleteAllPages 1890
-#define wxChoicebook_DeletePage 1891
-#define wxChoicebook_RemovePage 1892
-#define wxChoicebook_GetCurrentPage 1893
-#define wxChoicebook_GetImageList 1894
-#define wxChoicebook_GetPage 1896
-#define wxChoicebook_GetPageCount 1897
-#define wxChoicebook_GetPageImage 1898
-#define wxChoicebook_GetPageText 1899
-#define wxChoicebook_GetSelection 1900
-#define wxChoicebook_HitTest 1901
-#define wxChoicebook_InsertPage 1902
-#define wxChoicebook_SetImageList 1903
-#define wxChoicebook_SetPageSize 1904
-#define wxChoicebook_SetPageImage 1905
-#define wxChoicebook_SetPageText 1906
-#define wxChoicebook_SetSelection 1907
-#define wxChoicebook_ChangeSelection 1908
-#define wxChoicebook_destroy 1909
-#define wxToolbook_new_0 1910
-#define wxToolbook_new_3 1911
-#define wxToolbook_AddPage 1912
-#define wxToolbook_AdvanceSelection 1913
-#define wxToolbook_AssignImageList 1914
-#define wxToolbook_Create 1915
-#define wxToolbook_DeleteAllPages 1916
-#define wxToolbook_DeletePage 1917
-#define wxToolbook_RemovePage 1918
-#define wxToolbook_GetCurrentPage 1919
-#define wxToolbook_GetImageList 1920
-#define wxToolbook_GetPage 1922
-#define wxToolbook_GetPageCount 1923
-#define wxToolbook_GetPageImage 1924
-#define wxToolbook_GetPageText 1925
-#define wxToolbook_GetSelection 1926
-#define wxToolbook_HitTest 1928
-#define wxToolbook_InsertPage 1929
-#define wxToolbook_SetImageList 1930
-#define wxToolbook_SetPageSize 1931
-#define wxToolbook_SetPageImage 1932
-#define wxToolbook_SetPageText 1933
-#define wxToolbook_SetSelection 1934
-#define wxToolbook_ChangeSelection 1935
-#define wxToolbook_destroy 1936
-#define wxListbook_new_0 1937
-#define wxListbook_new_3 1938
-#define wxListbook_AddPage 1939
-#define wxListbook_AdvanceSelection 1940
-#define wxListbook_AssignImageList 1941
-#define wxListbook_Create 1942
-#define wxListbook_DeleteAllPages 1943
-#define wxListbook_DeletePage 1944
-#define wxListbook_RemovePage 1945
-#define wxListbook_GetCurrentPage 1946
-#define wxListbook_GetImageList 1947
-#define wxListbook_GetPage 1949
-#define wxListbook_GetPageCount 1950
-#define wxListbook_GetPageImage 1951
-#define wxListbook_GetPageText 1952
-#define wxListbook_GetSelection 1953
-#define wxListbook_HitTest 1955
-#define wxListbook_InsertPage 1956
-#define wxListbook_SetImageList 1957
-#define wxListbook_SetPageSize 1958
-#define wxListbook_SetPageImage 1959
-#define wxListbook_SetPageText 1960
-#define wxListbook_SetSelection 1961
-#define wxListbook_ChangeSelection 1962
-#define wxListbook_destroy 1963
-#define wxTreebook_new_0 1964
-#define wxTreebook_new_3 1965
-#define wxTreebook_AddPage 1966
-#define wxTreebook_AdvanceSelection 1967
-#define wxTreebook_AssignImageList 1968
-#define wxTreebook_Create 1969
-#define wxTreebook_DeleteAllPages 1970
-#define wxTreebook_DeletePage 1971
-#define wxTreebook_RemovePage 1972
-#define wxTreebook_GetCurrentPage 1973
-#define wxTreebook_GetImageList 1974
-#define wxTreebook_GetPage 1976
-#define wxTreebook_GetPageCount 1977
-#define wxTreebook_GetPageImage 1978
-#define wxTreebook_GetPageText 1979
-#define wxTreebook_GetSelection 1980
-#define wxTreebook_ExpandNode 1981
-#define wxTreebook_IsNodeExpanded 1982
-#define wxTreebook_HitTest 1984
-#define wxTreebook_InsertPage 1985
-#define wxTreebook_InsertSubPage 1986
-#define wxTreebook_SetImageList 1987
-#define wxTreebook_SetPageSize 1988
-#define wxTreebook_SetPageImage 1989
-#define wxTreebook_SetPageText 1990
-#define wxTreebook_SetSelection 1991
-#define wxTreebook_ChangeSelection 1992
-#define wxTreebook_destroy 1993
-#define wxTreeCtrl_new_2 1996
-#define wxTreeCtrl_new_0 1997
-#define wxTreeCtrl_destruct 1999
-#define wxTreeCtrl_AddRoot 2000
-#define wxTreeCtrl_AppendItem 2001
-#define wxTreeCtrl_AssignImageList 2002
-#define wxTreeCtrl_AssignStateImageList 2003
-#define wxTreeCtrl_Collapse 2004
-#define wxTreeCtrl_CollapseAndReset 2005
-#define wxTreeCtrl_Create 2006
-#define wxTreeCtrl_Delete 2007
-#define wxTreeCtrl_DeleteAllItems 2008
-#define wxTreeCtrl_DeleteChildren 2009
-#define wxTreeCtrl_EditLabel 2010
-#define wxTreeCtrl_EnsureVisible 2011
-#define wxTreeCtrl_Expand 2012
-#define wxTreeCtrl_GetBoundingRect 2013
-#define wxTreeCtrl_GetChildrenCount 2015
-#define wxTreeCtrl_GetCount 2016
-#define wxTreeCtrl_GetEditControl 2017
-#define wxTreeCtrl_GetFirstChild 2018
-#define wxTreeCtrl_GetNextChild 2019
-#define wxTreeCtrl_GetFirstVisibleItem 2020
-#define wxTreeCtrl_GetImageList 2021
-#define wxTreeCtrl_GetIndent 2022
-#define wxTreeCtrl_GetItemBackgroundColour 2023
-#define wxTreeCtrl_GetItemData 2024
-#define wxTreeCtrl_GetItemFont 2025
-#define wxTreeCtrl_GetItemImage_1 2026
-#define wxTreeCtrl_GetItemImage_2 2027
-#define wxTreeCtrl_GetItemText 2028
-#define wxTreeCtrl_GetItemTextColour 2029
-#define wxTreeCtrl_GetLastChild 2030
-#define wxTreeCtrl_GetNextSibling 2031
-#define wxTreeCtrl_GetNextVisible 2032
-#define wxTreeCtrl_GetItemParent 2033
-#define wxTreeCtrl_GetPrevSibling 2034
-#define wxTreeCtrl_GetPrevVisible 2035
-#define wxTreeCtrl_GetRootItem 2036
-#define wxTreeCtrl_GetSelection 2037
-#define wxTreeCtrl_GetSelections 2038
-#define wxTreeCtrl_GetStateImageList 2039
-#define wxTreeCtrl_HitTest 2040
-#define wxTreeCtrl_InsertItem 2042
-#define wxTreeCtrl_IsBold 2043
-#define wxTreeCtrl_IsExpanded 2044
-#define wxTreeCtrl_IsSelected 2045
-#define wxTreeCtrl_IsVisible 2046
-#define wxTreeCtrl_ItemHasChildren 2047
-#define wxTreeCtrl_PrependItem 2048
-#define wxTreeCtrl_ScrollTo 2049
-#define wxTreeCtrl_SelectItem_1 2050
-#define wxTreeCtrl_SelectItem_2 2051
-#define wxTreeCtrl_SetIndent 2052
-#define wxTreeCtrl_SetImageList 2053
-#define wxTreeCtrl_SetItemBackgroundColour 2054
-#define wxTreeCtrl_SetItemBold 2055
-#define wxTreeCtrl_SetItemData 2056
-#define wxTreeCtrl_SetItemDropHighlight 2057
-#define wxTreeCtrl_SetItemFont 2058
-#define wxTreeCtrl_SetItemHasChildren 2059
-#define wxTreeCtrl_SetItemImage_2 2060
-#define wxTreeCtrl_SetItemImage_3 2061
-#define wxTreeCtrl_SetItemText 2062
-#define wxTreeCtrl_SetItemTextColour 2063
-#define wxTreeCtrl_SetStateImageList 2064
-#define wxTreeCtrl_SetWindowStyle 2065
-#define wxTreeCtrl_SortChildren 2066
-#define wxTreeCtrl_Toggle 2067
-#define wxTreeCtrl_ToggleItemSelection 2068
-#define wxTreeCtrl_Unselect 2069
-#define wxTreeCtrl_UnselectAll 2070
-#define wxTreeCtrl_UnselectItem 2071
-#define wxScrollBar_new_0 2072
-#define wxScrollBar_new_3 2073
-#define wxScrollBar_destruct 2074
-#define wxScrollBar_Create 2075
-#define wxScrollBar_GetRange 2076
-#define wxScrollBar_GetPageSize 2077
-#define wxScrollBar_GetThumbPosition 2078
-#define wxScrollBar_GetThumbSize 2079
-#define wxScrollBar_SetThumbPosition 2080
-#define wxScrollBar_SetScrollbar 2081
-#define wxSpinButton_new_2 2083
-#define wxSpinButton_new_0 2084
-#define wxSpinButton_Create 2085
-#define wxSpinButton_GetMax 2086
-#define wxSpinButton_GetMin 2087
-#define wxSpinButton_GetValue 2088
-#define wxSpinButton_SetRange 2089
-#define wxSpinButton_SetValue 2090
-#define wxSpinButton_destroy 2091
-#define wxSpinCtrl_new_0 2092
-#define wxSpinCtrl_new_2 2093
-#define wxSpinCtrl_Create 2095
-#define wxSpinCtrl_SetValue_1_1 2098
-#define wxSpinCtrl_SetValue_1_0 2099
-#define wxSpinCtrl_GetValue 2101
-#define wxSpinCtrl_SetRange 2103
-#define wxSpinCtrl_SetSelection 2104
-#define wxSpinCtrl_GetMin 2106
-#define wxSpinCtrl_GetMax 2108
-#define wxSpinCtrl_destroy 2109
-#define wxStaticText_new_0 2110
-#define wxStaticText_new_4 2111
-#define wxStaticText_Create 2112
-#define wxStaticText_GetLabel 2113
-#define wxStaticText_SetLabel 2114
-#define wxStaticText_Wrap 2115
-#define wxStaticText_destroy 2116
-#define wxStaticBitmap_new_0 2117
-#define wxStaticBitmap_new_4 2118
-#define wxStaticBitmap_Create 2119
-#define wxStaticBitmap_GetBitmap 2120
-#define wxStaticBitmap_SetBitmap 2121
-#define wxStaticBitmap_destroy 2122
-#define wxRadioBox_new 2123
-#define wxRadioBox_destruct 2125
-#define wxRadioBox_Create 2126
-#define wxRadioBox_Enable_2 2127
-#define wxRadioBox_Enable_1 2128
-#define wxRadioBox_GetSelection 2129
-#define wxRadioBox_GetString 2130
-#define wxRadioBox_SetSelection 2131
-#define wxRadioBox_Show_2 2132
-#define wxRadioBox_Show_1 2133
-#define wxRadioBox_GetColumnCount 2134
-#define wxRadioBox_GetItemHelpText 2135
-#define wxRadioBox_GetItemToolTip 2136
-#define wxRadioBox_GetItemFromPoint 2138
-#define wxRadioBox_GetRowCount 2139
-#define wxRadioBox_IsItemEnabled 2140
-#define wxRadioBox_IsItemShown 2141
-#define wxRadioBox_SetItemHelpText 2142
-#define wxRadioBox_SetItemToolTip 2143
-#define wxRadioButton_new_0 2144
-#define wxRadioButton_new_4 2145
-#define wxRadioButton_Create 2146
-#define wxRadioButton_GetValue 2147
-#define wxRadioButton_SetValue 2148
-#define wxRadioButton_destroy 2149
-#define wxSlider_new_6 2151
-#define wxSlider_new_0 2152
-#define wxSlider_Create 2153
-#define wxSlider_GetLineSize 2154
-#define wxSlider_GetMax 2155
-#define wxSlider_GetMin 2156
-#define wxSlider_GetPageSize 2157
-#define wxSlider_GetThumbLength 2158
-#define wxSlider_GetValue 2159
-#define wxSlider_SetLineSize 2160
-#define wxSlider_SetPageSize 2161
-#define wxSlider_SetRange 2162
-#define wxSlider_SetThumbLength 2163
-#define wxSlider_SetValue 2164
-#define wxSlider_destroy 2165
-#define wxDialog_new_4 2167
-#define wxDialog_new_0 2168
-#define wxDialog_destruct 2170
-#define wxDialog_Create 2171
-#define wxDialog_CreateButtonSizer 2172
-#define wxDialog_CreateStdDialogButtonSizer 2173
-#define wxDialog_EndModal 2174
-#define wxDialog_GetAffirmativeId 2175
-#define wxDialog_GetReturnCode 2176
-#define wxDialog_IsModal 2177
-#define wxDialog_SetAffirmativeId 2178
-#define wxDialog_SetReturnCode 2179
-#define wxDialog_Show 2180
-#define wxDialog_ShowModal 2181
-#define wxColourDialog_new_0 2182
-#define wxColourDialog_new_2 2183
-#define wxColourDialog_destruct 2184
-#define wxColourDialog_Create 2185
-#define wxColourDialog_GetColourData 2186
-#define wxColourData_new_0 2187
-#define wxColourData_new_1 2188
-#define wxColourData_destruct 2189
-#define wxColourData_GetChooseFull 2190
-#define wxColourData_GetColour 2191
-#define wxColourData_GetCustomColour 2193
-#define wxColourData_SetChooseFull 2194
-#define wxColourData_SetColour 2195
-#define wxColourData_SetCustomColour 2196
-#define wxPalette_new_0 2197
-#define wxPalette_new_4 2198
-#define wxPalette_destruct 2200
-#define wxPalette_Create 2201
-#define wxPalette_GetColoursCount 2202
-#define wxPalette_GetPixel 2203
-#define wxPalette_GetRGB 2204
-#define wxPalette_IsOk 2205
-#define wxDirDialog_new 2209
-#define wxDirDialog_destruct 2210
-#define wxDirDialog_GetPath 2211
-#define wxDirDialog_GetMessage 2212
-#define wxDirDialog_SetMessage 2213
-#define wxDirDialog_SetPath 2214
-#define wxFileDialog_new 2218
-#define wxFileDialog_destruct 2219
-#define wxFileDialog_GetDirectory 2220
-#define wxFileDialog_GetFilename 2221
-#define wxFileDialog_GetFilenames 2222
-#define wxFileDialog_GetFilterIndex 2223
-#define wxFileDialog_GetMessage 2224
-#define wxFileDialog_GetPath 2225
-#define wxFileDialog_GetPaths 2226
-#define wxFileDialog_GetWildcard 2227
-#define wxFileDialog_SetDirectory 2228
-#define wxFileDialog_SetFilename 2229
-#define wxFileDialog_SetFilterIndex 2230
-#define wxFileDialog_SetMessage 2231
-#define wxFileDialog_SetPath 2232
-#define wxFileDialog_SetWildcard 2233
-#define wxPickerBase_SetInternalMargin 2234
-#define wxPickerBase_GetInternalMargin 2235
-#define wxPickerBase_SetTextCtrlProportion 2236
-#define wxPickerBase_SetPickerCtrlProportion 2237
-#define wxPickerBase_GetTextCtrlProportion 2238
-#define wxPickerBase_GetPickerCtrlProportion 2239
-#define wxPickerBase_HasTextCtrl 2240
-#define wxPickerBase_GetTextCtrl 2241
-#define wxPickerBase_IsTextCtrlGrowable 2242
-#define wxPickerBase_SetPickerCtrlGrowable 2243
-#define wxPickerBase_SetTextCtrlGrowable 2244
-#define wxPickerBase_IsPickerCtrlGrowable 2245
-#define wxFilePickerCtrl_new_0 2246
-#define wxFilePickerCtrl_new_3 2247
-#define wxFilePickerCtrl_Create 2248
-#define wxFilePickerCtrl_GetPath 2249
-#define wxFilePickerCtrl_SetPath 2250
-#define wxFilePickerCtrl_destroy 2251
-#define wxDirPickerCtrl_new_0 2252
-#define wxDirPickerCtrl_new_3 2253
-#define wxDirPickerCtrl_Create 2254
-#define wxDirPickerCtrl_GetPath 2255
-#define wxDirPickerCtrl_SetPath 2256
-#define wxDirPickerCtrl_destroy 2257
-#define wxColourPickerCtrl_new_0 2258
-#define wxColourPickerCtrl_new_3 2259
-#define wxColourPickerCtrl_Create 2260
-#define wxColourPickerCtrl_GetColour 2261
-#define wxColourPickerCtrl_SetColour_1_1 2262
-#define wxColourPickerCtrl_SetColour_1_0 2263
-#define wxColourPickerCtrl_destroy 2264
-#define wxDatePickerCtrl_new_0 2265
-#define wxDatePickerCtrl_new_3 2266
-#define wxDatePickerCtrl_GetRange 2267
-#define wxDatePickerCtrl_GetValue 2268
-#define wxDatePickerCtrl_SetRange 2269
-#define wxDatePickerCtrl_SetValue 2270
-#define wxDatePickerCtrl_destroy 2271
-#define wxFontPickerCtrl_new_0 2272
-#define wxFontPickerCtrl_new_3 2273
-#define wxFontPickerCtrl_Create 2274
-#define wxFontPickerCtrl_GetSelectedFont 2275
-#define wxFontPickerCtrl_SetSelectedFont 2276
-#define wxFontPickerCtrl_GetMaxPointSize 2277
-#define wxFontPickerCtrl_SetMaxPointSize 2278
-#define wxFontPickerCtrl_destroy 2279
-#define wxFindReplaceDialog_new_0 2282
-#define wxFindReplaceDialog_new_4 2283
-#define wxFindReplaceDialog_destruct 2284
-#define wxFindReplaceDialog_Create 2285
-#define wxFindReplaceDialog_GetData 2286
-#define wxFindReplaceData_new_0 2287
-#define wxFindReplaceData_new_1 2288
-#define wxFindReplaceData_GetFindString 2289
-#define wxFindReplaceData_GetReplaceString 2290
-#define wxFindReplaceData_GetFlags 2291
-#define wxFindReplaceData_SetFlags 2292
-#define wxFindReplaceData_SetFindString 2293
-#define wxFindReplaceData_SetReplaceString 2294
-#define wxFindReplaceData_destroy 2295
-#define wxMultiChoiceDialog_new_0 2296
-#define wxMultiChoiceDialog_new_5 2298
-#define wxMultiChoiceDialog_GetSelections 2299
-#define wxMultiChoiceDialog_SetSelections 2300
-#define wxMultiChoiceDialog_destroy 2301
-#define wxSingleChoiceDialog_new_0 2302
-#define wxSingleChoiceDialog_new_5 2304
-#define wxSingleChoiceDialog_GetSelection 2305
-#define wxSingleChoiceDialog_GetStringSelection 2306
-#define wxSingleChoiceDialog_SetSelection 2307
-#define wxSingleChoiceDialog_destroy 2308
-#define wxTextEntryDialog_new 2309
-#define wxTextEntryDialog_GetValue 2310
-#define wxTextEntryDialog_SetValue 2311
-#define wxTextEntryDialog_destroy 2312
-#define wxPasswordEntryDialog_new 2313
-#define wxPasswordEntryDialog_destroy 2314
-#define wxFontData_new_0 2315
-#define wxFontData_new_1 2316
-#define wxFontData_destruct 2317
-#define wxFontData_EnableEffects 2318
-#define wxFontData_GetAllowSymbols 2319
-#define wxFontData_GetColour 2320
-#define wxFontData_GetChosenFont 2321
-#define wxFontData_GetEnableEffects 2322
-#define wxFontData_GetInitialFont 2323
-#define wxFontData_GetShowHelp 2324
-#define wxFontData_SetAllowSymbols 2325
-#define wxFontData_SetChosenFont 2326
-#define wxFontData_SetColour 2327
-#define wxFontData_SetInitialFont 2328
-#define wxFontData_SetRange 2329
-#define wxFontData_SetShowHelp 2330
-#define wxFontDialog_new_0 2334
-#define wxFontDialog_new_2 2336
-#define wxFontDialog_Create 2338
-#define wxFontDialog_GetFontData 2339
-#define wxFontDialog_destroy 2341
-#define wxProgressDialog_new 2342
-#define wxProgressDialog_destruct 2343
-#define wxProgressDialog_Resume 2344
-#define wxProgressDialog_Update_2 2345
-#define wxProgressDialog_Update_0 2346
-#define wxMessageDialog_new 2347
-#define wxMessageDialog_destruct 2348
-#define wxPageSetupDialog_new 2349
-#define wxPageSetupDialog_destruct 2350
-#define wxPageSetupDialog_GetPageSetupData 2351
-#define wxPageSetupDialog_ShowModal 2352
-#define wxPageSetupDialogData_new_0 2353
-#define wxPageSetupDialogData_new_1_0 2354
-#define wxPageSetupDialogData_new_1_1 2355
-#define wxPageSetupDialogData_destruct 2356
-#define wxPageSetupDialogData_EnableHelp 2357
-#define wxPageSetupDialogData_EnableMargins 2358
-#define wxPageSetupDialogData_EnableOrientation 2359
-#define wxPageSetupDialogData_EnablePaper 2360
-#define wxPageSetupDialogData_EnablePrinter 2361
-#define wxPageSetupDialogData_GetDefaultMinMargins 2362
-#define wxPageSetupDialogData_GetEnableMargins 2363
-#define wxPageSetupDialogData_GetEnableOrientation 2364
-#define wxPageSetupDialogData_GetEnablePaper 2365
-#define wxPageSetupDialogData_GetEnablePrinter 2366
-#define wxPageSetupDialogData_GetEnableHelp 2367
-#define wxPageSetupDialogData_GetDefaultInfo 2368
-#define wxPageSetupDialogData_GetMarginTopLeft 2369
-#define wxPageSetupDialogData_GetMarginBottomRight 2370
-#define wxPageSetupDialogData_GetMinMarginTopLeft 2371
-#define wxPageSetupDialogData_GetMinMarginBottomRight 2372
-#define wxPageSetupDialogData_GetPaperId 2373
-#define wxPageSetupDialogData_GetPaperSize 2374
-#define wxPageSetupDialogData_GetPrintData 2376
-#define wxPageSetupDialogData_IsOk 2377
-#define wxPageSetupDialogData_SetDefaultInfo 2378
-#define wxPageSetupDialogData_SetDefaultMinMargins 2379
-#define wxPageSetupDialogData_SetMarginTopLeft 2380
-#define wxPageSetupDialogData_SetMarginBottomRight 2381
-#define wxPageSetupDialogData_SetMinMarginTopLeft 2382
-#define wxPageSetupDialogData_SetMinMarginBottomRight 2383
-#define wxPageSetupDialogData_SetPaperId 2384
-#define wxPageSetupDialogData_SetPaperSize_1_1 2385
-#define wxPageSetupDialogData_SetPaperSize_1_0 2386
-#define wxPageSetupDialogData_SetPrintData 2387
-#define wxPrintDialog_new_2_0 2388
-#define wxPrintDialog_new_2_1 2389
-#define wxPrintDialog_destruct 2390
-#define wxPrintDialog_GetPrintDialogData 2391
-#define wxPrintDialog_GetPrintDC 2392
-#define wxPrintDialogData_new_0 2393
-#define wxPrintDialogData_new_1_1 2394
-#define wxPrintDialogData_new_1_0 2395
-#define wxPrintDialogData_destruct 2396
-#define wxPrintDialogData_EnableHelp 2397
-#define wxPrintDialogData_EnablePageNumbers 2398
-#define wxPrintDialogData_EnablePrintToFile 2399
-#define wxPrintDialogData_EnableSelection 2400
-#define wxPrintDialogData_GetAllPages 2401
-#define wxPrintDialogData_GetCollate 2402
-#define wxPrintDialogData_GetFromPage 2403
-#define wxPrintDialogData_GetMaxPage 2404
-#define wxPrintDialogData_GetMinPage 2405
-#define wxPrintDialogData_GetNoCopies 2406
-#define wxPrintDialogData_GetPrintData 2407
-#define wxPrintDialogData_GetPrintToFile 2408
-#define wxPrintDialogData_GetSelection 2409
-#define wxPrintDialogData_GetToPage 2410
-#define wxPrintDialogData_IsOk 2411
-#define wxPrintDialogData_SetCollate 2412
-#define wxPrintDialogData_SetFromPage 2413
-#define wxPrintDialogData_SetMaxPage 2414
-#define wxPrintDialogData_SetMinPage 2415
-#define wxPrintDialogData_SetNoCopies 2416
-#define wxPrintDialogData_SetPrintData 2417
-#define wxPrintDialogData_SetPrintToFile 2418
-#define wxPrintDialogData_SetSelection 2419
-#define wxPrintDialogData_SetToPage 2420
-#define wxPrintData_new_0 2421
-#define wxPrintData_new_1 2422
-#define wxPrintData_destruct 2423
-#define wxPrintData_GetCollate 2424
-#define wxPrintData_GetBin 2425
-#define wxPrintData_GetColour 2426
-#define wxPrintData_GetDuplex 2427
-#define wxPrintData_GetNoCopies 2428
-#define wxPrintData_GetOrientation 2429
-#define wxPrintData_GetPaperId 2430
-#define wxPrintData_GetPrinterName 2431
-#define wxPrintData_GetQuality 2432
-#define wxPrintData_IsOk 2433
-#define wxPrintData_SetBin 2434
-#define wxPrintData_SetCollate 2435
-#define wxPrintData_SetColour 2436
-#define wxPrintData_SetDuplex 2437
-#define wxPrintData_SetNoCopies 2438
-#define wxPrintData_SetOrientation 2439
-#define wxPrintData_SetPaperId 2440
-#define wxPrintData_SetPrinterName 2441
-#define wxPrintData_SetQuality 2442
-#define wxPrintPreview_new_2 2445
-#define wxPrintPreview_new_3 2446
-#define wxPrintPreview_destruct 2448
-#define wxPrintPreview_GetCanvas 2449
-#define wxPrintPreview_GetCurrentPage 2450
-#define wxPrintPreview_GetFrame 2451
-#define wxPrintPreview_GetMaxPage 2452
-#define wxPrintPreview_GetMinPage 2453
-#define wxPrintPreview_GetPrintout 2454
-#define wxPrintPreview_GetPrintoutForPrinting 2455
-#define wxPrintPreview_IsOk 2456
-#define wxPrintPreview_PaintPage 2457
-#define wxPrintPreview_Print 2458
-#define wxPrintPreview_RenderPage 2459
-#define wxPrintPreview_SetCanvas 2460
-#define wxPrintPreview_SetCurrentPage 2461
-#define wxPrintPreview_SetFrame 2462
-#define wxPrintPreview_SetPrintout 2463
-#define wxPrintPreview_SetZoom 2464
-#define wxPreviewFrame_new 2465
-#define wxPreviewFrame_destruct 2466
-#define wxPreviewFrame_CreateControlBar 2467
-#define wxPreviewFrame_CreateCanvas 2468
-#define wxPreviewFrame_Initialize 2469
-#define wxPreviewFrame_OnCloseWindow 2470
-#define wxPreviewControlBar_new 2471
-#define wxPreviewControlBar_destruct 2472
-#define wxPreviewControlBar_CreateButtons 2473
-#define wxPreviewControlBar_GetPrintPreview 2474
-#define wxPreviewControlBar_GetZoomControl 2475
-#define wxPreviewControlBar_SetZoomControl 2476
-#define wxPrinter_new 2478
-#define wxPrinter_CreateAbortWindow 2479
-#define wxPrinter_GetAbort 2480
-#define wxPrinter_GetLastError 2481
-#define wxPrinter_GetPrintDialogData 2482
-#define wxPrinter_Print 2483
-#define wxPrinter_PrintDialog 2484
-#define wxPrinter_ReportError 2485
-#define wxPrinter_Setup 2486
-#define wxPrinter_destroy 2487
-#define wxXmlResource_new_1 2488
-#define wxXmlResource_new_2 2489
-#define wxXmlResource_destruct 2490
-#define wxXmlResource_AttachUnknownControl 2491
-#define wxXmlResource_ClearHandlers 2492
-#define wxXmlResource_CompareVersion 2493
-#define wxXmlResource_Get 2494
-#define wxXmlResource_GetFlags 2495
-#define wxXmlResource_GetVersion 2496
-#define wxXmlResource_GetXRCID 2497
-#define wxXmlResource_InitAllHandlers 2498
-#define wxXmlResource_Load 2499
-#define wxXmlResource_LoadBitmap 2500
-#define wxXmlResource_LoadDialog_2 2501
-#define wxXmlResource_LoadDialog_3 2502
-#define wxXmlResource_LoadFrame_2 2503
-#define wxXmlResource_LoadFrame_3 2504
-#define wxXmlResource_LoadIcon 2505
-#define wxXmlResource_LoadMenu 2506
-#define wxXmlResource_LoadMenuBar_2 2507
-#define wxXmlResource_LoadMenuBar_1 2508
-#define wxXmlResource_LoadPanel_2 2509
-#define wxXmlResource_LoadPanel_3 2510
-#define wxXmlResource_LoadToolBar 2511
-#define wxXmlResource_Set 2512
-#define wxXmlResource_SetFlags 2513
-#define wxXmlResource_Unload 2514
-#define wxXmlResource_xrcctrl 2515
-#define wxHtmlEasyPrinting_new 2516
-#define wxHtmlEasyPrinting_destruct 2517
-#define wxHtmlEasyPrinting_GetPrintData 2518
-#define wxHtmlEasyPrinting_GetPageSetupData 2519
-#define wxHtmlEasyPrinting_PreviewFile 2520
-#define wxHtmlEasyPrinting_PreviewText 2521
-#define wxHtmlEasyPrinting_PrintFile 2522
-#define wxHtmlEasyPrinting_PrintText 2523
-#define wxHtmlEasyPrinting_PageSetup 2524
-#define wxHtmlEasyPrinting_SetFonts 2525
-#define wxHtmlEasyPrinting_SetHeader 2526
-#define wxHtmlEasyPrinting_SetFooter 2527
-#define wxGLCanvas_new_2 2529
-#define wxGLCanvas_new_3_1 2530
-#define wxGLCanvas_new_3_0 2531
-#define wxGLCanvas_GetContext 2532
-#define wxGLCanvas_SetCurrent 2534
-#define wxGLCanvas_SwapBuffers 2535
-#define wxGLCanvas_destroy 2536
-#define wxAuiManager_new 2537
-#define wxAuiManager_destruct 2538
-#define wxAuiManager_AddPane_2_1 2539
-#define wxAuiManager_AddPane_3 2540
-#define wxAuiManager_AddPane_2_0 2541
-#define wxAuiManager_DetachPane 2542
-#define wxAuiManager_GetAllPanes 2543
-#define wxAuiManager_GetArtProvider 2544
-#define wxAuiManager_GetDockSizeConstraint 2545
-#define wxAuiManager_GetFlags 2546
-#define wxAuiManager_GetManagedWindow 2547
-#define wxAuiManager_GetManager 2548
-#define wxAuiManager_GetPane_1_1 2549
-#define wxAuiManager_GetPane_1_0 2550
-#define wxAuiManager_HideHint 2551
-#define wxAuiManager_InsertPane 2552
-#define wxAuiManager_LoadPaneInfo 2553
-#define wxAuiManager_LoadPerspective 2554
-#define wxAuiManager_SavePaneInfo 2555
-#define wxAuiManager_SavePerspective 2556
-#define wxAuiManager_SetArtProvider 2557
-#define wxAuiManager_SetDockSizeConstraint 2558
-#define wxAuiManager_SetFlags 2559
-#define wxAuiManager_SetManagedWindow 2560
-#define wxAuiManager_ShowHint 2561
-#define wxAuiManager_UnInit 2562
-#define wxAuiManager_Update 2563
-#define wxAuiPaneInfo_new_0 2564
-#define wxAuiPaneInfo_new_1 2565
-#define wxAuiPaneInfo_destruct 2566
-#define wxAuiPaneInfo_BestSize_1 2567
-#define wxAuiPaneInfo_BestSize_2 2568
-#define wxAuiPaneInfo_Bottom 2569
-#define wxAuiPaneInfo_BottomDockable 2570
-#define wxAuiPaneInfo_Caption 2571
-#define wxAuiPaneInfo_CaptionVisible 2572
-#define wxAuiPaneInfo_Centre 2573
-#define wxAuiPaneInfo_CentrePane 2574
-#define wxAuiPaneInfo_CloseButton 2575
-#define wxAuiPaneInfo_DefaultPane 2576
-#define wxAuiPaneInfo_DestroyOnClose 2577
-#define wxAuiPaneInfo_Direction 2578
-#define wxAuiPaneInfo_Dock 2579
-#define wxAuiPaneInfo_Dockable 2580
-#define wxAuiPaneInfo_Fixed 2581
-#define wxAuiPaneInfo_Float 2582
-#define wxAuiPaneInfo_Floatable 2583
-#define wxAuiPaneInfo_FloatingPosition_1 2584
-#define wxAuiPaneInfo_FloatingPosition_2 2585
-#define wxAuiPaneInfo_FloatingSize_1 2586
-#define wxAuiPaneInfo_FloatingSize_2 2587
-#define wxAuiPaneInfo_Gripper 2588
-#define wxAuiPaneInfo_GripperTop 2589
-#define wxAuiPaneInfo_HasBorder 2590
-#define wxAuiPaneInfo_HasCaption 2591
-#define wxAuiPaneInfo_HasCloseButton 2592
-#define wxAuiPaneInfo_HasFlag 2593
-#define wxAuiPaneInfo_HasGripper 2594
-#define wxAuiPaneInfo_HasGripperTop 2595
-#define wxAuiPaneInfo_HasMaximizeButton 2596
-#define wxAuiPaneInfo_HasMinimizeButton 2597
-#define wxAuiPaneInfo_HasPinButton 2598
-#define wxAuiPaneInfo_Hide 2599
-#define wxAuiPaneInfo_IsBottomDockable 2600
-#define wxAuiPaneInfo_IsDocked 2601
-#define wxAuiPaneInfo_IsFixed 2602
-#define wxAuiPaneInfo_IsFloatable 2603
-#define wxAuiPaneInfo_IsFloating 2604
-#define wxAuiPaneInfo_IsLeftDockable 2605
-#define wxAuiPaneInfo_IsMovable 2606
-#define wxAuiPaneInfo_IsOk 2607
-#define wxAuiPaneInfo_IsResizable 2608
-#define wxAuiPaneInfo_IsRightDockable 2609
-#define wxAuiPaneInfo_IsShown 2610
-#define wxAuiPaneInfo_IsToolbar 2611
-#define wxAuiPaneInfo_IsTopDockable 2612
-#define wxAuiPaneInfo_Layer 2613
-#define wxAuiPaneInfo_Left 2614
-#define wxAuiPaneInfo_LeftDockable 2615
-#define wxAuiPaneInfo_MaxSize_1 2616
-#define wxAuiPaneInfo_MaxSize_2 2617
-#define wxAuiPaneInfo_MaximizeButton 2618
-#define wxAuiPaneInfo_MinSize_1 2619
-#define wxAuiPaneInfo_MinSize_2 2620
-#define wxAuiPaneInfo_MinimizeButton 2621
-#define wxAuiPaneInfo_Movable 2622
-#define wxAuiPaneInfo_Name 2623
-#define wxAuiPaneInfo_PaneBorder 2624
-#define wxAuiPaneInfo_PinButton 2625
-#define wxAuiPaneInfo_Position 2626
-#define wxAuiPaneInfo_Resizable 2627
-#define wxAuiPaneInfo_Right 2628
-#define wxAuiPaneInfo_RightDockable 2629
-#define wxAuiPaneInfo_Row 2630
-#define wxAuiPaneInfo_SafeSet 2631
-#define wxAuiPaneInfo_SetFlag 2632
-#define wxAuiPaneInfo_Show 2633
-#define wxAuiPaneInfo_ToolbarPane 2634
-#define wxAuiPaneInfo_Top 2635
-#define wxAuiPaneInfo_TopDockable 2636
-#define wxAuiPaneInfo_Window 2637
-#define wxAuiNotebook_new_0 2638
-#define wxAuiNotebook_new_2 2639
-#define wxAuiNotebook_AddPage 2640
-#define wxAuiNotebook_Create 2641
-#define wxAuiNotebook_DeletePage 2642
-#define wxAuiNotebook_GetArtProvider 2643
-#define wxAuiNotebook_GetPage 2644
-#define wxAuiNotebook_GetPageBitmap 2645
-#define wxAuiNotebook_GetPageCount 2646
-#define wxAuiNotebook_GetPageIndex 2647
-#define wxAuiNotebook_GetPageText 2648
-#define wxAuiNotebook_GetSelection 2649
-#define wxAuiNotebook_InsertPage 2650
-#define wxAuiNotebook_RemovePage 2651
-#define wxAuiNotebook_SetArtProvider 2652
-#define wxAuiNotebook_SetFont 2653
-#define wxAuiNotebook_SetPageBitmap 2654
-#define wxAuiNotebook_SetPageText 2655
-#define wxAuiNotebook_SetSelection 2656
-#define wxAuiNotebook_SetTabCtrlHeight 2657
-#define wxAuiNotebook_SetUniformBitmapSize 2658
-#define wxAuiNotebook_destroy 2659
-#define wxMDIParentFrame_new_0 2660
-#define wxMDIParentFrame_new_4 2661
-#define wxMDIParentFrame_destruct 2662
-#define wxMDIParentFrame_ActivateNext 2663
-#define wxMDIParentFrame_ActivatePrevious 2664
-#define wxMDIParentFrame_ArrangeIcons 2665
-#define wxMDIParentFrame_Cascade 2666
-#define wxMDIParentFrame_Create 2667
-#define wxMDIParentFrame_GetActiveChild 2668
-#define wxMDIParentFrame_GetClientWindow 2669
-#define wxMDIParentFrame_Tile 2670
-#define wxMDIChildFrame_new_0 2671
-#define wxMDIChildFrame_new_4 2672
-#define wxMDIChildFrame_destruct 2673
-#define wxMDIChildFrame_Activate 2674
-#define wxMDIChildFrame_Create 2675
-#define wxMDIChildFrame_Maximize 2676
-#define wxMDIChildFrame_Restore 2677
-#define wxMDIClientWindow_new_0 2678
-#define wxMDIClientWindow_new_2 2679
-#define wxMDIClientWindow_destruct 2680
-#define wxMDIClientWindow_CreateClient 2681
-#define wxLayoutAlgorithm_new 2682
-#define wxLayoutAlgorithm_LayoutFrame 2683
-#define wxLayoutAlgorithm_LayoutMDIFrame 2684
-#define wxLayoutAlgorithm_LayoutWindow 2685
-#define wxLayoutAlgorithm_destroy 2686
-#define wxEvent_GetId 2687
-#define wxEvent_GetSkipped 2688
-#define wxEvent_GetTimestamp 2689
-#define wxEvent_IsCommandEvent 2690
-#define wxEvent_ResumePropagation 2691
-#define wxEvent_ShouldPropagate 2692
-#define wxEvent_Skip 2693
-#define wxEvent_StopPropagation 2694
-#define wxCommandEvent_getClientData 2695
-#define wxCommandEvent_GetExtraLong 2696
-#define wxCommandEvent_GetInt 2697
-#define wxCommandEvent_GetSelection 2698
-#define wxCommandEvent_GetString 2699
-#define wxCommandEvent_IsChecked 2700
-#define wxCommandEvent_IsSelection 2701
-#define wxCommandEvent_SetInt 2702
-#define wxCommandEvent_SetString 2703
-#define wxScrollEvent_GetOrientation 2704
-#define wxScrollEvent_GetPosition 2705
-#define wxScrollWinEvent_GetOrientation 2706
-#define wxScrollWinEvent_GetPosition 2707
-#define wxMouseEvent_AltDown 2708
-#define wxMouseEvent_Button 2709
-#define wxMouseEvent_ButtonDClick 2710
-#define wxMouseEvent_ButtonDown 2711
-#define wxMouseEvent_ButtonUp 2712
-#define wxMouseEvent_CmdDown 2713
-#define wxMouseEvent_ControlDown 2714
-#define wxMouseEvent_Dragging 2715
-#define wxMouseEvent_Entering 2716
-#define wxMouseEvent_GetButton 2717
-#define wxMouseEvent_GetPosition 2720
-#define wxMouseEvent_GetLogicalPosition 2721
-#define wxMouseEvent_GetLinesPerAction 2722
-#define wxMouseEvent_GetWheelRotation 2723
-#define wxMouseEvent_GetWheelDelta 2724
-#define wxMouseEvent_GetX 2725
-#define wxMouseEvent_GetY 2726
-#define wxMouseEvent_IsButton 2727
-#define wxMouseEvent_IsPageScroll 2728
-#define wxMouseEvent_Leaving 2729
-#define wxMouseEvent_LeftDClick 2730
-#define wxMouseEvent_LeftDown 2731
-#define wxMouseEvent_LeftIsDown 2732
-#define wxMouseEvent_LeftUp 2733
-#define wxMouseEvent_MetaDown 2734
-#define wxMouseEvent_MiddleDClick 2735
-#define wxMouseEvent_MiddleDown 2736
-#define wxMouseEvent_MiddleIsDown 2737
-#define wxMouseEvent_MiddleUp 2738
-#define wxMouseEvent_Moving 2739
-#define wxMouseEvent_RightDClick 2740
-#define wxMouseEvent_RightDown 2741
-#define wxMouseEvent_RightIsDown 2742
-#define wxMouseEvent_RightUp 2743
-#define wxMouseEvent_ShiftDown 2744
-#define wxSetCursorEvent_GetCursor 2745
-#define wxSetCursorEvent_GetX 2746
-#define wxSetCursorEvent_GetY 2747
-#define wxSetCursorEvent_HasCursor 2748
-#define wxSetCursorEvent_SetCursor 2749
-#define wxKeyEvent_AltDown 2750
-#define wxKeyEvent_CmdDown 2751
-#define wxKeyEvent_ControlDown 2752
-#define wxKeyEvent_GetKeyCode 2753
-#define wxKeyEvent_GetModifiers 2754
-#define wxKeyEvent_GetPosition 2757
-#define wxKeyEvent_GetRawKeyCode 2758
-#define wxKeyEvent_GetRawKeyFlags 2759
-#define wxKeyEvent_GetUnicodeKey 2760
-#define wxKeyEvent_GetX 2761
-#define wxKeyEvent_GetY 2762
-#define wxKeyEvent_HasModifiers 2763
-#define wxKeyEvent_MetaDown 2764
-#define wxKeyEvent_ShiftDown 2765
-#define wxSizeEvent_GetSize 2766
-#define wxMoveEvent_GetPosition 2767
-#define wxEraseEvent_GetDC 2768
-#define wxFocusEvent_GetWindow 2769
-#define wxChildFocusEvent_GetWindow 2770
-#define wxMenuEvent_GetMenu 2771
-#define wxMenuEvent_GetMenuId 2772
-#define wxMenuEvent_IsPopup 2773
-#define wxCloseEvent_CanVeto 2774
-#define wxCloseEvent_GetLoggingOff 2775
-#define wxCloseEvent_SetCanVeto 2776
-#define wxCloseEvent_SetLoggingOff 2777
-#define wxCloseEvent_Veto 2778
-#define wxShowEvent_SetShow 2779
-#define wxShowEvent_GetShow 2780
-#define wxIconizeEvent_Iconized 2781
-#define wxJoystickEvent_ButtonDown 2782
-#define wxJoystickEvent_ButtonIsDown 2783
-#define wxJoystickEvent_ButtonUp 2784
-#define wxJoystickEvent_GetButtonChange 2785
-#define wxJoystickEvent_GetButtonState 2786
-#define wxJoystickEvent_GetJoystick 2787
-#define wxJoystickEvent_GetPosition 2788
-#define wxJoystickEvent_GetZPosition 2789
-#define wxJoystickEvent_IsButton 2790
-#define wxJoystickEvent_IsMove 2791
-#define wxJoystickEvent_IsZMove 2792
-#define wxUpdateUIEvent_CanUpdate 2793
-#define wxUpdateUIEvent_Check 2794
-#define wxUpdateUIEvent_Enable 2795
-#define wxUpdateUIEvent_Show 2796
-#define wxUpdateUIEvent_GetChecked 2797
-#define wxUpdateUIEvent_GetEnabled 2798
-#define wxUpdateUIEvent_GetShown 2799
-#define wxUpdateUIEvent_GetSetChecked 2800
-#define wxUpdateUIEvent_GetSetEnabled 2801
-#define wxUpdateUIEvent_GetSetShown 2802
-#define wxUpdateUIEvent_GetSetText 2803
-#define wxUpdateUIEvent_GetText 2804
-#define wxUpdateUIEvent_GetMode 2805
-#define wxUpdateUIEvent_GetUpdateInterval 2806
-#define wxUpdateUIEvent_ResetUpdateTime 2807
-#define wxUpdateUIEvent_SetMode 2808
-#define wxUpdateUIEvent_SetText 2809
-#define wxUpdateUIEvent_SetUpdateInterval 2810
-#define wxMouseCaptureChangedEvent_GetCapturedWindow 2811
-#define wxPaletteChangedEvent_SetChangedWindow 2812
-#define wxPaletteChangedEvent_GetChangedWindow 2813
-#define wxQueryNewPaletteEvent_SetPaletteRealized 2814
-#define wxQueryNewPaletteEvent_GetPaletteRealized 2815
-#define wxNavigationKeyEvent_GetDirection 2816
-#define wxNavigationKeyEvent_SetDirection 2817
-#define wxNavigationKeyEvent_IsWindowChange 2818
-#define wxNavigationKeyEvent_SetWindowChange 2819
-#define wxNavigationKeyEvent_IsFromTab 2820
-#define wxNavigationKeyEvent_SetFromTab 2821
-#define wxNavigationKeyEvent_GetCurrentFocus 2822
-#define wxNavigationKeyEvent_SetCurrentFocus 2823
-#define wxHelpEvent_GetOrigin 2824
-#define wxHelpEvent_GetPosition 2825
-#define wxHelpEvent_SetOrigin 2826
-#define wxHelpEvent_SetPosition 2827
-#define wxContextMenuEvent_GetPosition 2828
-#define wxContextMenuEvent_SetPosition 2829
-#define wxIdleEvent_CanSend 2830
-#define wxIdleEvent_GetMode 2831
-#define wxIdleEvent_RequestMore 2832
-#define wxIdleEvent_MoreRequested 2833
-#define wxIdleEvent_SetMode 2834
-#define wxGridEvent_AltDown 2835
-#define wxGridEvent_ControlDown 2836
-#define wxGridEvent_GetCol 2837
-#define wxGridEvent_GetPosition 2838
-#define wxGridEvent_GetRow 2839
-#define wxGridEvent_MetaDown 2840
-#define wxGridEvent_Selecting 2841
-#define wxGridEvent_ShiftDown 2842
-#define wxNotifyEvent_Allow 2843
-#define wxNotifyEvent_IsAllowed 2844
-#define wxNotifyEvent_Veto 2845
-#define wxSashEvent_GetEdge 2846
-#define wxSashEvent_GetDragRect 2847
-#define wxSashEvent_GetDragStatus 2848
-#define wxListEvent_GetCacheFrom 2849
-#define wxListEvent_GetCacheTo 2850
-#define wxListEvent_GetKeyCode 2851
-#define wxListEvent_GetIndex 2852
-#define wxListEvent_GetColumn 2853
-#define wxListEvent_GetPoint 2854
-#define wxListEvent_GetLabel 2855
-#define wxListEvent_GetText 2856
-#define wxListEvent_GetImage 2857
-#define wxListEvent_GetData 2858
-#define wxListEvent_GetMask 2859
-#define wxListEvent_GetItem 2860
-#define wxListEvent_IsEditCancelled 2861
-#define wxDateEvent_GetDate 2862
-#define wxCalendarEvent_GetWeekDay 2863
-#define wxFileDirPickerEvent_GetPath 2864
-#define wxColourPickerEvent_GetColour 2865
-#define wxFontPickerEvent_GetFont 2866
-#define wxStyledTextEvent_GetPosition 2867
-#define wxStyledTextEvent_GetKey 2868
-#define wxStyledTextEvent_GetModifiers 2869
-#define wxStyledTextEvent_GetModificationType 2870
-#define wxStyledTextEvent_GetText 2871
-#define wxStyledTextEvent_GetLength 2872
-#define wxStyledTextEvent_GetLinesAdded 2873
-#define wxStyledTextEvent_GetLine 2874
-#define wxStyledTextEvent_GetFoldLevelNow 2875
-#define wxStyledTextEvent_GetFoldLevelPrev 2876
-#define wxStyledTextEvent_GetMargin 2877
-#define wxStyledTextEvent_GetMessage 2878
-#define wxStyledTextEvent_GetWParam 2879
-#define wxStyledTextEvent_GetLParam 2880
-#define wxStyledTextEvent_GetListType 2881
-#define wxStyledTextEvent_GetX 2882
-#define wxStyledTextEvent_GetY 2883
-#define wxStyledTextEvent_GetDragText 2884
-#define wxStyledTextEvent_GetDragAllowMove 2885
-#define wxStyledTextEvent_GetDragResult 2886
-#define wxStyledTextEvent_GetShift 2887
-#define wxStyledTextEvent_GetControl 2888
-#define wxStyledTextEvent_GetAlt 2889
-#define utils_wxGetKeyState 2890
-#define utils_wxGetMousePosition 2891
-#define utils_wxGetMouseState 2892
-#define utils_wxSetDetectableAutoRepeat 2893
-#define utils_wxBell 2894
-#define utils_wxFindMenuItemId 2895
-#define utils_wxGenericFindWindowAtPoint 2896
-#define utils_wxFindWindowAtPoint 2897
-#define utils_wxBeginBusyCursor 2898
-#define utils_wxEndBusyCursor 2899
-#define utils_wxIsBusy 2900
-#define utils_wxShutdown 2901
-#define utils_wxShell 2902
-#define utils_wxLaunchDefaultBrowser 2903
-#define utils_wxGetEmailAddress 2904
-#define utils_wxGetUserId 2905
-#define utils_wxGetHomeDir 2906
-#define utils_wxNewId 2907
-#define utils_wxRegisterId 2908
-#define utils_wxGetCurrentId 2909
-#define utils_wxGetOsDescription 2910
-#define utils_wxIsPlatformLittleEndian 2911
-#define utils_wxIsPlatform64Bit 2912
-#define wxPrintout_new 2913
-#define wxPrintout_destruct 2914
-#define wxPrintout_GetDC 2915
-#define wxPrintout_GetPageSizeMM 2916
-#define wxPrintout_GetPageSizePixels 2917
-#define wxPrintout_GetPaperRectPixels 2918
-#define wxPrintout_GetPPIPrinter 2919
-#define wxPrintout_GetPPIScreen 2920
-#define wxPrintout_GetTitle 2921
-#define wxPrintout_IsPreview 2922
-#define wxPrintout_FitThisSizeToPaper 2923
-#define wxPrintout_FitThisSizeToPage 2924
-#define wxPrintout_FitThisSizeToPageMargins 2925
-#define wxPrintout_MapScreenSizeToPaper 2926
-#define wxPrintout_MapScreenSizeToPage 2927
-#define wxPrintout_MapScreenSizeToPageMargins 2928
-#define wxPrintout_MapScreenSizeToDevice 2929
-#define wxPrintout_GetLogicalPaperRect 2930
-#define wxPrintout_GetLogicalPageRect 2931
-#define wxPrintout_GetLogicalPageMarginsRect 2932
-#define wxPrintout_SetLogicalOrigin 2933
-#define wxPrintout_OffsetLogicalOrigin 2934
-#define wxStyledTextCtrl_new_2 2935
-#define wxStyledTextCtrl_new_0 2936
-#define wxStyledTextCtrl_destruct 2937
-#define wxStyledTextCtrl_Create 2938
-#define wxStyledTextCtrl_AddText 2939
-#define wxStyledTextCtrl_AddStyledText 2940
-#define wxStyledTextCtrl_InsertText 2941
-#define wxStyledTextCtrl_ClearAll 2942
-#define wxStyledTextCtrl_ClearDocumentStyle 2943
-#define wxStyledTextCtrl_GetLength 2944
-#define wxStyledTextCtrl_GetCharAt 2945
-#define wxStyledTextCtrl_GetCurrentPos 2946
-#define wxStyledTextCtrl_GetAnchor 2947
-#define wxStyledTextCtrl_GetStyleAt 2948
-#define wxStyledTextCtrl_Redo 2949
-#define wxStyledTextCtrl_SetUndoCollection 2950
-#define wxStyledTextCtrl_SelectAll 2951
-#define wxStyledTextCtrl_SetSavePoint 2952
-#define wxStyledTextCtrl_GetStyledText 2953
-#define wxStyledTextCtrl_CanRedo 2954
-#define wxStyledTextCtrl_MarkerLineFromHandle 2955
-#define wxStyledTextCtrl_MarkerDeleteHandle 2956
-#define wxStyledTextCtrl_GetUndoCollection 2957
-#define wxStyledTextCtrl_GetViewWhiteSpace 2958
-#define wxStyledTextCtrl_SetViewWhiteSpace 2959
-#define wxStyledTextCtrl_PositionFromPoint 2960
-#define wxStyledTextCtrl_PositionFromPointClose 2961
-#define wxStyledTextCtrl_GotoLine 2962
-#define wxStyledTextCtrl_GotoPos 2963
-#define wxStyledTextCtrl_SetAnchor 2964
-#define wxStyledTextCtrl_GetCurLine 2965
-#define wxStyledTextCtrl_GetEndStyled 2966
-#define wxStyledTextCtrl_ConvertEOLs 2967
-#define wxStyledTextCtrl_GetEOLMode 2968
-#define wxStyledTextCtrl_SetEOLMode 2969
-#define wxStyledTextCtrl_StartStyling 2970
-#define wxStyledTextCtrl_SetStyling 2971
-#define wxStyledTextCtrl_GetBufferedDraw 2972
-#define wxStyledTextCtrl_SetBufferedDraw 2973
-#define wxStyledTextCtrl_SetTabWidth 2974
-#define wxStyledTextCtrl_GetTabWidth 2975
-#define wxStyledTextCtrl_SetCodePage 2976
-#define wxStyledTextCtrl_MarkerDefine 2977
-#define wxStyledTextCtrl_MarkerSetForeground 2978
-#define wxStyledTextCtrl_MarkerSetBackground 2979
-#define wxStyledTextCtrl_MarkerAdd 2980
-#define wxStyledTextCtrl_MarkerDelete 2981
-#define wxStyledTextCtrl_MarkerDeleteAll 2982
-#define wxStyledTextCtrl_MarkerGet 2983
-#define wxStyledTextCtrl_MarkerNext 2984
-#define wxStyledTextCtrl_MarkerPrevious 2985
-#define wxStyledTextCtrl_MarkerDefineBitmap 2986
-#define wxStyledTextCtrl_MarkerAddSet 2987
-#define wxStyledTextCtrl_MarkerSetAlpha 2988
-#define wxStyledTextCtrl_SetMarginType 2989
-#define wxStyledTextCtrl_GetMarginType 2990
-#define wxStyledTextCtrl_SetMarginWidth 2991
-#define wxStyledTextCtrl_GetMarginWidth 2992
-#define wxStyledTextCtrl_SetMarginMask 2993
-#define wxStyledTextCtrl_GetMarginMask 2994
-#define wxStyledTextCtrl_SetMarginSensitive 2995
-#define wxStyledTextCtrl_GetMarginSensitive 2996
-#define wxStyledTextCtrl_StyleClearAll 2997
-#define wxStyledTextCtrl_StyleSetForeground 2998
-#define wxStyledTextCtrl_StyleSetBackground 2999
-#define wxStyledTextCtrl_StyleSetBold 3000
-#define wxStyledTextCtrl_StyleSetItalic 3001
-#define wxStyledTextCtrl_StyleSetSize 3002
-#define wxStyledTextCtrl_StyleSetFaceName 3003
-#define wxStyledTextCtrl_StyleSetEOLFilled 3004
-#define wxStyledTextCtrl_StyleResetDefault 3005
-#define wxStyledTextCtrl_StyleSetUnderline 3006
-#define wxStyledTextCtrl_StyleSetCase 3007
-#define wxStyledTextCtrl_StyleSetHotSpot 3008
-#define wxStyledTextCtrl_SetSelForeground 3009
-#define wxStyledTextCtrl_SetSelBackground 3010
-#define wxStyledTextCtrl_GetSelAlpha 3011
-#define wxStyledTextCtrl_SetSelAlpha 3012
-#define wxStyledTextCtrl_SetCaretForeground 3013
-#define wxStyledTextCtrl_CmdKeyAssign 3014
-#define wxStyledTextCtrl_CmdKeyClear 3015
-#define wxStyledTextCtrl_CmdKeyClearAll 3016
-#define wxStyledTextCtrl_SetStyleBytes 3017
-#define wxStyledTextCtrl_StyleSetVisible 3018
-#define wxStyledTextCtrl_GetCaretPeriod 3019
-#define wxStyledTextCtrl_SetCaretPeriod 3020
-#define wxStyledTextCtrl_SetWordChars 3021
-#define wxStyledTextCtrl_BeginUndoAction 3022
-#define wxStyledTextCtrl_EndUndoAction 3023
-#define wxStyledTextCtrl_IndicatorSetStyle 3024
-#define wxStyledTextCtrl_IndicatorGetStyle 3025
-#define wxStyledTextCtrl_IndicatorSetForeground 3026
-#define wxStyledTextCtrl_IndicatorGetForeground 3027
-#define wxStyledTextCtrl_SetWhitespaceForeground 3028
-#define wxStyledTextCtrl_SetWhitespaceBackground 3029
-#define wxStyledTextCtrl_GetStyleBits 3030
-#define wxStyledTextCtrl_SetLineState 3031
-#define wxStyledTextCtrl_GetLineState 3032
-#define wxStyledTextCtrl_GetMaxLineState 3033
-#define wxStyledTextCtrl_GetCaretLineVisible 3034
-#define wxStyledTextCtrl_SetCaretLineVisible 3035
-#define wxStyledTextCtrl_GetCaretLineBackground 3036
-#define wxStyledTextCtrl_SetCaretLineBackground 3037
-#define wxStyledTextCtrl_AutoCompShow 3038
-#define wxStyledTextCtrl_AutoCompCancel 3039
-#define wxStyledTextCtrl_AutoCompActive 3040
-#define wxStyledTextCtrl_AutoCompPosStart 3041
-#define wxStyledTextCtrl_AutoCompComplete 3042
-#define wxStyledTextCtrl_AutoCompStops 3043
-#define wxStyledTextCtrl_AutoCompSetSeparator 3044
-#define wxStyledTextCtrl_AutoCompGetSeparator 3045
-#define wxStyledTextCtrl_AutoCompSelect 3046
-#define wxStyledTextCtrl_AutoCompSetCancelAtStart 3047
-#define wxStyledTextCtrl_AutoCompGetCancelAtStart 3048
-#define wxStyledTextCtrl_AutoCompSetFillUps 3049
-#define wxStyledTextCtrl_AutoCompSetChooseSingle 3050
-#define wxStyledTextCtrl_AutoCompGetChooseSingle 3051
-#define wxStyledTextCtrl_AutoCompSetIgnoreCase 3052
-#define wxStyledTextCtrl_AutoCompGetIgnoreCase 3053
-#define wxStyledTextCtrl_UserListShow 3054
-#define wxStyledTextCtrl_AutoCompSetAutoHide 3055
-#define wxStyledTextCtrl_AutoCompGetAutoHide 3056
-#define wxStyledTextCtrl_AutoCompSetDropRestOfWord 3057
-#define wxStyledTextCtrl_AutoCompGetDropRestOfWord 3058
-#define wxStyledTextCtrl_RegisterImage 3059
-#define wxStyledTextCtrl_ClearRegisteredImages 3060
-#define wxStyledTextCtrl_AutoCompGetTypeSeparator 3061
-#define wxStyledTextCtrl_AutoCompSetTypeSeparator 3062
-#define wxStyledTextCtrl_AutoCompSetMaxWidth 3063
-#define wxStyledTextCtrl_AutoCompGetMaxWidth 3064
-#define wxStyledTextCtrl_AutoCompSetMaxHeight 3065
-#define wxStyledTextCtrl_AutoCompGetMaxHeight 3066
-#define wxStyledTextCtrl_SetIndent 3067
-#define wxStyledTextCtrl_GetIndent 3068
-#define wxStyledTextCtrl_SetUseTabs 3069
-#define wxStyledTextCtrl_GetUseTabs 3070
-#define wxStyledTextCtrl_SetLineIndentation 3071
-#define wxStyledTextCtrl_GetLineIndentation 3072
-#define wxStyledTextCtrl_GetLineIndentPosition 3073
-#define wxStyledTextCtrl_GetColumn 3074
-#define wxStyledTextCtrl_SetUseHorizontalScrollBar 3075
-#define wxStyledTextCtrl_GetUseHorizontalScrollBar 3076
-#define wxStyledTextCtrl_SetIndentationGuides 3077
-#define wxStyledTextCtrl_GetIndentationGuides 3078
-#define wxStyledTextCtrl_SetHighlightGuide 3079
-#define wxStyledTextCtrl_GetHighlightGuide 3080
-#define wxStyledTextCtrl_GetLineEndPosition 3081
-#define wxStyledTextCtrl_GetCodePage 3082
-#define wxStyledTextCtrl_GetCaretForeground 3083
-#define wxStyledTextCtrl_GetReadOnly 3084
-#define wxStyledTextCtrl_SetCurrentPos 3085
-#define wxStyledTextCtrl_SetSelectionStart 3086
-#define wxStyledTextCtrl_GetSelectionStart 3087
-#define wxStyledTextCtrl_SetSelectionEnd 3088
-#define wxStyledTextCtrl_GetSelectionEnd 3089
-#define wxStyledTextCtrl_SetPrintMagnification 3090
-#define wxStyledTextCtrl_GetPrintMagnification 3091
-#define wxStyledTextCtrl_SetPrintColourMode 3092
-#define wxStyledTextCtrl_GetPrintColourMode 3093
-#define wxStyledTextCtrl_FindText 3094
-#define wxStyledTextCtrl_FormatRange 3095
-#define wxStyledTextCtrl_GetFirstVisibleLine 3096
-#define wxStyledTextCtrl_GetLine 3097
-#define wxStyledTextCtrl_GetLineCount 3098
-#define wxStyledTextCtrl_SetMarginLeft 3099
-#define wxStyledTextCtrl_GetMarginLeft 3100
-#define wxStyledTextCtrl_SetMarginRight 3101
-#define wxStyledTextCtrl_GetMarginRight 3102
-#define wxStyledTextCtrl_GetModify 3103
-#define wxStyledTextCtrl_SetSelection 3104
-#define wxStyledTextCtrl_GetSelectedText 3105
-#define wxStyledTextCtrl_GetTextRange 3106
-#define wxStyledTextCtrl_HideSelection 3107
-#define wxStyledTextCtrl_LineFromPosition 3108
-#define wxStyledTextCtrl_PositionFromLine 3109
-#define wxStyledTextCtrl_LineScroll 3110
-#define wxStyledTextCtrl_EnsureCaretVisible 3111
-#define wxStyledTextCtrl_ReplaceSelection 3112
-#define wxStyledTextCtrl_SetReadOnly 3113
-#define wxStyledTextCtrl_CanPaste 3114
-#define wxStyledTextCtrl_CanUndo 3115
-#define wxStyledTextCtrl_EmptyUndoBuffer 3116
-#define wxStyledTextCtrl_Undo 3117
-#define wxStyledTextCtrl_Cut 3118
-#define wxStyledTextCtrl_Copy 3119
-#define wxStyledTextCtrl_Paste 3120
-#define wxStyledTextCtrl_Clear 3121
-#define wxStyledTextCtrl_SetText 3122
-#define wxStyledTextCtrl_GetText 3123
-#define wxStyledTextCtrl_GetTextLength 3124
-#define wxStyledTextCtrl_GetOvertype 3125
-#define wxStyledTextCtrl_SetCaretWidth 3126
-#define wxStyledTextCtrl_GetCaretWidth 3127
-#define wxStyledTextCtrl_SetTargetStart 3128
-#define wxStyledTextCtrl_GetTargetStart 3129
-#define wxStyledTextCtrl_SetTargetEnd 3130
-#define wxStyledTextCtrl_GetTargetEnd 3131
-#define wxStyledTextCtrl_ReplaceTarget 3132
-#define wxStyledTextCtrl_SearchInTarget 3133
-#define wxStyledTextCtrl_SetSearchFlags 3134
-#define wxStyledTextCtrl_GetSearchFlags 3135
-#define wxStyledTextCtrl_CallTipShow 3136
-#define wxStyledTextCtrl_CallTipCancel 3137
-#define wxStyledTextCtrl_CallTipActive 3138
-#define wxStyledTextCtrl_CallTipPosAtStart 3139
-#define wxStyledTextCtrl_CallTipSetHighlight 3140
-#define wxStyledTextCtrl_CallTipSetBackground 3141
-#define wxStyledTextCtrl_CallTipSetForeground 3142
-#define wxStyledTextCtrl_CallTipSetForegroundHighlight 3143
-#define wxStyledTextCtrl_CallTipUseStyle 3144
-#define wxStyledTextCtrl_VisibleFromDocLine 3145
-#define wxStyledTextCtrl_DocLineFromVisible 3146
-#define wxStyledTextCtrl_WrapCount 3147
-#define wxStyledTextCtrl_SetFoldLevel 3148
-#define wxStyledTextCtrl_GetFoldLevel 3149
-#define wxStyledTextCtrl_GetLastChild 3150
-#define wxStyledTextCtrl_GetFoldParent 3151
-#define wxStyledTextCtrl_ShowLines 3152
-#define wxStyledTextCtrl_HideLines 3153
-#define wxStyledTextCtrl_GetLineVisible 3154
-#define wxStyledTextCtrl_SetFoldExpanded 3155
-#define wxStyledTextCtrl_GetFoldExpanded 3156
-#define wxStyledTextCtrl_ToggleFold 3157
-#define wxStyledTextCtrl_EnsureVisible 3158
-#define wxStyledTextCtrl_SetFoldFlags 3159
-#define wxStyledTextCtrl_EnsureVisibleEnforcePolicy 3160
-#define wxStyledTextCtrl_SetTabIndents 3161
-#define wxStyledTextCtrl_GetTabIndents 3162
-#define wxStyledTextCtrl_SetBackSpaceUnIndents 3163
-#define wxStyledTextCtrl_GetBackSpaceUnIndents 3164
-#define wxStyledTextCtrl_SetMouseDwellTime 3165
-#define wxStyledTextCtrl_GetMouseDwellTime 3166
-#define wxStyledTextCtrl_WordStartPosition 3167
-#define wxStyledTextCtrl_WordEndPosition 3168
-#define wxStyledTextCtrl_SetWrapMode 3169
-#define wxStyledTextCtrl_GetWrapMode 3170
-#define wxStyledTextCtrl_SetWrapVisualFlags 3171
-#define wxStyledTextCtrl_GetWrapVisualFlags 3172
-#define wxStyledTextCtrl_SetWrapVisualFlagsLocation 3173
-#define wxStyledTextCtrl_GetWrapVisualFlagsLocation 3174
-#define wxStyledTextCtrl_SetWrapStartIndent 3175
-#define wxStyledTextCtrl_GetWrapStartIndent 3176
-#define wxStyledTextCtrl_SetLayoutCache 3177
-#define wxStyledTextCtrl_GetLayoutCache 3178
-#define wxStyledTextCtrl_SetScrollWidth 3179
-#define wxStyledTextCtrl_GetScrollWidth 3180
-#define wxStyledTextCtrl_TextWidth 3181
-#define wxStyledTextCtrl_GetEndAtLastLine 3182
-#define wxStyledTextCtrl_TextHeight 3183
-#define wxStyledTextCtrl_SetUseVerticalScrollBar 3184
-#define wxStyledTextCtrl_GetUseVerticalScrollBar 3185
-#define wxStyledTextCtrl_AppendText 3186
-#define wxStyledTextCtrl_GetTwoPhaseDraw 3187
-#define wxStyledTextCtrl_SetTwoPhaseDraw 3188
-#define wxStyledTextCtrl_TargetFromSelection 3189
-#define wxStyledTextCtrl_LinesJoin 3190
-#define wxStyledTextCtrl_LinesSplit 3191
-#define wxStyledTextCtrl_SetFoldMarginColour 3192
-#define wxStyledTextCtrl_SetFoldMarginHiColour 3193
-#define wxStyledTextCtrl_LineDown 3194
-#define wxStyledTextCtrl_LineDownExtend 3195
-#define wxStyledTextCtrl_LineUp 3196
-#define wxStyledTextCtrl_LineUpExtend 3197
-#define wxStyledTextCtrl_CharLeft 3198
-#define wxStyledTextCtrl_CharLeftExtend 3199
-#define wxStyledTextCtrl_CharRight 3200
-#define wxStyledTextCtrl_CharRightExtend 3201
-#define wxStyledTextCtrl_WordLeft 3202
-#define wxStyledTextCtrl_WordLeftExtend 3203
-#define wxStyledTextCtrl_WordRight 3204
-#define wxStyledTextCtrl_WordRightExtend 3205
-#define wxStyledTextCtrl_Home 3206
-#define wxStyledTextCtrl_HomeExtend 3207
-#define wxStyledTextCtrl_LineEnd 3208
-#define wxStyledTextCtrl_LineEndExtend 3209
-#define wxStyledTextCtrl_DocumentStart 3210
-#define wxStyledTextCtrl_DocumentStartExtend 3211
-#define wxStyledTextCtrl_DocumentEnd 3212
-#define wxStyledTextCtrl_DocumentEndExtend 3213
-#define wxStyledTextCtrl_PageUp 3214
-#define wxStyledTextCtrl_PageUpExtend 3215
-#define wxStyledTextCtrl_PageDown 3216
-#define wxStyledTextCtrl_PageDownExtend 3217
-#define wxStyledTextCtrl_EditToggleOvertype 3218
-#define wxStyledTextCtrl_Cancel 3219
-#define wxStyledTextCtrl_DeleteBack 3220
-#define wxStyledTextCtrl_Tab 3221
-#define wxStyledTextCtrl_BackTab 3222
-#define wxStyledTextCtrl_NewLine 3223
-#define wxStyledTextCtrl_FormFeed 3224
-#define wxStyledTextCtrl_VCHome 3225
-#define wxStyledTextCtrl_VCHomeExtend 3226
-#define wxStyledTextCtrl_ZoomIn 3227
-#define wxStyledTextCtrl_ZoomOut 3228
-#define wxStyledTextCtrl_DelWordLeft 3229
-#define wxStyledTextCtrl_DelWordRight 3230
-#define wxStyledTextCtrl_LineCut 3231
-#define wxStyledTextCtrl_LineDelete 3232
-#define wxStyledTextCtrl_LineTranspose 3233
-#define wxStyledTextCtrl_LineDuplicate 3234
-#define wxStyledTextCtrl_LowerCase 3235
-#define wxStyledTextCtrl_UpperCase 3236
-#define wxStyledTextCtrl_LineScrollDown 3237
-#define wxStyledTextCtrl_LineScrollUp 3238
-#define wxStyledTextCtrl_DeleteBackNotLine 3239
-#define wxStyledTextCtrl_HomeDisplay 3240
-#define wxStyledTextCtrl_HomeDisplayExtend 3241
-#define wxStyledTextCtrl_LineEndDisplay 3242
-#define wxStyledTextCtrl_LineEndDisplayExtend 3243
-#define wxStyledTextCtrl_HomeWrapExtend 3244
-#define wxStyledTextCtrl_LineEndWrap 3245
-#define wxStyledTextCtrl_LineEndWrapExtend 3246
-#define wxStyledTextCtrl_VCHomeWrap 3247
-#define wxStyledTextCtrl_VCHomeWrapExtend 3248
-#define wxStyledTextCtrl_LineCopy 3249
-#define wxStyledTextCtrl_MoveCaretInsideView 3250
-#define wxStyledTextCtrl_LineLength 3251
-#define wxStyledTextCtrl_BraceHighlight 3252
-#define wxStyledTextCtrl_BraceBadLight 3253
-#define wxStyledTextCtrl_BraceMatch 3254
-#define wxStyledTextCtrl_GetViewEOL 3255
-#define wxStyledTextCtrl_SetViewEOL 3256
-#define wxStyledTextCtrl_SetModEventMask 3257
-#define wxStyledTextCtrl_GetEdgeColumn 3258
-#define wxStyledTextCtrl_SetEdgeColumn 3259
-#define wxStyledTextCtrl_GetEdgeMode 3260
-#define wxStyledTextCtrl_GetEdgeColour 3261
-#define wxStyledTextCtrl_SetEdgeColour 3262
-#define wxStyledTextCtrl_SearchAnchor 3263
-#define wxStyledTextCtrl_SearchNext 3264
-#define wxStyledTextCtrl_SearchPrev 3265
-#define wxStyledTextCtrl_LinesOnScreen 3266
-#define wxStyledTextCtrl_UsePopUp 3267
-#define wxStyledTextCtrl_SelectionIsRectangle 3268
-#define wxStyledTextCtrl_SetZoom 3269
-#define wxStyledTextCtrl_GetZoom 3270
-#define wxStyledTextCtrl_GetModEventMask 3271
-#define wxStyledTextCtrl_SetSTCFocus 3272
-#define wxStyledTextCtrl_GetSTCFocus 3273
-#define wxStyledTextCtrl_SetStatus 3274
-#define wxStyledTextCtrl_GetStatus 3275
-#define wxStyledTextCtrl_SetMouseDownCaptures 3276
-#define wxStyledTextCtrl_GetMouseDownCaptures 3277
-#define wxStyledTextCtrl_SetSTCCursor 3278
-#define wxStyledTextCtrl_GetSTCCursor 3279
-#define wxStyledTextCtrl_SetControlCharSymbol 3280
-#define wxStyledTextCtrl_GetControlCharSymbol 3281
-#define wxStyledTextCtrl_WordPartLeft 3282
-#define wxStyledTextCtrl_WordPartLeftExtend 3283
-#define wxStyledTextCtrl_WordPartRight 3284
-#define wxStyledTextCtrl_WordPartRightExtend 3285
-#define wxStyledTextCtrl_SetVisiblePolicy 3286
-#define wxStyledTextCtrl_DelLineLeft 3287
-#define wxStyledTextCtrl_DelLineRight 3288
-#define wxStyledTextCtrl_GetXOffset 3289
-#define wxStyledTextCtrl_ChooseCaretX 3290
-#define wxStyledTextCtrl_SetXCaretPolicy 3291
-#define wxStyledTextCtrl_SetYCaretPolicy 3292
-#define wxStyledTextCtrl_GetPrintWrapMode 3293
-#define wxStyledTextCtrl_SetHotspotActiveForeground 3294
-#define wxStyledTextCtrl_SetHotspotActiveBackground 3295
-#define wxStyledTextCtrl_SetHotspotActiveUnderline 3296
-#define wxStyledTextCtrl_SetHotspotSingleLine 3297
-#define wxStyledTextCtrl_ParaDownExtend 3298
-#define wxStyledTextCtrl_ParaUp 3299
-#define wxStyledTextCtrl_ParaUpExtend 3300
-#define wxStyledTextCtrl_PositionBefore 3301
-#define wxStyledTextCtrl_PositionAfter 3302
-#define wxStyledTextCtrl_CopyRange 3303
-#define wxStyledTextCtrl_CopyText 3304
-#define wxStyledTextCtrl_SetSelectionMode 3305
-#define wxStyledTextCtrl_GetSelectionMode 3306
-#define wxStyledTextCtrl_LineDownRectExtend 3307
-#define wxStyledTextCtrl_LineUpRectExtend 3308
-#define wxStyledTextCtrl_CharLeftRectExtend 3309
-#define wxStyledTextCtrl_CharRightRectExtend 3310
-#define wxStyledTextCtrl_HomeRectExtend 3311
-#define wxStyledTextCtrl_VCHomeRectExtend 3312
-#define wxStyledTextCtrl_LineEndRectExtend 3313
-#define wxStyledTextCtrl_PageUpRectExtend 3314
-#define wxStyledTextCtrl_PageDownRectExtend 3315
-#define wxStyledTextCtrl_StutteredPageUp 3316
-#define wxStyledTextCtrl_StutteredPageUpExtend 3317
-#define wxStyledTextCtrl_StutteredPageDown 3318
-#define wxStyledTextCtrl_StutteredPageDownExtend 3319
-#define wxStyledTextCtrl_WordLeftEnd 3320
-#define wxStyledTextCtrl_WordLeftEndExtend 3321
-#define wxStyledTextCtrl_WordRightEnd 3322
-#define wxStyledTextCtrl_WordRightEndExtend 3323
-#define wxStyledTextCtrl_SetWhitespaceChars 3324
-#define wxStyledTextCtrl_SetCharsDefault 3325
-#define wxStyledTextCtrl_AutoCompGetCurrent 3326
-#define wxStyledTextCtrl_Allocate 3327
-#define wxStyledTextCtrl_FindColumn 3328
-#define wxStyledTextCtrl_GetCaretSticky 3329
-#define wxStyledTextCtrl_SetCaretSticky 3330
-#define wxStyledTextCtrl_ToggleCaretSticky 3331
-#define wxStyledTextCtrl_SetPasteConvertEndings 3332
-#define wxStyledTextCtrl_GetPasteConvertEndings 3333
-#define wxStyledTextCtrl_SelectionDuplicate 3334
-#define wxStyledTextCtrl_SetCaretLineBackAlpha 3335
-#define wxStyledTextCtrl_GetCaretLineBackAlpha 3336
-#define wxStyledTextCtrl_StartRecord 3337
-#define wxStyledTextCtrl_StopRecord 3338
-#define wxStyledTextCtrl_SetLexer 3339
-#define wxStyledTextCtrl_GetLexer 3340
-#define wxStyledTextCtrl_Colourise 3341
-#define wxStyledTextCtrl_SetProperty 3342
-#define wxStyledTextCtrl_SetKeyWords 3343
-#define wxStyledTextCtrl_SetLexerLanguage 3344
-#define wxStyledTextCtrl_GetProperty 3345
-#define wxStyledTextCtrl_GetStyleBitsNeeded 3346
-#define wxStyledTextCtrl_GetCurrentLine 3347
-#define wxStyledTextCtrl_StyleSetSpec 3348
-#define wxStyledTextCtrl_StyleSetFont 3349
-#define wxStyledTextCtrl_StyleSetFontAttr 3350
-#define wxStyledTextCtrl_StyleSetCharacterSet 3351
-#define wxStyledTextCtrl_StyleSetFontEncoding 3352
-#define wxStyledTextCtrl_CmdKeyExecute 3353
-#define wxStyledTextCtrl_SetMargins 3354
-#define wxStyledTextCtrl_GetSelection 3355
-#define wxStyledTextCtrl_PointFromPosition 3356
-#define wxStyledTextCtrl_ScrollToLine 3357
-#define wxStyledTextCtrl_ScrollToColumn 3358
-#define wxStyledTextCtrl_SendMsg 3359
-#define wxStyledTextCtrl_SetVScrollBar 3360
-#define wxStyledTextCtrl_SetHScrollBar 3361
-#define wxStyledTextCtrl_GetLastKeydownProcessed 3362
-#define wxStyledTextCtrl_SetLastKeydownProcessed 3363
-#define wxStyledTextCtrl_SaveFile 3364
-#define wxStyledTextCtrl_LoadFile 3365
-#define wxStyledTextCtrl_DoDragOver 3366
-#define wxStyledTextCtrl_DoDropText 3367
-#define wxStyledTextCtrl_GetUseAntiAliasing 3368
-#define wxStyledTextCtrl_AddTextRaw 3369
-#define wxStyledTextCtrl_InsertTextRaw 3370
-#define wxStyledTextCtrl_GetCurLineRaw 3371
-#define wxStyledTextCtrl_GetLineRaw 3372
-#define wxStyledTextCtrl_GetSelectedTextRaw 3373
-#define wxStyledTextCtrl_GetTextRangeRaw 3374
-#define wxStyledTextCtrl_SetTextRaw 3375
-#define wxStyledTextCtrl_GetTextRaw 3376
-#define wxStyledTextCtrl_AppendTextRaw 3377
-#define wxArtProvider_GetBitmap 3378
-#define wxArtProvider_GetIcon 3379
-#define wxTreeEvent_GetKeyCode 3380
-#define wxTreeEvent_GetItem 3381
-#define wxTreeEvent_GetKeyEvent 3382
-#define wxTreeEvent_GetLabel 3383
-#define wxTreeEvent_GetOldItem 3384
-#define wxTreeEvent_GetPoint 3385
-#define wxTreeEvent_IsEditCancelled 3386
-#define wxTreeEvent_SetToolTip 3387
-#define wxNotebookEvent_GetOldSelection 3388
-#define wxNotebookEvent_GetSelection 3389
-#define wxNotebookEvent_SetOldSelection 3390
-#define wxNotebookEvent_SetSelection 3391
-#define wxFileDataObject_new 3392
-#define wxFileDataObject_AddFile 3393
-#define wxFileDataObject_GetFilenames 3394
-#define wxFileDataObject_destroy 3395
-#define wxTextDataObject_new 3396
-#define wxTextDataObject_GetTextLength 3397
-#define wxTextDataObject_GetText 3398
-#define wxTextDataObject_SetText 3399
-#define wxTextDataObject_destroy 3400
-#define wxBitmapDataObject_new_1_1 3401
-#define wxBitmapDataObject_new_1_0 3402
-#define wxBitmapDataObject_GetBitmap 3403
-#define wxBitmapDataObject_SetBitmap 3404
-#define wxBitmapDataObject_destroy 3405
-#define wxClipboard_new 3407
-#define wxClipboard_destruct 3408
-#define wxClipboard_AddData 3409
-#define wxClipboard_Clear 3410
-#define wxClipboard_Close 3411
-#define wxClipboard_Flush 3412
-#define wxClipboard_GetData 3413
-#define wxClipboard_IsOpened 3414
-#define wxClipboard_Open 3415
-#define wxClipboard_SetData 3416
-#define wxClipboard_UsePrimarySelection 3418
-#define wxClipboard_IsSupported 3419
-#define wxClipboard_Get 3420
-#define wxSpinEvent_GetPosition 3421
-#define wxSpinEvent_SetPosition 3422
-#define wxSplitterWindow_new_0 3423
-#define wxSplitterWindow_new_2 3424
-#define wxSplitterWindow_destruct 3425
-#define wxSplitterWindow_Create 3426
-#define wxSplitterWindow_GetMinimumPaneSize 3427
-#define wxSplitterWindow_GetSashGravity 3428
-#define wxSplitterWindow_GetSashPosition 3429
-#define wxSplitterWindow_GetSplitMode 3430
-#define wxSplitterWindow_GetWindow1 3431
-#define wxSplitterWindow_GetWindow2 3432
-#define wxSplitterWindow_Initialize 3433
-#define wxSplitterWindow_IsSplit 3434
-#define wxSplitterWindow_ReplaceWindow 3435
-#define wxSplitterWindow_SetSashGravity 3436
-#define wxSplitterWindow_SetSashPosition 3437
-#define wxSplitterWindow_SetSashSize 3438
-#define wxSplitterWindow_SetMinimumPaneSize 3439
-#define wxSplitterWindow_SetSplitMode 3440
-#define wxSplitterWindow_SplitHorizontally 3441
-#define wxSplitterWindow_SplitVertically 3442
-#define wxSplitterWindow_Unsplit 3443
-#define wxSplitterWindow_UpdateSize 3444
-#define wxSplitterEvent_GetSashPosition 3445
-#define wxSplitterEvent_GetX 3446
-#define wxSplitterEvent_GetY 3447
-#define wxSplitterEvent_GetWindowBeingRemoved 3448
-#define wxSplitterEvent_SetSashPosition 3449
-#define wxHtmlWindow_new_0 3450
-#define wxHtmlWindow_new_2 3451
-#define wxHtmlWindow_AppendToPage 3452
-#define wxHtmlWindow_GetOpenedAnchor 3453
-#define wxHtmlWindow_GetOpenedPage 3454
-#define wxHtmlWindow_GetOpenedPageTitle 3455
-#define wxHtmlWindow_GetRelatedFrame 3456
-#define wxHtmlWindow_HistoryBack 3457
-#define wxHtmlWindow_HistoryCanBack 3458
-#define wxHtmlWindow_HistoryCanForward 3459
-#define wxHtmlWindow_HistoryClear 3460
-#define wxHtmlWindow_HistoryForward 3461
-#define wxHtmlWindow_LoadFile 3462
-#define wxHtmlWindow_LoadPage 3463
-#define wxHtmlWindow_SelectAll 3464
-#define wxHtmlWindow_SelectionToText 3465
-#define wxHtmlWindow_SelectLine 3466
-#define wxHtmlWindow_SelectWord 3467
-#define wxHtmlWindow_SetBorders 3468
-#define wxHtmlWindow_SetFonts 3469
-#define wxHtmlWindow_SetPage 3470
-#define wxHtmlWindow_SetRelatedFrame 3471
-#define wxHtmlWindow_SetRelatedStatusBar 3472
-#define wxHtmlWindow_ToText 3473
-#define wxHtmlWindow_destroy 3474
-#define wxHtmlLinkEvent_GetLinkInfo 3475
-#define wxSystemSettings_GetColour 3476
-#define wxSystemSettings_GetFont 3477
-#define wxSystemSettings_GetMetric 3478
-#define wxSystemSettings_GetScreenType 3479
-#define wxAuiNotebookEvent_SetSelection 3480
-#define wxAuiNotebookEvent_GetSelection 3481
-#define wxAuiNotebookEvent_SetOldSelection 3482
-#define wxAuiNotebookEvent_GetOldSelection 3483
-#define wxAuiNotebookEvent_SetDragSource 3484
-#define wxAuiNotebookEvent_GetDragSource 3485
-#define wxAuiManagerEvent_SetManager 3486
-#define wxAuiManagerEvent_GetManager 3487
-#define wxAuiManagerEvent_SetPane 3488
-#define wxAuiManagerEvent_GetPane 3489
-#define wxAuiManagerEvent_SetButton 3490
-#define wxAuiManagerEvent_GetButton 3491
-#define wxAuiManagerEvent_SetDC 3492
-#define wxAuiManagerEvent_GetDC 3493
-#define wxAuiManagerEvent_Veto 3494
-#define wxAuiManagerEvent_GetVeto 3495
-#define wxAuiManagerEvent_SetCanVeto 3496
-#define wxAuiManagerEvent_CanVeto 3497
-#define wxLogNull_new 3498
-#define wxLogNull_destroy 3499
+#define wxListItemAttr_new_0 1757
+#define wxListItemAttr_new_3 1758
+#define wxListItemAttr_GetBackgroundColour 1759
+#define wxListItemAttr_GetFont 1760
+#define wxListItemAttr_GetTextColour 1761
+#define wxListItemAttr_HasBackgroundColour 1762
+#define wxListItemAttr_HasFont 1763
+#define wxListItemAttr_HasTextColour 1764
+#define wxListItemAttr_SetBackgroundColour 1765
+#define wxListItemAttr_SetFont 1766
+#define wxListItemAttr_SetTextColour 1767
+#define wxListItemAttr_destroy 1768
+#define wxImageList_new_0 1769
+#define wxImageList_new_3 1770
+#define wxImageList_Add_1 1771
+#define wxImageList_Add_2_0 1772
+#define wxImageList_Add_2_1 1773
+#define wxImageList_Create 1774
+#define wxImageList_Draw 1776
+#define wxImageList_GetBitmap 1777
+#define wxImageList_GetIcon 1778
+#define wxImageList_GetImageCount 1779
+#define wxImageList_GetSize 1780
+#define wxImageList_Remove 1781
+#define wxImageList_RemoveAll 1782
+#define wxImageList_Replace_2 1783
+#define wxImageList_Replace_3 1784
+#define wxImageList_destroy 1785
+#define wxTextAttr_new_0 1786
+#define wxTextAttr_new_2 1787
+#define wxTextAttr_GetAlignment 1788
+#define wxTextAttr_GetBackgroundColour 1789
+#define wxTextAttr_GetFont 1790
+#define wxTextAttr_GetLeftIndent 1791
+#define wxTextAttr_GetLeftSubIndent 1792
+#define wxTextAttr_GetRightIndent 1793
+#define wxTextAttr_GetTabs 1794
+#define wxTextAttr_GetTextColour 1795
+#define wxTextAttr_HasBackgroundColour 1796
+#define wxTextAttr_HasFont 1797
+#define wxTextAttr_HasTextColour 1798
+#define wxTextAttr_GetFlags 1799
+#define wxTextAttr_IsDefault 1800
+#define wxTextAttr_SetAlignment 1801
+#define wxTextAttr_SetBackgroundColour 1802
+#define wxTextAttr_SetFlags 1803
+#define wxTextAttr_SetFont 1804
+#define wxTextAttr_SetLeftIndent 1805
+#define wxTextAttr_SetRightIndent 1806
+#define wxTextAttr_SetTabs 1807
+#define wxTextAttr_SetTextColour 1808
+#define wxTextAttr_destroy 1809
+#define wxTextCtrl_new_3 1811
+#define wxTextCtrl_new_0 1812
+#define wxTextCtrl_destruct 1814
+#define wxTextCtrl_AppendText 1815
+#define wxTextCtrl_CanCopy 1816
+#define wxTextCtrl_CanCut 1817
+#define wxTextCtrl_CanPaste 1818
+#define wxTextCtrl_CanRedo 1819
+#define wxTextCtrl_CanUndo 1820
+#define wxTextCtrl_Clear 1821
+#define wxTextCtrl_Copy 1822
+#define wxTextCtrl_Create 1823
+#define wxTextCtrl_Cut 1824
+#define wxTextCtrl_DiscardEdits 1825
+#define wxTextCtrl_EmulateKeyPress 1826
+#define wxTextCtrl_GetDefaultStyle 1827
+#define wxTextCtrl_GetInsertionPoint 1828
+#define wxTextCtrl_GetLastPosition 1829
+#define wxTextCtrl_GetLineLength 1830
+#define wxTextCtrl_GetLineText 1831
+#define wxTextCtrl_GetNumberOfLines 1832
+#define wxTextCtrl_GetRange 1833
+#define wxTextCtrl_GetSelection 1834
+#define wxTextCtrl_GetStringSelection 1835
+#define wxTextCtrl_GetStyle 1836
+#define wxTextCtrl_GetValue 1837
+#define wxTextCtrl_IsEditable 1838
+#define wxTextCtrl_IsModified 1839
+#define wxTextCtrl_IsMultiLine 1840
+#define wxTextCtrl_IsSingleLine 1841
+#define wxTextCtrl_LoadFile 1842
+#define wxTextCtrl_MarkDirty 1843
+#define wxTextCtrl_Paste 1844
+#define wxTextCtrl_PositionToXY 1845
+#define wxTextCtrl_Redo 1846
+#define wxTextCtrl_Remove 1847
+#define wxTextCtrl_Replace 1848
+#define wxTextCtrl_SaveFile 1849
+#define wxTextCtrl_SetDefaultStyle 1850
+#define wxTextCtrl_SetEditable 1851
+#define wxTextCtrl_SetInsertionPoint 1852
+#define wxTextCtrl_SetInsertionPointEnd 1853
+#define wxTextCtrl_SetMaxLength 1855
+#define wxTextCtrl_SetSelection 1856
+#define wxTextCtrl_SetStyle 1857
+#define wxTextCtrl_SetValue 1858
+#define wxTextCtrl_ShowPosition 1859
+#define wxTextCtrl_Undo 1860
+#define wxTextCtrl_WriteText 1861
+#define wxTextCtrl_XYToPosition 1862
+#define wxNotebook_new_0 1865
+#define wxNotebook_new_3 1866
+#define wxNotebook_destruct 1867
+#define wxNotebook_AddPage 1868
+#define wxNotebook_AdvanceSelection 1869
+#define wxNotebook_AssignImageList 1870
+#define wxNotebook_Create 1871
+#define wxNotebook_DeleteAllPages 1872
+#define wxNotebook_DeletePage 1873
+#define wxNotebook_RemovePage 1874
+#define wxNotebook_GetCurrentPage 1875
+#define wxNotebook_GetImageList 1876
+#define wxNotebook_GetPage 1878
+#define wxNotebook_GetPageCount 1879
+#define wxNotebook_GetPageImage 1880
+#define wxNotebook_GetPageText 1881
+#define wxNotebook_GetRowCount 1882
+#define wxNotebook_GetSelection 1883
+#define wxNotebook_GetThemeBackgroundColour 1884
+#define wxNotebook_HitTest 1886
+#define wxNotebook_InsertPage 1888
+#define wxNotebook_SetImageList 1889
+#define wxNotebook_SetPadding 1890
+#define wxNotebook_SetPageSize 1891
+#define wxNotebook_SetPageImage 1892
+#define wxNotebook_SetPageText 1893
+#define wxNotebook_SetSelection 1894
+#define wxNotebook_ChangeSelection 1895
+#define wxChoicebook_new_0 1896
+#define wxChoicebook_new_3 1897
+#define wxChoicebook_AddPage 1898
+#define wxChoicebook_AdvanceSelection 1899
+#define wxChoicebook_AssignImageList 1900
+#define wxChoicebook_Create 1901
+#define wxChoicebook_DeleteAllPages 1902
+#define wxChoicebook_DeletePage 1903
+#define wxChoicebook_RemovePage 1904
+#define wxChoicebook_GetCurrentPage 1905
+#define wxChoicebook_GetImageList 1906
+#define wxChoicebook_GetPage 1908
+#define wxChoicebook_GetPageCount 1909
+#define wxChoicebook_GetPageImage 1910
+#define wxChoicebook_GetPageText 1911
+#define wxChoicebook_GetSelection 1912
+#define wxChoicebook_HitTest 1913
+#define wxChoicebook_InsertPage 1914
+#define wxChoicebook_SetImageList 1915
+#define wxChoicebook_SetPageSize 1916
+#define wxChoicebook_SetPageImage 1917
+#define wxChoicebook_SetPageText 1918
+#define wxChoicebook_SetSelection 1919
+#define wxChoicebook_ChangeSelection 1920
+#define wxChoicebook_destroy 1921
+#define wxToolbook_new_0 1922
+#define wxToolbook_new_3 1923
+#define wxToolbook_AddPage 1924
+#define wxToolbook_AdvanceSelection 1925
+#define wxToolbook_AssignImageList 1926
+#define wxToolbook_Create 1927
+#define wxToolbook_DeleteAllPages 1928
+#define wxToolbook_DeletePage 1929
+#define wxToolbook_RemovePage 1930
+#define wxToolbook_GetCurrentPage 1931
+#define wxToolbook_GetImageList 1932
+#define wxToolbook_GetPage 1934
+#define wxToolbook_GetPageCount 1935
+#define wxToolbook_GetPageImage 1936
+#define wxToolbook_GetPageText 1937
+#define wxToolbook_GetSelection 1938
+#define wxToolbook_HitTest 1940
+#define wxToolbook_InsertPage 1941
+#define wxToolbook_SetImageList 1942
+#define wxToolbook_SetPageSize 1943
+#define wxToolbook_SetPageImage 1944
+#define wxToolbook_SetPageText 1945
+#define wxToolbook_SetSelection 1946
+#define wxToolbook_ChangeSelection 1947
+#define wxToolbook_destroy 1948
+#define wxListbook_new_0 1949
+#define wxListbook_new_3 1950
+#define wxListbook_AddPage 1951
+#define wxListbook_AdvanceSelection 1952
+#define wxListbook_AssignImageList 1953
+#define wxListbook_Create 1954
+#define wxListbook_DeleteAllPages 1955
+#define wxListbook_DeletePage 1956
+#define wxListbook_RemovePage 1957
+#define wxListbook_GetCurrentPage 1958
+#define wxListbook_GetImageList 1959
+#define wxListbook_GetPage 1961
+#define wxListbook_GetPageCount 1962
+#define wxListbook_GetPageImage 1963
+#define wxListbook_GetPageText 1964
+#define wxListbook_GetSelection 1965
+#define wxListbook_HitTest 1967
+#define wxListbook_InsertPage 1968
+#define wxListbook_SetImageList 1969
+#define wxListbook_SetPageSize 1970
+#define wxListbook_SetPageImage 1971
+#define wxListbook_SetPageText 1972
+#define wxListbook_SetSelection 1973
+#define wxListbook_ChangeSelection 1974
+#define wxListbook_destroy 1975
+#define wxTreebook_new_0 1976
+#define wxTreebook_new_3 1977
+#define wxTreebook_AddPage 1978
+#define wxTreebook_AdvanceSelection 1979
+#define wxTreebook_AssignImageList 1980
+#define wxTreebook_Create 1981
+#define wxTreebook_DeleteAllPages 1982
+#define wxTreebook_DeletePage 1983
+#define wxTreebook_RemovePage 1984
+#define wxTreebook_GetCurrentPage 1985
+#define wxTreebook_GetImageList 1986
+#define wxTreebook_GetPage 1988
+#define wxTreebook_GetPageCount 1989
+#define wxTreebook_GetPageImage 1990
+#define wxTreebook_GetPageText 1991
+#define wxTreebook_GetSelection 1992
+#define wxTreebook_ExpandNode 1993
+#define wxTreebook_IsNodeExpanded 1994
+#define wxTreebook_HitTest 1996
+#define wxTreebook_InsertPage 1997
+#define wxTreebook_InsertSubPage 1998
+#define wxTreebook_SetImageList 1999
+#define wxTreebook_SetPageSize 2000
+#define wxTreebook_SetPageImage 2001
+#define wxTreebook_SetPageText 2002
+#define wxTreebook_SetSelection 2003
+#define wxTreebook_ChangeSelection 2004
+#define wxTreebook_destroy 2005
+#define wxTreeCtrl_new_2 2008
+#define wxTreeCtrl_new_0 2009
+#define wxTreeCtrl_destruct 2011
+#define wxTreeCtrl_AddRoot 2012
+#define wxTreeCtrl_AppendItem 2013
+#define wxTreeCtrl_AssignImageList 2014
+#define wxTreeCtrl_AssignStateImageList 2015
+#define wxTreeCtrl_Collapse 2016
+#define wxTreeCtrl_CollapseAndReset 2017
+#define wxTreeCtrl_Create 2018
+#define wxTreeCtrl_Delete 2019
+#define wxTreeCtrl_DeleteAllItems 2020
+#define wxTreeCtrl_DeleteChildren 2021
+#define wxTreeCtrl_EditLabel 2022
+#define wxTreeCtrl_EnsureVisible 2023
+#define wxTreeCtrl_Expand 2024
+#define wxTreeCtrl_GetBoundingRect 2025
+#define wxTreeCtrl_GetChildrenCount 2027
+#define wxTreeCtrl_GetCount 2028
+#define wxTreeCtrl_GetEditControl 2029
+#define wxTreeCtrl_GetFirstChild 2030
+#define wxTreeCtrl_GetNextChild 2031
+#define wxTreeCtrl_GetFirstVisibleItem 2032
+#define wxTreeCtrl_GetImageList 2033
+#define wxTreeCtrl_GetIndent 2034
+#define wxTreeCtrl_GetItemBackgroundColour 2035
+#define wxTreeCtrl_GetItemData 2036
+#define wxTreeCtrl_GetItemFont 2037
+#define wxTreeCtrl_GetItemImage_1 2038
+#define wxTreeCtrl_GetItemImage_2 2039
+#define wxTreeCtrl_GetItemText 2040
+#define wxTreeCtrl_GetItemTextColour 2041
+#define wxTreeCtrl_GetLastChild 2042
+#define wxTreeCtrl_GetNextSibling 2043
+#define wxTreeCtrl_GetNextVisible 2044
+#define wxTreeCtrl_GetItemParent 2045
+#define wxTreeCtrl_GetPrevSibling 2046
+#define wxTreeCtrl_GetPrevVisible 2047
+#define wxTreeCtrl_GetRootItem 2048
+#define wxTreeCtrl_GetSelection 2049
+#define wxTreeCtrl_GetSelections 2050
+#define wxTreeCtrl_GetStateImageList 2051
+#define wxTreeCtrl_HitTest 2052
+#define wxTreeCtrl_InsertItem 2054
+#define wxTreeCtrl_IsBold 2055
+#define wxTreeCtrl_IsExpanded 2056
+#define wxTreeCtrl_IsSelected 2057
+#define wxTreeCtrl_IsVisible 2058
+#define wxTreeCtrl_ItemHasChildren 2059
+#define wxTreeCtrl_PrependItem 2060
+#define wxTreeCtrl_ScrollTo 2061
+#define wxTreeCtrl_SelectItem_1 2062
+#define wxTreeCtrl_SelectItem_2 2063
+#define wxTreeCtrl_SetIndent 2064
+#define wxTreeCtrl_SetImageList 2065
+#define wxTreeCtrl_SetItemBackgroundColour 2066
+#define wxTreeCtrl_SetItemBold 2067
+#define wxTreeCtrl_SetItemData 2068
+#define wxTreeCtrl_SetItemDropHighlight 2069
+#define wxTreeCtrl_SetItemFont 2070
+#define wxTreeCtrl_SetItemHasChildren 2071
+#define wxTreeCtrl_SetItemImage_2 2072
+#define wxTreeCtrl_SetItemImage_3 2073
+#define wxTreeCtrl_SetItemText 2074
+#define wxTreeCtrl_SetItemTextColour 2075
+#define wxTreeCtrl_SetStateImageList 2076
+#define wxTreeCtrl_SetWindowStyle 2077
+#define wxTreeCtrl_SortChildren 2078
+#define wxTreeCtrl_Toggle 2079
+#define wxTreeCtrl_ToggleItemSelection 2080
+#define wxTreeCtrl_Unselect 2081
+#define wxTreeCtrl_UnselectAll 2082
+#define wxTreeCtrl_UnselectItem 2083
+#define wxScrollBar_new_0 2084
+#define wxScrollBar_new_3 2085
+#define wxScrollBar_destruct 2086
+#define wxScrollBar_Create 2087
+#define wxScrollBar_GetRange 2088
+#define wxScrollBar_GetPageSize 2089
+#define wxScrollBar_GetThumbPosition 2090
+#define wxScrollBar_GetThumbSize 2091
+#define wxScrollBar_SetThumbPosition 2092
+#define wxScrollBar_SetScrollbar 2093
+#define wxSpinButton_new_2 2095
+#define wxSpinButton_new_0 2096
+#define wxSpinButton_Create 2097
+#define wxSpinButton_GetMax 2098
+#define wxSpinButton_GetMin 2099
+#define wxSpinButton_GetValue 2100
+#define wxSpinButton_SetRange 2101
+#define wxSpinButton_SetValue 2102
+#define wxSpinButton_destroy 2103
+#define wxSpinCtrl_new_0 2104
+#define wxSpinCtrl_new_2 2105
+#define wxSpinCtrl_Create 2107
+#define wxSpinCtrl_SetValue_1_1 2110
+#define wxSpinCtrl_SetValue_1_0 2111
+#define wxSpinCtrl_GetValue 2113
+#define wxSpinCtrl_SetRange 2115
+#define wxSpinCtrl_SetSelection 2116
+#define wxSpinCtrl_GetMin 2118
+#define wxSpinCtrl_GetMax 2120
+#define wxSpinCtrl_destroy 2121
+#define wxStaticText_new_0 2122
+#define wxStaticText_new_4 2123
+#define wxStaticText_Create 2124
+#define wxStaticText_GetLabel 2125
+#define wxStaticText_SetLabel 2126
+#define wxStaticText_Wrap 2127
+#define wxStaticText_destroy 2128
+#define wxStaticBitmap_new_0 2129
+#define wxStaticBitmap_new_4 2130
+#define wxStaticBitmap_Create 2131
+#define wxStaticBitmap_GetBitmap 2132
+#define wxStaticBitmap_SetBitmap 2133
+#define wxStaticBitmap_destroy 2134
+#define wxRadioBox_new 2135
+#define wxRadioBox_destruct 2137
+#define wxRadioBox_Create 2138
+#define wxRadioBox_Enable_2 2139
+#define wxRadioBox_Enable_1 2140
+#define wxRadioBox_GetSelection 2141
+#define wxRadioBox_GetString 2142
+#define wxRadioBox_SetSelection 2143
+#define wxRadioBox_Show_2 2144
+#define wxRadioBox_Show_1 2145
+#define wxRadioBox_GetColumnCount 2146
+#define wxRadioBox_GetItemHelpText 2147
+#define wxRadioBox_GetItemToolTip 2148
+#define wxRadioBox_GetItemFromPoint 2150
+#define wxRadioBox_GetRowCount 2151
+#define wxRadioBox_IsItemEnabled 2152
+#define wxRadioBox_IsItemShown 2153
+#define wxRadioBox_SetItemHelpText 2154
+#define wxRadioBox_SetItemToolTip 2155
+#define wxRadioButton_new_0 2156
+#define wxRadioButton_new_4 2157
+#define wxRadioButton_Create 2158
+#define wxRadioButton_GetValue 2159
+#define wxRadioButton_SetValue 2160
+#define wxRadioButton_destroy 2161
+#define wxSlider_new_6 2163
+#define wxSlider_new_0 2164
+#define wxSlider_Create 2165
+#define wxSlider_GetLineSize 2166
+#define wxSlider_GetMax 2167
+#define wxSlider_GetMin 2168
+#define wxSlider_GetPageSize 2169
+#define wxSlider_GetThumbLength 2170
+#define wxSlider_GetValue 2171
+#define wxSlider_SetLineSize 2172
+#define wxSlider_SetPageSize 2173
+#define wxSlider_SetRange 2174
+#define wxSlider_SetThumbLength 2175
+#define wxSlider_SetValue 2176
+#define wxSlider_destroy 2177
+#define wxDialog_new_4 2179
+#define wxDialog_new_0 2180
+#define wxDialog_destruct 2182
+#define wxDialog_Create 2183
+#define wxDialog_CreateButtonSizer 2184
+#define wxDialog_CreateStdDialogButtonSizer 2185
+#define wxDialog_EndModal 2186
+#define wxDialog_GetAffirmativeId 2187
+#define wxDialog_GetReturnCode 2188
+#define wxDialog_IsModal 2189
+#define wxDialog_SetAffirmativeId 2190
+#define wxDialog_SetReturnCode 2191
+#define wxDialog_Show 2192
+#define wxDialog_ShowModal 2193
+#define wxColourDialog_new_0 2194
+#define wxColourDialog_new_2 2195
+#define wxColourDialog_destruct 2196
+#define wxColourDialog_Create 2197
+#define wxColourDialog_GetColourData 2198
+#define wxColourData_new_0 2199
+#define wxColourData_new_1 2200
+#define wxColourData_destruct 2201
+#define wxColourData_GetChooseFull 2202
+#define wxColourData_GetColour 2203
+#define wxColourData_GetCustomColour 2205
+#define wxColourData_SetChooseFull 2206
+#define wxColourData_SetColour 2207
+#define wxColourData_SetCustomColour 2208
+#define wxPalette_new_0 2209
+#define wxPalette_new_4 2210
+#define wxPalette_destruct 2212
+#define wxPalette_Create 2213
+#define wxPalette_GetColoursCount 2214
+#define wxPalette_GetPixel 2215
+#define wxPalette_GetRGB 2216
+#define wxPalette_IsOk 2217
+#define wxDirDialog_new 2221
+#define wxDirDialog_destruct 2222
+#define wxDirDialog_GetPath 2223
+#define wxDirDialog_GetMessage 2224
+#define wxDirDialog_SetMessage 2225
+#define wxDirDialog_SetPath 2226
+#define wxFileDialog_new 2230
+#define wxFileDialog_destruct 2231
+#define wxFileDialog_GetDirectory 2232
+#define wxFileDialog_GetFilename 2233
+#define wxFileDialog_GetFilenames 2234
+#define wxFileDialog_GetFilterIndex 2235
+#define wxFileDialog_GetMessage 2236
+#define wxFileDialog_GetPath 2237
+#define wxFileDialog_GetPaths 2238
+#define wxFileDialog_GetWildcard 2239
+#define wxFileDialog_SetDirectory 2240
+#define wxFileDialog_SetFilename 2241
+#define wxFileDialog_SetFilterIndex 2242
+#define wxFileDialog_SetMessage 2243
+#define wxFileDialog_SetPath 2244
+#define wxFileDialog_SetWildcard 2245
+#define wxPickerBase_SetInternalMargin 2246
+#define wxPickerBase_GetInternalMargin 2247
+#define wxPickerBase_SetTextCtrlProportion 2248
+#define wxPickerBase_SetPickerCtrlProportion 2249
+#define wxPickerBase_GetTextCtrlProportion 2250
+#define wxPickerBase_GetPickerCtrlProportion 2251
+#define wxPickerBase_HasTextCtrl 2252
+#define wxPickerBase_GetTextCtrl 2253
+#define wxPickerBase_IsTextCtrlGrowable 2254
+#define wxPickerBase_SetPickerCtrlGrowable 2255
+#define wxPickerBase_SetTextCtrlGrowable 2256
+#define wxPickerBase_IsPickerCtrlGrowable 2257
+#define wxFilePickerCtrl_new_0 2258
+#define wxFilePickerCtrl_new_3 2259
+#define wxFilePickerCtrl_Create 2260
+#define wxFilePickerCtrl_GetPath 2261
+#define wxFilePickerCtrl_SetPath 2262
+#define wxFilePickerCtrl_destroy 2263
+#define wxDirPickerCtrl_new_0 2264
+#define wxDirPickerCtrl_new_3 2265
+#define wxDirPickerCtrl_Create 2266
+#define wxDirPickerCtrl_GetPath 2267
+#define wxDirPickerCtrl_SetPath 2268
+#define wxDirPickerCtrl_destroy 2269
+#define wxColourPickerCtrl_new_0 2270
+#define wxColourPickerCtrl_new_3 2271
+#define wxColourPickerCtrl_Create 2272
+#define wxColourPickerCtrl_GetColour 2273
+#define wxColourPickerCtrl_SetColour_1_1 2274
+#define wxColourPickerCtrl_SetColour_1_0 2275
+#define wxColourPickerCtrl_destroy 2276
+#define wxDatePickerCtrl_new_0 2277
+#define wxDatePickerCtrl_new_3 2278
+#define wxDatePickerCtrl_GetRange 2279
+#define wxDatePickerCtrl_GetValue 2280
+#define wxDatePickerCtrl_SetRange 2281
+#define wxDatePickerCtrl_SetValue 2282
+#define wxDatePickerCtrl_destroy 2283
+#define wxFontPickerCtrl_new_0 2284
+#define wxFontPickerCtrl_new_3 2285
+#define wxFontPickerCtrl_Create 2286
+#define wxFontPickerCtrl_GetSelectedFont 2287
+#define wxFontPickerCtrl_SetSelectedFont 2288
+#define wxFontPickerCtrl_GetMaxPointSize 2289
+#define wxFontPickerCtrl_SetMaxPointSize 2290
+#define wxFontPickerCtrl_destroy 2291
+#define wxFindReplaceDialog_new_0 2294
+#define wxFindReplaceDialog_new_4 2295
+#define wxFindReplaceDialog_destruct 2296
+#define wxFindReplaceDialog_Create 2297
+#define wxFindReplaceDialog_GetData 2298
+#define wxFindReplaceData_new_0 2299
+#define wxFindReplaceData_new_1 2300
+#define wxFindReplaceData_GetFindString 2301
+#define wxFindReplaceData_GetReplaceString 2302
+#define wxFindReplaceData_GetFlags 2303
+#define wxFindReplaceData_SetFlags 2304
+#define wxFindReplaceData_SetFindString 2305
+#define wxFindReplaceData_SetReplaceString 2306
+#define wxFindReplaceData_destroy 2307
+#define wxMultiChoiceDialog_new_0 2308
+#define wxMultiChoiceDialog_new_5 2310
+#define wxMultiChoiceDialog_GetSelections 2311
+#define wxMultiChoiceDialog_SetSelections 2312
+#define wxMultiChoiceDialog_destroy 2313
+#define wxSingleChoiceDialog_new_0 2314
+#define wxSingleChoiceDialog_new_5 2316
+#define wxSingleChoiceDialog_GetSelection 2317
+#define wxSingleChoiceDialog_GetStringSelection 2318
+#define wxSingleChoiceDialog_SetSelection 2319
+#define wxSingleChoiceDialog_destroy 2320
+#define wxTextEntryDialog_new 2321
+#define wxTextEntryDialog_GetValue 2322
+#define wxTextEntryDialog_SetValue 2323
+#define wxTextEntryDialog_destroy 2324
+#define wxPasswordEntryDialog_new 2325
+#define wxPasswordEntryDialog_destroy 2326
+#define wxFontData_new_0 2327
+#define wxFontData_new_1 2328
+#define wxFontData_destruct 2329
+#define wxFontData_EnableEffects 2330
+#define wxFontData_GetAllowSymbols 2331
+#define wxFontData_GetColour 2332
+#define wxFontData_GetChosenFont 2333
+#define wxFontData_GetEnableEffects 2334
+#define wxFontData_GetInitialFont 2335
+#define wxFontData_GetShowHelp 2336
+#define wxFontData_SetAllowSymbols 2337
+#define wxFontData_SetChosenFont 2338
+#define wxFontData_SetColour 2339
+#define wxFontData_SetInitialFont 2340
+#define wxFontData_SetRange 2341
+#define wxFontData_SetShowHelp 2342
+#define wxFontDialog_new_0 2346
+#define wxFontDialog_new_2 2348
+#define wxFontDialog_Create 2350
+#define wxFontDialog_GetFontData 2351
+#define wxFontDialog_destroy 2353
+#define wxProgressDialog_new 2354
+#define wxProgressDialog_destruct 2355
+#define wxProgressDialog_Resume 2356
+#define wxProgressDialog_Update_2 2357
+#define wxProgressDialog_Update_0 2358
+#define wxMessageDialog_new 2359
+#define wxMessageDialog_destruct 2360
+#define wxPageSetupDialog_new 2361
+#define wxPageSetupDialog_destruct 2362
+#define wxPageSetupDialog_GetPageSetupData 2363
+#define wxPageSetupDialog_ShowModal 2364
+#define wxPageSetupDialogData_new_0 2365
+#define wxPageSetupDialogData_new_1_0 2366
+#define wxPageSetupDialogData_new_1_1 2367
+#define wxPageSetupDialogData_destruct 2368
+#define wxPageSetupDialogData_EnableHelp 2369
+#define wxPageSetupDialogData_EnableMargins 2370
+#define wxPageSetupDialogData_EnableOrientation 2371
+#define wxPageSetupDialogData_EnablePaper 2372
+#define wxPageSetupDialogData_EnablePrinter 2373
+#define wxPageSetupDialogData_GetDefaultMinMargins 2374
+#define wxPageSetupDialogData_GetEnableMargins 2375
+#define wxPageSetupDialogData_GetEnableOrientation 2376
+#define wxPageSetupDialogData_GetEnablePaper 2377
+#define wxPageSetupDialogData_GetEnablePrinter 2378
+#define wxPageSetupDialogData_GetEnableHelp 2379
+#define wxPageSetupDialogData_GetDefaultInfo 2380
+#define wxPageSetupDialogData_GetMarginTopLeft 2381
+#define wxPageSetupDialogData_GetMarginBottomRight 2382
+#define wxPageSetupDialogData_GetMinMarginTopLeft 2383
+#define wxPageSetupDialogData_GetMinMarginBottomRight 2384
+#define wxPageSetupDialogData_GetPaperId 2385
+#define wxPageSetupDialogData_GetPaperSize 2386
+#define wxPageSetupDialogData_GetPrintData 2388
+#define wxPageSetupDialogData_IsOk 2389
+#define wxPageSetupDialogData_SetDefaultInfo 2390
+#define wxPageSetupDialogData_SetDefaultMinMargins 2391
+#define wxPageSetupDialogData_SetMarginTopLeft 2392
+#define wxPageSetupDialogData_SetMarginBottomRight 2393
+#define wxPageSetupDialogData_SetMinMarginTopLeft 2394
+#define wxPageSetupDialogData_SetMinMarginBottomRight 2395
+#define wxPageSetupDialogData_SetPaperId 2396
+#define wxPageSetupDialogData_SetPaperSize_1_1 2397
+#define wxPageSetupDialogData_SetPaperSize_1_0 2398
+#define wxPageSetupDialogData_SetPrintData 2399
+#define wxPrintDialog_new_2_0 2400
+#define wxPrintDialog_new_2_1 2401
+#define wxPrintDialog_destruct 2402
+#define wxPrintDialog_GetPrintDialogData 2403
+#define wxPrintDialog_GetPrintDC 2404
+#define wxPrintDialogData_new_0 2405
+#define wxPrintDialogData_new_1_1 2406
+#define wxPrintDialogData_new_1_0 2407
+#define wxPrintDialogData_destruct 2408
+#define wxPrintDialogData_EnableHelp 2409
+#define wxPrintDialogData_EnablePageNumbers 2410
+#define wxPrintDialogData_EnablePrintToFile 2411
+#define wxPrintDialogData_EnableSelection 2412
+#define wxPrintDialogData_GetAllPages 2413
+#define wxPrintDialogData_GetCollate 2414
+#define wxPrintDialogData_GetFromPage 2415
+#define wxPrintDialogData_GetMaxPage 2416
+#define wxPrintDialogData_GetMinPage 2417
+#define wxPrintDialogData_GetNoCopies 2418
+#define wxPrintDialogData_GetPrintData 2419
+#define wxPrintDialogData_GetPrintToFile 2420
+#define wxPrintDialogData_GetSelection 2421
+#define wxPrintDialogData_GetToPage 2422
+#define wxPrintDialogData_IsOk 2423
+#define wxPrintDialogData_SetCollate 2424
+#define wxPrintDialogData_SetFromPage 2425
+#define wxPrintDialogData_SetMaxPage 2426
+#define wxPrintDialogData_SetMinPage 2427
+#define wxPrintDialogData_SetNoCopies 2428
+#define wxPrintDialogData_SetPrintData 2429
+#define wxPrintDialogData_SetPrintToFile 2430
+#define wxPrintDialogData_SetSelection 2431
+#define wxPrintDialogData_SetToPage 2432
+#define wxPrintData_new_0 2433
+#define wxPrintData_new_1 2434
+#define wxPrintData_destruct 2435
+#define wxPrintData_GetCollate 2436
+#define wxPrintData_GetBin 2437
+#define wxPrintData_GetColour 2438
+#define wxPrintData_GetDuplex 2439
+#define wxPrintData_GetNoCopies 2440
+#define wxPrintData_GetOrientation 2441
+#define wxPrintData_GetPaperId 2442
+#define wxPrintData_GetPrinterName 2443
+#define wxPrintData_GetQuality 2444
+#define wxPrintData_IsOk 2445
+#define wxPrintData_SetBin 2446
+#define wxPrintData_SetCollate 2447
+#define wxPrintData_SetColour 2448
+#define wxPrintData_SetDuplex 2449
+#define wxPrintData_SetNoCopies 2450
+#define wxPrintData_SetOrientation 2451
+#define wxPrintData_SetPaperId 2452
+#define wxPrintData_SetPrinterName 2453
+#define wxPrintData_SetQuality 2454
+#define wxPrintPreview_new_2 2457
+#define wxPrintPreview_new_3 2458
+#define wxPrintPreview_destruct 2460
+#define wxPrintPreview_GetCanvas 2461
+#define wxPrintPreview_GetCurrentPage 2462
+#define wxPrintPreview_GetFrame 2463
+#define wxPrintPreview_GetMaxPage 2464
+#define wxPrintPreview_GetMinPage 2465
+#define wxPrintPreview_GetPrintout 2466
+#define wxPrintPreview_GetPrintoutForPrinting 2467
+#define wxPrintPreview_IsOk 2468
+#define wxPrintPreview_PaintPage 2469
+#define wxPrintPreview_Print 2470
+#define wxPrintPreview_RenderPage 2471
+#define wxPrintPreview_SetCanvas 2472
+#define wxPrintPreview_SetCurrentPage 2473
+#define wxPrintPreview_SetFrame 2474
+#define wxPrintPreview_SetPrintout 2475
+#define wxPrintPreview_SetZoom 2476
+#define wxPreviewFrame_new 2477
+#define wxPreviewFrame_destruct 2478
+#define wxPreviewFrame_CreateControlBar 2479
+#define wxPreviewFrame_CreateCanvas 2480
+#define wxPreviewFrame_Initialize 2481
+#define wxPreviewFrame_OnCloseWindow 2482
+#define wxPreviewControlBar_new 2483
+#define wxPreviewControlBar_destruct 2484
+#define wxPreviewControlBar_CreateButtons 2485
+#define wxPreviewControlBar_GetPrintPreview 2486
+#define wxPreviewControlBar_GetZoomControl 2487
+#define wxPreviewControlBar_SetZoomControl 2488
+#define wxPrinter_new 2490
+#define wxPrinter_CreateAbortWindow 2491
+#define wxPrinter_GetAbort 2492
+#define wxPrinter_GetLastError 2493
+#define wxPrinter_GetPrintDialogData 2494
+#define wxPrinter_Print 2495
+#define wxPrinter_PrintDialog 2496
+#define wxPrinter_ReportError 2497
+#define wxPrinter_Setup 2498
+#define wxPrinter_destroy 2499
+#define wxXmlResource_new_1 2500
+#define wxXmlResource_new_2 2501
+#define wxXmlResource_destruct 2502
+#define wxXmlResource_AttachUnknownControl 2503
+#define wxXmlResource_ClearHandlers 2504
+#define wxXmlResource_CompareVersion 2505
+#define wxXmlResource_Get 2506
+#define wxXmlResource_GetFlags 2507
+#define wxXmlResource_GetVersion 2508
+#define wxXmlResource_GetXRCID 2509
+#define wxXmlResource_InitAllHandlers 2510
+#define wxXmlResource_Load 2511
+#define wxXmlResource_LoadBitmap 2512
+#define wxXmlResource_LoadDialog_2 2513
+#define wxXmlResource_LoadDialog_3 2514
+#define wxXmlResource_LoadFrame_2 2515
+#define wxXmlResource_LoadFrame_3 2516
+#define wxXmlResource_LoadIcon 2517
+#define wxXmlResource_LoadMenu 2518
+#define wxXmlResource_LoadMenuBar_2 2519
+#define wxXmlResource_LoadMenuBar_1 2520
+#define wxXmlResource_LoadPanel_2 2521
+#define wxXmlResource_LoadPanel_3 2522
+#define wxXmlResource_LoadToolBar 2523
+#define wxXmlResource_Set 2524
+#define wxXmlResource_SetFlags 2525
+#define wxXmlResource_Unload 2526
+#define wxXmlResource_xrcctrl 2527
+#define wxHtmlEasyPrinting_new 2528
+#define wxHtmlEasyPrinting_destruct 2529
+#define wxHtmlEasyPrinting_GetPrintData 2530
+#define wxHtmlEasyPrinting_GetPageSetupData 2531
+#define wxHtmlEasyPrinting_PreviewFile 2532
+#define wxHtmlEasyPrinting_PreviewText 2533
+#define wxHtmlEasyPrinting_PrintFile 2534
+#define wxHtmlEasyPrinting_PrintText 2535
+#define wxHtmlEasyPrinting_PageSetup 2536
+#define wxHtmlEasyPrinting_SetFonts 2537
+#define wxHtmlEasyPrinting_SetHeader 2538
+#define wxHtmlEasyPrinting_SetFooter 2539
+#define wxGLCanvas_new_2 2541
+#define wxGLCanvas_new_3_1 2542
+#define wxGLCanvas_new_3_0 2543
+#define wxGLCanvas_GetContext 2544
+#define wxGLCanvas_SetCurrent 2546
+#define wxGLCanvas_SwapBuffers 2547
+#define wxGLCanvas_destroy 2548
+#define wxAuiManager_new 2549
+#define wxAuiManager_destruct 2550
+#define wxAuiManager_AddPane_2_1 2551
+#define wxAuiManager_AddPane_3 2552
+#define wxAuiManager_AddPane_2_0 2553
+#define wxAuiManager_DetachPane 2554
+#define wxAuiManager_GetAllPanes 2555
+#define wxAuiManager_GetArtProvider 2556
+#define wxAuiManager_GetDockSizeConstraint 2557
+#define wxAuiManager_GetFlags 2558
+#define wxAuiManager_GetManagedWindow 2559
+#define wxAuiManager_GetManager 2560
+#define wxAuiManager_GetPane_1_1 2561
+#define wxAuiManager_GetPane_1_0 2562
+#define wxAuiManager_HideHint 2563
+#define wxAuiManager_InsertPane 2564
+#define wxAuiManager_LoadPaneInfo 2565
+#define wxAuiManager_LoadPerspective 2566
+#define wxAuiManager_SavePaneInfo 2567
+#define wxAuiManager_SavePerspective 2568
+#define wxAuiManager_SetArtProvider 2569
+#define wxAuiManager_SetDockSizeConstraint 2570
+#define wxAuiManager_SetFlags 2571
+#define wxAuiManager_SetManagedWindow 2572
+#define wxAuiManager_ShowHint 2573
+#define wxAuiManager_UnInit 2574
+#define wxAuiManager_Update 2575
+#define wxAuiPaneInfo_new_0 2576
+#define wxAuiPaneInfo_new_1 2577
+#define wxAuiPaneInfo_destruct 2578
+#define wxAuiPaneInfo_BestSize_1 2579
+#define wxAuiPaneInfo_BestSize_2 2580
+#define wxAuiPaneInfo_Bottom 2581
+#define wxAuiPaneInfo_BottomDockable 2582
+#define wxAuiPaneInfo_Caption 2583
+#define wxAuiPaneInfo_CaptionVisible 2584
+#define wxAuiPaneInfo_Centre 2585
+#define wxAuiPaneInfo_CentrePane 2586
+#define wxAuiPaneInfo_CloseButton 2587
+#define wxAuiPaneInfo_DefaultPane 2588
+#define wxAuiPaneInfo_DestroyOnClose 2589
+#define wxAuiPaneInfo_Direction 2590
+#define wxAuiPaneInfo_Dock 2591
+#define wxAuiPaneInfo_Dockable 2592
+#define wxAuiPaneInfo_Fixed 2593
+#define wxAuiPaneInfo_Float 2594
+#define wxAuiPaneInfo_Floatable 2595
+#define wxAuiPaneInfo_FloatingPosition_1 2596
+#define wxAuiPaneInfo_FloatingPosition_2 2597
+#define wxAuiPaneInfo_FloatingSize_1 2598
+#define wxAuiPaneInfo_FloatingSize_2 2599
+#define wxAuiPaneInfo_Gripper 2600
+#define wxAuiPaneInfo_GripperTop 2601
+#define wxAuiPaneInfo_HasBorder 2602
+#define wxAuiPaneInfo_HasCaption 2603
+#define wxAuiPaneInfo_HasCloseButton 2604
+#define wxAuiPaneInfo_HasFlag 2605
+#define wxAuiPaneInfo_HasGripper 2606
+#define wxAuiPaneInfo_HasGripperTop 2607
+#define wxAuiPaneInfo_HasMaximizeButton 2608
+#define wxAuiPaneInfo_HasMinimizeButton 2609
+#define wxAuiPaneInfo_HasPinButton 2610
+#define wxAuiPaneInfo_Hide 2611
+#define wxAuiPaneInfo_IsBottomDockable 2612
+#define wxAuiPaneInfo_IsDocked 2613
+#define wxAuiPaneInfo_IsFixed 2614
+#define wxAuiPaneInfo_IsFloatable 2615
+#define wxAuiPaneInfo_IsFloating 2616
+#define wxAuiPaneInfo_IsLeftDockable 2617
+#define wxAuiPaneInfo_IsMovable 2618
+#define wxAuiPaneInfo_IsOk 2619
+#define wxAuiPaneInfo_IsResizable 2620
+#define wxAuiPaneInfo_IsRightDockable 2621
+#define wxAuiPaneInfo_IsShown 2622
+#define wxAuiPaneInfo_IsToolbar 2623
+#define wxAuiPaneInfo_IsTopDockable 2624
+#define wxAuiPaneInfo_Layer 2625
+#define wxAuiPaneInfo_Left 2626
+#define wxAuiPaneInfo_LeftDockable 2627
+#define wxAuiPaneInfo_MaxSize_1 2628
+#define wxAuiPaneInfo_MaxSize_2 2629
+#define wxAuiPaneInfo_MaximizeButton 2630
+#define wxAuiPaneInfo_MinSize_1 2631
+#define wxAuiPaneInfo_MinSize_2 2632
+#define wxAuiPaneInfo_MinimizeButton 2633
+#define wxAuiPaneInfo_Movable 2634
+#define wxAuiPaneInfo_Name 2635
+#define wxAuiPaneInfo_PaneBorder 2636
+#define wxAuiPaneInfo_PinButton 2637
+#define wxAuiPaneInfo_Position 2638
+#define wxAuiPaneInfo_Resizable 2639
+#define wxAuiPaneInfo_Right 2640
+#define wxAuiPaneInfo_RightDockable 2641
+#define wxAuiPaneInfo_Row 2642
+#define wxAuiPaneInfo_SafeSet 2643
+#define wxAuiPaneInfo_SetFlag 2644
+#define wxAuiPaneInfo_Show 2645
+#define wxAuiPaneInfo_ToolbarPane 2646
+#define wxAuiPaneInfo_Top 2647
+#define wxAuiPaneInfo_TopDockable 2648
+#define wxAuiPaneInfo_Window 2649
+#define wxAuiNotebook_new_0 2650
+#define wxAuiNotebook_new_2 2651
+#define wxAuiNotebook_AddPage 2652
+#define wxAuiNotebook_Create 2653
+#define wxAuiNotebook_DeletePage 2654
+#define wxAuiNotebook_GetArtProvider 2655
+#define wxAuiNotebook_GetPage 2656
+#define wxAuiNotebook_GetPageBitmap 2657
+#define wxAuiNotebook_GetPageCount 2658
+#define wxAuiNotebook_GetPageIndex 2659
+#define wxAuiNotebook_GetPageText 2660
+#define wxAuiNotebook_GetSelection 2661
+#define wxAuiNotebook_InsertPage 2662
+#define wxAuiNotebook_RemovePage 2663
+#define wxAuiNotebook_SetArtProvider 2664
+#define wxAuiNotebook_SetFont 2665
+#define wxAuiNotebook_SetPageBitmap 2666
+#define wxAuiNotebook_SetPageText 2667
+#define wxAuiNotebook_SetSelection 2668
+#define wxAuiNotebook_SetTabCtrlHeight 2669
+#define wxAuiNotebook_SetUniformBitmapSize 2670
+#define wxAuiNotebook_destroy 2671
+#define wxMDIParentFrame_new_0 2672
+#define wxMDIParentFrame_new_4 2673
+#define wxMDIParentFrame_destruct 2674
+#define wxMDIParentFrame_ActivateNext 2675
+#define wxMDIParentFrame_ActivatePrevious 2676
+#define wxMDIParentFrame_ArrangeIcons 2677
+#define wxMDIParentFrame_Cascade 2678
+#define wxMDIParentFrame_Create 2679
+#define wxMDIParentFrame_GetActiveChild 2680
+#define wxMDIParentFrame_GetClientWindow 2681
+#define wxMDIParentFrame_Tile 2682
+#define wxMDIChildFrame_new_0 2683
+#define wxMDIChildFrame_new_4 2684
+#define wxMDIChildFrame_destruct 2685
+#define wxMDIChildFrame_Activate 2686
+#define wxMDIChildFrame_Create 2687
+#define wxMDIChildFrame_Maximize 2688
+#define wxMDIChildFrame_Restore 2689
+#define wxMDIClientWindow_new_0 2690
+#define wxMDIClientWindow_new_2 2691
+#define wxMDIClientWindow_destruct 2692
+#define wxMDIClientWindow_CreateClient 2693
+#define wxLayoutAlgorithm_new 2694
+#define wxLayoutAlgorithm_LayoutFrame 2695
+#define wxLayoutAlgorithm_LayoutMDIFrame 2696
+#define wxLayoutAlgorithm_LayoutWindow 2697
+#define wxLayoutAlgorithm_destroy 2698
+#define wxEvent_GetId 2699
+#define wxEvent_GetSkipped 2700
+#define wxEvent_GetTimestamp 2701
+#define wxEvent_IsCommandEvent 2702
+#define wxEvent_ResumePropagation 2703
+#define wxEvent_ShouldPropagate 2704
+#define wxEvent_Skip 2705
+#define wxEvent_StopPropagation 2706
+#define wxCommandEvent_getClientData 2707
+#define wxCommandEvent_GetExtraLong 2708
+#define wxCommandEvent_GetInt 2709
+#define wxCommandEvent_GetSelection 2710
+#define wxCommandEvent_GetString 2711
+#define wxCommandEvent_IsChecked 2712
+#define wxCommandEvent_IsSelection 2713
+#define wxCommandEvent_SetInt 2714
+#define wxCommandEvent_SetString 2715
+#define wxScrollEvent_GetOrientation 2716
+#define wxScrollEvent_GetPosition 2717
+#define wxScrollWinEvent_GetOrientation 2718
+#define wxScrollWinEvent_GetPosition 2719
+#define wxMouseEvent_AltDown 2720
+#define wxMouseEvent_Button 2721
+#define wxMouseEvent_ButtonDClick 2722
+#define wxMouseEvent_ButtonDown 2723
+#define wxMouseEvent_ButtonUp 2724
+#define wxMouseEvent_CmdDown 2725
+#define wxMouseEvent_ControlDown 2726
+#define wxMouseEvent_Dragging 2727
+#define wxMouseEvent_Entering 2728
+#define wxMouseEvent_GetButton 2729
+#define wxMouseEvent_GetPosition 2732
+#define wxMouseEvent_GetLogicalPosition 2733
+#define wxMouseEvent_GetLinesPerAction 2734
+#define wxMouseEvent_GetWheelRotation 2735
+#define wxMouseEvent_GetWheelDelta 2736
+#define wxMouseEvent_GetX 2737
+#define wxMouseEvent_GetY 2738
+#define wxMouseEvent_IsButton 2739
+#define wxMouseEvent_IsPageScroll 2740
+#define wxMouseEvent_Leaving 2741
+#define wxMouseEvent_LeftDClick 2742
+#define wxMouseEvent_LeftDown 2743
+#define wxMouseEvent_LeftIsDown 2744
+#define wxMouseEvent_LeftUp 2745
+#define wxMouseEvent_MetaDown 2746
+#define wxMouseEvent_MiddleDClick 2747
+#define wxMouseEvent_MiddleDown 2748
+#define wxMouseEvent_MiddleIsDown 2749
+#define wxMouseEvent_MiddleUp 2750
+#define wxMouseEvent_Moving 2751
+#define wxMouseEvent_RightDClick 2752
+#define wxMouseEvent_RightDown 2753
+#define wxMouseEvent_RightIsDown 2754
+#define wxMouseEvent_RightUp 2755
+#define wxMouseEvent_ShiftDown 2756
+#define wxSetCursorEvent_GetCursor 2757
+#define wxSetCursorEvent_GetX 2758
+#define wxSetCursorEvent_GetY 2759
+#define wxSetCursorEvent_HasCursor 2760
+#define wxSetCursorEvent_SetCursor 2761
+#define wxKeyEvent_AltDown 2762
+#define wxKeyEvent_CmdDown 2763
+#define wxKeyEvent_ControlDown 2764
+#define wxKeyEvent_GetKeyCode 2765
+#define wxKeyEvent_GetModifiers 2766
+#define wxKeyEvent_GetPosition 2769
+#define wxKeyEvent_GetRawKeyCode 2770
+#define wxKeyEvent_GetRawKeyFlags 2771
+#define wxKeyEvent_GetUnicodeKey 2772
+#define wxKeyEvent_GetX 2773
+#define wxKeyEvent_GetY 2774
+#define wxKeyEvent_HasModifiers 2775
+#define wxKeyEvent_MetaDown 2776
+#define wxKeyEvent_ShiftDown 2777
+#define wxSizeEvent_GetSize 2778
+#define wxMoveEvent_GetPosition 2779
+#define wxEraseEvent_GetDC 2780
+#define wxFocusEvent_GetWindow 2781
+#define wxChildFocusEvent_GetWindow 2782
+#define wxMenuEvent_GetMenu 2783
+#define wxMenuEvent_GetMenuId 2784
+#define wxMenuEvent_IsPopup 2785
+#define wxCloseEvent_CanVeto 2786
+#define wxCloseEvent_GetLoggingOff 2787
+#define wxCloseEvent_SetCanVeto 2788
+#define wxCloseEvent_SetLoggingOff 2789
+#define wxCloseEvent_Veto 2790
+#define wxShowEvent_SetShow 2791
+#define wxShowEvent_GetShow 2792
+#define wxIconizeEvent_Iconized 2793
+#define wxJoystickEvent_ButtonDown 2794
+#define wxJoystickEvent_ButtonIsDown 2795
+#define wxJoystickEvent_ButtonUp 2796
+#define wxJoystickEvent_GetButtonChange 2797
+#define wxJoystickEvent_GetButtonState 2798
+#define wxJoystickEvent_GetJoystick 2799
+#define wxJoystickEvent_GetPosition 2800
+#define wxJoystickEvent_GetZPosition 2801
+#define wxJoystickEvent_IsButton 2802
+#define wxJoystickEvent_IsMove 2803
+#define wxJoystickEvent_IsZMove 2804
+#define wxUpdateUIEvent_CanUpdate 2805
+#define wxUpdateUIEvent_Check 2806
+#define wxUpdateUIEvent_Enable 2807
+#define wxUpdateUIEvent_Show 2808
+#define wxUpdateUIEvent_GetChecked 2809
+#define wxUpdateUIEvent_GetEnabled 2810
+#define wxUpdateUIEvent_GetShown 2811
+#define wxUpdateUIEvent_GetSetChecked 2812
+#define wxUpdateUIEvent_GetSetEnabled 2813
+#define wxUpdateUIEvent_GetSetShown 2814
+#define wxUpdateUIEvent_GetSetText 2815
+#define wxUpdateUIEvent_GetText 2816
+#define wxUpdateUIEvent_GetMode 2817
+#define wxUpdateUIEvent_GetUpdateInterval 2818
+#define wxUpdateUIEvent_ResetUpdateTime 2819
+#define wxUpdateUIEvent_SetMode 2820
+#define wxUpdateUIEvent_SetText 2821
+#define wxUpdateUIEvent_SetUpdateInterval 2822
+#define wxMouseCaptureChangedEvent_GetCapturedWindow 2823
+#define wxPaletteChangedEvent_SetChangedWindow 2824
+#define wxPaletteChangedEvent_GetChangedWindow 2825
+#define wxQueryNewPaletteEvent_SetPaletteRealized 2826
+#define wxQueryNewPaletteEvent_GetPaletteRealized 2827
+#define wxNavigationKeyEvent_GetDirection 2828
+#define wxNavigationKeyEvent_SetDirection 2829
+#define wxNavigationKeyEvent_IsWindowChange 2830
+#define wxNavigationKeyEvent_SetWindowChange 2831
+#define wxNavigationKeyEvent_IsFromTab 2832
+#define wxNavigationKeyEvent_SetFromTab 2833
+#define wxNavigationKeyEvent_GetCurrentFocus 2834
+#define wxNavigationKeyEvent_SetCurrentFocus 2835
+#define wxHelpEvent_GetOrigin 2836
+#define wxHelpEvent_GetPosition 2837
+#define wxHelpEvent_SetOrigin 2838
+#define wxHelpEvent_SetPosition 2839
+#define wxContextMenuEvent_GetPosition 2840
+#define wxContextMenuEvent_SetPosition 2841
+#define wxIdleEvent_CanSend 2842
+#define wxIdleEvent_GetMode 2843
+#define wxIdleEvent_RequestMore 2844
+#define wxIdleEvent_MoreRequested 2845
+#define wxIdleEvent_SetMode 2846
+#define wxGridEvent_AltDown 2847
+#define wxGridEvent_ControlDown 2848
+#define wxGridEvent_GetCol 2849
+#define wxGridEvent_GetPosition 2850
+#define wxGridEvent_GetRow 2851
+#define wxGridEvent_MetaDown 2852
+#define wxGridEvent_Selecting 2853
+#define wxGridEvent_ShiftDown 2854
+#define wxNotifyEvent_Allow 2855
+#define wxNotifyEvent_IsAllowed 2856
+#define wxNotifyEvent_Veto 2857
+#define wxSashEvent_GetEdge 2858
+#define wxSashEvent_GetDragRect 2859
+#define wxSashEvent_GetDragStatus 2860
+#define wxListEvent_GetCacheFrom 2861
+#define wxListEvent_GetCacheTo 2862
+#define wxListEvent_GetKeyCode 2863
+#define wxListEvent_GetIndex 2864
+#define wxListEvent_GetColumn 2865
+#define wxListEvent_GetPoint 2866
+#define wxListEvent_GetLabel 2867
+#define wxListEvent_GetText 2868
+#define wxListEvent_GetImage 2869
+#define wxListEvent_GetData 2870
+#define wxListEvent_GetMask 2871
+#define wxListEvent_GetItem 2872
+#define wxListEvent_IsEditCancelled 2873
+#define wxDateEvent_GetDate 2874
+#define wxCalendarEvent_GetWeekDay 2875
+#define wxFileDirPickerEvent_GetPath 2876
+#define wxColourPickerEvent_GetColour 2877
+#define wxFontPickerEvent_GetFont 2878
+#define wxStyledTextEvent_GetPosition 2879
+#define wxStyledTextEvent_GetKey 2880
+#define wxStyledTextEvent_GetModifiers 2881
+#define wxStyledTextEvent_GetModificationType 2882
+#define wxStyledTextEvent_GetText 2883
+#define wxStyledTextEvent_GetLength 2884
+#define wxStyledTextEvent_GetLinesAdded 2885
+#define wxStyledTextEvent_GetLine 2886
+#define wxStyledTextEvent_GetFoldLevelNow 2887
+#define wxStyledTextEvent_GetFoldLevelPrev 2888
+#define wxStyledTextEvent_GetMargin 2889
+#define wxStyledTextEvent_GetMessage 2890
+#define wxStyledTextEvent_GetWParam 2891
+#define wxStyledTextEvent_GetLParam 2892
+#define wxStyledTextEvent_GetListType 2893
+#define wxStyledTextEvent_GetX 2894
+#define wxStyledTextEvent_GetY 2895
+#define wxStyledTextEvent_GetDragText 2896
+#define wxStyledTextEvent_GetDragAllowMove 2897
+#define wxStyledTextEvent_GetDragResult 2898
+#define wxStyledTextEvent_GetShift 2899
+#define wxStyledTextEvent_GetControl 2900
+#define wxStyledTextEvent_GetAlt 2901
+#define utils_wxGetKeyState 2902
+#define utils_wxGetMousePosition 2903
+#define utils_wxGetMouseState 2904
+#define utils_wxSetDetectableAutoRepeat 2905
+#define utils_wxBell 2906
+#define utils_wxFindMenuItemId 2907
+#define utils_wxGenericFindWindowAtPoint 2908
+#define utils_wxFindWindowAtPoint 2909
+#define utils_wxBeginBusyCursor 2910
+#define utils_wxEndBusyCursor 2911
+#define utils_wxIsBusy 2912
+#define utils_wxShutdown 2913
+#define utils_wxShell 2914
+#define utils_wxLaunchDefaultBrowser 2915
+#define utils_wxGetEmailAddress 2916
+#define utils_wxGetUserId 2917
+#define utils_wxGetHomeDir 2918
+#define utils_wxNewId 2919
+#define utils_wxRegisterId 2920
+#define utils_wxGetCurrentId 2921
+#define utils_wxGetOsDescription 2922
+#define utils_wxIsPlatformLittleEndian 2923
+#define utils_wxIsPlatform64Bit 2924
+#define wxPrintout_new 2925
+#define wxPrintout_destruct 2926
+#define wxPrintout_GetDC 2927
+#define wxPrintout_GetPageSizeMM 2928
+#define wxPrintout_GetPageSizePixels 2929
+#define wxPrintout_GetPaperRectPixels 2930
+#define wxPrintout_GetPPIPrinter 2931
+#define wxPrintout_GetPPIScreen 2932
+#define wxPrintout_GetTitle 2933
+#define wxPrintout_IsPreview 2934
+#define wxPrintout_FitThisSizeToPaper 2935
+#define wxPrintout_FitThisSizeToPage 2936
+#define wxPrintout_FitThisSizeToPageMargins 2937
+#define wxPrintout_MapScreenSizeToPaper 2938
+#define wxPrintout_MapScreenSizeToPage 2939
+#define wxPrintout_MapScreenSizeToPageMargins 2940
+#define wxPrintout_MapScreenSizeToDevice 2941
+#define wxPrintout_GetLogicalPaperRect 2942
+#define wxPrintout_GetLogicalPageRect 2943
+#define wxPrintout_GetLogicalPageMarginsRect 2944
+#define wxPrintout_SetLogicalOrigin 2945
+#define wxPrintout_OffsetLogicalOrigin 2946
+#define wxStyledTextCtrl_new_2 2947
+#define wxStyledTextCtrl_new_0 2948
+#define wxStyledTextCtrl_destruct 2949
+#define wxStyledTextCtrl_Create 2950
+#define wxStyledTextCtrl_AddText 2951
+#define wxStyledTextCtrl_AddStyledText 2952
+#define wxStyledTextCtrl_InsertText 2953
+#define wxStyledTextCtrl_ClearAll 2954
+#define wxStyledTextCtrl_ClearDocumentStyle 2955
+#define wxStyledTextCtrl_GetLength 2956
+#define wxStyledTextCtrl_GetCharAt 2957
+#define wxStyledTextCtrl_GetCurrentPos 2958
+#define wxStyledTextCtrl_GetAnchor 2959
+#define wxStyledTextCtrl_GetStyleAt 2960
+#define wxStyledTextCtrl_Redo 2961
+#define wxStyledTextCtrl_SetUndoCollection 2962
+#define wxStyledTextCtrl_SelectAll 2963
+#define wxStyledTextCtrl_SetSavePoint 2964
+#define wxStyledTextCtrl_GetStyledText 2965
+#define wxStyledTextCtrl_CanRedo 2966
+#define wxStyledTextCtrl_MarkerLineFromHandle 2967
+#define wxStyledTextCtrl_MarkerDeleteHandle 2968
+#define wxStyledTextCtrl_GetUndoCollection 2969
+#define wxStyledTextCtrl_GetViewWhiteSpace 2970
+#define wxStyledTextCtrl_SetViewWhiteSpace 2971
+#define wxStyledTextCtrl_PositionFromPoint 2972
+#define wxStyledTextCtrl_PositionFromPointClose 2973
+#define wxStyledTextCtrl_GotoLine 2974
+#define wxStyledTextCtrl_GotoPos 2975
+#define wxStyledTextCtrl_SetAnchor 2976
+#define wxStyledTextCtrl_GetCurLine 2977
+#define wxStyledTextCtrl_GetEndStyled 2978
+#define wxStyledTextCtrl_ConvertEOLs 2979
+#define wxStyledTextCtrl_GetEOLMode 2980
+#define wxStyledTextCtrl_SetEOLMode 2981
+#define wxStyledTextCtrl_StartStyling 2982
+#define wxStyledTextCtrl_SetStyling 2983
+#define wxStyledTextCtrl_GetBufferedDraw 2984
+#define wxStyledTextCtrl_SetBufferedDraw 2985
+#define wxStyledTextCtrl_SetTabWidth 2986
+#define wxStyledTextCtrl_GetTabWidth 2987
+#define wxStyledTextCtrl_SetCodePage 2988
+#define wxStyledTextCtrl_MarkerDefine 2989
+#define wxStyledTextCtrl_MarkerSetForeground 2990
+#define wxStyledTextCtrl_MarkerSetBackground 2991
+#define wxStyledTextCtrl_MarkerAdd 2992
+#define wxStyledTextCtrl_MarkerDelete 2993
+#define wxStyledTextCtrl_MarkerDeleteAll 2994
+#define wxStyledTextCtrl_MarkerGet 2995
+#define wxStyledTextCtrl_MarkerNext 2996
+#define wxStyledTextCtrl_MarkerPrevious 2997
+#define wxStyledTextCtrl_MarkerDefineBitmap 2998
+#define wxStyledTextCtrl_MarkerAddSet 2999
+#define wxStyledTextCtrl_MarkerSetAlpha 3000
+#define wxStyledTextCtrl_SetMarginType 3001
+#define wxStyledTextCtrl_GetMarginType 3002
+#define wxStyledTextCtrl_SetMarginWidth 3003
+#define wxStyledTextCtrl_GetMarginWidth 3004
+#define wxStyledTextCtrl_SetMarginMask 3005
+#define wxStyledTextCtrl_GetMarginMask 3006
+#define wxStyledTextCtrl_SetMarginSensitive 3007
+#define wxStyledTextCtrl_GetMarginSensitive 3008
+#define wxStyledTextCtrl_StyleClearAll 3009
+#define wxStyledTextCtrl_StyleSetForeground 3010
+#define wxStyledTextCtrl_StyleSetBackground 3011
+#define wxStyledTextCtrl_StyleSetBold 3012
+#define wxStyledTextCtrl_StyleSetItalic 3013
+#define wxStyledTextCtrl_StyleSetSize 3014
+#define wxStyledTextCtrl_StyleSetFaceName 3015
+#define wxStyledTextCtrl_StyleSetEOLFilled 3016
+#define wxStyledTextCtrl_StyleResetDefault 3017
+#define wxStyledTextCtrl_StyleSetUnderline 3018
+#define wxStyledTextCtrl_StyleSetCase 3019
+#define wxStyledTextCtrl_StyleSetHotSpot 3020
+#define wxStyledTextCtrl_SetSelForeground 3021
+#define wxStyledTextCtrl_SetSelBackground 3022
+#define wxStyledTextCtrl_GetSelAlpha 3023
+#define wxStyledTextCtrl_SetSelAlpha 3024
+#define wxStyledTextCtrl_SetCaretForeground 3025
+#define wxStyledTextCtrl_CmdKeyAssign 3026
+#define wxStyledTextCtrl_CmdKeyClear 3027
+#define wxStyledTextCtrl_CmdKeyClearAll 3028
+#define wxStyledTextCtrl_SetStyleBytes 3029
+#define wxStyledTextCtrl_StyleSetVisible 3030
+#define wxStyledTextCtrl_GetCaretPeriod 3031
+#define wxStyledTextCtrl_SetCaretPeriod 3032
+#define wxStyledTextCtrl_SetWordChars 3033
+#define wxStyledTextCtrl_BeginUndoAction 3034
+#define wxStyledTextCtrl_EndUndoAction 3035
+#define wxStyledTextCtrl_IndicatorSetStyle 3036
+#define wxStyledTextCtrl_IndicatorGetStyle 3037
+#define wxStyledTextCtrl_IndicatorSetForeground 3038
+#define wxStyledTextCtrl_IndicatorGetForeground 3039
+#define wxStyledTextCtrl_SetWhitespaceForeground 3040
+#define wxStyledTextCtrl_SetWhitespaceBackground 3041
+#define wxStyledTextCtrl_GetStyleBits 3042
+#define wxStyledTextCtrl_SetLineState 3043
+#define wxStyledTextCtrl_GetLineState 3044
+#define wxStyledTextCtrl_GetMaxLineState 3045
+#define wxStyledTextCtrl_GetCaretLineVisible 3046
+#define wxStyledTextCtrl_SetCaretLineVisible 3047
+#define wxStyledTextCtrl_GetCaretLineBackground 3048
+#define wxStyledTextCtrl_SetCaretLineBackground 3049
+#define wxStyledTextCtrl_AutoCompShow 3050
+#define wxStyledTextCtrl_AutoCompCancel 3051
+#define wxStyledTextCtrl_AutoCompActive 3052
+#define wxStyledTextCtrl_AutoCompPosStart 3053
+#define wxStyledTextCtrl_AutoCompComplete 3054
+#define wxStyledTextCtrl_AutoCompStops 3055
+#define wxStyledTextCtrl_AutoCompSetSeparator 3056
+#define wxStyledTextCtrl_AutoCompGetSeparator 3057
+#define wxStyledTextCtrl_AutoCompSelect 3058
+#define wxStyledTextCtrl_AutoCompSetCancelAtStart 3059
+#define wxStyledTextCtrl_AutoCompGetCancelAtStart 3060
+#define wxStyledTextCtrl_AutoCompSetFillUps 3061
+#define wxStyledTextCtrl_AutoCompSetChooseSingle 3062
+#define wxStyledTextCtrl_AutoCompGetChooseSingle 3063
+#define wxStyledTextCtrl_AutoCompSetIgnoreCase 3064
+#define wxStyledTextCtrl_AutoCompGetIgnoreCase 3065
+#define wxStyledTextCtrl_UserListShow 3066
+#define wxStyledTextCtrl_AutoCompSetAutoHide 3067
+#define wxStyledTextCtrl_AutoCompGetAutoHide 3068
+#define wxStyledTextCtrl_AutoCompSetDropRestOfWord 3069
+#define wxStyledTextCtrl_AutoCompGetDropRestOfWord 3070
+#define wxStyledTextCtrl_RegisterImage 3071
+#define wxStyledTextCtrl_ClearRegisteredImages 3072
+#define wxStyledTextCtrl_AutoCompGetTypeSeparator 3073
+#define wxStyledTextCtrl_AutoCompSetTypeSeparator 3074
+#define wxStyledTextCtrl_AutoCompSetMaxWidth 3075
+#define wxStyledTextCtrl_AutoCompGetMaxWidth 3076
+#define wxStyledTextCtrl_AutoCompSetMaxHeight 3077
+#define wxStyledTextCtrl_AutoCompGetMaxHeight 3078
+#define wxStyledTextCtrl_SetIndent 3079
+#define wxStyledTextCtrl_GetIndent 3080
+#define wxStyledTextCtrl_SetUseTabs 3081
+#define wxStyledTextCtrl_GetUseTabs 3082
+#define wxStyledTextCtrl_SetLineIndentation 3083
+#define wxStyledTextCtrl_GetLineIndentation 3084
+#define wxStyledTextCtrl_GetLineIndentPosition 3085
+#define wxStyledTextCtrl_GetColumn 3086
+#define wxStyledTextCtrl_SetUseHorizontalScrollBar 3087
+#define wxStyledTextCtrl_GetUseHorizontalScrollBar 3088
+#define wxStyledTextCtrl_SetIndentationGuides 3089
+#define wxStyledTextCtrl_GetIndentationGuides 3090
+#define wxStyledTextCtrl_SetHighlightGuide 3091
+#define wxStyledTextCtrl_GetHighlightGuide 3092
+#define wxStyledTextCtrl_GetLineEndPosition 3093
+#define wxStyledTextCtrl_GetCodePage 3094
+#define wxStyledTextCtrl_GetCaretForeground 3095
+#define wxStyledTextCtrl_GetReadOnly 3096
+#define wxStyledTextCtrl_SetCurrentPos 3097
+#define wxStyledTextCtrl_SetSelectionStart 3098
+#define wxStyledTextCtrl_GetSelectionStart 3099
+#define wxStyledTextCtrl_SetSelectionEnd 3100
+#define wxStyledTextCtrl_GetSelectionEnd 3101
+#define wxStyledTextCtrl_SetPrintMagnification 3102
+#define wxStyledTextCtrl_GetPrintMagnification 3103
+#define wxStyledTextCtrl_SetPrintColourMode 3104
+#define wxStyledTextCtrl_GetPrintColourMode 3105
+#define wxStyledTextCtrl_FindText 3106
+#define wxStyledTextCtrl_FormatRange 3107
+#define wxStyledTextCtrl_GetFirstVisibleLine 3108
+#define wxStyledTextCtrl_GetLine 3109
+#define wxStyledTextCtrl_GetLineCount 3110
+#define wxStyledTextCtrl_SetMarginLeft 3111
+#define wxStyledTextCtrl_GetMarginLeft 3112
+#define wxStyledTextCtrl_SetMarginRight 3113
+#define wxStyledTextCtrl_GetMarginRight 3114
+#define wxStyledTextCtrl_GetModify 3115
+#define wxStyledTextCtrl_SetSelection 3116
+#define wxStyledTextCtrl_GetSelectedText 3117
+#define wxStyledTextCtrl_GetTextRange 3118
+#define wxStyledTextCtrl_HideSelection 3119
+#define wxStyledTextCtrl_LineFromPosition 3120
+#define wxStyledTextCtrl_PositionFromLine 3121
+#define wxStyledTextCtrl_LineScroll 3122
+#define wxStyledTextCtrl_EnsureCaretVisible 3123
+#define wxStyledTextCtrl_ReplaceSelection 3124
+#define wxStyledTextCtrl_SetReadOnly 3125
+#define wxStyledTextCtrl_CanPaste 3126
+#define wxStyledTextCtrl_CanUndo 3127
+#define wxStyledTextCtrl_EmptyUndoBuffer 3128
+#define wxStyledTextCtrl_Undo 3129
+#define wxStyledTextCtrl_Cut 3130
+#define wxStyledTextCtrl_Copy 3131
+#define wxStyledTextCtrl_Paste 3132
+#define wxStyledTextCtrl_Clear 3133
+#define wxStyledTextCtrl_SetText 3134
+#define wxStyledTextCtrl_GetText 3135
+#define wxStyledTextCtrl_GetTextLength 3136
+#define wxStyledTextCtrl_GetOvertype 3137
+#define wxStyledTextCtrl_SetCaretWidth 3138
+#define wxStyledTextCtrl_GetCaretWidth 3139
+#define wxStyledTextCtrl_SetTargetStart 3140
+#define wxStyledTextCtrl_GetTargetStart 3141
+#define wxStyledTextCtrl_SetTargetEnd 3142
+#define wxStyledTextCtrl_GetTargetEnd 3143
+#define wxStyledTextCtrl_ReplaceTarget 3144
+#define wxStyledTextCtrl_SearchInTarget 3145
+#define wxStyledTextCtrl_SetSearchFlags 3146
+#define wxStyledTextCtrl_GetSearchFlags 3147
+#define wxStyledTextCtrl_CallTipShow 3148
+#define wxStyledTextCtrl_CallTipCancel 3149
+#define wxStyledTextCtrl_CallTipActive 3150
+#define wxStyledTextCtrl_CallTipPosAtStart 3151
+#define wxStyledTextCtrl_CallTipSetHighlight 3152
+#define wxStyledTextCtrl_CallTipSetBackground 3153
+#define wxStyledTextCtrl_CallTipSetForeground 3154
+#define wxStyledTextCtrl_CallTipSetForegroundHighlight 3155
+#define wxStyledTextCtrl_CallTipUseStyle 3156
+#define wxStyledTextCtrl_VisibleFromDocLine 3157
+#define wxStyledTextCtrl_DocLineFromVisible 3158
+#define wxStyledTextCtrl_WrapCount 3159
+#define wxStyledTextCtrl_SetFoldLevel 3160
+#define wxStyledTextCtrl_GetFoldLevel 3161
+#define wxStyledTextCtrl_GetLastChild 3162
+#define wxStyledTextCtrl_GetFoldParent 3163
+#define wxStyledTextCtrl_ShowLines 3164
+#define wxStyledTextCtrl_HideLines 3165
+#define wxStyledTextCtrl_GetLineVisible 3166
+#define wxStyledTextCtrl_SetFoldExpanded 3167
+#define wxStyledTextCtrl_GetFoldExpanded 3168
+#define wxStyledTextCtrl_ToggleFold 3169
+#define wxStyledTextCtrl_EnsureVisible 3170
+#define wxStyledTextCtrl_SetFoldFlags 3171
+#define wxStyledTextCtrl_EnsureVisibleEnforcePolicy 3172
+#define wxStyledTextCtrl_SetTabIndents 3173
+#define wxStyledTextCtrl_GetTabIndents 3174
+#define wxStyledTextCtrl_SetBackSpaceUnIndents 3175
+#define wxStyledTextCtrl_GetBackSpaceUnIndents 3176
+#define wxStyledTextCtrl_SetMouseDwellTime 3177
+#define wxStyledTextCtrl_GetMouseDwellTime 3178
+#define wxStyledTextCtrl_WordStartPosition 3179
+#define wxStyledTextCtrl_WordEndPosition 3180
+#define wxStyledTextCtrl_SetWrapMode 3181
+#define wxStyledTextCtrl_GetWrapMode 3182
+#define wxStyledTextCtrl_SetWrapVisualFlags 3183
+#define wxStyledTextCtrl_GetWrapVisualFlags 3184
+#define wxStyledTextCtrl_SetWrapVisualFlagsLocation 3185
+#define wxStyledTextCtrl_GetWrapVisualFlagsLocation 3186
+#define wxStyledTextCtrl_SetWrapStartIndent 3187
+#define wxStyledTextCtrl_GetWrapStartIndent 3188
+#define wxStyledTextCtrl_SetLayoutCache 3189
+#define wxStyledTextCtrl_GetLayoutCache 3190
+#define wxStyledTextCtrl_SetScrollWidth 3191
+#define wxStyledTextCtrl_GetScrollWidth 3192
+#define wxStyledTextCtrl_TextWidth 3193
+#define wxStyledTextCtrl_GetEndAtLastLine 3194
+#define wxStyledTextCtrl_TextHeight 3195
+#define wxStyledTextCtrl_SetUseVerticalScrollBar 3196
+#define wxStyledTextCtrl_GetUseVerticalScrollBar 3197
+#define wxStyledTextCtrl_AppendText 3198
+#define wxStyledTextCtrl_GetTwoPhaseDraw 3199
+#define wxStyledTextCtrl_SetTwoPhaseDraw 3200
+#define wxStyledTextCtrl_TargetFromSelection 3201
+#define wxStyledTextCtrl_LinesJoin 3202
+#define wxStyledTextCtrl_LinesSplit 3203
+#define wxStyledTextCtrl_SetFoldMarginColour 3204
+#define wxStyledTextCtrl_SetFoldMarginHiColour 3205
+#define wxStyledTextCtrl_LineDown 3206
+#define wxStyledTextCtrl_LineDownExtend 3207
+#define wxStyledTextCtrl_LineUp 3208
+#define wxStyledTextCtrl_LineUpExtend 3209
+#define wxStyledTextCtrl_CharLeft 3210
+#define wxStyledTextCtrl_CharLeftExtend 3211
+#define wxStyledTextCtrl_CharRight 3212
+#define wxStyledTextCtrl_CharRightExtend 3213
+#define wxStyledTextCtrl_WordLeft 3214
+#define wxStyledTextCtrl_WordLeftExtend 3215
+#define wxStyledTextCtrl_WordRight 3216
+#define wxStyledTextCtrl_WordRightExtend 3217
+#define wxStyledTextCtrl_Home 3218
+#define wxStyledTextCtrl_HomeExtend 3219
+#define wxStyledTextCtrl_LineEnd 3220
+#define wxStyledTextCtrl_LineEndExtend 3221
+#define wxStyledTextCtrl_DocumentStart 3222
+#define wxStyledTextCtrl_DocumentStartExtend 3223
+#define wxStyledTextCtrl_DocumentEnd 3224
+#define wxStyledTextCtrl_DocumentEndExtend 3225
+#define wxStyledTextCtrl_PageUp 3226
+#define wxStyledTextCtrl_PageUpExtend 3227
+#define wxStyledTextCtrl_PageDown 3228
+#define wxStyledTextCtrl_PageDownExtend 3229
+#define wxStyledTextCtrl_EditToggleOvertype 3230
+#define wxStyledTextCtrl_Cancel 3231
+#define wxStyledTextCtrl_DeleteBack 3232
+#define wxStyledTextCtrl_Tab 3233
+#define wxStyledTextCtrl_BackTab 3234
+#define wxStyledTextCtrl_NewLine 3235
+#define wxStyledTextCtrl_FormFeed 3236
+#define wxStyledTextCtrl_VCHome 3237
+#define wxStyledTextCtrl_VCHomeExtend 3238
+#define wxStyledTextCtrl_ZoomIn 3239
+#define wxStyledTextCtrl_ZoomOut 3240
+#define wxStyledTextCtrl_DelWordLeft 3241
+#define wxStyledTextCtrl_DelWordRight 3242
+#define wxStyledTextCtrl_LineCut 3243
+#define wxStyledTextCtrl_LineDelete 3244
+#define wxStyledTextCtrl_LineTranspose 3245
+#define wxStyledTextCtrl_LineDuplicate 3246
+#define wxStyledTextCtrl_LowerCase 3247
+#define wxStyledTextCtrl_UpperCase 3248
+#define wxStyledTextCtrl_LineScrollDown 3249
+#define wxStyledTextCtrl_LineScrollUp 3250
+#define wxStyledTextCtrl_DeleteBackNotLine 3251
+#define wxStyledTextCtrl_HomeDisplay 3252
+#define wxStyledTextCtrl_HomeDisplayExtend 3253
+#define wxStyledTextCtrl_LineEndDisplay 3254
+#define wxStyledTextCtrl_LineEndDisplayExtend 3255
+#define wxStyledTextCtrl_HomeWrapExtend 3256
+#define wxStyledTextCtrl_LineEndWrap 3257
+#define wxStyledTextCtrl_LineEndWrapExtend 3258
+#define wxStyledTextCtrl_VCHomeWrap 3259
+#define wxStyledTextCtrl_VCHomeWrapExtend 3260
+#define wxStyledTextCtrl_LineCopy 3261
+#define wxStyledTextCtrl_MoveCaretInsideView 3262
+#define wxStyledTextCtrl_LineLength 3263
+#define wxStyledTextCtrl_BraceHighlight 3264
+#define wxStyledTextCtrl_BraceBadLight 3265
+#define wxStyledTextCtrl_BraceMatch 3266
+#define wxStyledTextCtrl_GetViewEOL 3267
+#define wxStyledTextCtrl_SetViewEOL 3268
+#define wxStyledTextCtrl_SetModEventMask 3269
+#define wxStyledTextCtrl_GetEdgeColumn 3270
+#define wxStyledTextCtrl_SetEdgeColumn 3271
+#define wxStyledTextCtrl_GetEdgeMode 3272
+#define wxStyledTextCtrl_GetEdgeColour 3273
+#define wxStyledTextCtrl_SetEdgeColour 3274
+#define wxStyledTextCtrl_SearchAnchor 3275
+#define wxStyledTextCtrl_SearchNext 3276
+#define wxStyledTextCtrl_SearchPrev 3277
+#define wxStyledTextCtrl_LinesOnScreen 3278
+#define wxStyledTextCtrl_UsePopUp 3279
+#define wxStyledTextCtrl_SelectionIsRectangle 3280
+#define wxStyledTextCtrl_SetZoom 3281
+#define wxStyledTextCtrl_GetZoom 3282
+#define wxStyledTextCtrl_GetModEventMask 3283
+#define wxStyledTextCtrl_SetSTCFocus 3284
+#define wxStyledTextCtrl_GetSTCFocus 3285
+#define wxStyledTextCtrl_SetStatus 3286
+#define wxStyledTextCtrl_GetStatus 3287
+#define wxStyledTextCtrl_SetMouseDownCaptures 3288
+#define wxStyledTextCtrl_GetMouseDownCaptures 3289
+#define wxStyledTextCtrl_SetSTCCursor 3290
+#define wxStyledTextCtrl_GetSTCCursor 3291
+#define wxStyledTextCtrl_SetControlCharSymbol 3292
+#define wxStyledTextCtrl_GetControlCharSymbol 3293
+#define wxStyledTextCtrl_WordPartLeft 3294
+#define wxStyledTextCtrl_WordPartLeftExtend 3295
+#define wxStyledTextCtrl_WordPartRight 3296
+#define wxStyledTextCtrl_WordPartRightExtend 3297
+#define wxStyledTextCtrl_SetVisiblePolicy 3298
+#define wxStyledTextCtrl_DelLineLeft 3299
+#define wxStyledTextCtrl_DelLineRight 3300
+#define wxStyledTextCtrl_GetXOffset 3301
+#define wxStyledTextCtrl_ChooseCaretX 3302
+#define wxStyledTextCtrl_SetXCaretPolicy 3303
+#define wxStyledTextCtrl_SetYCaretPolicy 3304
+#define wxStyledTextCtrl_GetPrintWrapMode 3305
+#define wxStyledTextCtrl_SetHotspotActiveForeground 3306
+#define wxStyledTextCtrl_SetHotspotActiveBackground 3307
+#define wxStyledTextCtrl_SetHotspotActiveUnderline 3308
+#define wxStyledTextCtrl_SetHotspotSingleLine 3309
+#define wxStyledTextCtrl_ParaDownExtend 3310
+#define wxStyledTextCtrl_ParaUp 3311
+#define wxStyledTextCtrl_ParaUpExtend 3312
+#define wxStyledTextCtrl_PositionBefore 3313
+#define wxStyledTextCtrl_PositionAfter 3314
+#define wxStyledTextCtrl_CopyRange 3315
+#define wxStyledTextCtrl_CopyText 3316
+#define wxStyledTextCtrl_SetSelectionMode 3317
+#define wxStyledTextCtrl_GetSelectionMode 3318
+#define wxStyledTextCtrl_LineDownRectExtend 3319
+#define wxStyledTextCtrl_LineUpRectExtend 3320
+#define wxStyledTextCtrl_CharLeftRectExtend 3321
+#define wxStyledTextCtrl_CharRightRectExtend 3322
+#define wxStyledTextCtrl_HomeRectExtend 3323
+#define wxStyledTextCtrl_VCHomeRectExtend 3324
+#define wxStyledTextCtrl_LineEndRectExtend 3325
+#define wxStyledTextCtrl_PageUpRectExtend 3326
+#define wxStyledTextCtrl_PageDownRectExtend 3327
+#define wxStyledTextCtrl_StutteredPageUp 3328
+#define wxStyledTextCtrl_StutteredPageUpExtend 3329
+#define wxStyledTextCtrl_StutteredPageDown 3330
+#define wxStyledTextCtrl_StutteredPageDownExtend 3331
+#define wxStyledTextCtrl_WordLeftEnd 3332
+#define wxStyledTextCtrl_WordLeftEndExtend 3333
+#define wxStyledTextCtrl_WordRightEnd 3334
+#define wxStyledTextCtrl_WordRightEndExtend 3335
+#define wxStyledTextCtrl_SetWhitespaceChars 3336
+#define wxStyledTextCtrl_SetCharsDefault 3337
+#define wxStyledTextCtrl_AutoCompGetCurrent 3338
+#define wxStyledTextCtrl_Allocate 3339
+#define wxStyledTextCtrl_FindColumn 3340
+#define wxStyledTextCtrl_GetCaretSticky 3341
+#define wxStyledTextCtrl_SetCaretSticky 3342
+#define wxStyledTextCtrl_ToggleCaretSticky 3343
+#define wxStyledTextCtrl_SetPasteConvertEndings 3344
+#define wxStyledTextCtrl_GetPasteConvertEndings 3345
+#define wxStyledTextCtrl_SelectionDuplicate 3346
+#define wxStyledTextCtrl_SetCaretLineBackAlpha 3347
+#define wxStyledTextCtrl_GetCaretLineBackAlpha 3348
+#define wxStyledTextCtrl_StartRecord 3349
+#define wxStyledTextCtrl_StopRecord 3350
+#define wxStyledTextCtrl_SetLexer 3351
+#define wxStyledTextCtrl_GetLexer 3352
+#define wxStyledTextCtrl_Colourise 3353
+#define wxStyledTextCtrl_SetProperty 3354
+#define wxStyledTextCtrl_SetKeyWords 3355
+#define wxStyledTextCtrl_SetLexerLanguage 3356
+#define wxStyledTextCtrl_GetProperty 3357
+#define wxStyledTextCtrl_GetStyleBitsNeeded 3358
+#define wxStyledTextCtrl_GetCurrentLine 3359
+#define wxStyledTextCtrl_StyleSetSpec 3360
+#define wxStyledTextCtrl_StyleSetFont 3361
+#define wxStyledTextCtrl_StyleSetFontAttr 3362
+#define wxStyledTextCtrl_StyleSetCharacterSet 3363
+#define wxStyledTextCtrl_StyleSetFontEncoding 3364
+#define wxStyledTextCtrl_CmdKeyExecute 3365
+#define wxStyledTextCtrl_SetMargins 3366
+#define wxStyledTextCtrl_GetSelection 3367
+#define wxStyledTextCtrl_PointFromPosition 3368
+#define wxStyledTextCtrl_ScrollToLine 3369
+#define wxStyledTextCtrl_ScrollToColumn 3370
+#define wxStyledTextCtrl_SendMsg 3371
+#define wxStyledTextCtrl_SetVScrollBar 3372
+#define wxStyledTextCtrl_SetHScrollBar 3373
+#define wxStyledTextCtrl_GetLastKeydownProcessed 3374
+#define wxStyledTextCtrl_SetLastKeydownProcessed 3375
+#define wxStyledTextCtrl_SaveFile 3376
+#define wxStyledTextCtrl_LoadFile 3377
+#define wxStyledTextCtrl_DoDragOver 3378
+#define wxStyledTextCtrl_DoDropText 3379
+#define wxStyledTextCtrl_GetUseAntiAliasing 3380
+#define wxStyledTextCtrl_AddTextRaw 3381
+#define wxStyledTextCtrl_InsertTextRaw 3382
+#define wxStyledTextCtrl_GetCurLineRaw 3383
+#define wxStyledTextCtrl_GetLineRaw 3384
+#define wxStyledTextCtrl_GetSelectedTextRaw 3385
+#define wxStyledTextCtrl_GetTextRangeRaw 3386
+#define wxStyledTextCtrl_SetTextRaw 3387
+#define wxStyledTextCtrl_GetTextRaw 3388
+#define wxStyledTextCtrl_AppendTextRaw 3389
+#define wxArtProvider_GetBitmap 3390
+#define wxArtProvider_GetIcon 3391
+#define wxTreeEvent_GetKeyCode 3392
+#define wxTreeEvent_GetItem 3393
+#define wxTreeEvent_GetKeyEvent 3394
+#define wxTreeEvent_GetLabel 3395
+#define wxTreeEvent_GetOldItem 3396
+#define wxTreeEvent_GetPoint 3397
+#define wxTreeEvent_IsEditCancelled 3398
+#define wxTreeEvent_SetToolTip 3399
+#define wxNotebookEvent_GetOldSelection 3400
+#define wxNotebookEvent_GetSelection 3401
+#define wxNotebookEvent_SetOldSelection 3402
+#define wxNotebookEvent_SetSelection 3403
+#define wxFileDataObject_new 3404
+#define wxFileDataObject_AddFile 3405
+#define wxFileDataObject_GetFilenames 3406
+#define wxFileDataObject_destroy 3407
+#define wxTextDataObject_new 3408
+#define wxTextDataObject_GetTextLength 3409
+#define wxTextDataObject_GetText 3410
+#define wxTextDataObject_SetText 3411
+#define wxTextDataObject_destroy 3412
+#define wxBitmapDataObject_new_1_1 3413
+#define wxBitmapDataObject_new_1_0 3414
+#define wxBitmapDataObject_GetBitmap 3415
+#define wxBitmapDataObject_SetBitmap 3416
+#define wxBitmapDataObject_destroy 3417
+#define wxClipboard_new 3419
+#define wxClipboard_destruct 3420
+#define wxClipboard_AddData 3421
+#define wxClipboard_Clear 3422
+#define wxClipboard_Close 3423
+#define wxClipboard_Flush 3424
+#define wxClipboard_GetData 3425
+#define wxClipboard_IsOpened 3426
+#define wxClipboard_Open 3427
+#define wxClipboard_SetData 3428
+#define wxClipboard_UsePrimarySelection 3430
+#define wxClipboard_IsSupported 3431
+#define wxClipboard_Get 3432
+#define wxSpinEvent_GetPosition 3433
+#define wxSpinEvent_SetPosition 3434
+#define wxSplitterWindow_new_0 3435
+#define wxSplitterWindow_new_2 3436
+#define wxSplitterWindow_destruct 3437
+#define wxSplitterWindow_Create 3438
+#define wxSplitterWindow_GetMinimumPaneSize 3439
+#define wxSplitterWindow_GetSashGravity 3440
+#define wxSplitterWindow_GetSashPosition 3441
+#define wxSplitterWindow_GetSplitMode 3442
+#define wxSplitterWindow_GetWindow1 3443
+#define wxSplitterWindow_GetWindow2 3444
+#define wxSplitterWindow_Initialize 3445
+#define wxSplitterWindow_IsSplit 3446
+#define wxSplitterWindow_ReplaceWindow 3447
+#define wxSplitterWindow_SetSashGravity 3448
+#define wxSplitterWindow_SetSashPosition 3449
+#define wxSplitterWindow_SetSashSize 3450
+#define wxSplitterWindow_SetMinimumPaneSize 3451
+#define wxSplitterWindow_SetSplitMode 3452
+#define wxSplitterWindow_SplitHorizontally 3453
+#define wxSplitterWindow_SplitVertically 3454
+#define wxSplitterWindow_Unsplit 3455
+#define wxSplitterWindow_UpdateSize 3456
+#define wxSplitterEvent_GetSashPosition 3457
+#define wxSplitterEvent_GetX 3458
+#define wxSplitterEvent_GetY 3459
+#define wxSplitterEvent_GetWindowBeingRemoved 3460
+#define wxSplitterEvent_SetSashPosition 3461
+#define wxHtmlWindow_new_0 3462
+#define wxHtmlWindow_new_2 3463
+#define wxHtmlWindow_AppendToPage 3464
+#define wxHtmlWindow_GetOpenedAnchor 3465
+#define wxHtmlWindow_GetOpenedPage 3466
+#define wxHtmlWindow_GetOpenedPageTitle 3467
+#define wxHtmlWindow_GetRelatedFrame 3468
+#define wxHtmlWindow_HistoryBack 3469
+#define wxHtmlWindow_HistoryCanBack 3470
+#define wxHtmlWindow_HistoryCanForward 3471
+#define wxHtmlWindow_HistoryClear 3472
+#define wxHtmlWindow_HistoryForward 3473
+#define wxHtmlWindow_LoadFile 3474
+#define wxHtmlWindow_LoadPage 3475
+#define wxHtmlWindow_SelectAll 3476
+#define wxHtmlWindow_SelectionToText 3477
+#define wxHtmlWindow_SelectLine 3478
+#define wxHtmlWindow_SelectWord 3479
+#define wxHtmlWindow_SetBorders 3480
+#define wxHtmlWindow_SetFonts 3481
+#define wxHtmlWindow_SetPage 3482
+#define wxHtmlWindow_SetRelatedFrame 3483
+#define wxHtmlWindow_SetRelatedStatusBar 3484
+#define wxHtmlWindow_ToText 3485
+#define wxHtmlWindow_destroy 3486
+#define wxHtmlLinkEvent_GetLinkInfo 3487
+#define wxSystemSettings_GetColour 3488
+#define wxSystemSettings_GetFont 3489
+#define wxSystemSettings_GetMetric 3490
+#define wxSystemSettings_GetScreenType 3491
+#define wxAuiNotebookEvent_SetSelection 3492
+#define wxAuiNotebookEvent_GetSelection 3493
+#define wxAuiNotebookEvent_SetOldSelection 3494
+#define wxAuiNotebookEvent_GetOldSelection 3495
+#define wxAuiNotebookEvent_SetDragSource 3496
+#define wxAuiNotebookEvent_GetDragSource 3497
+#define wxAuiManagerEvent_SetManager 3498
+#define wxAuiManagerEvent_GetManager 3499
+#define wxAuiManagerEvent_SetPane 3500
+#define wxAuiManagerEvent_GetPane 3501
+#define wxAuiManagerEvent_SetButton 3502
+#define wxAuiManagerEvent_GetButton 3503
+#define wxAuiManagerEvent_SetDC 3504
+#define wxAuiManagerEvent_GetDC 3505
+#define wxAuiManagerEvent_Veto 3506
+#define wxAuiManagerEvent_GetVeto 3507
+#define wxAuiManagerEvent_SetCanVeto 3508
+#define wxAuiManagerEvent_CanVeto 3509
+#define wxLogNull_new 3510
+#define wxLogNull_destroy 3511
 
 
diff --git a/lib/wx/c_src/wxePrintout.cpp b/lib/wx/c_src/wxePrintout.cpp
index ea1c76edcc..90959df379 100644
--- a/lib/wx/c_src/wxePrintout.cpp
+++ b/lib/wx/c_src/wxePrintout.cpp
@@ -1,41 +1,62 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2008-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2008-2011. All Rights Reserved.
+ *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
  * compliance with the License. You should have received a copy of the
  * Erlang Public License along with this software. If not, it can be
  * retrieved online at http://www.erlang.org/.
- * 
+ *
  * Software distributed under the License is distributed on an "AS IS"
  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
  * the License for the specific language governing rights and limitations
  * under the License.
- * 
- * %CopyrightEnd% 
+ *
+ * %CopyrightEnd%
  */
 
 #include <wx/wx.h>
 #include "wxe_impl.h"
 #include "wxe_return.h"
+#include "gen/wxe_macros.h"
+#include "gen/wxe_derived_dest.h"
 
 /* *****************************************************************/
 /* Special Class impls */
 
+#define INVOKE_CALLBACK_INIT(port, callback, class_str)		        \
+  {									\
+    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);	\
+    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);	\
+    rt.addInt(callback);						\
+    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), class_str);
+
+#define INVOKE_CALLBACK_END(port, args)					\
+  rt.endList(1 + (args));						\
+  rt.addAtom("_wx_invoke_cb_");						\
+  rt.addTupleCount(3);							\
+  rt.send();								\
+  handle_event_callback(port, memenv->owner); 			        \
+ }
+
+#define INVOKE_CALLBACK(port, callback, class_str)	\
+  INVOKE_CALLBACK_INIT(port, callback, class_str);	\
+  INVOKE_CALLBACK_END(port, 0)
 
+/* *****************************************************************/
 /* Printing special */
 
 wxEPrintout::~wxEPrintout() {
-  clear_cb(onPrintPage);
-  clear_cb(onPreparePrinting);
-  clear_cb(onBeginPrinting); 
-  clear_cb(onEndPrinting);
-  clear_cb(onBeginDocument);
-  clear_cb(onEndDocument);
-  clear_cb(hasPage); 
-  clear_cb(getPageInfo);
+  clear_cb(port, onPrintPage);
+  clear_cb(port, onPreparePrinting);
+  clear_cb(port, onBeginPrinting);
+  clear_cb(port, onEndPrinting);
+  clear_cb(port, onBeginDocument);
+  clear_cb(port, onEndDocument);
+  clear_cb(port, hasPage);
+  clear_cb(port, getPageInfo);
 
   ((WxeApp *)wxTheApp)->clearPtr(this);
 }
@@ -43,73 +64,44 @@ wxEPrintout::~wxEPrintout() {
 bool wxEPrintout::OnBeginDocument(int startPage, int endPage)
 {
   if(onBeginDocument) {
-    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-    char * bp = ((WxeApp *) wxTheApp)->cb_buff;
-    
-    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);
-    rt.addInt(onBeginDocument);
-    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
+    INVOKE_CALLBACK_INIT(port, onBeginDocument, "wxPrintout");
     rt.addInt(startPage);
     rt.addInt(endPage);
-    rt.endList(3);
-    rt.addAtom("_wx_invoke_cb_");
-    rt.addTupleCount(3);
-    rt.send();
-    handle_callback_batch(port);
-    return *(int*) bp; 
-  } else {
-    return wxPrintout::OnBeginDocument(startPage,endPage);
-  } 
+    INVOKE_CALLBACK_END(port, 2);
+    if(((WxeApp *) wxTheApp)->cb_buff) {
+      int res = * (int*) ((WxeApp *) wxTheApp)->cb_buff;
+      driver_free(((WxeApp *) wxTheApp)->cb_buff);
+      ((WxeApp *) wxTheApp)->cb_buff = NULL;
+      return res;
+    }
+  }
+  return wxPrintout::OnBeginDocument(startPage,endPage);
 }
 
-void wxEPrintout::OnEndDocument() 
+void wxEPrintout::OnEndDocument()
 {
   if(onEndDocument) {
-    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);
-    rt.addInt(onEndDocument);
-    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
-    rt.endList(1);
-    rt.addAtom("_wx_invoke_cb_");
-    rt.addTupleCount(3);
-    rt.send();
-    handle_callback_batch(port);
+    INVOKE_CALLBACK(port, onEndDocument, "wxPrintout");
   } else {
     wxPrintout::OnEndDocument();
-  } 
+  }
 }
 
-void wxEPrintout::OnBeginPrinting() 
+void wxEPrintout::OnBeginPrinting()
 {
 
   if(onBeginPrinting) {
-    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);    
-    rt.addInt(onBeginPrinting);
-    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
-    rt.endList(1);
-    rt.addAtom("_wx_invoke_cb_");
-    rt.addTupleCount(3);
-    rt.send();
-    handle_callback_batch(port);
+    INVOKE_CALLBACK(port, onBeginPrinting, "wxPrintout");
   } else {
     wxPrintout::OnBeginPrinting();
-  } 
+  }
 }
 
-void wxEPrintout::OnEndPrinting() 
+void wxEPrintout::OnEndPrinting()
 {
 
   if(onEndPrinting) {
-    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);    
-    rt.addInt(onEndPrinting);
-    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
-    rt.endList(1);
-    rt.addAtom("_wx_invoke_cb_");
-    rt.addTupleCount(3);
-    rt.send();
-    handle_callback_batch(port);
+    INVOKE_CALLBACK(port, onEndPrinting, "wxPrintout");
   } else {
     wxPrintout::OnEndPrinting();
   }
@@ -119,92 +111,133 @@ void wxEPrintout::OnPreparePrinting()
 {
 
   if(onPreparePrinting) {
-    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);    
-    rt.addInt(onPreparePrinting);
-    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
-    rt.endList(1);
-    rt.addAtom("_wx_invoke_cb_");
-    rt.addTupleCount(3);
-    rt.send();
-    handle_callback_batch(port);
+    INVOKE_CALLBACK(port, onPreparePrinting, "wxPrintout");
   } else {
     wxPrintout::OnPreparePrinting();
-  } 
+  }
 }
 
-bool wxEPrintout::HasPage(int page) 
+bool wxEPrintout::HasPage(int page)
 {
 
   if(hasPage) {
-    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);    
-    rt.addInt(hasPage);
-    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
+    INVOKE_CALLBACK_INIT(port, hasPage, "wxPrintout");
     rt.addInt(page);
-    rt.endList(2);
-    rt.addAtom("_wx_invoke_cb_");
-    rt.addTupleCount(3);
-    rt.send();
-    char * bp = ((WxeApp *) wxTheApp)->cb_buff;
-    handle_callback_batch(port);    
-    return *(int*) bp;
-  } else {
-    return wxPrintout::HasPage(page);
-  } 
+    INVOKE_CALLBACK_END(port, 1);
+    if(((WxeApp *) wxTheApp)->cb_buff) {
+      int res = * (int*) ((WxeApp *) wxTheApp)->cb_buff;
+      driver_free(((WxeApp *) wxTheApp)->cb_buff);
+      ((WxeApp *) wxTheApp)->cb_buff = NULL;
+      return res;
+    }
+  }
+  return wxPrintout::HasPage(page);
 }
 
 bool wxEPrintout::OnPrintPage(int page)
 {
-  wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-  wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);    
-  rt.addInt(onPrintPage);
-  rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
+  INVOKE_CALLBACK_INIT(port, onPrintPage, "wxPrintout");
   rt.addInt(page);
-  rt.endList(2);
-  rt.addAtom("_wx_invoke_cb_");
-  rt.addTupleCount(3);
-  rt.send();
-  handle_callback_batch(port);
-  //fprintf(stderr,"%d ", __LINE__);handle_callback_batch(port);  fprintf(stderr,"%d\r\n", __LINE__);
-  char * bp = ((WxeApp *) wxTheApp)->cb_buff;
-  return *(int*) bp;
+  INVOKE_CALLBACK_END(port, 1);
+  if(((WxeApp *) wxTheApp)->cb_buff) {
+    int res = * (int*) ((WxeApp *) wxTheApp)->cb_buff;
+    driver_free(((WxeApp *) wxTheApp)->cb_buff);
+    ((WxeApp *) wxTheApp)->cb_buff = NULL;
+    return res;
+  }
+  return FALSE;
 }
- 
+
 void wxEPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo)
 {
   if(getPageInfo) {
-    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
-    wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);        
-    rt.addInt(getPageInfo);
-    rt.addRef(((WxeApp *) wxTheApp)->getRef((void *)this, memenv), "wxPrintout");
-    rt.endList(1);
-    rt.addAtom("_wx_invoke_cb_");
-    rt.addTupleCount(3);
-    rt.send();
-    handle_callback_batch(port);
-    //fprintf(stderr,"%d ", __LINE__);handle_callback_batch(port);  fprintf(stderr,"%d\r\n", __LINE__);    
+    INVOKE_CALLBACK(port, getPageInfo, "wxPrintout");
+    if(((WxeApp *) wxTheApp)->cb_buff) {
+      char * bp = ((WxeApp *) wxTheApp)->cb_buff;
+      *minPage  = *(int *) bp; bp += 4;
+      *maxPage  = *(int *) bp; bp += 4;
+      *pageFrom = *(int *) bp; bp += 4;
+      *pageTo   = *(int *) bp; bp += 4;
+      driver_free(((WxeApp *) wxTheApp)->cb_buff);
+      ((WxeApp *) wxTheApp)->cb_buff = NULL;
+    }
+  }
+  wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo);
+}
+
+/* *****************************************************************/
+// ListCtrl with callbacks for VIRTUAL_TABLES
+
+wxString EwxListCtrl::OnGetItemText(long item, long col) const {
+  if(onGetItemText) {
+    INVOKE_CALLBACK_INIT(port, onGetItemText, "wxListCtrl");
+    rt.addInt(item);
+    rt.addInt(col);
+    INVOKE_CALLBACK_END(port, 2);
+    if(((WxeApp *) wxTheApp)->cb_buff) {
+      char * bp = ((WxeApp *) wxTheApp)->cb_buff;
+      wxString str = wxString(bp, wxConvUTF8);
+      driver_free(((WxeApp *) wxTheApp)->cb_buff);
+      ((WxeApp *) wxTheApp)->cb_buff = NULL;
+      return str;
+    }
+  }
+  return wxT("OnGetItemText not correctly defined");
+}
 
+wxListItemAttr* EwxListCtrl::OnGetItemAttr(long item) const {
+  if(onGetItemAttr) {
+    INVOKE_CALLBACK_INIT(port, onGetItemAttr, "wxListCtrl");
+    rt.addInt(item);
+    INVOKE_CALLBACK_END(port, 1);
     char * bp = ((WxeApp *) wxTheApp)->cb_buff;
-    *minPage  = *(int *) bp; bp += 4;
-    *maxPage  = *(int *) bp; bp += 4;
-    *pageFrom = *(int *) bp; bp += 4;
-    *pageTo   = *(int *) bp; bp += 4;
-  } else {
-    wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo);
+    wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
+    if(bp) {
+      wxListItemAttr * result = (wxListItemAttr *)((WxeApp *) wxTheApp)->getPtr(bp, memenv);
+      driver_free(((WxeApp *) wxTheApp)->cb_buff);
+      ((WxeApp *) wxTheApp)->cb_buff = NULL;
+      return result;
+    }
   }
+  return NULL;
+}
+
+int EwxListCtrl::OnGetItemImage(long item) const {
+  return OnGetItemColumnImage(item, 0);
 }
 
-void wxEPrintout::clear_cb(int callback)
+int EwxListCtrl::OnGetItemColumnImage(long item, long col) const {
+  if(onGetItemColumnImage) {
+    INVOKE_CALLBACK_INIT(port, onGetItemColumnImage, "wxListCtrl");
+    rt.addInt(item);
+    rt.addInt(col);
+    INVOKE_CALLBACK_END(port, 2);
+    if(((WxeApp *) wxTheApp)->cb_buff) {
+      int res = * (int*) ((WxeApp *) wxTheApp)->cb_buff;
+      driver_free(((WxeApp *) wxTheApp)->cb_buff);
+      ((WxeApp *) wxTheApp)->cb_buff = NULL;
+      return res;
+    }
+  }
+  return -1;
+}
+
+EwxListCtrl::~EwxListCtrl() {
+  clear_cb(port, onGetItemText);
+  clear_cb(port, onGetItemAttr);
+  clear_cb(port, onGetItemColumnImage);
+  ((WxeApp *)wxTheApp)->clearPtr(this);
+}
+// tools
+
+void clear_cb(ErlDrvPort port, int callback)
 {
   if(callback > 0) {
     wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(port);
     wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);
-    // NOTE: Remove this later when changing from funs to gen_server
     rt.addAtom("wx_delete_cb");
     rt.addInt(callback);
     rt.addTupleCount(2);
     rt.send();
   }
 }
-
diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp
index 365fb691a1..95755978f1 100644
--- a/lib/wx/c_src/wxe_impl.cpp
+++ b/lib/wx/c_src/wxe_impl.cpp
@@ -270,6 +270,7 @@ bool WxeApp::OnInit()
   global_me = new wxeMemEnv();
   wxe_batch = new wxList;
   wxe_batch_cb_saved = new wxList;
+  cb_buff = NULL;
 
   wxIdleEvent::SetMode(wxIDLE_PROCESS_SPECIFIED);
 
@@ -330,24 +331,14 @@ void handle_event_callback(ErlDrvPort port, ErlDrvTermData process)
   driver_monitor_process(port, process, &monitor);
   // Should we be able to handle commands when recursing? probably
   erl_drv_mutex_lock(wxe_batch_locker_m);
-  //fprintf(stderr, "\r\nCB Start ");fflush(stderr);
+  // fprintf(stderr, "\r\nCB EV Start ");fflush(stderr);
   app->dispatch_cb(wxe_batch, wxe_batch_cb_saved, process);
-  //fprintf(stderr, ".. done \r\n");fflush(stderr);
+  // fprintf(stderr, ".. done \r\n");fflush(stderr);
   wxe_batch_caller = 0;
   erl_drv_mutex_unlock(wxe_batch_locker_m);
   driver_demonitor_process(port, &monitor);
 }
 
-void handle_callback_batch(ErlDrvPort port)
-{
-  WxeApp * app = (WxeApp *) wxTheApp;
-  // Should we be able to handle commands when recursing? probably
-  erl_drv_mutex_lock(wxe_batch_locker_m);
-  app->dispatch(wxe_batch, 0, WXE_CALLBACK);
-  wxe_batch_caller = 0;
-  erl_drv_mutex_unlock(wxe_batch_locker_m);
-}
-
 // Called by wx thread
 void WxeApp::idle(wxIdleEvent& event) {
   dispatch_cmds();
@@ -394,7 +385,10 @@ int WxeApp::dispatch(wxList * batch, int blevel, int list_type)
 	    case WXE_CB_RETURN:
 	      // erl_drv_mutex_unlock(wxe_batch_locker_m); should be called after
 	      // whatever cleaning is necessary
-	      memcpy(cb_buff, event->buffer, event->len);
+	      if(event->len > 0) {
+		cb_buff = (char *) driver_alloc(event->len);
+		memcpy(cb_buff, event->buffer, event->len);
+	      }
 	      return blevel;
 	    default:
 	      erl_drv_mutex_unlock(wxe_batch_locker_m);	      
@@ -447,7 +441,10 @@ void WxeApp::dispatch_cb(wxList * batch, wxList * temp, ErlDrvTermData process)
 	      case WXE_DEBUG_PING:
 		break;
 	      case WXE_CB_RETURN:
-		memcpy(cb_buff, event->buffer, event->len);
+		if(event->len > 0) {
+		  cb_buff = (char *) driver_alloc(event->len);
+		  memcpy(cb_buff, event->buffer, event->len);
+		}
 		callback_returned = 1;
 		return;
 	      case WXE_CB_START:
@@ -469,7 +466,7 @@ void WxeApp::dispatch_cb(wxList * batch, wxList * temp, ErlDrvTermData process)
 	      }
 	      delete event;
 	    } else {
-	    // fprintf(stderr, "  sav %d \r\n", event->op);
+	    // fprintf(stderr, "  save %d \r\n", event->op);
 	    temp->Append(event);
 	  }
 	}
@@ -893,8 +890,6 @@ int wxCALLBACK wxEListCtrlCompare(long item1, long item2, long callbackInfoPtr)
 {
   callbackInfo * cb = (callbackInfo *)callbackInfoPtr;
   wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(cb->port);
-  char * bp = ((WxeApp *) wxTheApp)->cb_buff;
-  
   wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);
   rt.addInt(cb->callbackID);
   rt.addInt(item1);
@@ -903,6 +898,13 @@ int wxCALLBACK wxEListCtrlCompare(long item1, long item2, long callbackInfoPtr)
   rt.addAtom("_wx_invoke_cb_");
   rt.addTupleCount(3);
   rt.send();
-  handle_callback_batch(cb->port);
-  return *(int*) bp;
+  handle_event_callback(cb->port, memenv->owner);
+
+  if(((WxeApp *) wxTheApp)->cb_buff) {
+    int res = * (int*) ((WxeApp *) wxTheApp)->cb_buff;
+    driver_free(((WxeApp *) wxTheApp)->cb_buff);
+    ((WxeApp *) wxTheApp)->cb_buff = NULL;
+    return res;
+  }
+  return 0;
 }
diff --git a/lib/wx/c_src/wxe_impl.h b/lib/wx/c_src/wxe_impl.h
index 39c02f8c1a..ee31068d5d 100644
--- a/lib/wx/c_src/wxe_impl.h
+++ b/lib/wx/c_src/wxe_impl.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -178,7 +178,8 @@ public:
   wxeMemEnv * global_me;
   
   // Temp container for callbacks
-  char cb_buff[256];
+  char *cb_buff;
+  int  cb_len;
 };
 
 class wxETreeItemData : public wxTreeItemData 
@@ -194,7 +195,6 @@ class wxETreeItemData : public wxTreeItemData
 
 bool sendevent(wxEvent * event, ErlDrvPort port);
 void pre_callback();
-void handle_callback_batch(ErlDrvPort port);  // For wxePrintout
 void handle_event_callback(ErlDrvPort port, ErlDrvTermData process);
 
 void activateGL(ErlDrvTermData caller);
@@ -232,8 +232,6 @@ class wxEPrintout : public wxPrintout
    bool OnPrintPage(int page);
    void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);
 
-   void clear_cb(int callback);
-
    int onPrintPage;
    int onPreparePrinting;
    int onBeginPrinting; 
@@ -246,6 +244,9 @@ class wxEPrintout : public wxPrintout
    ErlDrvPort port;
 };
 
+void clear_cb(ErlDrvPort port, int callback);
+
+
 // Implementation of wxListCtrlCompare
 struct callbackInfo {
    ErlDrvPort port;
diff --git a/lib/wx/examples/demo/ex_listCtrl.erl b/lib/wx/examples/demo/ex_listCtrl.erl
index c574c7247a..3faec4e229 100644
--- a/lib/wx/examples/demo/ex_listCtrl.erl
+++ b/lib/wx/examples/demo/ex_listCtrl.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 
 -module(ex_listCtrl).
@@ -25,7 +25,7 @@
 -export([start/1, init/1, terminate/2,  code_change/3,
 	 handle_info/2, handle_call/3, handle_event/2]).
 
--record(state, 
+-record(state,
 	{
 	  parent,
 	  config,
@@ -40,11 +40,11 @@ init(Config) ->
         wx:batch(fun() -> do_init(Config) end).
 
 do_init(Config) ->
-    Parent = proplists:get_value(parent, Config),  
+    Parent = proplists:get_value(parent, Config),
     Panel = wxPanel:new(Parent, []),
 
     %% Setup sizers
-    MainSizer = wxStaticBoxSizer:new(?wxVERTICAL, Panel, 
+    MainSizer = wxStaticBoxSizer:new(?wxVERTICAL, Panel,
 				     [{label, "wxListCtrl"}]),
 
     Notebook = wxNotebook:new(Panel, 1, [{style, ?wxBK_DEFAULT}]),
@@ -81,14 +81,46 @@ do_init(Config) ->
     wxListCtrl:setItemBackgroundColour(ListCtrl3,3,?wxGREEN),
     wxListCtrl:setItemBackgroundColour(ListCtrl3,0,?wxCYAN),
 
+    IA = wxListItemAttr:new(),
+    wxListItemAttr:setTextColour(IA, {190, 25, 25}),
+    LC4Opts = [{style, ?wxLC_REPORT bor ?wxLC_VIRTUAL},
+	       {onGetItemText, fun(_This, Item, 0) ->
+				       "Row " ++ integer_to_list(Item);
+				  (_, Item, 1) when Item rem 5 == 0 ->
+				       "Column 2";
+				  (_, _, _) -> ""
+			       end},
+	       {onGetItemAttr, fun(_This, Item) when Item rem 3 == 0 ->
+				       IA;
+				  (_This, _Item)  ->
+				       wx:typeCast(wx:null(), wxListItemAttr)
+			       end},
+	       {onGetItemColumnImage, fun(_This, Item, 1) ->
+					      Item rem 4;
+					 (_, _, _) ->
+					      -1
+				      end}
+	      ],
+    ListCtrl4 = wxListCtrl:new(Notebook, LC4Opts),
+    wxListCtrl:setImageList(ListCtrl4, IL, ?wxIMAGE_LIST_SMALL),
+
+    wxListCtrl:insertColumn(ListCtrl4, 0, "Column 1"),
+    wxListCtrl:insertColumn(ListCtrl4, 1, "Column 2"),
+    wxListCtrl:setColumnWidth(ListCtrl4, 0, 200),
+    wxListCtrl:setColumnWidth(ListCtrl4, 1, 200),
+    wxListCtrl:setItemCount(ListCtrl4, 1000000),
+
+
     wxListCtrl:connect(ListCtrl1, command_list_item_selected, []),
     wxListCtrl:connect(ListCtrl2, command_list_item_selected, []),
     wxListCtrl:connect(ListCtrl3, command_list_item_selected, []),
+    wxListCtrl:connect(ListCtrl4, command_list_item_selected, []),
 
     %% Add to sizers
     wxNotebook:addPage(Notebook, ListCtrl1, "List", []),
     wxNotebook:addPage(Notebook, ListCtrl2, "Report", []),
     wxNotebook:addPage(Notebook, ListCtrl3, "Colored multiselect", []),
+    wxNotebook:addPage(Notebook, ListCtrl4, "Virtual Report", []),
 
     wxSizer:add(MainSizer, Notebook, [{proportion, 1},
 				      {flag, ?wxEXPAND}]),
@@ -145,4 +177,4 @@ create_list_ctrl(Win, Options) ->
 
     ListCtrl.
 
-    
+
diff --git a/lib/wx/include/gl.hrl b/lib/wx/include/gl.hrl
index 52f2635af9..54eb551285 100644
--- a/lib/wx/include/gl.hrl
+++ b/lib/wx/include/gl.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -21,32 +21,22 @@
 %% This file is generated DO NOT EDIT
 
 -define(GL_VERSION_1_1, 1).
--define(GL_CURRENT_BIT, 16#1).
--define(GL_POINT_BIT, 16#2).
--define(GL_LINE_BIT, 16#4).
--define(GL_POLYGON_BIT, 16#8).
--define(GL_POLYGON_STIPPLE_BIT, 16#10).
--define(GL_PIXEL_MODE_BIT, 16#20).
--define(GL_LIGHTING_BIT, 16#40).
--define(GL_FOG_BIT, 16#80).
--define(GL_DEPTH_BUFFER_BIT, 16#100).
--define(GL_ACCUM_BUFFER_BIT, 16#200).
--define(GL_STENCIL_BUFFER_BIT, 16#400).
--define(GL_VIEWPORT_BIT, 16#800).
--define(GL_TRANSFORM_BIT, 16#1000).
--define(GL_ENABLE_BIT, 16#2000).
--define(GL_COLOR_BUFFER_BIT, 16#4000).
--define(GL_HINT_BIT, 16#8000).
--define(GL_EVAL_BIT, 16#10000).
--define(GL_LIST_BIT, 16#20000).
--define(GL_TEXTURE_BIT, 16#40000).
--define(GL_SCISSOR_BIT, 16#80000).
--define(GL_ALL_ATTRIB_BITS, 16#FFFFFFFF).
--define(GL_CLIENT_PIXEL_STORE_BIT, 16#1).
--define(GL_CLIENT_VERTEX_ARRAY_BIT, 16#2).
--define(GL_CLIENT_ALL_ATTRIB_BITS, 16#FFFFFFFF).
--define(GL_FALSE, 0).
--define(GL_TRUE, 1).
+-define(GL_VERSION_1_2, 1).
+-define(GL_VERSION_1_3, 1).
+-define(GL_ARB_imaging, 1).
+-define(GL_FALSE, 16#0).
+-define(GL_TRUE, 16#1).
+-define(GL_BYTE, 16#1400).
+-define(GL_UNSIGNED_BYTE, 16#1401).
+-define(GL_SHORT, 16#1402).
+-define(GL_UNSIGNED_SHORT, 16#1403).
+-define(GL_INT, 16#1404).
+-define(GL_UNSIGNED_INT, 16#1405).
+-define(GL_FLOAT, 16#1406).
+-define(GL_2_BYTES, 16#1407).
+-define(GL_3_BYTES, 16#1408).
+-define(GL_4_BYTES, 16#1409).
+-define(GL_DOUBLE, 16#140A).
 -define(GL_POINTS, 16#0).
 -define(GL_LINES, 16#1).
 -define(GL_LINE_LOOP, 16#2).
@@ -57,11 +47,85 @@
 -define(GL_QUADS, 16#7).
 -define(GL_QUAD_STRIP, 16#8).
 -define(GL_POLYGON, 16#9).
--define(GL_ACCUM, 16#100).
--define(GL_LOAD, 16#101).
--define(GL_RETURN, 16#102).
--define(GL_MULT, 16#103).
--define(GL_ADD, 16#104).
+-define(GL_VERTEX_ARRAY, 16#8074).
+-define(GL_NORMAL_ARRAY, 16#8075).
+-define(GL_COLOR_ARRAY, 16#8076).
+-define(GL_INDEX_ARRAY, 16#8077).
+-define(GL_TEXTURE_COORD_ARRAY, 16#8078).
+-define(GL_EDGE_FLAG_ARRAY, 16#8079).
+-define(GL_VERTEX_ARRAY_SIZE, 16#807A).
+-define(GL_VERTEX_ARRAY_TYPE, 16#807B).
+-define(GL_VERTEX_ARRAY_STRIDE, 16#807C).
+-define(GL_NORMAL_ARRAY_TYPE, 16#807E).
+-define(GL_NORMAL_ARRAY_STRIDE, 16#807F).
+-define(GL_COLOR_ARRAY_SIZE, 16#8081).
+-define(GL_COLOR_ARRAY_TYPE, 16#8082).
+-define(GL_COLOR_ARRAY_STRIDE, 16#8083).
+-define(GL_INDEX_ARRAY_TYPE, 16#8085).
+-define(GL_INDEX_ARRAY_STRIDE, 16#8086).
+-define(GL_TEXTURE_COORD_ARRAY_SIZE, 16#8088).
+-define(GL_TEXTURE_COORD_ARRAY_TYPE, 16#8089).
+-define(GL_TEXTURE_COORD_ARRAY_STRIDE, 16#808A).
+-define(GL_EDGE_FLAG_ARRAY_STRIDE, 16#808C).
+-define(GL_VERTEX_ARRAY_POINTER, 16#808E).
+-define(GL_NORMAL_ARRAY_POINTER, 16#808F).
+-define(GL_COLOR_ARRAY_POINTER, 16#8090).
+-define(GL_INDEX_ARRAY_POINTER, 16#8091).
+-define(GL_TEXTURE_COORD_ARRAY_POINTER, 16#8092).
+-define(GL_EDGE_FLAG_ARRAY_POINTER, 16#8093).
+-define(GL_V2F, 16#2A20).
+-define(GL_V3F, 16#2A21).
+-define(GL_C4UB_V2F, 16#2A22).
+-define(GL_C4UB_V3F, 16#2A23).
+-define(GL_C3F_V3F, 16#2A24).
+-define(GL_N3F_V3F, 16#2A25).
+-define(GL_C4F_N3F_V3F, 16#2A26).
+-define(GL_T2F_V3F, 16#2A27).
+-define(GL_T4F_V4F, 16#2A28).
+-define(GL_T2F_C4UB_V3F, 16#2A29).
+-define(GL_T2F_C3F_V3F, 16#2A2A).
+-define(GL_T2F_N3F_V3F, 16#2A2B).
+-define(GL_T2F_C4F_N3F_V3F, 16#2A2C).
+-define(GL_T4F_C4F_N3F_V4F, 16#2A2D).
+-define(GL_MATRIX_MODE, 16#BA0).
+-define(GL_MODELVIEW, 16#1700).
+-define(GL_PROJECTION, 16#1701).
+-define(GL_TEXTURE, 16#1702).
+-define(GL_POINT_SMOOTH, 16#B10).
+-define(GL_POINT_SIZE, 16#B11).
+-define(GL_POINT_SIZE_GRANULARITY, 16#B13).
+-define(GL_POINT_SIZE_RANGE, 16#B12).
+-define(GL_LINE_SMOOTH, 16#B20).
+-define(GL_LINE_STIPPLE, 16#B24).
+-define(GL_LINE_STIPPLE_PATTERN, 16#B25).
+-define(GL_LINE_STIPPLE_REPEAT, 16#B26).
+-define(GL_LINE_WIDTH, 16#B21).
+-define(GL_LINE_WIDTH_GRANULARITY, 16#B23).
+-define(GL_LINE_WIDTH_RANGE, 16#B22).
+-define(GL_POINT, 16#1B00).
+-define(GL_LINE, 16#1B01).
+-define(GL_FILL, 16#1B02).
+-define(GL_CW, 16#900).
+-define(GL_CCW, 16#901).
+-define(GL_FRONT, 16#404).
+-define(GL_BACK, 16#405).
+-define(GL_POLYGON_MODE, 16#B40).
+-define(GL_POLYGON_SMOOTH, 16#B41).
+-define(GL_POLYGON_STIPPLE, 16#B42).
+-define(GL_EDGE_FLAG, 16#B43).
+-define(GL_CULL_FACE, 16#B44).
+-define(GL_CULL_FACE_MODE, 16#B45).
+-define(GL_FRONT_FACE, 16#B46).
+-define(GL_POLYGON_OFFSET_FACTOR, 16#8038).
+-define(GL_POLYGON_OFFSET_UNITS, 16#2A00).
+-define(GL_POLYGON_OFFSET_POINT, 16#2A01).
+-define(GL_POLYGON_OFFSET_LINE, 16#2A02).
+-define(GL_POLYGON_OFFSET_FILL, 16#8037).
+-define(GL_COMPILE, 16#1300).
+-define(GL_COMPILE_AND_EXECUTE, 16#1301).
+-define(GL_LIST_BASE, 16#B32).
+-define(GL_LIST_INDEX, 16#B33).
+-define(GL_LIST_MODE, 16#B30).
 -define(GL_NEVER, 16#200).
 -define(GL_LESS, 16#201).
 -define(GL_EQUAL, 16#202).
@@ -70,8 +134,71 @@
 -define(GL_NOTEQUAL, 16#205).
 -define(GL_GEQUAL, 16#206).
 -define(GL_ALWAYS, 16#207).
--define(GL_ZERO, 0).
--define(GL_ONE, 1).
+-define(GL_DEPTH_TEST, 16#B71).
+-define(GL_DEPTH_BITS, 16#D56).
+-define(GL_DEPTH_CLEAR_VALUE, 16#B73).
+-define(GL_DEPTH_FUNC, 16#B74).
+-define(GL_DEPTH_RANGE, 16#B70).
+-define(GL_DEPTH_WRITEMASK, 16#B72).
+-define(GL_DEPTH_COMPONENT, 16#1902).
+-define(GL_LIGHTING, 16#B50).
+-define(GL_LIGHT0, 16#4000).
+-define(GL_LIGHT1, 16#4001).
+-define(GL_LIGHT2, 16#4002).
+-define(GL_LIGHT3, 16#4003).
+-define(GL_LIGHT4, 16#4004).
+-define(GL_LIGHT5, 16#4005).
+-define(GL_LIGHT6, 16#4006).
+-define(GL_LIGHT7, 16#4007).
+-define(GL_SPOT_EXPONENT, 16#1205).
+-define(GL_SPOT_CUTOFF, 16#1206).
+-define(GL_CONSTANT_ATTENUATION, 16#1207).
+-define(GL_LINEAR_ATTENUATION, 16#1208).
+-define(GL_QUADRATIC_ATTENUATION, 16#1209).
+-define(GL_AMBIENT, 16#1200).
+-define(GL_DIFFUSE, 16#1201).
+-define(GL_SPECULAR, 16#1202).
+-define(GL_SHININESS, 16#1601).
+-define(GL_EMISSION, 16#1600).
+-define(GL_POSITION, 16#1203).
+-define(GL_SPOT_DIRECTION, 16#1204).
+-define(GL_AMBIENT_AND_DIFFUSE, 16#1602).
+-define(GL_COLOR_INDEXES, 16#1603).
+-define(GL_LIGHT_MODEL_TWO_SIDE, 16#B52).
+-define(GL_LIGHT_MODEL_LOCAL_VIEWER, 16#B51).
+-define(GL_LIGHT_MODEL_AMBIENT, 16#B53).
+-define(GL_FRONT_AND_BACK, 16#408).
+-define(GL_SHADE_MODEL, 16#B54).
+-define(GL_FLAT, 16#1D00).
+-define(GL_SMOOTH, 16#1D01).
+-define(GL_COLOR_MATERIAL, 16#B57).
+-define(GL_COLOR_MATERIAL_FACE, 16#B55).
+-define(GL_COLOR_MATERIAL_PARAMETER, 16#B56).
+-define(GL_NORMALIZE, 16#BA1).
+-define(GL_CLIP_PLANE0, 16#3000).
+-define(GL_CLIP_PLANE1, 16#3001).
+-define(GL_CLIP_PLANE2, 16#3002).
+-define(GL_CLIP_PLANE3, 16#3003).
+-define(GL_CLIP_PLANE4, 16#3004).
+-define(GL_CLIP_PLANE5, 16#3005).
+-define(GL_ACCUM_RED_BITS, 16#D58).
+-define(GL_ACCUM_GREEN_BITS, 16#D59).
+-define(GL_ACCUM_BLUE_BITS, 16#D5A).
+-define(GL_ACCUM_ALPHA_BITS, 16#D5B).
+-define(GL_ACCUM_CLEAR_VALUE, 16#B80).
+-define(GL_ACCUM, 16#100).
+-define(GL_ADD, 16#104).
+-define(GL_LOAD, 16#101).
+-define(GL_MULT, 16#103).
+-define(GL_RETURN, 16#102).
+-define(GL_ALPHA_TEST, 16#BC0).
+-define(GL_ALPHA_TEST_REF, 16#BC2).
+-define(GL_ALPHA_TEST_FUNC, 16#BC1).
+-define(GL_BLEND, 16#BE2).
+-define(GL_BLEND_SRC, 16#BE1).
+-define(GL_BLEND_DST, 16#BE0).
+-define(GL_ZERO, 16#0).
+-define(GL_ONE, 16#1).
 -define(GL_SRC_COLOR, 16#300).
 -define(GL_ONE_MINUS_SRC_COLOR, 16#301).
 -define(GL_SRC_ALPHA, 16#302).
@@ -81,121 +208,58 @@
 -define(GL_DST_COLOR, 16#306).
 -define(GL_ONE_MINUS_DST_COLOR, 16#307).
 -define(GL_SRC_ALPHA_SATURATE, 16#308).
--define(GL_NONE, 0).
--define(GL_FRONT_LEFT, 16#400).
--define(GL_FRONT_RIGHT, 16#401).
--define(GL_BACK_LEFT, 16#402).
--define(GL_BACK_RIGHT, 16#403).
--define(GL_FRONT, 16#404).
--define(GL_BACK, 16#405).
--define(GL_LEFT, 16#406).
--define(GL_RIGHT, 16#407).
--define(GL_FRONT_AND_BACK, 16#408).
--define(GL_AUX0, 16#409).
--define(GL_AUX1, 16#40A).
--define(GL_AUX2, 16#40B).
--define(GL_AUX3, 16#40C).
--define(GL_NO_ERROR, 0).
--define(GL_INVALID_ENUM, 16#500).
--define(GL_INVALID_VALUE, 16#501).
--define(GL_INVALID_OPERATION, 16#502).
--define(GL_STACK_OVERFLOW, 16#503).
--define(GL_STACK_UNDERFLOW, 16#504).
--define(GL_OUT_OF_MEMORY, 16#505).
--define(GL_TABLE_TOO_LARGE, 16#8031).
+-define(GL_FEEDBACK, 16#1C01).
+-define(GL_RENDER, 16#1C00).
+-define(GL_SELECT, 16#1C02).
 -define(GL_2D, 16#600).
 -define(GL_3D, 16#601).
 -define(GL_3D_COLOR, 16#602).
 -define(GL_3D_COLOR_TEXTURE, 16#603).
 -define(GL_4D_COLOR_TEXTURE, 16#604).
--define(GL_PASS_THROUGH_TOKEN, 16#700).
 -define(GL_POINT_TOKEN, 16#701).
 -define(GL_LINE_TOKEN, 16#702).
+-define(GL_LINE_RESET_TOKEN, 16#707).
 -define(GL_POLYGON_TOKEN, 16#703).
 -define(GL_BITMAP_TOKEN, 16#704).
 -define(GL_DRAW_PIXEL_TOKEN, 16#705).
 -define(GL_COPY_PIXEL_TOKEN, 16#706).
--define(GL_LINE_RESET_TOKEN, 16#707).
--define(GL_EXP, 16#800).
--define(GL_EXP2, 16#801).
--define(GL_CW, 16#900).
--define(GL_CCW, 16#901).
--define(GL_COEFF, 16#A00).
--define(GL_ORDER, 16#A01).
--define(GL_DOMAIN, 16#A02).
--define(GL_PIXEL_MAP_I_TO_I, 16#C70).
--define(GL_PIXEL_MAP_S_TO_S, 16#C71).
--define(GL_PIXEL_MAP_I_TO_R, 16#C72).
--define(GL_PIXEL_MAP_I_TO_G, 16#C73).
--define(GL_PIXEL_MAP_I_TO_B, 16#C74).
--define(GL_PIXEL_MAP_I_TO_A, 16#C75).
--define(GL_PIXEL_MAP_R_TO_R, 16#C76).
--define(GL_PIXEL_MAP_G_TO_G, 16#C77).
--define(GL_PIXEL_MAP_B_TO_B, 16#C78).
--define(GL_PIXEL_MAP_A_TO_A, 16#C79).
--define(GL_VERTEX_ARRAY_POINTER, 16#808E).
--define(GL_NORMAL_ARRAY_POINTER, 16#808F).
--define(GL_COLOR_ARRAY_POINTER, 16#8090).
--define(GL_INDEX_ARRAY_POINTER, 16#8091).
--define(GL_TEXTURE_COORD_ARRAY_POINTER, 16#8092).
--define(GL_EDGE_FLAG_ARRAY_POINTER, 16#8093).
--define(GL_CURRENT_COLOR, 16#B00).
--define(GL_CURRENT_INDEX, 16#B01).
--define(GL_CURRENT_NORMAL, 16#B02).
--define(GL_CURRENT_TEXTURE_COORDS, 16#B03).
--define(GL_CURRENT_RASTER_COLOR, 16#B04).
--define(GL_CURRENT_RASTER_INDEX, 16#B05).
--define(GL_CURRENT_RASTER_TEXTURE_COORDS, 16#B06).
--define(GL_CURRENT_RASTER_POSITION, 16#B07).
--define(GL_CURRENT_RASTER_POSITION_VALID, 16#B08).
--define(GL_CURRENT_RASTER_DISTANCE, 16#B09).
--define(GL_POINT_SMOOTH, 16#B10).
--define(GL_POINT_SIZE, 16#B11).
--define(GL_SMOOTH_POINT_SIZE_RANGE, 16#B12).
--define(GL_SMOOTH_POINT_SIZE_GRANULARITY, 16#B13).
--define(GL_POINT_SIZE_RANGE, ?GL_SMOOTH_POINT_SIZE_RANGE).
--define(GL_POINT_SIZE_GRANULARITY, ?GL_SMOOTH_POINT_SIZE_GRANULARITY).
--define(GL_LINE_SMOOTH, 16#B20).
--define(GL_LINE_WIDTH, 16#B21).
--define(GL_SMOOTH_LINE_WIDTH_RANGE, 16#B22).
--define(GL_SMOOTH_LINE_WIDTH_GRANULARITY, 16#B23).
--define(GL_LINE_WIDTH_RANGE, ?GL_SMOOTH_LINE_WIDTH_RANGE).
--define(GL_LINE_WIDTH_GRANULARITY, ?GL_SMOOTH_LINE_WIDTH_GRANULARITY).
--define(GL_LINE_STIPPLE, 16#B24).
--define(GL_LINE_STIPPLE_PATTERN, 16#B25).
--define(GL_LINE_STIPPLE_REPEAT, 16#B26).
--define(GL_LIST_MODE, 16#B30).
--define(GL_MAX_LIST_NESTING, 16#B31).
--define(GL_LIST_BASE, 16#B32).
--define(GL_LIST_INDEX, 16#B33).
--define(GL_POLYGON_MODE, 16#B40).
--define(GL_POLYGON_SMOOTH, 16#B41).
--define(GL_POLYGON_STIPPLE, 16#B42).
--define(GL_EDGE_FLAG, 16#B43).
--define(GL_CULL_FACE, 16#B44).
--define(GL_CULL_FACE_MODE, 16#B45).
--define(GL_FRONT_FACE, 16#B46).
--define(GL_LIGHTING, 16#B50).
--define(GL_LIGHT_MODEL_LOCAL_VIEWER, 16#B51).
--define(GL_LIGHT_MODEL_TWO_SIDE, 16#B52).
--define(GL_LIGHT_MODEL_AMBIENT, 16#B53).
--define(GL_SHADE_MODEL, 16#B54).
--define(GL_COLOR_MATERIAL_FACE, 16#B55).
--define(GL_COLOR_MATERIAL_PARAMETER, 16#B56).
--define(GL_COLOR_MATERIAL, 16#B57).
+-define(GL_PASS_THROUGH_TOKEN, 16#700).
+-define(GL_FEEDBACK_BUFFER_POINTER, 16#DF0).
+-define(GL_FEEDBACK_BUFFER_SIZE, 16#DF1).
+-define(GL_FEEDBACK_BUFFER_TYPE, 16#DF2).
+-define(GL_SELECTION_BUFFER_POINTER, 16#DF3).
+-define(GL_SELECTION_BUFFER_SIZE, 16#DF4).
 -define(GL_FOG, 16#B60).
--define(GL_FOG_INDEX, 16#B61).
+-define(GL_FOG_MODE, 16#B65).
 -define(GL_FOG_DENSITY, 16#B62).
+-define(GL_FOG_COLOR, 16#B66).
+-define(GL_FOG_INDEX, 16#B61).
 -define(GL_FOG_START, 16#B63).
 -define(GL_FOG_END, 16#B64).
--define(GL_FOG_MODE, 16#B65).
--define(GL_FOG_COLOR, 16#B66).
--define(GL_DEPTH_RANGE, 16#B70).
--define(GL_DEPTH_TEST, 16#B71).
--define(GL_DEPTH_WRITEMASK, 16#B72).
--define(GL_DEPTH_CLEAR_VALUE, 16#B73).
--define(GL_DEPTH_FUNC, 16#B74).
--define(GL_ACCUM_CLEAR_VALUE, 16#B80).
+-define(GL_LINEAR, 16#2601).
+-define(GL_EXP, 16#800).
+-define(GL_EXP2, 16#801).
+-define(GL_LOGIC_OP, 16#BF1).
+-define(GL_INDEX_LOGIC_OP, 16#BF1).
+-define(GL_COLOR_LOGIC_OP, 16#BF2).
+-define(GL_LOGIC_OP_MODE, 16#BF0).
+-define(GL_CLEAR, 16#1500).
+-define(GL_SET, 16#150F).
+-define(GL_COPY, 16#1503).
+-define(GL_COPY_INVERTED, 16#150C).
+-define(GL_NOOP, 16#1505).
+-define(GL_INVERT, 16#150A).
+-define(GL_AND, 16#1501).
+-define(GL_NAND, 16#150E).
+-define(GL_OR, 16#1507).
+-define(GL_NOR, 16#1508).
+-define(GL_XOR, 16#1506).
+-define(GL_EQUIV, 16#1509).
+-define(GL_AND_REVERSE, 16#1502).
+-define(GL_AND_INVERTED, 16#1504).
+-define(GL_OR_REVERSE, 16#150B).
+-define(GL_OR_INVERTED, 16#150D).
+-define(GL_STENCIL_BITS, 16#D57).
 -define(GL_STENCIL_TEST, 16#B90).
 -define(GL_STENCIL_CLEAR_VALUE, 16#B91).
 -define(GL_STENCIL_FUNC, 16#B92).
@@ -205,89 +269,48 @@
 -define(GL_STENCIL_PASS_DEPTH_PASS, 16#B96).
 -define(GL_STENCIL_REF, 16#B97).
 -define(GL_STENCIL_WRITEMASK, 16#B98).
--define(GL_MATRIX_MODE, 16#BA0).
--define(GL_NORMALIZE, 16#BA1).
--define(GL_VIEWPORT, 16#BA2).
--define(GL_MODELVIEW_STACK_DEPTH, 16#BA3).
--define(GL_PROJECTION_STACK_DEPTH, 16#BA4).
--define(GL_TEXTURE_STACK_DEPTH, 16#BA5).
--define(GL_MODELVIEW_MATRIX, 16#BA6).
--define(GL_PROJECTION_MATRIX, 16#BA7).
--define(GL_TEXTURE_MATRIX, 16#BA8).
--define(GL_ATTRIB_STACK_DEPTH, 16#BB0).
--define(GL_CLIENT_ATTRIB_STACK_DEPTH, 16#BB1).
--define(GL_ALPHA_TEST, 16#BC0).
--define(GL_ALPHA_TEST_FUNC, 16#BC1).
--define(GL_ALPHA_TEST_REF, 16#BC2).
--define(GL_DITHER, 16#BD0).
--define(GL_BLEND_DST, 16#BE0).
--define(GL_BLEND_SRC, 16#BE1).
--define(GL_BLEND, 16#BE2).
--define(GL_LOGIC_OP_MODE, 16#BF0).
--define(GL_INDEX_LOGIC_OP, 16#BF1).
--define(GL_LOGIC_OP, ?GL_INDEX_LOGIC_OP).
--define(GL_COLOR_LOGIC_OP, 16#BF2).
+-define(GL_STENCIL_INDEX, 16#1901).
+-define(GL_KEEP, 16#1E00).
+-define(GL_REPLACE, 16#1E01).
+-define(GL_INCR, 16#1E02).
+-define(GL_DECR, 16#1E03).
+-define(GL_NONE, 16#0).
+-define(GL_LEFT, 16#406).
+-define(GL_RIGHT, 16#407).
+-define(GL_FRONT_LEFT, 16#400).
+-define(GL_FRONT_RIGHT, 16#401).
+-define(GL_BACK_LEFT, 16#402).
+-define(GL_BACK_RIGHT, 16#403).
+-define(GL_AUX0, 16#409).
+-define(GL_AUX1, 16#40A).
+-define(GL_AUX2, 16#40B).
+-define(GL_AUX3, 16#40C).
+-define(GL_COLOR_INDEX, 16#1900).
+-define(GL_RED, 16#1903).
+-define(GL_GREEN, 16#1904).
+-define(GL_BLUE, 16#1905).
+-define(GL_ALPHA, 16#1906).
+-define(GL_LUMINANCE, 16#1909).
+-define(GL_LUMINANCE_ALPHA, 16#190A).
+-define(GL_ALPHA_BITS, 16#D55).
+-define(GL_RED_BITS, 16#D52).
+-define(GL_GREEN_BITS, 16#D53).
+-define(GL_BLUE_BITS, 16#D54).
+-define(GL_INDEX_BITS, 16#D51).
+-define(GL_SUBPIXEL_BITS, 16#D50).
 -define(GL_AUX_BUFFERS, 16#C00).
--define(GL_DRAW_BUFFER, 16#C01).
 -define(GL_READ_BUFFER, 16#C02).
--define(GL_SCISSOR_BOX, 16#C10).
--define(GL_SCISSOR_TEST, 16#C11).
--define(GL_INDEX_CLEAR_VALUE, 16#C20).
--define(GL_INDEX_WRITEMASK, 16#C21).
--define(GL_COLOR_CLEAR_VALUE, 16#C22).
--define(GL_COLOR_WRITEMASK, 16#C23).
--define(GL_INDEX_MODE, 16#C30).
--define(GL_RGBA_MODE, 16#C31).
+-define(GL_DRAW_BUFFER, 16#C01).
 -define(GL_DOUBLEBUFFER, 16#C32).
 -define(GL_STEREO, 16#C33).
--define(GL_RENDER_MODE, 16#C40).
--define(GL_PERSPECTIVE_CORRECTION_HINT, 16#C50).
--define(GL_POINT_SMOOTH_HINT, 16#C51).
--define(GL_LINE_SMOOTH_HINT, 16#C52).
--define(GL_POLYGON_SMOOTH_HINT, 16#C53).
--define(GL_FOG_HINT, 16#C54).
--define(GL_TEXTURE_GEN_S, 16#C60).
--define(GL_TEXTURE_GEN_T, 16#C61).
--define(GL_TEXTURE_GEN_R, 16#C62).
--define(GL_TEXTURE_GEN_Q, 16#C63).
--define(GL_PIXEL_MAP_I_TO_I_SIZE, 16#CB0).
--define(GL_PIXEL_MAP_S_TO_S_SIZE, 16#CB1).
--define(GL_PIXEL_MAP_I_TO_R_SIZE, 16#CB2).
--define(GL_PIXEL_MAP_I_TO_G_SIZE, 16#CB3).
--define(GL_PIXEL_MAP_I_TO_B_SIZE, 16#CB4).
--define(GL_PIXEL_MAP_I_TO_A_SIZE, 16#CB5).
--define(GL_PIXEL_MAP_R_TO_R_SIZE, 16#CB6).
--define(GL_PIXEL_MAP_G_TO_G_SIZE, 16#CB7).
--define(GL_PIXEL_MAP_B_TO_B_SIZE, 16#CB8).
--define(GL_PIXEL_MAP_A_TO_A_SIZE, 16#CB9).
--define(GL_UNPACK_SWAP_BYTES, 16#CF0).
--define(GL_UNPACK_LSB_FIRST, 16#CF1).
--define(GL_UNPACK_ROW_LENGTH, 16#CF2).
--define(GL_UNPACK_SKIP_ROWS, 16#CF3).
--define(GL_UNPACK_SKIP_PIXELS, 16#CF4).
--define(GL_UNPACK_ALIGNMENT, 16#CF5).
--define(GL_PACK_SWAP_BYTES, 16#D00).
--define(GL_PACK_LSB_FIRST, 16#D01).
--define(GL_PACK_ROW_LENGTH, 16#D02).
--define(GL_PACK_SKIP_ROWS, 16#D03).
--define(GL_PACK_SKIP_PIXELS, 16#D04).
--define(GL_PACK_ALIGNMENT, 16#D05).
--define(GL_MAP_COLOR, 16#D10).
--define(GL_MAP_STENCIL, 16#D11).
--define(GL_INDEX_SHIFT, 16#D12).
--define(GL_INDEX_OFFSET, 16#D13).
--define(GL_RED_SCALE, 16#D14).
--define(GL_RED_BIAS, 16#D15).
--define(GL_ZOOM_X, 16#D16).
--define(GL_ZOOM_Y, 16#D17).
--define(GL_GREEN_SCALE, 16#D18).
--define(GL_GREEN_BIAS, 16#D19).
--define(GL_BLUE_SCALE, 16#D1A).
--define(GL_BLUE_BIAS, 16#D1B).
--define(GL_ALPHA_SCALE, 16#D1C).
--define(GL_ALPHA_BIAS, 16#D1D).
--define(GL_DEPTH_SCALE, 16#D1E).
--define(GL_DEPTH_BIAS, 16#D1F).
+-define(GL_BITMAP, 16#1A00).
+-define(GL_COLOR, 16#1800).
+-define(GL_DEPTH, 16#1801).
+-define(GL_STENCIL, 16#1802).
+-define(GL_DITHER, 16#BD0).
+-define(GL_RGB, 16#1907).
+-define(GL_RGBA, 16#1908).
+-define(GL_MAX_LIST_NESTING, 16#B31).
 -define(GL_MAX_EVAL_ORDER, 16#D30).
 -define(GL_MAX_LIGHTS, 16#D31).
 -define(GL_MAX_CLIP_PLANES, 16#D32).
@@ -300,19 +323,33 @@
 -define(GL_MAX_TEXTURE_STACK_DEPTH, 16#D39).
 -define(GL_MAX_VIEWPORT_DIMS, 16#D3A).
 -define(GL_MAX_CLIENT_ATTRIB_STACK_DEPTH, 16#D3B).
--define(GL_SUBPIXEL_BITS, 16#D50).
--define(GL_INDEX_BITS, 16#D51).
--define(GL_RED_BITS, 16#D52).
--define(GL_GREEN_BITS, 16#D53).
--define(GL_BLUE_BITS, 16#D54).
--define(GL_ALPHA_BITS, 16#D55).
--define(GL_DEPTH_BITS, 16#D56).
--define(GL_STENCIL_BITS, 16#D57).
--define(GL_ACCUM_RED_BITS, 16#D58).
--define(GL_ACCUM_GREEN_BITS, 16#D59).
--define(GL_ACCUM_BLUE_BITS, 16#D5A).
--define(GL_ACCUM_ALPHA_BITS, 16#D5B).
+-define(GL_ATTRIB_STACK_DEPTH, 16#BB0).
+-define(GL_CLIENT_ATTRIB_STACK_DEPTH, 16#BB1).
+-define(GL_COLOR_CLEAR_VALUE, 16#C22).
+-define(GL_COLOR_WRITEMASK, 16#C23).
+-define(GL_CURRENT_INDEX, 16#B01).
+-define(GL_CURRENT_COLOR, 16#B00).
+-define(GL_CURRENT_NORMAL, 16#B02).
+-define(GL_CURRENT_RASTER_COLOR, 16#B04).
+-define(GL_CURRENT_RASTER_DISTANCE, 16#B09).
+-define(GL_CURRENT_RASTER_INDEX, 16#B05).
+-define(GL_CURRENT_RASTER_POSITION, 16#B07).
+-define(GL_CURRENT_RASTER_TEXTURE_COORDS, 16#B06).
+-define(GL_CURRENT_RASTER_POSITION_VALID, 16#B08).
+-define(GL_CURRENT_TEXTURE_COORDS, 16#B03).
+-define(GL_INDEX_CLEAR_VALUE, 16#C20).
+-define(GL_INDEX_MODE, 16#C30).
+-define(GL_INDEX_WRITEMASK, 16#C21).
+-define(GL_MODELVIEW_MATRIX, 16#BA6).
+-define(GL_MODELVIEW_STACK_DEPTH, 16#BA3).
 -define(GL_NAME_STACK_DEPTH, 16#D70).
+-define(GL_PROJECTION_MATRIX, 16#BA7).
+-define(GL_PROJECTION_STACK_DEPTH, 16#BA4).
+-define(GL_RENDER_MODE, 16#C40).
+-define(GL_RGBA_MODE, 16#C31).
+-define(GL_TEXTURE_MATRIX, 16#BA8).
+-define(GL_TEXTURE_STACK_DEPTH, 16#BA5).
+-define(GL_VIEWPORT, 16#BA2).
 -define(GL_AUTO_NORMAL, 16#D80).
 -define(GL_MAP1_COLOR_4, 16#D90).
 -define(GL_MAP1_INDEX, 16#D91).
@@ -336,166 +373,149 @@
 -define(GL_MAP1_GRID_SEGMENTS, 16#DD1).
 -define(GL_MAP2_GRID_DOMAIN, 16#DD2).
 -define(GL_MAP2_GRID_SEGMENTS, 16#DD3).
+-define(GL_COEFF, 16#A00).
+-define(GL_ORDER, 16#A01).
+-define(GL_DOMAIN, 16#A02).
+-define(GL_PERSPECTIVE_CORRECTION_HINT, 16#C50).
+-define(GL_POINT_SMOOTH_HINT, 16#C51).
+-define(GL_LINE_SMOOTH_HINT, 16#C52).
+-define(GL_POLYGON_SMOOTH_HINT, 16#C53).
+-define(GL_FOG_HINT, 16#C54).
+-define(GL_DONT_CARE, 16#1100).
+-define(GL_FASTEST, 16#1101).
+-define(GL_NICEST, 16#1102).
+-define(GL_SCISSOR_BOX, 16#C10).
+-define(GL_SCISSOR_TEST, 16#C11).
+-define(GL_MAP_COLOR, 16#D10).
+-define(GL_MAP_STENCIL, 16#D11).
+-define(GL_INDEX_SHIFT, 16#D12).
+-define(GL_INDEX_OFFSET, 16#D13).
+-define(GL_RED_SCALE, 16#D14).
+-define(GL_RED_BIAS, 16#D15).
+-define(GL_GREEN_SCALE, 16#D18).
+-define(GL_GREEN_BIAS, 16#D19).
+-define(GL_BLUE_SCALE, 16#D1A).
+-define(GL_BLUE_BIAS, 16#D1B).
+-define(GL_ALPHA_SCALE, 16#D1C).
+-define(GL_ALPHA_BIAS, 16#D1D).
+-define(GL_DEPTH_SCALE, 16#D1E).
+-define(GL_DEPTH_BIAS, 16#D1F).
+-define(GL_PIXEL_MAP_S_TO_S_SIZE, 16#CB1).
+-define(GL_PIXEL_MAP_I_TO_I_SIZE, 16#CB0).
+-define(GL_PIXEL_MAP_I_TO_R_SIZE, 16#CB2).
+-define(GL_PIXEL_MAP_I_TO_G_SIZE, 16#CB3).
+-define(GL_PIXEL_MAP_I_TO_B_SIZE, 16#CB4).
+-define(GL_PIXEL_MAP_I_TO_A_SIZE, 16#CB5).
+-define(GL_PIXEL_MAP_R_TO_R_SIZE, 16#CB6).
+-define(GL_PIXEL_MAP_G_TO_G_SIZE, 16#CB7).
+-define(GL_PIXEL_MAP_B_TO_B_SIZE, 16#CB8).
+-define(GL_PIXEL_MAP_A_TO_A_SIZE, 16#CB9).
+-define(GL_PIXEL_MAP_S_TO_S, 16#C71).
+-define(GL_PIXEL_MAP_I_TO_I, 16#C70).
+-define(GL_PIXEL_MAP_I_TO_R, 16#C72).
+-define(GL_PIXEL_MAP_I_TO_G, 16#C73).
+-define(GL_PIXEL_MAP_I_TO_B, 16#C74).
+-define(GL_PIXEL_MAP_I_TO_A, 16#C75).
+-define(GL_PIXEL_MAP_R_TO_R, 16#C76).
+-define(GL_PIXEL_MAP_G_TO_G, 16#C77).
+-define(GL_PIXEL_MAP_B_TO_B, 16#C78).
+-define(GL_PIXEL_MAP_A_TO_A, 16#C79).
+-define(GL_PACK_ALIGNMENT, 16#D05).
+-define(GL_PACK_LSB_FIRST, 16#D01).
+-define(GL_PACK_ROW_LENGTH, 16#D02).
+-define(GL_PACK_SKIP_PIXELS, 16#D04).
+-define(GL_PACK_SKIP_ROWS, 16#D03).
+-define(GL_PACK_SWAP_BYTES, 16#D00).
+-define(GL_UNPACK_ALIGNMENT, 16#CF5).
+-define(GL_UNPACK_LSB_FIRST, 16#CF1).
+-define(GL_UNPACK_ROW_LENGTH, 16#CF2).
+-define(GL_UNPACK_SKIP_PIXELS, 16#CF4).
+-define(GL_UNPACK_SKIP_ROWS, 16#CF3).
+-define(GL_UNPACK_SWAP_BYTES, 16#CF0).
+-define(GL_ZOOM_X, 16#D16).
+-define(GL_ZOOM_Y, 16#D17).
+-define(GL_TEXTURE_ENV, 16#2300).
+-define(GL_TEXTURE_ENV_MODE, 16#2200).
 -define(GL_TEXTURE_1D, 16#DE0).
 -define(GL_TEXTURE_2D, 16#DE1).
--define(GL_FEEDBACK_BUFFER_POINTER, 16#DF0).
--define(GL_FEEDBACK_BUFFER_SIZE, 16#DF1).
--define(GL_FEEDBACK_BUFFER_TYPE, 16#DF2).
--define(GL_SELECTION_BUFFER_POINTER, 16#DF3).
--define(GL_SELECTION_BUFFER_SIZE, 16#DF4).
--define(GL_POLYGON_OFFSET_UNITS, 16#2A00).
--define(GL_POLYGON_OFFSET_POINT, 16#2A01).
--define(GL_POLYGON_OFFSET_LINE, 16#2A02).
--define(GL_POLYGON_OFFSET_FILL, 16#8037).
--define(GL_POLYGON_OFFSET_FACTOR, 16#8038).
--define(GL_TEXTURE_BINDING_1D, 16#8068).
--define(GL_TEXTURE_BINDING_2D, 16#8069).
--define(GL_TEXTURE_BINDING_3D, 16#806A).
--define(GL_VERTEX_ARRAY, 16#8074).
--define(GL_NORMAL_ARRAY, 16#8075).
--define(GL_COLOR_ARRAY, 16#8076).
--define(GL_INDEX_ARRAY, 16#8077).
--define(GL_TEXTURE_COORD_ARRAY, 16#8078).
--define(GL_EDGE_FLAG_ARRAY, 16#8079).
--define(GL_VERTEX_ARRAY_SIZE, 16#807A).
--define(GL_VERTEX_ARRAY_TYPE, 16#807B).
--define(GL_VERTEX_ARRAY_STRIDE, 16#807C).
--define(GL_NORMAL_ARRAY_TYPE, 16#807E).
--define(GL_NORMAL_ARRAY_STRIDE, 16#807F).
--define(GL_COLOR_ARRAY_SIZE, 16#8081).
--define(GL_COLOR_ARRAY_TYPE, 16#8082).
--define(GL_COLOR_ARRAY_STRIDE, 16#8083).
--define(GL_INDEX_ARRAY_TYPE, 16#8085).
--define(GL_INDEX_ARRAY_STRIDE, 16#8086).
--define(GL_TEXTURE_COORD_ARRAY_SIZE, 16#8088).
--define(GL_TEXTURE_COORD_ARRAY_TYPE, 16#8089).
--define(GL_TEXTURE_COORD_ARRAY_STRIDE, 16#808A).
--define(GL_EDGE_FLAG_ARRAY_STRIDE, 16#808C).
+-define(GL_TEXTURE_WRAP_S, 16#2802).
+-define(GL_TEXTURE_WRAP_T, 16#2803).
+-define(GL_TEXTURE_MAG_FILTER, 16#2800).
+-define(GL_TEXTURE_MIN_FILTER, 16#2801).
+-define(GL_TEXTURE_ENV_COLOR, 16#2201).
+-define(GL_TEXTURE_GEN_S, 16#C60).
+-define(GL_TEXTURE_GEN_T, 16#C61).
+-define(GL_TEXTURE_GEN_MODE, 16#2500).
+-define(GL_TEXTURE_BORDER_COLOR, 16#1004).
 -define(GL_TEXTURE_WIDTH, 16#1000).
 -define(GL_TEXTURE_HEIGHT, 16#1001).
--define(GL_TEXTURE_INTERNAL_FORMAT, 16#1003).
--define(GL_TEXTURE_COMPONENTS, ?GL_TEXTURE_INTERNAL_FORMAT).
--define(GL_TEXTURE_BORDER_COLOR, 16#1004).
 -define(GL_TEXTURE_BORDER, 16#1005).
+-define(GL_TEXTURE_COMPONENTS, 16#1003).
 -define(GL_TEXTURE_RED_SIZE, 16#805C).
 -define(GL_TEXTURE_GREEN_SIZE, 16#805D).
 -define(GL_TEXTURE_BLUE_SIZE, 16#805E).
 -define(GL_TEXTURE_ALPHA_SIZE, 16#805F).
 -define(GL_TEXTURE_LUMINANCE_SIZE, 16#8060).
 -define(GL_TEXTURE_INTENSITY_SIZE, 16#8061).
--define(GL_TEXTURE_PRIORITY, 16#8066).
--define(GL_TEXTURE_RESIDENT, 16#8067).
--define(GL_DONT_CARE, 16#1100).
--define(GL_FASTEST, 16#1101).
--define(GL_NICEST, 16#1102).
--define(GL_AMBIENT, 16#1200).
--define(GL_DIFFUSE, 16#1201).
--define(GL_SPECULAR, 16#1202).
--define(GL_POSITION, 16#1203).
--define(GL_SPOT_DIRECTION, 16#1204).
--define(GL_SPOT_EXPONENT, 16#1205).
--define(GL_SPOT_CUTOFF, 16#1206).
--define(GL_CONSTANT_ATTENUATION, 16#1207).
--define(GL_LINEAR_ATTENUATION, 16#1208).
--define(GL_QUADRATIC_ATTENUATION, 16#1209).
--define(GL_COMPILE, 16#1300).
--define(GL_COMPILE_AND_EXECUTE, 16#1301).
--define(GL_BYTE, 16#1400).
--define(GL_UNSIGNED_BYTE, 16#1401).
--define(GL_SHORT, 16#1402).
--define(GL_UNSIGNED_SHORT, 16#1403).
--define(GL_INT, 16#1404).
--define(GL_UNSIGNED_INT, 16#1405).
--define(GL_FLOAT, 16#1406).
--define(GL_2_BYTES, 16#1407).
--define(GL_3_BYTES, 16#1408).
--define(GL_4_BYTES, 16#1409).
--define(GL_DOUBLE, 16#140A).
--define(GL_DOUBLE_EXT, 16#140A).
--define(GL_CLEAR, 16#1500).
--define(GL_AND, 16#1501).
--define(GL_AND_REVERSE, 16#1502).
--define(GL_COPY, 16#1503).
--define(GL_AND_INVERTED, 16#1504).
--define(GL_NOOP, 16#1505).
--define(GL_XOR, 16#1506).
--define(GL_OR, 16#1507).
--define(GL_NOR, 16#1508).
--define(GL_EQUIV, 16#1509).
--define(GL_INVERT, 16#150A).
--define(GL_OR_REVERSE, 16#150B).
--define(GL_COPY_INVERTED, 16#150C).
--define(GL_OR_INVERTED, 16#150D).
--define(GL_NAND, 16#150E).
--define(GL_SET, 16#150F).
--define(GL_EMISSION, 16#1600).
--define(GL_SHININESS, 16#1601).
--define(GL_AMBIENT_AND_DIFFUSE, 16#1602).
--define(GL_COLOR_INDEXES, 16#1603).
--define(GL_MODELVIEW, 16#1700).
--define(GL_PROJECTION, 16#1701).
--define(GL_TEXTURE, 16#1702).
--define(GL_COLOR, 16#1800).
--define(GL_DEPTH, 16#1801).
--define(GL_STENCIL, 16#1802).
--define(GL_COLOR_INDEX, 16#1900).
--define(GL_STENCIL_INDEX, 16#1901).
--define(GL_DEPTH_COMPONENT, 16#1902).
--define(GL_RED, 16#1903).
--define(GL_GREEN, 16#1904).
--define(GL_BLUE, 16#1905).
--define(GL_ALPHA, 16#1906).
--define(GL_RGB, 16#1907).
--define(GL_RGBA, 16#1908).
--define(GL_LUMINANCE, 16#1909).
--define(GL_LUMINANCE_ALPHA, 16#190A).
--define(GL_BITMAP, 16#1A00).
--define(GL_POINT, 16#1B00).
--define(GL_LINE, 16#1B01).
--define(GL_FILL, 16#1B02).
--define(GL_RENDER, 16#1C00).
--define(GL_FEEDBACK, 16#1C01).
--define(GL_SELECT, 16#1C02).
--define(GL_FLAT, 16#1D00).
--define(GL_SMOOTH, 16#1D01).
--define(GL_KEEP, 16#1E00).
--define(GL_REPLACE, 16#1E01).
--define(GL_INCR, 16#1E02).
--define(GL_DECR, 16#1E03).
--define(GL_VENDOR, 16#1F00).
--define(GL_RENDERER, 16#1F01).
--define(GL_VERSION, 16#1F02).
--define(GL_EXTENSIONS, 16#1F03).
--define(GL_S, 16#2000).
--define(GL_T, 16#2001).
--define(GL_R, 16#2002).
--define(GL_Q, 16#2003).
--define(GL_MODULATE, 16#2100).
--define(GL_DECAL, 16#2101).
--define(GL_TEXTURE_ENV_MODE, 16#2200).
--define(GL_TEXTURE_ENV_COLOR, 16#2201).
--define(GL_TEXTURE_ENV, 16#2300).
--define(GL_EYE_LINEAR, 16#2400).
+-define(GL_NEAREST_MIPMAP_NEAREST, 16#2700).
+-define(GL_NEAREST_MIPMAP_LINEAR, 16#2702).
+-define(GL_LINEAR_MIPMAP_NEAREST, 16#2701).
+-define(GL_LINEAR_MIPMAP_LINEAR, 16#2703).
 -define(GL_OBJECT_LINEAR, 16#2401).
--define(GL_SPHERE_MAP, 16#2402).
--define(GL_TEXTURE_GEN_MODE, 16#2500).
 -define(GL_OBJECT_PLANE, 16#2501).
+-define(GL_EYE_LINEAR, 16#2400).
 -define(GL_EYE_PLANE, 16#2502).
+-define(GL_SPHERE_MAP, 16#2402).
+-define(GL_DECAL, 16#2101).
+-define(GL_MODULATE, 16#2100).
 -define(GL_NEAREST, 16#2600).
--define(GL_LINEAR, 16#2601).
--define(GL_NEAREST_MIPMAP_NEAREST, 16#2700).
--define(GL_LINEAR_MIPMAP_NEAREST, 16#2701).
--define(GL_NEAREST_MIPMAP_LINEAR, 16#2702).
--define(GL_LINEAR_MIPMAP_LINEAR, 16#2703).
--define(GL_TEXTURE_MAG_FILTER, 16#2800).
--define(GL_TEXTURE_MIN_FILTER, 16#2801).
--define(GL_TEXTURE_WRAP_S, 16#2802).
--define(GL_TEXTURE_WRAP_T, 16#2803).
+-define(GL_REPEAT, 16#2901).
+-define(GL_CLAMP, 16#2900).
+-define(GL_S, 16#2000).
+-define(GL_T, 16#2001).
+-define(GL_R, 16#2002).
+-define(GL_Q, 16#2003).
+-define(GL_TEXTURE_GEN_R, 16#C62).
+-define(GL_TEXTURE_GEN_Q, 16#C63).
+-define(GL_VENDOR, 16#1F00).
+-define(GL_RENDERER, 16#1F01).
+-define(GL_VERSION, 16#1F02).
+-define(GL_EXTENSIONS, 16#1F03).
+-define(GL_NO_ERROR, 16#0).
+-define(GL_INVALID_ENUM, 16#500).
+-define(GL_INVALID_VALUE, 16#501).
+-define(GL_INVALID_OPERATION, 16#502).
+-define(GL_STACK_OVERFLOW, 16#503).
+-define(GL_STACK_UNDERFLOW, 16#504).
+-define(GL_OUT_OF_MEMORY, 16#505).
+-define(GL_CURRENT_BIT, 16#1).
+-define(GL_POINT_BIT, 16#2).
+-define(GL_LINE_BIT, 16#4).
+-define(GL_POLYGON_BIT, 16#8).
+-define(GL_POLYGON_STIPPLE_BIT, 16#10).
+-define(GL_PIXEL_MODE_BIT, 16#20).
+-define(GL_LIGHTING_BIT, 16#40).
+-define(GL_FOG_BIT, 16#80).
+-define(GL_DEPTH_BUFFER_BIT, 16#100).
+-define(GL_ACCUM_BUFFER_BIT, 16#200).
+-define(GL_STENCIL_BUFFER_BIT, 16#400).
+-define(GL_VIEWPORT_BIT, 16#800).
+-define(GL_TRANSFORM_BIT, 16#1000).
+-define(GL_ENABLE_BIT, 16#2000).
+-define(GL_COLOR_BUFFER_BIT, 16#4000).
+-define(GL_HINT_BIT, 16#8000).
+-define(GL_EVAL_BIT, 16#10000).
+-define(GL_LIST_BIT, 16#20000).
+-define(GL_TEXTURE_BIT, 16#40000).
+-define(GL_SCISSOR_BIT, 16#80000).
+-define(GL_ALL_ATTRIB_BITS, 16#FFFFF).
 -define(GL_PROXY_TEXTURE_1D, 16#8063).
 -define(GL_PROXY_TEXTURE_2D, 16#8064).
--define(GL_CLAMP, 16#2900).
--define(GL_REPEAT, 16#2901).
--define(GL_R3_G3_B2, 16#2A10).
+-define(GL_TEXTURE_PRIORITY, 16#8066).
+-define(GL_TEXTURE_RESIDENT, 16#8067).
+-define(GL_TEXTURE_BINDING_1D, 16#8068).
+-define(GL_TEXTURE_BINDING_2D, 16#8069).
+-define(GL_TEXTURE_INTERNAL_FORMAT, 16#1003).
 -define(GL_ALPHA4, 16#803B).
 -define(GL_ALPHA8, 16#803C).
 -define(GL_ALPHA12, 16#803D).
@@ -515,6 +535,7 @@
 -define(GL_INTENSITY8, 16#804B).
 -define(GL_INTENSITY12, 16#804C).
 -define(GL_INTENSITY16, 16#804D).
+-define(GL_R3_G3_B2, 16#2A10).
 -define(GL_RGB4, 16#804F).
 -define(GL_RGB5, 16#8050).
 -define(GL_RGB8, 16#8051).
@@ -528,51 +549,14 @@
 -define(GL_RGB10_A2, 16#8059).
 -define(GL_RGBA12, 16#805A).
 -define(GL_RGBA16, 16#805B).
--define(GL_V2F, 16#2A20).
--define(GL_V3F, 16#2A21).
--define(GL_C4UB_V2F, 16#2A22).
--define(GL_C4UB_V3F, 16#2A23).
--define(GL_C3F_V3F, 16#2A24).
--define(GL_N3F_V3F, 16#2A25).
--define(GL_C4F_N3F_V3F, 16#2A26).
--define(GL_T2F_V3F, 16#2A27).
--define(GL_T4F_V4F, 16#2A28).
--define(GL_T2F_C4UB_V3F, 16#2A29).
--define(GL_T2F_C3F_V3F, 16#2A2A).
--define(GL_T2F_N3F_V3F, 16#2A2B).
--define(GL_T2F_C4F_N3F_V3F, 16#2A2C).
--define(GL_T4F_C4F_N3F_V4F, 16#2A2D).
--define(GL_CLIP_PLANE0, 16#3000).
--define(GL_CLIP_PLANE1, 16#3001).
--define(GL_CLIP_PLANE2, 16#3002).
--define(GL_CLIP_PLANE3, 16#3003).
--define(GL_CLIP_PLANE4, 16#3004).
--define(GL_CLIP_PLANE5, 16#3005).
--define(GL_LIGHT0, 16#4000).
--define(GL_LIGHT1, 16#4001).
--define(GL_LIGHT2, 16#4002).
--define(GL_LIGHT3, 16#4003).
--define(GL_LIGHT4, 16#4004).
--define(GL_LIGHT5, 16#4005).
--define(GL_LIGHT6, 16#4006).
--define(GL_LIGHT7, 16#4007).
--define(GL_ABGR_EXT, 16#8000).
--define(GL_FUNC_SUBTRACT_EXT, 16#800A).
--define(GL_FUNC_REVERSE_SUBTRACT_EXT, 16#800B).
--define(GL_UNSIGNED_BYTE_3_3_2_EXT, 16#8032).
--define(GL_UNSIGNED_SHORT_4_4_4_4_EXT, 16#8033).
--define(GL_UNSIGNED_SHORT_5_5_5_1_EXT, 16#8034).
--define(GL_UNSIGNED_INT_8_8_8_8_EXT, 16#8035).
--define(GL_UNSIGNED_INT_10_10_10_2_EXT, 16#8036).
--define(GL_PACK_SKIP_IMAGES, 16#806B).
--define(GL_PACK_IMAGE_HEIGHT, 16#806C).
--define(GL_UNPACK_SKIP_IMAGES, 16#806D).
--define(GL_UNPACK_IMAGE_HEIGHT, 16#806E).
--define(GL_TEXTURE_3D, 16#806F).
--define(GL_PROXY_TEXTURE_3D, 16#8070).
--define(GL_TEXTURE_DEPTH, 16#8071).
--define(GL_TEXTURE_WRAP_R, 16#8072).
--define(GL_MAX_3D_TEXTURE_SIZE, 16#8073).
+-define(GL_CLIENT_PIXEL_STORE_BIT, 16#1).
+-define(GL_CLIENT_VERTEX_ARRAY_BIT, 16#2).
+-define(GL_ALL_CLIENT_ATTRIB_BITS, 16#FFFFFFFF).
+-define(GL_CLIENT_ALL_ATTRIB_BITS, 16#FFFFFFFF).
+-define(GL_RESCALE_NORMAL, 16#803A).
+-define(GL_CLAMP_TO_EDGE, 16#812F).
+-define(GL_MAX_ELEMENTS_VERTICES, 16#80E8).
+-define(GL_MAX_ELEMENTS_INDICES, 16#80E9).
 -define(GL_BGR, 16#80E0).
 -define(GL_BGRA, 16#80E1).
 -define(GL_UNSIGNED_BYTE_3_3_2, 16#8032).
@@ -587,22 +571,104 @@
 -define(GL_UNSIGNED_INT_8_8_8_8_REV, 16#8367).
 -define(GL_UNSIGNED_INT_10_10_10_2, 16#8036).
 -define(GL_UNSIGNED_INT_2_10_10_10_REV, 16#8368).
--define(GL_RESCALE_NORMAL, 16#803A).
 -define(GL_LIGHT_MODEL_COLOR_CONTROL, 16#81F8).
 -define(GL_SINGLE_COLOR, 16#81F9).
 -define(GL_SEPARATE_SPECULAR_COLOR, 16#81FA).
--define(GL_CLAMP_TO_EDGE, 16#812F).
 -define(GL_TEXTURE_MIN_LOD, 16#813A).
 -define(GL_TEXTURE_MAX_LOD, 16#813B).
 -define(GL_TEXTURE_BASE_LEVEL, 16#813C).
 -define(GL_TEXTURE_MAX_LEVEL, 16#813D).
--define(GL_MAX_ELEMENTS_VERTICES, 16#80E8).
--define(GL_MAX_ELEMENTS_INDICES, 16#80E9).
+-define(GL_SMOOTH_POINT_SIZE_RANGE, 16#B12).
+-define(GL_SMOOTH_POINT_SIZE_GRANULARITY, 16#B13).
+-define(GL_SMOOTH_LINE_WIDTH_RANGE, 16#B22).
+-define(GL_SMOOTH_LINE_WIDTH_GRANULARITY, 16#B23).
 -define(GL_ALIASED_POINT_SIZE_RANGE, 16#846D).
 -define(GL_ALIASED_LINE_WIDTH_RANGE, 16#846E).
--define(GL_ACTIVE_TEXTURE, 16#84E0).
--define(GL_CLIENT_ACTIVE_TEXTURE, 16#84E1).
--define(GL_MAX_TEXTURE_UNITS, 16#84E2).
+-define(GL_PACK_SKIP_IMAGES, 16#806B).
+-define(GL_PACK_IMAGE_HEIGHT, 16#806C).
+-define(GL_UNPACK_SKIP_IMAGES, 16#806D).
+-define(GL_UNPACK_IMAGE_HEIGHT, 16#806E).
+-define(GL_TEXTURE_3D, 16#806F).
+-define(GL_PROXY_TEXTURE_3D, 16#8070).
+-define(GL_TEXTURE_DEPTH, 16#8071).
+-define(GL_TEXTURE_WRAP_R, 16#8072).
+-define(GL_MAX_3D_TEXTURE_SIZE, 16#8073).
+-define(GL_TEXTURE_BINDING_3D, 16#806A).
+-define(GL_CONSTANT_COLOR, 16#8001).
+-define(GL_ONE_MINUS_CONSTANT_COLOR, 16#8002).
+-define(GL_CONSTANT_ALPHA, 16#8003).
+-define(GL_ONE_MINUS_CONSTANT_ALPHA, 16#8004).
+-define(GL_COLOR_TABLE, 16#80D0).
+-define(GL_POST_CONVOLUTION_COLOR_TABLE, 16#80D1).
+-define(GL_POST_COLOR_MATRIX_COLOR_TABLE, 16#80D2).
+-define(GL_PROXY_COLOR_TABLE, 16#80D3).
+-define(GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, 16#80D4).
+-define(GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE, 16#80D5).
+-define(GL_COLOR_TABLE_SCALE, 16#80D6).
+-define(GL_COLOR_TABLE_BIAS, 16#80D7).
+-define(GL_COLOR_TABLE_FORMAT, 16#80D8).
+-define(GL_COLOR_TABLE_WIDTH, 16#80D9).
+-define(GL_COLOR_TABLE_RED_SIZE, 16#80DA).
+-define(GL_COLOR_TABLE_GREEN_SIZE, 16#80DB).
+-define(GL_COLOR_TABLE_BLUE_SIZE, 16#80DC).
+-define(GL_COLOR_TABLE_ALPHA_SIZE, 16#80DD).
+-define(GL_COLOR_TABLE_LUMINANCE_SIZE, 16#80DE).
+-define(GL_COLOR_TABLE_INTENSITY_SIZE, 16#80DF).
+-define(GL_CONVOLUTION_1D, 16#8010).
+-define(GL_CONVOLUTION_2D, 16#8011).
+-define(GL_SEPARABLE_2D, 16#8012).
+-define(GL_CONVOLUTION_BORDER_MODE, 16#8013).
+-define(GL_CONVOLUTION_FILTER_SCALE, 16#8014).
+-define(GL_CONVOLUTION_FILTER_BIAS, 16#8015).
+-define(GL_REDUCE, 16#8016).
+-define(GL_CONVOLUTION_FORMAT, 16#8017).
+-define(GL_CONVOLUTION_WIDTH, 16#8018).
+-define(GL_CONVOLUTION_HEIGHT, 16#8019).
+-define(GL_MAX_CONVOLUTION_WIDTH, 16#801A).
+-define(GL_MAX_CONVOLUTION_HEIGHT, 16#801B).
+-define(GL_POST_CONVOLUTION_RED_SCALE, 16#801C).
+-define(GL_POST_CONVOLUTION_GREEN_SCALE, 16#801D).
+-define(GL_POST_CONVOLUTION_BLUE_SCALE, 16#801E).
+-define(GL_POST_CONVOLUTION_ALPHA_SCALE, 16#801F).
+-define(GL_POST_CONVOLUTION_RED_BIAS, 16#8020).
+-define(GL_POST_CONVOLUTION_GREEN_BIAS, 16#8021).
+-define(GL_POST_CONVOLUTION_BLUE_BIAS, 16#8022).
+-define(GL_POST_CONVOLUTION_ALPHA_BIAS, 16#8023).
+-define(GL_CONSTANT_BORDER, 16#8151).
+-define(GL_REPLICATE_BORDER, 16#8153).
+-define(GL_CONVOLUTION_BORDER_COLOR, 16#8154).
+-define(GL_COLOR_MATRIX, 16#80B1).
+-define(GL_COLOR_MATRIX_STACK_DEPTH, 16#80B2).
+-define(GL_MAX_COLOR_MATRIX_STACK_DEPTH, 16#80B3).
+-define(GL_POST_COLOR_MATRIX_RED_SCALE, 16#80B4).
+-define(GL_POST_COLOR_MATRIX_GREEN_SCALE, 16#80B5).
+-define(GL_POST_COLOR_MATRIX_BLUE_SCALE, 16#80B6).
+-define(GL_POST_COLOR_MATRIX_ALPHA_SCALE, 16#80B7).
+-define(GL_POST_COLOR_MATRIX_RED_BIAS, 16#80B8).
+-define(GL_POST_COLOR_MATRIX_GREEN_BIAS, 16#80B9).
+-define(GL_POST_COLOR_MATRIX_BLUE_BIAS, 16#80BA).
+-define(GL_POST_COLOR_MATRIX_ALPHA_BIAS, 16#80BB).
+-define(GL_HISTOGRAM, 16#8024).
+-define(GL_PROXY_HISTOGRAM, 16#8025).
+-define(GL_HISTOGRAM_WIDTH, 16#8026).
+-define(GL_HISTOGRAM_FORMAT, 16#8027).
+-define(GL_HISTOGRAM_RED_SIZE, 16#8028).
+-define(GL_HISTOGRAM_GREEN_SIZE, 16#8029).
+-define(GL_HISTOGRAM_BLUE_SIZE, 16#802A).
+-define(GL_HISTOGRAM_ALPHA_SIZE, 16#802B).
+-define(GL_HISTOGRAM_LUMINANCE_SIZE, 16#802C).
+-define(GL_HISTOGRAM_SINK, 16#802D).
+-define(GL_MINMAX, 16#802E).
+-define(GL_MINMAX_FORMAT, 16#802F).
+-define(GL_MINMAX_SINK, 16#8030).
+-define(GL_TABLE_TOO_LARGE, 16#8031).
+-define(GL_BLEND_EQUATION, 16#8009).
+-define(GL_MIN, 16#8007).
+-define(GL_MAX, 16#8008).
+-define(GL_FUNC_ADD, 16#8006).
+-define(GL_FUNC_SUBTRACT, 16#800A).
+-define(GL_FUNC_REVERSE_SUBTRACT, 16#800B).
+-define(GL_BLEND_COLOR, 16#8005).
 -define(GL_TEXTURE0, 16#84C0).
 -define(GL_TEXTURE1, 16#84C1).
 -define(GL_TEXTURE2, 16#84C2).
@@ -635,6 +701,9 @@
 -define(GL_TEXTURE29, 16#84DD).
 -define(GL_TEXTURE30, 16#84DE).
 -define(GL_TEXTURE31, 16#84DF).
+-define(GL_ACTIVE_TEXTURE, 16#84E0).
+-define(GL_CLIENT_ACTIVE_TEXTURE, 16#84E1).
+-define(GL_MAX_TEXTURE_UNITS, 16#84E2).
 -define(GL_NORMAL_MAP, 16#8511).
 -define(GL_REFLECTION_MAP, 16#8512).
 -define(GL_TEXTURE_CUBE_MAP, 16#8513).
@@ -647,32 +716,6 @@
 -define(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, 16#851A).
 -define(GL_PROXY_TEXTURE_CUBE_MAP, 16#851B).
 -define(GL_MAX_CUBE_MAP_TEXTURE_SIZE, 16#851C).
--define(GL_COMBINE, 16#8570).
--define(GL_COMBINE_RGB, 16#8571).
--define(GL_COMBINE_ALPHA, 16#8572).
--define(GL_RGB_SCALE, 16#8573).
--define(GL_ADD_SIGNED, 16#8574).
--define(GL_INTERPOLATE, 16#8575).
--define(GL_CONSTANT, 16#8576).
--define(GL_PRIMARY_COLOR, 16#8577).
--define(GL_PREVIOUS, 16#8578).
--define(GL_SOURCE0_RGB, 16#8580).
--define(GL_SOURCE1_RGB, 16#8581).
--define(GL_SOURCE2_RGB, 16#8582).
--define(GL_SOURCE0_ALPHA, 16#8588).
--define(GL_SOURCE1_ALPHA, 16#8589).
--define(GL_SOURCE2_ALPHA, 16#858A).
--define(GL_OPERAND0_RGB, 16#8590).
--define(GL_OPERAND1_RGB, 16#8591).
--define(GL_OPERAND2_RGB, 16#8592).
--define(GL_OPERAND0_ALPHA, 16#8598).
--define(GL_OPERAND1_ALPHA, 16#8599).
--define(GL_OPERAND2_ALPHA, 16#859A).
--define(GL_SUBTRACT, 16#84E7).
--define(GL_TRANSPOSE_MODELVIEW_MATRIX, 16#84E3).
--define(GL_TRANSPOSE_PROJECTION_MATRIX, 16#84E4).
--define(GL_TRANSPOSE_TEXTURE_MATRIX, 16#84E5).
--define(GL_TRANSPOSE_COLOR_MATRIX, 16#84E6).
 -define(GL_COMPRESSED_ALPHA, 16#84E9).
 -define(GL_COMPRESSED_LUMINANCE, 16#84EA).
 -define(GL_COMPRESSED_LUMINANCE_ALPHA, 16#84EB).
@@ -684,9 +727,6 @@
 -define(GL_TEXTURE_COMPRESSED, 16#86A1).
 -define(GL_NUM_COMPRESSED_TEXTURE_FORMATS, 16#86A2).
 -define(GL_COMPRESSED_TEXTURE_FORMATS, 16#86A3).
--define(GL_DOT3_RGB, 16#86AE).
--define(GL_DOT3_RGBA, 16#86AF).
--define(GL_CLAMP_TO_BORDER, 16#812D).
 -define(GL_MULTISAMPLE, 16#809D).
 -define(GL_SAMPLE_ALPHA_TO_COVERAGE, 16#809E).
 -define(GL_SAMPLE_ALPHA_TO_ONE, 16#809F).
@@ -696,57 +736,120 @@
 -define(GL_SAMPLE_COVERAGE_VALUE, 16#80AA).
 -define(GL_SAMPLE_COVERAGE_INVERT, 16#80AB).
 -define(GL_MULTISAMPLE_BIT, 16#20000000).
--define(GL_VERTEX_ARRAY_EXT, 16#8074).
--define(GL_NORMAL_ARRAY_EXT, 16#8075).
--define(GL_COLOR_ARRAY_EXT, 16#8076).
--define(GL_INDEX_ARRAY_EXT, 16#8077).
--define(GL_TEXTURE_COORD_ARRAY_EXT, 16#8078).
--define(GL_EDGE_FLAG_ARRAY_EXT, 16#8079).
--define(GL_VERTEX_ARRAY_SIZE_EXT, 16#807A).
--define(GL_VERTEX_ARRAY_TYPE_EXT, 16#807B).
--define(GL_VERTEX_ARRAY_STRIDE_EXT, 16#807C).
--define(GL_VERTEX_ARRAY_COUNT_EXT, 16#807D).
--define(GL_NORMAL_ARRAY_TYPE_EXT, 16#807E).
--define(GL_NORMAL_ARRAY_STRIDE_EXT, 16#807F).
--define(GL_NORMAL_ARRAY_COUNT_EXT, 16#8080).
--define(GL_COLOR_ARRAY_SIZE_EXT, 16#8081).
--define(GL_COLOR_ARRAY_TYPE_EXT, 16#8082).
--define(GL_COLOR_ARRAY_STRIDE_EXT, 16#8083).
--define(GL_COLOR_ARRAY_COUNT_EXT, 16#8084).
--define(GL_INDEX_ARRAY_TYPE_EXT, 16#8085).
--define(GL_INDEX_ARRAY_STRIDE_EXT, 16#8086).
--define(GL_INDEX_ARRAY_COUNT_EXT, 16#8087).
--define(GL_TEXTURE_COORD_ARRAY_SIZE_EXT, 16#8088).
--define(GL_TEXTURE_COORD_ARRAY_TYPE_EXT, 16#8089).
--define(GL_TEXTURE_COORD_ARRAY_STRIDE_EXT, 16#808A).
--define(GL_TEXTURE_COORD_ARRAY_COUNT_EXT, 16#808B).
--define(GL_EDGE_FLAG_ARRAY_STRIDE_EXT, 16#808C).
--define(GL_EDGE_FLAG_ARRAY_COUNT_EXT, 16#808D).
--define(GL_VERTEX_ARRAY_POINTER_EXT, 16#808E).
--define(GL_NORMAL_ARRAY_POINTER_EXT, 16#808F).
--define(GL_COLOR_ARRAY_POINTER_EXT, 16#8090).
--define(GL_INDEX_ARRAY_POINTER_EXT, 16#8091).
--define(GL_TEXTURE_COORD_ARRAY_POINTER_EXT, 16#8092).
--define(GL_EDGE_FLAG_ARRAY_POINTER_EXT, 16#8093).
--define(GL_TEXTURE_MIN_LOD_SGIS, 16#813A).
--define(GL_TEXTURE_MAX_LOD_SGIS, 16#813B).
--define(GL_TEXTURE_BASE_LEVEL_SGIS, 16#813C).
--define(GL_TEXTURE_MAX_LEVEL_SGIS, 16#813D).
--define(GL_SHARED_TEXTURE_PALETTE_EXT, 16#81FB).
--define(GL_RESCALE_NORMAL_EXT, 16#803A).
--define(GL_TEXTURE_COMPARE_SGIX, 16#819A).
--define(GL_TEXTURE_COMPARE_OPERATOR_SGIX, 16#819B).
--define(GL_TEXTURE_LEQUAL_R_SGIX, 16#819C).
--define(GL_TEXTURE_GEQUAL_R_SGIX, 16#819D).
--define(GL_DEPTH_COMPONENT16_SGIX, 16#81A5).
--define(GL_DEPTH_COMPONENT24_SGIX, 16#81A6).
--define(GL_DEPTH_COMPONENT32_SGIX, 16#81A7).
--define(GL_GENERATE_MIPMAP_SGIS, 16#8191).
--define(GL_GENERATE_MIPMAP_HINT_SGIS, 16#8192).
+-define(GL_TRANSPOSE_MODELVIEW_MATRIX, 16#84E3).
+-define(GL_TRANSPOSE_PROJECTION_MATRIX, 16#84E4).
+-define(GL_TRANSPOSE_TEXTURE_MATRIX, 16#84E5).
+-define(GL_TRANSPOSE_COLOR_MATRIX, 16#84E6).
+-define(GL_COMBINE, 16#8570).
+-define(GL_COMBINE_RGB, 16#8571).
+-define(GL_COMBINE_ALPHA, 16#8572).
+-define(GL_SOURCE0_RGB, 16#8580).
+-define(GL_SOURCE1_RGB, 16#8581).
+-define(GL_SOURCE2_RGB, 16#8582).
+-define(GL_SOURCE0_ALPHA, 16#8588).
+-define(GL_SOURCE1_ALPHA, 16#8589).
+-define(GL_SOURCE2_ALPHA, 16#858A).
+-define(GL_OPERAND0_RGB, 16#8590).
+-define(GL_OPERAND1_RGB, 16#8591).
+-define(GL_OPERAND2_RGB, 16#8592).
+-define(GL_OPERAND0_ALPHA, 16#8598).
+-define(GL_OPERAND1_ALPHA, 16#8599).
+-define(GL_OPERAND2_ALPHA, 16#859A).
+-define(GL_RGB_SCALE, 16#8573).
+-define(GL_ADD_SIGNED, 16#8574).
+-define(GL_INTERPOLATE, 16#8575).
+-define(GL_SUBTRACT, 16#84E7).
+-define(GL_CONSTANT, 16#8576).
+-define(GL_PRIMARY_COLOR, 16#8577).
+-define(GL_PREVIOUS, 16#8578).
+-define(GL_DOT3_RGB, 16#86AE).
+-define(GL_DOT3_RGBA, 16#86AF).
+-define(GL_CLAMP_TO_BORDER, 16#812D).
+-define(GL_ARB_multitexture, 1).
+-define(GL_TEXTURE0_ARB, 16#84C0).
+-define(GL_TEXTURE1_ARB, 16#84C1).
+-define(GL_TEXTURE2_ARB, 16#84C2).
+-define(GL_TEXTURE3_ARB, 16#84C3).
+-define(GL_TEXTURE4_ARB, 16#84C4).
+-define(GL_TEXTURE5_ARB, 16#84C5).
+-define(GL_TEXTURE6_ARB, 16#84C6).
+-define(GL_TEXTURE7_ARB, 16#84C7).
+-define(GL_TEXTURE8_ARB, 16#84C8).
+-define(GL_TEXTURE9_ARB, 16#84C9).
+-define(GL_TEXTURE10_ARB, 16#84CA).
+-define(GL_TEXTURE11_ARB, 16#84CB).
+-define(GL_TEXTURE12_ARB, 16#84CC).
+-define(GL_TEXTURE13_ARB, 16#84CD).
+-define(GL_TEXTURE14_ARB, 16#84CE).
+-define(GL_TEXTURE15_ARB, 16#84CF).
+-define(GL_TEXTURE16_ARB, 16#84D0).
+-define(GL_TEXTURE17_ARB, 16#84D1).
+-define(GL_TEXTURE18_ARB, 16#84D2).
+-define(GL_TEXTURE19_ARB, 16#84D3).
+-define(GL_TEXTURE20_ARB, 16#84D4).
+-define(GL_TEXTURE21_ARB, 16#84D5).
+-define(GL_TEXTURE22_ARB, 16#84D6).
+-define(GL_TEXTURE23_ARB, 16#84D7).
+-define(GL_TEXTURE24_ARB, 16#84D8).
+-define(GL_TEXTURE25_ARB, 16#84D9).
+-define(GL_TEXTURE26_ARB, 16#84DA).
+-define(GL_TEXTURE27_ARB, 16#84DB).
+-define(GL_TEXTURE28_ARB, 16#84DC).
+-define(GL_TEXTURE29_ARB, 16#84DD).
+-define(GL_TEXTURE30_ARB, 16#84DE).
+-define(GL_TEXTURE31_ARB, 16#84DF).
+-define(GL_ACTIVE_TEXTURE_ARB, 16#84E0).
+-define(GL_CLIENT_ACTIVE_TEXTURE_ARB, 16#84E1).
+-define(GL_MAX_TEXTURE_UNITS_ARB, 16#84E2).
+-define(GL_MESA_packed_depth_stencil, 1).
+-define(GL_DEPTH_STENCIL_MESA, 16#8750).
+-define(GL_UNSIGNED_INT_24_8_MESA, 16#8751).
+-define(GL_UNSIGNED_INT_8_24_REV_MESA, 16#8752).
+-define(GL_UNSIGNED_SHORT_15_1_MESA, 16#8753).
+-define(GL_UNSIGNED_SHORT_1_15_REV_MESA, 16#8754).
+-define(GL_MESA_program_debug, 1).
+-define(GL_FRAGMENT_PROGRAM_POSITION_MESA, 16#8BB0).
+-define(GL_FRAGMENT_PROGRAM_CALLBACK_MESA, 16#8BB1).
+-define(GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA, 16#8BB2).
+-define(GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA, 16#8BB3).
+-define(GL_VERTEX_PROGRAM_POSITION_MESA, 16#8BB4).
+-define(GL_VERTEX_PROGRAM_CALLBACK_MESA, 16#8BB5).
+-define(GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA, 16#8BB6).
+-define(GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA, 16#8BB7).
+-define(GL_MESA_texture_array, 1).
+-define(GL_TEXTURE_1D_ARRAY_EXT, 16#8C18).
+-define(GL_PROXY_TEXTURE_1D_ARRAY_EXT, 16#8C19).
+-define(GL_TEXTURE_2D_ARRAY_EXT, 16#8C1A).
+-define(GL_PROXY_TEXTURE_2D_ARRAY_EXT, 16#8C1B).
+-define(GL_TEXTURE_BINDING_1D_ARRAY_EXT, 16#8C1C).
+-define(GL_TEXTURE_BINDING_2D_ARRAY_EXT, 16#8C1D).
+-define(GL_MAX_ARRAY_TEXTURE_LAYERS_EXT, 16#88FF).
+-define(GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT, 16#8CD4).
+-define(GL_ATI_blend_equation_separate, 1).
+-define(GL_ALPHA_BLEND_EQUATION_ATI, 16#883D).
+-define(GL_OES_EGL_image, 1).
+-define(GL_GLEXT_VERSION, 66).
+-define(GL_BLEND_DST_RGB, 16#80C8).
+-define(GL_BLEND_SRC_RGB, 16#80C9).
+-define(GL_BLEND_DST_ALPHA, 16#80CA).
+-define(GL_BLEND_SRC_ALPHA, 16#80CB).
+-define(GL_POINT_FADE_THRESHOLD_SIZE, 16#8128).
+-define(GL_DEPTH_COMPONENT16, 16#81A5).
+-define(GL_DEPTH_COMPONENT24, 16#81A6).
+-define(GL_DEPTH_COMPONENT32, 16#81A7).
+-define(GL_MIRRORED_REPEAT, 16#8370).
+-define(GL_MAX_TEXTURE_LOD_BIAS, 16#84FD).
+-define(GL_TEXTURE_LOD_BIAS, 16#8501).
+-define(GL_INCR_WRAP, 16#8507).
+-define(GL_DECR_WRAP, 16#8508).
+-define(GL_TEXTURE_DEPTH_SIZE, 16#884A).
+-define(GL_TEXTURE_COMPARE_MODE, 16#884C).
+-define(GL_TEXTURE_COMPARE_FUNC, 16#884D).
 -define(GL_POINT_SIZE_MIN, 16#8126).
 -define(GL_POINT_SIZE_MAX, 16#8127).
--define(GL_POINT_FADE_THRESHOLD_SIZE, 16#8128).
 -define(GL_POINT_DISTANCE_ATTENUATION, 16#8129).
+-define(GL_GENERATE_MIPMAP, 16#8191).
+-define(GL_GENERATE_MIPMAP_HINT, 16#8192).
 -define(GL_FOG_COORDINATE_SOURCE, 16#8450).
 -define(GL_FOG_COORDINATE, 16#8451).
 -define(GL_FRAGMENT_DEPTH, 16#8452).
@@ -762,101 +865,9 @@
 -define(GL_SECONDARY_COLOR_ARRAY_STRIDE, 16#845C).
 -define(GL_SECONDARY_COLOR_ARRAY_POINTER, 16#845D).
 -define(GL_SECONDARY_COLOR_ARRAY, 16#845E).
--define(GL_INCR_WRAP, 16#8507).
--define(GL_DECR_WRAP, 16#8508).
--define(GL_MAX_TEXTURE_LOD_BIAS, 16#84FD).
 -define(GL_TEXTURE_FILTER_CONTROL, 16#8500).
--define(GL_TEXTURE_LOD_BIAS, 16#8501).
--define(GL_GENERATE_MIPMAP, 16#8191).
--define(GL_GENERATE_MIPMAP_HINT, 16#8192).
--define(GL_BLEND_DST_RGB, 16#80C8).
--define(GL_BLEND_SRC_RGB, 16#80C9).
--define(GL_BLEND_DST_ALPHA, 16#80CA).
--define(GL_BLEND_SRC_ALPHA, 16#80CB).
--define(GL_MIRRORED_REPEAT, 16#8370).
--define(GL_DEPTH_COMPONENT16, 16#81A5).
--define(GL_DEPTH_COMPONENT24, 16#81A6).
--define(GL_DEPTH_COMPONENT32, 16#81A7).
--define(GL_TEXTURE_DEPTH_SIZE, 16#884A).
 -define(GL_DEPTH_TEXTURE_MODE, 16#884B).
--define(GL_TEXTURE_COMPARE_MODE, 16#884C).
--define(GL_TEXTURE_COMPARE_FUNC, 16#884D).
 -define(GL_COMPARE_R_TO_TEXTURE, 16#884E).
--define(GL_GLEXT_VERSION, 65).
--define(GL_CONSTANT_COLOR, 16#8001).
--define(GL_ONE_MINUS_CONSTANT_COLOR, 16#8002).
--define(GL_CONSTANT_ALPHA, 16#8003).
--define(GL_ONE_MINUS_CONSTANT_ALPHA, 16#8004).
--define(GL_BLEND_COLOR, 16#8005).
--define(GL_FUNC_ADD, 16#8006).
--define(GL_MIN, 16#8007).
--define(GL_MAX, 16#8008).
--define(GL_BLEND_EQUATION, 16#8009).
--define(GL_FUNC_SUBTRACT, 16#800A).
--define(GL_FUNC_REVERSE_SUBTRACT, 16#800B).
--define(GL_CONVOLUTION_1D, 16#8010).
--define(GL_CONVOLUTION_2D, 16#8011).
--define(GL_SEPARABLE_2D, 16#8012).
--define(GL_CONVOLUTION_BORDER_MODE, 16#8013).
--define(GL_CONVOLUTION_FILTER_SCALE, 16#8014).
--define(GL_CONVOLUTION_FILTER_BIAS, 16#8015).
--define(GL_REDUCE, 16#8016).
--define(GL_CONVOLUTION_FORMAT, 16#8017).
--define(GL_CONVOLUTION_WIDTH, 16#8018).
--define(GL_CONVOLUTION_HEIGHT, 16#8019).
--define(GL_MAX_CONVOLUTION_WIDTH, 16#801A).
--define(GL_MAX_CONVOLUTION_HEIGHT, 16#801B).
--define(GL_POST_CONVOLUTION_RED_SCALE, 16#801C).
--define(GL_POST_CONVOLUTION_GREEN_SCALE, 16#801D).
--define(GL_POST_CONVOLUTION_BLUE_SCALE, 16#801E).
--define(GL_POST_CONVOLUTION_ALPHA_SCALE, 16#801F).
--define(GL_POST_CONVOLUTION_RED_BIAS, 16#8020).
--define(GL_POST_CONVOLUTION_GREEN_BIAS, 16#8021).
--define(GL_POST_CONVOLUTION_BLUE_BIAS, 16#8022).
--define(GL_POST_CONVOLUTION_ALPHA_BIAS, 16#8023).
--define(GL_HISTOGRAM, 16#8024).
--define(GL_PROXY_HISTOGRAM, 16#8025).
--define(GL_HISTOGRAM_WIDTH, 16#8026).
--define(GL_HISTOGRAM_FORMAT, 16#8027).
--define(GL_HISTOGRAM_RED_SIZE, 16#8028).
--define(GL_HISTOGRAM_GREEN_SIZE, 16#8029).
--define(GL_HISTOGRAM_BLUE_SIZE, 16#802A).
--define(GL_HISTOGRAM_ALPHA_SIZE, 16#802B).
--define(GL_HISTOGRAM_LUMINANCE_SIZE, 16#802C).
--define(GL_HISTOGRAM_SINK, 16#802D).
--define(GL_MINMAX, 16#802E).
--define(GL_MINMAX_FORMAT, 16#802F).
--define(GL_MINMAX_SINK, 16#8030).
--define(GL_COLOR_MATRIX, 16#80B1).
--define(GL_COLOR_MATRIX_STACK_DEPTH, 16#80B2).
--define(GL_MAX_COLOR_MATRIX_STACK_DEPTH, 16#80B3).
--define(GL_POST_COLOR_MATRIX_RED_SCALE, 16#80B4).
--define(GL_POST_COLOR_MATRIX_GREEN_SCALE, 16#80B5).
--define(GL_POST_COLOR_MATRIX_BLUE_SCALE, 16#80B6).
--define(GL_POST_COLOR_MATRIX_ALPHA_SCALE, 16#80B7).
--define(GL_POST_COLOR_MATRIX_RED_BIAS, 16#80B8).
--define(GL_POST_COLOR_MATRIX_GREEN_BIAS, 16#80B9).
--define(GL_POST_COLOR_MATRIX_BLUE_BIAS, 16#80BA).
--define(GL_POST_COLOR_MATRIX_ALPHA_BIAS, 16#80BB).
--define(GL_COLOR_TABLE, 16#80D0).
--define(GL_POST_CONVOLUTION_COLOR_TABLE, 16#80D1).
--define(GL_POST_COLOR_MATRIX_COLOR_TABLE, 16#80D2).
--define(GL_PROXY_COLOR_TABLE, 16#80D3).
--define(GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, 16#80D4).
--define(GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE, 16#80D5).
--define(GL_COLOR_TABLE_SCALE, 16#80D6).
--define(GL_COLOR_TABLE_BIAS, 16#80D7).
--define(GL_COLOR_TABLE_FORMAT, 16#80D8).
--define(GL_COLOR_TABLE_WIDTH, 16#80D9).
--define(GL_COLOR_TABLE_RED_SIZE, 16#80DA).
--define(GL_COLOR_TABLE_GREEN_SIZE, 16#80DB).
--define(GL_COLOR_TABLE_BLUE_SIZE, 16#80DC).
--define(GL_COLOR_TABLE_ALPHA_SIZE, 16#80DD).
--define(GL_COLOR_TABLE_LUMINANCE_SIZE, 16#80DE).
--define(GL_COLOR_TABLE_INTENSITY_SIZE, 16#80DF).
--define(GL_CONSTANT_BORDER, 16#8151).
--define(GL_REPLICATE_BORDER, 16#8153).
--define(GL_CONVOLUTION_BORDER_COLOR, 16#8154).
 -define(GL_BUFFER_SIZE, 16#8764).
 -define(GL_BUFFER_USAGE, 16#8765).
 -define(GL_QUERY_COUNTER_BITS, 16#8864).
@@ -1184,41 +1195,6 @@
 -define(GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW, 16#900D).
 -define(GL_INT_SAMPLER_CUBE_MAP_ARRAY, 16#900E).
 -define(GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY, 16#900F).
--define(GL_TEXTURE0_ARB, 16#84C0).
--define(GL_TEXTURE1_ARB, 16#84C1).
--define(GL_TEXTURE2_ARB, 16#84C2).
--define(GL_TEXTURE3_ARB, 16#84C3).
--define(GL_TEXTURE4_ARB, 16#84C4).
--define(GL_TEXTURE5_ARB, 16#84C5).
--define(GL_TEXTURE6_ARB, 16#84C6).
--define(GL_TEXTURE7_ARB, 16#84C7).
--define(GL_TEXTURE8_ARB, 16#84C8).
--define(GL_TEXTURE9_ARB, 16#84C9).
--define(GL_TEXTURE10_ARB, 16#84CA).
--define(GL_TEXTURE11_ARB, 16#84CB).
--define(GL_TEXTURE12_ARB, 16#84CC).
--define(GL_TEXTURE13_ARB, 16#84CD).
--define(GL_TEXTURE14_ARB, 16#84CE).
--define(GL_TEXTURE15_ARB, 16#84CF).
--define(GL_TEXTURE16_ARB, 16#84D0).
--define(GL_TEXTURE17_ARB, 16#84D1).
--define(GL_TEXTURE18_ARB, 16#84D2).
--define(GL_TEXTURE19_ARB, 16#84D3).
--define(GL_TEXTURE20_ARB, 16#84D4).
--define(GL_TEXTURE21_ARB, 16#84D5).
--define(GL_TEXTURE22_ARB, 16#84D6).
--define(GL_TEXTURE23_ARB, 16#84D7).
--define(GL_TEXTURE24_ARB, 16#84D8).
--define(GL_TEXTURE25_ARB, 16#84D9).
--define(GL_TEXTURE26_ARB, 16#84DA).
--define(GL_TEXTURE27_ARB, 16#84DB).
--define(GL_TEXTURE28_ARB, 16#84DC).
--define(GL_TEXTURE29_ARB, 16#84DD).
--define(GL_TEXTURE30_ARB, 16#84DE).
--define(GL_TEXTURE31_ARB, 16#84DF).
--define(GL_ACTIVE_TEXTURE_ARB, 16#84E0).
--define(GL_CLIENT_ACTIVE_TEXTURE_ARB, 16#84E1).
--define(GL_MAX_TEXTURE_UNITS_ARB, 16#84E2).
 -define(GL_TRANSPOSE_MODELVIEW_MATRIX_ARB, 16#84E3).
 -define(GL_TRANSPOSE_PROJECTION_MATRIX_ARB, 16#84E4).
 -define(GL_TRANSPOSE_TEXTURE_MATRIX_ARB, 16#84E5).
@@ -1956,6 +1932,7 @@
 -define(GL_UNKNOWN_CONTEXT_RESET_ARB, 16#8255).
 -define(GL_RESET_NOTIFICATION_STRATEGY_ARB, 16#8256).
 -define(GL_NO_RESET_NOTIFICATION_ARB, 16#8261).
+-define(GL_ABGR_EXT, 16#8000).
 -define(GL_CONSTANT_COLOR_EXT, 16#8001).
 -define(GL_ONE_MINUS_CONSTANT_COLOR_EXT, 16#8002).
 -define(GL_CONSTANT_ALPHA_EXT, 16#8003).
@@ -2118,6 +2095,15 @@
 -define(GL_LINEAR_SHARPEN_ALPHA_SGIS, 16#80AE).
 -define(GL_LINEAR_SHARPEN_COLOR_SGIS, 16#80AF).
 -define(GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS, 16#80B0).
+-define(GL_UNSIGNED_BYTE_3_3_2_EXT, 16#8032).
+-define(GL_UNSIGNED_SHORT_4_4_4_4_EXT, 16#8033).
+-define(GL_UNSIGNED_SHORT_5_5_5_1_EXT, 16#8034).
+-define(GL_UNSIGNED_INT_8_8_8_8_EXT, 16#8035).
+-define(GL_UNSIGNED_INT_10_10_10_2_EXT, 16#8036).
+-define(GL_TEXTURE_MIN_LOD_SGIS, 16#813A).
+-define(GL_TEXTURE_MAX_LOD_SGIS, 16#813B).
+-define(GL_TEXTURE_BASE_LEVEL_SGIS, 16#813C).
+-define(GL_TEXTURE_MAX_LEVEL_SGIS, 16#813D).
 -define(GL_MULTISAMPLE_SGIS, 16#809D).
 -define(GL_SAMPLE_ALPHA_TO_MASK_SGIS, 16#809E).
 -define(GL_SAMPLE_ALPHA_TO_ONE_SGIS, 16#809F).
@@ -2134,6 +2120,41 @@
 -define(GL_SAMPLE_MASK_VALUE_SGIS, 16#80AA).
 -define(GL_SAMPLE_MASK_INVERT_SGIS, 16#80AB).
 -define(GL_SAMPLE_PATTERN_SGIS, 16#80AC).
+-define(GL_RESCALE_NORMAL_EXT, 16#803A).
+-define(GL_VERTEX_ARRAY_EXT, 16#8074).
+-define(GL_NORMAL_ARRAY_EXT, 16#8075).
+-define(GL_COLOR_ARRAY_EXT, 16#8076).
+-define(GL_INDEX_ARRAY_EXT, 16#8077).
+-define(GL_TEXTURE_COORD_ARRAY_EXT, 16#8078).
+-define(GL_EDGE_FLAG_ARRAY_EXT, 16#8079).
+-define(GL_VERTEX_ARRAY_SIZE_EXT, 16#807A).
+-define(GL_VERTEX_ARRAY_TYPE_EXT, 16#807B).
+-define(GL_VERTEX_ARRAY_STRIDE_EXT, 16#807C).
+-define(GL_VERTEX_ARRAY_COUNT_EXT, 16#807D).
+-define(GL_NORMAL_ARRAY_TYPE_EXT, 16#807E).
+-define(GL_NORMAL_ARRAY_STRIDE_EXT, 16#807F).
+-define(GL_NORMAL_ARRAY_COUNT_EXT, 16#8080).
+-define(GL_COLOR_ARRAY_SIZE_EXT, 16#8081).
+-define(GL_COLOR_ARRAY_TYPE_EXT, 16#8082).
+-define(GL_COLOR_ARRAY_STRIDE_EXT, 16#8083).
+-define(GL_COLOR_ARRAY_COUNT_EXT, 16#8084).
+-define(GL_INDEX_ARRAY_TYPE_EXT, 16#8085).
+-define(GL_INDEX_ARRAY_STRIDE_EXT, 16#8086).
+-define(GL_INDEX_ARRAY_COUNT_EXT, 16#8087).
+-define(GL_TEXTURE_COORD_ARRAY_SIZE_EXT, 16#8088).
+-define(GL_TEXTURE_COORD_ARRAY_TYPE_EXT, 16#8089).
+-define(GL_TEXTURE_COORD_ARRAY_STRIDE_EXT, 16#808A).
+-define(GL_TEXTURE_COORD_ARRAY_COUNT_EXT, 16#808B).
+-define(GL_EDGE_FLAG_ARRAY_STRIDE_EXT, 16#808C).
+-define(GL_EDGE_FLAG_ARRAY_COUNT_EXT, 16#808D).
+-define(GL_VERTEX_ARRAY_POINTER_EXT, 16#808E).
+-define(GL_NORMAL_ARRAY_POINTER_EXT, 16#808F).
+-define(GL_COLOR_ARRAY_POINTER_EXT, 16#8090).
+-define(GL_INDEX_ARRAY_POINTER_EXT, 16#8091).
+-define(GL_TEXTURE_COORD_ARRAY_POINTER_EXT, 16#8092).
+-define(GL_EDGE_FLAG_ARRAY_POINTER_EXT, 16#8093).
+-define(GL_GENERATE_MIPMAP_SGIS, 16#8191).
+-define(GL_GENERATE_MIPMAP_HINT_SGIS, 16#8192).
 -define(GL_LINEAR_CLIPMAP_LINEAR_SGIX, 16#8170).
 -define(GL_TEXTURE_CLIPMAP_CENTER_SGIX, 16#8171).
 -define(GL_TEXTURE_CLIPMAP_FRAME_SGIX, 16#8172).
@@ -2146,12 +2167,18 @@
 -define(GL_NEAREST_CLIPMAP_NEAREST_SGIX, 16#844D).
 -define(GL_NEAREST_CLIPMAP_LINEAR_SGIX, 16#844E).
 -define(GL_LINEAR_CLIPMAP_NEAREST_SGIX, 16#844F).
+-define(GL_TEXTURE_COMPARE_SGIX, 16#819A).
+-define(GL_TEXTURE_COMPARE_OPERATOR_SGIX, 16#819B).
+-define(GL_TEXTURE_LEQUAL_R_SGIX, 16#819C).
+-define(GL_TEXTURE_GEQUAL_R_SGIX, 16#819D).
 -define(GL_CLAMP_TO_EDGE_SGIS, 16#812F).
 -define(GL_CLAMP_TO_BORDER_SGIS, 16#812D).
 -define(GL_FUNC_ADD_EXT, 16#8006).
 -define(GL_MIN_EXT, 16#8007).
 -define(GL_MAX_EXT, 16#8008).
 -define(GL_BLEND_EQUATION_EXT, 16#8009).
+-define(GL_FUNC_SUBTRACT_EXT, 16#800A).
+-define(GL_FUNC_REVERSE_SUBTRACT_EXT, 16#800B).
 -define(GL_INTERLACE_SGIX, 16#8094).
 -define(GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX, 16#813E).
 -define(GL_PIXEL_TILE_CACHE_INCREMENT_SGIX, 16#813F).
@@ -2216,6 +2243,9 @@
 -define(GL_MAX_DEFORMATION_ORDER_SGIX, 16#8197).
 -define(GL_REFERENCE_PLANE_SGIX, 16#817D).
 -define(GL_REFERENCE_PLANE_EQUATION_SGIX, 16#817E).
+-define(GL_DEPTH_COMPONENT16_SGIX, 16#81A5).
+-define(GL_DEPTH_COMPONENT24_SGIX, 16#81A6).
+-define(GL_DEPTH_COMPONENT32_SGIX, 16#81A7).
 -define(GL_FOG_FUNC_SGIS, 16#812A).
 -define(GL_FOG_FUNC_POINTS_SGIS, 16#812B).
 -define(GL_MAX_FOG_FUNC_POINTS_SGIS, 16#812C).
@@ -2393,6 +2423,7 @@
 -define(GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT, 16#8336).
 -define(GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT, 16#8337).
 -define(GL_PIXEL_TRANSFORM_2D_MATRIX_EXT, 16#8338).
+-define(GL_SHARED_TEXTURE_PALETTE_EXT, 16#81FB).
 -define(GL_LIGHT_MODEL_COLOR_CONTROL_EXT, 16#81F8).
 -define(GL_SINGLE_COLOR_EXT, 16#81F9).
 -define(GL_SEPARATE_SPECULAR_COLOR_EXT, 16#81FA).
@@ -3387,7 +3418,6 @@
 -define(GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT, 16#8DA7).
 -define(GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT, 16#8DA8).
 -define(GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT, 16#8DA9).
--define(GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT, 16#8CD4).
 -define(GL_PROGRAM_POINT_SIZE_EXT, 16#8642).
 -define(GL_GEOMETRY_SHADER_EXT, 16#8DD9).
 -define(GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT, 16#8DDD).
@@ -3425,13 +3455,6 @@
 -define(GL_R11F_G11F_B10F_EXT, 16#8C3A).
 -define(GL_UNSIGNED_INT_10F_11F_11F_REV_EXT, 16#8C3B).
 -define(GL_RGBA_SIGNED_COMPONENTS_EXT, 16#8C3C).
--define(GL_TEXTURE_1D_ARRAY_EXT, 16#8C18).
--define(GL_PROXY_TEXTURE_1D_ARRAY_EXT, 16#8C19).
--define(GL_TEXTURE_2D_ARRAY_EXT, 16#8C1A).
--define(GL_PROXY_TEXTURE_2D_ARRAY_EXT, 16#8C1B).
--define(GL_TEXTURE_BINDING_1D_ARRAY_EXT, 16#8C1C).
--define(GL_TEXTURE_BINDING_2D_ARRAY_EXT, 16#8C1D).
--define(GL_MAX_ARRAY_TEXTURE_LAYERS_EXT, 16#88FF).
 -define(GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT, 16#884E).
 -define(GL_TEXTURE_BUFFER_EXT, 16#8C2A).
 -define(GL_MAX_TEXTURE_BUFFER_SIZE_EXT, 16#8C2B).
@@ -3857,396 +3880,5 @@
 -define(GL_SURFACE_REGISTERED_NV, 16#86FD).
 -define(GL_SURFACE_MAPPED_NV, 16#8700).
 -define(GL_WRITE_DISCARD_NV, 16#88BE).
--define(GL_VERSION_1_2, 1).
--define(GL_VERSION_1_2_DEPRECATED, 1).
--define(GL_VERSION_1_3, 1).
--define(GL_VERSION_1_3_DEPRECATED, 1).
--define(GL_VERSION_1_4, 1).
--define(GL_VERSION_1_4_DEPRECATED, 1).
--define(GL_VERSION_1_5, 1).
--define(GL_VERSION_2_0, 1).
--define(GL_VERSION_2_1, 1).
--define(GL_VERSION_3_0, 1).
--define(GL_VERSION_3_1, 1).
--define(GL_VERSION_3_2, 1).
--define(GL_VERSION_3_3, 1).
--define(GL_VERSION_4_0, 1).
--define(GL_VERSION_4_1, 1).
--define(GL_ARB_multitexture, 1).
--define(GL_ARB_transpose_matrix, 1).
--define(GL_ARB_multisample, 1).
--define(GL_ARB_texture_env_add, 1).
--define(GL_ARB_texture_cube_map, 1).
--define(GL_ARB_texture_compression, 1).
--define(GL_ARB_texture_border_clamp, 1).
--define(GL_ARB_point_parameters, 1).
--define(GL_ARB_vertex_blend, 1).
--define(GL_ARB_matrix_palette, 1).
--define(GL_ARB_texture_env_combine, 1).
--define(GL_ARB_texture_env_crossbar, 1).
--define(GL_ARB_texture_env_dot3, 1).
--define(GL_ARB_texture_mirrored_repeat, 1).
--define(GL_ARB_depth_texture, 1).
--define(GL_ARB_shadow, 1).
--define(GL_ARB_shadow_ambient, 1).
--define(GL_ARB_window_pos, 1).
--define(GL_ARB_vertex_program, 1).
--define(GL_ARB_fragment_program, 1).
--define(GL_ARB_vertex_buffer_object, 1).
--define(GL_ARB_occlusion_query, 1).
--define(GL_ARB_shader_objects, 1).
--define(GL_ARB_vertex_shader, 1).
--define(GL_ARB_fragment_shader, 1).
--define(GL_ARB_shading_language_100, 1).
--define(GL_ARB_texture_non_power_of_two, 1).
--define(GL_ARB_point_sprite, 1).
--define(GL_ARB_fragment_program_shadow, 1).
--define(GL_ARB_draw_buffers, 1).
--define(GL_ARB_texture_rectangle, 1).
--define(GL_ARB_color_buffer_float, 1).
--define(GL_ARB_half_float_pixel, 1).
--define(GL_ARB_texture_float, 1).
--define(GL_ARB_pixel_buffer_object, 1).
--define(GL_ARB_depth_buffer_float, 1).
--define(GL_ARB_draw_instanced, 1).
--define(GL_ARB_framebuffer_object, 1).
--define(GL_ARB_framebuffer_sRGB, 1).
--define(GL_ARB_geometry_shader4, 1).
--define(GL_ARB_half_float_vertex, 1).
--define(GL_ARB_instanced_arrays, 1).
--define(GL_ARB_map_buffer_range, 1).
--define(GL_ARB_texture_buffer_object, 1).
--define(GL_ARB_texture_compression_rgtc, 1).
--define(GL_ARB_texture_rg, 1).
--define(GL_ARB_vertex_array_object, 1).
--define(GL_ARB_uniform_buffer_object, 1).
--define(GL_ARB_compatibility, 1).
--define(GL_ARB_copy_buffer, 1).
--define(GL_ARB_shader_texture_lod, 1).
--define(GL_ARB_depth_clamp, 1).
--define(GL_ARB_draw_elements_base_vertex, 1).
--define(GL_ARB_fragment_coord_conventions, 1).
--define(GL_ARB_provoking_vertex, 1).
--define(GL_ARB_seamless_cube_map, 1).
--define(GL_ARB_sync, 1).
--define(GL_ARB_texture_multisample, 1).
--define(GL_ARB_vertex_array_bgra, 1).
--define(GL_ARB_draw_buffers_blend, 1).
--define(GL_ARB_sample_shading, 1).
--define(GL_ARB_texture_cube_map_array, 1).
--define(GL_ARB_texture_gather, 1).
--define(GL_ARB_texture_query_lod, 1).
--define(GL_ARB_shading_language_include, 1).
--define(GL_ARB_texture_compression_bptc, 1).
--define(GL_ARB_blend_func_extended, 1).
--define(GL_ARB_explicit_attrib_location, 1).
--define(GL_ARB_occlusion_query2, 1).
--define(GL_ARB_sampler_objects, 1).
--define(GL_ARB_texture_rgb10_a2ui, 1).
--define(GL_ARB_texture_swizzle, 1).
--define(GL_ARB_timer_query, 1).
--define(GL_ARB_vertex_type_2_10_10_10_rev, 1).
--define(GL_ARB_draw_indirect, 1).
--define(GL_ARB_gpu_shader5, 1).
--define(GL_ARB_gpu_shader_fp64, 1).
--define(GL_ARB_shader_subroutine, 1).
--define(GL_ARB_tessellation_shader, 1).
--define(GL_ARB_texture_buffer_object_rgb32, 1).
--define(GL_ARB_transform_feedback2, 1).
--define(GL_ARB_transform_feedback3, 1).
--define(GL_ARB_ES2_compatibility, 1).
--define(GL_ARB_get_program_binary, 1).
--define(GL_ARB_separate_shader_objects, 1).
--define(GL_ARB_vertex_attrib_64bit, 1).
--define(GL_ARB_viewport_array, 1).
--define(GL_ARB_cl_event, 1).
--define(GL_ARB_debug_output, 1).
--define(GL_ARB_robustness, 1).
--define(GL_ARB_shader_stencil_export, 1).
--define(GL_EXT_abgr, 1).
--define(GL_EXT_blend_color, 1).
--define(GL_EXT_polygon_offset, 1).
--define(GL_EXT_texture, 1).
--define(GL_EXT_texture3D, 1).
--define(GL_SGIS_texture_filter4, 1).
--define(GL_EXT_subtexture, 1).
--define(GL_EXT_copy_texture, 1).
--define(GL_EXT_histogram, 1).
--define(GL_EXT_convolution, 1).
--define(GL_SGI_color_matrix, 1).
--define(GL_SGI_color_table, 1).
--define(GL_SGIX_pixel_texture, 1).
--define(GL_SGIS_pixel_texture, 1).
--define(GL_SGIS_texture4D, 1).
--define(GL_SGI_texture_color_table, 1).
--define(GL_EXT_cmyka, 1).
--define(GL_EXT_texture_object, 1).
--define(GL_SGIS_detail_texture, 1).
--define(GL_SGIS_sharpen_texture, 1).
--define(GL_EXT_packed_pixels, 1).
--define(GL_SGIS_texture_lod, 1).
--define(GL_SGIS_multisample, 1).
--define(GL_EXT_rescale_normal, 1).
--define(GL_EXT_vertex_array, 1).
--define(GL_EXT_misc_attribute, 1).
--define(GL_SGIS_generate_mipmap, 1).
--define(GL_SGIX_clipmap, 1).
--define(GL_SGIX_shadow, 1).
--define(GL_SGIS_texture_edge_clamp, 1).
--define(GL_SGIS_texture_border_clamp, 1).
--define(GL_EXT_blend_minmax, 1).
--define(GL_EXT_blend_subtract, 1).
--define(GL_EXT_blend_logic_op, 1).
--define(GL_SGIX_interlace, 1).
--define(GL_SGIX_pixel_tiles, 1).
--define(GL_SGIX_texture_select, 1).
--define(GL_SGIX_sprite, 1).
--define(GL_SGIX_texture_multi_buffer, 1).
--define(GL_EXT_point_parameters, 1).
--define(GL_SGIS_point_parameters, 1).
--define(GL_SGIX_instruments, 1).
--define(GL_SGIX_texture_scale_bias, 1).
--define(GL_SGIX_framezoom, 1).
--define(GL_SGIX_tag_sample_buffer, 1).
--define(GL_SGIX_polynomial_ffd, 1).
--define(GL_SGIX_reference_plane, 1).
--define(GL_SGIX_flush_raster, 1).
--define(GL_SGIX_depth_texture, 1).
--define(GL_SGIS_fog_function, 1).
--define(GL_SGIX_fog_offset, 1).
--define(GL_HP_image_transform, 1).
--define(GL_HP_convolution_border_modes, 1).
--define(GL_SGIX_texture_add_env, 1).
--define(GL_EXT_color_subtable, 1).
--define(GL_PGI_vertex_hints, 1).
--define(GL_PGI_misc_hints, 1).
--define(GL_EXT_paletted_texture, 1).
--define(GL_EXT_clip_volume_hint, 1).
--define(GL_SGIX_list_priority, 1).
--define(GL_SGIX_ir_instrument1, 1).
--define(GL_SGIX_calligraphic_fragment, 1).
--define(GL_SGIX_texture_lod_bias, 1).
--define(GL_SGIX_shadow_ambient, 1).
--define(GL_EXT_index_texture, 1).
--define(GL_EXT_index_material, 1).
--define(GL_EXT_index_func, 1).
--define(GL_EXT_index_array_formats, 1).
--define(GL_EXT_compiled_vertex_array, 1).
--define(GL_EXT_cull_vertex, 1).
--define(GL_SGIX_ycrcb, 1).
--define(GL_SGIX_fragment_lighting, 1).
--define(GL_IBM_rasterpos_clip, 1).
--define(GL_HP_texture_lighting, 1).
--define(GL_EXT_draw_range_elements, 1).
--define(GL_WIN_phong_shading, 1).
--define(GL_WIN_specular_fog, 1).
--define(GL_EXT_light_texture, 1).
--define(GL_SGIX_blend_alpha_minmax, 1).
--define(GL_EXT_bgra, 1).
--define(GL_SGIX_async, 1).
--define(GL_SGIX_async_pixel, 1).
--define(GL_SGIX_async_histogram, 1).
--define(GL_INTEL_parallel_arrays, 1).
--define(GL_HP_occlusion_test, 1).
--define(GL_EXT_pixel_transform, 1).
--define(GL_EXT_pixel_transform_color_table, 1).
--define(GL_EXT_shared_texture_palette, 1).
--define(GL_EXT_separate_specular_color, 1).
--define(GL_EXT_secondary_color, 1).
--define(GL_EXT_texture_perturb_normal, 1).
--define(GL_EXT_multi_draw_arrays, 1).
--define(GL_EXT_fog_coord, 1).
--define(GL_REND_screen_coordinates, 1).
--define(GL_EXT_coordinate_frame, 1).
--define(GL_EXT_texture_env_combine, 1).
--define(GL_APPLE_specular_vector, 1).
--define(GL_APPLE_transform_hint, 1).
--define(GL_SGIX_fog_scale, 1).
--define(GL_SUNX_constant_data, 1).
--define(GL_SUN_global_alpha, 1).
--define(GL_SUN_triangle_list, 1).
--define(GL_SUN_vertex, 1).
--define(GL_EXT_blend_func_separate, 1).
--define(GL_INGR_blend_func_separate, 1).
--define(GL_INGR_color_clamp, 1).
--define(GL_INGR_interlace_read, 1).
--define(GL_EXT_stencil_wrap, 1).
--define(GL_EXT_422_pixels, 1).
--define(GL_NV_texgen_reflection, 1).
--define(GL_SUN_convolution_border_modes, 1).
--define(GL_EXT_texture_env_add, 1).
--define(GL_EXT_texture_lod_bias, 1).
--define(GL_EXT_texture_filter_anisotropic, 1).
--define(GL_EXT_vertex_weighting, 1).
--define(GL_NV_light_max_exponent, 1).
--define(GL_NV_vertex_array_range, 1).
--define(GL_NV_register_combiners, 1).
--define(GL_NV_fog_distance, 1).
--define(GL_NV_texgen_emboss, 1).
--define(GL_NV_blend_square, 1).
--define(GL_NV_texture_env_combine4, 1).
--define(GL_MESA_resize_buffers, 1).
--define(GL_MESA_window_pos, 1).
--define(GL_IBM_cull_vertex, 1).
--define(GL_IBM_multimode_draw_arrays, 1).
--define(GL_IBM_vertex_array_lists, 1).
--define(GL_SGIX_subsample, 1).
--define(GL_SGIX_ycrcba, 1).
--define(GL_SGIX_ycrcb_subsample, 1).
--define(GL_SGIX_depth_pass_instrument, 1).
--define(GL_3DFX_texture_compression_FXT1, 1).
--define(GL_3DFX_multisample, 1).
--define(GL_3DFX_tbuffer, 1).
--define(GL_EXT_multisample, 1).
--define(GL_SGIX_vertex_preclip, 1).
--define(GL_SGIX_convolution_accuracy, 1).
--define(GL_SGIX_resample, 1).
--define(GL_SGIS_point_line_texgen, 1).
--define(GL_SGIS_texture_color_mask, 1).
--define(GL_SGIX_igloo_interface, 1).
--define(GL_EXT_texture_env_dot3, 1).
--define(GL_ATI_texture_mirror_once, 1).
--define(GL_NV_fence, 1).
--define(GL_NV_evaluators, 1).
--define(GL_NV_packed_depth_stencil, 1).
--define(GL_NV_register_combiners2, 1).
--define(GL_NV_texture_compression_vtc, 1).
--define(GL_NV_texture_rectangle, 1).
--define(GL_NV_texture_shader, 1).
--define(GL_NV_texture_shader2, 1).
--define(GL_NV_vertex_array_range2, 1).
--define(GL_NV_vertex_program, 1).
--define(GL_SGIX_texture_coordinate_clamp, 1).
--define(GL_SGIX_scalebias_hint, 1).
--define(GL_OML_interlace, 1).
--define(GL_OML_subsample, 1).
--define(GL_OML_resample, 1).
--define(GL_NV_copy_depth_to_color, 1).
--define(GL_ATI_envmap_bumpmap, 1).
--define(GL_ATI_fragment_shader, 1).
--define(GL_ATI_pn_triangles, 1).
--define(GL_ATI_vertex_array_object, 1).
--define(GL_EXT_vertex_shader, 1).
--define(GL_ATI_vertex_streams, 1).
--define(GL_ATI_element_array, 1).
--define(GL_SUN_mesh_array, 1).
--define(GL_SUN_slice_accum, 1).
--define(GL_NV_multisample_filter_hint, 1).
--define(GL_NV_depth_clamp, 1).
--define(GL_NV_occlusion_query, 1).
--define(GL_NV_point_sprite, 1).
--define(GL_NV_texture_shader3, 1).
--define(GL_NV_vertex_program1_1, 1).
--define(GL_EXT_shadow_funcs, 1).
--define(GL_EXT_stencil_two_side, 1).
--define(GL_ATI_text_fragment_shader, 1).
--define(GL_APPLE_client_storage, 1).
--define(GL_APPLE_element_array, 1).
--define(GL_APPLE_fence, 1).
--define(GL_APPLE_vertex_array_object, 1).
--define(GL_APPLE_vertex_array_range, 1).
--define(GL_APPLE_ycbcr_422, 1).
--define(GL_S3_s3tc, 1).
--define(GL_ATI_draw_buffers, 1).
--define(GL_ATI_pixel_format_float, 1).
--define(GL_ATI_texture_env_combine3, 1).
--define(GL_ATI_texture_float, 1).
--define(GL_NV_float_buffer, 1).
--define(GL_NV_fragment_program, 1).
--define(GL_NV_half_float, 1).
--define(GL_NV_pixel_data_range, 1).
--define(GL_NV_primitive_restart, 1).
--define(GL_NV_texture_expand_normal, 1).
--define(GL_NV_vertex_program2, 1).
--define(GL_ATI_map_object_buffer, 1).
--define(GL_ATI_separate_stencil, 1).
--define(GL_ATI_vertex_attrib_array_object, 1).
--define(GL_OES_read_format, 1).
--define(GL_EXT_depth_bounds_test, 1).
--define(GL_EXT_texture_mirror_clamp, 1).
--define(GL_EXT_blend_equation_separate, 1).
--define(GL_MESA_pack_invert, 1).
--define(GL_MESA_ycbcr_texture, 1).
--define(GL_EXT_pixel_buffer_object, 1).
--define(GL_NV_fragment_program_option, 1).
--define(GL_NV_fragment_program2, 1).
--define(GL_NV_vertex_program2_option, 1).
--define(GL_NV_vertex_program3, 1).
--define(GL_EXT_framebuffer_object, 1).
--define(GL_GREMEDY_string_marker, 1).
--define(GL_EXT_packed_depth_stencil, 1).
--define(GL_EXT_stencil_clear_tag, 1).
--define(GL_EXT_texture_sRGB, 1).
--define(GL_EXT_framebuffer_blit, 1).
--define(GL_EXT_framebuffer_multisample, 1).
--define(GL_MESAX_texture_stack, 1).
--define(GL_EXT_timer_query, 1).
--define(GL_EXT_gpu_program_parameters, 1).
--define(GL_APPLE_flush_buffer_range, 1).
--define(GL_NV_gpu_program4, 1).
--define(GL_NV_geometry_program4, 1).
--define(GL_EXT_geometry_shader4, 1).
--define(GL_NV_vertex_program4, 1).
--define(GL_EXT_gpu_shader4, 1).
--define(GL_EXT_draw_instanced, 1).
--define(GL_EXT_packed_float, 1).
--define(GL_EXT_texture_array, 1).
--define(GL_EXT_texture_buffer_object, 1).
--define(GL_EXT_texture_compression_latc, 1).
--define(GL_EXT_texture_compression_rgtc, 1).
--define(GL_EXT_texture_shared_exponent, 1).
--define(GL_NV_depth_buffer_float, 1).
--define(GL_NV_fragment_program4, 1).
--define(GL_NV_framebuffer_multisample_coverage, 1).
--define(GL_EXT_framebuffer_sRGB, 1).
--define(GL_NV_geometry_shader4, 1).
--define(GL_NV_parameter_buffer_object, 1).
--define(GL_EXT_draw_buffers2, 1).
--define(GL_NV_transform_feedback, 1).
--define(GL_EXT_bindable_uniform, 1).
--define(GL_EXT_texture_integer, 1).
--define(GL_GREMEDY_frame_terminator, 1).
--define(GL_NV_conditional_render, 1).
--define(GL_NV_present_video, 1).
--define(GL_EXT_transform_feedback, 1).
--define(GL_EXT_direct_state_access, 1).
--define(GL_EXT_vertex_array_bgra, 1).
--define(GL_EXT_texture_swizzle, 1).
--define(GL_NV_explicit_multisample, 1).
--define(GL_NV_transform_feedback2, 1).
--define(GL_ATI_meminfo, 1).
--define(GL_AMD_performance_monitor, 1).
--define(GL_AMD_texture_texture4, 1).
--define(GL_AMD_vertex_shader_tesselator, 1).
--define(GL_EXT_provoking_vertex, 1).
--define(GL_EXT_texture_snorm, 1).
--define(GL_AMD_draw_buffers_blend, 1).
--define(GL_APPLE_texture_range, 1).
--define(GL_APPLE_float_pixels, 1).
--define(GL_APPLE_vertex_program_evaluators, 1).
--define(GL_APPLE_aux_depth_stencil, 1).
--define(GL_APPLE_object_purgeable, 1).
--define(GL_APPLE_row_bytes, 1).
--define(GL_APPLE_rgb_422, 1).
--define(GL_NV_video_capture, 1).
--define(GL_NV_copy_image, 1).
--define(GL_EXT_separate_shader_objects, 1).
--define(GL_NV_parameter_buffer_object2, 1).
--define(GL_NV_shader_buffer_load, 1).
--define(GL_NV_vertex_buffer_unified_memory, 1).
--define(GL_NV_texture_barrier, 1).
--define(GL_AMD_shader_stencil_export, 1).
--define(GL_AMD_seamless_cubemap_per_texture, 1).
--define(GL_AMD_conservative_depth, 1).
--define(GL_EXT_shader_image_load_store, 1).
--define(GL_EXT_vertex_attrib_64bit, 1).
--define(GL_NV_gpu_program5, 1).
--define(GL_NV_gpu_shader5, 1).
--define(GL_NV_shader_buffer_store, 1).
--define(GL_NV_tessellation_program5, 1).
--define(GL_NV_vertex_attrib_integer_64bit, 1).
--define(GL_NV_multisample_coverage, 1).
--define(GL_AMD_name_gen_delete, 1).
--define(GL_AMD_debug_output, 1).
--define(GL_NV_vdpau_interop, 1).
--define(GL_AMD_transform_feedback3_lines_triangles, 1).
+-define(GL_DEPTH_CLAMP_NEAR_AMD, 16#901E).
+-define(GL_DEPTH_CLAMP_FAR_AMD, 16#901F).
diff --git a/lib/wx/src/gen/wxListCtrl.erl b/lib/wx/src/gen/wxListCtrl.erl
index 9c4ba1e5a3..5799206b87 100644
--- a/lib/wx/src/gen/wxListCtrl.erl
+++ b/lib/wx/src/gen/wxListCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -29,17 +29,17 @@
 
 -module(wxListCtrl).
 -include("wxe.hrl").
--export([ sortItems/2 ,arrange/1,arrange/2,assignImageList/3,clearAll/1,create/2,
-  create/3,deleteAllItems/1,deleteColumn/2,deleteItem/2,destroy/1,editLabel/2,
-  ensureVisible/2,findItem/3,findItem/4,getColumn/3,getColumnCount/1,
-  getColumnWidth/2,getCountPerPage/1,getEditControl/1,getImageList/2,
-  getItem/2,getItemBackgroundColour/2,getItemCount/1,getItemData/2,
-  getItemFont/2,getItemPosition/3,getItemRect/3,getItemRect/4,getItemSpacing/1,
-  getItemState/3,getItemText/2,getItemTextColour/2,getNextItem/2,getNextItem/3,
-  getSelectedItemCount/1,getTextColour/1,getTopItem/1,getViewRect/1,
-  hitTest/2,insertColumn/3,insertColumn/4,insertItem/2,insertItem/3,
-  insertItem/4,new/0,new/1,new/2,refreshItem/2,refreshItems/3,scrollList/3,
-  setBackgroundColour/2,setColumn/3,setColumnWidth/3,setImageList/3,
+-export([ create/2, create/3 , new/0, new/1, new/2 , sortItems/2 ,arrange/1,
+  arrange/2,assignImageList/3,clearAll/1,deleteAllItems/1,deleteColumn/2,
+  deleteItem/2,destroy/1,editLabel/2,ensureVisible/2,findItem/3,findItem/4,
+  getColumn/3,getColumnCount/1,getColumnWidth/2,getCountPerPage/1,getEditControl/1,
+  getImageList/2,getItem/2,getItemBackgroundColour/2,getItemCount/1,
+  getItemData/2,getItemFont/2,getItemPosition/3,getItemRect/3,getItemRect/4,
+  getItemSpacing/1,getItemState/3,getItemText/2,getItemTextColour/2,
+  getNextItem/2,getNextItem/3,getSelectedItemCount/1,getTextColour/1,
+  getTopItem/1,getViewRect/1,hitTest/2,insertColumn/3,insertColumn/4,
+  insertItem/2,insertItem/3,insertItem/4,refreshItem/2,refreshItems/3,
+  scrollList/3,setBackgroundColour/2,setColumn/3,setColumnWidth/3,setImageList/3,
   setItem/2,setItem/4,setItem/5,setItemBackgroundColour/3,setItemColumnImage/4,
   setItemCount/2,setItemData/3,setItemFont/3,setItemImage/3,setItemImage/4,
   setItemPosition/3,setItemState/4,setItemText/3,setItemTextColour/3,
@@ -89,11 +89,11 @@ parent_class(wxWindow) -> true;
 parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
+
 %% @spec () -> wxListCtrl()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlwxlistctrl">external documentation</a>.
 new() ->
-  wxe_util:construct(?wxListCtrl_new_0,
-  <<>>).
+    wxe_util:construct(?wxListCtrl_new_0, <<>>).
 
 %% @spec (Parent::wxWindow:wxWindow()) -> wxListCtrl()
 %% @equiv new(Parent, [])
@@ -102,20 +102,44 @@ new(Parent)
   new(Parent, []).
 
 %% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxListCtrl()
-%% Option = {winid, integer()} | {pos, {X::integer(),Y::integer()}} | {size, {W::integer(),H::integer()}} | {style, integer()} | {validator, wx:wx()}
+%% Option = {winid, integer()} |
+%%          {pos, {X::integer(),Y::integer()}} |
+%%          {size, {W::integer(),H::integer()}} |
+%%          {style, integer()} |
+%%          {validator, wx:wx()} |
+%%          {onGetItemText, OnGetItemText} |
+%%          {onGetItemAttr, OnGetItemAttr} |
+%%          {onGetItemColumnImage, OnGetItemColumnImage}
+%%
+%% OnGetItemText = (This, Item, Column) -> wxString()
+%% OnGetItemAttr = (This, Item) -> wxListItemAttr()
+%% OnGetItemColumnImage = (This, Item, Column) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlwxlistctrl">external documentation</a>.
+
 new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
- when is_list(Options) ->
-  ?CLASS(ParentT,wxWindow),
-  MOpts = fun({winid, Winid}, Acc) -> [<<1:32/?UI,Winid:32/?UI>>|Acc];
-          ({pos, {PosX,PosY}}, Acc) -> [<<2:32/?UI,PosX:32/?UI,PosY:32/?UI,0:32>>|Acc];
-          ({size, {SizeW,SizeH}}, Acc) -> [<<3:32/?UI,SizeW:32/?UI,SizeH:32/?UI,0:32>>|Acc];
-          ({style, Style}, Acc) -> [<<4:32/?UI,Style:32/?UI>>|Acc];
-          ({validator, #wx_ref{type=ValidatorT,ref=ValidatorRef}}, Acc) ->   ?CLASS(ValidatorT,wx),[<<5:32/?UI,ValidatorRef:32/?UI>>|Acc];
-          (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
-  BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
-  wxe_util:construct(?wxListCtrl_new_2,
-  <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
+  when is_list(Options)->
+    ?CLASS(ParentT,wxWindow),
+    MOpts = fun({winid, Winid}, Acc) -> [<<1:32/?UI,Winid:32/?UI>>|Acc];
+	       ({pos, {PosX,PosY}}, Acc) -> [<<2:32/?UI,PosX:32/?UI,PosY:32/?UI,0:32>>|Acc];
+	       ({size, {SizeW,SizeH}}, Acc) -> [<<3:32/?UI,SizeW:32/?UI,SizeH:32/?UI,0:32>>|Acc];
+	       ({style, Style}, Acc) -> [<<4:32/?UI,Style:32/?UI>>|Acc];
+	       ({validator, #wx_ref{type=ValidatorT,ref=ValidatorRef}}, Acc) ->
+		    ?CLASS(ValidatorT,wx),[<<5:32/?UI,ValidatorRef:32/?UI>>|Acc];
+	       ({onGetItemText, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item,Col]) -> unicode:characters_to_binary([F(This,Item,Col),0]) end,
+		    [<<6:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       ({onGetItemAttr, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item]) ->
+				  #wx_ref{type=wxListItemAttr,ref=ThisRef} = F(This,Item),
+				  <<ThisRef:32/?UI>>
+			  end,
+		    [<<7:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       ({onGetItemColumnImage, F}, Acc) when is_function(F) ->
+		    Fun = fun([This,Item, Col]) -> <<(F(This,Item,Col)):32/?I>> end,
+		    [<<8:32/?UI,(wxe_util:get_cbId(Fun)):32/?UI>>|Acc];
+	       (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
+    BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
+    wxe_util:construct(?wxListCtrl_new_2, <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
 %% @spec (This::wxListCtrl()) -> bool()
 %% @equiv arrange(This, [])
@@ -151,6 +175,7 @@ clearAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxListCtrl_ClearAll,
   <<ThisRef:32/?UI>>).
 
+
 %% @spec (This::wxListCtrl(), Parent::wxWindow:wxWindow()) -> bool()
 %% @equiv create(This,Parent, [])
 create(This,Parent)
@@ -158,7 +183,18 @@ create(This,Parent)
   create(This,Parent, []).
 
 %% @spec (This::wxListCtrl(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {winid, integer()} | {pos, {X::integer(),Y::integer()}} | {size, {W::integer(),H::integer()}} | {style, integer()} | {validator, wx:wx()}
+%% Option = {winid, integer()} |
+%%          {pos, {X::integer(),Y::integer()}} |
+%%          {size, {W::integer(),H::integer()}} |
+%%          {style, integer()} |
+%%          {validator, wx:wx()} |
+%%          {onGetItemText, OnGetItemText} |
+%%          {onGetItemAttr, OnGetItemAttr} |
+%%          {onGetItemColumnImage, OnGetItemColumnImage}
+%%
+%% OnGetItemText = (This, Item, Column) -> wxString()
+%% OnGetItemAttr = (This, Item) -> wxListItemAttr()
+%% OnGetItemColumnImage = (This, Item, Column) -> integer()
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlcreate">external documentation</a>.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
  when is_list(Options) ->
@@ -726,12 +762,12 @@ setWindowStyleFlag(#wx_ref{type=ThisT,ref=ThisRef},Style)
 
 %% @spec (This::wxListCtrl(), SortCallBack::function()) -> boolean()
 %% @doc Sort the items in the list control<br />
-%%   <pre>SortCalBack(Item1,Item2) -> integer()</pre>
+%%   <pre>SortCallBack(Item1,Item2) -> integer()</pre>
 %%  <br /> SortCallBack receives the client data associated with two items
 %%         to compare, and should return 0 if the items are equal, a negative
 %%         value if the first item is less than the second one and a positive
 %%         value if the first item is greater than the second one.
-%%  <br /> NOTE: The callback may not call other processes.
+%%  <br /> NOTE: The callback may not call other (wx) processes.
 sortItems(#wx_ref{type=ThisT,ref=ThisRef}, SortCallBack)
   when is_function(SortCallBack, 2) ->
 	?CLASS(ThisT,wxListCtrl),
diff --git a/lib/wx/src/gen/wxListItemAttr.erl b/lib/wx/src/gen/wxListItemAttr.erl
new file mode 100644
index 0000000000..1a43c71854
--- /dev/null
+++ b/lib/wx/src/gen/wxListItemAttr.erl
@@ -0,0 +1,122 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%% This file is generated DO NOT EDIT
+
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html">wxListItemAttr</a>.
+%% @type wxListItemAttr().  An object reference, The representation is internal
+%% and can be changed without notice. It can't be used for comparsion
+%% stored on disc or distributed for use on other nodes.
+
+-module(wxListItemAttr).
+-include("wxe.hrl").
+-export([destroy/1,getBackgroundColour/1,getFont/1,getTextColour/1,hasBackgroundColour/1,
+  hasFont/1,hasTextColour/1,new/0,new/3,setBackgroundColour/2,setFont/2,
+  setTextColour/2]).
+
+%% inherited exports
+-export([parent_class/1]).
+
+%% @hidden
+parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
+
+%% @spec () -> wxListItemAttr()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrwxlistitemattr">external documentation</a>.
+new() ->
+  wxe_util:construct(?wxListItemAttr_new_0,
+  <<>>).
+
+%% @spec (ColText::wx:colour(), ColBack::wx:colour(), Font::wxFont:wxFont()) -> wxListItemAttr()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrwxlistitemattr">external documentation</a>.
+new(ColText,ColBack,#wx_ref{type=FontT,ref=FontRef})
+ when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4,tuple_size(ColBack) =:= 3; tuple_size(ColBack) =:= 4 ->
+  ?CLASS(FontT,wxFont),
+  wxe_util:construct(?wxListItemAttr_new_3,
+  <<(wxe_util:colour_bin(ColText)):16/binary,(wxe_util:colour_bin(ColBack)):16/binary,FontRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr()) -> wx:colour()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrgetbackgroundcolour">external documentation</a>.
+getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:call(?wxListItemAttr_GetBackgroundColour,
+  <<ThisRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr()) -> wxFont:wxFont()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrgetfont">external documentation</a>.
+getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:call(?wxListItemAttr_GetFont,
+  <<ThisRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr()) -> wx:colour()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrgettextcolour">external documentation</a>.
+getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:call(?wxListItemAttr_GetTextColour,
+  <<ThisRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr()) -> bool()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrhasbackgroundcolour">external documentation</a>.
+hasBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:call(?wxListItemAttr_HasBackgroundColour,
+  <<ThisRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr()) -> bool()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrhasfont">external documentation</a>.
+hasFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:call(?wxListItemAttr_HasFont,
+  <<ThisRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr()) -> bool()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrhastextcolour">external documentation</a>.
+hasTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:call(?wxListItemAttr_HasTextColour,
+  <<ThisRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr(), ColBack::wx:colour()) -> ok
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrsetbackgroundcolour">external documentation</a>.
+setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
+ when tuple_size(ColBack) =:= 3; tuple_size(ColBack) =:= 4 ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:cast(?wxListItemAttr_SetBackgroundColour,
+  <<ThisRef:32/?UI,(wxe_util:colour_bin(ColBack)):16/binary>>).
+
+%% @spec (This::wxListItemAttr(), Font::wxFont:wxFont()) -> ok
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrsetfont">external documentation</a>.
+setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
+  ?CLASS(ThisT,wxListItemAttr),
+  ?CLASS(FontT,wxFont),
+  wxe_util:cast(?wxListItemAttr_SetFont,
+  <<ThisRef:32/?UI,FontRef:32/?UI>>).
+
+%% @spec (This::wxListItemAttr(), ColText::wx:colour()) -> ok
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrsettextcolour">external documentation</a>.
+setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
+ when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4 ->
+  ?CLASS(ThisT,wxListItemAttr),
+  wxe_util:cast(?wxListItemAttr_SetTextColour,
+  <<ThisRef:32/?UI,(wxe_util:colour_bin(ColText)):16/binary>>).
+
+%% @spec (This::wxListItemAttr()) -> ok
+%% @doc Destroys this object, do not use object again
+destroy(Obj=#wx_ref{type=Type}) ->
+  ?CLASS(Type,wxListItemAttr),
+  wxe_util:destroy(?wxListItemAttr_destroy,Obj),
+  ok.
diff --git a/lib/wx/src/gen/wxe_debug.hrl b/lib/wx/src/gen/wxe_debug.hrl
index 3edfa73599..960f67a1f6 100644
--- a/lib/wx/src/gen/wxe_debug.hrl
+++ b/lib/wx/src/gen/wxe_debug.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1603,1684 +1603,1696 @@ wxdebug_table() ->
  {1754, {wxListItem, setText, 1}},
  {1755, {wxListItem, setTextColour, 1}},
  {1756, {wxListItem, setWidth, 1}},
- {1757, {wxImageList, new_0, 0}},
- {1758, {wxImageList, new_3, 3}},
- {1759, {wxImageList, add_1, 1}},
- {1760, {wxImageList, add_2_0, 2}},
- {1761, {wxImageList, add_2_1, 2}},
- {1762, {wxImageList, create, 3}},
- {1764, {wxImageList, draw, 5}},
- {1765, {wxImageList, getBitmap, 1}},
- {1766, {wxImageList, getIcon, 1}},
- {1767, {wxImageList, getImageCount, 0}},
- {1768, {wxImageList, getSize, 3}},
- {1769, {wxImageList, remove, 1}},
- {1770, {wxImageList, removeAll, 0}},
- {1771, {wxImageList, replace_2, 2}},
- {1772, {wxImageList, replace_3, 3}},
- {1773, {wxImageList, 'Destroy', undefined}},
- {1774, {wxTextAttr, new_0, 0}},
- {1775, {wxTextAttr, new_2, 2}},
- {1776, {wxTextAttr, getAlignment, 0}},
- {1777, {wxTextAttr, getBackgroundColour, 0}},
- {1778, {wxTextAttr, getFont, 0}},
- {1779, {wxTextAttr, getLeftIndent, 0}},
- {1780, {wxTextAttr, getLeftSubIndent, 0}},
- {1781, {wxTextAttr, getRightIndent, 0}},
- {1782, {wxTextAttr, getTabs, 0}},
- {1783, {wxTextAttr, getTextColour, 0}},
- {1784, {wxTextAttr, hasBackgroundColour, 0}},
- {1785, {wxTextAttr, hasFont, 0}},
- {1786, {wxTextAttr, hasTextColour, 0}},
- {1787, {wxTextAttr, getFlags, 0}},
- {1788, {wxTextAttr, isDefault, 0}},
- {1789, {wxTextAttr, setAlignment, 1}},
- {1790, {wxTextAttr, setBackgroundColour, 1}},
- {1791, {wxTextAttr, setFlags, 1}},
- {1792, {wxTextAttr, setFont, 2}},
- {1793, {wxTextAttr, setLeftIndent, 2}},
- {1794, {wxTextAttr, setRightIndent, 1}},
- {1795, {wxTextAttr, setTabs, 1}},
- {1796, {wxTextAttr, setTextColour, 1}},
- {1797, {wxTextAttr, 'Destroy', undefined}},
- {1799, {wxTextCtrl, new_3, 3}},
- {1800, {wxTextCtrl, new_0, 0}},
- {1802, {wxTextCtrl, destruct, 0}},
- {1803, {wxTextCtrl, appendText, 1}},
- {1804, {wxTextCtrl, canCopy, 0}},
- {1805, {wxTextCtrl, canCut, 0}},
- {1806, {wxTextCtrl, canPaste, 0}},
- {1807, {wxTextCtrl, canRedo, 0}},
- {1808, {wxTextCtrl, canUndo, 0}},
- {1809, {wxTextCtrl, clear, 0}},
- {1810, {wxTextCtrl, copy, 0}},
- {1811, {wxTextCtrl, create, 3}},
- {1812, {wxTextCtrl, cut, 0}},
- {1813, {wxTextCtrl, discardEdits, 0}},
- {1814, {wxTextCtrl, emulateKeyPress, 1}},
- {1815, {wxTextCtrl, getDefaultStyle, 0}},
- {1816, {wxTextCtrl, getInsertionPoint, 0}},
- {1817, {wxTextCtrl, getLastPosition, 0}},
- {1818, {wxTextCtrl, getLineLength, 1}},
- {1819, {wxTextCtrl, getLineText, 1}},
- {1820, {wxTextCtrl, getNumberOfLines, 0}},
- {1821, {wxTextCtrl, getRange, 2}},
- {1822, {wxTextCtrl, getSelection, 2}},
- {1823, {wxTextCtrl, getStringSelection, 0}},
- {1824, {wxTextCtrl, getStyle, 2}},
- {1825, {wxTextCtrl, getValue, 0}},
- {1826, {wxTextCtrl, isEditable, 0}},
- {1827, {wxTextCtrl, isModified, 0}},
- {1828, {wxTextCtrl, isMultiLine, 0}},
- {1829, {wxTextCtrl, isSingleLine, 0}},
- {1830, {wxTextCtrl, loadFile, 2}},
- {1831, {wxTextCtrl, markDirty, 0}},
- {1832, {wxTextCtrl, paste, 0}},
- {1833, {wxTextCtrl, positionToXY, 3}},
- {1834, {wxTextCtrl, redo, 0}},
- {1835, {wxTextCtrl, remove, 2}},
- {1836, {wxTextCtrl, replace, 3}},
- {1837, {wxTextCtrl, saveFile, 1}},
- {1838, {wxTextCtrl, setDefaultStyle, 1}},
- {1839, {wxTextCtrl, setEditable, 1}},
- {1840, {wxTextCtrl, setInsertionPoint, 1}},
- {1841, {wxTextCtrl, setInsertionPointEnd, 0}},
- {1843, {wxTextCtrl, setMaxLength, 1}},
- {1844, {wxTextCtrl, setSelection, 2}},
- {1845, {wxTextCtrl, setStyle, 3}},
- {1846, {wxTextCtrl, setValue, 1}},
- {1847, {wxTextCtrl, showPosition, 1}},
- {1848, {wxTextCtrl, undo, 0}},
- {1849, {wxTextCtrl, writeText, 1}},
- {1850, {wxTextCtrl, xYToPosition, 2}},
- {1853, {wxNotebook, new_0, 0}},
- {1854, {wxNotebook, new_3, 3}},
- {1855, {wxNotebook, destruct, 0}},
- {1856, {wxNotebook, addPage, 3}},
- {1857, {wxNotebook, advanceSelection, 1}},
- {1858, {wxNotebook, assignImageList, 1}},
- {1859, {wxNotebook, create, 3}},
- {1860, {wxNotebook, deleteAllPages, 0}},
- {1861, {wxNotebook, deletePage, 1}},
- {1862, {wxNotebook, removePage, 1}},
- {1863, {wxNotebook, getCurrentPage, 0}},
- {1864, {wxNotebook, getImageList, 0}},
- {1866, {wxNotebook, getPage, 1}},
- {1867, {wxNotebook, getPageCount, 0}},
- {1868, {wxNotebook, getPageImage, 1}},
- {1869, {wxNotebook, getPageText, 1}},
- {1870, {wxNotebook, getRowCount, 0}},
- {1871, {wxNotebook, getSelection, 0}},
- {1872, {wxNotebook, getThemeBackgroundColour, 0}},
- {1874, {wxNotebook, hitTest, 2}},
- {1876, {wxNotebook, insertPage, 4}},
- {1877, {wxNotebook, setImageList, 1}},
- {1878, {wxNotebook, setPadding, 1}},
- {1879, {wxNotebook, setPageSize, 1}},
- {1880, {wxNotebook, setPageImage, 2}},
- {1881, {wxNotebook, setPageText, 2}},
- {1882, {wxNotebook, setSelection, 1}},
- {1883, {wxNotebook, changeSelection, 1}},
- {1884, {wxChoicebook, new_0, 0}},
- {1885, {wxChoicebook, new_3, 3}},
- {1886, {wxChoicebook, addPage, 3}},
- {1887, {wxChoicebook, advanceSelection, 1}},
- {1888, {wxChoicebook, assignImageList, 1}},
- {1889, {wxChoicebook, create, 3}},
- {1890, {wxChoicebook, deleteAllPages, 0}},
- {1891, {wxChoicebook, deletePage, 1}},
- {1892, {wxChoicebook, removePage, 1}},
- {1893, {wxChoicebook, getCurrentPage, 0}},
- {1894, {wxChoicebook, getImageList, 0}},
- {1896, {wxChoicebook, getPage, 1}},
- {1897, {wxChoicebook, getPageCount, 0}},
- {1898, {wxChoicebook, getPageImage, 1}},
- {1899, {wxChoicebook, getPageText, 1}},
- {1900, {wxChoicebook, getSelection, 0}},
- {1901, {wxChoicebook, hitTest, 2}},
- {1902, {wxChoicebook, insertPage, 4}},
- {1903, {wxChoicebook, setImageList, 1}},
- {1904, {wxChoicebook, setPageSize, 1}},
- {1905, {wxChoicebook, setPageImage, 2}},
- {1906, {wxChoicebook, setPageText, 2}},
- {1907, {wxChoicebook, setSelection, 1}},
- {1908, {wxChoicebook, changeSelection, 1}},
- {1909, {wxChoicebook, 'Destroy', undefined}},
- {1910, {wxToolbook, new_0, 0}},
- {1911, {wxToolbook, new_3, 3}},
- {1912, {wxToolbook, addPage, 3}},
- {1913, {wxToolbook, advanceSelection, 1}},
- {1914, {wxToolbook, assignImageList, 1}},
- {1915, {wxToolbook, create, 3}},
- {1916, {wxToolbook, deleteAllPages, 0}},
- {1917, {wxToolbook, deletePage, 1}},
- {1918, {wxToolbook, removePage, 1}},
- {1919, {wxToolbook, getCurrentPage, 0}},
- {1920, {wxToolbook, getImageList, 0}},
- {1922, {wxToolbook, getPage, 1}},
- {1923, {wxToolbook, getPageCount, 0}},
- {1924, {wxToolbook, getPageImage, 1}},
- {1925, {wxToolbook, getPageText, 1}},
- {1926, {wxToolbook, getSelection, 0}},
- {1928, {wxToolbook, hitTest, 2}},
- {1929, {wxToolbook, insertPage, 4}},
- {1930, {wxToolbook, setImageList, 1}},
- {1931, {wxToolbook, setPageSize, 1}},
- {1932, {wxToolbook, setPageImage, 2}},
- {1933, {wxToolbook, setPageText, 2}},
- {1934, {wxToolbook, setSelection, 1}},
- {1935, {wxToolbook, changeSelection, 1}},
- {1936, {wxToolbook, 'Destroy', undefined}},
- {1937, {wxListbook, new_0, 0}},
- {1938, {wxListbook, new_3, 3}},
- {1939, {wxListbook, addPage, 3}},
- {1940, {wxListbook, advanceSelection, 1}},
- {1941, {wxListbook, assignImageList, 1}},
- {1942, {wxListbook, create, 3}},
- {1943, {wxListbook, deleteAllPages, 0}},
- {1944, {wxListbook, deletePage, 1}},
- {1945, {wxListbook, removePage, 1}},
- {1946, {wxListbook, getCurrentPage, 0}},
- {1947, {wxListbook, getImageList, 0}},
- {1949, {wxListbook, getPage, 1}},
- {1950, {wxListbook, getPageCount, 0}},
- {1951, {wxListbook, getPageImage, 1}},
- {1952, {wxListbook, getPageText, 1}},
- {1953, {wxListbook, getSelection, 0}},
- {1955, {wxListbook, hitTest, 2}},
- {1956, {wxListbook, insertPage, 4}},
- {1957, {wxListbook, setImageList, 1}},
- {1958, {wxListbook, setPageSize, 1}},
- {1959, {wxListbook, setPageImage, 2}},
- {1960, {wxListbook, setPageText, 2}},
- {1961, {wxListbook, setSelection, 1}},
- {1962, {wxListbook, changeSelection, 1}},
- {1963, {wxListbook, 'Destroy', undefined}},
- {1964, {wxTreebook, new_0, 0}},
- {1965, {wxTreebook, new_3, 3}},
- {1966, {wxTreebook, addPage, 3}},
- {1967, {wxTreebook, advanceSelection, 1}},
- {1968, {wxTreebook, assignImageList, 1}},
- {1969, {wxTreebook, create, 3}},
- {1970, {wxTreebook, deleteAllPages, 0}},
- {1971, {wxTreebook, deletePage, 1}},
- {1972, {wxTreebook, removePage, 1}},
- {1973, {wxTreebook, getCurrentPage, 0}},
- {1974, {wxTreebook, getImageList, 0}},
- {1976, {wxTreebook, getPage, 1}},
- {1977, {wxTreebook, getPageCount, 0}},
- {1978, {wxTreebook, getPageImage, 1}},
- {1979, {wxTreebook, getPageText, 1}},
- {1980, {wxTreebook, getSelection, 0}},
- {1981, {wxTreebook, expandNode, 2}},
- {1982, {wxTreebook, isNodeExpanded, 1}},
- {1984, {wxTreebook, hitTest, 2}},
- {1985, {wxTreebook, insertPage, 4}},
- {1986, {wxTreebook, insertSubPage, 4}},
- {1987, {wxTreebook, setImageList, 1}},
- {1988, {wxTreebook, setPageSize, 1}},
- {1989, {wxTreebook, setPageImage, 2}},
- {1990, {wxTreebook, setPageText, 2}},
- {1991, {wxTreebook, setSelection, 1}},
- {1992, {wxTreebook, changeSelection, 1}},
- {1993, {wxTreebook, 'Destroy', undefined}},
- {1996, {wxTreeCtrl, new_2, 2}},
- {1997, {wxTreeCtrl, new_0, 0}},
- {1999, {wxTreeCtrl, destruct, 0}},
- {2000, {wxTreeCtrl, addRoot, 2}},
- {2001, {wxTreeCtrl, appendItem, 3}},
- {2002, {wxTreeCtrl, assignImageList, 1}},
- {2003, {wxTreeCtrl, assignStateImageList, 1}},
- {2004, {wxTreeCtrl, collapse, 1}},
- {2005, {wxTreeCtrl, collapseAndReset, 1}},
- {2006, {wxTreeCtrl, create, 2}},
- {2007, {wxTreeCtrl, delete, 1}},
- {2008, {wxTreeCtrl, deleteAllItems, 0}},
- {2009, {wxTreeCtrl, deleteChildren, 1}},
- {2010, {wxTreeCtrl, editLabel, 1}},
- {2011, {wxTreeCtrl, ensureVisible, 1}},
- {2012, {wxTreeCtrl, expand, 1}},
- {2013, {wxTreeCtrl, getBoundingRect, 3}},
- {2015, {wxTreeCtrl, getChildrenCount, 2}},
- {2016, {wxTreeCtrl, getCount, 0}},
- {2017, {wxTreeCtrl, getEditControl, 0}},
- {2018, {wxTreeCtrl, getFirstChild, 2}},
- {2019, {wxTreeCtrl, getNextChild, 2}},
- {2020, {wxTreeCtrl, getFirstVisibleItem, 0}},
- {2021, {wxTreeCtrl, getImageList, 0}},
- {2022, {wxTreeCtrl, getIndent, 0}},
- {2023, {wxTreeCtrl, getItemBackgroundColour, 1}},
- {2024, {wxTreeCtrl, getItemData, 1}},
- {2025, {wxTreeCtrl, getItemFont, 1}},
- {2026, {wxTreeCtrl, getItemImage_1, 1}},
- {2027, {wxTreeCtrl, getItemImage_2, 2}},
- {2028, {wxTreeCtrl, getItemText, 1}},
- {2029, {wxTreeCtrl, getItemTextColour, 1}},
- {2030, {wxTreeCtrl, getLastChild, 1}},
- {2031, {wxTreeCtrl, getNextSibling, 1}},
- {2032, {wxTreeCtrl, getNextVisible, 1}},
- {2033, {wxTreeCtrl, getItemParent, 1}},
- {2034, {wxTreeCtrl, getPrevSibling, 1}},
- {2035, {wxTreeCtrl, getPrevVisible, 1}},
- {2036, {wxTreeCtrl, getRootItem, 0}},
- {2037, {wxTreeCtrl, getSelection, 0}},
- {2038, {wxTreeCtrl, getSelections, 1}},
- {2039, {wxTreeCtrl, getStateImageList, 0}},
- {2040, {wxTreeCtrl, hitTest, 1}},
- {2042, {wxTreeCtrl, insertItem, 4}},
- {2043, {wxTreeCtrl, isBold, 1}},
- {2044, {wxTreeCtrl, isExpanded, 1}},
- {2045, {wxTreeCtrl, isSelected, 1}},
- {2046, {wxTreeCtrl, isVisible, 1}},
- {2047, {wxTreeCtrl, itemHasChildren, 1}},
- {2048, {wxTreeCtrl, prependItem, 3}},
- {2049, {wxTreeCtrl, scrollTo, 1}},
- {2050, {wxTreeCtrl, selectItem_1, 1}},
- {2051, {wxTreeCtrl, selectItem_2, 2}},
- {2052, {wxTreeCtrl, setIndent, 1}},
- {2053, {wxTreeCtrl, setImageList, 1}},
- {2054, {wxTreeCtrl, setItemBackgroundColour, 2}},
- {2055, {wxTreeCtrl, setItemBold, 2}},
- {2056, {wxTreeCtrl, setItemData, 2}},
- {2057, {wxTreeCtrl, setItemDropHighlight, 2}},
- {2058, {wxTreeCtrl, setItemFont, 2}},
- {2059, {wxTreeCtrl, setItemHasChildren, 2}},
- {2060, {wxTreeCtrl, setItemImage_2, 2}},
- {2061, {wxTreeCtrl, setItemImage_3, 3}},
- {2062, {wxTreeCtrl, setItemText, 2}},
- {2063, {wxTreeCtrl, setItemTextColour, 2}},
- {2064, {wxTreeCtrl, setStateImageList, 1}},
- {2065, {wxTreeCtrl, setWindowStyle, 1}},
- {2066, {wxTreeCtrl, sortChildren, 1}},
- {2067, {wxTreeCtrl, toggle, 1}},
- {2068, {wxTreeCtrl, toggleItemSelection, 1}},
- {2069, {wxTreeCtrl, unselect, 0}},
- {2070, {wxTreeCtrl, unselectAll, 0}},
- {2071, {wxTreeCtrl, unselectItem, 1}},
- {2072, {wxScrollBar, new_0, 0}},
- {2073, {wxScrollBar, new_3, 3}},
- {2074, {wxScrollBar, destruct, 0}},
- {2075, {wxScrollBar, create, 3}},
- {2076, {wxScrollBar, getRange, 0}},
- {2077, {wxScrollBar, getPageSize, 0}},
- {2078, {wxScrollBar, getThumbPosition, 0}},
- {2079, {wxScrollBar, getThumbSize, 0}},
- {2080, {wxScrollBar, setThumbPosition, 1}},
- {2081, {wxScrollBar, setScrollbar, 5}},
- {2083, {wxSpinButton, new_2, 2}},
- {2084, {wxSpinButton, new_0, 0}},
- {2085, {wxSpinButton, create, 2}},
- {2086, {wxSpinButton, getMax, 0}},
- {2087, {wxSpinButton, getMin, 0}},
- {2088, {wxSpinButton, getValue, 0}},
- {2089, {wxSpinButton, setRange, 2}},
- {2090, {wxSpinButton, setValue, 1}},
- {2091, {wxSpinButton, 'Destroy', undefined}},
- {2092, {wxSpinCtrl, new_0, 0}},
- {2093, {wxSpinCtrl, new_2, 2}},
- {2095, {wxSpinCtrl, create, 2}},
- {2098, {wxSpinCtrl, setValue_1_1, 1}},
- {2099, {wxSpinCtrl, setValue_1_0, 1}},
- {2101, {wxSpinCtrl, getValue, 0}},
- {2103, {wxSpinCtrl, setRange, 2}},
- {2104, {wxSpinCtrl, setSelection, 2}},
- {2106, {wxSpinCtrl, getMin, 0}},
- {2108, {wxSpinCtrl, getMax, 0}},
- {2109, {wxSpinCtrl, 'Destroy', undefined}},
- {2110, {wxStaticText, new_0, 0}},
- {2111, {wxStaticText, new_4, 4}},
- {2112, {wxStaticText, create, 4}},
- {2113, {wxStaticText, getLabel, 0}},
- {2114, {wxStaticText, setLabel, 1}},
- {2115, {wxStaticText, wrap, 1}},
- {2116, {wxStaticText, 'Destroy', undefined}},
- {2117, {wxStaticBitmap, new_0, 0}},
- {2118, {wxStaticBitmap, new_4, 4}},
- {2119, {wxStaticBitmap, create, 4}},
- {2120, {wxStaticBitmap, getBitmap, 0}},
- {2121, {wxStaticBitmap, setBitmap, 1}},
- {2122, {wxStaticBitmap, 'Destroy', undefined}},
- {2123, {wxRadioBox, new, 7}},
- {2125, {wxRadioBox, destruct, 0}},
- {2126, {wxRadioBox, create, 7}},
- {2127, {wxRadioBox, enable_2, 2}},
- {2128, {wxRadioBox, enable_1, 1}},
- {2129, {wxRadioBox, getSelection, 0}},
- {2130, {wxRadioBox, getString, 1}},
- {2131, {wxRadioBox, setSelection, 1}},
- {2132, {wxRadioBox, show_2, 2}},
- {2133, {wxRadioBox, show_1, 1}},
- {2134, {wxRadioBox, getColumnCount, 0}},
- {2135, {wxRadioBox, getItemHelpText, 1}},
- {2136, {wxRadioBox, getItemToolTip, 1}},
- {2138, {wxRadioBox, getItemFromPoint, 1}},
- {2139, {wxRadioBox, getRowCount, 0}},
- {2140, {wxRadioBox, isItemEnabled, 1}},
- {2141, {wxRadioBox, isItemShown, 1}},
- {2142, {wxRadioBox, setItemHelpText, 2}},
- {2143, {wxRadioBox, setItemToolTip, 2}},
- {2144, {wxRadioButton, new_0, 0}},
- {2145, {wxRadioButton, new_4, 4}},
- {2146, {wxRadioButton, create, 4}},
- {2147, {wxRadioButton, getValue, 0}},
- {2148, {wxRadioButton, setValue, 1}},
- {2149, {wxRadioButton, 'Destroy', undefined}},
- {2151, {wxSlider, new_6, 6}},
- {2152, {wxSlider, new_0, 0}},
- {2153, {wxSlider, create, 6}},
- {2154, {wxSlider, getLineSize, 0}},
- {2155, {wxSlider, getMax, 0}},
- {2156, {wxSlider, getMin, 0}},
- {2157, {wxSlider, getPageSize, 0}},
- {2158, {wxSlider, getThumbLength, 0}},
- {2159, {wxSlider, getValue, 0}},
- {2160, {wxSlider, setLineSize, 1}},
- {2161, {wxSlider, setPageSize, 1}},
- {2162, {wxSlider, setRange, 2}},
- {2163, {wxSlider, setThumbLength, 1}},
- {2164, {wxSlider, setValue, 1}},
- {2165, {wxSlider, 'Destroy', undefined}},
- {2167, {wxDialog, new_4, 4}},
- {2168, {wxDialog, new_0, 0}},
- {2170, {wxDialog, destruct, 0}},
- {2171, {wxDialog, create, 4}},
- {2172, {wxDialog, createButtonSizer, 1}},
- {2173, {wxDialog, createStdDialogButtonSizer, 1}},
- {2174, {wxDialog, endModal, 1}},
- {2175, {wxDialog, getAffirmativeId, 0}},
- {2176, {wxDialog, getReturnCode, 0}},
- {2177, {wxDialog, isModal, 0}},
- {2178, {wxDialog, setAffirmativeId, 1}},
- {2179, {wxDialog, setReturnCode, 1}},
- {2180, {wxDialog, show, 1}},
- {2181, {wxDialog, showModal, 0}},
- {2182, {wxColourDialog, new_0, 0}},
- {2183, {wxColourDialog, new_2, 2}},
- {2184, {wxColourDialog, destruct, 0}},
- {2185, {wxColourDialog, create, 2}},
- {2186, {wxColourDialog, getColourData, 0}},
- {2187, {wxColourData, new_0, 0}},
- {2188, {wxColourData, new_1, 1}},
- {2189, {wxColourData, destruct, 0}},
- {2190, {wxColourData, getChooseFull, 0}},
- {2191, {wxColourData, getColour, 0}},
- {2193, {wxColourData, getCustomColour, 1}},
- {2194, {wxColourData, setChooseFull, 1}},
- {2195, {wxColourData, setColour, 1}},
- {2196, {wxColourData, setCustomColour, 2}},
- {2197, {wxPalette, new_0, 0}},
- {2198, {wxPalette, new_4, 4}},
- {2200, {wxPalette, destruct, 0}},
- {2201, {wxPalette, create, 4}},
- {2202, {wxPalette, getColoursCount, 0}},
- {2203, {wxPalette, getPixel, 3}},
- {2204, {wxPalette, getRGB, 4}},
- {2205, {wxPalette, isOk, 0}},
- {2209, {wxDirDialog, new, 2}},
- {2210, {wxDirDialog, destruct, 0}},
- {2211, {wxDirDialog, getPath, 0}},
- {2212, {wxDirDialog, getMessage, 0}},
- {2213, {wxDirDialog, setMessage, 1}},
- {2214, {wxDirDialog, setPath, 1}},
- {2218, {wxFileDialog, new, 2}},
- {2219, {wxFileDialog, destruct, 0}},
- {2220, {wxFileDialog, getDirectory, 0}},
- {2221, {wxFileDialog, getFilename, 0}},
- {2222, {wxFileDialog, getFilenames, 1}},
- {2223, {wxFileDialog, getFilterIndex, 0}},
- {2224, {wxFileDialog, getMessage, 0}},
- {2225, {wxFileDialog, getPath, 0}},
- {2226, {wxFileDialog, getPaths, 1}},
- {2227, {wxFileDialog, getWildcard, 0}},
- {2228, {wxFileDialog, setDirectory, 1}},
- {2229, {wxFileDialog, setFilename, 1}},
- {2230, {wxFileDialog, setFilterIndex, 1}},
- {2231, {wxFileDialog, setMessage, 1}},
- {2232, {wxFileDialog, setPath, 1}},
- {2233, {wxFileDialog, setWildcard, 1}},
- {2234, {wxPickerBase, setInternalMargin, 1}},
- {2235, {wxPickerBase, getInternalMargin, 0}},
- {2236, {wxPickerBase, setTextCtrlProportion, 1}},
- {2237, {wxPickerBase, setPickerCtrlProportion, 1}},
- {2238, {wxPickerBase, getTextCtrlProportion, 0}},
- {2239, {wxPickerBase, getPickerCtrlProportion, 0}},
- {2240, {wxPickerBase, hasTextCtrl, 0}},
- {2241, {wxPickerBase, getTextCtrl, 0}},
- {2242, {wxPickerBase, isTextCtrlGrowable, 0}},
- {2243, {wxPickerBase, setPickerCtrlGrowable, 1}},
- {2244, {wxPickerBase, setTextCtrlGrowable, 1}},
- {2245, {wxPickerBase, isPickerCtrlGrowable, 0}},
- {2246, {wxFilePickerCtrl, new_0, 0}},
- {2247, {wxFilePickerCtrl, new_3, 3}},
- {2248, {wxFilePickerCtrl, create, 3}},
- {2249, {wxFilePickerCtrl, getPath, 0}},
- {2250, {wxFilePickerCtrl, setPath, 1}},
- {2251, {wxFilePickerCtrl, 'Destroy', undefined}},
- {2252, {wxDirPickerCtrl, new_0, 0}},
- {2253, {wxDirPickerCtrl, new_3, 3}},
- {2254, {wxDirPickerCtrl, create, 3}},
- {2255, {wxDirPickerCtrl, getPath, 0}},
- {2256, {wxDirPickerCtrl, setPath, 1}},
- {2257, {wxDirPickerCtrl, 'Destroy', undefined}},
- {2258, {wxColourPickerCtrl, new_0, 0}},
- {2259, {wxColourPickerCtrl, new_3, 3}},
- {2260, {wxColourPickerCtrl, create, 3}},
- {2261, {wxColourPickerCtrl, getColour, 0}},
- {2262, {wxColourPickerCtrl, setColour_1_1, 1}},
- {2263, {wxColourPickerCtrl, setColour_1_0, 1}},
- {2264, {wxColourPickerCtrl, 'Destroy', undefined}},
- {2265, {wxDatePickerCtrl, new_0, 0}},
- {2266, {wxDatePickerCtrl, new_3, 3}},
- {2267, {wxDatePickerCtrl, getRange, 2}},
- {2268, {wxDatePickerCtrl, getValue, 0}},
- {2269, {wxDatePickerCtrl, setRange, 2}},
- {2270, {wxDatePickerCtrl, setValue, 1}},
- {2271, {wxDatePickerCtrl, 'Destroy', undefined}},
- {2272, {wxFontPickerCtrl, new_0, 0}},
- {2273, {wxFontPickerCtrl, new_3, 3}},
- {2274, {wxFontPickerCtrl, create, 3}},
- {2275, {wxFontPickerCtrl, getSelectedFont, 0}},
- {2276, {wxFontPickerCtrl, setSelectedFont, 1}},
- {2277, {wxFontPickerCtrl, getMaxPointSize, 0}},
- {2278, {wxFontPickerCtrl, setMaxPointSize, 1}},
- {2279, {wxFontPickerCtrl, 'Destroy', undefined}},
- {2282, {wxFindReplaceDialog, new_0, 0}},
- {2283, {wxFindReplaceDialog, new_4, 4}},
- {2284, {wxFindReplaceDialog, destruct, 0}},
- {2285, {wxFindReplaceDialog, create, 4}},
- {2286, {wxFindReplaceDialog, getData, 0}},
- {2287, {wxFindReplaceData, new_0, 0}},
- {2288, {wxFindReplaceData, new_1, 1}},
- {2289, {wxFindReplaceData, getFindString, 0}},
- {2290, {wxFindReplaceData, getReplaceString, 0}},
- {2291, {wxFindReplaceData, getFlags, 0}},
- {2292, {wxFindReplaceData, setFlags, 1}},
- {2293, {wxFindReplaceData, setFindString, 1}},
- {2294, {wxFindReplaceData, setReplaceString, 1}},
- {2295, {wxFindReplaceData, 'Destroy', undefined}},
- {2296, {wxMultiChoiceDialog, new_0, 0}},
- {2298, {wxMultiChoiceDialog, new_5, 5}},
- {2299, {wxMultiChoiceDialog, getSelections, 0}},
- {2300, {wxMultiChoiceDialog, setSelections, 1}},
- {2301, {wxMultiChoiceDialog, 'Destroy', undefined}},
- {2302, {wxSingleChoiceDialog, new_0, 0}},
- {2304, {wxSingleChoiceDialog, new_5, 5}},
- {2305, {wxSingleChoiceDialog, getSelection, 0}},
- {2306, {wxSingleChoiceDialog, getStringSelection, 0}},
- {2307, {wxSingleChoiceDialog, setSelection, 1}},
- {2308, {wxSingleChoiceDialog, 'Destroy', undefined}},
- {2309, {wxTextEntryDialog, new, 3}},
- {2310, {wxTextEntryDialog, getValue, 0}},
- {2311, {wxTextEntryDialog, setValue, 1}},
- {2312, {wxTextEntryDialog, 'Destroy', undefined}},
- {2313, {wxPasswordEntryDialog, new, 3}},
- {2314, {wxPasswordEntryDialog, 'Destroy', undefined}},
- {2315, {wxFontData, new_0, 0}},
- {2316, {wxFontData, new_1, 1}},
- {2317, {wxFontData, destruct, 0}},
- {2318, {wxFontData, enableEffects, 1}},
- {2319, {wxFontData, getAllowSymbols, 0}},
- {2320, {wxFontData, getColour, 0}},
- {2321, {wxFontData, getChosenFont, 0}},
- {2322, {wxFontData, getEnableEffects, 0}},
- {2323, {wxFontData, getInitialFont, 0}},
- {2324, {wxFontData, getShowHelp, 0}},
- {2325, {wxFontData, setAllowSymbols, 1}},
- {2326, {wxFontData, setChosenFont, 1}},
- {2327, {wxFontData, setColour, 1}},
- {2328, {wxFontData, setInitialFont, 1}},
- {2329, {wxFontData, setRange, 2}},
- {2330, {wxFontData, setShowHelp, 1}},
- {2334, {wxFontDialog, new_0, 0}},
- {2336, {wxFontDialog, new_2, 2}},
- {2338, {wxFontDialog, create, 2}},
- {2339, {wxFontDialog, getFontData, 0}},
- {2341, {wxFontDialog, 'Destroy', undefined}},
- {2342, {wxProgressDialog, new, 3}},
- {2343, {wxProgressDialog, destruct, 0}},
- {2344, {wxProgressDialog, resume, 0}},
- {2345, {wxProgressDialog, update_2, 2}},
- {2346, {wxProgressDialog, update_0, 0}},
- {2347, {wxMessageDialog, new, 3}},
- {2348, {wxMessageDialog, destruct, 0}},
- {2349, {wxPageSetupDialog, new, 2}},
- {2350, {wxPageSetupDialog, destruct, 0}},
- {2351, {wxPageSetupDialog, getPageSetupData, 0}},
- {2352, {wxPageSetupDialog, showModal, 0}},
- {2353, {wxPageSetupDialogData, new_0, 0}},
- {2354, {wxPageSetupDialogData, new_1_0, 1}},
- {2355, {wxPageSetupDialogData, new_1_1, 1}},
- {2356, {wxPageSetupDialogData, destruct, 0}},
- {2357, {wxPageSetupDialogData, enableHelp, 1}},
- {2358, {wxPageSetupDialogData, enableMargins, 1}},
- {2359, {wxPageSetupDialogData, enableOrientation, 1}},
- {2360, {wxPageSetupDialogData, enablePaper, 1}},
- {2361, {wxPageSetupDialogData, enablePrinter, 1}},
- {2362, {wxPageSetupDialogData, getDefaultMinMargins, 0}},
- {2363, {wxPageSetupDialogData, getEnableMargins, 0}},
- {2364, {wxPageSetupDialogData, getEnableOrientation, 0}},
- {2365, {wxPageSetupDialogData, getEnablePaper, 0}},
- {2366, {wxPageSetupDialogData, getEnablePrinter, 0}},
- {2367, {wxPageSetupDialogData, getEnableHelp, 0}},
- {2368, {wxPageSetupDialogData, getDefaultInfo, 0}},
- {2369, {wxPageSetupDialogData, getMarginTopLeft, 0}},
- {2370, {wxPageSetupDialogData, getMarginBottomRight, 0}},
- {2371, {wxPageSetupDialogData, getMinMarginTopLeft, 0}},
- {2372, {wxPageSetupDialogData, getMinMarginBottomRight, 0}},
- {2373, {wxPageSetupDialogData, getPaperId, 0}},
- {2374, {wxPageSetupDialogData, getPaperSize, 0}},
- {2376, {wxPageSetupDialogData, getPrintData, 0}},
- {2377, {wxPageSetupDialogData, isOk, 0}},
- {2378, {wxPageSetupDialogData, setDefaultInfo, 1}},
- {2379, {wxPageSetupDialogData, setDefaultMinMargins, 1}},
- {2380, {wxPageSetupDialogData, setMarginTopLeft, 1}},
- {2381, {wxPageSetupDialogData, setMarginBottomRight, 1}},
- {2382, {wxPageSetupDialogData, setMinMarginTopLeft, 1}},
- {2383, {wxPageSetupDialogData, setMinMarginBottomRight, 1}},
- {2384, {wxPageSetupDialogData, setPaperId, 1}},
- {2385, {wxPageSetupDialogData, setPaperSize_1_1, 1}},
- {2386, {wxPageSetupDialogData, setPaperSize_1_0, 1}},
- {2387, {wxPageSetupDialogData, setPrintData, 1}},
- {2388, {wxPrintDialog, new_2_0, 2}},
- {2389, {wxPrintDialog, new_2_1, 2}},
- {2390, {wxPrintDialog, destruct, 0}},
- {2391, {wxPrintDialog, getPrintDialogData, 0}},
- {2392, {wxPrintDialog, getPrintDC, 0}},
- {2393, {wxPrintDialogData, new_0, 0}},
- {2394, {wxPrintDialogData, new_1_1, 1}},
- {2395, {wxPrintDialogData, new_1_0, 1}},
- {2396, {wxPrintDialogData, destruct, 0}},
- {2397, {wxPrintDialogData, enableHelp, 1}},
- {2398, {wxPrintDialogData, enablePageNumbers, 1}},
- {2399, {wxPrintDialogData, enablePrintToFile, 1}},
- {2400, {wxPrintDialogData, enableSelection, 1}},
- {2401, {wxPrintDialogData, getAllPages, 0}},
- {2402, {wxPrintDialogData, getCollate, 0}},
- {2403, {wxPrintDialogData, getFromPage, 0}},
- {2404, {wxPrintDialogData, getMaxPage, 0}},
- {2405, {wxPrintDialogData, getMinPage, 0}},
- {2406, {wxPrintDialogData, getNoCopies, 0}},
- {2407, {wxPrintDialogData, getPrintData, 0}},
- {2408, {wxPrintDialogData, getPrintToFile, 0}},
- {2409, {wxPrintDialogData, getSelection, 0}},
- {2410, {wxPrintDialogData, getToPage, 0}},
- {2411, {wxPrintDialogData, isOk, 0}},
- {2412, {wxPrintDialogData, setCollate, 1}},
- {2413, {wxPrintDialogData, setFromPage, 1}},
- {2414, {wxPrintDialogData, setMaxPage, 1}},
- {2415, {wxPrintDialogData, setMinPage, 1}},
- {2416, {wxPrintDialogData, setNoCopies, 1}},
- {2417, {wxPrintDialogData, setPrintData, 1}},
- {2418, {wxPrintDialogData, setPrintToFile, 1}},
- {2419, {wxPrintDialogData, setSelection, 1}},
- {2420, {wxPrintDialogData, setToPage, 1}},
- {2421, {wxPrintData, new_0, 0}},
- {2422, {wxPrintData, new_1, 1}},
- {2423, {wxPrintData, destruct, 0}},
- {2424, {wxPrintData, getCollate, 0}},
- {2425, {wxPrintData, getBin, 0}},
- {2426, {wxPrintData, getColour, 0}},
- {2427, {wxPrintData, getDuplex, 0}},
- {2428, {wxPrintData, getNoCopies, 0}},
- {2429, {wxPrintData, getOrientation, 0}},
- {2430, {wxPrintData, getPaperId, 0}},
- {2431, {wxPrintData, getPrinterName, 0}},
- {2432, {wxPrintData, getQuality, 0}},
- {2433, {wxPrintData, isOk, 0}},
- {2434, {wxPrintData, setBin, 1}},
- {2435, {wxPrintData, setCollate, 1}},
- {2436, {wxPrintData, setColour, 1}},
- {2437, {wxPrintData, setDuplex, 1}},
- {2438, {wxPrintData, setNoCopies, 1}},
- {2439, {wxPrintData, setOrientation, 1}},
- {2440, {wxPrintData, setPaperId, 1}},
- {2441, {wxPrintData, setPrinterName, 1}},
- {2442, {wxPrintData, setQuality, 1}},
- {2445, {wxPrintPreview, new_2, 2}},
- {2446, {wxPrintPreview, new_3, 3}},
- {2448, {wxPrintPreview, destruct, 0}},
- {2449, {wxPrintPreview, getCanvas, 0}},
- {2450, {wxPrintPreview, getCurrentPage, 0}},
- {2451, {wxPrintPreview, getFrame, 0}},
- {2452, {wxPrintPreview, getMaxPage, 0}},
- {2453, {wxPrintPreview, getMinPage, 0}},
- {2454, {wxPrintPreview, getPrintout, 0}},
- {2455, {wxPrintPreview, getPrintoutForPrinting, 0}},
- {2456, {wxPrintPreview, isOk, 0}},
- {2457, {wxPrintPreview, paintPage, 2}},
- {2458, {wxPrintPreview, print, 1}},
- {2459, {wxPrintPreview, renderPage, 1}},
- {2460, {wxPrintPreview, setCanvas, 1}},
- {2461, {wxPrintPreview, setCurrentPage, 1}},
- {2462, {wxPrintPreview, setFrame, 1}},
- {2463, {wxPrintPreview, setPrintout, 1}},
- {2464, {wxPrintPreview, setZoom, 1}},
- {2465, {wxPreviewFrame, new, 3}},
- {2466, {wxPreviewFrame, destruct, 0}},
- {2467, {wxPreviewFrame, createControlBar, 0}},
- {2468, {wxPreviewFrame, createCanvas, 0}},
- {2469, {wxPreviewFrame, initialize, 0}},
- {2470, {wxPreviewFrame, onCloseWindow, 1}},
- {2471, {wxPreviewControlBar, new, 4}},
- {2472, {wxPreviewControlBar, destruct, 0}},
- {2473, {wxPreviewControlBar, createButtons, 0}},
- {2474, {wxPreviewControlBar, getPrintPreview, 0}},
- {2475, {wxPreviewControlBar, getZoomControl, 0}},
- {2476, {wxPreviewControlBar, setZoomControl, 1}},
- {2478, {wxPrinter, new, 1}},
- {2479, {wxPrinter, createAbortWindow, 2}},
- {2480, {wxPrinter, getAbort, 0}},
- {2481, {wxPrinter, getLastError, 0}},
- {2482, {wxPrinter, getPrintDialogData, 0}},
- {2483, {wxPrinter, print, 3}},
- {2484, {wxPrinter, printDialog, 1}},
- {2485, {wxPrinter, reportError, 3}},
- {2486, {wxPrinter, setup, 1}},
- {2487, {wxPrinter, 'Destroy', undefined}},
- {2488, {wxXmlResource, new_1, 1}},
- {2489, {wxXmlResource, new_2, 2}},
- {2490, {wxXmlResource, destruct, 0}},
- {2491, {wxXmlResource, attachUnknownControl, 3}},
- {2492, {wxXmlResource, clearHandlers, 0}},
- {2493, {wxXmlResource, compareVersion, 4}},
- {2494, {wxXmlResource, get, 0}},
- {2495, {wxXmlResource, getFlags, 0}},
- {2496, {wxXmlResource, getVersion, 0}},
- {2497, {wxXmlResource, getXRCID, 2}},
- {2498, {wxXmlResource, initAllHandlers, 0}},
- {2499, {wxXmlResource, load, 1}},
- {2500, {wxXmlResource, loadBitmap, 1}},
- {2501, {wxXmlResource, loadDialog_2, 2}},
- {2502, {wxXmlResource, loadDialog_3, 3}},
- {2503, {wxXmlResource, loadFrame_2, 2}},
- {2504, {wxXmlResource, loadFrame_3, 3}},
- {2505, {wxXmlResource, loadIcon, 1}},
- {2506, {wxXmlResource, loadMenu, 1}},
- {2507, {wxXmlResource, loadMenuBar_2, 2}},
- {2508, {wxXmlResource, loadMenuBar_1, 1}},
- {2509, {wxXmlResource, loadPanel_2, 2}},
- {2510, {wxXmlResource, loadPanel_3, 3}},
- {2511, {wxXmlResource, loadToolBar, 2}},
- {2512, {wxXmlResource, set, 1}},
- {2513, {wxXmlResource, setFlags, 1}},
- {2514, {wxXmlResource, unload, 1}},
- {2515, {wxXmlResource, xrcctrl, 3}},
- {2516, {wxHtmlEasyPrinting, new, 1}},
- {2517, {wxHtmlEasyPrinting, destruct, 0}},
- {2518, {wxHtmlEasyPrinting, getPrintData, 0}},
- {2519, {wxHtmlEasyPrinting, getPageSetupData, 0}},
- {2520, {wxHtmlEasyPrinting, previewFile, 1}},
- {2521, {wxHtmlEasyPrinting, previewText, 2}},
- {2522, {wxHtmlEasyPrinting, printFile, 1}},
- {2523, {wxHtmlEasyPrinting, printText, 2}},
- {2524, {wxHtmlEasyPrinting, pageSetup, 0}},
- {2525, {wxHtmlEasyPrinting, setFonts, 3}},
- {2526, {wxHtmlEasyPrinting, setHeader, 2}},
- {2527, {wxHtmlEasyPrinting, setFooter, 2}},
- {2529, {wxGLCanvas, new_2, 2}},
- {2530, {wxGLCanvas, new_3_1, 3}},
- {2531, {wxGLCanvas, new_3_0, 3}},
- {2532, {wxGLCanvas, getContext, 0}},
- {2534, {wxGLCanvas, setCurrent, 0}},
- {2535, {wxGLCanvas, swapBuffers, 0}},
- {2536, {wxGLCanvas, 'Destroy', undefined}},
- {2537, {wxAuiManager, new, 1}},
- {2538, {wxAuiManager, destruct, 0}},
- {2539, {wxAuiManager, addPane_2_1, 2}},
- {2540, {wxAuiManager, addPane_3, 3}},
- {2541, {wxAuiManager, addPane_2_0, 2}},
- {2542, {wxAuiManager, detachPane, 1}},
- {2543, {wxAuiManager, getAllPanes, 0}},
- {2544, {wxAuiManager, getArtProvider, 0}},
- {2545, {wxAuiManager, getDockSizeConstraint, 2}},
- {2546, {wxAuiManager, getFlags, 0}},
- {2547, {wxAuiManager, getManagedWindow, 0}},
- {2548, {wxAuiManager, getManager, 1}},
- {2549, {wxAuiManager, getPane_1_1, 1}},
- {2550, {wxAuiManager, getPane_1_0, 1}},
- {2551, {wxAuiManager, hideHint, 0}},
- {2552, {wxAuiManager, insertPane, 3}},
- {2553, {wxAuiManager, loadPaneInfo, 2}},
- {2554, {wxAuiManager, loadPerspective, 2}},
- {2555, {wxAuiManager, savePaneInfo, 1}},
- {2556, {wxAuiManager, savePerspective, 0}},
- {2557, {wxAuiManager, setArtProvider, 1}},
- {2558, {wxAuiManager, setDockSizeConstraint, 2}},
- {2559, {wxAuiManager, setFlags, 1}},
- {2560, {wxAuiManager, setManagedWindow, 1}},
- {2561, {wxAuiManager, showHint, 1}},
- {2562, {wxAuiManager, unInit, 0}},
- {2563, {wxAuiManager, update, 0}},
- {2564, {wxAuiPaneInfo, new_0, 0}},
- {2565, {wxAuiPaneInfo, new_1, 1}},
- {2566, {wxAuiPaneInfo, destruct, 0}},
- {2567, {wxAuiPaneInfo, bestSize_1, 1}},
- {2568, {wxAuiPaneInfo, bestSize_2, 2}},
- {2569, {wxAuiPaneInfo, bottom, 0}},
- {2570, {wxAuiPaneInfo, bottomDockable, 1}},
- {2571, {wxAuiPaneInfo, caption, 1}},
- {2572, {wxAuiPaneInfo, captionVisible, 1}},
- {2573, {wxAuiPaneInfo, centre, 0}},
- {2574, {wxAuiPaneInfo, centrePane, 0}},
- {2575, {wxAuiPaneInfo, closeButton, 1}},
- {2576, {wxAuiPaneInfo, defaultPane, 0}},
- {2577, {wxAuiPaneInfo, destroyOnClose, 1}},
- {2578, {wxAuiPaneInfo, direction, 1}},
- {2579, {wxAuiPaneInfo, dock, 0}},
- {2580, {wxAuiPaneInfo, dockable, 1}},
- {2581, {wxAuiPaneInfo, fixed, 0}},
- {2582, {wxAuiPaneInfo, float, 0}},
- {2583, {wxAuiPaneInfo, floatable, 1}},
- {2584, {wxAuiPaneInfo, floatingPosition_1, 1}},
- {2585, {wxAuiPaneInfo, floatingPosition_2, 2}},
- {2586, {wxAuiPaneInfo, floatingSize_1, 1}},
- {2587, {wxAuiPaneInfo, floatingSize_2, 2}},
- {2588, {wxAuiPaneInfo, gripper, 1}},
- {2589, {wxAuiPaneInfo, gripperTop, 1}},
- {2590, {wxAuiPaneInfo, hasBorder, 0}},
- {2591, {wxAuiPaneInfo, hasCaption, 0}},
- {2592, {wxAuiPaneInfo, hasCloseButton, 0}},
- {2593, {wxAuiPaneInfo, hasFlag, 1}},
- {2594, {wxAuiPaneInfo, hasGripper, 0}},
- {2595, {wxAuiPaneInfo, hasGripperTop, 0}},
- {2596, {wxAuiPaneInfo, hasMaximizeButton, 0}},
- {2597, {wxAuiPaneInfo, hasMinimizeButton, 0}},
- {2598, {wxAuiPaneInfo, hasPinButton, 0}},
- {2599, {wxAuiPaneInfo, hide, 0}},
- {2600, {wxAuiPaneInfo, isBottomDockable, 0}},
- {2601, {wxAuiPaneInfo, isDocked, 0}},
- {2602, {wxAuiPaneInfo, isFixed, 0}},
- {2603, {wxAuiPaneInfo, isFloatable, 0}},
- {2604, {wxAuiPaneInfo, isFloating, 0}},
- {2605, {wxAuiPaneInfo, isLeftDockable, 0}},
- {2606, {wxAuiPaneInfo, isMovable, 0}},
- {2607, {wxAuiPaneInfo, isOk, 0}},
- {2608, {wxAuiPaneInfo, isResizable, 0}},
- {2609, {wxAuiPaneInfo, isRightDockable, 0}},
- {2610, {wxAuiPaneInfo, isShown, 0}},
- {2611, {wxAuiPaneInfo, isToolbar, 0}},
- {2612, {wxAuiPaneInfo, isTopDockable, 0}},
- {2613, {wxAuiPaneInfo, layer, 1}},
- {2614, {wxAuiPaneInfo, left, 0}},
- {2615, {wxAuiPaneInfo, leftDockable, 1}},
- {2616, {wxAuiPaneInfo, maxSize_1, 1}},
- {2617, {wxAuiPaneInfo, maxSize_2, 2}},
- {2618, {wxAuiPaneInfo, maximizeButton, 1}},
- {2619, {wxAuiPaneInfo, minSize_1, 1}},
- {2620, {wxAuiPaneInfo, minSize_2, 2}},
- {2621, {wxAuiPaneInfo, minimizeButton, 1}},
- {2622, {wxAuiPaneInfo, movable, 1}},
- {2623, {wxAuiPaneInfo, name, 1}},
- {2624, {wxAuiPaneInfo, paneBorder, 1}},
- {2625, {wxAuiPaneInfo, pinButton, 1}},
- {2626, {wxAuiPaneInfo, position, 1}},
- {2627, {wxAuiPaneInfo, resizable, 1}},
- {2628, {wxAuiPaneInfo, right, 0}},
- {2629, {wxAuiPaneInfo, rightDockable, 1}},
- {2630, {wxAuiPaneInfo, row, 1}},
- {2631, {wxAuiPaneInfo, safeSet, 1}},
- {2632, {wxAuiPaneInfo, setFlag, 2}},
- {2633, {wxAuiPaneInfo, show, 1}},
- {2634, {wxAuiPaneInfo, toolbarPane, 0}},
- {2635, {wxAuiPaneInfo, top, 0}},
- {2636, {wxAuiPaneInfo, topDockable, 1}},
- {2637, {wxAuiPaneInfo, window, 1}},
- {2638, {wxAuiNotebook, new_0, 0}},
- {2639, {wxAuiNotebook, new_2, 2}},
- {2640, {wxAuiNotebook, addPage, 3}},
- {2641, {wxAuiNotebook, create, 2}},
- {2642, {wxAuiNotebook, deletePage, 1}},
- {2643, {wxAuiNotebook, getArtProvider, 0}},
- {2644, {wxAuiNotebook, getPage, 1}},
- {2645, {wxAuiNotebook, getPageBitmap, 1}},
- {2646, {wxAuiNotebook, getPageCount, 0}},
- {2647, {wxAuiNotebook, getPageIndex, 1}},
- {2648, {wxAuiNotebook, getPageText, 1}},
- {2649, {wxAuiNotebook, getSelection, 0}},
- {2650, {wxAuiNotebook, insertPage, 4}},
- {2651, {wxAuiNotebook, removePage, 1}},
- {2652, {wxAuiNotebook, setArtProvider, 1}},
- {2653, {wxAuiNotebook, setFont, 1}},
- {2654, {wxAuiNotebook, setPageBitmap, 2}},
- {2655, {wxAuiNotebook, setPageText, 2}},
- {2656, {wxAuiNotebook, setSelection, 1}},
- {2657, {wxAuiNotebook, setTabCtrlHeight, 1}},
- {2658, {wxAuiNotebook, setUniformBitmapSize, 1}},
- {2659, {wxAuiNotebook, 'Destroy', undefined}},
- {2660, {wxMDIParentFrame, new_0, 0}},
- {2661, {wxMDIParentFrame, new_4, 4}},
- {2662, {wxMDIParentFrame, destruct, 0}},
- {2663, {wxMDIParentFrame, activateNext, 0}},
- {2664, {wxMDIParentFrame, activatePrevious, 0}},
- {2665, {wxMDIParentFrame, arrangeIcons, 0}},
- {2666, {wxMDIParentFrame, cascade, 0}},
- {2667, {wxMDIParentFrame, create, 4}},
- {2668, {wxMDIParentFrame, getActiveChild, 0}},
- {2669, {wxMDIParentFrame, getClientWindow, 0}},
- {2670, {wxMDIParentFrame, tile, 1}},
- {2671, {wxMDIChildFrame, new_0, 0}},
- {2672, {wxMDIChildFrame, new_4, 4}},
- {2673, {wxMDIChildFrame, destruct, 0}},
- {2674, {wxMDIChildFrame, activate, 0}},
- {2675, {wxMDIChildFrame, create, 4}},
- {2676, {wxMDIChildFrame, maximize, 1}},
- {2677, {wxMDIChildFrame, restore, 0}},
- {2678, {wxMDIClientWindow, new_0, 0}},
- {2679, {wxMDIClientWindow, new_2, 2}},
- {2680, {wxMDIClientWindow, destruct, 0}},
- {2681, {wxMDIClientWindow, createClient, 2}},
- {2682, {wxLayoutAlgorithm, new, 0}},
- {2683, {wxLayoutAlgorithm, layoutFrame, 2}},
- {2684, {wxLayoutAlgorithm, layoutMDIFrame, 2}},
- {2685, {wxLayoutAlgorithm, layoutWindow, 2}},
- {2686, {wxLayoutAlgorithm, 'Destroy', undefined}},
- {2687, {wxEvent, getId, 0}},
- {2688, {wxEvent, getSkipped, 0}},
- {2689, {wxEvent, getTimestamp, 0}},
- {2690, {wxEvent, isCommandEvent, 0}},
- {2691, {wxEvent, resumePropagation, 1}},
- {2692, {wxEvent, shouldPropagate, 0}},
- {2693, {wxEvent, skip, 1}},
- {2694, {wxEvent, stopPropagation, 0}},
- {2695, {wxCommandEvent, getClientData, 0}},
- {2696, {wxCommandEvent, getExtraLong, 0}},
- {2697, {wxCommandEvent, getInt, 0}},
- {2698, {wxCommandEvent, getSelection, 0}},
- {2699, {wxCommandEvent, getString, 0}},
- {2700, {wxCommandEvent, isChecked, 0}},
- {2701, {wxCommandEvent, isSelection, 0}},
- {2702, {wxCommandEvent, setInt, 1}},
- {2703, {wxCommandEvent, setString, 1}},
- {2704, {wxScrollEvent, getOrientation, 0}},
- {2705, {wxScrollEvent, getPosition, 0}},
- {2706, {wxScrollWinEvent, getOrientation, 0}},
- {2707, {wxScrollWinEvent, getPosition, 0}},
- {2708, {wxMouseEvent, altDown, 0}},
- {2709, {wxMouseEvent, button, 1}},
- {2710, {wxMouseEvent, buttonDClick, 1}},
- {2711, {wxMouseEvent, buttonDown, 1}},
- {2712, {wxMouseEvent, buttonUp, 1}},
- {2713, {wxMouseEvent, cmdDown, 0}},
- {2714, {wxMouseEvent, controlDown, 0}},
- {2715, {wxMouseEvent, dragging, 0}},
- {2716, {wxMouseEvent, entering, 0}},
- {2717, {wxMouseEvent, getButton, 0}},
- {2720, {wxMouseEvent, getPosition, 0}},
- {2721, {wxMouseEvent, getLogicalPosition, 1}},
- {2722, {wxMouseEvent, getLinesPerAction, 0}},
- {2723, {wxMouseEvent, getWheelRotation, 0}},
- {2724, {wxMouseEvent, getWheelDelta, 0}},
- {2725, {wxMouseEvent, getX, 0}},
- {2726, {wxMouseEvent, getY, 0}},
- {2727, {wxMouseEvent, isButton, 0}},
- {2728, {wxMouseEvent, isPageScroll, 0}},
- {2729, {wxMouseEvent, leaving, 0}},
- {2730, {wxMouseEvent, leftDClick, 0}},
- {2731, {wxMouseEvent, leftDown, 0}},
- {2732, {wxMouseEvent, leftIsDown, 0}},
- {2733, {wxMouseEvent, leftUp, 0}},
- {2734, {wxMouseEvent, metaDown, 0}},
- {2735, {wxMouseEvent, middleDClick, 0}},
- {2736, {wxMouseEvent, middleDown, 0}},
- {2737, {wxMouseEvent, middleIsDown, 0}},
- {2738, {wxMouseEvent, middleUp, 0}},
- {2739, {wxMouseEvent, moving, 0}},
- {2740, {wxMouseEvent, rightDClick, 0}},
- {2741, {wxMouseEvent, rightDown, 0}},
- {2742, {wxMouseEvent, rightIsDown, 0}},
- {2743, {wxMouseEvent, rightUp, 0}},
- {2744, {wxMouseEvent, shiftDown, 0}},
- {2745, {wxSetCursorEvent, getCursor, 0}},
- {2746, {wxSetCursorEvent, getX, 0}},
- {2747, {wxSetCursorEvent, getY, 0}},
- {2748, {wxSetCursorEvent, hasCursor, 0}},
- {2749, {wxSetCursorEvent, setCursor, 1}},
- {2750, {wxKeyEvent, altDown, 0}},
- {2751, {wxKeyEvent, cmdDown, 0}},
- {2752, {wxKeyEvent, controlDown, 0}},
- {2753, {wxKeyEvent, getKeyCode, 0}},
- {2754, {wxKeyEvent, getModifiers, 0}},
- {2757, {wxKeyEvent, getPosition, 0}},
- {2758, {wxKeyEvent, getRawKeyCode, 0}},
- {2759, {wxKeyEvent, getRawKeyFlags, 0}},
- {2760, {wxKeyEvent, getUnicodeKey, 0}},
- {2761, {wxKeyEvent, getX, 0}},
- {2762, {wxKeyEvent, getY, 0}},
- {2763, {wxKeyEvent, hasModifiers, 0}},
- {2764, {wxKeyEvent, metaDown, 0}},
- {2765, {wxKeyEvent, shiftDown, 0}},
- {2766, {wxSizeEvent, getSize, 0}},
- {2767, {wxMoveEvent, getPosition, 0}},
- {2768, {wxEraseEvent, getDC, 0}},
- {2769, {wxFocusEvent, getWindow, 0}},
- {2770, {wxChildFocusEvent, getWindow, 0}},
- {2771, {wxMenuEvent, getMenu, 0}},
- {2772, {wxMenuEvent, getMenuId, 0}},
- {2773, {wxMenuEvent, isPopup, 0}},
- {2774, {wxCloseEvent, canVeto, 0}},
- {2775, {wxCloseEvent, getLoggingOff, 0}},
- {2776, {wxCloseEvent, setCanVeto, 1}},
- {2777, {wxCloseEvent, setLoggingOff, 1}},
- {2778, {wxCloseEvent, veto, 1}},
- {2779, {wxShowEvent, setShow, 1}},
- {2780, {wxShowEvent, getShow, 0}},
- {2781, {wxIconizeEvent, iconized, 0}},
- {2782, {wxJoystickEvent, buttonDown, 1}},
- {2783, {wxJoystickEvent, buttonIsDown, 1}},
- {2784, {wxJoystickEvent, buttonUp, 1}},
- {2785, {wxJoystickEvent, getButtonChange, 0}},
- {2786, {wxJoystickEvent, getButtonState, 0}},
- {2787, {wxJoystickEvent, getJoystick, 0}},
- {2788, {wxJoystickEvent, getPosition, 0}},
- {2789, {wxJoystickEvent, getZPosition, 0}},
- {2790, {wxJoystickEvent, isButton, 0}},
- {2791, {wxJoystickEvent, isMove, 0}},
- {2792, {wxJoystickEvent, isZMove, 0}},
- {2793, {wxUpdateUIEvent, canUpdate, 1}},
- {2794, {wxUpdateUIEvent, check, 1}},
- {2795, {wxUpdateUIEvent, enable, 1}},
- {2796, {wxUpdateUIEvent, show, 1}},
- {2797, {wxUpdateUIEvent, getChecked, 0}},
- {2798, {wxUpdateUIEvent, getEnabled, 0}},
- {2799, {wxUpdateUIEvent, getShown, 0}},
- {2800, {wxUpdateUIEvent, getSetChecked, 0}},
- {2801, {wxUpdateUIEvent, getSetEnabled, 0}},
- {2802, {wxUpdateUIEvent, getSetShown, 0}},
- {2803, {wxUpdateUIEvent, getSetText, 0}},
- {2804, {wxUpdateUIEvent, getText, 0}},
- {2805, {wxUpdateUIEvent, getMode, 0}},
- {2806, {wxUpdateUIEvent, getUpdateInterval, 0}},
- {2807, {wxUpdateUIEvent, resetUpdateTime, 0}},
- {2808, {wxUpdateUIEvent, setMode, 1}},
- {2809, {wxUpdateUIEvent, setText, 1}},
- {2810, {wxUpdateUIEvent, setUpdateInterval, 1}},
- {2811, {wxMouseCaptureChangedEvent, getCapturedWindow, 0}},
- {2812, {wxPaletteChangedEvent, setChangedWindow, 1}},
- {2813, {wxPaletteChangedEvent, getChangedWindow, 0}},
- {2814, {wxQueryNewPaletteEvent, setPaletteRealized, 1}},
- {2815, {wxQueryNewPaletteEvent, getPaletteRealized, 0}},
- {2816, {wxNavigationKeyEvent, getDirection, 0}},
- {2817, {wxNavigationKeyEvent, setDirection, 1}},
- {2818, {wxNavigationKeyEvent, isWindowChange, 0}},
- {2819, {wxNavigationKeyEvent, setWindowChange, 1}},
- {2820, {wxNavigationKeyEvent, isFromTab, 0}},
- {2821, {wxNavigationKeyEvent, setFromTab, 1}},
- {2822, {wxNavigationKeyEvent, getCurrentFocus, 0}},
- {2823, {wxNavigationKeyEvent, setCurrentFocus, 1}},
- {2824, {wxHelpEvent, getOrigin, 0}},
- {2825, {wxHelpEvent, getPosition, 0}},
- {2826, {wxHelpEvent, setOrigin, 1}},
- {2827, {wxHelpEvent, setPosition, 1}},
- {2828, {wxContextMenuEvent, getPosition, 0}},
- {2829, {wxContextMenuEvent, setPosition, 1}},
- {2830, {wxIdleEvent, canSend, 1}},
- {2831, {wxIdleEvent, getMode, 0}},
- {2832, {wxIdleEvent, requestMore, 1}},
- {2833, {wxIdleEvent, moreRequested, 0}},
- {2834, {wxIdleEvent, setMode, 1}},
- {2835, {wxGridEvent, altDown, 0}},
- {2836, {wxGridEvent, controlDown, 0}},
- {2837, {wxGridEvent, getCol, 0}},
- {2838, {wxGridEvent, getPosition, 0}},
- {2839, {wxGridEvent, getRow, 0}},
- {2840, {wxGridEvent, metaDown, 0}},
- {2841, {wxGridEvent, selecting, 0}},
- {2842, {wxGridEvent, shiftDown, 0}},
- {2843, {wxNotifyEvent, allow, 0}},
- {2844, {wxNotifyEvent, isAllowed, 0}},
- {2845, {wxNotifyEvent, veto, 0}},
- {2846, {wxSashEvent, getEdge, 0}},
- {2847, {wxSashEvent, getDragRect, 0}},
- {2848, {wxSashEvent, getDragStatus, 0}},
- {2849, {wxListEvent, getCacheFrom, 0}},
- {2850, {wxListEvent, getCacheTo, 0}},
- {2851, {wxListEvent, getKeyCode, 0}},
- {2852, {wxListEvent, getIndex, 0}},
- {2853, {wxListEvent, getColumn, 0}},
- {2854, {wxListEvent, getPoint, 0}},
- {2855, {wxListEvent, getLabel, 0}},
- {2856, {wxListEvent, getText, 0}},
- {2857, {wxListEvent, getImage, 0}},
- {2858, {wxListEvent, getData, 0}},
- {2859, {wxListEvent, getMask, 0}},
- {2860, {wxListEvent, getItem, 0}},
- {2861, {wxListEvent, isEditCancelled, 0}},
- {2862, {wxDateEvent, getDate, 0}},
- {2863, {wxCalendarEvent, getWeekDay, 0}},
- {2864, {wxFileDirPickerEvent, getPath, 0}},
- {2865, {wxColourPickerEvent, getColour, 0}},
- {2866, {wxFontPickerEvent, getFont, 0}},
- {2867, {wxStyledTextEvent, getPosition, 0}},
- {2868, {wxStyledTextEvent, getKey, 0}},
- {2869, {wxStyledTextEvent, getModifiers, 0}},
- {2870, {wxStyledTextEvent, getModificationType, 0}},
- {2871, {wxStyledTextEvent, getText, 0}},
- {2872, {wxStyledTextEvent, getLength, 0}},
- {2873, {wxStyledTextEvent, getLinesAdded, 0}},
- {2874, {wxStyledTextEvent, getLine, 0}},
- {2875, {wxStyledTextEvent, getFoldLevelNow, 0}},
- {2876, {wxStyledTextEvent, getFoldLevelPrev, 0}},
- {2877, {wxStyledTextEvent, getMargin, 0}},
- {2878, {wxStyledTextEvent, getMessage, 0}},
- {2879, {wxStyledTextEvent, getWParam, 0}},
- {2880, {wxStyledTextEvent, getLParam, 0}},
- {2881, {wxStyledTextEvent, getListType, 0}},
- {2882, {wxStyledTextEvent, getX, 0}},
- {2883, {wxStyledTextEvent, getY, 0}},
- {2884, {wxStyledTextEvent, getDragText, 0}},
- {2885, {wxStyledTextEvent, getDragAllowMove, 0}},
- {2886, {wxStyledTextEvent, getDragResult, 0}},
- {2887, {wxStyledTextEvent, getShift, 0}},
- {2888, {wxStyledTextEvent, getControl, 0}},
- {2889, {wxStyledTextEvent, getAlt, 0}},
- {2890, {utils, getKeyState, 1}},
- {2891, {utils, getMousePosition, 2}},
- {2892, {utils, getMouseState, 0}},
- {2893, {utils, setDetectableAutoRepeat, 1}},
- {2894, {utils, bell, 0}},
- {2895, {utils, findMenuItemId, 3}},
- {2896, {utils, genericFindWindowAtPoint, 1}},
- {2897, {utils, findWindowAtPoint, 1}},
- {2898, {utils, beginBusyCursor, 1}},
- {2899, {utils, endBusyCursor, 0}},
- {2900, {utils, isBusy, 0}},
- {2901, {utils, shutdown, 1}},
- {2902, {utils, shell, 1}},
- {2903, {utils, launchDefaultBrowser, 2}},
- {2904, {utils, getEmailAddress, 0}},
- {2905, {utils, getUserId, 0}},
- {2906, {utils, getHomeDir, 0}},
- {2907, {utils, newId, 0}},
- {2908, {utils, registerId, 1}},
- {2909, {utils, getCurrentId, 0}},
- {2910, {utils, getOsDescription, 0}},
- {2911, {utils, isPlatformLittleEndian, 0}},
- {2912, {utils, isPlatform64Bit, 0}},
- {2913, {wxPrintout, new, 1}},
- {2914, {wxPrintout, destruct, 0}},
- {2915, {wxPrintout, getDC, 0}},
- {2916, {wxPrintout, getPageSizeMM, 2}},
- {2917, {wxPrintout, getPageSizePixels, 2}},
- {2918, {wxPrintout, getPaperRectPixels, 0}},
- {2919, {wxPrintout, getPPIPrinter, 2}},
- {2920, {wxPrintout, getPPIScreen, 2}},
- {2921, {wxPrintout, getTitle, 0}},
- {2922, {wxPrintout, isPreview, 0}},
- {2923, {wxPrintout, fitThisSizeToPaper, 1}},
- {2924, {wxPrintout, fitThisSizeToPage, 1}},
- {2925, {wxPrintout, fitThisSizeToPageMargins, 2}},
- {2926, {wxPrintout, mapScreenSizeToPaper, 0}},
- {2927, {wxPrintout, mapScreenSizeToPage, 0}},
- {2928, {wxPrintout, mapScreenSizeToPageMargins, 1}},
- {2929, {wxPrintout, mapScreenSizeToDevice, 0}},
- {2930, {wxPrintout, getLogicalPaperRect, 0}},
- {2931, {wxPrintout, getLogicalPageRect, 0}},
- {2932, {wxPrintout, getLogicalPageMarginsRect, 1}},
- {2933, {wxPrintout, setLogicalOrigin, 2}},
- {2934, {wxPrintout, offsetLogicalOrigin, 2}},
- {2935, {wxStyledTextCtrl, new_2, 2}},
- {2936, {wxStyledTextCtrl, new_0, 0}},
- {2937, {wxStyledTextCtrl, destruct, 0}},
- {2938, {wxStyledTextCtrl, create, 2}},
- {2939, {wxStyledTextCtrl, addText, 1}},
- {2940, {wxStyledTextCtrl, addStyledText, 1}},
- {2941, {wxStyledTextCtrl, insertText, 2}},
- {2942, {wxStyledTextCtrl, clearAll, 0}},
- {2943, {wxStyledTextCtrl, clearDocumentStyle, 0}},
- {2944, {wxStyledTextCtrl, getLength, 0}},
- {2945, {wxStyledTextCtrl, getCharAt, 1}},
- {2946, {wxStyledTextCtrl, getCurrentPos, 0}},
- {2947, {wxStyledTextCtrl, getAnchor, 0}},
- {2948, {wxStyledTextCtrl, getStyleAt, 1}},
- {2949, {wxStyledTextCtrl, redo, 0}},
- {2950, {wxStyledTextCtrl, setUndoCollection, 1}},
- {2951, {wxStyledTextCtrl, selectAll, 0}},
- {2952, {wxStyledTextCtrl, setSavePoint, 0}},
- {2953, {wxStyledTextCtrl, getStyledText, 2}},
- {2954, {wxStyledTextCtrl, canRedo, 0}},
- {2955, {wxStyledTextCtrl, markerLineFromHandle, 1}},
- {2956, {wxStyledTextCtrl, markerDeleteHandle, 1}},
- {2957, {wxStyledTextCtrl, getUndoCollection, 0}},
- {2958, {wxStyledTextCtrl, getViewWhiteSpace, 0}},
- {2959, {wxStyledTextCtrl, setViewWhiteSpace, 1}},
- {2960, {wxStyledTextCtrl, positionFromPoint, 1}},
- {2961, {wxStyledTextCtrl, positionFromPointClose, 2}},
- {2962, {wxStyledTextCtrl, gotoLine, 1}},
- {2963, {wxStyledTextCtrl, gotoPos, 1}},
- {2964, {wxStyledTextCtrl, setAnchor, 1}},
- {2965, {wxStyledTextCtrl, getCurLine, 1}},
- {2966, {wxStyledTextCtrl, getEndStyled, 0}},
- {2967, {wxStyledTextCtrl, convertEOLs, 1}},
- {2968, {wxStyledTextCtrl, getEOLMode, 0}},
- {2969, {wxStyledTextCtrl, setEOLMode, 1}},
- {2970, {wxStyledTextCtrl, startStyling, 2}},
- {2971, {wxStyledTextCtrl, setStyling, 2}},
- {2972, {wxStyledTextCtrl, getBufferedDraw, 0}},
- {2973, {wxStyledTextCtrl, setBufferedDraw, 1}},
- {2974, {wxStyledTextCtrl, setTabWidth, 1}},
- {2975, {wxStyledTextCtrl, getTabWidth, 0}},
- {2976, {wxStyledTextCtrl, setCodePage, 1}},
- {2977, {wxStyledTextCtrl, markerDefine, 3}},
- {2978, {wxStyledTextCtrl, markerSetForeground, 2}},
- {2979, {wxStyledTextCtrl, markerSetBackground, 2}},
- {2980, {wxStyledTextCtrl, markerAdd, 2}},
- {2981, {wxStyledTextCtrl, markerDelete, 2}},
- {2982, {wxStyledTextCtrl, markerDeleteAll, 1}},
- {2983, {wxStyledTextCtrl, markerGet, 1}},
- {2984, {wxStyledTextCtrl, markerNext, 2}},
- {2985, {wxStyledTextCtrl, markerPrevious, 2}},
- {2986, {wxStyledTextCtrl, markerDefineBitmap, 2}},
- {2987, {wxStyledTextCtrl, markerAddSet, 2}},
- {2988, {wxStyledTextCtrl, markerSetAlpha, 2}},
- {2989, {wxStyledTextCtrl, setMarginType, 2}},
- {2990, {wxStyledTextCtrl, getMarginType, 1}},
- {2991, {wxStyledTextCtrl, setMarginWidth, 2}},
- {2992, {wxStyledTextCtrl, getMarginWidth, 1}},
- {2993, {wxStyledTextCtrl, setMarginMask, 2}},
- {2994, {wxStyledTextCtrl, getMarginMask, 1}},
- {2995, {wxStyledTextCtrl, setMarginSensitive, 2}},
- {2996, {wxStyledTextCtrl, getMarginSensitive, 1}},
- {2997, {wxStyledTextCtrl, styleClearAll, 0}},
- {2998, {wxStyledTextCtrl, styleSetForeground, 2}},
- {2999, {wxStyledTextCtrl, styleSetBackground, 2}},
- {3000, {wxStyledTextCtrl, styleSetBold, 2}},
- {3001, {wxStyledTextCtrl, styleSetItalic, 2}},
- {3002, {wxStyledTextCtrl, styleSetSize, 2}},
- {3003, {wxStyledTextCtrl, styleSetFaceName, 2}},
- {3004, {wxStyledTextCtrl, styleSetEOLFilled, 2}},
- {3005, {wxStyledTextCtrl, styleResetDefault, 0}},
- {3006, {wxStyledTextCtrl, styleSetUnderline, 2}},
- {3007, {wxStyledTextCtrl, styleSetCase, 2}},
- {3008, {wxStyledTextCtrl, styleSetHotSpot, 2}},
- {3009, {wxStyledTextCtrl, setSelForeground, 2}},
- {3010, {wxStyledTextCtrl, setSelBackground, 2}},
- {3011, {wxStyledTextCtrl, getSelAlpha, 0}},
- {3012, {wxStyledTextCtrl, setSelAlpha, 1}},
- {3013, {wxStyledTextCtrl, setCaretForeground, 1}},
- {3014, {wxStyledTextCtrl, cmdKeyAssign, 3}},
- {3015, {wxStyledTextCtrl, cmdKeyClear, 2}},
- {3016, {wxStyledTextCtrl, cmdKeyClearAll, 0}},
- {3017, {wxStyledTextCtrl, setStyleBytes, 2}},
- {3018, {wxStyledTextCtrl, styleSetVisible, 2}},
- {3019, {wxStyledTextCtrl, getCaretPeriod, 0}},
- {3020, {wxStyledTextCtrl, setCaretPeriod, 1}},
- {3021, {wxStyledTextCtrl, setWordChars, 1}},
- {3022, {wxStyledTextCtrl, beginUndoAction, 0}},
- {3023, {wxStyledTextCtrl, endUndoAction, 0}},
- {3024, {wxStyledTextCtrl, indicatorSetStyle, 2}},
- {3025, {wxStyledTextCtrl, indicatorGetStyle, 1}},
- {3026, {wxStyledTextCtrl, indicatorSetForeground, 2}},
- {3027, {wxStyledTextCtrl, indicatorGetForeground, 1}},
- {3028, {wxStyledTextCtrl, setWhitespaceForeground, 2}},
- {3029, {wxStyledTextCtrl, setWhitespaceBackground, 2}},
- {3030, {wxStyledTextCtrl, getStyleBits, 0}},
- {3031, {wxStyledTextCtrl, setLineState, 2}},
- {3032, {wxStyledTextCtrl, getLineState, 1}},
- {3033, {wxStyledTextCtrl, getMaxLineState, 0}},
- {3034, {wxStyledTextCtrl, getCaretLineVisible, 0}},
- {3035, {wxStyledTextCtrl, setCaretLineVisible, 1}},
- {3036, {wxStyledTextCtrl, getCaretLineBackground, 0}},
- {3037, {wxStyledTextCtrl, setCaretLineBackground, 1}},
- {3038, {wxStyledTextCtrl, autoCompShow, 2}},
- {3039, {wxStyledTextCtrl, autoCompCancel, 0}},
- {3040, {wxStyledTextCtrl, autoCompActive, 0}},
- {3041, {wxStyledTextCtrl, autoCompPosStart, 0}},
- {3042, {wxStyledTextCtrl, autoCompComplete, 0}},
- {3043, {wxStyledTextCtrl, autoCompStops, 1}},
- {3044, {wxStyledTextCtrl, autoCompSetSeparator, 1}},
- {3045, {wxStyledTextCtrl, autoCompGetSeparator, 0}},
- {3046, {wxStyledTextCtrl, autoCompSelect, 1}},
- {3047, {wxStyledTextCtrl, autoCompSetCancelAtStart, 1}},
- {3048, {wxStyledTextCtrl, autoCompGetCancelAtStart, 0}},
- {3049, {wxStyledTextCtrl, autoCompSetFillUps, 1}},
- {3050, {wxStyledTextCtrl, autoCompSetChooseSingle, 1}},
- {3051, {wxStyledTextCtrl, autoCompGetChooseSingle, 0}},
- {3052, {wxStyledTextCtrl, autoCompSetIgnoreCase, 1}},
- {3053, {wxStyledTextCtrl, autoCompGetIgnoreCase, 0}},
- {3054, {wxStyledTextCtrl, userListShow, 2}},
- {3055, {wxStyledTextCtrl, autoCompSetAutoHide, 1}},
- {3056, {wxStyledTextCtrl, autoCompGetAutoHide, 0}},
- {3057, {wxStyledTextCtrl, autoCompSetDropRestOfWord, 1}},
- {3058, {wxStyledTextCtrl, autoCompGetDropRestOfWord, 0}},
- {3059, {wxStyledTextCtrl, registerImage, 2}},
- {3060, {wxStyledTextCtrl, clearRegisteredImages, 0}},
- {3061, {wxStyledTextCtrl, autoCompGetTypeSeparator, 0}},
- {3062, {wxStyledTextCtrl, autoCompSetTypeSeparator, 1}},
- {3063, {wxStyledTextCtrl, autoCompSetMaxWidth, 1}},
- {3064, {wxStyledTextCtrl, autoCompGetMaxWidth, 0}},
- {3065, {wxStyledTextCtrl, autoCompSetMaxHeight, 1}},
- {3066, {wxStyledTextCtrl, autoCompGetMaxHeight, 0}},
- {3067, {wxStyledTextCtrl, setIndent, 1}},
- {3068, {wxStyledTextCtrl, getIndent, 0}},
- {3069, {wxStyledTextCtrl, setUseTabs, 1}},
- {3070, {wxStyledTextCtrl, getUseTabs, 0}},
- {3071, {wxStyledTextCtrl, setLineIndentation, 2}},
- {3072, {wxStyledTextCtrl, getLineIndentation, 1}},
- {3073, {wxStyledTextCtrl, getLineIndentPosition, 1}},
- {3074, {wxStyledTextCtrl, getColumn, 1}},
- {3075, {wxStyledTextCtrl, setUseHorizontalScrollBar, 1}},
- {3076, {wxStyledTextCtrl, getUseHorizontalScrollBar, 0}},
- {3077, {wxStyledTextCtrl, setIndentationGuides, 1}},
- {3078, {wxStyledTextCtrl, getIndentationGuides, 0}},
- {3079, {wxStyledTextCtrl, setHighlightGuide, 1}},
- {3080, {wxStyledTextCtrl, getHighlightGuide, 0}},
- {3081, {wxStyledTextCtrl, getLineEndPosition, 1}},
- {3082, {wxStyledTextCtrl, getCodePage, 0}},
- {3083, {wxStyledTextCtrl, getCaretForeground, 0}},
- {3084, {wxStyledTextCtrl, getReadOnly, 0}},
- {3085, {wxStyledTextCtrl, setCurrentPos, 1}},
- {3086, {wxStyledTextCtrl, setSelectionStart, 1}},
- {3087, {wxStyledTextCtrl, getSelectionStart, 0}},
- {3088, {wxStyledTextCtrl, setSelectionEnd, 1}},
- {3089, {wxStyledTextCtrl, getSelectionEnd, 0}},
- {3090, {wxStyledTextCtrl, setPrintMagnification, 1}},
- {3091, {wxStyledTextCtrl, getPrintMagnification, 0}},
- {3092, {wxStyledTextCtrl, setPrintColourMode, 1}},
- {3093, {wxStyledTextCtrl, getPrintColourMode, 0}},
- {3094, {wxStyledTextCtrl, findText, 4}},
- {3095, {wxStyledTextCtrl, formatRange, 7}},
- {3096, {wxStyledTextCtrl, getFirstVisibleLine, 0}},
- {3097, {wxStyledTextCtrl, getLine, 1}},
- {3098, {wxStyledTextCtrl, getLineCount, 0}},
- {3099, {wxStyledTextCtrl, setMarginLeft, 1}},
- {3100, {wxStyledTextCtrl, getMarginLeft, 0}},
- {3101, {wxStyledTextCtrl, setMarginRight, 1}},
- {3102, {wxStyledTextCtrl, getMarginRight, 0}},
- {3103, {wxStyledTextCtrl, getModify, 0}},
- {3104, {wxStyledTextCtrl, setSelection, 2}},
- {3105, {wxStyledTextCtrl, getSelectedText, 0}},
- {3106, {wxStyledTextCtrl, getTextRange, 2}},
- {3107, {wxStyledTextCtrl, hideSelection, 1}},
- {3108, {wxStyledTextCtrl, lineFromPosition, 1}},
- {3109, {wxStyledTextCtrl, positionFromLine, 1}},
- {3110, {wxStyledTextCtrl, lineScroll, 2}},
- {3111, {wxStyledTextCtrl, ensureCaretVisible, 0}},
- {3112, {wxStyledTextCtrl, replaceSelection, 1}},
- {3113, {wxStyledTextCtrl, setReadOnly, 1}},
- {3114, {wxStyledTextCtrl, canPaste, 0}},
- {3115, {wxStyledTextCtrl, canUndo, 0}},
- {3116, {wxStyledTextCtrl, emptyUndoBuffer, 0}},
- {3117, {wxStyledTextCtrl, undo, 0}},
- {3118, {wxStyledTextCtrl, cut, 0}},
- {3119, {wxStyledTextCtrl, copy, 0}},
- {3120, {wxStyledTextCtrl, paste, 0}},
- {3121, {wxStyledTextCtrl, clear, 0}},
- {3122, {wxStyledTextCtrl, setText, 1}},
- {3123, {wxStyledTextCtrl, getText, 0}},
- {3124, {wxStyledTextCtrl, getTextLength, 0}},
- {3125, {wxStyledTextCtrl, getOvertype, 0}},
- {3126, {wxStyledTextCtrl, setCaretWidth, 1}},
- {3127, {wxStyledTextCtrl, getCaretWidth, 0}},
- {3128, {wxStyledTextCtrl, setTargetStart, 1}},
- {3129, {wxStyledTextCtrl, getTargetStart, 0}},
- {3130, {wxStyledTextCtrl, setTargetEnd, 1}},
- {3131, {wxStyledTextCtrl, getTargetEnd, 0}},
- {3132, {wxStyledTextCtrl, replaceTarget, 1}},
- {3133, {wxStyledTextCtrl, searchInTarget, 1}},
- {3134, {wxStyledTextCtrl, setSearchFlags, 1}},
- {3135, {wxStyledTextCtrl, getSearchFlags, 0}},
- {3136, {wxStyledTextCtrl, callTipShow, 2}},
- {3137, {wxStyledTextCtrl, callTipCancel, 0}},
- {3138, {wxStyledTextCtrl, callTipActive, 0}},
- {3139, {wxStyledTextCtrl, callTipPosAtStart, 0}},
- {3140, {wxStyledTextCtrl, callTipSetHighlight, 2}},
- {3141, {wxStyledTextCtrl, callTipSetBackground, 1}},
- {3142, {wxStyledTextCtrl, callTipSetForeground, 1}},
- {3143, {wxStyledTextCtrl, callTipSetForegroundHighlight, 1}},
- {3144, {wxStyledTextCtrl, callTipUseStyle, 1}},
- {3145, {wxStyledTextCtrl, visibleFromDocLine, 1}},
- {3146, {wxStyledTextCtrl, docLineFromVisible, 1}},
- {3147, {wxStyledTextCtrl, wrapCount, 1}},
- {3148, {wxStyledTextCtrl, setFoldLevel, 2}},
- {3149, {wxStyledTextCtrl, getFoldLevel, 1}},
- {3150, {wxStyledTextCtrl, getLastChild, 2}},
- {3151, {wxStyledTextCtrl, getFoldParent, 1}},
- {3152, {wxStyledTextCtrl, showLines, 2}},
- {3153, {wxStyledTextCtrl, hideLines, 2}},
- {3154, {wxStyledTextCtrl, getLineVisible, 1}},
- {3155, {wxStyledTextCtrl, setFoldExpanded, 2}},
- {3156, {wxStyledTextCtrl, getFoldExpanded, 1}},
- {3157, {wxStyledTextCtrl, toggleFold, 1}},
- {3158, {wxStyledTextCtrl, ensureVisible, 1}},
- {3159, {wxStyledTextCtrl, setFoldFlags, 1}},
- {3160, {wxStyledTextCtrl, ensureVisibleEnforcePolicy, 1}},
- {3161, {wxStyledTextCtrl, setTabIndents, 1}},
- {3162, {wxStyledTextCtrl, getTabIndents, 0}},
- {3163, {wxStyledTextCtrl, setBackSpaceUnIndents, 1}},
- {3164, {wxStyledTextCtrl, getBackSpaceUnIndents, 0}},
- {3165, {wxStyledTextCtrl, setMouseDwellTime, 1}},
- {3166, {wxStyledTextCtrl, getMouseDwellTime, 0}},
- {3167, {wxStyledTextCtrl, wordStartPosition, 2}},
- {3168, {wxStyledTextCtrl, wordEndPosition, 2}},
- {3169, {wxStyledTextCtrl, setWrapMode, 1}},
- {3170, {wxStyledTextCtrl, getWrapMode, 0}},
- {3171, {wxStyledTextCtrl, setWrapVisualFlags, 1}},
- {3172, {wxStyledTextCtrl, getWrapVisualFlags, 0}},
- {3173, {wxStyledTextCtrl, setWrapVisualFlagsLocation, 1}},
- {3174, {wxStyledTextCtrl, getWrapVisualFlagsLocation, 0}},
- {3175, {wxStyledTextCtrl, setWrapStartIndent, 1}},
- {3176, {wxStyledTextCtrl, getWrapStartIndent, 0}},
- {3177, {wxStyledTextCtrl, setLayoutCache, 1}},
- {3178, {wxStyledTextCtrl, getLayoutCache, 0}},
- {3179, {wxStyledTextCtrl, setScrollWidth, 1}},
- {3180, {wxStyledTextCtrl, getScrollWidth, 0}},
- {3181, {wxStyledTextCtrl, textWidth, 2}},
- {3182, {wxStyledTextCtrl, getEndAtLastLine, 0}},
- {3183, {wxStyledTextCtrl, textHeight, 1}},
- {3184, {wxStyledTextCtrl, setUseVerticalScrollBar, 1}},
- {3185, {wxStyledTextCtrl, getUseVerticalScrollBar, 0}},
- {3186, {wxStyledTextCtrl, appendText, 1}},
- {3187, {wxStyledTextCtrl, getTwoPhaseDraw, 0}},
- {3188, {wxStyledTextCtrl, setTwoPhaseDraw, 1}},
- {3189, {wxStyledTextCtrl, targetFromSelection, 0}},
- {3190, {wxStyledTextCtrl, linesJoin, 0}},
- {3191, {wxStyledTextCtrl, linesSplit, 1}},
- {3192, {wxStyledTextCtrl, setFoldMarginColour, 2}},
- {3193, {wxStyledTextCtrl, setFoldMarginHiColour, 2}},
- {3194, {wxStyledTextCtrl, lineDown, 0}},
- {3195, {wxStyledTextCtrl, lineDownExtend, 0}},
- {3196, {wxStyledTextCtrl, lineUp, 0}},
- {3197, {wxStyledTextCtrl, lineUpExtend, 0}},
- {3198, {wxStyledTextCtrl, charLeft, 0}},
- {3199, {wxStyledTextCtrl, charLeftExtend, 0}},
- {3200, {wxStyledTextCtrl, charRight, 0}},
- {3201, {wxStyledTextCtrl, charRightExtend, 0}},
- {3202, {wxStyledTextCtrl, wordLeft, 0}},
- {3203, {wxStyledTextCtrl, wordLeftExtend, 0}},
- {3204, {wxStyledTextCtrl, wordRight, 0}},
- {3205, {wxStyledTextCtrl, wordRightExtend, 0}},
- {3206, {wxStyledTextCtrl, home, 0}},
- {3207, {wxStyledTextCtrl, homeExtend, 0}},
- {3208, {wxStyledTextCtrl, lineEnd, 0}},
- {3209, {wxStyledTextCtrl, lineEndExtend, 0}},
- {3210, {wxStyledTextCtrl, documentStart, 0}},
- {3211, {wxStyledTextCtrl, documentStartExtend, 0}},
- {3212, {wxStyledTextCtrl, documentEnd, 0}},
- {3213, {wxStyledTextCtrl, documentEndExtend, 0}},
- {3214, {wxStyledTextCtrl, pageUp, 0}},
- {3215, {wxStyledTextCtrl, pageUpExtend, 0}},
- {3216, {wxStyledTextCtrl, pageDown, 0}},
- {3217, {wxStyledTextCtrl, pageDownExtend, 0}},
- {3218, {wxStyledTextCtrl, editToggleOvertype, 0}},
- {3219, {wxStyledTextCtrl, cancel, 0}},
- {3220, {wxStyledTextCtrl, deleteBack, 0}},
- {3221, {wxStyledTextCtrl, tab, 0}},
- {3222, {wxStyledTextCtrl, backTab, 0}},
- {3223, {wxStyledTextCtrl, newLine, 0}},
- {3224, {wxStyledTextCtrl, formFeed, 0}},
- {3225, {wxStyledTextCtrl, vCHome, 0}},
- {3226, {wxStyledTextCtrl, vCHomeExtend, 0}},
- {3227, {wxStyledTextCtrl, zoomIn, 0}},
- {3228, {wxStyledTextCtrl, zoomOut, 0}},
- {3229, {wxStyledTextCtrl, delWordLeft, 0}},
- {3230, {wxStyledTextCtrl, delWordRight, 0}},
- {3231, {wxStyledTextCtrl, lineCut, 0}},
- {3232, {wxStyledTextCtrl, lineDelete, 0}},
- {3233, {wxStyledTextCtrl, lineTranspose, 0}},
- {3234, {wxStyledTextCtrl, lineDuplicate, 0}},
- {3235, {wxStyledTextCtrl, lowerCase, 0}},
- {3236, {wxStyledTextCtrl, upperCase, 0}},
- {3237, {wxStyledTextCtrl, lineScrollDown, 0}},
- {3238, {wxStyledTextCtrl, lineScrollUp, 0}},
- {3239, {wxStyledTextCtrl, deleteBackNotLine, 0}},
- {3240, {wxStyledTextCtrl, homeDisplay, 0}},
- {3241, {wxStyledTextCtrl, homeDisplayExtend, 0}},
- {3242, {wxStyledTextCtrl, lineEndDisplay, 0}},
- {3243, {wxStyledTextCtrl, lineEndDisplayExtend, 0}},
- {3244, {wxStyledTextCtrl, homeWrapExtend, 0}},
- {3245, {wxStyledTextCtrl, lineEndWrap, 0}},
- {3246, {wxStyledTextCtrl, lineEndWrapExtend, 0}},
- {3247, {wxStyledTextCtrl, vCHomeWrap, 0}},
- {3248, {wxStyledTextCtrl, vCHomeWrapExtend, 0}},
- {3249, {wxStyledTextCtrl, lineCopy, 0}},
- {3250, {wxStyledTextCtrl, moveCaretInsideView, 0}},
- {3251, {wxStyledTextCtrl, lineLength, 1}},
- {3252, {wxStyledTextCtrl, braceHighlight, 2}},
- {3253, {wxStyledTextCtrl, braceBadLight, 1}},
- {3254, {wxStyledTextCtrl, braceMatch, 1}},
- {3255, {wxStyledTextCtrl, getViewEOL, 0}},
- {3256, {wxStyledTextCtrl, setViewEOL, 1}},
- {3257, {wxStyledTextCtrl, setModEventMask, 1}},
- {3258, {wxStyledTextCtrl, getEdgeColumn, 0}},
- {3259, {wxStyledTextCtrl, setEdgeColumn, 1}},
- {3260, {wxStyledTextCtrl, getEdgeMode, 0}},
- {3261, {wxStyledTextCtrl, getEdgeColour, 0}},
- {3262, {wxStyledTextCtrl, setEdgeColour, 1}},
- {3263, {wxStyledTextCtrl, searchAnchor, 0}},
- {3264, {wxStyledTextCtrl, searchNext, 2}},
- {3265, {wxStyledTextCtrl, searchPrev, 2}},
- {3266, {wxStyledTextCtrl, linesOnScreen, 0}},
- {3267, {wxStyledTextCtrl, usePopUp, 1}},
- {3268, {wxStyledTextCtrl, selectionIsRectangle, 0}},
- {3269, {wxStyledTextCtrl, setZoom, 1}},
- {3270, {wxStyledTextCtrl, getZoom, 0}},
- {3271, {wxStyledTextCtrl, getModEventMask, 0}},
- {3272, {wxStyledTextCtrl, setSTCFocus, 1}},
- {3273, {wxStyledTextCtrl, getSTCFocus, 0}},
- {3274, {wxStyledTextCtrl, setStatus, 1}},
- {3275, {wxStyledTextCtrl, getStatus, 0}},
- {3276, {wxStyledTextCtrl, setMouseDownCaptures, 1}},
- {3277, {wxStyledTextCtrl, getMouseDownCaptures, 0}},
- {3278, {wxStyledTextCtrl, setSTCCursor, 1}},
- {3279, {wxStyledTextCtrl, getSTCCursor, 0}},
- {3280, {wxStyledTextCtrl, setControlCharSymbol, 1}},
- {3281, {wxStyledTextCtrl, getControlCharSymbol, 0}},
- {3282, {wxStyledTextCtrl, wordPartLeft, 0}},
- {3283, {wxStyledTextCtrl, wordPartLeftExtend, 0}},
- {3284, {wxStyledTextCtrl, wordPartRight, 0}},
- {3285, {wxStyledTextCtrl, wordPartRightExtend, 0}},
- {3286, {wxStyledTextCtrl, setVisiblePolicy, 2}},
- {3287, {wxStyledTextCtrl, delLineLeft, 0}},
- {3288, {wxStyledTextCtrl, delLineRight, 0}},
- {3289, {wxStyledTextCtrl, getXOffset, 0}},
- {3290, {wxStyledTextCtrl, chooseCaretX, 0}},
- {3291, {wxStyledTextCtrl, setXCaretPolicy, 2}},
- {3292, {wxStyledTextCtrl, setYCaretPolicy, 2}},
- {3293, {wxStyledTextCtrl, getPrintWrapMode, 0}},
- {3294, {wxStyledTextCtrl, setHotspotActiveForeground, 2}},
- {3295, {wxStyledTextCtrl, setHotspotActiveBackground, 2}},
- {3296, {wxStyledTextCtrl, setHotspotActiveUnderline, 1}},
- {3297, {wxStyledTextCtrl, setHotspotSingleLine, 1}},
- {3298, {wxStyledTextCtrl, paraDownExtend, 0}},
- {3299, {wxStyledTextCtrl, paraUp, 0}},
- {3300, {wxStyledTextCtrl, paraUpExtend, 0}},
- {3301, {wxStyledTextCtrl, positionBefore, 1}},
- {3302, {wxStyledTextCtrl, positionAfter, 1}},
- {3303, {wxStyledTextCtrl, copyRange, 2}},
- {3304, {wxStyledTextCtrl, copyText, 2}},
- {3305, {wxStyledTextCtrl, setSelectionMode, 1}},
- {3306, {wxStyledTextCtrl, getSelectionMode, 0}},
- {3307, {wxStyledTextCtrl, lineDownRectExtend, 0}},
- {3308, {wxStyledTextCtrl, lineUpRectExtend, 0}},
- {3309, {wxStyledTextCtrl, charLeftRectExtend, 0}},
- {3310, {wxStyledTextCtrl, charRightRectExtend, 0}},
- {3311, {wxStyledTextCtrl, homeRectExtend, 0}},
- {3312, {wxStyledTextCtrl, vCHomeRectExtend, 0}},
- {3313, {wxStyledTextCtrl, lineEndRectExtend, 0}},
- {3314, {wxStyledTextCtrl, pageUpRectExtend, 0}},
- {3315, {wxStyledTextCtrl, pageDownRectExtend, 0}},
- {3316, {wxStyledTextCtrl, stutteredPageUp, 0}},
- {3317, {wxStyledTextCtrl, stutteredPageUpExtend, 0}},
- {3318, {wxStyledTextCtrl, stutteredPageDown, 0}},
- {3319, {wxStyledTextCtrl, stutteredPageDownExtend, 0}},
- {3320, {wxStyledTextCtrl, wordLeftEnd, 0}},
- {3321, {wxStyledTextCtrl, wordLeftEndExtend, 0}},
- {3322, {wxStyledTextCtrl, wordRightEnd, 0}},
- {3323, {wxStyledTextCtrl, wordRightEndExtend, 0}},
- {3324, {wxStyledTextCtrl, setWhitespaceChars, 1}},
- {3325, {wxStyledTextCtrl, setCharsDefault, 0}},
- {3326, {wxStyledTextCtrl, autoCompGetCurrent, 0}},
- {3327, {wxStyledTextCtrl, allocate, 1}},
- {3328, {wxStyledTextCtrl, findColumn, 2}},
- {3329, {wxStyledTextCtrl, getCaretSticky, 0}},
- {3330, {wxStyledTextCtrl, setCaretSticky, 1}},
- {3331, {wxStyledTextCtrl, toggleCaretSticky, 0}},
- {3332, {wxStyledTextCtrl, setPasteConvertEndings, 1}},
- {3333, {wxStyledTextCtrl, getPasteConvertEndings, 0}},
- {3334, {wxStyledTextCtrl, selectionDuplicate, 0}},
- {3335, {wxStyledTextCtrl, setCaretLineBackAlpha, 1}},
- {3336, {wxStyledTextCtrl, getCaretLineBackAlpha, 0}},
- {3337, {wxStyledTextCtrl, startRecord, 0}},
- {3338, {wxStyledTextCtrl, stopRecord, 0}},
- {3339, {wxStyledTextCtrl, setLexer, 1}},
- {3340, {wxStyledTextCtrl, getLexer, 0}},
- {3341, {wxStyledTextCtrl, colourise, 2}},
- {3342, {wxStyledTextCtrl, setProperty, 2}},
- {3343, {wxStyledTextCtrl, setKeyWords, 2}},
- {3344, {wxStyledTextCtrl, setLexerLanguage, 1}},
- {3345, {wxStyledTextCtrl, getProperty, 1}},
- {3346, {wxStyledTextCtrl, getStyleBitsNeeded, 0}},
- {3347, {wxStyledTextCtrl, getCurrentLine, 0}},
- {3348, {wxStyledTextCtrl, styleSetSpec, 2}},
- {3349, {wxStyledTextCtrl, styleSetFont, 2}},
- {3350, {wxStyledTextCtrl, styleSetFontAttr, 7}},
- {3351, {wxStyledTextCtrl, styleSetCharacterSet, 2}},
- {3352, {wxStyledTextCtrl, styleSetFontEncoding, 2}},
- {3353, {wxStyledTextCtrl, cmdKeyExecute, 1}},
- {3354, {wxStyledTextCtrl, setMargins, 2}},
- {3355, {wxStyledTextCtrl, getSelection, 2}},
- {3356, {wxStyledTextCtrl, pointFromPosition, 1}},
- {3357, {wxStyledTextCtrl, scrollToLine, 1}},
- {3358, {wxStyledTextCtrl, scrollToColumn, 1}},
- {3359, {wxStyledTextCtrl, sendMsg, 2}},
- {3360, {wxStyledTextCtrl, setVScrollBar, 1}},
- {3361, {wxStyledTextCtrl, setHScrollBar, 1}},
- {3362, {wxStyledTextCtrl, getLastKeydownProcessed, 0}},
- {3363, {wxStyledTextCtrl, setLastKeydownProcessed, 1}},
- {3364, {wxStyledTextCtrl, saveFile, 1}},
- {3365, {wxStyledTextCtrl, loadFile, 1}},
- {3366, {wxStyledTextCtrl, doDragOver, 3}},
- {3367, {wxStyledTextCtrl, doDropText, 3}},
- {3368, {wxStyledTextCtrl, getUseAntiAliasing, 0}},
- {3369, {wxStyledTextCtrl, addTextRaw, 1}},
- {3370, {wxStyledTextCtrl, insertTextRaw, 2}},
- {3371, {wxStyledTextCtrl, getCurLineRaw, 1}},
- {3372, {wxStyledTextCtrl, getLineRaw, 1}},
- {3373, {wxStyledTextCtrl, getSelectedTextRaw, 0}},
- {3374, {wxStyledTextCtrl, getTextRangeRaw, 2}},
- {3375, {wxStyledTextCtrl, setTextRaw, 1}},
- {3376, {wxStyledTextCtrl, getTextRaw, 0}},
- {3377, {wxStyledTextCtrl, appendTextRaw, 1}},
- {3378, {wxArtProvider, getBitmap, 2}},
- {3379, {wxArtProvider, getIcon, 2}},
- {3380, {wxTreeEvent, getKeyCode, 0}},
- {3381, {wxTreeEvent, getItem, 0}},
- {3382, {wxTreeEvent, getKeyEvent, 0}},
- {3383, {wxTreeEvent, getLabel, 0}},
- {3384, {wxTreeEvent, getOldItem, 0}},
- {3385, {wxTreeEvent, getPoint, 0}},
- {3386, {wxTreeEvent, isEditCancelled, 0}},
- {3387, {wxTreeEvent, setToolTip, 1}},
- {3388, {wxNotebookEvent, getOldSelection, 0}},
- {3389, {wxNotebookEvent, getSelection, 0}},
- {3390, {wxNotebookEvent, setOldSelection, 1}},
- {3391, {wxNotebookEvent, setSelection, 1}},
- {3392, {wxFileDataObject, new, 0}},
- {3393, {wxFileDataObject, addFile, 1}},
- {3394, {wxFileDataObject, getFilenames, 0}},
- {3395, {wxFileDataObject, 'Destroy', undefined}},
- {3396, {wxTextDataObject, new, 1}},
- {3397, {wxTextDataObject, getTextLength, 0}},
- {3398, {wxTextDataObject, getText, 0}},
- {3399, {wxTextDataObject, setText, 1}},
- {3400, {wxTextDataObject, 'Destroy', undefined}},
- {3401, {wxBitmapDataObject, new_1_1, 1}},
- {3402, {wxBitmapDataObject, new_1_0, 1}},
- {3403, {wxBitmapDataObject, getBitmap, 0}},
- {3404, {wxBitmapDataObject, setBitmap, 1}},
- {3405, {wxBitmapDataObject, 'Destroy', undefined}},
- {3407, {wxClipboard, new, 0}},
- {3408, {wxClipboard, destruct, 0}},
- {3409, {wxClipboard, addData, 1}},
- {3410, {wxClipboard, clear, 0}},
- {3411, {wxClipboard, close, 0}},
- {3412, {wxClipboard, flush, 0}},
- {3413, {wxClipboard, getData, 1}},
- {3414, {wxClipboard, isOpened, 0}},
- {3415, {wxClipboard, open, 0}},
- {3416, {wxClipboard, setData, 1}},
- {3418, {wxClipboard, usePrimarySelection, 1}},
- {3419, {wxClipboard, isSupported, 1}},
- {3420, {wxClipboard, get, 0}},
- {3421, {wxSpinEvent, getPosition, 0}},
- {3422, {wxSpinEvent, setPosition, 1}},
- {3423, {wxSplitterWindow, new_0, 0}},
- {3424, {wxSplitterWindow, new_2, 2}},
- {3425, {wxSplitterWindow, destruct, 0}},
- {3426, {wxSplitterWindow, create, 2}},
- {3427, {wxSplitterWindow, getMinimumPaneSize, 0}},
- {3428, {wxSplitterWindow, getSashGravity, 0}},
- {3429, {wxSplitterWindow, getSashPosition, 0}},
- {3430, {wxSplitterWindow, getSplitMode, 0}},
- {3431, {wxSplitterWindow, getWindow1, 0}},
- {3432, {wxSplitterWindow, getWindow2, 0}},
- {3433, {wxSplitterWindow, initialize, 1}},
- {3434, {wxSplitterWindow, isSplit, 0}},
- {3435, {wxSplitterWindow, replaceWindow, 2}},
- {3436, {wxSplitterWindow, setSashGravity, 1}},
- {3437, {wxSplitterWindow, setSashPosition, 2}},
- {3438, {wxSplitterWindow, setSashSize, 1}},
- {3439, {wxSplitterWindow, setMinimumPaneSize, 1}},
- {3440, {wxSplitterWindow, setSplitMode, 1}},
- {3441, {wxSplitterWindow, splitHorizontally, 3}},
- {3442, {wxSplitterWindow, splitVertically, 3}},
- {3443, {wxSplitterWindow, unsplit, 1}},
- {3444, {wxSplitterWindow, updateSize, 0}},
- {3445, {wxSplitterEvent, getSashPosition, 0}},
- {3446, {wxSplitterEvent, getX, 0}},
- {3447, {wxSplitterEvent, getY, 0}},
- {3448, {wxSplitterEvent, getWindowBeingRemoved, 0}},
- {3449, {wxSplitterEvent, setSashPosition, 1}},
- {3450, {wxHtmlWindow, new_0, 0}},
- {3451, {wxHtmlWindow, new_2, 2}},
- {3452, {wxHtmlWindow, appendToPage, 1}},
- {3453, {wxHtmlWindow, getOpenedAnchor, 0}},
- {3454, {wxHtmlWindow, getOpenedPage, 0}},
- {3455, {wxHtmlWindow, getOpenedPageTitle, 0}},
- {3456, {wxHtmlWindow, getRelatedFrame, 0}},
- {3457, {wxHtmlWindow, historyBack, 0}},
- {3458, {wxHtmlWindow, historyCanBack, 0}},
- {3459, {wxHtmlWindow, historyCanForward, 0}},
- {3460, {wxHtmlWindow, historyClear, 0}},
- {3461, {wxHtmlWindow, historyForward, 0}},
- {3462, {wxHtmlWindow, loadFile, 1}},
- {3463, {wxHtmlWindow, loadPage, 1}},
- {3464, {wxHtmlWindow, selectAll, 0}},
- {3465, {wxHtmlWindow, selectionToText, 0}},
- {3466, {wxHtmlWindow, selectLine, 1}},
- {3467, {wxHtmlWindow, selectWord, 1}},
- {3468, {wxHtmlWindow, setBorders, 1}},
- {3469, {wxHtmlWindow, setFonts, 3}},
- {3470, {wxHtmlWindow, setPage, 1}},
- {3471, {wxHtmlWindow, setRelatedFrame, 2}},
- {3472, {wxHtmlWindow, setRelatedStatusBar, 1}},
- {3473, {wxHtmlWindow, toText, 0}},
- {3474, {wxHtmlWindow, 'Destroy', undefined}},
- {3475, {wxHtmlLinkEvent, getLinkInfo, 0}},
- {3476, {wxSystemSettings, getColour, 1}},
- {3477, {wxSystemSettings, getFont, 1}},
- {3478, {wxSystemSettings, getMetric, 2}},
- {3479, {wxSystemSettings, getScreenType, 0}},
- {3480, {wxAuiNotebookEvent, setSelection, 1}},
- {3481, {wxAuiNotebookEvent, getSelection, 0}},
- {3482, {wxAuiNotebookEvent, setOldSelection, 1}},
- {3483, {wxAuiNotebookEvent, getOldSelection, 0}},
- {3484, {wxAuiNotebookEvent, setDragSource, 1}},
- {3485, {wxAuiNotebookEvent, getDragSource, 0}},
- {3486, {wxAuiManagerEvent, setManager, 1}},
- {3487, {wxAuiManagerEvent, getManager, 0}},
- {3488, {wxAuiManagerEvent, setPane, 1}},
- {3489, {wxAuiManagerEvent, getPane, 0}},
- {3490, {wxAuiManagerEvent, setButton, 1}},
- {3491, {wxAuiManagerEvent, getButton, 0}},
- {3492, {wxAuiManagerEvent, setDC, 1}},
- {3493, {wxAuiManagerEvent, getDC, 0}},
- {3494, {wxAuiManagerEvent, veto, 1}},
- {3495, {wxAuiManagerEvent, getVeto, 0}},
- {3496, {wxAuiManagerEvent, setCanVeto, 1}},
- {3497, {wxAuiManagerEvent, canVeto, 0}},
- {3498, {wxLogNull, new, 0}},
- {3499, {wxLogNull, 'Destroy', undefined}},
+ {1757, {wxListItemAttr, new_0, 0}},
+ {1758, {wxListItemAttr, new_3, 3}},
+ {1759, {wxListItemAttr, getBackgroundColour, 0}},
+ {1760, {wxListItemAttr, getFont, 0}},
+ {1761, {wxListItemAttr, getTextColour, 0}},
+ {1762, {wxListItemAttr, hasBackgroundColour, 0}},
+ {1763, {wxListItemAttr, hasFont, 0}},
+ {1764, {wxListItemAttr, hasTextColour, 0}},
+ {1765, {wxListItemAttr, setBackgroundColour, 1}},
+ {1766, {wxListItemAttr, setFont, 1}},
+ {1767, {wxListItemAttr, setTextColour, 1}},
+ {1768, {wxListItemAttr, 'Destroy', undefined}},
+ {1769, {wxImageList, new_0, 0}},
+ {1770, {wxImageList, new_3, 3}},
+ {1771, {wxImageList, add_1, 1}},
+ {1772, {wxImageList, add_2_0, 2}},
+ {1773, {wxImageList, add_2_1, 2}},
+ {1774, {wxImageList, create, 3}},
+ {1776, {wxImageList, draw, 5}},
+ {1777, {wxImageList, getBitmap, 1}},
+ {1778, {wxImageList, getIcon, 1}},
+ {1779, {wxImageList, getImageCount, 0}},
+ {1780, {wxImageList, getSize, 3}},
+ {1781, {wxImageList, remove, 1}},
+ {1782, {wxImageList, removeAll, 0}},
+ {1783, {wxImageList, replace_2, 2}},
+ {1784, {wxImageList, replace_3, 3}},
+ {1785, {wxImageList, 'Destroy', undefined}},
+ {1786, {wxTextAttr, new_0, 0}},
+ {1787, {wxTextAttr, new_2, 2}},
+ {1788, {wxTextAttr, getAlignment, 0}},
+ {1789, {wxTextAttr, getBackgroundColour, 0}},
+ {1790, {wxTextAttr, getFont, 0}},
+ {1791, {wxTextAttr, getLeftIndent, 0}},
+ {1792, {wxTextAttr, getLeftSubIndent, 0}},
+ {1793, {wxTextAttr, getRightIndent, 0}},
+ {1794, {wxTextAttr, getTabs, 0}},
+ {1795, {wxTextAttr, getTextColour, 0}},
+ {1796, {wxTextAttr, hasBackgroundColour, 0}},
+ {1797, {wxTextAttr, hasFont, 0}},
+ {1798, {wxTextAttr, hasTextColour, 0}},
+ {1799, {wxTextAttr, getFlags, 0}},
+ {1800, {wxTextAttr, isDefault, 0}},
+ {1801, {wxTextAttr, setAlignment, 1}},
+ {1802, {wxTextAttr, setBackgroundColour, 1}},
+ {1803, {wxTextAttr, setFlags, 1}},
+ {1804, {wxTextAttr, setFont, 2}},
+ {1805, {wxTextAttr, setLeftIndent, 2}},
+ {1806, {wxTextAttr, setRightIndent, 1}},
+ {1807, {wxTextAttr, setTabs, 1}},
+ {1808, {wxTextAttr, setTextColour, 1}},
+ {1809, {wxTextAttr, 'Destroy', undefined}},
+ {1811, {wxTextCtrl, new_3, 3}},
+ {1812, {wxTextCtrl, new_0, 0}},
+ {1814, {wxTextCtrl, destruct, 0}},
+ {1815, {wxTextCtrl, appendText, 1}},
+ {1816, {wxTextCtrl, canCopy, 0}},
+ {1817, {wxTextCtrl, canCut, 0}},
+ {1818, {wxTextCtrl, canPaste, 0}},
+ {1819, {wxTextCtrl, canRedo, 0}},
+ {1820, {wxTextCtrl, canUndo, 0}},
+ {1821, {wxTextCtrl, clear, 0}},
+ {1822, {wxTextCtrl, copy, 0}},
+ {1823, {wxTextCtrl, create, 3}},
+ {1824, {wxTextCtrl, cut, 0}},
+ {1825, {wxTextCtrl, discardEdits, 0}},
+ {1826, {wxTextCtrl, emulateKeyPress, 1}},
+ {1827, {wxTextCtrl, getDefaultStyle, 0}},
+ {1828, {wxTextCtrl, getInsertionPoint, 0}},
+ {1829, {wxTextCtrl, getLastPosition, 0}},
+ {1830, {wxTextCtrl, getLineLength, 1}},
+ {1831, {wxTextCtrl, getLineText, 1}},
+ {1832, {wxTextCtrl, getNumberOfLines, 0}},
+ {1833, {wxTextCtrl, getRange, 2}},
+ {1834, {wxTextCtrl, getSelection, 2}},
+ {1835, {wxTextCtrl, getStringSelection, 0}},
+ {1836, {wxTextCtrl, getStyle, 2}},
+ {1837, {wxTextCtrl, getValue, 0}},
+ {1838, {wxTextCtrl, isEditable, 0}},
+ {1839, {wxTextCtrl, isModified, 0}},
+ {1840, {wxTextCtrl, isMultiLine, 0}},
+ {1841, {wxTextCtrl, isSingleLine, 0}},
+ {1842, {wxTextCtrl, loadFile, 2}},
+ {1843, {wxTextCtrl, markDirty, 0}},
+ {1844, {wxTextCtrl, paste, 0}},
+ {1845, {wxTextCtrl, positionToXY, 3}},
+ {1846, {wxTextCtrl, redo, 0}},
+ {1847, {wxTextCtrl, remove, 2}},
+ {1848, {wxTextCtrl, replace, 3}},
+ {1849, {wxTextCtrl, saveFile, 1}},
+ {1850, {wxTextCtrl, setDefaultStyle, 1}},
+ {1851, {wxTextCtrl, setEditable, 1}},
+ {1852, {wxTextCtrl, setInsertionPoint, 1}},
+ {1853, {wxTextCtrl, setInsertionPointEnd, 0}},
+ {1855, {wxTextCtrl, setMaxLength, 1}},
+ {1856, {wxTextCtrl, setSelection, 2}},
+ {1857, {wxTextCtrl, setStyle, 3}},
+ {1858, {wxTextCtrl, setValue, 1}},
+ {1859, {wxTextCtrl, showPosition, 1}},
+ {1860, {wxTextCtrl, undo, 0}},
+ {1861, {wxTextCtrl, writeText, 1}},
+ {1862, {wxTextCtrl, xYToPosition, 2}},
+ {1865, {wxNotebook, new_0, 0}},
+ {1866, {wxNotebook, new_3, 3}},
+ {1867, {wxNotebook, destruct, 0}},
+ {1868, {wxNotebook, addPage, 3}},
+ {1869, {wxNotebook, advanceSelection, 1}},
+ {1870, {wxNotebook, assignImageList, 1}},
+ {1871, {wxNotebook, create, 3}},
+ {1872, {wxNotebook, deleteAllPages, 0}},
+ {1873, {wxNotebook, deletePage, 1}},
+ {1874, {wxNotebook, removePage, 1}},
+ {1875, {wxNotebook, getCurrentPage, 0}},
+ {1876, {wxNotebook, getImageList, 0}},
+ {1878, {wxNotebook, getPage, 1}},
+ {1879, {wxNotebook, getPageCount, 0}},
+ {1880, {wxNotebook, getPageImage, 1}},
+ {1881, {wxNotebook, getPageText, 1}},
+ {1882, {wxNotebook, getRowCount, 0}},
+ {1883, {wxNotebook, getSelection, 0}},
+ {1884, {wxNotebook, getThemeBackgroundColour, 0}},
+ {1886, {wxNotebook, hitTest, 2}},
+ {1888, {wxNotebook, insertPage, 4}},
+ {1889, {wxNotebook, setImageList, 1}},
+ {1890, {wxNotebook, setPadding, 1}},
+ {1891, {wxNotebook, setPageSize, 1}},
+ {1892, {wxNotebook, setPageImage, 2}},
+ {1893, {wxNotebook, setPageText, 2}},
+ {1894, {wxNotebook, setSelection, 1}},
+ {1895, {wxNotebook, changeSelection, 1}},
+ {1896, {wxChoicebook, new_0, 0}},
+ {1897, {wxChoicebook, new_3, 3}},
+ {1898, {wxChoicebook, addPage, 3}},
+ {1899, {wxChoicebook, advanceSelection, 1}},
+ {1900, {wxChoicebook, assignImageList, 1}},
+ {1901, {wxChoicebook, create, 3}},
+ {1902, {wxChoicebook, deleteAllPages, 0}},
+ {1903, {wxChoicebook, deletePage, 1}},
+ {1904, {wxChoicebook, removePage, 1}},
+ {1905, {wxChoicebook, getCurrentPage, 0}},
+ {1906, {wxChoicebook, getImageList, 0}},
+ {1908, {wxChoicebook, getPage, 1}},
+ {1909, {wxChoicebook, getPageCount, 0}},
+ {1910, {wxChoicebook, getPageImage, 1}},
+ {1911, {wxChoicebook, getPageText, 1}},
+ {1912, {wxChoicebook, getSelection, 0}},
+ {1913, {wxChoicebook, hitTest, 2}},
+ {1914, {wxChoicebook, insertPage, 4}},
+ {1915, {wxChoicebook, setImageList, 1}},
+ {1916, {wxChoicebook, setPageSize, 1}},
+ {1917, {wxChoicebook, setPageImage, 2}},
+ {1918, {wxChoicebook, setPageText, 2}},
+ {1919, {wxChoicebook, setSelection, 1}},
+ {1920, {wxChoicebook, changeSelection, 1}},
+ {1921, {wxChoicebook, 'Destroy', undefined}},
+ {1922, {wxToolbook, new_0, 0}},
+ {1923, {wxToolbook, new_3, 3}},
+ {1924, {wxToolbook, addPage, 3}},
+ {1925, {wxToolbook, advanceSelection, 1}},
+ {1926, {wxToolbook, assignImageList, 1}},
+ {1927, {wxToolbook, create, 3}},
+ {1928, {wxToolbook, deleteAllPages, 0}},
+ {1929, {wxToolbook, deletePage, 1}},
+ {1930, {wxToolbook, removePage, 1}},
+ {1931, {wxToolbook, getCurrentPage, 0}},
+ {1932, {wxToolbook, getImageList, 0}},
+ {1934, {wxToolbook, getPage, 1}},
+ {1935, {wxToolbook, getPageCount, 0}},
+ {1936, {wxToolbook, getPageImage, 1}},
+ {1937, {wxToolbook, getPageText, 1}},
+ {1938, {wxToolbook, getSelection, 0}},
+ {1940, {wxToolbook, hitTest, 2}},
+ {1941, {wxToolbook, insertPage, 4}},
+ {1942, {wxToolbook, setImageList, 1}},
+ {1943, {wxToolbook, setPageSize, 1}},
+ {1944, {wxToolbook, setPageImage, 2}},
+ {1945, {wxToolbook, setPageText, 2}},
+ {1946, {wxToolbook, setSelection, 1}},
+ {1947, {wxToolbook, changeSelection, 1}},
+ {1948, {wxToolbook, 'Destroy', undefined}},
+ {1949, {wxListbook, new_0, 0}},
+ {1950, {wxListbook, new_3, 3}},
+ {1951, {wxListbook, addPage, 3}},
+ {1952, {wxListbook, advanceSelection, 1}},
+ {1953, {wxListbook, assignImageList, 1}},
+ {1954, {wxListbook, create, 3}},
+ {1955, {wxListbook, deleteAllPages, 0}},
+ {1956, {wxListbook, deletePage, 1}},
+ {1957, {wxListbook, removePage, 1}},
+ {1958, {wxListbook, getCurrentPage, 0}},
+ {1959, {wxListbook, getImageList, 0}},
+ {1961, {wxListbook, getPage, 1}},
+ {1962, {wxListbook, getPageCount, 0}},
+ {1963, {wxListbook, getPageImage, 1}},
+ {1964, {wxListbook, getPageText, 1}},
+ {1965, {wxListbook, getSelection, 0}},
+ {1967, {wxListbook, hitTest, 2}},
+ {1968, {wxListbook, insertPage, 4}},
+ {1969, {wxListbook, setImageList, 1}},
+ {1970, {wxListbook, setPageSize, 1}},
+ {1971, {wxListbook, setPageImage, 2}},
+ {1972, {wxListbook, setPageText, 2}},
+ {1973, {wxListbook, setSelection, 1}},
+ {1974, {wxListbook, changeSelection, 1}},
+ {1975, {wxListbook, 'Destroy', undefined}},
+ {1976, {wxTreebook, new_0, 0}},
+ {1977, {wxTreebook, new_3, 3}},
+ {1978, {wxTreebook, addPage, 3}},
+ {1979, {wxTreebook, advanceSelection, 1}},
+ {1980, {wxTreebook, assignImageList, 1}},
+ {1981, {wxTreebook, create, 3}},
+ {1982, {wxTreebook, deleteAllPages, 0}},
+ {1983, {wxTreebook, deletePage, 1}},
+ {1984, {wxTreebook, removePage, 1}},
+ {1985, {wxTreebook, getCurrentPage, 0}},
+ {1986, {wxTreebook, getImageList, 0}},
+ {1988, {wxTreebook, getPage, 1}},
+ {1989, {wxTreebook, getPageCount, 0}},
+ {1990, {wxTreebook, getPageImage, 1}},
+ {1991, {wxTreebook, getPageText, 1}},
+ {1992, {wxTreebook, getSelection, 0}},
+ {1993, {wxTreebook, expandNode, 2}},
+ {1994, {wxTreebook, isNodeExpanded, 1}},
+ {1996, {wxTreebook, hitTest, 2}},
+ {1997, {wxTreebook, insertPage, 4}},
+ {1998, {wxTreebook, insertSubPage, 4}},
+ {1999, {wxTreebook, setImageList, 1}},
+ {2000, {wxTreebook, setPageSize, 1}},
+ {2001, {wxTreebook, setPageImage, 2}},
+ {2002, {wxTreebook, setPageText, 2}},
+ {2003, {wxTreebook, setSelection, 1}},
+ {2004, {wxTreebook, changeSelection, 1}},
+ {2005, {wxTreebook, 'Destroy', undefined}},
+ {2008, {wxTreeCtrl, new_2, 2}},
+ {2009, {wxTreeCtrl, new_0, 0}},
+ {2011, {wxTreeCtrl, destruct, 0}},
+ {2012, {wxTreeCtrl, addRoot, 2}},
+ {2013, {wxTreeCtrl, appendItem, 3}},
+ {2014, {wxTreeCtrl, assignImageList, 1}},
+ {2015, {wxTreeCtrl, assignStateImageList, 1}},
+ {2016, {wxTreeCtrl, collapse, 1}},
+ {2017, {wxTreeCtrl, collapseAndReset, 1}},
+ {2018, {wxTreeCtrl, create, 2}},
+ {2019, {wxTreeCtrl, delete, 1}},
+ {2020, {wxTreeCtrl, deleteAllItems, 0}},
+ {2021, {wxTreeCtrl, deleteChildren, 1}},
+ {2022, {wxTreeCtrl, editLabel, 1}},
+ {2023, {wxTreeCtrl, ensureVisible, 1}},
+ {2024, {wxTreeCtrl, expand, 1}},
+ {2025, {wxTreeCtrl, getBoundingRect, 3}},
+ {2027, {wxTreeCtrl, getChildrenCount, 2}},
+ {2028, {wxTreeCtrl, getCount, 0}},
+ {2029, {wxTreeCtrl, getEditControl, 0}},
+ {2030, {wxTreeCtrl, getFirstChild, 2}},
+ {2031, {wxTreeCtrl, getNextChild, 2}},
+ {2032, {wxTreeCtrl, getFirstVisibleItem, 0}},
+ {2033, {wxTreeCtrl, getImageList, 0}},
+ {2034, {wxTreeCtrl, getIndent, 0}},
+ {2035, {wxTreeCtrl, getItemBackgroundColour, 1}},
+ {2036, {wxTreeCtrl, getItemData, 1}},
+ {2037, {wxTreeCtrl, getItemFont, 1}},
+ {2038, {wxTreeCtrl, getItemImage_1, 1}},
+ {2039, {wxTreeCtrl, getItemImage_2, 2}},
+ {2040, {wxTreeCtrl, getItemText, 1}},
+ {2041, {wxTreeCtrl, getItemTextColour, 1}},
+ {2042, {wxTreeCtrl, getLastChild, 1}},
+ {2043, {wxTreeCtrl, getNextSibling, 1}},
+ {2044, {wxTreeCtrl, getNextVisible, 1}},
+ {2045, {wxTreeCtrl, getItemParent, 1}},
+ {2046, {wxTreeCtrl, getPrevSibling, 1}},
+ {2047, {wxTreeCtrl, getPrevVisible, 1}},
+ {2048, {wxTreeCtrl, getRootItem, 0}},
+ {2049, {wxTreeCtrl, getSelection, 0}},
+ {2050, {wxTreeCtrl, getSelections, 1}},
+ {2051, {wxTreeCtrl, getStateImageList, 0}},
+ {2052, {wxTreeCtrl, hitTest, 1}},
+ {2054, {wxTreeCtrl, insertItem, 4}},
+ {2055, {wxTreeCtrl, isBold, 1}},
+ {2056, {wxTreeCtrl, isExpanded, 1}},
+ {2057, {wxTreeCtrl, isSelected, 1}},
+ {2058, {wxTreeCtrl, isVisible, 1}},
+ {2059, {wxTreeCtrl, itemHasChildren, 1}},
+ {2060, {wxTreeCtrl, prependItem, 3}},
+ {2061, {wxTreeCtrl, scrollTo, 1}},
+ {2062, {wxTreeCtrl, selectItem_1, 1}},
+ {2063, {wxTreeCtrl, selectItem_2, 2}},
+ {2064, {wxTreeCtrl, setIndent, 1}},
+ {2065, {wxTreeCtrl, setImageList, 1}},
+ {2066, {wxTreeCtrl, setItemBackgroundColour, 2}},
+ {2067, {wxTreeCtrl, setItemBold, 2}},
+ {2068, {wxTreeCtrl, setItemData, 2}},
+ {2069, {wxTreeCtrl, setItemDropHighlight, 2}},
+ {2070, {wxTreeCtrl, setItemFont, 2}},
+ {2071, {wxTreeCtrl, setItemHasChildren, 2}},
+ {2072, {wxTreeCtrl, setItemImage_2, 2}},
+ {2073, {wxTreeCtrl, setItemImage_3, 3}},
+ {2074, {wxTreeCtrl, setItemText, 2}},
+ {2075, {wxTreeCtrl, setItemTextColour, 2}},
+ {2076, {wxTreeCtrl, setStateImageList, 1}},
+ {2077, {wxTreeCtrl, setWindowStyle, 1}},
+ {2078, {wxTreeCtrl, sortChildren, 1}},
+ {2079, {wxTreeCtrl, toggle, 1}},
+ {2080, {wxTreeCtrl, toggleItemSelection, 1}},
+ {2081, {wxTreeCtrl, unselect, 0}},
+ {2082, {wxTreeCtrl, unselectAll, 0}},
+ {2083, {wxTreeCtrl, unselectItem, 1}},
+ {2084, {wxScrollBar, new_0, 0}},
+ {2085, {wxScrollBar, new_3, 3}},
+ {2086, {wxScrollBar, destruct, 0}},
+ {2087, {wxScrollBar, create, 3}},
+ {2088, {wxScrollBar, getRange, 0}},
+ {2089, {wxScrollBar, getPageSize, 0}},
+ {2090, {wxScrollBar, getThumbPosition, 0}},
+ {2091, {wxScrollBar, getThumbSize, 0}},
+ {2092, {wxScrollBar, setThumbPosition, 1}},
+ {2093, {wxScrollBar, setScrollbar, 5}},
+ {2095, {wxSpinButton, new_2, 2}},
+ {2096, {wxSpinButton, new_0, 0}},
+ {2097, {wxSpinButton, create, 2}},
+ {2098, {wxSpinButton, getMax, 0}},
+ {2099, {wxSpinButton, getMin, 0}},
+ {2100, {wxSpinButton, getValue, 0}},
+ {2101, {wxSpinButton, setRange, 2}},
+ {2102, {wxSpinButton, setValue, 1}},
+ {2103, {wxSpinButton, 'Destroy', undefined}},
+ {2104, {wxSpinCtrl, new_0, 0}},
+ {2105, {wxSpinCtrl, new_2, 2}},
+ {2107, {wxSpinCtrl, create, 2}},
+ {2110, {wxSpinCtrl, setValue_1_1, 1}},
+ {2111, {wxSpinCtrl, setValue_1_0, 1}},
+ {2113, {wxSpinCtrl, getValue, 0}},
+ {2115, {wxSpinCtrl, setRange, 2}},
+ {2116, {wxSpinCtrl, setSelection, 2}},
+ {2118, {wxSpinCtrl, getMin, 0}},
+ {2120, {wxSpinCtrl, getMax, 0}},
+ {2121, {wxSpinCtrl, 'Destroy', undefined}},
+ {2122, {wxStaticText, new_0, 0}},
+ {2123, {wxStaticText, new_4, 4}},
+ {2124, {wxStaticText, create, 4}},
+ {2125, {wxStaticText, getLabel, 0}},
+ {2126, {wxStaticText, setLabel, 1}},
+ {2127, {wxStaticText, wrap, 1}},
+ {2128, {wxStaticText, 'Destroy', undefined}},
+ {2129, {wxStaticBitmap, new_0, 0}},
+ {2130, {wxStaticBitmap, new_4, 4}},
+ {2131, {wxStaticBitmap, create, 4}},
+ {2132, {wxStaticBitmap, getBitmap, 0}},
+ {2133, {wxStaticBitmap, setBitmap, 1}},
+ {2134, {wxStaticBitmap, 'Destroy', undefined}},
+ {2135, {wxRadioBox, new, 7}},
+ {2137, {wxRadioBox, destruct, 0}},
+ {2138, {wxRadioBox, create, 7}},
+ {2139, {wxRadioBox, enable_2, 2}},
+ {2140, {wxRadioBox, enable_1, 1}},
+ {2141, {wxRadioBox, getSelection, 0}},
+ {2142, {wxRadioBox, getString, 1}},
+ {2143, {wxRadioBox, setSelection, 1}},
+ {2144, {wxRadioBox, show_2, 2}},
+ {2145, {wxRadioBox, show_1, 1}},
+ {2146, {wxRadioBox, getColumnCount, 0}},
+ {2147, {wxRadioBox, getItemHelpText, 1}},
+ {2148, {wxRadioBox, getItemToolTip, 1}},
+ {2150, {wxRadioBox, getItemFromPoint, 1}},
+ {2151, {wxRadioBox, getRowCount, 0}},
+ {2152, {wxRadioBox, isItemEnabled, 1}},
+ {2153, {wxRadioBox, isItemShown, 1}},
+ {2154, {wxRadioBox, setItemHelpText, 2}},
+ {2155, {wxRadioBox, setItemToolTip, 2}},
+ {2156, {wxRadioButton, new_0, 0}},
+ {2157, {wxRadioButton, new_4, 4}},
+ {2158, {wxRadioButton, create, 4}},
+ {2159, {wxRadioButton, getValue, 0}},
+ {2160, {wxRadioButton, setValue, 1}},
+ {2161, {wxRadioButton, 'Destroy', undefined}},
+ {2163, {wxSlider, new_6, 6}},
+ {2164, {wxSlider, new_0, 0}},
+ {2165, {wxSlider, create, 6}},
+ {2166, {wxSlider, getLineSize, 0}},
+ {2167, {wxSlider, getMax, 0}},
+ {2168, {wxSlider, getMin, 0}},
+ {2169, {wxSlider, getPageSize, 0}},
+ {2170, {wxSlider, getThumbLength, 0}},
+ {2171, {wxSlider, getValue, 0}},
+ {2172, {wxSlider, setLineSize, 1}},
+ {2173, {wxSlider, setPageSize, 1}},
+ {2174, {wxSlider, setRange, 2}},
+ {2175, {wxSlider, setThumbLength, 1}},
+ {2176, {wxSlider, setValue, 1}},
+ {2177, {wxSlider, 'Destroy', undefined}},
+ {2179, {wxDialog, new_4, 4}},
+ {2180, {wxDialog, new_0, 0}},
+ {2182, {wxDialog, destruct, 0}},
+ {2183, {wxDialog, create, 4}},
+ {2184, {wxDialog, createButtonSizer, 1}},
+ {2185, {wxDialog, createStdDialogButtonSizer, 1}},
+ {2186, {wxDialog, endModal, 1}},
+ {2187, {wxDialog, getAffirmativeId, 0}},
+ {2188, {wxDialog, getReturnCode, 0}},
+ {2189, {wxDialog, isModal, 0}},
+ {2190, {wxDialog, setAffirmativeId, 1}},
+ {2191, {wxDialog, setReturnCode, 1}},
+ {2192, {wxDialog, show, 1}},
+ {2193, {wxDialog, showModal, 0}},
+ {2194, {wxColourDialog, new_0, 0}},
+ {2195, {wxColourDialog, new_2, 2}},
+ {2196, {wxColourDialog, destruct, 0}},
+ {2197, {wxColourDialog, create, 2}},
+ {2198, {wxColourDialog, getColourData, 0}},
+ {2199, {wxColourData, new_0, 0}},
+ {2200, {wxColourData, new_1, 1}},
+ {2201, {wxColourData, destruct, 0}},
+ {2202, {wxColourData, getChooseFull, 0}},
+ {2203, {wxColourData, getColour, 0}},
+ {2205, {wxColourData, getCustomColour, 1}},
+ {2206, {wxColourData, setChooseFull, 1}},
+ {2207, {wxColourData, setColour, 1}},
+ {2208, {wxColourData, setCustomColour, 2}},
+ {2209, {wxPalette, new_0, 0}},
+ {2210, {wxPalette, new_4, 4}},
+ {2212, {wxPalette, destruct, 0}},
+ {2213, {wxPalette, create, 4}},
+ {2214, {wxPalette, getColoursCount, 0}},
+ {2215, {wxPalette, getPixel, 3}},
+ {2216, {wxPalette, getRGB, 4}},
+ {2217, {wxPalette, isOk, 0}},
+ {2221, {wxDirDialog, new, 2}},
+ {2222, {wxDirDialog, destruct, 0}},
+ {2223, {wxDirDialog, getPath, 0}},
+ {2224, {wxDirDialog, getMessage, 0}},
+ {2225, {wxDirDialog, setMessage, 1}},
+ {2226, {wxDirDialog, setPath, 1}},
+ {2230, {wxFileDialog, new, 2}},
+ {2231, {wxFileDialog, destruct, 0}},
+ {2232, {wxFileDialog, getDirectory, 0}},
+ {2233, {wxFileDialog, getFilename, 0}},
+ {2234, {wxFileDialog, getFilenames, 1}},
+ {2235, {wxFileDialog, getFilterIndex, 0}},
+ {2236, {wxFileDialog, getMessage, 0}},
+ {2237, {wxFileDialog, getPath, 0}},
+ {2238, {wxFileDialog, getPaths, 1}},
+ {2239, {wxFileDialog, getWildcard, 0}},
+ {2240, {wxFileDialog, setDirectory, 1}},
+ {2241, {wxFileDialog, setFilename, 1}},
+ {2242, {wxFileDialog, setFilterIndex, 1}},
+ {2243, {wxFileDialog, setMessage, 1}},
+ {2244, {wxFileDialog, setPath, 1}},
+ {2245, {wxFileDialog, setWildcard, 1}},
+ {2246, {wxPickerBase, setInternalMargin, 1}},
+ {2247, {wxPickerBase, getInternalMargin, 0}},
+ {2248, {wxPickerBase, setTextCtrlProportion, 1}},
+ {2249, {wxPickerBase, setPickerCtrlProportion, 1}},
+ {2250, {wxPickerBase, getTextCtrlProportion, 0}},
+ {2251, {wxPickerBase, getPickerCtrlProportion, 0}},
+ {2252, {wxPickerBase, hasTextCtrl, 0}},
+ {2253, {wxPickerBase, getTextCtrl, 0}},
+ {2254, {wxPickerBase, isTextCtrlGrowable, 0}},
+ {2255, {wxPickerBase, setPickerCtrlGrowable, 1}},
+ {2256, {wxPickerBase, setTextCtrlGrowable, 1}},
+ {2257, {wxPickerBase, isPickerCtrlGrowable, 0}},
+ {2258, {wxFilePickerCtrl, new_0, 0}},
+ {2259, {wxFilePickerCtrl, new_3, 3}},
+ {2260, {wxFilePickerCtrl, create, 3}},
+ {2261, {wxFilePickerCtrl, getPath, 0}},
+ {2262, {wxFilePickerCtrl, setPath, 1}},
+ {2263, {wxFilePickerCtrl, 'Destroy', undefined}},
+ {2264, {wxDirPickerCtrl, new_0, 0}},
+ {2265, {wxDirPickerCtrl, new_3, 3}},
+ {2266, {wxDirPickerCtrl, create, 3}},
+ {2267, {wxDirPickerCtrl, getPath, 0}},
+ {2268, {wxDirPickerCtrl, setPath, 1}},
+ {2269, {wxDirPickerCtrl, 'Destroy', undefined}},
+ {2270, {wxColourPickerCtrl, new_0, 0}},
+ {2271, {wxColourPickerCtrl, new_3, 3}},
+ {2272, {wxColourPickerCtrl, create, 3}},
+ {2273, {wxColourPickerCtrl, getColour, 0}},
+ {2274, {wxColourPickerCtrl, setColour_1_1, 1}},
+ {2275, {wxColourPickerCtrl, setColour_1_0, 1}},
+ {2276, {wxColourPickerCtrl, 'Destroy', undefined}},
+ {2277, {wxDatePickerCtrl, new_0, 0}},
+ {2278, {wxDatePickerCtrl, new_3, 3}},
+ {2279, {wxDatePickerCtrl, getRange, 2}},
+ {2280, {wxDatePickerCtrl, getValue, 0}},
+ {2281, {wxDatePickerCtrl, setRange, 2}},
+ {2282, {wxDatePickerCtrl, setValue, 1}},
+ {2283, {wxDatePickerCtrl, 'Destroy', undefined}},
+ {2284, {wxFontPickerCtrl, new_0, 0}},
+ {2285, {wxFontPickerCtrl, new_3, 3}},
+ {2286, {wxFontPickerCtrl, create, 3}},
+ {2287, {wxFontPickerCtrl, getSelectedFont, 0}},
+ {2288, {wxFontPickerCtrl, setSelectedFont, 1}},
+ {2289, {wxFontPickerCtrl, getMaxPointSize, 0}},
+ {2290, {wxFontPickerCtrl, setMaxPointSize, 1}},
+ {2291, {wxFontPickerCtrl, 'Destroy', undefined}},
+ {2294, {wxFindReplaceDialog, new_0, 0}},
+ {2295, {wxFindReplaceDialog, new_4, 4}},
+ {2296, {wxFindReplaceDialog, destruct, 0}},
+ {2297, {wxFindReplaceDialog, create, 4}},
+ {2298, {wxFindReplaceDialog, getData, 0}},
+ {2299, {wxFindReplaceData, new_0, 0}},
+ {2300, {wxFindReplaceData, new_1, 1}},
+ {2301, {wxFindReplaceData, getFindString, 0}},
+ {2302, {wxFindReplaceData, getReplaceString, 0}},
+ {2303, {wxFindReplaceData, getFlags, 0}},
+ {2304, {wxFindReplaceData, setFlags, 1}},
+ {2305, {wxFindReplaceData, setFindString, 1}},
+ {2306, {wxFindReplaceData, setReplaceString, 1}},
+ {2307, {wxFindReplaceData, 'Destroy', undefined}},
+ {2308, {wxMultiChoiceDialog, new_0, 0}},
+ {2310, {wxMultiChoiceDialog, new_5, 5}},
+ {2311, {wxMultiChoiceDialog, getSelections, 0}},
+ {2312, {wxMultiChoiceDialog, setSelections, 1}},
+ {2313, {wxMultiChoiceDialog, 'Destroy', undefined}},
+ {2314, {wxSingleChoiceDialog, new_0, 0}},
+ {2316, {wxSingleChoiceDialog, new_5, 5}},
+ {2317, {wxSingleChoiceDialog, getSelection, 0}},
+ {2318, {wxSingleChoiceDialog, getStringSelection, 0}},
+ {2319, {wxSingleChoiceDialog, setSelection, 1}},
+ {2320, {wxSingleChoiceDialog, 'Destroy', undefined}},
+ {2321, {wxTextEntryDialog, new, 3}},
+ {2322, {wxTextEntryDialog, getValue, 0}},
+ {2323, {wxTextEntryDialog, setValue, 1}},
+ {2324, {wxTextEntryDialog, 'Destroy', undefined}},
+ {2325, {wxPasswordEntryDialog, new, 3}},
+ {2326, {wxPasswordEntryDialog, 'Destroy', undefined}},
+ {2327, {wxFontData, new_0, 0}},
+ {2328, {wxFontData, new_1, 1}},
+ {2329, {wxFontData, destruct, 0}},
+ {2330, {wxFontData, enableEffects, 1}},
+ {2331, {wxFontData, getAllowSymbols, 0}},
+ {2332, {wxFontData, getColour, 0}},
+ {2333, {wxFontData, getChosenFont, 0}},
+ {2334, {wxFontData, getEnableEffects, 0}},
+ {2335, {wxFontData, getInitialFont, 0}},
+ {2336, {wxFontData, getShowHelp, 0}},
+ {2337, {wxFontData, setAllowSymbols, 1}},
+ {2338, {wxFontData, setChosenFont, 1}},
+ {2339, {wxFontData, setColour, 1}},
+ {2340, {wxFontData, setInitialFont, 1}},
+ {2341, {wxFontData, setRange, 2}},
+ {2342, {wxFontData, setShowHelp, 1}},
+ {2346, {wxFontDialog, new_0, 0}},
+ {2348, {wxFontDialog, new_2, 2}},
+ {2350, {wxFontDialog, create, 2}},
+ {2351, {wxFontDialog, getFontData, 0}},
+ {2353, {wxFontDialog, 'Destroy', undefined}},
+ {2354, {wxProgressDialog, new, 3}},
+ {2355, {wxProgressDialog, destruct, 0}},
+ {2356, {wxProgressDialog, resume, 0}},
+ {2357, {wxProgressDialog, update_2, 2}},
+ {2358, {wxProgressDialog, update_0, 0}},
+ {2359, {wxMessageDialog, new, 3}},
+ {2360, {wxMessageDialog, destruct, 0}},
+ {2361, {wxPageSetupDialog, new, 2}},
+ {2362, {wxPageSetupDialog, destruct, 0}},
+ {2363, {wxPageSetupDialog, getPageSetupData, 0}},
+ {2364, {wxPageSetupDialog, showModal, 0}},
+ {2365, {wxPageSetupDialogData, new_0, 0}},
+ {2366, {wxPageSetupDialogData, new_1_0, 1}},
+ {2367, {wxPageSetupDialogData, new_1_1, 1}},
+ {2368, {wxPageSetupDialogData, destruct, 0}},
+ {2369, {wxPageSetupDialogData, enableHelp, 1}},
+ {2370, {wxPageSetupDialogData, enableMargins, 1}},
+ {2371, {wxPageSetupDialogData, enableOrientation, 1}},
+ {2372, {wxPageSetupDialogData, enablePaper, 1}},
+ {2373, {wxPageSetupDialogData, enablePrinter, 1}},
+ {2374, {wxPageSetupDialogData, getDefaultMinMargins, 0}},
+ {2375, {wxPageSetupDialogData, getEnableMargins, 0}},
+ {2376, {wxPageSetupDialogData, getEnableOrientation, 0}},
+ {2377, {wxPageSetupDialogData, getEnablePaper, 0}},
+ {2378, {wxPageSetupDialogData, getEnablePrinter, 0}},
+ {2379, {wxPageSetupDialogData, getEnableHelp, 0}},
+ {2380, {wxPageSetupDialogData, getDefaultInfo, 0}},
+ {2381, {wxPageSetupDialogData, getMarginTopLeft, 0}},
+ {2382, {wxPageSetupDialogData, getMarginBottomRight, 0}},
+ {2383, {wxPageSetupDialogData, getMinMarginTopLeft, 0}},
+ {2384, {wxPageSetupDialogData, getMinMarginBottomRight, 0}},
+ {2385, {wxPageSetupDialogData, getPaperId, 0}},
+ {2386, {wxPageSetupDialogData, getPaperSize, 0}},
+ {2388, {wxPageSetupDialogData, getPrintData, 0}},
+ {2389, {wxPageSetupDialogData, isOk, 0}},
+ {2390, {wxPageSetupDialogData, setDefaultInfo, 1}},
+ {2391, {wxPageSetupDialogData, setDefaultMinMargins, 1}},
+ {2392, {wxPageSetupDialogData, setMarginTopLeft, 1}},
+ {2393, {wxPageSetupDialogData, setMarginBottomRight, 1}},
+ {2394, {wxPageSetupDialogData, setMinMarginTopLeft, 1}},
+ {2395, {wxPageSetupDialogData, setMinMarginBottomRight, 1}},
+ {2396, {wxPageSetupDialogData, setPaperId, 1}},
+ {2397, {wxPageSetupDialogData, setPaperSize_1_1, 1}},
+ {2398, {wxPageSetupDialogData, setPaperSize_1_0, 1}},
+ {2399, {wxPageSetupDialogData, setPrintData, 1}},
+ {2400, {wxPrintDialog, new_2_0, 2}},
+ {2401, {wxPrintDialog, new_2_1, 2}},
+ {2402, {wxPrintDialog, destruct, 0}},
+ {2403, {wxPrintDialog, getPrintDialogData, 0}},
+ {2404, {wxPrintDialog, getPrintDC, 0}},
+ {2405, {wxPrintDialogData, new_0, 0}},
+ {2406, {wxPrintDialogData, new_1_1, 1}},
+ {2407, {wxPrintDialogData, new_1_0, 1}},
+ {2408, {wxPrintDialogData, destruct, 0}},
+ {2409, {wxPrintDialogData, enableHelp, 1}},
+ {2410, {wxPrintDialogData, enablePageNumbers, 1}},
+ {2411, {wxPrintDialogData, enablePrintToFile, 1}},
+ {2412, {wxPrintDialogData, enableSelection, 1}},
+ {2413, {wxPrintDialogData, getAllPages, 0}},
+ {2414, {wxPrintDialogData, getCollate, 0}},
+ {2415, {wxPrintDialogData, getFromPage, 0}},
+ {2416, {wxPrintDialogData, getMaxPage, 0}},
+ {2417, {wxPrintDialogData, getMinPage, 0}},
+ {2418, {wxPrintDialogData, getNoCopies, 0}},
+ {2419, {wxPrintDialogData, getPrintData, 0}},
+ {2420, {wxPrintDialogData, getPrintToFile, 0}},
+ {2421, {wxPrintDialogData, getSelection, 0}},
+ {2422, {wxPrintDialogData, getToPage, 0}},
+ {2423, {wxPrintDialogData, isOk, 0}},
+ {2424, {wxPrintDialogData, setCollate, 1}},
+ {2425, {wxPrintDialogData, setFromPage, 1}},
+ {2426, {wxPrintDialogData, setMaxPage, 1}},
+ {2427, {wxPrintDialogData, setMinPage, 1}},
+ {2428, {wxPrintDialogData, setNoCopies, 1}},
+ {2429, {wxPrintDialogData, setPrintData, 1}},
+ {2430, {wxPrintDialogData, setPrintToFile, 1}},
+ {2431, {wxPrintDialogData, setSelection, 1}},
+ {2432, {wxPrintDialogData, setToPage, 1}},
+ {2433, {wxPrintData, new_0, 0}},
+ {2434, {wxPrintData, new_1, 1}},
+ {2435, {wxPrintData, destruct, 0}},
+ {2436, {wxPrintData, getCollate, 0}},
+ {2437, {wxPrintData, getBin, 0}},
+ {2438, {wxPrintData, getColour, 0}},
+ {2439, {wxPrintData, getDuplex, 0}},
+ {2440, {wxPrintData, getNoCopies, 0}},
+ {2441, {wxPrintData, getOrientation, 0}},
+ {2442, {wxPrintData, getPaperId, 0}},
+ {2443, {wxPrintData, getPrinterName, 0}},
+ {2444, {wxPrintData, getQuality, 0}},
+ {2445, {wxPrintData, isOk, 0}},
+ {2446, {wxPrintData, setBin, 1}},
+ {2447, {wxPrintData, setCollate, 1}},
+ {2448, {wxPrintData, setColour, 1}},
+ {2449, {wxPrintData, setDuplex, 1}},
+ {2450, {wxPrintData, setNoCopies, 1}},
+ {2451, {wxPrintData, setOrientation, 1}},
+ {2452, {wxPrintData, setPaperId, 1}},
+ {2453, {wxPrintData, setPrinterName, 1}},
+ {2454, {wxPrintData, setQuality, 1}},
+ {2457, {wxPrintPreview, new_2, 2}},
+ {2458, {wxPrintPreview, new_3, 3}},
+ {2460, {wxPrintPreview, destruct, 0}},
+ {2461, {wxPrintPreview, getCanvas, 0}},
+ {2462, {wxPrintPreview, getCurrentPage, 0}},
+ {2463, {wxPrintPreview, getFrame, 0}},
+ {2464, {wxPrintPreview, getMaxPage, 0}},
+ {2465, {wxPrintPreview, getMinPage, 0}},
+ {2466, {wxPrintPreview, getPrintout, 0}},
+ {2467, {wxPrintPreview, getPrintoutForPrinting, 0}},
+ {2468, {wxPrintPreview, isOk, 0}},
+ {2469, {wxPrintPreview, paintPage, 2}},
+ {2470, {wxPrintPreview, print, 1}},
+ {2471, {wxPrintPreview, renderPage, 1}},
+ {2472, {wxPrintPreview, setCanvas, 1}},
+ {2473, {wxPrintPreview, setCurrentPage, 1}},
+ {2474, {wxPrintPreview, setFrame, 1}},
+ {2475, {wxPrintPreview, setPrintout, 1}},
+ {2476, {wxPrintPreview, setZoom, 1}},
+ {2477, {wxPreviewFrame, new, 3}},
+ {2478, {wxPreviewFrame, destruct, 0}},
+ {2479, {wxPreviewFrame, createControlBar, 0}},
+ {2480, {wxPreviewFrame, createCanvas, 0}},
+ {2481, {wxPreviewFrame, initialize, 0}},
+ {2482, {wxPreviewFrame, onCloseWindow, 1}},
+ {2483, {wxPreviewControlBar, new, 4}},
+ {2484, {wxPreviewControlBar, destruct, 0}},
+ {2485, {wxPreviewControlBar, createButtons, 0}},
+ {2486, {wxPreviewControlBar, getPrintPreview, 0}},
+ {2487, {wxPreviewControlBar, getZoomControl, 0}},
+ {2488, {wxPreviewControlBar, setZoomControl, 1}},
+ {2490, {wxPrinter, new, 1}},
+ {2491, {wxPrinter, createAbortWindow, 2}},
+ {2492, {wxPrinter, getAbort, 0}},
+ {2493, {wxPrinter, getLastError, 0}},
+ {2494, {wxPrinter, getPrintDialogData, 0}},
+ {2495, {wxPrinter, print, 3}},
+ {2496, {wxPrinter, printDialog, 1}},
+ {2497, {wxPrinter, reportError, 3}},
+ {2498, {wxPrinter, setup, 1}},
+ {2499, {wxPrinter, 'Destroy', undefined}},
+ {2500, {wxXmlResource, new_1, 1}},
+ {2501, {wxXmlResource, new_2, 2}},
+ {2502, {wxXmlResource, destruct, 0}},
+ {2503, {wxXmlResource, attachUnknownControl, 3}},
+ {2504, {wxXmlResource, clearHandlers, 0}},
+ {2505, {wxXmlResource, compareVersion, 4}},
+ {2506, {wxXmlResource, get, 0}},
+ {2507, {wxXmlResource, getFlags, 0}},
+ {2508, {wxXmlResource, getVersion, 0}},
+ {2509, {wxXmlResource, getXRCID, 2}},
+ {2510, {wxXmlResource, initAllHandlers, 0}},
+ {2511, {wxXmlResource, load, 1}},
+ {2512, {wxXmlResource, loadBitmap, 1}},
+ {2513, {wxXmlResource, loadDialog_2, 2}},
+ {2514, {wxXmlResource, loadDialog_3, 3}},
+ {2515, {wxXmlResource, loadFrame_2, 2}},
+ {2516, {wxXmlResource, loadFrame_3, 3}},
+ {2517, {wxXmlResource, loadIcon, 1}},
+ {2518, {wxXmlResource, loadMenu, 1}},
+ {2519, {wxXmlResource, loadMenuBar_2, 2}},
+ {2520, {wxXmlResource, loadMenuBar_1, 1}},
+ {2521, {wxXmlResource, loadPanel_2, 2}},
+ {2522, {wxXmlResource, loadPanel_3, 3}},
+ {2523, {wxXmlResource, loadToolBar, 2}},
+ {2524, {wxXmlResource, set, 1}},
+ {2525, {wxXmlResource, setFlags, 1}},
+ {2526, {wxXmlResource, unload, 1}},
+ {2527, {wxXmlResource, xrcctrl, 3}},
+ {2528, {wxHtmlEasyPrinting, new, 1}},
+ {2529, {wxHtmlEasyPrinting, destruct, 0}},
+ {2530, {wxHtmlEasyPrinting, getPrintData, 0}},
+ {2531, {wxHtmlEasyPrinting, getPageSetupData, 0}},
+ {2532, {wxHtmlEasyPrinting, previewFile, 1}},
+ {2533, {wxHtmlEasyPrinting, previewText, 2}},
+ {2534, {wxHtmlEasyPrinting, printFile, 1}},
+ {2535, {wxHtmlEasyPrinting, printText, 2}},
+ {2536, {wxHtmlEasyPrinting, pageSetup, 0}},
+ {2537, {wxHtmlEasyPrinting, setFonts, 3}},
+ {2538, {wxHtmlEasyPrinting, setHeader, 2}},
+ {2539, {wxHtmlEasyPrinting, setFooter, 2}},
+ {2541, {wxGLCanvas, new_2, 2}},
+ {2542, {wxGLCanvas, new_3_1, 3}},
+ {2543, {wxGLCanvas, new_3_0, 3}},
+ {2544, {wxGLCanvas, getContext, 0}},
+ {2546, {wxGLCanvas, setCurrent, 0}},
+ {2547, {wxGLCanvas, swapBuffers, 0}},
+ {2548, {wxGLCanvas, 'Destroy', undefined}},
+ {2549, {wxAuiManager, new, 1}},
+ {2550, {wxAuiManager, destruct, 0}},
+ {2551, {wxAuiManager, addPane_2_1, 2}},
+ {2552, {wxAuiManager, addPane_3, 3}},
+ {2553, {wxAuiManager, addPane_2_0, 2}},
+ {2554, {wxAuiManager, detachPane, 1}},
+ {2555, {wxAuiManager, getAllPanes, 0}},
+ {2556, {wxAuiManager, getArtProvider, 0}},
+ {2557, {wxAuiManager, getDockSizeConstraint, 2}},
+ {2558, {wxAuiManager, getFlags, 0}},
+ {2559, {wxAuiManager, getManagedWindow, 0}},
+ {2560, {wxAuiManager, getManager, 1}},
+ {2561, {wxAuiManager, getPane_1_1, 1}},
+ {2562, {wxAuiManager, getPane_1_0, 1}},
+ {2563, {wxAuiManager, hideHint, 0}},
+ {2564, {wxAuiManager, insertPane, 3}},
+ {2565, {wxAuiManager, loadPaneInfo, 2}},
+ {2566, {wxAuiManager, loadPerspective, 2}},
+ {2567, {wxAuiManager, savePaneInfo, 1}},
+ {2568, {wxAuiManager, savePerspective, 0}},
+ {2569, {wxAuiManager, setArtProvider, 1}},
+ {2570, {wxAuiManager, setDockSizeConstraint, 2}},
+ {2571, {wxAuiManager, setFlags, 1}},
+ {2572, {wxAuiManager, setManagedWindow, 1}},
+ {2573, {wxAuiManager, showHint, 1}},
+ {2574, {wxAuiManager, unInit, 0}},
+ {2575, {wxAuiManager, update, 0}},
+ {2576, {wxAuiPaneInfo, new_0, 0}},
+ {2577, {wxAuiPaneInfo, new_1, 1}},
+ {2578, {wxAuiPaneInfo, destruct, 0}},
+ {2579, {wxAuiPaneInfo, bestSize_1, 1}},
+ {2580, {wxAuiPaneInfo, bestSize_2, 2}},
+ {2581, {wxAuiPaneInfo, bottom, 0}},
+ {2582, {wxAuiPaneInfo, bottomDockable, 1}},
+ {2583, {wxAuiPaneInfo, caption, 1}},
+ {2584, {wxAuiPaneInfo, captionVisible, 1}},
+ {2585, {wxAuiPaneInfo, centre, 0}},
+ {2586, {wxAuiPaneInfo, centrePane, 0}},
+ {2587, {wxAuiPaneInfo, closeButton, 1}},
+ {2588, {wxAuiPaneInfo, defaultPane, 0}},
+ {2589, {wxAuiPaneInfo, destroyOnClose, 1}},
+ {2590, {wxAuiPaneInfo, direction, 1}},
+ {2591, {wxAuiPaneInfo, dock, 0}},
+ {2592, {wxAuiPaneInfo, dockable, 1}},
+ {2593, {wxAuiPaneInfo, fixed, 0}},
+ {2594, {wxAuiPaneInfo, float, 0}},
+ {2595, {wxAuiPaneInfo, floatable, 1}},
+ {2596, {wxAuiPaneInfo, floatingPosition_1, 1}},
+ {2597, {wxAuiPaneInfo, floatingPosition_2, 2}},
+ {2598, {wxAuiPaneInfo, floatingSize_1, 1}},
+ {2599, {wxAuiPaneInfo, floatingSize_2, 2}},
+ {2600, {wxAuiPaneInfo, gripper, 1}},
+ {2601, {wxAuiPaneInfo, gripperTop, 1}},
+ {2602, {wxAuiPaneInfo, hasBorder, 0}},
+ {2603, {wxAuiPaneInfo, hasCaption, 0}},
+ {2604, {wxAuiPaneInfo, hasCloseButton, 0}},
+ {2605, {wxAuiPaneInfo, hasFlag, 1}},
+ {2606, {wxAuiPaneInfo, hasGripper, 0}},
+ {2607, {wxAuiPaneInfo, hasGripperTop, 0}},
+ {2608, {wxAuiPaneInfo, hasMaximizeButton, 0}},
+ {2609, {wxAuiPaneInfo, hasMinimizeButton, 0}},
+ {2610, {wxAuiPaneInfo, hasPinButton, 0}},
+ {2611, {wxAuiPaneInfo, hide, 0}},
+ {2612, {wxAuiPaneInfo, isBottomDockable, 0}},
+ {2613, {wxAuiPaneInfo, isDocked, 0}},
+ {2614, {wxAuiPaneInfo, isFixed, 0}},
+ {2615, {wxAuiPaneInfo, isFloatable, 0}},
+ {2616, {wxAuiPaneInfo, isFloating, 0}},
+ {2617, {wxAuiPaneInfo, isLeftDockable, 0}},
+ {2618, {wxAuiPaneInfo, isMovable, 0}},
+ {2619, {wxAuiPaneInfo, isOk, 0}},
+ {2620, {wxAuiPaneInfo, isResizable, 0}},
+ {2621, {wxAuiPaneInfo, isRightDockable, 0}},
+ {2622, {wxAuiPaneInfo, isShown, 0}},
+ {2623, {wxAuiPaneInfo, isToolbar, 0}},
+ {2624, {wxAuiPaneInfo, isTopDockable, 0}},
+ {2625, {wxAuiPaneInfo, layer, 1}},
+ {2626, {wxAuiPaneInfo, left, 0}},
+ {2627, {wxAuiPaneInfo, leftDockable, 1}},
+ {2628, {wxAuiPaneInfo, maxSize_1, 1}},
+ {2629, {wxAuiPaneInfo, maxSize_2, 2}},
+ {2630, {wxAuiPaneInfo, maximizeButton, 1}},
+ {2631, {wxAuiPaneInfo, minSize_1, 1}},
+ {2632, {wxAuiPaneInfo, minSize_2, 2}},
+ {2633, {wxAuiPaneInfo, minimizeButton, 1}},
+ {2634, {wxAuiPaneInfo, movable, 1}},
+ {2635, {wxAuiPaneInfo, name, 1}},
+ {2636, {wxAuiPaneInfo, paneBorder, 1}},
+ {2637, {wxAuiPaneInfo, pinButton, 1}},
+ {2638, {wxAuiPaneInfo, position, 1}},
+ {2639, {wxAuiPaneInfo, resizable, 1}},
+ {2640, {wxAuiPaneInfo, right, 0}},
+ {2641, {wxAuiPaneInfo, rightDockable, 1}},
+ {2642, {wxAuiPaneInfo, row, 1}},
+ {2643, {wxAuiPaneInfo, safeSet, 1}},
+ {2644, {wxAuiPaneInfo, setFlag, 2}},
+ {2645, {wxAuiPaneInfo, show, 1}},
+ {2646, {wxAuiPaneInfo, toolbarPane, 0}},
+ {2647, {wxAuiPaneInfo, top, 0}},
+ {2648, {wxAuiPaneInfo, topDockable, 1}},
+ {2649, {wxAuiPaneInfo, window, 1}},
+ {2650, {wxAuiNotebook, new_0, 0}},
+ {2651, {wxAuiNotebook, new_2, 2}},
+ {2652, {wxAuiNotebook, addPage, 3}},
+ {2653, {wxAuiNotebook, create, 2}},
+ {2654, {wxAuiNotebook, deletePage, 1}},
+ {2655, {wxAuiNotebook, getArtProvider, 0}},
+ {2656, {wxAuiNotebook, getPage, 1}},
+ {2657, {wxAuiNotebook, getPageBitmap, 1}},
+ {2658, {wxAuiNotebook, getPageCount, 0}},
+ {2659, {wxAuiNotebook, getPageIndex, 1}},
+ {2660, {wxAuiNotebook, getPageText, 1}},
+ {2661, {wxAuiNotebook, getSelection, 0}},
+ {2662, {wxAuiNotebook, insertPage, 4}},
+ {2663, {wxAuiNotebook, removePage, 1}},
+ {2664, {wxAuiNotebook, setArtProvider, 1}},
+ {2665, {wxAuiNotebook, setFont, 1}},
+ {2666, {wxAuiNotebook, setPageBitmap, 2}},
+ {2667, {wxAuiNotebook, setPageText, 2}},
+ {2668, {wxAuiNotebook, setSelection, 1}},
+ {2669, {wxAuiNotebook, setTabCtrlHeight, 1}},
+ {2670, {wxAuiNotebook, setUniformBitmapSize, 1}},
+ {2671, {wxAuiNotebook, 'Destroy', undefined}},
+ {2672, {wxMDIParentFrame, new_0, 0}},
+ {2673, {wxMDIParentFrame, new_4, 4}},
+ {2674, {wxMDIParentFrame, destruct, 0}},
+ {2675, {wxMDIParentFrame, activateNext, 0}},
+ {2676, {wxMDIParentFrame, activatePrevious, 0}},
+ {2677, {wxMDIParentFrame, arrangeIcons, 0}},
+ {2678, {wxMDIParentFrame, cascade, 0}},
+ {2679, {wxMDIParentFrame, create, 4}},
+ {2680, {wxMDIParentFrame, getActiveChild, 0}},
+ {2681, {wxMDIParentFrame, getClientWindow, 0}},
+ {2682, {wxMDIParentFrame, tile, 1}},
+ {2683, {wxMDIChildFrame, new_0, 0}},
+ {2684, {wxMDIChildFrame, new_4, 4}},
+ {2685, {wxMDIChildFrame, destruct, 0}},
+ {2686, {wxMDIChildFrame, activate, 0}},
+ {2687, {wxMDIChildFrame, create, 4}},
+ {2688, {wxMDIChildFrame, maximize, 1}},
+ {2689, {wxMDIChildFrame, restore, 0}},
+ {2690, {wxMDIClientWindow, new_0, 0}},
+ {2691, {wxMDIClientWindow, new_2, 2}},
+ {2692, {wxMDIClientWindow, destruct, 0}},
+ {2693, {wxMDIClientWindow, createClient, 2}},
+ {2694, {wxLayoutAlgorithm, new, 0}},
+ {2695, {wxLayoutAlgorithm, layoutFrame, 2}},
+ {2696, {wxLayoutAlgorithm, layoutMDIFrame, 2}},
+ {2697, {wxLayoutAlgorithm, layoutWindow, 2}},
+ {2698, {wxLayoutAlgorithm, 'Destroy', undefined}},
+ {2699, {wxEvent, getId, 0}},
+ {2700, {wxEvent, getSkipped, 0}},
+ {2701, {wxEvent, getTimestamp, 0}},
+ {2702, {wxEvent, isCommandEvent, 0}},
+ {2703, {wxEvent, resumePropagation, 1}},
+ {2704, {wxEvent, shouldPropagate, 0}},
+ {2705, {wxEvent, skip, 1}},
+ {2706, {wxEvent, stopPropagation, 0}},
+ {2707, {wxCommandEvent, getClientData, 0}},
+ {2708, {wxCommandEvent, getExtraLong, 0}},
+ {2709, {wxCommandEvent, getInt, 0}},
+ {2710, {wxCommandEvent, getSelection, 0}},
+ {2711, {wxCommandEvent, getString, 0}},
+ {2712, {wxCommandEvent, isChecked, 0}},
+ {2713, {wxCommandEvent, isSelection, 0}},
+ {2714, {wxCommandEvent, setInt, 1}},
+ {2715, {wxCommandEvent, setString, 1}},
+ {2716, {wxScrollEvent, getOrientation, 0}},
+ {2717, {wxScrollEvent, getPosition, 0}},
+ {2718, {wxScrollWinEvent, getOrientation, 0}},
+ {2719, {wxScrollWinEvent, getPosition, 0}},
+ {2720, {wxMouseEvent, altDown, 0}},
+ {2721, {wxMouseEvent, button, 1}},
+ {2722, {wxMouseEvent, buttonDClick, 1}},
+ {2723, {wxMouseEvent, buttonDown, 1}},
+ {2724, {wxMouseEvent, buttonUp, 1}},
+ {2725, {wxMouseEvent, cmdDown, 0}},
+ {2726, {wxMouseEvent, controlDown, 0}},
+ {2727, {wxMouseEvent, dragging, 0}},
+ {2728, {wxMouseEvent, entering, 0}},
+ {2729, {wxMouseEvent, getButton, 0}},
+ {2732, {wxMouseEvent, getPosition, 0}},
+ {2733, {wxMouseEvent, getLogicalPosition, 1}},
+ {2734, {wxMouseEvent, getLinesPerAction, 0}},
+ {2735, {wxMouseEvent, getWheelRotation, 0}},
+ {2736, {wxMouseEvent, getWheelDelta, 0}},
+ {2737, {wxMouseEvent, getX, 0}},
+ {2738, {wxMouseEvent, getY, 0}},
+ {2739, {wxMouseEvent, isButton, 0}},
+ {2740, {wxMouseEvent, isPageScroll, 0}},
+ {2741, {wxMouseEvent, leaving, 0}},
+ {2742, {wxMouseEvent, leftDClick, 0}},
+ {2743, {wxMouseEvent, leftDown, 0}},
+ {2744, {wxMouseEvent, leftIsDown, 0}},
+ {2745, {wxMouseEvent, leftUp, 0}},
+ {2746, {wxMouseEvent, metaDown, 0}},
+ {2747, {wxMouseEvent, middleDClick, 0}},
+ {2748, {wxMouseEvent, middleDown, 0}},
+ {2749, {wxMouseEvent, middleIsDown, 0}},
+ {2750, {wxMouseEvent, middleUp, 0}},
+ {2751, {wxMouseEvent, moving, 0}},
+ {2752, {wxMouseEvent, rightDClick, 0}},
+ {2753, {wxMouseEvent, rightDown, 0}},
+ {2754, {wxMouseEvent, rightIsDown, 0}},
+ {2755, {wxMouseEvent, rightUp, 0}},
+ {2756, {wxMouseEvent, shiftDown, 0}},
+ {2757, {wxSetCursorEvent, getCursor, 0}},
+ {2758, {wxSetCursorEvent, getX, 0}},
+ {2759, {wxSetCursorEvent, getY, 0}},
+ {2760, {wxSetCursorEvent, hasCursor, 0}},
+ {2761, {wxSetCursorEvent, setCursor, 1}},
+ {2762, {wxKeyEvent, altDown, 0}},
+ {2763, {wxKeyEvent, cmdDown, 0}},
+ {2764, {wxKeyEvent, controlDown, 0}},
+ {2765, {wxKeyEvent, getKeyCode, 0}},
+ {2766, {wxKeyEvent, getModifiers, 0}},
+ {2769, {wxKeyEvent, getPosition, 0}},
+ {2770, {wxKeyEvent, getRawKeyCode, 0}},
+ {2771, {wxKeyEvent, getRawKeyFlags, 0}},
+ {2772, {wxKeyEvent, getUnicodeKey, 0}},
+ {2773, {wxKeyEvent, getX, 0}},
+ {2774, {wxKeyEvent, getY, 0}},
+ {2775, {wxKeyEvent, hasModifiers, 0}},
+ {2776, {wxKeyEvent, metaDown, 0}},
+ {2777, {wxKeyEvent, shiftDown, 0}},
+ {2778, {wxSizeEvent, getSize, 0}},
+ {2779, {wxMoveEvent, getPosition, 0}},
+ {2780, {wxEraseEvent, getDC, 0}},
+ {2781, {wxFocusEvent, getWindow, 0}},
+ {2782, {wxChildFocusEvent, getWindow, 0}},
+ {2783, {wxMenuEvent, getMenu, 0}},
+ {2784, {wxMenuEvent, getMenuId, 0}},
+ {2785, {wxMenuEvent, isPopup, 0}},
+ {2786, {wxCloseEvent, canVeto, 0}},
+ {2787, {wxCloseEvent, getLoggingOff, 0}},
+ {2788, {wxCloseEvent, setCanVeto, 1}},
+ {2789, {wxCloseEvent, setLoggingOff, 1}},
+ {2790, {wxCloseEvent, veto, 1}},
+ {2791, {wxShowEvent, setShow, 1}},
+ {2792, {wxShowEvent, getShow, 0}},
+ {2793, {wxIconizeEvent, iconized, 0}},
+ {2794, {wxJoystickEvent, buttonDown, 1}},
+ {2795, {wxJoystickEvent, buttonIsDown, 1}},
+ {2796, {wxJoystickEvent, buttonUp, 1}},
+ {2797, {wxJoystickEvent, getButtonChange, 0}},
+ {2798, {wxJoystickEvent, getButtonState, 0}},
+ {2799, {wxJoystickEvent, getJoystick, 0}},
+ {2800, {wxJoystickEvent, getPosition, 0}},
+ {2801, {wxJoystickEvent, getZPosition, 0}},
+ {2802, {wxJoystickEvent, isButton, 0}},
+ {2803, {wxJoystickEvent, isMove, 0}},
+ {2804, {wxJoystickEvent, isZMove, 0}},
+ {2805, {wxUpdateUIEvent, canUpdate, 1}},
+ {2806, {wxUpdateUIEvent, check, 1}},
+ {2807, {wxUpdateUIEvent, enable, 1}},
+ {2808, {wxUpdateUIEvent, show, 1}},
+ {2809, {wxUpdateUIEvent, getChecked, 0}},
+ {2810, {wxUpdateUIEvent, getEnabled, 0}},
+ {2811, {wxUpdateUIEvent, getShown, 0}},
+ {2812, {wxUpdateUIEvent, getSetChecked, 0}},
+ {2813, {wxUpdateUIEvent, getSetEnabled, 0}},
+ {2814, {wxUpdateUIEvent, getSetShown, 0}},
+ {2815, {wxUpdateUIEvent, getSetText, 0}},
+ {2816, {wxUpdateUIEvent, getText, 0}},
+ {2817, {wxUpdateUIEvent, getMode, 0}},
+ {2818, {wxUpdateUIEvent, getUpdateInterval, 0}},
+ {2819, {wxUpdateUIEvent, resetUpdateTime, 0}},
+ {2820, {wxUpdateUIEvent, setMode, 1}},
+ {2821, {wxUpdateUIEvent, setText, 1}},
+ {2822, {wxUpdateUIEvent, setUpdateInterval, 1}},
+ {2823, {wxMouseCaptureChangedEvent, getCapturedWindow, 0}},
+ {2824, {wxPaletteChangedEvent, setChangedWindow, 1}},
+ {2825, {wxPaletteChangedEvent, getChangedWindow, 0}},
+ {2826, {wxQueryNewPaletteEvent, setPaletteRealized, 1}},
+ {2827, {wxQueryNewPaletteEvent, getPaletteRealized, 0}},
+ {2828, {wxNavigationKeyEvent, getDirection, 0}},
+ {2829, {wxNavigationKeyEvent, setDirection, 1}},
+ {2830, {wxNavigationKeyEvent, isWindowChange, 0}},
+ {2831, {wxNavigationKeyEvent, setWindowChange, 1}},
+ {2832, {wxNavigationKeyEvent, isFromTab, 0}},
+ {2833, {wxNavigationKeyEvent, setFromTab, 1}},
+ {2834, {wxNavigationKeyEvent, getCurrentFocus, 0}},
+ {2835, {wxNavigationKeyEvent, setCurrentFocus, 1}},
+ {2836, {wxHelpEvent, getOrigin, 0}},
+ {2837, {wxHelpEvent, getPosition, 0}},
+ {2838, {wxHelpEvent, setOrigin, 1}},
+ {2839, {wxHelpEvent, setPosition, 1}},
+ {2840, {wxContextMenuEvent, getPosition, 0}},
+ {2841, {wxContextMenuEvent, setPosition, 1}},
+ {2842, {wxIdleEvent, canSend, 1}},
+ {2843, {wxIdleEvent, getMode, 0}},
+ {2844, {wxIdleEvent, requestMore, 1}},
+ {2845, {wxIdleEvent, moreRequested, 0}},
+ {2846, {wxIdleEvent, setMode, 1}},
+ {2847, {wxGridEvent, altDown, 0}},
+ {2848, {wxGridEvent, controlDown, 0}},
+ {2849, {wxGridEvent, getCol, 0}},
+ {2850, {wxGridEvent, getPosition, 0}},
+ {2851, {wxGridEvent, getRow, 0}},
+ {2852, {wxGridEvent, metaDown, 0}},
+ {2853, {wxGridEvent, selecting, 0}},
+ {2854, {wxGridEvent, shiftDown, 0}},
+ {2855, {wxNotifyEvent, allow, 0}},
+ {2856, {wxNotifyEvent, isAllowed, 0}},
+ {2857, {wxNotifyEvent, veto, 0}},
+ {2858, {wxSashEvent, getEdge, 0}},
+ {2859, {wxSashEvent, getDragRect, 0}},
+ {2860, {wxSashEvent, getDragStatus, 0}},
+ {2861, {wxListEvent, getCacheFrom, 0}},
+ {2862, {wxListEvent, getCacheTo, 0}},
+ {2863, {wxListEvent, getKeyCode, 0}},
+ {2864, {wxListEvent, getIndex, 0}},
+ {2865, {wxListEvent, getColumn, 0}},
+ {2866, {wxListEvent, getPoint, 0}},
+ {2867, {wxListEvent, getLabel, 0}},
+ {2868, {wxListEvent, getText, 0}},
+ {2869, {wxListEvent, getImage, 0}},
+ {2870, {wxListEvent, getData, 0}},
+ {2871, {wxListEvent, getMask, 0}},
+ {2872, {wxListEvent, getItem, 0}},
+ {2873, {wxListEvent, isEditCancelled, 0}},
+ {2874, {wxDateEvent, getDate, 0}},
+ {2875, {wxCalendarEvent, getWeekDay, 0}},
+ {2876, {wxFileDirPickerEvent, getPath, 0}},
+ {2877, {wxColourPickerEvent, getColour, 0}},
+ {2878, {wxFontPickerEvent, getFont, 0}},
+ {2879, {wxStyledTextEvent, getPosition, 0}},
+ {2880, {wxStyledTextEvent, getKey, 0}},
+ {2881, {wxStyledTextEvent, getModifiers, 0}},
+ {2882, {wxStyledTextEvent, getModificationType, 0}},
+ {2883, {wxStyledTextEvent, getText, 0}},
+ {2884, {wxStyledTextEvent, getLength, 0}},
+ {2885, {wxStyledTextEvent, getLinesAdded, 0}},
+ {2886, {wxStyledTextEvent, getLine, 0}},
+ {2887, {wxStyledTextEvent, getFoldLevelNow, 0}},
+ {2888, {wxStyledTextEvent, getFoldLevelPrev, 0}},
+ {2889, {wxStyledTextEvent, getMargin, 0}},
+ {2890, {wxStyledTextEvent, getMessage, 0}},
+ {2891, {wxStyledTextEvent, getWParam, 0}},
+ {2892, {wxStyledTextEvent, getLParam, 0}},
+ {2893, {wxStyledTextEvent, getListType, 0}},
+ {2894, {wxStyledTextEvent, getX, 0}},
+ {2895, {wxStyledTextEvent, getY, 0}},
+ {2896, {wxStyledTextEvent, getDragText, 0}},
+ {2897, {wxStyledTextEvent, getDragAllowMove, 0}},
+ {2898, {wxStyledTextEvent, getDragResult, 0}},
+ {2899, {wxStyledTextEvent, getShift, 0}},
+ {2900, {wxStyledTextEvent, getControl, 0}},
+ {2901, {wxStyledTextEvent, getAlt, 0}},
+ {2902, {utils, getKeyState, 1}},
+ {2903, {utils, getMousePosition, 2}},
+ {2904, {utils, getMouseState, 0}},
+ {2905, {utils, setDetectableAutoRepeat, 1}},
+ {2906, {utils, bell, 0}},
+ {2907, {utils, findMenuItemId, 3}},
+ {2908, {utils, genericFindWindowAtPoint, 1}},
+ {2909, {utils, findWindowAtPoint, 1}},
+ {2910, {utils, beginBusyCursor, 1}},
+ {2911, {utils, endBusyCursor, 0}},
+ {2912, {utils, isBusy, 0}},
+ {2913, {utils, shutdown, 1}},
+ {2914, {utils, shell, 1}},
+ {2915, {utils, launchDefaultBrowser, 2}},
+ {2916, {utils, getEmailAddress, 0}},
+ {2917, {utils, getUserId, 0}},
+ {2918, {utils, getHomeDir, 0}},
+ {2919, {utils, newId, 0}},
+ {2920, {utils, registerId, 1}},
+ {2921, {utils, getCurrentId, 0}},
+ {2922, {utils, getOsDescription, 0}},
+ {2923, {utils, isPlatformLittleEndian, 0}},
+ {2924, {utils, isPlatform64Bit, 0}},
+ {2925, {wxPrintout, new, 1}},
+ {2926, {wxPrintout, destruct, 0}},
+ {2927, {wxPrintout, getDC, 0}},
+ {2928, {wxPrintout, getPageSizeMM, 2}},
+ {2929, {wxPrintout, getPageSizePixels, 2}},
+ {2930, {wxPrintout, getPaperRectPixels, 0}},
+ {2931, {wxPrintout, getPPIPrinter, 2}},
+ {2932, {wxPrintout, getPPIScreen, 2}},
+ {2933, {wxPrintout, getTitle, 0}},
+ {2934, {wxPrintout, isPreview, 0}},
+ {2935, {wxPrintout, fitThisSizeToPaper, 1}},
+ {2936, {wxPrintout, fitThisSizeToPage, 1}},
+ {2937, {wxPrintout, fitThisSizeToPageMargins, 2}},
+ {2938, {wxPrintout, mapScreenSizeToPaper, 0}},
+ {2939, {wxPrintout, mapScreenSizeToPage, 0}},
+ {2940, {wxPrintout, mapScreenSizeToPageMargins, 1}},
+ {2941, {wxPrintout, mapScreenSizeToDevice, 0}},
+ {2942, {wxPrintout, getLogicalPaperRect, 0}},
+ {2943, {wxPrintout, getLogicalPageRect, 0}},
+ {2944, {wxPrintout, getLogicalPageMarginsRect, 1}},
+ {2945, {wxPrintout, setLogicalOrigin, 2}},
+ {2946, {wxPrintout, offsetLogicalOrigin, 2}},
+ {2947, {wxStyledTextCtrl, new_2, 2}},
+ {2948, {wxStyledTextCtrl, new_0, 0}},
+ {2949, {wxStyledTextCtrl, destruct, 0}},
+ {2950, {wxStyledTextCtrl, create, 2}},
+ {2951, {wxStyledTextCtrl, addText, 1}},
+ {2952, {wxStyledTextCtrl, addStyledText, 1}},
+ {2953, {wxStyledTextCtrl, insertText, 2}},
+ {2954, {wxStyledTextCtrl, clearAll, 0}},
+ {2955, {wxStyledTextCtrl, clearDocumentStyle, 0}},
+ {2956, {wxStyledTextCtrl, getLength, 0}},
+ {2957, {wxStyledTextCtrl, getCharAt, 1}},
+ {2958, {wxStyledTextCtrl, getCurrentPos, 0}},
+ {2959, {wxStyledTextCtrl, getAnchor, 0}},
+ {2960, {wxStyledTextCtrl, getStyleAt, 1}},
+ {2961, {wxStyledTextCtrl, redo, 0}},
+ {2962, {wxStyledTextCtrl, setUndoCollection, 1}},
+ {2963, {wxStyledTextCtrl, selectAll, 0}},
+ {2964, {wxStyledTextCtrl, setSavePoint, 0}},
+ {2965, {wxStyledTextCtrl, getStyledText, 2}},
+ {2966, {wxStyledTextCtrl, canRedo, 0}},
+ {2967, {wxStyledTextCtrl, markerLineFromHandle, 1}},
+ {2968, {wxStyledTextCtrl, markerDeleteHandle, 1}},
+ {2969, {wxStyledTextCtrl, getUndoCollection, 0}},
+ {2970, {wxStyledTextCtrl, getViewWhiteSpace, 0}},
+ {2971, {wxStyledTextCtrl, setViewWhiteSpace, 1}},
+ {2972, {wxStyledTextCtrl, positionFromPoint, 1}},
+ {2973, {wxStyledTextCtrl, positionFromPointClose, 2}},
+ {2974, {wxStyledTextCtrl, gotoLine, 1}},
+ {2975, {wxStyledTextCtrl, gotoPos, 1}},
+ {2976, {wxStyledTextCtrl, setAnchor, 1}},
+ {2977, {wxStyledTextCtrl, getCurLine, 1}},
+ {2978, {wxStyledTextCtrl, getEndStyled, 0}},
+ {2979, {wxStyledTextCtrl, convertEOLs, 1}},
+ {2980, {wxStyledTextCtrl, getEOLMode, 0}},
+ {2981, {wxStyledTextCtrl, setEOLMode, 1}},
+ {2982, {wxStyledTextCtrl, startStyling, 2}},
+ {2983, {wxStyledTextCtrl, setStyling, 2}},
+ {2984, {wxStyledTextCtrl, getBufferedDraw, 0}},
+ {2985, {wxStyledTextCtrl, setBufferedDraw, 1}},
+ {2986, {wxStyledTextCtrl, setTabWidth, 1}},
+ {2987, {wxStyledTextCtrl, getTabWidth, 0}},
+ {2988, {wxStyledTextCtrl, setCodePage, 1}},
+ {2989, {wxStyledTextCtrl, markerDefine, 3}},
+ {2990, {wxStyledTextCtrl, markerSetForeground, 2}},
+ {2991, {wxStyledTextCtrl, markerSetBackground, 2}},
+ {2992, {wxStyledTextCtrl, markerAdd, 2}},
+ {2993, {wxStyledTextCtrl, markerDelete, 2}},
+ {2994, {wxStyledTextCtrl, markerDeleteAll, 1}},
+ {2995, {wxStyledTextCtrl, markerGet, 1}},
+ {2996, {wxStyledTextCtrl, markerNext, 2}},
+ {2997, {wxStyledTextCtrl, markerPrevious, 2}},
+ {2998, {wxStyledTextCtrl, markerDefineBitmap, 2}},
+ {2999, {wxStyledTextCtrl, markerAddSet, 2}},
+ {3000, {wxStyledTextCtrl, markerSetAlpha, 2}},
+ {3001, {wxStyledTextCtrl, setMarginType, 2}},
+ {3002, {wxStyledTextCtrl, getMarginType, 1}},
+ {3003, {wxStyledTextCtrl, setMarginWidth, 2}},
+ {3004, {wxStyledTextCtrl, getMarginWidth, 1}},
+ {3005, {wxStyledTextCtrl, setMarginMask, 2}},
+ {3006, {wxStyledTextCtrl, getMarginMask, 1}},
+ {3007, {wxStyledTextCtrl, setMarginSensitive, 2}},
+ {3008, {wxStyledTextCtrl, getMarginSensitive, 1}},
+ {3009, {wxStyledTextCtrl, styleClearAll, 0}},
+ {3010, {wxStyledTextCtrl, styleSetForeground, 2}},
+ {3011, {wxStyledTextCtrl, styleSetBackground, 2}},
+ {3012, {wxStyledTextCtrl, styleSetBold, 2}},
+ {3013, {wxStyledTextCtrl, styleSetItalic, 2}},
+ {3014, {wxStyledTextCtrl, styleSetSize, 2}},
+ {3015, {wxStyledTextCtrl, styleSetFaceName, 2}},
+ {3016, {wxStyledTextCtrl, styleSetEOLFilled, 2}},
+ {3017, {wxStyledTextCtrl, styleResetDefault, 0}},
+ {3018, {wxStyledTextCtrl, styleSetUnderline, 2}},
+ {3019, {wxStyledTextCtrl, styleSetCase, 2}},
+ {3020, {wxStyledTextCtrl, styleSetHotSpot, 2}},
+ {3021, {wxStyledTextCtrl, setSelForeground, 2}},
+ {3022, {wxStyledTextCtrl, setSelBackground, 2}},
+ {3023, {wxStyledTextCtrl, getSelAlpha, 0}},
+ {3024, {wxStyledTextCtrl, setSelAlpha, 1}},
+ {3025, {wxStyledTextCtrl, setCaretForeground, 1}},
+ {3026, {wxStyledTextCtrl, cmdKeyAssign, 3}},
+ {3027, {wxStyledTextCtrl, cmdKeyClear, 2}},
+ {3028, {wxStyledTextCtrl, cmdKeyClearAll, 0}},
+ {3029, {wxStyledTextCtrl, setStyleBytes, 2}},
+ {3030, {wxStyledTextCtrl, styleSetVisible, 2}},
+ {3031, {wxStyledTextCtrl, getCaretPeriod, 0}},
+ {3032, {wxStyledTextCtrl, setCaretPeriod, 1}},
+ {3033, {wxStyledTextCtrl, setWordChars, 1}},
+ {3034, {wxStyledTextCtrl, beginUndoAction, 0}},
+ {3035, {wxStyledTextCtrl, endUndoAction, 0}},
+ {3036, {wxStyledTextCtrl, indicatorSetStyle, 2}},
+ {3037, {wxStyledTextCtrl, indicatorGetStyle, 1}},
+ {3038, {wxStyledTextCtrl, indicatorSetForeground, 2}},
+ {3039, {wxStyledTextCtrl, indicatorGetForeground, 1}},
+ {3040, {wxStyledTextCtrl, setWhitespaceForeground, 2}},
+ {3041, {wxStyledTextCtrl, setWhitespaceBackground, 2}},
+ {3042, {wxStyledTextCtrl, getStyleBits, 0}},
+ {3043, {wxStyledTextCtrl, setLineState, 2}},
+ {3044, {wxStyledTextCtrl, getLineState, 1}},
+ {3045, {wxStyledTextCtrl, getMaxLineState, 0}},
+ {3046, {wxStyledTextCtrl, getCaretLineVisible, 0}},
+ {3047, {wxStyledTextCtrl, setCaretLineVisible, 1}},
+ {3048, {wxStyledTextCtrl, getCaretLineBackground, 0}},
+ {3049, {wxStyledTextCtrl, setCaretLineBackground, 1}},
+ {3050, {wxStyledTextCtrl, autoCompShow, 2}},
+ {3051, {wxStyledTextCtrl, autoCompCancel, 0}},
+ {3052, {wxStyledTextCtrl, autoCompActive, 0}},
+ {3053, {wxStyledTextCtrl, autoCompPosStart, 0}},
+ {3054, {wxStyledTextCtrl, autoCompComplete, 0}},
+ {3055, {wxStyledTextCtrl, autoCompStops, 1}},
+ {3056, {wxStyledTextCtrl, autoCompSetSeparator, 1}},
+ {3057, {wxStyledTextCtrl, autoCompGetSeparator, 0}},
+ {3058, {wxStyledTextCtrl, autoCompSelect, 1}},
+ {3059, {wxStyledTextCtrl, autoCompSetCancelAtStart, 1}},
+ {3060, {wxStyledTextCtrl, autoCompGetCancelAtStart, 0}},
+ {3061, {wxStyledTextCtrl, autoCompSetFillUps, 1}},
+ {3062, {wxStyledTextCtrl, autoCompSetChooseSingle, 1}},
+ {3063, {wxStyledTextCtrl, autoCompGetChooseSingle, 0}},
+ {3064, {wxStyledTextCtrl, autoCompSetIgnoreCase, 1}},
+ {3065, {wxStyledTextCtrl, autoCompGetIgnoreCase, 0}},
+ {3066, {wxStyledTextCtrl, userListShow, 2}},
+ {3067, {wxStyledTextCtrl, autoCompSetAutoHide, 1}},
+ {3068, {wxStyledTextCtrl, autoCompGetAutoHide, 0}},
+ {3069, {wxStyledTextCtrl, autoCompSetDropRestOfWord, 1}},
+ {3070, {wxStyledTextCtrl, autoCompGetDropRestOfWord, 0}},
+ {3071, {wxStyledTextCtrl, registerImage, 2}},
+ {3072, {wxStyledTextCtrl, clearRegisteredImages, 0}},
+ {3073, {wxStyledTextCtrl, autoCompGetTypeSeparator, 0}},
+ {3074, {wxStyledTextCtrl, autoCompSetTypeSeparator, 1}},
+ {3075, {wxStyledTextCtrl, autoCompSetMaxWidth, 1}},
+ {3076, {wxStyledTextCtrl, autoCompGetMaxWidth, 0}},
+ {3077, {wxStyledTextCtrl, autoCompSetMaxHeight, 1}},
+ {3078, {wxStyledTextCtrl, autoCompGetMaxHeight, 0}},
+ {3079, {wxStyledTextCtrl, setIndent, 1}},
+ {3080, {wxStyledTextCtrl, getIndent, 0}},
+ {3081, {wxStyledTextCtrl, setUseTabs, 1}},
+ {3082, {wxStyledTextCtrl, getUseTabs, 0}},
+ {3083, {wxStyledTextCtrl, setLineIndentation, 2}},
+ {3084, {wxStyledTextCtrl, getLineIndentation, 1}},
+ {3085, {wxStyledTextCtrl, getLineIndentPosition, 1}},
+ {3086, {wxStyledTextCtrl, getColumn, 1}},
+ {3087, {wxStyledTextCtrl, setUseHorizontalScrollBar, 1}},
+ {3088, {wxStyledTextCtrl, getUseHorizontalScrollBar, 0}},
+ {3089, {wxStyledTextCtrl, setIndentationGuides, 1}},
+ {3090, {wxStyledTextCtrl, getIndentationGuides, 0}},
+ {3091, {wxStyledTextCtrl, setHighlightGuide, 1}},
+ {3092, {wxStyledTextCtrl, getHighlightGuide, 0}},
+ {3093, {wxStyledTextCtrl, getLineEndPosition, 1}},
+ {3094, {wxStyledTextCtrl, getCodePage, 0}},
+ {3095, {wxStyledTextCtrl, getCaretForeground, 0}},
+ {3096, {wxStyledTextCtrl, getReadOnly, 0}},
+ {3097, {wxStyledTextCtrl, setCurrentPos, 1}},
+ {3098, {wxStyledTextCtrl, setSelectionStart, 1}},
+ {3099, {wxStyledTextCtrl, getSelectionStart, 0}},
+ {3100, {wxStyledTextCtrl, setSelectionEnd, 1}},
+ {3101, {wxStyledTextCtrl, getSelectionEnd, 0}},
+ {3102, {wxStyledTextCtrl, setPrintMagnification, 1}},
+ {3103, {wxStyledTextCtrl, getPrintMagnification, 0}},
+ {3104, {wxStyledTextCtrl, setPrintColourMode, 1}},
+ {3105, {wxStyledTextCtrl, getPrintColourMode, 0}},
+ {3106, {wxStyledTextCtrl, findText, 4}},
+ {3107, {wxStyledTextCtrl, formatRange, 7}},
+ {3108, {wxStyledTextCtrl, getFirstVisibleLine, 0}},
+ {3109, {wxStyledTextCtrl, getLine, 1}},
+ {3110, {wxStyledTextCtrl, getLineCount, 0}},
+ {3111, {wxStyledTextCtrl, setMarginLeft, 1}},
+ {3112, {wxStyledTextCtrl, getMarginLeft, 0}},
+ {3113, {wxStyledTextCtrl, setMarginRight, 1}},
+ {3114, {wxStyledTextCtrl, getMarginRight, 0}},
+ {3115, {wxStyledTextCtrl, getModify, 0}},
+ {3116, {wxStyledTextCtrl, setSelection, 2}},
+ {3117, {wxStyledTextCtrl, getSelectedText, 0}},
+ {3118, {wxStyledTextCtrl, getTextRange, 2}},
+ {3119, {wxStyledTextCtrl, hideSelection, 1}},
+ {3120, {wxStyledTextCtrl, lineFromPosition, 1}},
+ {3121, {wxStyledTextCtrl, positionFromLine, 1}},
+ {3122, {wxStyledTextCtrl, lineScroll, 2}},
+ {3123, {wxStyledTextCtrl, ensureCaretVisible, 0}},
+ {3124, {wxStyledTextCtrl, replaceSelection, 1}},
+ {3125, {wxStyledTextCtrl, setReadOnly, 1}},
+ {3126, {wxStyledTextCtrl, canPaste, 0}},
+ {3127, {wxStyledTextCtrl, canUndo, 0}},
+ {3128, {wxStyledTextCtrl, emptyUndoBuffer, 0}},
+ {3129, {wxStyledTextCtrl, undo, 0}},
+ {3130, {wxStyledTextCtrl, cut, 0}},
+ {3131, {wxStyledTextCtrl, copy, 0}},
+ {3132, {wxStyledTextCtrl, paste, 0}},
+ {3133, {wxStyledTextCtrl, clear, 0}},
+ {3134, {wxStyledTextCtrl, setText, 1}},
+ {3135, {wxStyledTextCtrl, getText, 0}},
+ {3136, {wxStyledTextCtrl, getTextLength, 0}},
+ {3137, {wxStyledTextCtrl, getOvertype, 0}},
+ {3138, {wxStyledTextCtrl, setCaretWidth, 1}},
+ {3139, {wxStyledTextCtrl, getCaretWidth, 0}},
+ {3140, {wxStyledTextCtrl, setTargetStart, 1}},
+ {3141, {wxStyledTextCtrl, getTargetStart, 0}},
+ {3142, {wxStyledTextCtrl, setTargetEnd, 1}},
+ {3143, {wxStyledTextCtrl, getTargetEnd, 0}},
+ {3144, {wxStyledTextCtrl, replaceTarget, 1}},
+ {3145, {wxStyledTextCtrl, searchInTarget, 1}},
+ {3146, {wxStyledTextCtrl, setSearchFlags, 1}},
+ {3147, {wxStyledTextCtrl, getSearchFlags, 0}},
+ {3148, {wxStyledTextCtrl, callTipShow, 2}},
+ {3149, {wxStyledTextCtrl, callTipCancel, 0}},
+ {3150, {wxStyledTextCtrl, callTipActive, 0}},
+ {3151, {wxStyledTextCtrl, callTipPosAtStart, 0}},
+ {3152, {wxStyledTextCtrl, callTipSetHighlight, 2}},
+ {3153, {wxStyledTextCtrl, callTipSetBackground, 1}},
+ {3154, {wxStyledTextCtrl, callTipSetForeground, 1}},
+ {3155, {wxStyledTextCtrl, callTipSetForegroundHighlight, 1}},
+ {3156, {wxStyledTextCtrl, callTipUseStyle, 1}},
+ {3157, {wxStyledTextCtrl, visibleFromDocLine, 1}},
+ {3158, {wxStyledTextCtrl, docLineFromVisible, 1}},
+ {3159, {wxStyledTextCtrl, wrapCount, 1}},
+ {3160, {wxStyledTextCtrl, setFoldLevel, 2}},
+ {3161, {wxStyledTextCtrl, getFoldLevel, 1}},
+ {3162, {wxStyledTextCtrl, getLastChild, 2}},
+ {3163, {wxStyledTextCtrl, getFoldParent, 1}},
+ {3164, {wxStyledTextCtrl, showLines, 2}},
+ {3165, {wxStyledTextCtrl, hideLines, 2}},
+ {3166, {wxStyledTextCtrl, getLineVisible, 1}},
+ {3167, {wxStyledTextCtrl, setFoldExpanded, 2}},
+ {3168, {wxStyledTextCtrl, getFoldExpanded, 1}},
+ {3169, {wxStyledTextCtrl, toggleFold, 1}},
+ {3170, {wxStyledTextCtrl, ensureVisible, 1}},
+ {3171, {wxStyledTextCtrl, setFoldFlags, 1}},
+ {3172, {wxStyledTextCtrl, ensureVisibleEnforcePolicy, 1}},
+ {3173, {wxStyledTextCtrl, setTabIndents, 1}},
+ {3174, {wxStyledTextCtrl, getTabIndents, 0}},
+ {3175, {wxStyledTextCtrl, setBackSpaceUnIndents, 1}},
+ {3176, {wxStyledTextCtrl, getBackSpaceUnIndents, 0}},
+ {3177, {wxStyledTextCtrl, setMouseDwellTime, 1}},
+ {3178, {wxStyledTextCtrl, getMouseDwellTime, 0}},
+ {3179, {wxStyledTextCtrl, wordStartPosition, 2}},
+ {3180, {wxStyledTextCtrl, wordEndPosition, 2}},
+ {3181, {wxStyledTextCtrl, setWrapMode, 1}},
+ {3182, {wxStyledTextCtrl, getWrapMode, 0}},
+ {3183, {wxStyledTextCtrl, setWrapVisualFlags, 1}},
+ {3184, {wxStyledTextCtrl, getWrapVisualFlags, 0}},
+ {3185, {wxStyledTextCtrl, setWrapVisualFlagsLocation, 1}},
+ {3186, {wxStyledTextCtrl, getWrapVisualFlagsLocation, 0}},
+ {3187, {wxStyledTextCtrl, setWrapStartIndent, 1}},
+ {3188, {wxStyledTextCtrl, getWrapStartIndent, 0}},
+ {3189, {wxStyledTextCtrl, setLayoutCache, 1}},
+ {3190, {wxStyledTextCtrl, getLayoutCache, 0}},
+ {3191, {wxStyledTextCtrl, setScrollWidth, 1}},
+ {3192, {wxStyledTextCtrl, getScrollWidth, 0}},
+ {3193, {wxStyledTextCtrl, textWidth, 2}},
+ {3194, {wxStyledTextCtrl, getEndAtLastLine, 0}},
+ {3195, {wxStyledTextCtrl, textHeight, 1}},
+ {3196, {wxStyledTextCtrl, setUseVerticalScrollBar, 1}},
+ {3197, {wxStyledTextCtrl, getUseVerticalScrollBar, 0}},
+ {3198, {wxStyledTextCtrl, appendText, 1}},
+ {3199, {wxStyledTextCtrl, getTwoPhaseDraw, 0}},
+ {3200, {wxStyledTextCtrl, setTwoPhaseDraw, 1}},
+ {3201, {wxStyledTextCtrl, targetFromSelection, 0}},
+ {3202, {wxStyledTextCtrl, linesJoin, 0}},
+ {3203, {wxStyledTextCtrl, linesSplit, 1}},
+ {3204, {wxStyledTextCtrl, setFoldMarginColour, 2}},
+ {3205, {wxStyledTextCtrl, setFoldMarginHiColour, 2}},
+ {3206, {wxStyledTextCtrl, lineDown, 0}},
+ {3207, {wxStyledTextCtrl, lineDownExtend, 0}},
+ {3208, {wxStyledTextCtrl, lineUp, 0}},
+ {3209, {wxStyledTextCtrl, lineUpExtend, 0}},
+ {3210, {wxStyledTextCtrl, charLeft, 0}},
+ {3211, {wxStyledTextCtrl, charLeftExtend, 0}},
+ {3212, {wxStyledTextCtrl, charRight, 0}},
+ {3213, {wxStyledTextCtrl, charRightExtend, 0}},
+ {3214, {wxStyledTextCtrl, wordLeft, 0}},
+ {3215, {wxStyledTextCtrl, wordLeftExtend, 0}},
+ {3216, {wxStyledTextCtrl, wordRight, 0}},
+ {3217, {wxStyledTextCtrl, wordRightExtend, 0}},
+ {3218, {wxStyledTextCtrl, home, 0}},
+ {3219, {wxStyledTextCtrl, homeExtend, 0}},
+ {3220, {wxStyledTextCtrl, lineEnd, 0}},
+ {3221, {wxStyledTextCtrl, lineEndExtend, 0}},
+ {3222, {wxStyledTextCtrl, documentStart, 0}},
+ {3223, {wxStyledTextCtrl, documentStartExtend, 0}},
+ {3224, {wxStyledTextCtrl, documentEnd, 0}},
+ {3225, {wxStyledTextCtrl, documentEndExtend, 0}},
+ {3226, {wxStyledTextCtrl, pageUp, 0}},
+ {3227, {wxStyledTextCtrl, pageUpExtend, 0}},
+ {3228, {wxStyledTextCtrl, pageDown, 0}},
+ {3229, {wxStyledTextCtrl, pageDownExtend, 0}},
+ {3230, {wxStyledTextCtrl, editToggleOvertype, 0}},
+ {3231, {wxStyledTextCtrl, cancel, 0}},
+ {3232, {wxStyledTextCtrl, deleteBack, 0}},
+ {3233, {wxStyledTextCtrl, tab, 0}},
+ {3234, {wxStyledTextCtrl, backTab, 0}},
+ {3235, {wxStyledTextCtrl, newLine, 0}},
+ {3236, {wxStyledTextCtrl, formFeed, 0}},
+ {3237, {wxStyledTextCtrl, vCHome, 0}},
+ {3238, {wxStyledTextCtrl, vCHomeExtend, 0}},
+ {3239, {wxStyledTextCtrl, zoomIn, 0}},
+ {3240, {wxStyledTextCtrl, zoomOut, 0}},
+ {3241, {wxStyledTextCtrl, delWordLeft, 0}},
+ {3242, {wxStyledTextCtrl, delWordRight, 0}},
+ {3243, {wxStyledTextCtrl, lineCut, 0}},
+ {3244, {wxStyledTextCtrl, lineDelete, 0}},
+ {3245, {wxStyledTextCtrl, lineTranspose, 0}},
+ {3246, {wxStyledTextCtrl, lineDuplicate, 0}},
+ {3247, {wxStyledTextCtrl, lowerCase, 0}},
+ {3248, {wxStyledTextCtrl, upperCase, 0}},
+ {3249, {wxStyledTextCtrl, lineScrollDown, 0}},
+ {3250, {wxStyledTextCtrl, lineScrollUp, 0}},
+ {3251, {wxStyledTextCtrl, deleteBackNotLine, 0}},
+ {3252, {wxStyledTextCtrl, homeDisplay, 0}},
+ {3253, {wxStyledTextCtrl, homeDisplayExtend, 0}},
+ {3254, {wxStyledTextCtrl, lineEndDisplay, 0}},
+ {3255, {wxStyledTextCtrl, lineEndDisplayExtend, 0}},
+ {3256, {wxStyledTextCtrl, homeWrapExtend, 0}},
+ {3257, {wxStyledTextCtrl, lineEndWrap, 0}},
+ {3258, {wxStyledTextCtrl, lineEndWrapExtend, 0}},
+ {3259, {wxStyledTextCtrl, vCHomeWrap, 0}},
+ {3260, {wxStyledTextCtrl, vCHomeWrapExtend, 0}},
+ {3261, {wxStyledTextCtrl, lineCopy, 0}},
+ {3262, {wxStyledTextCtrl, moveCaretInsideView, 0}},
+ {3263, {wxStyledTextCtrl, lineLength, 1}},
+ {3264, {wxStyledTextCtrl, braceHighlight, 2}},
+ {3265, {wxStyledTextCtrl, braceBadLight, 1}},
+ {3266, {wxStyledTextCtrl, braceMatch, 1}},
+ {3267, {wxStyledTextCtrl, getViewEOL, 0}},
+ {3268, {wxStyledTextCtrl, setViewEOL, 1}},
+ {3269, {wxStyledTextCtrl, setModEventMask, 1}},
+ {3270, {wxStyledTextCtrl, getEdgeColumn, 0}},
+ {3271, {wxStyledTextCtrl, setEdgeColumn, 1}},
+ {3272, {wxStyledTextCtrl, getEdgeMode, 0}},
+ {3273, {wxStyledTextCtrl, getEdgeColour, 0}},
+ {3274, {wxStyledTextCtrl, setEdgeColour, 1}},
+ {3275, {wxStyledTextCtrl, searchAnchor, 0}},
+ {3276, {wxStyledTextCtrl, searchNext, 2}},
+ {3277, {wxStyledTextCtrl, searchPrev, 2}},
+ {3278, {wxStyledTextCtrl, linesOnScreen, 0}},
+ {3279, {wxStyledTextCtrl, usePopUp, 1}},
+ {3280, {wxStyledTextCtrl, selectionIsRectangle, 0}},
+ {3281, {wxStyledTextCtrl, setZoom, 1}},
+ {3282, {wxStyledTextCtrl, getZoom, 0}},
+ {3283, {wxStyledTextCtrl, getModEventMask, 0}},
+ {3284, {wxStyledTextCtrl, setSTCFocus, 1}},
+ {3285, {wxStyledTextCtrl, getSTCFocus, 0}},
+ {3286, {wxStyledTextCtrl, setStatus, 1}},
+ {3287, {wxStyledTextCtrl, getStatus, 0}},
+ {3288, {wxStyledTextCtrl, setMouseDownCaptures, 1}},
+ {3289, {wxStyledTextCtrl, getMouseDownCaptures, 0}},
+ {3290, {wxStyledTextCtrl, setSTCCursor, 1}},
+ {3291, {wxStyledTextCtrl, getSTCCursor, 0}},
+ {3292, {wxStyledTextCtrl, setControlCharSymbol, 1}},
+ {3293, {wxStyledTextCtrl, getControlCharSymbol, 0}},
+ {3294, {wxStyledTextCtrl, wordPartLeft, 0}},
+ {3295, {wxStyledTextCtrl, wordPartLeftExtend, 0}},
+ {3296, {wxStyledTextCtrl, wordPartRight, 0}},
+ {3297, {wxStyledTextCtrl, wordPartRightExtend, 0}},
+ {3298, {wxStyledTextCtrl, setVisiblePolicy, 2}},
+ {3299, {wxStyledTextCtrl, delLineLeft, 0}},
+ {3300, {wxStyledTextCtrl, delLineRight, 0}},
+ {3301, {wxStyledTextCtrl, getXOffset, 0}},
+ {3302, {wxStyledTextCtrl, chooseCaretX, 0}},
+ {3303, {wxStyledTextCtrl, setXCaretPolicy, 2}},
+ {3304, {wxStyledTextCtrl, setYCaretPolicy, 2}},
+ {3305, {wxStyledTextCtrl, getPrintWrapMode, 0}},
+ {3306, {wxStyledTextCtrl, setHotspotActiveForeground, 2}},
+ {3307, {wxStyledTextCtrl, setHotspotActiveBackground, 2}},
+ {3308, {wxStyledTextCtrl, setHotspotActiveUnderline, 1}},
+ {3309, {wxStyledTextCtrl, setHotspotSingleLine, 1}},
+ {3310, {wxStyledTextCtrl, paraDownExtend, 0}},
+ {3311, {wxStyledTextCtrl, paraUp, 0}},
+ {3312, {wxStyledTextCtrl, paraUpExtend, 0}},
+ {3313, {wxStyledTextCtrl, positionBefore, 1}},
+ {3314, {wxStyledTextCtrl, positionAfter, 1}},
+ {3315, {wxStyledTextCtrl, copyRange, 2}},
+ {3316, {wxStyledTextCtrl, copyText, 2}},
+ {3317, {wxStyledTextCtrl, setSelectionMode, 1}},
+ {3318, {wxStyledTextCtrl, getSelectionMode, 0}},
+ {3319, {wxStyledTextCtrl, lineDownRectExtend, 0}},
+ {3320, {wxStyledTextCtrl, lineUpRectExtend, 0}},
+ {3321, {wxStyledTextCtrl, charLeftRectExtend, 0}},
+ {3322, {wxStyledTextCtrl, charRightRectExtend, 0}},
+ {3323, {wxStyledTextCtrl, homeRectExtend, 0}},
+ {3324, {wxStyledTextCtrl, vCHomeRectExtend, 0}},
+ {3325, {wxStyledTextCtrl, lineEndRectExtend, 0}},
+ {3326, {wxStyledTextCtrl, pageUpRectExtend, 0}},
+ {3327, {wxStyledTextCtrl, pageDownRectExtend, 0}},
+ {3328, {wxStyledTextCtrl, stutteredPageUp, 0}},
+ {3329, {wxStyledTextCtrl, stutteredPageUpExtend, 0}},
+ {3330, {wxStyledTextCtrl, stutteredPageDown, 0}},
+ {3331, {wxStyledTextCtrl, stutteredPageDownExtend, 0}},
+ {3332, {wxStyledTextCtrl, wordLeftEnd, 0}},
+ {3333, {wxStyledTextCtrl, wordLeftEndExtend, 0}},
+ {3334, {wxStyledTextCtrl, wordRightEnd, 0}},
+ {3335, {wxStyledTextCtrl, wordRightEndExtend, 0}},
+ {3336, {wxStyledTextCtrl, setWhitespaceChars, 1}},
+ {3337, {wxStyledTextCtrl, setCharsDefault, 0}},
+ {3338, {wxStyledTextCtrl, autoCompGetCurrent, 0}},
+ {3339, {wxStyledTextCtrl, allocate, 1}},
+ {3340, {wxStyledTextCtrl, findColumn, 2}},
+ {3341, {wxStyledTextCtrl, getCaretSticky, 0}},
+ {3342, {wxStyledTextCtrl, setCaretSticky, 1}},
+ {3343, {wxStyledTextCtrl, toggleCaretSticky, 0}},
+ {3344, {wxStyledTextCtrl, setPasteConvertEndings, 1}},
+ {3345, {wxStyledTextCtrl, getPasteConvertEndings, 0}},
+ {3346, {wxStyledTextCtrl, selectionDuplicate, 0}},
+ {3347, {wxStyledTextCtrl, setCaretLineBackAlpha, 1}},
+ {3348, {wxStyledTextCtrl, getCaretLineBackAlpha, 0}},
+ {3349, {wxStyledTextCtrl, startRecord, 0}},
+ {3350, {wxStyledTextCtrl, stopRecord, 0}},
+ {3351, {wxStyledTextCtrl, setLexer, 1}},
+ {3352, {wxStyledTextCtrl, getLexer, 0}},
+ {3353, {wxStyledTextCtrl, colourise, 2}},
+ {3354, {wxStyledTextCtrl, setProperty, 2}},
+ {3355, {wxStyledTextCtrl, setKeyWords, 2}},
+ {3356, {wxStyledTextCtrl, setLexerLanguage, 1}},
+ {3357, {wxStyledTextCtrl, getProperty, 1}},
+ {3358, {wxStyledTextCtrl, getStyleBitsNeeded, 0}},
+ {3359, {wxStyledTextCtrl, getCurrentLine, 0}},
+ {3360, {wxStyledTextCtrl, styleSetSpec, 2}},
+ {3361, {wxStyledTextCtrl, styleSetFont, 2}},
+ {3362, {wxStyledTextCtrl, styleSetFontAttr, 7}},
+ {3363, {wxStyledTextCtrl, styleSetCharacterSet, 2}},
+ {3364, {wxStyledTextCtrl, styleSetFontEncoding, 2}},
+ {3365, {wxStyledTextCtrl, cmdKeyExecute, 1}},
+ {3366, {wxStyledTextCtrl, setMargins, 2}},
+ {3367, {wxStyledTextCtrl, getSelection, 2}},
+ {3368, {wxStyledTextCtrl, pointFromPosition, 1}},
+ {3369, {wxStyledTextCtrl, scrollToLine, 1}},
+ {3370, {wxStyledTextCtrl, scrollToColumn, 1}},
+ {3371, {wxStyledTextCtrl, sendMsg, 2}},
+ {3372, {wxStyledTextCtrl, setVScrollBar, 1}},
+ {3373, {wxStyledTextCtrl, setHScrollBar, 1}},
+ {3374, {wxStyledTextCtrl, getLastKeydownProcessed, 0}},
+ {3375, {wxStyledTextCtrl, setLastKeydownProcessed, 1}},
+ {3376, {wxStyledTextCtrl, saveFile, 1}},
+ {3377, {wxStyledTextCtrl, loadFile, 1}},
+ {3378, {wxStyledTextCtrl, doDragOver, 3}},
+ {3379, {wxStyledTextCtrl, doDropText, 3}},
+ {3380, {wxStyledTextCtrl, getUseAntiAliasing, 0}},
+ {3381, {wxStyledTextCtrl, addTextRaw, 1}},
+ {3382, {wxStyledTextCtrl, insertTextRaw, 2}},
+ {3383, {wxStyledTextCtrl, getCurLineRaw, 1}},
+ {3384, {wxStyledTextCtrl, getLineRaw, 1}},
+ {3385, {wxStyledTextCtrl, getSelectedTextRaw, 0}},
+ {3386, {wxStyledTextCtrl, getTextRangeRaw, 2}},
+ {3387, {wxStyledTextCtrl, setTextRaw, 1}},
+ {3388, {wxStyledTextCtrl, getTextRaw, 0}},
+ {3389, {wxStyledTextCtrl, appendTextRaw, 1}},
+ {3390, {wxArtProvider, getBitmap, 2}},
+ {3391, {wxArtProvider, getIcon, 2}},
+ {3392, {wxTreeEvent, getKeyCode, 0}},
+ {3393, {wxTreeEvent, getItem, 0}},
+ {3394, {wxTreeEvent, getKeyEvent, 0}},
+ {3395, {wxTreeEvent, getLabel, 0}},
+ {3396, {wxTreeEvent, getOldItem, 0}},
+ {3397, {wxTreeEvent, getPoint, 0}},
+ {3398, {wxTreeEvent, isEditCancelled, 0}},
+ {3399, {wxTreeEvent, setToolTip, 1}},
+ {3400, {wxNotebookEvent, getOldSelection, 0}},
+ {3401, {wxNotebookEvent, getSelection, 0}},
+ {3402, {wxNotebookEvent, setOldSelection, 1}},
+ {3403, {wxNotebookEvent, setSelection, 1}},
+ {3404, {wxFileDataObject, new, 0}},
+ {3405, {wxFileDataObject, addFile, 1}},
+ {3406, {wxFileDataObject, getFilenames, 0}},
+ {3407, {wxFileDataObject, 'Destroy', undefined}},
+ {3408, {wxTextDataObject, new, 1}},
+ {3409, {wxTextDataObject, getTextLength, 0}},
+ {3410, {wxTextDataObject, getText, 0}},
+ {3411, {wxTextDataObject, setText, 1}},
+ {3412, {wxTextDataObject, 'Destroy', undefined}},
+ {3413, {wxBitmapDataObject, new_1_1, 1}},
+ {3414, {wxBitmapDataObject, new_1_0, 1}},
+ {3415, {wxBitmapDataObject, getBitmap, 0}},
+ {3416, {wxBitmapDataObject, setBitmap, 1}},
+ {3417, {wxBitmapDataObject, 'Destroy', undefined}},
+ {3419, {wxClipboard, new, 0}},
+ {3420, {wxClipboard, destruct, 0}},
+ {3421, {wxClipboard, addData, 1}},
+ {3422, {wxClipboard, clear, 0}},
+ {3423, {wxClipboard, close, 0}},
+ {3424, {wxClipboard, flush, 0}},
+ {3425, {wxClipboard, getData, 1}},
+ {3426, {wxClipboard, isOpened, 0}},
+ {3427, {wxClipboard, open, 0}},
+ {3428, {wxClipboard, setData, 1}},
+ {3430, {wxClipboard, usePrimarySelection, 1}},
+ {3431, {wxClipboard, isSupported, 1}},
+ {3432, {wxClipboard, get, 0}},
+ {3433, {wxSpinEvent, getPosition, 0}},
+ {3434, {wxSpinEvent, setPosition, 1}},
+ {3435, {wxSplitterWindow, new_0, 0}},
+ {3436, {wxSplitterWindow, new_2, 2}},
+ {3437, {wxSplitterWindow, destruct, 0}},
+ {3438, {wxSplitterWindow, create, 2}},
+ {3439, {wxSplitterWindow, getMinimumPaneSize, 0}},
+ {3440, {wxSplitterWindow, getSashGravity, 0}},
+ {3441, {wxSplitterWindow, getSashPosition, 0}},
+ {3442, {wxSplitterWindow, getSplitMode, 0}},
+ {3443, {wxSplitterWindow, getWindow1, 0}},
+ {3444, {wxSplitterWindow, getWindow2, 0}},
+ {3445, {wxSplitterWindow, initialize, 1}},
+ {3446, {wxSplitterWindow, isSplit, 0}},
+ {3447, {wxSplitterWindow, replaceWindow, 2}},
+ {3448, {wxSplitterWindow, setSashGravity, 1}},
+ {3449, {wxSplitterWindow, setSashPosition, 2}},
+ {3450, {wxSplitterWindow, setSashSize, 1}},
+ {3451, {wxSplitterWindow, setMinimumPaneSize, 1}},
+ {3452, {wxSplitterWindow, setSplitMode, 1}},
+ {3453, {wxSplitterWindow, splitHorizontally, 3}},
+ {3454, {wxSplitterWindow, splitVertically, 3}},
+ {3455, {wxSplitterWindow, unsplit, 1}},
+ {3456, {wxSplitterWindow, updateSize, 0}},
+ {3457, {wxSplitterEvent, getSashPosition, 0}},
+ {3458, {wxSplitterEvent, getX, 0}},
+ {3459, {wxSplitterEvent, getY, 0}},
+ {3460, {wxSplitterEvent, getWindowBeingRemoved, 0}},
+ {3461, {wxSplitterEvent, setSashPosition, 1}},
+ {3462, {wxHtmlWindow, new_0, 0}},
+ {3463, {wxHtmlWindow, new_2, 2}},
+ {3464, {wxHtmlWindow, appendToPage, 1}},
+ {3465, {wxHtmlWindow, getOpenedAnchor, 0}},
+ {3466, {wxHtmlWindow, getOpenedPage, 0}},
+ {3467, {wxHtmlWindow, getOpenedPageTitle, 0}},
+ {3468, {wxHtmlWindow, getRelatedFrame, 0}},
+ {3469, {wxHtmlWindow, historyBack, 0}},
+ {3470, {wxHtmlWindow, historyCanBack, 0}},
+ {3471, {wxHtmlWindow, historyCanForward, 0}},
+ {3472, {wxHtmlWindow, historyClear, 0}},
+ {3473, {wxHtmlWindow, historyForward, 0}},
+ {3474, {wxHtmlWindow, loadFile, 1}},
+ {3475, {wxHtmlWindow, loadPage, 1}},
+ {3476, {wxHtmlWindow, selectAll, 0}},
+ {3477, {wxHtmlWindow, selectionToText, 0}},
+ {3478, {wxHtmlWindow, selectLine, 1}},
+ {3479, {wxHtmlWindow, selectWord, 1}},
+ {3480, {wxHtmlWindow, setBorders, 1}},
+ {3481, {wxHtmlWindow, setFonts, 3}},
+ {3482, {wxHtmlWindow, setPage, 1}},
+ {3483, {wxHtmlWindow, setRelatedFrame, 2}},
+ {3484, {wxHtmlWindow, setRelatedStatusBar, 1}},
+ {3485, {wxHtmlWindow, toText, 0}},
+ {3486, {wxHtmlWindow, 'Destroy', undefined}},
+ {3487, {wxHtmlLinkEvent, getLinkInfo, 0}},
+ {3488, {wxSystemSettings, getColour, 1}},
+ {3489, {wxSystemSettings, getFont, 1}},
+ {3490, {wxSystemSettings, getMetric, 2}},
+ {3491, {wxSystemSettings, getScreenType, 0}},
+ {3492, {wxAuiNotebookEvent, setSelection, 1}},
+ {3493, {wxAuiNotebookEvent, getSelection, 0}},
+ {3494, {wxAuiNotebookEvent, setOldSelection, 1}},
+ {3495, {wxAuiNotebookEvent, getOldSelection, 0}},
+ {3496, {wxAuiNotebookEvent, setDragSource, 1}},
+ {3497, {wxAuiNotebookEvent, getDragSource, 0}},
+ {3498, {wxAuiManagerEvent, setManager, 1}},
+ {3499, {wxAuiManagerEvent, getManager, 0}},
+ {3500, {wxAuiManagerEvent, setPane, 1}},
+ {3501, {wxAuiManagerEvent, getPane, 0}},
+ {3502, {wxAuiManagerEvent, setButton, 1}},
+ {3503, {wxAuiManagerEvent, getButton, 0}},
+ {3504, {wxAuiManagerEvent, setDC, 1}},
+ {3505, {wxAuiManagerEvent, getDC, 0}},
+ {3506, {wxAuiManagerEvent, veto, 1}},
+ {3507, {wxAuiManagerEvent, getVeto, 0}},
+ {3508, {wxAuiManagerEvent, setCanVeto, 1}},
+ {3509, {wxAuiManagerEvent, canVeto, 0}},
+ {3510, {wxLogNull, new, 0}},
+ {3511, {wxLogNull, 'Destroy', undefined}},
  {-1, {mod, func, -1}}
 ].
 
diff --git a/lib/wx/src/gen/wxe_funcs.hrl b/lib/wx/src/gen/wxe_funcs.hrl
index cf672644c6..af74caaa25 100644
--- a/lib/wx/src/gen/wxe_funcs.hrl
+++ b/lib/wx/src/gen/wxe_funcs.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1600,1681 +1600,1693 @@
 -define(wxListItem_SetText, 1754).
 -define(wxListItem_SetTextColour, 1755).
 -define(wxListItem_SetWidth, 1756).
--define(wxImageList_new_0, 1757).
--define(wxImageList_new_3, 1758).
--define(wxImageList_Add_1, 1759).
--define(wxImageList_Add_2_0, 1760).
--define(wxImageList_Add_2_1, 1761).
--define(wxImageList_Create, 1762).
--define(wxImageList_Draw, 1764).
--define(wxImageList_GetBitmap, 1765).
--define(wxImageList_GetIcon, 1766).
--define(wxImageList_GetImageCount, 1767).
--define(wxImageList_GetSize, 1768).
--define(wxImageList_Remove, 1769).
--define(wxImageList_RemoveAll, 1770).
--define(wxImageList_Replace_2, 1771).
--define(wxImageList_Replace_3, 1772).
--define(wxImageList_destroy, 1773).
--define(wxTextAttr_new_0, 1774).
--define(wxTextAttr_new_2, 1775).
--define(wxTextAttr_GetAlignment, 1776).
--define(wxTextAttr_GetBackgroundColour, 1777).
--define(wxTextAttr_GetFont, 1778).
--define(wxTextAttr_GetLeftIndent, 1779).
--define(wxTextAttr_GetLeftSubIndent, 1780).
--define(wxTextAttr_GetRightIndent, 1781).
--define(wxTextAttr_GetTabs, 1782).
--define(wxTextAttr_GetTextColour, 1783).
--define(wxTextAttr_HasBackgroundColour, 1784).
--define(wxTextAttr_HasFont, 1785).
--define(wxTextAttr_HasTextColour, 1786).
--define(wxTextAttr_GetFlags, 1787).
--define(wxTextAttr_IsDefault, 1788).
--define(wxTextAttr_SetAlignment, 1789).
--define(wxTextAttr_SetBackgroundColour, 1790).
--define(wxTextAttr_SetFlags, 1791).
--define(wxTextAttr_SetFont, 1792).
--define(wxTextAttr_SetLeftIndent, 1793).
--define(wxTextAttr_SetRightIndent, 1794).
--define(wxTextAttr_SetTabs, 1795).
--define(wxTextAttr_SetTextColour, 1796).
--define(wxTextAttr_destroy, 1797).
--define(wxTextCtrl_new_3, 1799).
--define(wxTextCtrl_new_0, 1800).
--define(wxTextCtrl_destruct, 1802).
--define(wxTextCtrl_AppendText, 1803).
--define(wxTextCtrl_CanCopy, 1804).
--define(wxTextCtrl_CanCut, 1805).
--define(wxTextCtrl_CanPaste, 1806).
--define(wxTextCtrl_CanRedo, 1807).
--define(wxTextCtrl_CanUndo, 1808).
--define(wxTextCtrl_Clear, 1809).
--define(wxTextCtrl_Copy, 1810).
--define(wxTextCtrl_Create, 1811).
--define(wxTextCtrl_Cut, 1812).
--define(wxTextCtrl_DiscardEdits, 1813).
--define(wxTextCtrl_EmulateKeyPress, 1814).
--define(wxTextCtrl_GetDefaultStyle, 1815).
--define(wxTextCtrl_GetInsertionPoint, 1816).
--define(wxTextCtrl_GetLastPosition, 1817).
--define(wxTextCtrl_GetLineLength, 1818).
--define(wxTextCtrl_GetLineText, 1819).
--define(wxTextCtrl_GetNumberOfLines, 1820).
--define(wxTextCtrl_GetRange, 1821).
--define(wxTextCtrl_GetSelection, 1822).
--define(wxTextCtrl_GetStringSelection, 1823).
--define(wxTextCtrl_GetStyle, 1824).
--define(wxTextCtrl_GetValue, 1825).
--define(wxTextCtrl_IsEditable, 1826).
--define(wxTextCtrl_IsModified, 1827).
--define(wxTextCtrl_IsMultiLine, 1828).
--define(wxTextCtrl_IsSingleLine, 1829).
--define(wxTextCtrl_LoadFile, 1830).
--define(wxTextCtrl_MarkDirty, 1831).
--define(wxTextCtrl_Paste, 1832).
--define(wxTextCtrl_PositionToXY, 1833).
--define(wxTextCtrl_Redo, 1834).
--define(wxTextCtrl_Remove, 1835).
--define(wxTextCtrl_Replace, 1836).
--define(wxTextCtrl_SaveFile, 1837).
--define(wxTextCtrl_SetDefaultStyle, 1838).
--define(wxTextCtrl_SetEditable, 1839).
--define(wxTextCtrl_SetInsertionPoint, 1840).
--define(wxTextCtrl_SetInsertionPointEnd, 1841).
--define(wxTextCtrl_SetMaxLength, 1843).
--define(wxTextCtrl_SetSelection, 1844).
--define(wxTextCtrl_SetStyle, 1845).
--define(wxTextCtrl_SetValue, 1846).
--define(wxTextCtrl_ShowPosition, 1847).
--define(wxTextCtrl_Undo, 1848).
--define(wxTextCtrl_WriteText, 1849).
--define(wxTextCtrl_XYToPosition, 1850).
--define(wxNotebook_new_0, 1853).
--define(wxNotebook_new_3, 1854).
--define(wxNotebook_destruct, 1855).
--define(wxNotebook_AddPage, 1856).
--define(wxNotebook_AdvanceSelection, 1857).
--define(wxNotebook_AssignImageList, 1858).
--define(wxNotebook_Create, 1859).
--define(wxNotebook_DeleteAllPages, 1860).
--define(wxNotebook_DeletePage, 1861).
--define(wxNotebook_RemovePage, 1862).
--define(wxNotebook_GetCurrentPage, 1863).
--define(wxNotebook_GetImageList, 1864).
--define(wxNotebook_GetPage, 1866).
--define(wxNotebook_GetPageCount, 1867).
--define(wxNotebook_GetPageImage, 1868).
--define(wxNotebook_GetPageText, 1869).
--define(wxNotebook_GetRowCount, 1870).
--define(wxNotebook_GetSelection, 1871).
--define(wxNotebook_GetThemeBackgroundColour, 1872).
--define(wxNotebook_HitTest, 1874).
--define(wxNotebook_InsertPage, 1876).
--define(wxNotebook_SetImageList, 1877).
--define(wxNotebook_SetPadding, 1878).
--define(wxNotebook_SetPageSize, 1879).
--define(wxNotebook_SetPageImage, 1880).
--define(wxNotebook_SetPageText, 1881).
--define(wxNotebook_SetSelection, 1882).
--define(wxNotebook_ChangeSelection, 1883).
--define(wxChoicebook_new_0, 1884).
--define(wxChoicebook_new_3, 1885).
--define(wxChoicebook_AddPage, 1886).
--define(wxChoicebook_AdvanceSelection, 1887).
--define(wxChoicebook_AssignImageList, 1888).
--define(wxChoicebook_Create, 1889).
--define(wxChoicebook_DeleteAllPages, 1890).
--define(wxChoicebook_DeletePage, 1891).
--define(wxChoicebook_RemovePage, 1892).
--define(wxChoicebook_GetCurrentPage, 1893).
--define(wxChoicebook_GetImageList, 1894).
--define(wxChoicebook_GetPage, 1896).
--define(wxChoicebook_GetPageCount, 1897).
--define(wxChoicebook_GetPageImage, 1898).
--define(wxChoicebook_GetPageText, 1899).
--define(wxChoicebook_GetSelection, 1900).
--define(wxChoicebook_HitTest, 1901).
--define(wxChoicebook_InsertPage, 1902).
--define(wxChoicebook_SetImageList, 1903).
--define(wxChoicebook_SetPageSize, 1904).
--define(wxChoicebook_SetPageImage, 1905).
--define(wxChoicebook_SetPageText, 1906).
--define(wxChoicebook_SetSelection, 1907).
--define(wxChoicebook_ChangeSelection, 1908).
--define(wxChoicebook_destroy, 1909).
--define(wxToolbook_new_0, 1910).
--define(wxToolbook_new_3, 1911).
--define(wxToolbook_AddPage, 1912).
--define(wxToolbook_AdvanceSelection, 1913).
--define(wxToolbook_AssignImageList, 1914).
--define(wxToolbook_Create, 1915).
--define(wxToolbook_DeleteAllPages, 1916).
--define(wxToolbook_DeletePage, 1917).
--define(wxToolbook_RemovePage, 1918).
--define(wxToolbook_GetCurrentPage, 1919).
--define(wxToolbook_GetImageList, 1920).
--define(wxToolbook_GetPage, 1922).
--define(wxToolbook_GetPageCount, 1923).
--define(wxToolbook_GetPageImage, 1924).
--define(wxToolbook_GetPageText, 1925).
--define(wxToolbook_GetSelection, 1926).
--define(wxToolbook_HitTest, 1928).
--define(wxToolbook_InsertPage, 1929).
--define(wxToolbook_SetImageList, 1930).
--define(wxToolbook_SetPageSize, 1931).
--define(wxToolbook_SetPageImage, 1932).
--define(wxToolbook_SetPageText, 1933).
--define(wxToolbook_SetSelection, 1934).
--define(wxToolbook_ChangeSelection, 1935).
--define(wxToolbook_destroy, 1936).
--define(wxListbook_new_0, 1937).
--define(wxListbook_new_3, 1938).
--define(wxListbook_AddPage, 1939).
--define(wxListbook_AdvanceSelection, 1940).
--define(wxListbook_AssignImageList, 1941).
--define(wxListbook_Create, 1942).
--define(wxListbook_DeleteAllPages, 1943).
--define(wxListbook_DeletePage, 1944).
--define(wxListbook_RemovePage, 1945).
--define(wxListbook_GetCurrentPage, 1946).
--define(wxListbook_GetImageList, 1947).
--define(wxListbook_GetPage, 1949).
--define(wxListbook_GetPageCount, 1950).
--define(wxListbook_GetPageImage, 1951).
--define(wxListbook_GetPageText, 1952).
--define(wxListbook_GetSelection, 1953).
--define(wxListbook_HitTest, 1955).
--define(wxListbook_InsertPage, 1956).
--define(wxListbook_SetImageList, 1957).
--define(wxListbook_SetPageSize, 1958).
--define(wxListbook_SetPageImage, 1959).
--define(wxListbook_SetPageText, 1960).
--define(wxListbook_SetSelection, 1961).
--define(wxListbook_ChangeSelection, 1962).
--define(wxListbook_destroy, 1963).
--define(wxTreebook_new_0, 1964).
--define(wxTreebook_new_3, 1965).
--define(wxTreebook_AddPage, 1966).
--define(wxTreebook_AdvanceSelection, 1967).
--define(wxTreebook_AssignImageList, 1968).
--define(wxTreebook_Create, 1969).
--define(wxTreebook_DeleteAllPages, 1970).
--define(wxTreebook_DeletePage, 1971).
--define(wxTreebook_RemovePage, 1972).
--define(wxTreebook_GetCurrentPage, 1973).
--define(wxTreebook_GetImageList, 1974).
--define(wxTreebook_GetPage, 1976).
--define(wxTreebook_GetPageCount, 1977).
--define(wxTreebook_GetPageImage, 1978).
--define(wxTreebook_GetPageText, 1979).
--define(wxTreebook_GetSelection, 1980).
--define(wxTreebook_ExpandNode, 1981).
--define(wxTreebook_IsNodeExpanded, 1982).
--define(wxTreebook_HitTest, 1984).
--define(wxTreebook_InsertPage, 1985).
--define(wxTreebook_InsertSubPage, 1986).
--define(wxTreebook_SetImageList, 1987).
--define(wxTreebook_SetPageSize, 1988).
--define(wxTreebook_SetPageImage, 1989).
--define(wxTreebook_SetPageText, 1990).
--define(wxTreebook_SetSelection, 1991).
--define(wxTreebook_ChangeSelection, 1992).
--define(wxTreebook_destroy, 1993).
--define(wxTreeCtrl_new_2, 1996).
--define(wxTreeCtrl_new_0, 1997).
--define(wxTreeCtrl_destruct, 1999).
--define(wxTreeCtrl_AddRoot, 2000).
--define(wxTreeCtrl_AppendItem, 2001).
--define(wxTreeCtrl_AssignImageList, 2002).
--define(wxTreeCtrl_AssignStateImageList, 2003).
--define(wxTreeCtrl_Collapse, 2004).
--define(wxTreeCtrl_CollapseAndReset, 2005).
--define(wxTreeCtrl_Create, 2006).
--define(wxTreeCtrl_Delete, 2007).
--define(wxTreeCtrl_DeleteAllItems, 2008).
--define(wxTreeCtrl_DeleteChildren, 2009).
--define(wxTreeCtrl_EditLabel, 2010).
--define(wxTreeCtrl_EnsureVisible, 2011).
--define(wxTreeCtrl_Expand, 2012).
--define(wxTreeCtrl_GetBoundingRect, 2013).
--define(wxTreeCtrl_GetChildrenCount, 2015).
--define(wxTreeCtrl_GetCount, 2016).
--define(wxTreeCtrl_GetEditControl, 2017).
--define(wxTreeCtrl_GetFirstChild, 2018).
--define(wxTreeCtrl_GetNextChild, 2019).
--define(wxTreeCtrl_GetFirstVisibleItem, 2020).
--define(wxTreeCtrl_GetImageList, 2021).
--define(wxTreeCtrl_GetIndent, 2022).
--define(wxTreeCtrl_GetItemBackgroundColour, 2023).
--define(wxTreeCtrl_GetItemData, 2024).
--define(wxTreeCtrl_GetItemFont, 2025).
--define(wxTreeCtrl_GetItemImage_1, 2026).
--define(wxTreeCtrl_GetItemImage_2, 2027).
--define(wxTreeCtrl_GetItemText, 2028).
--define(wxTreeCtrl_GetItemTextColour, 2029).
--define(wxTreeCtrl_GetLastChild, 2030).
--define(wxTreeCtrl_GetNextSibling, 2031).
--define(wxTreeCtrl_GetNextVisible, 2032).
--define(wxTreeCtrl_GetItemParent, 2033).
--define(wxTreeCtrl_GetPrevSibling, 2034).
--define(wxTreeCtrl_GetPrevVisible, 2035).
--define(wxTreeCtrl_GetRootItem, 2036).
--define(wxTreeCtrl_GetSelection, 2037).
--define(wxTreeCtrl_GetSelections, 2038).
--define(wxTreeCtrl_GetStateImageList, 2039).
--define(wxTreeCtrl_HitTest, 2040).
--define(wxTreeCtrl_InsertItem, 2042).
--define(wxTreeCtrl_IsBold, 2043).
--define(wxTreeCtrl_IsExpanded, 2044).
--define(wxTreeCtrl_IsSelected, 2045).
--define(wxTreeCtrl_IsVisible, 2046).
--define(wxTreeCtrl_ItemHasChildren, 2047).
--define(wxTreeCtrl_PrependItem, 2048).
--define(wxTreeCtrl_ScrollTo, 2049).
--define(wxTreeCtrl_SelectItem_1, 2050).
--define(wxTreeCtrl_SelectItem_2, 2051).
--define(wxTreeCtrl_SetIndent, 2052).
--define(wxTreeCtrl_SetImageList, 2053).
--define(wxTreeCtrl_SetItemBackgroundColour, 2054).
--define(wxTreeCtrl_SetItemBold, 2055).
--define(wxTreeCtrl_SetItemData, 2056).
--define(wxTreeCtrl_SetItemDropHighlight, 2057).
--define(wxTreeCtrl_SetItemFont, 2058).
--define(wxTreeCtrl_SetItemHasChildren, 2059).
--define(wxTreeCtrl_SetItemImage_2, 2060).
--define(wxTreeCtrl_SetItemImage_3, 2061).
--define(wxTreeCtrl_SetItemText, 2062).
--define(wxTreeCtrl_SetItemTextColour, 2063).
--define(wxTreeCtrl_SetStateImageList, 2064).
--define(wxTreeCtrl_SetWindowStyle, 2065).
--define(wxTreeCtrl_SortChildren, 2066).
--define(wxTreeCtrl_Toggle, 2067).
--define(wxTreeCtrl_ToggleItemSelection, 2068).
--define(wxTreeCtrl_Unselect, 2069).
--define(wxTreeCtrl_UnselectAll, 2070).
--define(wxTreeCtrl_UnselectItem, 2071).
--define(wxScrollBar_new_0, 2072).
--define(wxScrollBar_new_3, 2073).
--define(wxScrollBar_destruct, 2074).
--define(wxScrollBar_Create, 2075).
--define(wxScrollBar_GetRange, 2076).
--define(wxScrollBar_GetPageSize, 2077).
--define(wxScrollBar_GetThumbPosition, 2078).
--define(wxScrollBar_GetThumbSize, 2079).
--define(wxScrollBar_SetThumbPosition, 2080).
--define(wxScrollBar_SetScrollbar, 2081).
--define(wxSpinButton_new_2, 2083).
--define(wxSpinButton_new_0, 2084).
--define(wxSpinButton_Create, 2085).
--define(wxSpinButton_GetMax, 2086).
--define(wxSpinButton_GetMin, 2087).
--define(wxSpinButton_GetValue, 2088).
--define(wxSpinButton_SetRange, 2089).
--define(wxSpinButton_SetValue, 2090).
--define(wxSpinButton_destroy, 2091).
--define(wxSpinCtrl_new_0, 2092).
--define(wxSpinCtrl_new_2, 2093).
--define(wxSpinCtrl_Create, 2095).
--define(wxSpinCtrl_SetValue_1_1, 2098).
--define(wxSpinCtrl_SetValue_1_0, 2099).
--define(wxSpinCtrl_GetValue, 2101).
--define(wxSpinCtrl_SetRange, 2103).
--define(wxSpinCtrl_SetSelection, 2104).
--define(wxSpinCtrl_GetMin, 2106).
--define(wxSpinCtrl_GetMax, 2108).
--define(wxSpinCtrl_destroy, 2109).
--define(wxStaticText_new_0, 2110).
--define(wxStaticText_new_4, 2111).
--define(wxStaticText_Create, 2112).
--define(wxStaticText_GetLabel, 2113).
--define(wxStaticText_SetLabel, 2114).
--define(wxStaticText_Wrap, 2115).
--define(wxStaticText_destroy, 2116).
--define(wxStaticBitmap_new_0, 2117).
--define(wxStaticBitmap_new_4, 2118).
--define(wxStaticBitmap_Create, 2119).
--define(wxStaticBitmap_GetBitmap, 2120).
--define(wxStaticBitmap_SetBitmap, 2121).
--define(wxStaticBitmap_destroy, 2122).
--define(wxRadioBox_new, 2123).
--define(wxRadioBox_destruct, 2125).
--define(wxRadioBox_Create, 2126).
--define(wxRadioBox_Enable_2, 2127).
--define(wxRadioBox_Enable_1, 2128).
--define(wxRadioBox_GetSelection, 2129).
--define(wxRadioBox_GetString, 2130).
--define(wxRadioBox_SetSelection, 2131).
--define(wxRadioBox_Show_2, 2132).
--define(wxRadioBox_Show_1, 2133).
--define(wxRadioBox_GetColumnCount, 2134).
--define(wxRadioBox_GetItemHelpText, 2135).
--define(wxRadioBox_GetItemToolTip, 2136).
--define(wxRadioBox_GetItemFromPoint, 2138).
--define(wxRadioBox_GetRowCount, 2139).
--define(wxRadioBox_IsItemEnabled, 2140).
--define(wxRadioBox_IsItemShown, 2141).
--define(wxRadioBox_SetItemHelpText, 2142).
--define(wxRadioBox_SetItemToolTip, 2143).
--define(wxRadioButton_new_0, 2144).
--define(wxRadioButton_new_4, 2145).
--define(wxRadioButton_Create, 2146).
--define(wxRadioButton_GetValue, 2147).
--define(wxRadioButton_SetValue, 2148).
--define(wxRadioButton_destroy, 2149).
--define(wxSlider_new_6, 2151).
--define(wxSlider_new_0, 2152).
--define(wxSlider_Create, 2153).
--define(wxSlider_GetLineSize, 2154).
--define(wxSlider_GetMax, 2155).
--define(wxSlider_GetMin, 2156).
--define(wxSlider_GetPageSize, 2157).
--define(wxSlider_GetThumbLength, 2158).
--define(wxSlider_GetValue, 2159).
--define(wxSlider_SetLineSize, 2160).
--define(wxSlider_SetPageSize, 2161).
--define(wxSlider_SetRange, 2162).
--define(wxSlider_SetThumbLength, 2163).
--define(wxSlider_SetValue, 2164).
--define(wxSlider_destroy, 2165).
--define(wxDialog_new_4, 2167).
--define(wxDialog_new_0, 2168).
--define(wxDialog_destruct, 2170).
--define(wxDialog_Create, 2171).
--define(wxDialog_CreateButtonSizer, 2172).
--define(wxDialog_CreateStdDialogButtonSizer, 2173).
--define(wxDialog_EndModal, 2174).
--define(wxDialog_GetAffirmativeId, 2175).
--define(wxDialog_GetReturnCode, 2176).
--define(wxDialog_IsModal, 2177).
--define(wxDialog_SetAffirmativeId, 2178).
--define(wxDialog_SetReturnCode, 2179).
--define(wxDialog_Show, 2180).
--define(wxDialog_ShowModal, 2181).
--define(wxColourDialog_new_0, 2182).
--define(wxColourDialog_new_2, 2183).
--define(wxColourDialog_destruct, 2184).
--define(wxColourDialog_Create, 2185).
--define(wxColourDialog_GetColourData, 2186).
--define(wxColourData_new_0, 2187).
--define(wxColourData_new_1, 2188).
--define(wxColourData_destruct, 2189).
--define(wxColourData_GetChooseFull, 2190).
--define(wxColourData_GetColour, 2191).
--define(wxColourData_GetCustomColour, 2193).
--define(wxColourData_SetChooseFull, 2194).
--define(wxColourData_SetColour, 2195).
--define(wxColourData_SetCustomColour, 2196).
--define(wxPalette_new_0, 2197).
--define(wxPalette_new_4, 2198).
--define(wxPalette_destruct, 2200).
--define(wxPalette_Create, 2201).
--define(wxPalette_GetColoursCount, 2202).
--define(wxPalette_GetPixel, 2203).
--define(wxPalette_GetRGB, 2204).
--define(wxPalette_IsOk, 2205).
--define(wxDirDialog_new, 2209).
--define(wxDirDialog_destruct, 2210).
--define(wxDirDialog_GetPath, 2211).
--define(wxDirDialog_GetMessage, 2212).
--define(wxDirDialog_SetMessage, 2213).
--define(wxDirDialog_SetPath, 2214).
--define(wxFileDialog_new, 2218).
--define(wxFileDialog_destruct, 2219).
--define(wxFileDialog_GetDirectory, 2220).
--define(wxFileDialog_GetFilename, 2221).
--define(wxFileDialog_GetFilenames, 2222).
--define(wxFileDialog_GetFilterIndex, 2223).
--define(wxFileDialog_GetMessage, 2224).
--define(wxFileDialog_GetPath, 2225).
--define(wxFileDialog_GetPaths, 2226).
--define(wxFileDialog_GetWildcard, 2227).
--define(wxFileDialog_SetDirectory, 2228).
--define(wxFileDialog_SetFilename, 2229).
--define(wxFileDialog_SetFilterIndex, 2230).
--define(wxFileDialog_SetMessage, 2231).
--define(wxFileDialog_SetPath, 2232).
--define(wxFileDialog_SetWildcard, 2233).
--define(wxPickerBase_SetInternalMargin, 2234).
--define(wxPickerBase_GetInternalMargin, 2235).
--define(wxPickerBase_SetTextCtrlProportion, 2236).
--define(wxPickerBase_SetPickerCtrlProportion, 2237).
--define(wxPickerBase_GetTextCtrlProportion, 2238).
--define(wxPickerBase_GetPickerCtrlProportion, 2239).
--define(wxPickerBase_HasTextCtrl, 2240).
--define(wxPickerBase_GetTextCtrl, 2241).
--define(wxPickerBase_IsTextCtrlGrowable, 2242).
--define(wxPickerBase_SetPickerCtrlGrowable, 2243).
--define(wxPickerBase_SetTextCtrlGrowable, 2244).
--define(wxPickerBase_IsPickerCtrlGrowable, 2245).
--define(wxFilePickerCtrl_new_0, 2246).
--define(wxFilePickerCtrl_new_3, 2247).
--define(wxFilePickerCtrl_Create, 2248).
--define(wxFilePickerCtrl_GetPath, 2249).
--define(wxFilePickerCtrl_SetPath, 2250).
--define(wxFilePickerCtrl_destroy, 2251).
--define(wxDirPickerCtrl_new_0, 2252).
--define(wxDirPickerCtrl_new_3, 2253).
--define(wxDirPickerCtrl_Create, 2254).
--define(wxDirPickerCtrl_GetPath, 2255).
--define(wxDirPickerCtrl_SetPath, 2256).
--define(wxDirPickerCtrl_destroy, 2257).
--define(wxColourPickerCtrl_new_0, 2258).
--define(wxColourPickerCtrl_new_3, 2259).
--define(wxColourPickerCtrl_Create, 2260).
--define(wxColourPickerCtrl_GetColour, 2261).
--define(wxColourPickerCtrl_SetColour_1_1, 2262).
--define(wxColourPickerCtrl_SetColour_1_0, 2263).
--define(wxColourPickerCtrl_destroy, 2264).
--define(wxDatePickerCtrl_new_0, 2265).
--define(wxDatePickerCtrl_new_3, 2266).
--define(wxDatePickerCtrl_GetRange, 2267).
--define(wxDatePickerCtrl_GetValue, 2268).
--define(wxDatePickerCtrl_SetRange, 2269).
--define(wxDatePickerCtrl_SetValue, 2270).
--define(wxDatePickerCtrl_destroy, 2271).
--define(wxFontPickerCtrl_new_0, 2272).
--define(wxFontPickerCtrl_new_3, 2273).
--define(wxFontPickerCtrl_Create, 2274).
--define(wxFontPickerCtrl_GetSelectedFont, 2275).
--define(wxFontPickerCtrl_SetSelectedFont, 2276).
--define(wxFontPickerCtrl_GetMaxPointSize, 2277).
--define(wxFontPickerCtrl_SetMaxPointSize, 2278).
--define(wxFontPickerCtrl_destroy, 2279).
--define(wxFindReplaceDialog_new_0, 2282).
--define(wxFindReplaceDialog_new_4, 2283).
--define(wxFindReplaceDialog_destruct, 2284).
--define(wxFindReplaceDialog_Create, 2285).
--define(wxFindReplaceDialog_GetData, 2286).
--define(wxFindReplaceData_new_0, 2287).
--define(wxFindReplaceData_new_1, 2288).
--define(wxFindReplaceData_GetFindString, 2289).
--define(wxFindReplaceData_GetReplaceString, 2290).
--define(wxFindReplaceData_GetFlags, 2291).
--define(wxFindReplaceData_SetFlags, 2292).
--define(wxFindReplaceData_SetFindString, 2293).
--define(wxFindReplaceData_SetReplaceString, 2294).
--define(wxFindReplaceData_destroy, 2295).
--define(wxMultiChoiceDialog_new_0, 2296).
--define(wxMultiChoiceDialog_new_5, 2298).
--define(wxMultiChoiceDialog_GetSelections, 2299).
--define(wxMultiChoiceDialog_SetSelections, 2300).
--define(wxMultiChoiceDialog_destroy, 2301).
--define(wxSingleChoiceDialog_new_0, 2302).
--define(wxSingleChoiceDialog_new_5, 2304).
--define(wxSingleChoiceDialog_GetSelection, 2305).
--define(wxSingleChoiceDialog_GetStringSelection, 2306).
--define(wxSingleChoiceDialog_SetSelection, 2307).
--define(wxSingleChoiceDialog_destroy, 2308).
--define(wxTextEntryDialog_new, 2309).
--define(wxTextEntryDialog_GetValue, 2310).
--define(wxTextEntryDialog_SetValue, 2311).
--define(wxTextEntryDialog_destroy, 2312).
--define(wxPasswordEntryDialog_new, 2313).
--define(wxPasswordEntryDialog_destroy, 2314).
--define(wxFontData_new_0, 2315).
--define(wxFontData_new_1, 2316).
--define(wxFontData_destruct, 2317).
--define(wxFontData_EnableEffects, 2318).
--define(wxFontData_GetAllowSymbols, 2319).
--define(wxFontData_GetColour, 2320).
--define(wxFontData_GetChosenFont, 2321).
--define(wxFontData_GetEnableEffects, 2322).
--define(wxFontData_GetInitialFont, 2323).
--define(wxFontData_GetShowHelp, 2324).
--define(wxFontData_SetAllowSymbols, 2325).
--define(wxFontData_SetChosenFont, 2326).
--define(wxFontData_SetColour, 2327).
--define(wxFontData_SetInitialFont, 2328).
--define(wxFontData_SetRange, 2329).
--define(wxFontData_SetShowHelp, 2330).
--define(wxFontDialog_new_0, 2334).
--define(wxFontDialog_new_2, 2336).
--define(wxFontDialog_Create, 2338).
--define(wxFontDialog_GetFontData, 2339).
--define(wxFontDialog_destroy, 2341).
--define(wxProgressDialog_new, 2342).
--define(wxProgressDialog_destruct, 2343).
--define(wxProgressDialog_Resume, 2344).
--define(wxProgressDialog_Update_2, 2345).
--define(wxProgressDialog_Update_0, 2346).
--define(wxMessageDialog_new, 2347).
--define(wxMessageDialog_destruct, 2348).
--define(wxPageSetupDialog_new, 2349).
--define(wxPageSetupDialog_destruct, 2350).
--define(wxPageSetupDialog_GetPageSetupData, 2351).
--define(wxPageSetupDialog_ShowModal, 2352).
--define(wxPageSetupDialogData_new_0, 2353).
--define(wxPageSetupDialogData_new_1_0, 2354).
--define(wxPageSetupDialogData_new_1_1, 2355).
--define(wxPageSetupDialogData_destruct, 2356).
--define(wxPageSetupDialogData_EnableHelp, 2357).
--define(wxPageSetupDialogData_EnableMargins, 2358).
--define(wxPageSetupDialogData_EnableOrientation, 2359).
--define(wxPageSetupDialogData_EnablePaper, 2360).
--define(wxPageSetupDialogData_EnablePrinter, 2361).
--define(wxPageSetupDialogData_GetDefaultMinMargins, 2362).
--define(wxPageSetupDialogData_GetEnableMargins, 2363).
--define(wxPageSetupDialogData_GetEnableOrientation, 2364).
--define(wxPageSetupDialogData_GetEnablePaper, 2365).
--define(wxPageSetupDialogData_GetEnablePrinter, 2366).
--define(wxPageSetupDialogData_GetEnableHelp, 2367).
--define(wxPageSetupDialogData_GetDefaultInfo, 2368).
--define(wxPageSetupDialogData_GetMarginTopLeft, 2369).
--define(wxPageSetupDialogData_GetMarginBottomRight, 2370).
--define(wxPageSetupDialogData_GetMinMarginTopLeft, 2371).
--define(wxPageSetupDialogData_GetMinMarginBottomRight, 2372).
--define(wxPageSetupDialogData_GetPaperId, 2373).
--define(wxPageSetupDialogData_GetPaperSize, 2374).
--define(wxPageSetupDialogData_GetPrintData, 2376).
--define(wxPageSetupDialogData_IsOk, 2377).
--define(wxPageSetupDialogData_SetDefaultInfo, 2378).
--define(wxPageSetupDialogData_SetDefaultMinMargins, 2379).
--define(wxPageSetupDialogData_SetMarginTopLeft, 2380).
--define(wxPageSetupDialogData_SetMarginBottomRight, 2381).
--define(wxPageSetupDialogData_SetMinMarginTopLeft, 2382).
--define(wxPageSetupDialogData_SetMinMarginBottomRight, 2383).
--define(wxPageSetupDialogData_SetPaperId, 2384).
--define(wxPageSetupDialogData_SetPaperSize_1_1, 2385).
--define(wxPageSetupDialogData_SetPaperSize_1_0, 2386).
--define(wxPageSetupDialogData_SetPrintData, 2387).
--define(wxPrintDialog_new_2_0, 2388).
--define(wxPrintDialog_new_2_1, 2389).
--define(wxPrintDialog_destruct, 2390).
--define(wxPrintDialog_GetPrintDialogData, 2391).
--define(wxPrintDialog_GetPrintDC, 2392).
--define(wxPrintDialogData_new_0, 2393).
--define(wxPrintDialogData_new_1_1, 2394).
--define(wxPrintDialogData_new_1_0, 2395).
--define(wxPrintDialogData_destruct, 2396).
--define(wxPrintDialogData_EnableHelp, 2397).
--define(wxPrintDialogData_EnablePageNumbers, 2398).
--define(wxPrintDialogData_EnablePrintToFile, 2399).
--define(wxPrintDialogData_EnableSelection, 2400).
--define(wxPrintDialogData_GetAllPages, 2401).
--define(wxPrintDialogData_GetCollate, 2402).
--define(wxPrintDialogData_GetFromPage, 2403).
--define(wxPrintDialogData_GetMaxPage, 2404).
--define(wxPrintDialogData_GetMinPage, 2405).
--define(wxPrintDialogData_GetNoCopies, 2406).
--define(wxPrintDialogData_GetPrintData, 2407).
--define(wxPrintDialogData_GetPrintToFile, 2408).
--define(wxPrintDialogData_GetSelection, 2409).
--define(wxPrintDialogData_GetToPage, 2410).
--define(wxPrintDialogData_IsOk, 2411).
--define(wxPrintDialogData_SetCollate, 2412).
--define(wxPrintDialogData_SetFromPage, 2413).
--define(wxPrintDialogData_SetMaxPage, 2414).
--define(wxPrintDialogData_SetMinPage, 2415).
--define(wxPrintDialogData_SetNoCopies, 2416).
--define(wxPrintDialogData_SetPrintData, 2417).
--define(wxPrintDialogData_SetPrintToFile, 2418).
--define(wxPrintDialogData_SetSelection, 2419).
--define(wxPrintDialogData_SetToPage, 2420).
--define(wxPrintData_new_0, 2421).
--define(wxPrintData_new_1, 2422).
--define(wxPrintData_destruct, 2423).
--define(wxPrintData_GetCollate, 2424).
--define(wxPrintData_GetBin, 2425).
--define(wxPrintData_GetColour, 2426).
--define(wxPrintData_GetDuplex, 2427).
--define(wxPrintData_GetNoCopies, 2428).
--define(wxPrintData_GetOrientation, 2429).
--define(wxPrintData_GetPaperId, 2430).
--define(wxPrintData_GetPrinterName, 2431).
--define(wxPrintData_GetQuality, 2432).
--define(wxPrintData_IsOk, 2433).
--define(wxPrintData_SetBin, 2434).
--define(wxPrintData_SetCollate, 2435).
--define(wxPrintData_SetColour, 2436).
--define(wxPrintData_SetDuplex, 2437).
--define(wxPrintData_SetNoCopies, 2438).
--define(wxPrintData_SetOrientation, 2439).
--define(wxPrintData_SetPaperId, 2440).
--define(wxPrintData_SetPrinterName, 2441).
--define(wxPrintData_SetQuality, 2442).
--define(wxPrintPreview_new_2, 2445).
--define(wxPrintPreview_new_3, 2446).
--define(wxPrintPreview_destruct, 2448).
--define(wxPrintPreview_GetCanvas, 2449).
--define(wxPrintPreview_GetCurrentPage, 2450).
--define(wxPrintPreview_GetFrame, 2451).
--define(wxPrintPreview_GetMaxPage, 2452).
--define(wxPrintPreview_GetMinPage, 2453).
--define(wxPrintPreview_GetPrintout, 2454).
--define(wxPrintPreview_GetPrintoutForPrinting, 2455).
--define(wxPrintPreview_IsOk, 2456).
--define(wxPrintPreview_PaintPage, 2457).
--define(wxPrintPreview_Print, 2458).
--define(wxPrintPreview_RenderPage, 2459).
--define(wxPrintPreview_SetCanvas, 2460).
--define(wxPrintPreview_SetCurrentPage, 2461).
--define(wxPrintPreview_SetFrame, 2462).
--define(wxPrintPreview_SetPrintout, 2463).
--define(wxPrintPreview_SetZoom, 2464).
--define(wxPreviewFrame_new, 2465).
--define(wxPreviewFrame_destruct, 2466).
--define(wxPreviewFrame_CreateControlBar, 2467).
--define(wxPreviewFrame_CreateCanvas, 2468).
--define(wxPreviewFrame_Initialize, 2469).
--define(wxPreviewFrame_OnCloseWindow, 2470).
--define(wxPreviewControlBar_new, 2471).
--define(wxPreviewControlBar_destruct, 2472).
--define(wxPreviewControlBar_CreateButtons, 2473).
--define(wxPreviewControlBar_GetPrintPreview, 2474).
--define(wxPreviewControlBar_GetZoomControl, 2475).
--define(wxPreviewControlBar_SetZoomControl, 2476).
--define(wxPrinter_new, 2478).
--define(wxPrinter_CreateAbortWindow, 2479).
--define(wxPrinter_GetAbort, 2480).
--define(wxPrinter_GetLastError, 2481).
--define(wxPrinter_GetPrintDialogData, 2482).
--define(wxPrinter_Print, 2483).
--define(wxPrinter_PrintDialog, 2484).
--define(wxPrinter_ReportError, 2485).
--define(wxPrinter_Setup, 2486).
--define(wxPrinter_destroy, 2487).
--define(wxXmlResource_new_1, 2488).
--define(wxXmlResource_new_2, 2489).
--define(wxXmlResource_destruct, 2490).
--define(wxXmlResource_AttachUnknownControl, 2491).
--define(wxXmlResource_ClearHandlers, 2492).
--define(wxXmlResource_CompareVersion, 2493).
--define(wxXmlResource_Get, 2494).
--define(wxXmlResource_GetFlags, 2495).
--define(wxXmlResource_GetVersion, 2496).
--define(wxXmlResource_GetXRCID, 2497).
--define(wxXmlResource_InitAllHandlers, 2498).
--define(wxXmlResource_Load, 2499).
--define(wxXmlResource_LoadBitmap, 2500).
--define(wxXmlResource_LoadDialog_2, 2501).
--define(wxXmlResource_LoadDialog_3, 2502).
--define(wxXmlResource_LoadFrame_2, 2503).
--define(wxXmlResource_LoadFrame_3, 2504).
--define(wxXmlResource_LoadIcon, 2505).
--define(wxXmlResource_LoadMenu, 2506).
--define(wxXmlResource_LoadMenuBar_2, 2507).
--define(wxXmlResource_LoadMenuBar_1, 2508).
--define(wxXmlResource_LoadPanel_2, 2509).
--define(wxXmlResource_LoadPanel_3, 2510).
--define(wxXmlResource_LoadToolBar, 2511).
--define(wxXmlResource_Set, 2512).
--define(wxXmlResource_SetFlags, 2513).
--define(wxXmlResource_Unload, 2514).
--define(wxXmlResource_xrcctrl, 2515).
--define(wxHtmlEasyPrinting_new, 2516).
--define(wxHtmlEasyPrinting_destruct, 2517).
--define(wxHtmlEasyPrinting_GetPrintData, 2518).
--define(wxHtmlEasyPrinting_GetPageSetupData, 2519).
--define(wxHtmlEasyPrinting_PreviewFile, 2520).
--define(wxHtmlEasyPrinting_PreviewText, 2521).
--define(wxHtmlEasyPrinting_PrintFile, 2522).
--define(wxHtmlEasyPrinting_PrintText, 2523).
--define(wxHtmlEasyPrinting_PageSetup, 2524).
--define(wxHtmlEasyPrinting_SetFonts, 2525).
--define(wxHtmlEasyPrinting_SetHeader, 2526).
--define(wxHtmlEasyPrinting_SetFooter, 2527).
--define(wxGLCanvas_new_2, 2529).
--define(wxGLCanvas_new_3_1, 2530).
--define(wxGLCanvas_new_3_0, 2531).
--define(wxGLCanvas_GetContext, 2532).
--define(wxGLCanvas_SetCurrent, 2534).
--define(wxGLCanvas_SwapBuffers, 2535).
--define(wxGLCanvas_destroy, 2536).
--define(wxAuiManager_new, 2537).
--define(wxAuiManager_destruct, 2538).
--define(wxAuiManager_AddPane_2_1, 2539).
--define(wxAuiManager_AddPane_3, 2540).
--define(wxAuiManager_AddPane_2_0, 2541).
--define(wxAuiManager_DetachPane, 2542).
--define(wxAuiManager_GetAllPanes, 2543).
--define(wxAuiManager_GetArtProvider, 2544).
--define(wxAuiManager_GetDockSizeConstraint, 2545).
--define(wxAuiManager_GetFlags, 2546).
--define(wxAuiManager_GetManagedWindow, 2547).
--define(wxAuiManager_GetManager, 2548).
--define(wxAuiManager_GetPane_1_1, 2549).
--define(wxAuiManager_GetPane_1_0, 2550).
--define(wxAuiManager_HideHint, 2551).
--define(wxAuiManager_InsertPane, 2552).
--define(wxAuiManager_LoadPaneInfo, 2553).
--define(wxAuiManager_LoadPerspective, 2554).
--define(wxAuiManager_SavePaneInfo, 2555).
--define(wxAuiManager_SavePerspective, 2556).
--define(wxAuiManager_SetArtProvider, 2557).
--define(wxAuiManager_SetDockSizeConstraint, 2558).
--define(wxAuiManager_SetFlags, 2559).
--define(wxAuiManager_SetManagedWindow, 2560).
--define(wxAuiManager_ShowHint, 2561).
--define(wxAuiManager_UnInit, 2562).
--define(wxAuiManager_Update, 2563).
--define(wxAuiPaneInfo_new_0, 2564).
--define(wxAuiPaneInfo_new_1, 2565).
--define(wxAuiPaneInfo_destruct, 2566).
--define(wxAuiPaneInfo_BestSize_1, 2567).
--define(wxAuiPaneInfo_BestSize_2, 2568).
--define(wxAuiPaneInfo_Bottom, 2569).
--define(wxAuiPaneInfo_BottomDockable, 2570).
--define(wxAuiPaneInfo_Caption, 2571).
--define(wxAuiPaneInfo_CaptionVisible, 2572).
--define(wxAuiPaneInfo_Centre, 2573).
--define(wxAuiPaneInfo_CentrePane, 2574).
--define(wxAuiPaneInfo_CloseButton, 2575).
--define(wxAuiPaneInfo_DefaultPane, 2576).
--define(wxAuiPaneInfo_DestroyOnClose, 2577).
--define(wxAuiPaneInfo_Direction, 2578).
--define(wxAuiPaneInfo_Dock, 2579).
--define(wxAuiPaneInfo_Dockable, 2580).
--define(wxAuiPaneInfo_Fixed, 2581).
--define(wxAuiPaneInfo_Float, 2582).
--define(wxAuiPaneInfo_Floatable, 2583).
--define(wxAuiPaneInfo_FloatingPosition_1, 2584).
--define(wxAuiPaneInfo_FloatingPosition_2, 2585).
--define(wxAuiPaneInfo_FloatingSize_1, 2586).
--define(wxAuiPaneInfo_FloatingSize_2, 2587).
--define(wxAuiPaneInfo_Gripper, 2588).
--define(wxAuiPaneInfo_GripperTop, 2589).
--define(wxAuiPaneInfo_HasBorder, 2590).
--define(wxAuiPaneInfo_HasCaption, 2591).
--define(wxAuiPaneInfo_HasCloseButton, 2592).
--define(wxAuiPaneInfo_HasFlag, 2593).
--define(wxAuiPaneInfo_HasGripper, 2594).
--define(wxAuiPaneInfo_HasGripperTop, 2595).
--define(wxAuiPaneInfo_HasMaximizeButton, 2596).
--define(wxAuiPaneInfo_HasMinimizeButton, 2597).
--define(wxAuiPaneInfo_HasPinButton, 2598).
--define(wxAuiPaneInfo_Hide, 2599).
--define(wxAuiPaneInfo_IsBottomDockable, 2600).
--define(wxAuiPaneInfo_IsDocked, 2601).
--define(wxAuiPaneInfo_IsFixed, 2602).
--define(wxAuiPaneInfo_IsFloatable, 2603).
--define(wxAuiPaneInfo_IsFloating, 2604).
--define(wxAuiPaneInfo_IsLeftDockable, 2605).
--define(wxAuiPaneInfo_IsMovable, 2606).
--define(wxAuiPaneInfo_IsOk, 2607).
--define(wxAuiPaneInfo_IsResizable, 2608).
--define(wxAuiPaneInfo_IsRightDockable, 2609).
--define(wxAuiPaneInfo_IsShown, 2610).
--define(wxAuiPaneInfo_IsToolbar, 2611).
--define(wxAuiPaneInfo_IsTopDockable, 2612).
--define(wxAuiPaneInfo_Layer, 2613).
--define(wxAuiPaneInfo_Left, 2614).
--define(wxAuiPaneInfo_LeftDockable, 2615).
--define(wxAuiPaneInfo_MaxSize_1, 2616).
--define(wxAuiPaneInfo_MaxSize_2, 2617).
--define(wxAuiPaneInfo_MaximizeButton, 2618).
--define(wxAuiPaneInfo_MinSize_1, 2619).
--define(wxAuiPaneInfo_MinSize_2, 2620).
--define(wxAuiPaneInfo_MinimizeButton, 2621).
--define(wxAuiPaneInfo_Movable, 2622).
--define(wxAuiPaneInfo_Name, 2623).
--define(wxAuiPaneInfo_PaneBorder, 2624).
--define(wxAuiPaneInfo_PinButton, 2625).
--define(wxAuiPaneInfo_Position, 2626).
--define(wxAuiPaneInfo_Resizable, 2627).
--define(wxAuiPaneInfo_Right, 2628).
--define(wxAuiPaneInfo_RightDockable, 2629).
--define(wxAuiPaneInfo_Row, 2630).
--define(wxAuiPaneInfo_SafeSet, 2631).
--define(wxAuiPaneInfo_SetFlag, 2632).
--define(wxAuiPaneInfo_Show, 2633).
--define(wxAuiPaneInfo_ToolbarPane, 2634).
--define(wxAuiPaneInfo_Top, 2635).
--define(wxAuiPaneInfo_TopDockable, 2636).
--define(wxAuiPaneInfo_Window, 2637).
--define(wxAuiNotebook_new_0, 2638).
--define(wxAuiNotebook_new_2, 2639).
--define(wxAuiNotebook_AddPage, 2640).
--define(wxAuiNotebook_Create, 2641).
--define(wxAuiNotebook_DeletePage, 2642).
--define(wxAuiNotebook_GetArtProvider, 2643).
--define(wxAuiNotebook_GetPage, 2644).
--define(wxAuiNotebook_GetPageBitmap, 2645).
--define(wxAuiNotebook_GetPageCount, 2646).
--define(wxAuiNotebook_GetPageIndex, 2647).
--define(wxAuiNotebook_GetPageText, 2648).
--define(wxAuiNotebook_GetSelection, 2649).
--define(wxAuiNotebook_InsertPage, 2650).
--define(wxAuiNotebook_RemovePage, 2651).
--define(wxAuiNotebook_SetArtProvider, 2652).
--define(wxAuiNotebook_SetFont, 2653).
--define(wxAuiNotebook_SetPageBitmap, 2654).
--define(wxAuiNotebook_SetPageText, 2655).
--define(wxAuiNotebook_SetSelection, 2656).
--define(wxAuiNotebook_SetTabCtrlHeight, 2657).
--define(wxAuiNotebook_SetUniformBitmapSize, 2658).
--define(wxAuiNotebook_destroy, 2659).
--define(wxMDIParentFrame_new_0, 2660).
--define(wxMDIParentFrame_new_4, 2661).
--define(wxMDIParentFrame_destruct, 2662).
--define(wxMDIParentFrame_ActivateNext, 2663).
--define(wxMDIParentFrame_ActivatePrevious, 2664).
--define(wxMDIParentFrame_ArrangeIcons, 2665).
--define(wxMDIParentFrame_Cascade, 2666).
--define(wxMDIParentFrame_Create, 2667).
--define(wxMDIParentFrame_GetActiveChild, 2668).
--define(wxMDIParentFrame_GetClientWindow, 2669).
--define(wxMDIParentFrame_Tile, 2670).
--define(wxMDIChildFrame_new_0, 2671).
--define(wxMDIChildFrame_new_4, 2672).
--define(wxMDIChildFrame_destruct, 2673).
--define(wxMDIChildFrame_Activate, 2674).
--define(wxMDIChildFrame_Create, 2675).
--define(wxMDIChildFrame_Maximize, 2676).
--define(wxMDIChildFrame_Restore, 2677).
--define(wxMDIClientWindow_new_0, 2678).
--define(wxMDIClientWindow_new_2, 2679).
--define(wxMDIClientWindow_destruct, 2680).
--define(wxMDIClientWindow_CreateClient, 2681).
--define(wxLayoutAlgorithm_new, 2682).
--define(wxLayoutAlgorithm_LayoutFrame, 2683).
--define(wxLayoutAlgorithm_LayoutMDIFrame, 2684).
--define(wxLayoutAlgorithm_LayoutWindow, 2685).
--define(wxLayoutAlgorithm_destroy, 2686).
--define(wxEvent_GetId, 2687).
--define(wxEvent_GetSkipped, 2688).
--define(wxEvent_GetTimestamp, 2689).
--define(wxEvent_IsCommandEvent, 2690).
--define(wxEvent_ResumePropagation, 2691).
--define(wxEvent_ShouldPropagate, 2692).
--define(wxEvent_Skip, 2693).
--define(wxEvent_StopPropagation, 2694).
--define(wxCommandEvent_getClientData, 2695).
--define(wxCommandEvent_GetExtraLong, 2696).
--define(wxCommandEvent_GetInt, 2697).
--define(wxCommandEvent_GetSelection, 2698).
--define(wxCommandEvent_GetString, 2699).
--define(wxCommandEvent_IsChecked, 2700).
--define(wxCommandEvent_IsSelection, 2701).
--define(wxCommandEvent_SetInt, 2702).
--define(wxCommandEvent_SetString, 2703).
--define(wxScrollEvent_GetOrientation, 2704).
--define(wxScrollEvent_GetPosition, 2705).
--define(wxScrollWinEvent_GetOrientation, 2706).
--define(wxScrollWinEvent_GetPosition, 2707).
--define(wxMouseEvent_AltDown, 2708).
--define(wxMouseEvent_Button, 2709).
--define(wxMouseEvent_ButtonDClick, 2710).
--define(wxMouseEvent_ButtonDown, 2711).
--define(wxMouseEvent_ButtonUp, 2712).
--define(wxMouseEvent_CmdDown, 2713).
--define(wxMouseEvent_ControlDown, 2714).
--define(wxMouseEvent_Dragging, 2715).
--define(wxMouseEvent_Entering, 2716).
--define(wxMouseEvent_GetButton, 2717).
--define(wxMouseEvent_GetPosition, 2720).
--define(wxMouseEvent_GetLogicalPosition, 2721).
--define(wxMouseEvent_GetLinesPerAction, 2722).
--define(wxMouseEvent_GetWheelRotation, 2723).
--define(wxMouseEvent_GetWheelDelta, 2724).
--define(wxMouseEvent_GetX, 2725).
--define(wxMouseEvent_GetY, 2726).
--define(wxMouseEvent_IsButton, 2727).
--define(wxMouseEvent_IsPageScroll, 2728).
--define(wxMouseEvent_Leaving, 2729).
--define(wxMouseEvent_LeftDClick, 2730).
--define(wxMouseEvent_LeftDown, 2731).
--define(wxMouseEvent_LeftIsDown, 2732).
--define(wxMouseEvent_LeftUp, 2733).
--define(wxMouseEvent_MetaDown, 2734).
--define(wxMouseEvent_MiddleDClick, 2735).
--define(wxMouseEvent_MiddleDown, 2736).
--define(wxMouseEvent_MiddleIsDown, 2737).
--define(wxMouseEvent_MiddleUp, 2738).
--define(wxMouseEvent_Moving, 2739).
--define(wxMouseEvent_RightDClick, 2740).
--define(wxMouseEvent_RightDown, 2741).
--define(wxMouseEvent_RightIsDown, 2742).
--define(wxMouseEvent_RightUp, 2743).
--define(wxMouseEvent_ShiftDown, 2744).
--define(wxSetCursorEvent_GetCursor, 2745).
--define(wxSetCursorEvent_GetX, 2746).
--define(wxSetCursorEvent_GetY, 2747).
--define(wxSetCursorEvent_HasCursor, 2748).
--define(wxSetCursorEvent_SetCursor, 2749).
--define(wxKeyEvent_AltDown, 2750).
--define(wxKeyEvent_CmdDown, 2751).
--define(wxKeyEvent_ControlDown, 2752).
--define(wxKeyEvent_GetKeyCode, 2753).
--define(wxKeyEvent_GetModifiers, 2754).
--define(wxKeyEvent_GetPosition, 2757).
--define(wxKeyEvent_GetRawKeyCode, 2758).
--define(wxKeyEvent_GetRawKeyFlags, 2759).
--define(wxKeyEvent_GetUnicodeKey, 2760).
--define(wxKeyEvent_GetX, 2761).
--define(wxKeyEvent_GetY, 2762).
--define(wxKeyEvent_HasModifiers, 2763).
--define(wxKeyEvent_MetaDown, 2764).
--define(wxKeyEvent_ShiftDown, 2765).
--define(wxSizeEvent_GetSize, 2766).
--define(wxMoveEvent_GetPosition, 2767).
--define(wxEraseEvent_GetDC, 2768).
--define(wxFocusEvent_GetWindow, 2769).
--define(wxChildFocusEvent_GetWindow, 2770).
--define(wxMenuEvent_GetMenu, 2771).
--define(wxMenuEvent_GetMenuId, 2772).
--define(wxMenuEvent_IsPopup, 2773).
--define(wxCloseEvent_CanVeto, 2774).
--define(wxCloseEvent_GetLoggingOff, 2775).
--define(wxCloseEvent_SetCanVeto, 2776).
--define(wxCloseEvent_SetLoggingOff, 2777).
--define(wxCloseEvent_Veto, 2778).
--define(wxShowEvent_SetShow, 2779).
--define(wxShowEvent_GetShow, 2780).
--define(wxIconizeEvent_Iconized, 2781).
--define(wxJoystickEvent_ButtonDown, 2782).
--define(wxJoystickEvent_ButtonIsDown, 2783).
--define(wxJoystickEvent_ButtonUp, 2784).
--define(wxJoystickEvent_GetButtonChange, 2785).
--define(wxJoystickEvent_GetButtonState, 2786).
--define(wxJoystickEvent_GetJoystick, 2787).
--define(wxJoystickEvent_GetPosition, 2788).
--define(wxJoystickEvent_GetZPosition, 2789).
--define(wxJoystickEvent_IsButton, 2790).
--define(wxJoystickEvent_IsMove, 2791).
--define(wxJoystickEvent_IsZMove, 2792).
--define(wxUpdateUIEvent_CanUpdate, 2793).
--define(wxUpdateUIEvent_Check, 2794).
--define(wxUpdateUIEvent_Enable, 2795).
--define(wxUpdateUIEvent_Show, 2796).
--define(wxUpdateUIEvent_GetChecked, 2797).
--define(wxUpdateUIEvent_GetEnabled, 2798).
--define(wxUpdateUIEvent_GetShown, 2799).
--define(wxUpdateUIEvent_GetSetChecked, 2800).
--define(wxUpdateUIEvent_GetSetEnabled, 2801).
--define(wxUpdateUIEvent_GetSetShown, 2802).
--define(wxUpdateUIEvent_GetSetText, 2803).
--define(wxUpdateUIEvent_GetText, 2804).
--define(wxUpdateUIEvent_GetMode, 2805).
--define(wxUpdateUIEvent_GetUpdateInterval, 2806).
--define(wxUpdateUIEvent_ResetUpdateTime, 2807).
--define(wxUpdateUIEvent_SetMode, 2808).
--define(wxUpdateUIEvent_SetText, 2809).
--define(wxUpdateUIEvent_SetUpdateInterval, 2810).
--define(wxMouseCaptureChangedEvent_GetCapturedWindow, 2811).
--define(wxPaletteChangedEvent_SetChangedWindow, 2812).
--define(wxPaletteChangedEvent_GetChangedWindow, 2813).
--define(wxQueryNewPaletteEvent_SetPaletteRealized, 2814).
--define(wxQueryNewPaletteEvent_GetPaletteRealized, 2815).
--define(wxNavigationKeyEvent_GetDirection, 2816).
--define(wxNavigationKeyEvent_SetDirection, 2817).
--define(wxNavigationKeyEvent_IsWindowChange, 2818).
--define(wxNavigationKeyEvent_SetWindowChange, 2819).
--define(wxNavigationKeyEvent_IsFromTab, 2820).
--define(wxNavigationKeyEvent_SetFromTab, 2821).
--define(wxNavigationKeyEvent_GetCurrentFocus, 2822).
--define(wxNavigationKeyEvent_SetCurrentFocus, 2823).
--define(wxHelpEvent_GetOrigin, 2824).
--define(wxHelpEvent_GetPosition, 2825).
--define(wxHelpEvent_SetOrigin, 2826).
--define(wxHelpEvent_SetPosition, 2827).
--define(wxContextMenuEvent_GetPosition, 2828).
--define(wxContextMenuEvent_SetPosition, 2829).
--define(wxIdleEvent_CanSend, 2830).
--define(wxIdleEvent_GetMode, 2831).
--define(wxIdleEvent_RequestMore, 2832).
--define(wxIdleEvent_MoreRequested, 2833).
--define(wxIdleEvent_SetMode, 2834).
--define(wxGridEvent_AltDown, 2835).
--define(wxGridEvent_ControlDown, 2836).
--define(wxGridEvent_GetCol, 2837).
--define(wxGridEvent_GetPosition, 2838).
--define(wxGridEvent_GetRow, 2839).
--define(wxGridEvent_MetaDown, 2840).
--define(wxGridEvent_Selecting, 2841).
--define(wxGridEvent_ShiftDown, 2842).
--define(wxNotifyEvent_Allow, 2843).
--define(wxNotifyEvent_IsAllowed, 2844).
--define(wxNotifyEvent_Veto, 2845).
--define(wxSashEvent_GetEdge, 2846).
--define(wxSashEvent_GetDragRect, 2847).
--define(wxSashEvent_GetDragStatus, 2848).
--define(wxListEvent_GetCacheFrom, 2849).
--define(wxListEvent_GetCacheTo, 2850).
--define(wxListEvent_GetKeyCode, 2851).
--define(wxListEvent_GetIndex, 2852).
--define(wxListEvent_GetColumn, 2853).
--define(wxListEvent_GetPoint, 2854).
--define(wxListEvent_GetLabel, 2855).
--define(wxListEvent_GetText, 2856).
--define(wxListEvent_GetImage, 2857).
--define(wxListEvent_GetData, 2858).
--define(wxListEvent_GetMask, 2859).
--define(wxListEvent_GetItem, 2860).
--define(wxListEvent_IsEditCancelled, 2861).
--define(wxDateEvent_GetDate, 2862).
--define(wxCalendarEvent_GetWeekDay, 2863).
--define(wxFileDirPickerEvent_GetPath, 2864).
--define(wxColourPickerEvent_GetColour, 2865).
--define(wxFontPickerEvent_GetFont, 2866).
--define(wxStyledTextEvent_GetPosition, 2867).
--define(wxStyledTextEvent_GetKey, 2868).
--define(wxStyledTextEvent_GetModifiers, 2869).
--define(wxStyledTextEvent_GetModificationType, 2870).
--define(wxStyledTextEvent_GetText, 2871).
--define(wxStyledTextEvent_GetLength, 2872).
--define(wxStyledTextEvent_GetLinesAdded, 2873).
--define(wxStyledTextEvent_GetLine, 2874).
--define(wxStyledTextEvent_GetFoldLevelNow, 2875).
--define(wxStyledTextEvent_GetFoldLevelPrev, 2876).
--define(wxStyledTextEvent_GetMargin, 2877).
--define(wxStyledTextEvent_GetMessage, 2878).
--define(wxStyledTextEvent_GetWParam, 2879).
--define(wxStyledTextEvent_GetLParam, 2880).
--define(wxStyledTextEvent_GetListType, 2881).
--define(wxStyledTextEvent_GetX, 2882).
--define(wxStyledTextEvent_GetY, 2883).
--define(wxStyledTextEvent_GetDragText, 2884).
--define(wxStyledTextEvent_GetDragAllowMove, 2885).
--define(wxStyledTextEvent_GetDragResult, 2886).
--define(wxStyledTextEvent_GetShift, 2887).
--define(wxStyledTextEvent_GetControl, 2888).
--define(wxStyledTextEvent_GetAlt, 2889).
--define(utils_wxGetKeyState, 2890).
--define(utils_wxGetMousePosition, 2891).
--define(utils_wxGetMouseState, 2892).
--define(utils_wxSetDetectableAutoRepeat, 2893).
--define(utils_wxBell, 2894).
--define(utils_wxFindMenuItemId, 2895).
--define(utils_wxGenericFindWindowAtPoint, 2896).
--define(utils_wxFindWindowAtPoint, 2897).
--define(utils_wxBeginBusyCursor, 2898).
--define(utils_wxEndBusyCursor, 2899).
--define(utils_wxIsBusy, 2900).
--define(utils_wxShutdown, 2901).
--define(utils_wxShell, 2902).
--define(utils_wxLaunchDefaultBrowser, 2903).
--define(utils_wxGetEmailAddress, 2904).
--define(utils_wxGetUserId, 2905).
--define(utils_wxGetHomeDir, 2906).
--define(utils_wxNewId, 2907).
--define(utils_wxRegisterId, 2908).
--define(utils_wxGetCurrentId, 2909).
--define(utils_wxGetOsDescription, 2910).
--define(utils_wxIsPlatformLittleEndian, 2911).
--define(utils_wxIsPlatform64Bit, 2912).
--define(wxPrintout_new, 2913).
--define(wxPrintout_destruct, 2914).
--define(wxPrintout_GetDC, 2915).
--define(wxPrintout_GetPageSizeMM, 2916).
--define(wxPrintout_GetPageSizePixels, 2917).
--define(wxPrintout_GetPaperRectPixels, 2918).
--define(wxPrintout_GetPPIPrinter, 2919).
--define(wxPrintout_GetPPIScreen, 2920).
--define(wxPrintout_GetTitle, 2921).
--define(wxPrintout_IsPreview, 2922).
--define(wxPrintout_FitThisSizeToPaper, 2923).
--define(wxPrintout_FitThisSizeToPage, 2924).
--define(wxPrintout_FitThisSizeToPageMargins, 2925).
--define(wxPrintout_MapScreenSizeToPaper, 2926).
--define(wxPrintout_MapScreenSizeToPage, 2927).
--define(wxPrintout_MapScreenSizeToPageMargins, 2928).
--define(wxPrintout_MapScreenSizeToDevice, 2929).
--define(wxPrintout_GetLogicalPaperRect, 2930).
--define(wxPrintout_GetLogicalPageRect, 2931).
--define(wxPrintout_GetLogicalPageMarginsRect, 2932).
--define(wxPrintout_SetLogicalOrigin, 2933).
--define(wxPrintout_OffsetLogicalOrigin, 2934).
--define(wxStyledTextCtrl_new_2, 2935).
--define(wxStyledTextCtrl_new_0, 2936).
--define(wxStyledTextCtrl_destruct, 2937).
--define(wxStyledTextCtrl_Create, 2938).
--define(wxStyledTextCtrl_AddText, 2939).
--define(wxStyledTextCtrl_AddStyledText, 2940).
--define(wxStyledTextCtrl_InsertText, 2941).
--define(wxStyledTextCtrl_ClearAll, 2942).
--define(wxStyledTextCtrl_ClearDocumentStyle, 2943).
--define(wxStyledTextCtrl_GetLength, 2944).
--define(wxStyledTextCtrl_GetCharAt, 2945).
--define(wxStyledTextCtrl_GetCurrentPos, 2946).
--define(wxStyledTextCtrl_GetAnchor, 2947).
--define(wxStyledTextCtrl_GetStyleAt, 2948).
--define(wxStyledTextCtrl_Redo, 2949).
--define(wxStyledTextCtrl_SetUndoCollection, 2950).
--define(wxStyledTextCtrl_SelectAll, 2951).
--define(wxStyledTextCtrl_SetSavePoint, 2952).
--define(wxStyledTextCtrl_GetStyledText, 2953).
--define(wxStyledTextCtrl_CanRedo, 2954).
--define(wxStyledTextCtrl_MarkerLineFromHandle, 2955).
--define(wxStyledTextCtrl_MarkerDeleteHandle, 2956).
--define(wxStyledTextCtrl_GetUndoCollection, 2957).
--define(wxStyledTextCtrl_GetViewWhiteSpace, 2958).
--define(wxStyledTextCtrl_SetViewWhiteSpace, 2959).
--define(wxStyledTextCtrl_PositionFromPoint, 2960).
--define(wxStyledTextCtrl_PositionFromPointClose, 2961).
--define(wxStyledTextCtrl_GotoLine, 2962).
--define(wxStyledTextCtrl_GotoPos, 2963).
--define(wxStyledTextCtrl_SetAnchor, 2964).
--define(wxStyledTextCtrl_GetCurLine, 2965).
--define(wxStyledTextCtrl_GetEndStyled, 2966).
--define(wxStyledTextCtrl_ConvertEOLs, 2967).
--define(wxStyledTextCtrl_GetEOLMode, 2968).
--define(wxStyledTextCtrl_SetEOLMode, 2969).
--define(wxStyledTextCtrl_StartStyling, 2970).
--define(wxStyledTextCtrl_SetStyling, 2971).
--define(wxStyledTextCtrl_GetBufferedDraw, 2972).
--define(wxStyledTextCtrl_SetBufferedDraw, 2973).
--define(wxStyledTextCtrl_SetTabWidth, 2974).
--define(wxStyledTextCtrl_GetTabWidth, 2975).
--define(wxStyledTextCtrl_SetCodePage, 2976).
--define(wxStyledTextCtrl_MarkerDefine, 2977).
--define(wxStyledTextCtrl_MarkerSetForeground, 2978).
--define(wxStyledTextCtrl_MarkerSetBackground, 2979).
--define(wxStyledTextCtrl_MarkerAdd, 2980).
--define(wxStyledTextCtrl_MarkerDelete, 2981).
--define(wxStyledTextCtrl_MarkerDeleteAll, 2982).
--define(wxStyledTextCtrl_MarkerGet, 2983).
--define(wxStyledTextCtrl_MarkerNext, 2984).
--define(wxStyledTextCtrl_MarkerPrevious, 2985).
--define(wxStyledTextCtrl_MarkerDefineBitmap, 2986).
--define(wxStyledTextCtrl_MarkerAddSet, 2987).
--define(wxStyledTextCtrl_MarkerSetAlpha, 2988).
--define(wxStyledTextCtrl_SetMarginType, 2989).
--define(wxStyledTextCtrl_GetMarginType, 2990).
--define(wxStyledTextCtrl_SetMarginWidth, 2991).
--define(wxStyledTextCtrl_GetMarginWidth, 2992).
--define(wxStyledTextCtrl_SetMarginMask, 2993).
--define(wxStyledTextCtrl_GetMarginMask, 2994).
--define(wxStyledTextCtrl_SetMarginSensitive, 2995).
--define(wxStyledTextCtrl_GetMarginSensitive, 2996).
--define(wxStyledTextCtrl_StyleClearAll, 2997).
--define(wxStyledTextCtrl_StyleSetForeground, 2998).
--define(wxStyledTextCtrl_StyleSetBackground, 2999).
--define(wxStyledTextCtrl_StyleSetBold, 3000).
--define(wxStyledTextCtrl_StyleSetItalic, 3001).
--define(wxStyledTextCtrl_StyleSetSize, 3002).
--define(wxStyledTextCtrl_StyleSetFaceName, 3003).
--define(wxStyledTextCtrl_StyleSetEOLFilled, 3004).
--define(wxStyledTextCtrl_StyleResetDefault, 3005).
--define(wxStyledTextCtrl_StyleSetUnderline, 3006).
--define(wxStyledTextCtrl_StyleSetCase, 3007).
--define(wxStyledTextCtrl_StyleSetHotSpot, 3008).
--define(wxStyledTextCtrl_SetSelForeground, 3009).
--define(wxStyledTextCtrl_SetSelBackground, 3010).
--define(wxStyledTextCtrl_GetSelAlpha, 3011).
--define(wxStyledTextCtrl_SetSelAlpha, 3012).
--define(wxStyledTextCtrl_SetCaretForeground, 3013).
--define(wxStyledTextCtrl_CmdKeyAssign, 3014).
--define(wxStyledTextCtrl_CmdKeyClear, 3015).
--define(wxStyledTextCtrl_CmdKeyClearAll, 3016).
--define(wxStyledTextCtrl_SetStyleBytes, 3017).
--define(wxStyledTextCtrl_StyleSetVisible, 3018).
--define(wxStyledTextCtrl_GetCaretPeriod, 3019).
--define(wxStyledTextCtrl_SetCaretPeriod, 3020).
--define(wxStyledTextCtrl_SetWordChars, 3021).
--define(wxStyledTextCtrl_BeginUndoAction, 3022).
--define(wxStyledTextCtrl_EndUndoAction, 3023).
--define(wxStyledTextCtrl_IndicatorSetStyle, 3024).
--define(wxStyledTextCtrl_IndicatorGetStyle, 3025).
--define(wxStyledTextCtrl_IndicatorSetForeground, 3026).
--define(wxStyledTextCtrl_IndicatorGetForeground, 3027).
--define(wxStyledTextCtrl_SetWhitespaceForeground, 3028).
--define(wxStyledTextCtrl_SetWhitespaceBackground, 3029).
--define(wxStyledTextCtrl_GetStyleBits, 3030).
--define(wxStyledTextCtrl_SetLineState, 3031).
--define(wxStyledTextCtrl_GetLineState, 3032).
--define(wxStyledTextCtrl_GetMaxLineState, 3033).
--define(wxStyledTextCtrl_GetCaretLineVisible, 3034).
--define(wxStyledTextCtrl_SetCaretLineVisible, 3035).
--define(wxStyledTextCtrl_GetCaretLineBackground, 3036).
--define(wxStyledTextCtrl_SetCaretLineBackground, 3037).
--define(wxStyledTextCtrl_AutoCompShow, 3038).
--define(wxStyledTextCtrl_AutoCompCancel, 3039).
--define(wxStyledTextCtrl_AutoCompActive, 3040).
--define(wxStyledTextCtrl_AutoCompPosStart, 3041).
--define(wxStyledTextCtrl_AutoCompComplete, 3042).
--define(wxStyledTextCtrl_AutoCompStops, 3043).
--define(wxStyledTextCtrl_AutoCompSetSeparator, 3044).
--define(wxStyledTextCtrl_AutoCompGetSeparator, 3045).
--define(wxStyledTextCtrl_AutoCompSelect, 3046).
--define(wxStyledTextCtrl_AutoCompSetCancelAtStart, 3047).
--define(wxStyledTextCtrl_AutoCompGetCancelAtStart, 3048).
--define(wxStyledTextCtrl_AutoCompSetFillUps, 3049).
--define(wxStyledTextCtrl_AutoCompSetChooseSingle, 3050).
--define(wxStyledTextCtrl_AutoCompGetChooseSingle, 3051).
--define(wxStyledTextCtrl_AutoCompSetIgnoreCase, 3052).
--define(wxStyledTextCtrl_AutoCompGetIgnoreCase, 3053).
--define(wxStyledTextCtrl_UserListShow, 3054).
--define(wxStyledTextCtrl_AutoCompSetAutoHide, 3055).
--define(wxStyledTextCtrl_AutoCompGetAutoHide, 3056).
--define(wxStyledTextCtrl_AutoCompSetDropRestOfWord, 3057).
--define(wxStyledTextCtrl_AutoCompGetDropRestOfWord, 3058).
--define(wxStyledTextCtrl_RegisterImage, 3059).
--define(wxStyledTextCtrl_ClearRegisteredImages, 3060).
--define(wxStyledTextCtrl_AutoCompGetTypeSeparator, 3061).
--define(wxStyledTextCtrl_AutoCompSetTypeSeparator, 3062).
--define(wxStyledTextCtrl_AutoCompSetMaxWidth, 3063).
--define(wxStyledTextCtrl_AutoCompGetMaxWidth, 3064).
--define(wxStyledTextCtrl_AutoCompSetMaxHeight, 3065).
--define(wxStyledTextCtrl_AutoCompGetMaxHeight, 3066).
--define(wxStyledTextCtrl_SetIndent, 3067).
--define(wxStyledTextCtrl_GetIndent, 3068).
--define(wxStyledTextCtrl_SetUseTabs, 3069).
--define(wxStyledTextCtrl_GetUseTabs, 3070).
--define(wxStyledTextCtrl_SetLineIndentation, 3071).
--define(wxStyledTextCtrl_GetLineIndentation, 3072).
--define(wxStyledTextCtrl_GetLineIndentPosition, 3073).
--define(wxStyledTextCtrl_GetColumn, 3074).
--define(wxStyledTextCtrl_SetUseHorizontalScrollBar, 3075).
--define(wxStyledTextCtrl_GetUseHorizontalScrollBar, 3076).
--define(wxStyledTextCtrl_SetIndentationGuides, 3077).
--define(wxStyledTextCtrl_GetIndentationGuides, 3078).
--define(wxStyledTextCtrl_SetHighlightGuide, 3079).
--define(wxStyledTextCtrl_GetHighlightGuide, 3080).
--define(wxStyledTextCtrl_GetLineEndPosition, 3081).
--define(wxStyledTextCtrl_GetCodePage, 3082).
--define(wxStyledTextCtrl_GetCaretForeground, 3083).
--define(wxStyledTextCtrl_GetReadOnly, 3084).
--define(wxStyledTextCtrl_SetCurrentPos, 3085).
--define(wxStyledTextCtrl_SetSelectionStart, 3086).
--define(wxStyledTextCtrl_GetSelectionStart, 3087).
--define(wxStyledTextCtrl_SetSelectionEnd, 3088).
--define(wxStyledTextCtrl_GetSelectionEnd, 3089).
--define(wxStyledTextCtrl_SetPrintMagnification, 3090).
--define(wxStyledTextCtrl_GetPrintMagnification, 3091).
--define(wxStyledTextCtrl_SetPrintColourMode, 3092).
--define(wxStyledTextCtrl_GetPrintColourMode, 3093).
--define(wxStyledTextCtrl_FindText, 3094).
--define(wxStyledTextCtrl_FormatRange, 3095).
--define(wxStyledTextCtrl_GetFirstVisibleLine, 3096).
--define(wxStyledTextCtrl_GetLine, 3097).
--define(wxStyledTextCtrl_GetLineCount, 3098).
--define(wxStyledTextCtrl_SetMarginLeft, 3099).
--define(wxStyledTextCtrl_GetMarginLeft, 3100).
--define(wxStyledTextCtrl_SetMarginRight, 3101).
--define(wxStyledTextCtrl_GetMarginRight, 3102).
--define(wxStyledTextCtrl_GetModify, 3103).
--define(wxStyledTextCtrl_SetSelection, 3104).
--define(wxStyledTextCtrl_GetSelectedText, 3105).
--define(wxStyledTextCtrl_GetTextRange, 3106).
--define(wxStyledTextCtrl_HideSelection, 3107).
--define(wxStyledTextCtrl_LineFromPosition, 3108).
--define(wxStyledTextCtrl_PositionFromLine, 3109).
--define(wxStyledTextCtrl_LineScroll, 3110).
--define(wxStyledTextCtrl_EnsureCaretVisible, 3111).
--define(wxStyledTextCtrl_ReplaceSelection, 3112).
--define(wxStyledTextCtrl_SetReadOnly, 3113).
--define(wxStyledTextCtrl_CanPaste, 3114).
--define(wxStyledTextCtrl_CanUndo, 3115).
--define(wxStyledTextCtrl_EmptyUndoBuffer, 3116).
--define(wxStyledTextCtrl_Undo, 3117).
--define(wxStyledTextCtrl_Cut, 3118).
--define(wxStyledTextCtrl_Copy, 3119).
--define(wxStyledTextCtrl_Paste, 3120).
--define(wxStyledTextCtrl_Clear, 3121).
--define(wxStyledTextCtrl_SetText, 3122).
--define(wxStyledTextCtrl_GetText, 3123).
--define(wxStyledTextCtrl_GetTextLength, 3124).
--define(wxStyledTextCtrl_GetOvertype, 3125).
--define(wxStyledTextCtrl_SetCaretWidth, 3126).
--define(wxStyledTextCtrl_GetCaretWidth, 3127).
--define(wxStyledTextCtrl_SetTargetStart, 3128).
--define(wxStyledTextCtrl_GetTargetStart, 3129).
--define(wxStyledTextCtrl_SetTargetEnd, 3130).
--define(wxStyledTextCtrl_GetTargetEnd, 3131).
--define(wxStyledTextCtrl_ReplaceTarget, 3132).
--define(wxStyledTextCtrl_SearchInTarget, 3133).
--define(wxStyledTextCtrl_SetSearchFlags, 3134).
--define(wxStyledTextCtrl_GetSearchFlags, 3135).
--define(wxStyledTextCtrl_CallTipShow, 3136).
--define(wxStyledTextCtrl_CallTipCancel, 3137).
--define(wxStyledTextCtrl_CallTipActive, 3138).
--define(wxStyledTextCtrl_CallTipPosAtStart, 3139).
--define(wxStyledTextCtrl_CallTipSetHighlight, 3140).
--define(wxStyledTextCtrl_CallTipSetBackground, 3141).
--define(wxStyledTextCtrl_CallTipSetForeground, 3142).
--define(wxStyledTextCtrl_CallTipSetForegroundHighlight, 3143).
--define(wxStyledTextCtrl_CallTipUseStyle, 3144).
--define(wxStyledTextCtrl_VisibleFromDocLine, 3145).
--define(wxStyledTextCtrl_DocLineFromVisible, 3146).
--define(wxStyledTextCtrl_WrapCount, 3147).
--define(wxStyledTextCtrl_SetFoldLevel, 3148).
--define(wxStyledTextCtrl_GetFoldLevel, 3149).
--define(wxStyledTextCtrl_GetLastChild, 3150).
--define(wxStyledTextCtrl_GetFoldParent, 3151).
--define(wxStyledTextCtrl_ShowLines, 3152).
--define(wxStyledTextCtrl_HideLines, 3153).
--define(wxStyledTextCtrl_GetLineVisible, 3154).
--define(wxStyledTextCtrl_SetFoldExpanded, 3155).
--define(wxStyledTextCtrl_GetFoldExpanded, 3156).
--define(wxStyledTextCtrl_ToggleFold, 3157).
--define(wxStyledTextCtrl_EnsureVisible, 3158).
--define(wxStyledTextCtrl_SetFoldFlags, 3159).
--define(wxStyledTextCtrl_EnsureVisibleEnforcePolicy, 3160).
--define(wxStyledTextCtrl_SetTabIndents, 3161).
--define(wxStyledTextCtrl_GetTabIndents, 3162).
--define(wxStyledTextCtrl_SetBackSpaceUnIndents, 3163).
--define(wxStyledTextCtrl_GetBackSpaceUnIndents, 3164).
--define(wxStyledTextCtrl_SetMouseDwellTime, 3165).
--define(wxStyledTextCtrl_GetMouseDwellTime, 3166).
--define(wxStyledTextCtrl_WordStartPosition, 3167).
--define(wxStyledTextCtrl_WordEndPosition, 3168).
--define(wxStyledTextCtrl_SetWrapMode, 3169).
--define(wxStyledTextCtrl_GetWrapMode, 3170).
--define(wxStyledTextCtrl_SetWrapVisualFlags, 3171).
--define(wxStyledTextCtrl_GetWrapVisualFlags, 3172).
--define(wxStyledTextCtrl_SetWrapVisualFlagsLocation, 3173).
--define(wxStyledTextCtrl_GetWrapVisualFlagsLocation, 3174).
--define(wxStyledTextCtrl_SetWrapStartIndent, 3175).
--define(wxStyledTextCtrl_GetWrapStartIndent, 3176).
--define(wxStyledTextCtrl_SetLayoutCache, 3177).
--define(wxStyledTextCtrl_GetLayoutCache, 3178).
--define(wxStyledTextCtrl_SetScrollWidth, 3179).
--define(wxStyledTextCtrl_GetScrollWidth, 3180).
--define(wxStyledTextCtrl_TextWidth, 3181).
--define(wxStyledTextCtrl_GetEndAtLastLine, 3182).
--define(wxStyledTextCtrl_TextHeight, 3183).
--define(wxStyledTextCtrl_SetUseVerticalScrollBar, 3184).
--define(wxStyledTextCtrl_GetUseVerticalScrollBar, 3185).
--define(wxStyledTextCtrl_AppendText, 3186).
--define(wxStyledTextCtrl_GetTwoPhaseDraw, 3187).
--define(wxStyledTextCtrl_SetTwoPhaseDraw, 3188).
--define(wxStyledTextCtrl_TargetFromSelection, 3189).
--define(wxStyledTextCtrl_LinesJoin, 3190).
--define(wxStyledTextCtrl_LinesSplit, 3191).
--define(wxStyledTextCtrl_SetFoldMarginColour, 3192).
--define(wxStyledTextCtrl_SetFoldMarginHiColour, 3193).
--define(wxStyledTextCtrl_LineDown, 3194).
--define(wxStyledTextCtrl_LineDownExtend, 3195).
--define(wxStyledTextCtrl_LineUp, 3196).
--define(wxStyledTextCtrl_LineUpExtend, 3197).
--define(wxStyledTextCtrl_CharLeft, 3198).
--define(wxStyledTextCtrl_CharLeftExtend, 3199).
--define(wxStyledTextCtrl_CharRight, 3200).
--define(wxStyledTextCtrl_CharRightExtend, 3201).
--define(wxStyledTextCtrl_WordLeft, 3202).
--define(wxStyledTextCtrl_WordLeftExtend, 3203).
--define(wxStyledTextCtrl_WordRight, 3204).
--define(wxStyledTextCtrl_WordRightExtend, 3205).
--define(wxStyledTextCtrl_Home, 3206).
--define(wxStyledTextCtrl_HomeExtend, 3207).
--define(wxStyledTextCtrl_LineEnd, 3208).
--define(wxStyledTextCtrl_LineEndExtend, 3209).
--define(wxStyledTextCtrl_DocumentStart, 3210).
--define(wxStyledTextCtrl_DocumentStartExtend, 3211).
--define(wxStyledTextCtrl_DocumentEnd, 3212).
--define(wxStyledTextCtrl_DocumentEndExtend, 3213).
--define(wxStyledTextCtrl_PageUp, 3214).
--define(wxStyledTextCtrl_PageUpExtend, 3215).
--define(wxStyledTextCtrl_PageDown, 3216).
--define(wxStyledTextCtrl_PageDownExtend, 3217).
--define(wxStyledTextCtrl_EditToggleOvertype, 3218).
--define(wxStyledTextCtrl_Cancel, 3219).
--define(wxStyledTextCtrl_DeleteBack, 3220).
--define(wxStyledTextCtrl_Tab, 3221).
--define(wxStyledTextCtrl_BackTab, 3222).
--define(wxStyledTextCtrl_NewLine, 3223).
--define(wxStyledTextCtrl_FormFeed, 3224).
--define(wxStyledTextCtrl_VCHome, 3225).
--define(wxStyledTextCtrl_VCHomeExtend, 3226).
--define(wxStyledTextCtrl_ZoomIn, 3227).
--define(wxStyledTextCtrl_ZoomOut, 3228).
--define(wxStyledTextCtrl_DelWordLeft, 3229).
--define(wxStyledTextCtrl_DelWordRight, 3230).
--define(wxStyledTextCtrl_LineCut, 3231).
--define(wxStyledTextCtrl_LineDelete, 3232).
--define(wxStyledTextCtrl_LineTranspose, 3233).
--define(wxStyledTextCtrl_LineDuplicate, 3234).
--define(wxStyledTextCtrl_LowerCase, 3235).
--define(wxStyledTextCtrl_UpperCase, 3236).
--define(wxStyledTextCtrl_LineScrollDown, 3237).
--define(wxStyledTextCtrl_LineScrollUp, 3238).
--define(wxStyledTextCtrl_DeleteBackNotLine, 3239).
--define(wxStyledTextCtrl_HomeDisplay, 3240).
--define(wxStyledTextCtrl_HomeDisplayExtend, 3241).
--define(wxStyledTextCtrl_LineEndDisplay, 3242).
--define(wxStyledTextCtrl_LineEndDisplayExtend, 3243).
--define(wxStyledTextCtrl_HomeWrapExtend, 3244).
--define(wxStyledTextCtrl_LineEndWrap, 3245).
--define(wxStyledTextCtrl_LineEndWrapExtend, 3246).
--define(wxStyledTextCtrl_VCHomeWrap, 3247).
--define(wxStyledTextCtrl_VCHomeWrapExtend, 3248).
--define(wxStyledTextCtrl_LineCopy, 3249).
--define(wxStyledTextCtrl_MoveCaretInsideView, 3250).
--define(wxStyledTextCtrl_LineLength, 3251).
--define(wxStyledTextCtrl_BraceHighlight, 3252).
--define(wxStyledTextCtrl_BraceBadLight, 3253).
--define(wxStyledTextCtrl_BraceMatch, 3254).
--define(wxStyledTextCtrl_GetViewEOL, 3255).
--define(wxStyledTextCtrl_SetViewEOL, 3256).
--define(wxStyledTextCtrl_SetModEventMask, 3257).
--define(wxStyledTextCtrl_GetEdgeColumn, 3258).
--define(wxStyledTextCtrl_SetEdgeColumn, 3259).
--define(wxStyledTextCtrl_GetEdgeMode, 3260).
--define(wxStyledTextCtrl_GetEdgeColour, 3261).
--define(wxStyledTextCtrl_SetEdgeColour, 3262).
--define(wxStyledTextCtrl_SearchAnchor, 3263).
--define(wxStyledTextCtrl_SearchNext, 3264).
--define(wxStyledTextCtrl_SearchPrev, 3265).
--define(wxStyledTextCtrl_LinesOnScreen, 3266).
--define(wxStyledTextCtrl_UsePopUp, 3267).
--define(wxStyledTextCtrl_SelectionIsRectangle, 3268).
--define(wxStyledTextCtrl_SetZoom, 3269).
--define(wxStyledTextCtrl_GetZoom, 3270).
--define(wxStyledTextCtrl_GetModEventMask, 3271).
--define(wxStyledTextCtrl_SetSTCFocus, 3272).
--define(wxStyledTextCtrl_GetSTCFocus, 3273).
--define(wxStyledTextCtrl_SetStatus, 3274).
--define(wxStyledTextCtrl_GetStatus, 3275).
--define(wxStyledTextCtrl_SetMouseDownCaptures, 3276).
--define(wxStyledTextCtrl_GetMouseDownCaptures, 3277).
--define(wxStyledTextCtrl_SetSTCCursor, 3278).
--define(wxStyledTextCtrl_GetSTCCursor, 3279).
--define(wxStyledTextCtrl_SetControlCharSymbol, 3280).
--define(wxStyledTextCtrl_GetControlCharSymbol, 3281).
--define(wxStyledTextCtrl_WordPartLeft, 3282).
--define(wxStyledTextCtrl_WordPartLeftExtend, 3283).
--define(wxStyledTextCtrl_WordPartRight, 3284).
--define(wxStyledTextCtrl_WordPartRightExtend, 3285).
--define(wxStyledTextCtrl_SetVisiblePolicy, 3286).
--define(wxStyledTextCtrl_DelLineLeft, 3287).
--define(wxStyledTextCtrl_DelLineRight, 3288).
--define(wxStyledTextCtrl_GetXOffset, 3289).
--define(wxStyledTextCtrl_ChooseCaretX, 3290).
--define(wxStyledTextCtrl_SetXCaretPolicy, 3291).
--define(wxStyledTextCtrl_SetYCaretPolicy, 3292).
--define(wxStyledTextCtrl_GetPrintWrapMode, 3293).
--define(wxStyledTextCtrl_SetHotspotActiveForeground, 3294).
--define(wxStyledTextCtrl_SetHotspotActiveBackground, 3295).
--define(wxStyledTextCtrl_SetHotspotActiveUnderline, 3296).
--define(wxStyledTextCtrl_SetHotspotSingleLine, 3297).
--define(wxStyledTextCtrl_ParaDownExtend, 3298).
--define(wxStyledTextCtrl_ParaUp, 3299).
--define(wxStyledTextCtrl_ParaUpExtend, 3300).
--define(wxStyledTextCtrl_PositionBefore, 3301).
--define(wxStyledTextCtrl_PositionAfter, 3302).
--define(wxStyledTextCtrl_CopyRange, 3303).
--define(wxStyledTextCtrl_CopyText, 3304).
--define(wxStyledTextCtrl_SetSelectionMode, 3305).
--define(wxStyledTextCtrl_GetSelectionMode, 3306).
--define(wxStyledTextCtrl_LineDownRectExtend, 3307).
--define(wxStyledTextCtrl_LineUpRectExtend, 3308).
--define(wxStyledTextCtrl_CharLeftRectExtend, 3309).
--define(wxStyledTextCtrl_CharRightRectExtend, 3310).
--define(wxStyledTextCtrl_HomeRectExtend, 3311).
--define(wxStyledTextCtrl_VCHomeRectExtend, 3312).
--define(wxStyledTextCtrl_LineEndRectExtend, 3313).
--define(wxStyledTextCtrl_PageUpRectExtend, 3314).
--define(wxStyledTextCtrl_PageDownRectExtend, 3315).
--define(wxStyledTextCtrl_StutteredPageUp, 3316).
--define(wxStyledTextCtrl_StutteredPageUpExtend, 3317).
--define(wxStyledTextCtrl_StutteredPageDown, 3318).
--define(wxStyledTextCtrl_StutteredPageDownExtend, 3319).
--define(wxStyledTextCtrl_WordLeftEnd, 3320).
--define(wxStyledTextCtrl_WordLeftEndExtend, 3321).
--define(wxStyledTextCtrl_WordRightEnd, 3322).
--define(wxStyledTextCtrl_WordRightEndExtend, 3323).
--define(wxStyledTextCtrl_SetWhitespaceChars, 3324).
--define(wxStyledTextCtrl_SetCharsDefault, 3325).
--define(wxStyledTextCtrl_AutoCompGetCurrent, 3326).
--define(wxStyledTextCtrl_Allocate, 3327).
--define(wxStyledTextCtrl_FindColumn, 3328).
--define(wxStyledTextCtrl_GetCaretSticky, 3329).
--define(wxStyledTextCtrl_SetCaretSticky, 3330).
--define(wxStyledTextCtrl_ToggleCaretSticky, 3331).
--define(wxStyledTextCtrl_SetPasteConvertEndings, 3332).
--define(wxStyledTextCtrl_GetPasteConvertEndings, 3333).
--define(wxStyledTextCtrl_SelectionDuplicate, 3334).
--define(wxStyledTextCtrl_SetCaretLineBackAlpha, 3335).
--define(wxStyledTextCtrl_GetCaretLineBackAlpha, 3336).
--define(wxStyledTextCtrl_StartRecord, 3337).
--define(wxStyledTextCtrl_StopRecord, 3338).
--define(wxStyledTextCtrl_SetLexer, 3339).
--define(wxStyledTextCtrl_GetLexer, 3340).
--define(wxStyledTextCtrl_Colourise, 3341).
--define(wxStyledTextCtrl_SetProperty, 3342).
--define(wxStyledTextCtrl_SetKeyWords, 3343).
--define(wxStyledTextCtrl_SetLexerLanguage, 3344).
--define(wxStyledTextCtrl_GetProperty, 3345).
--define(wxStyledTextCtrl_GetStyleBitsNeeded, 3346).
--define(wxStyledTextCtrl_GetCurrentLine, 3347).
--define(wxStyledTextCtrl_StyleSetSpec, 3348).
--define(wxStyledTextCtrl_StyleSetFont, 3349).
--define(wxStyledTextCtrl_StyleSetFontAttr, 3350).
--define(wxStyledTextCtrl_StyleSetCharacterSet, 3351).
--define(wxStyledTextCtrl_StyleSetFontEncoding, 3352).
--define(wxStyledTextCtrl_CmdKeyExecute, 3353).
--define(wxStyledTextCtrl_SetMargins, 3354).
--define(wxStyledTextCtrl_GetSelection, 3355).
--define(wxStyledTextCtrl_PointFromPosition, 3356).
--define(wxStyledTextCtrl_ScrollToLine, 3357).
--define(wxStyledTextCtrl_ScrollToColumn, 3358).
--define(wxStyledTextCtrl_SendMsg, 3359).
--define(wxStyledTextCtrl_SetVScrollBar, 3360).
--define(wxStyledTextCtrl_SetHScrollBar, 3361).
--define(wxStyledTextCtrl_GetLastKeydownProcessed, 3362).
--define(wxStyledTextCtrl_SetLastKeydownProcessed, 3363).
--define(wxStyledTextCtrl_SaveFile, 3364).
--define(wxStyledTextCtrl_LoadFile, 3365).
--define(wxStyledTextCtrl_DoDragOver, 3366).
--define(wxStyledTextCtrl_DoDropText, 3367).
--define(wxStyledTextCtrl_GetUseAntiAliasing, 3368).
--define(wxStyledTextCtrl_AddTextRaw, 3369).
--define(wxStyledTextCtrl_InsertTextRaw, 3370).
--define(wxStyledTextCtrl_GetCurLineRaw, 3371).
--define(wxStyledTextCtrl_GetLineRaw, 3372).
--define(wxStyledTextCtrl_GetSelectedTextRaw, 3373).
--define(wxStyledTextCtrl_GetTextRangeRaw, 3374).
--define(wxStyledTextCtrl_SetTextRaw, 3375).
--define(wxStyledTextCtrl_GetTextRaw, 3376).
--define(wxStyledTextCtrl_AppendTextRaw, 3377).
--define(wxArtProvider_GetBitmap, 3378).
--define(wxArtProvider_GetIcon, 3379).
--define(wxTreeEvent_GetKeyCode, 3380).
--define(wxTreeEvent_GetItem, 3381).
--define(wxTreeEvent_GetKeyEvent, 3382).
--define(wxTreeEvent_GetLabel, 3383).
--define(wxTreeEvent_GetOldItem, 3384).
--define(wxTreeEvent_GetPoint, 3385).
--define(wxTreeEvent_IsEditCancelled, 3386).
--define(wxTreeEvent_SetToolTip, 3387).
--define(wxNotebookEvent_GetOldSelection, 3388).
--define(wxNotebookEvent_GetSelection, 3389).
--define(wxNotebookEvent_SetOldSelection, 3390).
--define(wxNotebookEvent_SetSelection, 3391).
--define(wxFileDataObject_new, 3392).
--define(wxFileDataObject_AddFile, 3393).
--define(wxFileDataObject_GetFilenames, 3394).
--define(wxFileDataObject_destroy, 3395).
--define(wxTextDataObject_new, 3396).
--define(wxTextDataObject_GetTextLength, 3397).
--define(wxTextDataObject_GetText, 3398).
--define(wxTextDataObject_SetText, 3399).
--define(wxTextDataObject_destroy, 3400).
--define(wxBitmapDataObject_new_1_1, 3401).
--define(wxBitmapDataObject_new_1_0, 3402).
--define(wxBitmapDataObject_GetBitmap, 3403).
--define(wxBitmapDataObject_SetBitmap, 3404).
--define(wxBitmapDataObject_destroy, 3405).
--define(wxClipboard_new, 3407).
--define(wxClipboard_destruct, 3408).
--define(wxClipboard_AddData, 3409).
--define(wxClipboard_Clear, 3410).
--define(wxClipboard_Close, 3411).
--define(wxClipboard_Flush, 3412).
--define(wxClipboard_GetData, 3413).
--define(wxClipboard_IsOpened, 3414).
--define(wxClipboard_Open, 3415).
--define(wxClipboard_SetData, 3416).
--define(wxClipboard_UsePrimarySelection, 3418).
--define(wxClipboard_IsSupported, 3419).
--define(wxClipboard_Get, 3420).
--define(wxSpinEvent_GetPosition, 3421).
--define(wxSpinEvent_SetPosition, 3422).
--define(wxSplitterWindow_new_0, 3423).
--define(wxSplitterWindow_new_2, 3424).
--define(wxSplitterWindow_destruct, 3425).
--define(wxSplitterWindow_Create, 3426).
--define(wxSplitterWindow_GetMinimumPaneSize, 3427).
--define(wxSplitterWindow_GetSashGravity, 3428).
--define(wxSplitterWindow_GetSashPosition, 3429).
--define(wxSplitterWindow_GetSplitMode, 3430).
--define(wxSplitterWindow_GetWindow1, 3431).
--define(wxSplitterWindow_GetWindow2, 3432).
--define(wxSplitterWindow_Initialize, 3433).
--define(wxSplitterWindow_IsSplit, 3434).
--define(wxSplitterWindow_ReplaceWindow, 3435).
--define(wxSplitterWindow_SetSashGravity, 3436).
--define(wxSplitterWindow_SetSashPosition, 3437).
--define(wxSplitterWindow_SetSashSize, 3438).
--define(wxSplitterWindow_SetMinimumPaneSize, 3439).
--define(wxSplitterWindow_SetSplitMode, 3440).
--define(wxSplitterWindow_SplitHorizontally, 3441).
--define(wxSplitterWindow_SplitVertically, 3442).
--define(wxSplitterWindow_Unsplit, 3443).
--define(wxSplitterWindow_UpdateSize, 3444).
--define(wxSplitterEvent_GetSashPosition, 3445).
--define(wxSplitterEvent_GetX, 3446).
--define(wxSplitterEvent_GetY, 3447).
--define(wxSplitterEvent_GetWindowBeingRemoved, 3448).
--define(wxSplitterEvent_SetSashPosition, 3449).
--define(wxHtmlWindow_new_0, 3450).
--define(wxHtmlWindow_new_2, 3451).
--define(wxHtmlWindow_AppendToPage, 3452).
--define(wxHtmlWindow_GetOpenedAnchor, 3453).
--define(wxHtmlWindow_GetOpenedPage, 3454).
--define(wxHtmlWindow_GetOpenedPageTitle, 3455).
--define(wxHtmlWindow_GetRelatedFrame, 3456).
--define(wxHtmlWindow_HistoryBack, 3457).
--define(wxHtmlWindow_HistoryCanBack, 3458).
--define(wxHtmlWindow_HistoryCanForward, 3459).
--define(wxHtmlWindow_HistoryClear, 3460).
--define(wxHtmlWindow_HistoryForward, 3461).
--define(wxHtmlWindow_LoadFile, 3462).
--define(wxHtmlWindow_LoadPage, 3463).
--define(wxHtmlWindow_SelectAll, 3464).
--define(wxHtmlWindow_SelectionToText, 3465).
--define(wxHtmlWindow_SelectLine, 3466).
--define(wxHtmlWindow_SelectWord, 3467).
--define(wxHtmlWindow_SetBorders, 3468).
--define(wxHtmlWindow_SetFonts, 3469).
--define(wxHtmlWindow_SetPage, 3470).
--define(wxHtmlWindow_SetRelatedFrame, 3471).
--define(wxHtmlWindow_SetRelatedStatusBar, 3472).
--define(wxHtmlWindow_ToText, 3473).
--define(wxHtmlWindow_destroy, 3474).
--define(wxHtmlLinkEvent_GetLinkInfo, 3475).
--define(wxSystemSettings_GetColour, 3476).
--define(wxSystemSettings_GetFont, 3477).
--define(wxSystemSettings_GetMetric, 3478).
--define(wxSystemSettings_GetScreenType, 3479).
--define(wxAuiNotebookEvent_SetSelection, 3480).
--define(wxAuiNotebookEvent_GetSelection, 3481).
--define(wxAuiNotebookEvent_SetOldSelection, 3482).
--define(wxAuiNotebookEvent_GetOldSelection, 3483).
--define(wxAuiNotebookEvent_SetDragSource, 3484).
--define(wxAuiNotebookEvent_GetDragSource, 3485).
--define(wxAuiManagerEvent_SetManager, 3486).
--define(wxAuiManagerEvent_GetManager, 3487).
--define(wxAuiManagerEvent_SetPane, 3488).
--define(wxAuiManagerEvent_GetPane, 3489).
--define(wxAuiManagerEvent_SetButton, 3490).
--define(wxAuiManagerEvent_GetButton, 3491).
--define(wxAuiManagerEvent_SetDC, 3492).
--define(wxAuiManagerEvent_GetDC, 3493).
--define(wxAuiManagerEvent_Veto, 3494).
--define(wxAuiManagerEvent_GetVeto, 3495).
--define(wxAuiManagerEvent_SetCanVeto, 3496).
--define(wxAuiManagerEvent_CanVeto, 3497).
--define(wxLogNull_new, 3498).
--define(wxLogNull_destroy, 3499).
+-define(wxListItemAttr_new_0, 1757).
+-define(wxListItemAttr_new_3, 1758).
+-define(wxListItemAttr_GetBackgroundColour, 1759).
+-define(wxListItemAttr_GetFont, 1760).
+-define(wxListItemAttr_GetTextColour, 1761).
+-define(wxListItemAttr_HasBackgroundColour, 1762).
+-define(wxListItemAttr_HasFont, 1763).
+-define(wxListItemAttr_HasTextColour, 1764).
+-define(wxListItemAttr_SetBackgroundColour, 1765).
+-define(wxListItemAttr_SetFont, 1766).
+-define(wxListItemAttr_SetTextColour, 1767).
+-define(wxListItemAttr_destroy, 1768).
+-define(wxImageList_new_0, 1769).
+-define(wxImageList_new_3, 1770).
+-define(wxImageList_Add_1, 1771).
+-define(wxImageList_Add_2_0, 1772).
+-define(wxImageList_Add_2_1, 1773).
+-define(wxImageList_Create, 1774).
+-define(wxImageList_Draw, 1776).
+-define(wxImageList_GetBitmap, 1777).
+-define(wxImageList_GetIcon, 1778).
+-define(wxImageList_GetImageCount, 1779).
+-define(wxImageList_GetSize, 1780).
+-define(wxImageList_Remove, 1781).
+-define(wxImageList_RemoveAll, 1782).
+-define(wxImageList_Replace_2, 1783).
+-define(wxImageList_Replace_3, 1784).
+-define(wxImageList_destroy, 1785).
+-define(wxTextAttr_new_0, 1786).
+-define(wxTextAttr_new_2, 1787).
+-define(wxTextAttr_GetAlignment, 1788).
+-define(wxTextAttr_GetBackgroundColour, 1789).
+-define(wxTextAttr_GetFont, 1790).
+-define(wxTextAttr_GetLeftIndent, 1791).
+-define(wxTextAttr_GetLeftSubIndent, 1792).
+-define(wxTextAttr_GetRightIndent, 1793).
+-define(wxTextAttr_GetTabs, 1794).
+-define(wxTextAttr_GetTextColour, 1795).
+-define(wxTextAttr_HasBackgroundColour, 1796).
+-define(wxTextAttr_HasFont, 1797).
+-define(wxTextAttr_HasTextColour, 1798).
+-define(wxTextAttr_GetFlags, 1799).
+-define(wxTextAttr_IsDefault, 1800).
+-define(wxTextAttr_SetAlignment, 1801).
+-define(wxTextAttr_SetBackgroundColour, 1802).
+-define(wxTextAttr_SetFlags, 1803).
+-define(wxTextAttr_SetFont, 1804).
+-define(wxTextAttr_SetLeftIndent, 1805).
+-define(wxTextAttr_SetRightIndent, 1806).
+-define(wxTextAttr_SetTabs, 1807).
+-define(wxTextAttr_SetTextColour, 1808).
+-define(wxTextAttr_destroy, 1809).
+-define(wxTextCtrl_new_3, 1811).
+-define(wxTextCtrl_new_0, 1812).
+-define(wxTextCtrl_destruct, 1814).
+-define(wxTextCtrl_AppendText, 1815).
+-define(wxTextCtrl_CanCopy, 1816).
+-define(wxTextCtrl_CanCut, 1817).
+-define(wxTextCtrl_CanPaste, 1818).
+-define(wxTextCtrl_CanRedo, 1819).
+-define(wxTextCtrl_CanUndo, 1820).
+-define(wxTextCtrl_Clear, 1821).
+-define(wxTextCtrl_Copy, 1822).
+-define(wxTextCtrl_Create, 1823).
+-define(wxTextCtrl_Cut, 1824).
+-define(wxTextCtrl_DiscardEdits, 1825).
+-define(wxTextCtrl_EmulateKeyPress, 1826).
+-define(wxTextCtrl_GetDefaultStyle, 1827).
+-define(wxTextCtrl_GetInsertionPoint, 1828).
+-define(wxTextCtrl_GetLastPosition, 1829).
+-define(wxTextCtrl_GetLineLength, 1830).
+-define(wxTextCtrl_GetLineText, 1831).
+-define(wxTextCtrl_GetNumberOfLines, 1832).
+-define(wxTextCtrl_GetRange, 1833).
+-define(wxTextCtrl_GetSelection, 1834).
+-define(wxTextCtrl_GetStringSelection, 1835).
+-define(wxTextCtrl_GetStyle, 1836).
+-define(wxTextCtrl_GetValue, 1837).
+-define(wxTextCtrl_IsEditable, 1838).
+-define(wxTextCtrl_IsModified, 1839).
+-define(wxTextCtrl_IsMultiLine, 1840).
+-define(wxTextCtrl_IsSingleLine, 1841).
+-define(wxTextCtrl_LoadFile, 1842).
+-define(wxTextCtrl_MarkDirty, 1843).
+-define(wxTextCtrl_Paste, 1844).
+-define(wxTextCtrl_PositionToXY, 1845).
+-define(wxTextCtrl_Redo, 1846).
+-define(wxTextCtrl_Remove, 1847).
+-define(wxTextCtrl_Replace, 1848).
+-define(wxTextCtrl_SaveFile, 1849).
+-define(wxTextCtrl_SetDefaultStyle, 1850).
+-define(wxTextCtrl_SetEditable, 1851).
+-define(wxTextCtrl_SetInsertionPoint, 1852).
+-define(wxTextCtrl_SetInsertionPointEnd, 1853).
+-define(wxTextCtrl_SetMaxLength, 1855).
+-define(wxTextCtrl_SetSelection, 1856).
+-define(wxTextCtrl_SetStyle, 1857).
+-define(wxTextCtrl_SetValue, 1858).
+-define(wxTextCtrl_ShowPosition, 1859).
+-define(wxTextCtrl_Undo, 1860).
+-define(wxTextCtrl_WriteText, 1861).
+-define(wxTextCtrl_XYToPosition, 1862).
+-define(wxNotebook_new_0, 1865).
+-define(wxNotebook_new_3, 1866).
+-define(wxNotebook_destruct, 1867).
+-define(wxNotebook_AddPage, 1868).
+-define(wxNotebook_AdvanceSelection, 1869).
+-define(wxNotebook_AssignImageList, 1870).
+-define(wxNotebook_Create, 1871).
+-define(wxNotebook_DeleteAllPages, 1872).
+-define(wxNotebook_DeletePage, 1873).
+-define(wxNotebook_RemovePage, 1874).
+-define(wxNotebook_GetCurrentPage, 1875).
+-define(wxNotebook_GetImageList, 1876).
+-define(wxNotebook_GetPage, 1878).
+-define(wxNotebook_GetPageCount, 1879).
+-define(wxNotebook_GetPageImage, 1880).
+-define(wxNotebook_GetPageText, 1881).
+-define(wxNotebook_GetRowCount, 1882).
+-define(wxNotebook_GetSelection, 1883).
+-define(wxNotebook_GetThemeBackgroundColour, 1884).
+-define(wxNotebook_HitTest, 1886).
+-define(wxNotebook_InsertPage, 1888).
+-define(wxNotebook_SetImageList, 1889).
+-define(wxNotebook_SetPadding, 1890).
+-define(wxNotebook_SetPageSize, 1891).
+-define(wxNotebook_SetPageImage, 1892).
+-define(wxNotebook_SetPageText, 1893).
+-define(wxNotebook_SetSelection, 1894).
+-define(wxNotebook_ChangeSelection, 1895).
+-define(wxChoicebook_new_0, 1896).
+-define(wxChoicebook_new_3, 1897).
+-define(wxChoicebook_AddPage, 1898).
+-define(wxChoicebook_AdvanceSelection, 1899).
+-define(wxChoicebook_AssignImageList, 1900).
+-define(wxChoicebook_Create, 1901).
+-define(wxChoicebook_DeleteAllPages, 1902).
+-define(wxChoicebook_DeletePage, 1903).
+-define(wxChoicebook_RemovePage, 1904).
+-define(wxChoicebook_GetCurrentPage, 1905).
+-define(wxChoicebook_GetImageList, 1906).
+-define(wxChoicebook_GetPage, 1908).
+-define(wxChoicebook_GetPageCount, 1909).
+-define(wxChoicebook_GetPageImage, 1910).
+-define(wxChoicebook_GetPageText, 1911).
+-define(wxChoicebook_GetSelection, 1912).
+-define(wxChoicebook_HitTest, 1913).
+-define(wxChoicebook_InsertPage, 1914).
+-define(wxChoicebook_SetImageList, 1915).
+-define(wxChoicebook_SetPageSize, 1916).
+-define(wxChoicebook_SetPageImage, 1917).
+-define(wxChoicebook_SetPageText, 1918).
+-define(wxChoicebook_SetSelection, 1919).
+-define(wxChoicebook_ChangeSelection, 1920).
+-define(wxChoicebook_destroy, 1921).
+-define(wxToolbook_new_0, 1922).
+-define(wxToolbook_new_3, 1923).
+-define(wxToolbook_AddPage, 1924).
+-define(wxToolbook_AdvanceSelection, 1925).
+-define(wxToolbook_AssignImageList, 1926).
+-define(wxToolbook_Create, 1927).
+-define(wxToolbook_DeleteAllPages, 1928).
+-define(wxToolbook_DeletePage, 1929).
+-define(wxToolbook_RemovePage, 1930).
+-define(wxToolbook_GetCurrentPage, 1931).
+-define(wxToolbook_GetImageList, 1932).
+-define(wxToolbook_GetPage, 1934).
+-define(wxToolbook_GetPageCount, 1935).
+-define(wxToolbook_GetPageImage, 1936).
+-define(wxToolbook_GetPageText, 1937).
+-define(wxToolbook_GetSelection, 1938).
+-define(wxToolbook_HitTest, 1940).
+-define(wxToolbook_InsertPage, 1941).
+-define(wxToolbook_SetImageList, 1942).
+-define(wxToolbook_SetPageSize, 1943).
+-define(wxToolbook_SetPageImage, 1944).
+-define(wxToolbook_SetPageText, 1945).
+-define(wxToolbook_SetSelection, 1946).
+-define(wxToolbook_ChangeSelection, 1947).
+-define(wxToolbook_destroy, 1948).
+-define(wxListbook_new_0, 1949).
+-define(wxListbook_new_3, 1950).
+-define(wxListbook_AddPage, 1951).
+-define(wxListbook_AdvanceSelection, 1952).
+-define(wxListbook_AssignImageList, 1953).
+-define(wxListbook_Create, 1954).
+-define(wxListbook_DeleteAllPages, 1955).
+-define(wxListbook_DeletePage, 1956).
+-define(wxListbook_RemovePage, 1957).
+-define(wxListbook_GetCurrentPage, 1958).
+-define(wxListbook_GetImageList, 1959).
+-define(wxListbook_GetPage, 1961).
+-define(wxListbook_GetPageCount, 1962).
+-define(wxListbook_GetPageImage, 1963).
+-define(wxListbook_GetPageText, 1964).
+-define(wxListbook_GetSelection, 1965).
+-define(wxListbook_HitTest, 1967).
+-define(wxListbook_InsertPage, 1968).
+-define(wxListbook_SetImageList, 1969).
+-define(wxListbook_SetPageSize, 1970).
+-define(wxListbook_SetPageImage, 1971).
+-define(wxListbook_SetPageText, 1972).
+-define(wxListbook_SetSelection, 1973).
+-define(wxListbook_ChangeSelection, 1974).
+-define(wxListbook_destroy, 1975).
+-define(wxTreebook_new_0, 1976).
+-define(wxTreebook_new_3, 1977).
+-define(wxTreebook_AddPage, 1978).
+-define(wxTreebook_AdvanceSelection, 1979).
+-define(wxTreebook_AssignImageList, 1980).
+-define(wxTreebook_Create, 1981).
+-define(wxTreebook_DeleteAllPages, 1982).
+-define(wxTreebook_DeletePage, 1983).
+-define(wxTreebook_RemovePage, 1984).
+-define(wxTreebook_GetCurrentPage, 1985).
+-define(wxTreebook_GetImageList, 1986).
+-define(wxTreebook_GetPage, 1988).
+-define(wxTreebook_GetPageCount, 1989).
+-define(wxTreebook_GetPageImage, 1990).
+-define(wxTreebook_GetPageText, 1991).
+-define(wxTreebook_GetSelection, 1992).
+-define(wxTreebook_ExpandNode, 1993).
+-define(wxTreebook_IsNodeExpanded, 1994).
+-define(wxTreebook_HitTest, 1996).
+-define(wxTreebook_InsertPage, 1997).
+-define(wxTreebook_InsertSubPage, 1998).
+-define(wxTreebook_SetImageList, 1999).
+-define(wxTreebook_SetPageSize, 2000).
+-define(wxTreebook_SetPageImage, 2001).
+-define(wxTreebook_SetPageText, 2002).
+-define(wxTreebook_SetSelection, 2003).
+-define(wxTreebook_ChangeSelection, 2004).
+-define(wxTreebook_destroy, 2005).
+-define(wxTreeCtrl_new_2, 2008).
+-define(wxTreeCtrl_new_0, 2009).
+-define(wxTreeCtrl_destruct, 2011).
+-define(wxTreeCtrl_AddRoot, 2012).
+-define(wxTreeCtrl_AppendItem, 2013).
+-define(wxTreeCtrl_AssignImageList, 2014).
+-define(wxTreeCtrl_AssignStateImageList, 2015).
+-define(wxTreeCtrl_Collapse, 2016).
+-define(wxTreeCtrl_CollapseAndReset, 2017).
+-define(wxTreeCtrl_Create, 2018).
+-define(wxTreeCtrl_Delete, 2019).
+-define(wxTreeCtrl_DeleteAllItems, 2020).
+-define(wxTreeCtrl_DeleteChildren, 2021).
+-define(wxTreeCtrl_EditLabel, 2022).
+-define(wxTreeCtrl_EnsureVisible, 2023).
+-define(wxTreeCtrl_Expand, 2024).
+-define(wxTreeCtrl_GetBoundingRect, 2025).
+-define(wxTreeCtrl_GetChildrenCount, 2027).
+-define(wxTreeCtrl_GetCount, 2028).
+-define(wxTreeCtrl_GetEditControl, 2029).
+-define(wxTreeCtrl_GetFirstChild, 2030).
+-define(wxTreeCtrl_GetNextChild, 2031).
+-define(wxTreeCtrl_GetFirstVisibleItem, 2032).
+-define(wxTreeCtrl_GetImageList, 2033).
+-define(wxTreeCtrl_GetIndent, 2034).
+-define(wxTreeCtrl_GetItemBackgroundColour, 2035).
+-define(wxTreeCtrl_GetItemData, 2036).
+-define(wxTreeCtrl_GetItemFont, 2037).
+-define(wxTreeCtrl_GetItemImage_1, 2038).
+-define(wxTreeCtrl_GetItemImage_2, 2039).
+-define(wxTreeCtrl_GetItemText, 2040).
+-define(wxTreeCtrl_GetItemTextColour, 2041).
+-define(wxTreeCtrl_GetLastChild, 2042).
+-define(wxTreeCtrl_GetNextSibling, 2043).
+-define(wxTreeCtrl_GetNextVisible, 2044).
+-define(wxTreeCtrl_GetItemParent, 2045).
+-define(wxTreeCtrl_GetPrevSibling, 2046).
+-define(wxTreeCtrl_GetPrevVisible, 2047).
+-define(wxTreeCtrl_GetRootItem, 2048).
+-define(wxTreeCtrl_GetSelection, 2049).
+-define(wxTreeCtrl_GetSelections, 2050).
+-define(wxTreeCtrl_GetStateImageList, 2051).
+-define(wxTreeCtrl_HitTest, 2052).
+-define(wxTreeCtrl_InsertItem, 2054).
+-define(wxTreeCtrl_IsBold, 2055).
+-define(wxTreeCtrl_IsExpanded, 2056).
+-define(wxTreeCtrl_IsSelected, 2057).
+-define(wxTreeCtrl_IsVisible, 2058).
+-define(wxTreeCtrl_ItemHasChildren, 2059).
+-define(wxTreeCtrl_PrependItem, 2060).
+-define(wxTreeCtrl_ScrollTo, 2061).
+-define(wxTreeCtrl_SelectItem_1, 2062).
+-define(wxTreeCtrl_SelectItem_2, 2063).
+-define(wxTreeCtrl_SetIndent, 2064).
+-define(wxTreeCtrl_SetImageList, 2065).
+-define(wxTreeCtrl_SetItemBackgroundColour, 2066).
+-define(wxTreeCtrl_SetItemBold, 2067).
+-define(wxTreeCtrl_SetItemData, 2068).
+-define(wxTreeCtrl_SetItemDropHighlight, 2069).
+-define(wxTreeCtrl_SetItemFont, 2070).
+-define(wxTreeCtrl_SetItemHasChildren, 2071).
+-define(wxTreeCtrl_SetItemImage_2, 2072).
+-define(wxTreeCtrl_SetItemImage_3, 2073).
+-define(wxTreeCtrl_SetItemText, 2074).
+-define(wxTreeCtrl_SetItemTextColour, 2075).
+-define(wxTreeCtrl_SetStateImageList, 2076).
+-define(wxTreeCtrl_SetWindowStyle, 2077).
+-define(wxTreeCtrl_SortChildren, 2078).
+-define(wxTreeCtrl_Toggle, 2079).
+-define(wxTreeCtrl_ToggleItemSelection, 2080).
+-define(wxTreeCtrl_Unselect, 2081).
+-define(wxTreeCtrl_UnselectAll, 2082).
+-define(wxTreeCtrl_UnselectItem, 2083).
+-define(wxScrollBar_new_0, 2084).
+-define(wxScrollBar_new_3, 2085).
+-define(wxScrollBar_destruct, 2086).
+-define(wxScrollBar_Create, 2087).
+-define(wxScrollBar_GetRange, 2088).
+-define(wxScrollBar_GetPageSize, 2089).
+-define(wxScrollBar_GetThumbPosition, 2090).
+-define(wxScrollBar_GetThumbSize, 2091).
+-define(wxScrollBar_SetThumbPosition, 2092).
+-define(wxScrollBar_SetScrollbar, 2093).
+-define(wxSpinButton_new_2, 2095).
+-define(wxSpinButton_new_0, 2096).
+-define(wxSpinButton_Create, 2097).
+-define(wxSpinButton_GetMax, 2098).
+-define(wxSpinButton_GetMin, 2099).
+-define(wxSpinButton_GetValue, 2100).
+-define(wxSpinButton_SetRange, 2101).
+-define(wxSpinButton_SetValue, 2102).
+-define(wxSpinButton_destroy, 2103).
+-define(wxSpinCtrl_new_0, 2104).
+-define(wxSpinCtrl_new_2, 2105).
+-define(wxSpinCtrl_Create, 2107).
+-define(wxSpinCtrl_SetValue_1_1, 2110).
+-define(wxSpinCtrl_SetValue_1_0, 2111).
+-define(wxSpinCtrl_GetValue, 2113).
+-define(wxSpinCtrl_SetRange, 2115).
+-define(wxSpinCtrl_SetSelection, 2116).
+-define(wxSpinCtrl_GetMin, 2118).
+-define(wxSpinCtrl_GetMax, 2120).
+-define(wxSpinCtrl_destroy, 2121).
+-define(wxStaticText_new_0, 2122).
+-define(wxStaticText_new_4, 2123).
+-define(wxStaticText_Create, 2124).
+-define(wxStaticText_GetLabel, 2125).
+-define(wxStaticText_SetLabel, 2126).
+-define(wxStaticText_Wrap, 2127).
+-define(wxStaticText_destroy, 2128).
+-define(wxStaticBitmap_new_0, 2129).
+-define(wxStaticBitmap_new_4, 2130).
+-define(wxStaticBitmap_Create, 2131).
+-define(wxStaticBitmap_GetBitmap, 2132).
+-define(wxStaticBitmap_SetBitmap, 2133).
+-define(wxStaticBitmap_destroy, 2134).
+-define(wxRadioBox_new, 2135).
+-define(wxRadioBox_destruct, 2137).
+-define(wxRadioBox_Create, 2138).
+-define(wxRadioBox_Enable_2, 2139).
+-define(wxRadioBox_Enable_1, 2140).
+-define(wxRadioBox_GetSelection, 2141).
+-define(wxRadioBox_GetString, 2142).
+-define(wxRadioBox_SetSelection, 2143).
+-define(wxRadioBox_Show_2, 2144).
+-define(wxRadioBox_Show_1, 2145).
+-define(wxRadioBox_GetColumnCount, 2146).
+-define(wxRadioBox_GetItemHelpText, 2147).
+-define(wxRadioBox_GetItemToolTip, 2148).
+-define(wxRadioBox_GetItemFromPoint, 2150).
+-define(wxRadioBox_GetRowCount, 2151).
+-define(wxRadioBox_IsItemEnabled, 2152).
+-define(wxRadioBox_IsItemShown, 2153).
+-define(wxRadioBox_SetItemHelpText, 2154).
+-define(wxRadioBox_SetItemToolTip, 2155).
+-define(wxRadioButton_new_0, 2156).
+-define(wxRadioButton_new_4, 2157).
+-define(wxRadioButton_Create, 2158).
+-define(wxRadioButton_GetValue, 2159).
+-define(wxRadioButton_SetValue, 2160).
+-define(wxRadioButton_destroy, 2161).
+-define(wxSlider_new_6, 2163).
+-define(wxSlider_new_0, 2164).
+-define(wxSlider_Create, 2165).
+-define(wxSlider_GetLineSize, 2166).
+-define(wxSlider_GetMax, 2167).
+-define(wxSlider_GetMin, 2168).
+-define(wxSlider_GetPageSize, 2169).
+-define(wxSlider_GetThumbLength, 2170).
+-define(wxSlider_GetValue, 2171).
+-define(wxSlider_SetLineSize, 2172).
+-define(wxSlider_SetPageSize, 2173).
+-define(wxSlider_SetRange, 2174).
+-define(wxSlider_SetThumbLength, 2175).
+-define(wxSlider_SetValue, 2176).
+-define(wxSlider_destroy, 2177).
+-define(wxDialog_new_4, 2179).
+-define(wxDialog_new_0, 2180).
+-define(wxDialog_destruct, 2182).
+-define(wxDialog_Create, 2183).
+-define(wxDialog_CreateButtonSizer, 2184).
+-define(wxDialog_CreateStdDialogButtonSizer, 2185).
+-define(wxDialog_EndModal, 2186).
+-define(wxDialog_GetAffirmativeId, 2187).
+-define(wxDialog_GetReturnCode, 2188).
+-define(wxDialog_IsModal, 2189).
+-define(wxDialog_SetAffirmativeId, 2190).
+-define(wxDialog_SetReturnCode, 2191).
+-define(wxDialog_Show, 2192).
+-define(wxDialog_ShowModal, 2193).
+-define(wxColourDialog_new_0, 2194).
+-define(wxColourDialog_new_2, 2195).
+-define(wxColourDialog_destruct, 2196).
+-define(wxColourDialog_Create, 2197).
+-define(wxColourDialog_GetColourData, 2198).
+-define(wxColourData_new_0, 2199).
+-define(wxColourData_new_1, 2200).
+-define(wxColourData_destruct, 2201).
+-define(wxColourData_GetChooseFull, 2202).
+-define(wxColourData_GetColour, 2203).
+-define(wxColourData_GetCustomColour, 2205).
+-define(wxColourData_SetChooseFull, 2206).
+-define(wxColourData_SetColour, 2207).
+-define(wxColourData_SetCustomColour, 2208).
+-define(wxPalette_new_0, 2209).
+-define(wxPalette_new_4, 2210).
+-define(wxPalette_destruct, 2212).
+-define(wxPalette_Create, 2213).
+-define(wxPalette_GetColoursCount, 2214).
+-define(wxPalette_GetPixel, 2215).
+-define(wxPalette_GetRGB, 2216).
+-define(wxPalette_IsOk, 2217).
+-define(wxDirDialog_new, 2221).
+-define(wxDirDialog_destruct, 2222).
+-define(wxDirDialog_GetPath, 2223).
+-define(wxDirDialog_GetMessage, 2224).
+-define(wxDirDialog_SetMessage, 2225).
+-define(wxDirDialog_SetPath, 2226).
+-define(wxFileDialog_new, 2230).
+-define(wxFileDialog_destruct, 2231).
+-define(wxFileDialog_GetDirectory, 2232).
+-define(wxFileDialog_GetFilename, 2233).
+-define(wxFileDialog_GetFilenames, 2234).
+-define(wxFileDialog_GetFilterIndex, 2235).
+-define(wxFileDialog_GetMessage, 2236).
+-define(wxFileDialog_GetPath, 2237).
+-define(wxFileDialog_GetPaths, 2238).
+-define(wxFileDialog_GetWildcard, 2239).
+-define(wxFileDialog_SetDirectory, 2240).
+-define(wxFileDialog_SetFilename, 2241).
+-define(wxFileDialog_SetFilterIndex, 2242).
+-define(wxFileDialog_SetMessage, 2243).
+-define(wxFileDialog_SetPath, 2244).
+-define(wxFileDialog_SetWildcard, 2245).
+-define(wxPickerBase_SetInternalMargin, 2246).
+-define(wxPickerBase_GetInternalMargin, 2247).
+-define(wxPickerBase_SetTextCtrlProportion, 2248).
+-define(wxPickerBase_SetPickerCtrlProportion, 2249).
+-define(wxPickerBase_GetTextCtrlProportion, 2250).
+-define(wxPickerBase_GetPickerCtrlProportion, 2251).
+-define(wxPickerBase_HasTextCtrl, 2252).
+-define(wxPickerBase_GetTextCtrl, 2253).
+-define(wxPickerBase_IsTextCtrlGrowable, 2254).
+-define(wxPickerBase_SetPickerCtrlGrowable, 2255).
+-define(wxPickerBase_SetTextCtrlGrowable, 2256).
+-define(wxPickerBase_IsPickerCtrlGrowable, 2257).
+-define(wxFilePickerCtrl_new_0, 2258).
+-define(wxFilePickerCtrl_new_3, 2259).
+-define(wxFilePickerCtrl_Create, 2260).
+-define(wxFilePickerCtrl_GetPath, 2261).
+-define(wxFilePickerCtrl_SetPath, 2262).
+-define(wxFilePickerCtrl_destroy, 2263).
+-define(wxDirPickerCtrl_new_0, 2264).
+-define(wxDirPickerCtrl_new_3, 2265).
+-define(wxDirPickerCtrl_Create, 2266).
+-define(wxDirPickerCtrl_GetPath, 2267).
+-define(wxDirPickerCtrl_SetPath, 2268).
+-define(wxDirPickerCtrl_destroy, 2269).
+-define(wxColourPickerCtrl_new_0, 2270).
+-define(wxColourPickerCtrl_new_3, 2271).
+-define(wxColourPickerCtrl_Create, 2272).
+-define(wxColourPickerCtrl_GetColour, 2273).
+-define(wxColourPickerCtrl_SetColour_1_1, 2274).
+-define(wxColourPickerCtrl_SetColour_1_0, 2275).
+-define(wxColourPickerCtrl_destroy, 2276).
+-define(wxDatePickerCtrl_new_0, 2277).
+-define(wxDatePickerCtrl_new_3, 2278).
+-define(wxDatePickerCtrl_GetRange, 2279).
+-define(wxDatePickerCtrl_GetValue, 2280).
+-define(wxDatePickerCtrl_SetRange, 2281).
+-define(wxDatePickerCtrl_SetValue, 2282).
+-define(wxDatePickerCtrl_destroy, 2283).
+-define(wxFontPickerCtrl_new_0, 2284).
+-define(wxFontPickerCtrl_new_3, 2285).
+-define(wxFontPickerCtrl_Create, 2286).
+-define(wxFontPickerCtrl_GetSelectedFont, 2287).
+-define(wxFontPickerCtrl_SetSelectedFont, 2288).
+-define(wxFontPickerCtrl_GetMaxPointSize, 2289).
+-define(wxFontPickerCtrl_SetMaxPointSize, 2290).
+-define(wxFontPickerCtrl_destroy, 2291).
+-define(wxFindReplaceDialog_new_0, 2294).
+-define(wxFindReplaceDialog_new_4, 2295).
+-define(wxFindReplaceDialog_destruct, 2296).
+-define(wxFindReplaceDialog_Create, 2297).
+-define(wxFindReplaceDialog_GetData, 2298).
+-define(wxFindReplaceData_new_0, 2299).
+-define(wxFindReplaceData_new_1, 2300).
+-define(wxFindReplaceData_GetFindString, 2301).
+-define(wxFindReplaceData_GetReplaceString, 2302).
+-define(wxFindReplaceData_GetFlags, 2303).
+-define(wxFindReplaceData_SetFlags, 2304).
+-define(wxFindReplaceData_SetFindString, 2305).
+-define(wxFindReplaceData_SetReplaceString, 2306).
+-define(wxFindReplaceData_destroy, 2307).
+-define(wxMultiChoiceDialog_new_0, 2308).
+-define(wxMultiChoiceDialog_new_5, 2310).
+-define(wxMultiChoiceDialog_GetSelections, 2311).
+-define(wxMultiChoiceDialog_SetSelections, 2312).
+-define(wxMultiChoiceDialog_destroy, 2313).
+-define(wxSingleChoiceDialog_new_0, 2314).
+-define(wxSingleChoiceDialog_new_5, 2316).
+-define(wxSingleChoiceDialog_GetSelection, 2317).
+-define(wxSingleChoiceDialog_GetStringSelection, 2318).
+-define(wxSingleChoiceDialog_SetSelection, 2319).
+-define(wxSingleChoiceDialog_destroy, 2320).
+-define(wxTextEntryDialog_new, 2321).
+-define(wxTextEntryDialog_GetValue, 2322).
+-define(wxTextEntryDialog_SetValue, 2323).
+-define(wxTextEntryDialog_destroy, 2324).
+-define(wxPasswordEntryDialog_new, 2325).
+-define(wxPasswordEntryDialog_destroy, 2326).
+-define(wxFontData_new_0, 2327).
+-define(wxFontData_new_1, 2328).
+-define(wxFontData_destruct, 2329).
+-define(wxFontData_EnableEffects, 2330).
+-define(wxFontData_GetAllowSymbols, 2331).
+-define(wxFontData_GetColour, 2332).
+-define(wxFontData_GetChosenFont, 2333).
+-define(wxFontData_GetEnableEffects, 2334).
+-define(wxFontData_GetInitialFont, 2335).
+-define(wxFontData_GetShowHelp, 2336).
+-define(wxFontData_SetAllowSymbols, 2337).
+-define(wxFontData_SetChosenFont, 2338).
+-define(wxFontData_SetColour, 2339).
+-define(wxFontData_SetInitialFont, 2340).
+-define(wxFontData_SetRange, 2341).
+-define(wxFontData_SetShowHelp, 2342).
+-define(wxFontDialog_new_0, 2346).
+-define(wxFontDialog_new_2, 2348).
+-define(wxFontDialog_Create, 2350).
+-define(wxFontDialog_GetFontData, 2351).
+-define(wxFontDialog_destroy, 2353).
+-define(wxProgressDialog_new, 2354).
+-define(wxProgressDialog_destruct, 2355).
+-define(wxProgressDialog_Resume, 2356).
+-define(wxProgressDialog_Update_2, 2357).
+-define(wxProgressDialog_Update_0, 2358).
+-define(wxMessageDialog_new, 2359).
+-define(wxMessageDialog_destruct, 2360).
+-define(wxPageSetupDialog_new, 2361).
+-define(wxPageSetupDialog_destruct, 2362).
+-define(wxPageSetupDialog_GetPageSetupData, 2363).
+-define(wxPageSetupDialog_ShowModal, 2364).
+-define(wxPageSetupDialogData_new_0, 2365).
+-define(wxPageSetupDialogData_new_1_0, 2366).
+-define(wxPageSetupDialogData_new_1_1, 2367).
+-define(wxPageSetupDialogData_destruct, 2368).
+-define(wxPageSetupDialogData_EnableHelp, 2369).
+-define(wxPageSetupDialogData_EnableMargins, 2370).
+-define(wxPageSetupDialogData_EnableOrientation, 2371).
+-define(wxPageSetupDialogData_EnablePaper, 2372).
+-define(wxPageSetupDialogData_EnablePrinter, 2373).
+-define(wxPageSetupDialogData_GetDefaultMinMargins, 2374).
+-define(wxPageSetupDialogData_GetEnableMargins, 2375).
+-define(wxPageSetupDialogData_GetEnableOrientation, 2376).
+-define(wxPageSetupDialogData_GetEnablePaper, 2377).
+-define(wxPageSetupDialogData_GetEnablePrinter, 2378).
+-define(wxPageSetupDialogData_GetEnableHelp, 2379).
+-define(wxPageSetupDialogData_GetDefaultInfo, 2380).
+-define(wxPageSetupDialogData_GetMarginTopLeft, 2381).
+-define(wxPageSetupDialogData_GetMarginBottomRight, 2382).
+-define(wxPageSetupDialogData_GetMinMarginTopLeft, 2383).
+-define(wxPageSetupDialogData_GetMinMarginBottomRight, 2384).
+-define(wxPageSetupDialogData_GetPaperId, 2385).
+-define(wxPageSetupDialogData_GetPaperSize, 2386).
+-define(wxPageSetupDialogData_GetPrintData, 2388).
+-define(wxPageSetupDialogData_IsOk, 2389).
+-define(wxPageSetupDialogData_SetDefaultInfo, 2390).
+-define(wxPageSetupDialogData_SetDefaultMinMargins, 2391).
+-define(wxPageSetupDialogData_SetMarginTopLeft, 2392).
+-define(wxPageSetupDialogData_SetMarginBottomRight, 2393).
+-define(wxPageSetupDialogData_SetMinMarginTopLeft, 2394).
+-define(wxPageSetupDialogData_SetMinMarginBottomRight, 2395).
+-define(wxPageSetupDialogData_SetPaperId, 2396).
+-define(wxPageSetupDialogData_SetPaperSize_1_1, 2397).
+-define(wxPageSetupDialogData_SetPaperSize_1_0, 2398).
+-define(wxPageSetupDialogData_SetPrintData, 2399).
+-define(wxPrintDialog_new_2_0, 2400).
+-define(wxPrintDialog_new_2_1, 2401).
+-define(wxPrintDialog_destruct, 2402).
+-define(wxPrintDialog_GetPrintDialogData, 2403).
+-define(wxPrintDialog_GetPrintDC, 2404).
+-define(wxPrintDialogData_new_0, 2405).
+-define(wxPrintDialogData_new_1_1, 2406).
+-define(wxPrintDialogData_new_1_0, 2407).
+-define(wxPrintDialogData_destruct, 2408).
+-define(wxPrintDialogData_EnableHelp, 2409).
+-define(wxPrintDialogData_EnablePageNumbers, 2410).
+-define(wxPrintDialogData_EnablePrintToFile, 2411).
+-define(wxPrintDialogData_EnableSelection, 2412).
+-define(wxPrintDialogData_GetAllPages, 2413).
+-define(wxPrintDialogData_GetCollate, 2414).
+-define(wxPrintDialogData_GetFromPage, 2415).
+-define(wxPrintDialogData_GetMaxPage, 2416).
+-define(wxPrintDialogData_GetMinPage, 2417).
+-define(wxPrintDialogData_GetNoCopies, 2418).
+-define(wxPrintDialogData_GetPrintData, 2419).
+-define(wxPrintDialogData_GetPrintToFile, 2420).
+-define(wxPrintDialogData_GetSelection, 2421).
+-define(wxPrintDialogData_GetToPage, 2422).
+-define(wxPrintDialogData_IsOk, 2423).
+-define(wxPrintDialogData_SetCollate, 2424).
+-define(wxPrintDialogData_SetFromPage, 2425).
+-define(wxPrintDialogData_SetMaxPage, 2426).
+-define(wxPrintDialogData_SetMinPage, 2427).
+-define(wxPrintDialogData_SetNoCopies, 2428).
+-define(wxPrintDialogData_SetPrintData, 2429).
+-define(wxPrintDialogData_SetPrintToFile, 2430).
+-define(wxPrintDialogData_SetSelection, 2431).
+-define(wxPrintDialogData_SetToPage, 2432).
+-define(wxPrintData_new_0, 2433).
+-define(wxPrintData_new_1, 2434).
+-define(wxPrintData_destruct, 2435).
+-define(wxPrintData_GetCollate, 2436).
+-define(wxPrintData_GetBin, 2437).
+-define(wxPrintData_GetColour, 2438).
+-define(wxPrintData_GetDuplex, 2439).
+-define(wxPrintData_GetNoCopies, 2440).
+-define(wxPrintData_GetOrientation, 2441).
+-define(wxPrintData_GetPaperId, 2442).
+-define(wxPrintData_GetPrinterName, 2443).
+-define(wxPrintData_GetQuality, 2444).
+-define(wxPrintData_IsOk, 2445).
+-define(wxPrintData_SetBin, 2446).
+-define(wxPrintData_SetCollate, 2447).
+-define(wxPrintData_SetColour, 2448).
+-define(wxPrintData_SetDuplex, 2449).
+-define(wxPrintData_SetNoCopies, 2450).
+-define(wxPrintData_SetOrientation, 2451).
+-define(wxPrintData_SetPaperId, 2452).
+-define(wxPrintData_SetPrinterName, 2453).
+-define(wxPrintData_SetQuality, 2454).
+-define(wxPrintPreview_new_2, 2457).
+-define(wxPrintPreview_new_3, 2458).
+-define(wxPrintPreview_destruct, 2460).
+-define(wxPrintPreview_GetCanvas, 2461).
+-define(wxPrintPreview_GetCurrentPage, 2462).
+-define(wxPrintPreview_GetFrame, 2463).
+-define(wxPrintPreview_GetMaxPage, 2464).
+-define(wxPrintPreview_GetMinPage, 2465).
+-define(wxPrintPreview_GetPrintout, 2466).
+-define(wxPrintPreview_GetPrintoutForPrinting, 2467).
+-define(wxPrintPreview_IsOk, 2468).
+-define(wxPrintPreview_PaintPage, 2469).
+-define(wxPrintPreview_Print, 2470).
+-define(wxPrintPreview_RenderPage, 2471).
+-define(wxPrintPreview_SetCanvas, 2472).
+-define(wxPrintPreview_SetCurrentPage, 2473).
+-define(wxPrintPreview_SetFrame, 2474).
+-define(wxPrintPreview_SetPrintout, 2475).
+-define(wxPrintPreview_SetZoom, 2476).
+-define(wxPreviewFrame_new, 2477).
+-define(wxPreviewFrame_destruct, 2478).
+-define(wxPreviewFrame_CreateControlBar, 2479).
+-define(wxPreviewFrame_CreateCanvas, 2480).
+-define(wxPreviewFrame_Initialize, 2481).
+-define(wxPreviewFrame_OnCloseWindow, 2482).
+-define(wxPreviewControlBar_new, 2483).
+-define(wxPreviewControlBar_destruct, 2484).
+-define(wxPreviewControlBar_CreateButtons, 2485).
+-define(wxPreviewControlBar_GetPrintPreview, 2486).
+-define(wxPreviewControlBar_GetZoomControl, 2487).
+-define(wxPreviewControlBar_SetZoomControl, 2488).
+-define(wxPrinter_new, 2490).
+-define(wxPrinter_CreateAbortWindow, 2491).
+-define(wxPrinter_GetAbort, 2492).
+-define(wxPrinter_GetLastError, 2493).
+-define(wxPrinter_GetPrintDialogData, 2494).
+-define(wxPrinter_Print, 2495).
+-define(wxPrinter_PrintDialog, 2496).
+-define(wxPrinter_ReportError, 2497).
+-define(wxPrinter_Setup, 2498).
+-define(wxPrinter_destroy, 2499).
+-define(wxXmlResource_new_1, 2500).
+-define(wxXmlResource_new_2, 2501).
+-define(wxXmlResource_destruct, 2502).
+-define(wxXmlResource_AttachUnknownControl, 2503).
+-define(wxXmlResource_ClearHandlers, 2504).
+-define(wxXmlResource_CompareVersion, 2505).
+-define(wxXmlResource_Get, 2506).
+-define(wxXmlResource_GetFlags, 2507).
+-define(wxXmlResource_GetVersion, 2508).
+-define(wxXmlResource_GetXRCID, 2509).
+-define(wxXmlResource_InitAllHandlers, 2510).
+-define(wxXmlResource_Load, 2511).
+-define(wxXmlResource_LoadBitmap, 2512).
+-define(wxXmlResource_LoadDialog_2, 2513).
+-define(wxXmlResource_LoadDialog_3, 2514).
+-define(wxXmlResource_LoadFrame_2, 2515).
+-define(wxXmlResource_LoadFrame_3, 2516).
+-define(wxXmlResource_LoadIcon, 2517).
+-define(wxXmlResource_LoadMenu, 2518).
+-define(wxXmlResource_LoadMenuBar_2, 2519).
+-define(wxXmlResource_LoadMenuBar_1, 2520).
+-define(wxXmlResource_LoadPanel_2, 2521).
+-define(wxXmlResource_LoadPanel_3, 2522).
+-define(wxXmlResource_LoadToolBar, 2523).
+-define(wxXmlResource_Set, 2524).
+-define(wxXmlResource_SetFlags, 2525).
+-define(wxXmlResource_Unload, 2526).
+-define(wxXmlResource_xrcctrl, 2527).
+-define(wxHtmlEasyPrinting_new, 2528).
+-define(wxHtmlEasyPrinting_destruct, 2529).
+-define(wxHtmlEasyPrinting_GetPrintData, 2530).
+-define(wxHtmlEasyPrinting_GetPageSetupData, 2531).
+-define(wxHtmlEasyPrinting_PreviewFile, 2532).
+-define(wxHtmlEasyPrinting_PreviewText, 2533).
+-define(wxHtmlEasyPrinting_PrintFile, 2534).
+-define(wxHtmlEasyPrinting_PrintText, 2535).
+-define(wxHtmlEasyPrinting_PageSetup, 2536).
+-define(wxHtmlEasyPrinting_SetFonts, 2537).
+-define(wxHtmlEasyPrinting_SetHeader, 2538).
+-define(wxHtmlEasyPrinting_SetFooter, 2539).
+-define(wxGLCanvas_new_2, 2541).
+-define(wxGLCanvas_new_3_1, 2542).
+-define(wxGLCanvas_new_3_0, 2543).
+-define(wxGLCanvas_GetContext, 2544).
+-define(wxGLCanvas_SetCurrent, 2546).
+-define(wxGLCanvas_SwapBuffers, 2547).
+-define(wxGLCanvas_destroy, 2548).
+-define(wxAuiManager_new, 2549).
+-define(wxAuiManager_destruct, 2550).
+-define(wxAuiManager_AddPane_2_1, 2551).
+-define(wxAuiManager_AddPane_3, 2552).
+-define(wxAuiManager_AddPane_2_0, 2553).
+-define(wxAuiManager_DetachPane, 2554).
+-define(wxAuiManager_GetAllPanes, 2555).
+-define(wxAuiManager_GetArtProvider, 2556).
+-define(wxAuiManager_GetDockSizeConstraint, 2557).
+-define(wxAuiManager_GetFlags, 2558).
+-define(wxAuiManager_GetManagedWindow, 2559).
+-define(wxAuiManager_GetManager, 2560).
+-define(wxAuiManager_GetPane_1_1, 2561).
+-define(wxAuiManager_GetPane_1_0, 2562).
+-define(wxAuiManager_HideHint, 2563).
+-define(wxAuiManager_InsertPane, 2564).
+-define(wxAuiManager_LoadPaneInfo, 2565).
+-define(wxAuiManager_LoadPerspective, 2566).
+-define(wxAuiManager_SavePaneInfo, 2567).
+-define(wxAuiManager_SavePerspective, 2568).
+-define(wxAuiManager_SetArtProvider, 2569).
+-define(wxAuiManager_SetDockSizeConstraint, 2570).
+-define(wxAuiManager_SetFlags, 2571).
+-define(wxAuiManager_SetManagedWindow, 2572).
+-define(wxAuiManager_ShowHint, 2573).
+-define(wxAuiManager_UnInit, 2574).
+-define(wxAuiManager_Update, 2575).
+-define(wxAuiPaneInfo_new_0, 2576).
+-define(wxAuiPaneInfo_new_1, 2577).
+-define(wxAuiPaneInfo_destruct, 2578).
+-define(wxAuiPaneInfo_BestSize_1, 2579).
+-define(wxAuiPaneInfo_BestSize_2, 2580).
+-define(wxAuiPaneInfo_Bottom, 2581).
+-define(wxAuiPaneInfo_BottomDockable, 2582).
+-define(wxAuiPaneInfo_Caption, 2583).
+-define(wxAuiPaneInfo_CaptionVisible, 2584).
+-define(wxAuiPaneInfo_Centre, 2585).
+-define(wxAuiPaneInfo_CentrePane, 2586).
+-define(wxAuiPaneInfo_CloseButton, 2587).
+-define(wxAuiPaneInfo_DefaultPane, 2588).
+-define(wxAuiPaneInfo_DestroyOnClose, 2589).
+-define(wxAuiPaneInfo_Direction, 2590).
+-define(wxAuiPaneInfo_Dock, 2591).
+-define(wxAuiPaneInfo_Dockable, 2592).
+-define(wxAuiPaneInfo_Fixed, 2593).
+-define(wxAuiPaneInfo_Float, 2594).
+-define(wxAuiPaneInfo_Floatable, 2595).
+-define(wxAuiPaneInfo_FloatingPosition_1, 2596).
+-define(wxAuiPaneInfo_FloatingPosition_2, 2597).
+-define(wxAuiPaneInfo_FloatingSize_1, 2598).
+-define(wxAuiPaneInfo_FloatingSize_2, 2599).
+-define(wxAuiPaneInfo_Gripper, 2600).
+-define(wxAuiPaneInfo_GripperTop, 2601).
+-define(wxAuiPaneInfo_HasBorder, 2602).
+-define(wxAuiPaneInfo_HasCaption, 2603).
+-define(wxAuiPaneInfo_HasCloseButton, 2604).
+-define(wxAuiPaneInfo_HasFlag, 2605).
+-define(wxAuiPaneInfo_HasGripper, 2606).
+-define(wxAuiPaneInfo_HasGripperTop, 2607).
+-define(wxAuiPaneInfo_HasMaximizeButton, 2608).
+-define(wxAuiPaneInfo_HasMinimizeButton, 2609).
+-define(wxAuiPaneInfo_HasPinButton, 2610).
+-define(wxAuiPaneInfo_Hide, 2611).
+-define(wxAuiPaneInfo_IsBottomDockable, 2612).
+-define(wxAuiPaneInfo_IsDocked, 2613).
+-define(wxAuiPaneInfo_IsFixed, 2614).
+-define(wxAuiPaneInfo_IsFloatable, 2615).
+-define(wxAuiPaneInfo_IsFloating, 2616).
+-define(wxAuiPaneInfo_IsLeftDockable, 2617).
+-define(wxAuiPaneInfo_IsMovable, 2618).
+-define(wxAuiPaneInfo_IsOk, 2619).
+-define(wxAuiPaneInfo_IsResizable, 2620).
+-define(wxAuiPaneInfo_IsRightDockable, 2621).
+-define(wxAuiPaneInfo_IsShown, 2622).
+-define(wxAuiPaneInfo_IsToolbar, 2623).
+-define(wxAuiPaneInfo_IsTopDockable, 2624).
+-define(wxAuiPaneInfo_Layer, 2625).
+-define(wxAuiPaneInfo_Left, 2626).
+-define(wxAuiPaneInfo_LeftDockable, 2627).
+-define(wxAuiPaneInfo_MaxSize_1, 2628).
+-define(wxAuiPaneInfo_MaxSize_2, 2629).
+-define(wxAuiPaneInfo_MaximizeButton, 2630).
+-define(wxAuiPaneInfo_MinSize_1, 2631).
+-define(wxAuiPaneInfo_MinSize_2, 2632).
+-define(wxAuiPaneInfo_MinimizeButton, 2633).
+-define(wxAuiPaneInfo_Movable, 2634).
+-define(wxAuiPaneInfo_Name, 2635).
+-define(wxAuiPaneInfo_PaneBorder, 2636).
+-define(wxAuiPaneInfo_PinButton, 2637).
+-define(wxAuiPaneInfo_Position, 2638).
+-define(wxAuiPaneInfo_Resizable, 2639).
+-define(wxAuiPaneInfo_Right, 2640).
+-define(wxAuiPaneInfo_RightDockable, 2641).
+-define(wxAuiPaneInfo_Row, 2642).
+-define(wxAuiPaneInfo_SafeSet, 2643).
+-define(wxAuiPaneInfo_SetFlag, 2644).
+-define(wxAuiPaneInfo_Show, 2645).
+-define(wxAuiPaneInfo_ToolbarPane, 2646).
+-define(wxAuiPaneInfo_Top, 2647).
+-define(wxAuiPaneInfo_TopDockable, 2648).
+-define(wxAuiPaneInfo_Window, 2649).
+-define(wxAuiNotebook_new_0, 2650).
+-define(wxAuiNotebook_new_2, 2651).
+-define(wxAuiNotebook_AddPage, 2652).
+-define(wxAuiNotebook_Create, 2653).
+-define(wxAuiNotebook_DeletePage, 2654).
+-define(wxAuiNotebook_GetArtProvider, 2655).
+-define(wxAuiNotebook_GetPage, 2656).
+-define(wxAuiNotebook_GetPageBitmap, 2657).
+-define(wxAuiNotebook_GetPageCount, 2658).
+-define(wxAuiNotebook_GetPageIndex, 2659).
+-define(wxAuiNotebook_GetPageText, 2660).
+-define(wxAuiNotebook_GetSelection, 2661).
+-define(wxAuiNotebook_InsertPage, 2662).
+-define(wxAuiNotebook_RemovePage, 2663).
+-define(wxAuiNotebook_SetArtProvider, 2664).
+-define(wxAuiNotebook_SetFont, 2665).
+-define(wxAuiNotebook_SetPageBitmap, 2666).
+-define(wxAuiNotebook_SetPageText, 2667).
+-define(wxAuiNotebook_SetSelection, 2668).
+-define(wxAuiNotebook_SetTabCtrlHeight, 2669).
+-define(wxAuiNotebook_SetUniformBitmapSize, 2670).
+-define(wxAuiNotebook_destroy, 2671).
+-define(wxMDIParentFrame_new_0, 2672).
+-define(wxMDIParentFrame_new_4, 2673).
+-define(wxMDIParentFrame_destruct, 2674).
+-define(wxMDIParentFrame_ActivateNext, 2675).
+-define(wxMDIParentFrame_ActivatePrevious, 2676).
+-define(wxMDIParentFrame_ArrangeIcons, 2677).
+-define(wxMDIParentFrame_Cascade, 2678).
+-define(wxMDIParentFrame_Create, 2679).
+-define(wxMDIParentFrame_GetActiveChild, 2680).
+-define(wxMDIParentFrame_GetClientWindow, 2681).
+-define(wxMDIParentFrame_Tile, 2682).
+-define(wxMDIChildFrame_new_0, 2683).
+-define(wxMDIChildFrame_new_4, 2684).
+-define(wxMDIChildFrame_destruct, 2685).
+-define(wxMDIChildFrame_Activate, 2686).
+-define(wxMDIChildFrame_Create, 2687).
+-define(wxMDIChildFrame_Maximize, 2688).
+-define(wxMDIChildFrame_Restore, 2689).
+-define(wxMDIClientWindow_new_0, 2690).
+-define(wxMDIClientWindow_new_2, 2691).
+-define(wxMDIClientWindow_destruct, 2692).
+-define(wxMDIClientWindow_CreateClient, 2693).
+-define(wxLayoutAlgorithm_new, 2694).
+-define(wxLayoutAlgorithm_LayoutFrame, 2695).
+-define(wxLayoutAlgorithm_LayoutMDIFrame, 2696).
+-define(wxLayoutAlgorithm_LayoutWindow, 2697).
+-define(wxLayoutAlgorithm_destroy, 2698).
+-define(wxEvent_GetId, 2699).
+-define(wxEvent_GetSkipped, 2700).
+-define(wxEvent_GetTimestamp, 2701).
+-define(wxEvent_IsCommandEvent, 2702).
+-define(wxEvent_ResumePropagation, 2703).
+-define(wxEvent_ShouldPropagate, 2704).
+-define(wxEvent_Skip, 2705).
+-define(wxEvent_StopPropagation, 2706).
+-define(wxCommandEvent_getClientData, 2707).
+-define(wxCommandEvent_GetExtraLong, 2708).
+-define(wxCommandEvent_GetInt, 2709).
+-define(wxCommandEvent_GetSelection, 2710).
+-define(wxCommandEvent_GetString, 2711).
+-define(wxCommandEvent_IsChecked, 2712).
+-define(wxCommandEvent_IsSelection, 2713).
+-define(wxCommandEvent_SetInt, 2714).
+-define(wxCommandEvent_SetString, 2715).
+-define(wxScrollEvent_GetOrientation, 2716).
+-define(wxScrollEvent_GetPosition, 2717).
+-define(wxScrollWinEvent_GetOrientation, 2718).
+-define(wxScrollWinEvent_GetPosition, 2719).
+-define(wxMouseEvent_AltDown, 2720).
+-define(wxMouseEvent_Button, 2721).
+-define(wxMouseEvent_ButtonDClick, 2722).
+-define(wxMouseEvent_ButtonDown, 2723).
+-define(wxMouseEvent_ButtonUp, 2724).
+-define(wxMouseEvent_CmdDown, 2725).
+-define(wxMouseEvent_ControlDown, 2726).
+-define(wxMouseEvent_Dragging, 2727).
+-define(wxMouseEvent_Entering, 2728).
+-define(wxMouseEvent_GetButton, 2729).
+-define(wxMouseEvent_GetPosition, 2732).
+-define(wxMouseEvent_GetLogicalPosition, 2733).
+-define(wxMouseEvent_GetLinesPerAction, 2734).
+-define(wxMouseEvent_GetWheelRotation, 2735).
+-define(wxMouseEvent_GetWheelDelta, 2736).
+-define(wxMouseEvent_GetX, 2737).
+-define(wxMouseEvent_GetY, 2738).
+-define(wxMouseEvent_IsButton, 2739).
+-define(wxMouseEvent_IsPageScroll, 2740).
+-define(wxMouseEvent_Leaving, 2741).
+-define(wxMouseEvent_LeftDClick, 2742).
+-define(wxMouseEvent_LeftDown, 2743).
+-define(wxMouseEvent_LeftIsDown, 2744).
+-define(wxMouseEvent_LeftUp, 2745).
+-define(wxMouseEvent_MetaDown, 2746).
+-define(wxMouseEvent_MiddleDClick, 2747).
+-define(wxMouseEvent_MiddleDown, 2748).
+-define(wxMouseEvent_MiddleIsDown, 2749).
+-define(wxMouseEvent_MiddleUp, 2750).
+-define(wxMouseEvent_Moving, 2751).
+-define(wxMouseEvent_RightDClick, 2752).
+-define(wxMouseEvent_RightDown, 2753).
+-define(wxMouseEvent_RightIsDown, 2754).
+-define(wxMouseEvent_RightUp, 2755).
+-define(wxMouseEvent_ShiftDown, 2756).
+-define(wxSetCursorEvent_GetCursor, 2757).
+-define(wxSetCursorEvent_GetX, 2758).
+-define(wxSetCursorEvent_GetY, 2759).
+-define(wxSetCursorEvent_HasCursor, 2760).
+-define(wxSetCursorEvent_SetCursor, 2761).
+-define(wxKeyEvent_AltDown, 2762).
+-define(wxKeyEvent_CmdDown, 2763).
+-define(wxKeyEvent_ControlDown, 2764).
+-define(wxKeyEvent_GetKeyCode, 2765).
+-define(wxKeyEvent_GetModifiers, 2766).
+-define(wxKeyEvent_GetPosition, 2769).
+-define(wxKeyEvent_GetRawKeyCode, 2770).
+-define(wxKeyEvent_GetRawKeyFlags, 2771).
+-define(wxKeyEvent_GetUnicodeKey, 2772).
+-define(wxKeyEvent_GetX, 2773).
+-define(wxKeyEvent_GetY, 2774).
+-define(wxKeyEvent_HasModifiers, 2775).
+-define(wxKeyEvent_MetaDown, 2776).
+-define(wxKeyEvent_ShiftDown, 2777).
+-define(wxSizeEvent_GetSize, 2778).
+-define(wxMoveEvent_GetPosition, 2779).
+-define(wxEraseEvent_GetDC, 2780).
+-define(wxFocusEvent_GetWindow, 2781).
+-define(wxChildFocusEvent_GetWindow, 2782).
+-define(wxMenuEvent_GetMenu, 2783).
+-define(wxMenuEvent_GetMenuId, 2784).
+-define(wxMenuEvent_IsPopup, 2785).
+-define(wxCloseEvent_CanVeto, 2786).
+-define(wxCloseEvent_GetLoggingOff, 2787).
+-define(wxCloseEvent_SetCanVeto, 2788).
+-define(wxCloseEvent_SetLoggingOff, 2789).
+-define(wxCloseEvent_Veto, 2790).
+-define(wxShowEvent_SetShow, 2791).
+-define(wxShowEvent_GetShow, 2792).
+-define(wxIconizeEvent_Iconized, 2793).
+-define(wxJoystickEvent_ButtonDown, 2794).
+-define(wxJoystickEvent_ButtonIsDown, 2795).
+-define(wxJoystickEvent_ButtonUp, 2796).
+-define(wxJoystickEvent_GetButtonChange, 2797).
+-define(wxJoystickEvent_GetButtonState, 2798).
+-define(wxJoystickEvent_GetJoystick, 2799).
+-define(wxJoystickEvent_GetPosition, 2800).
+-define(wxJoystickEvent_GetZPosition, 2801).
+-define(wxJoystickEvent_IsButton, 2802).
+-define(wxJoystickEvent_IsMove, 2803).
+-define(wxJoystickEvent_IsZMove, 2804).
+-define(wxUpdateUIEvent_CanUpdate, 2805).
+-define(wxUpdateUIEvent_Check, 2806).
+-define(wxUpdateUIEvent_Enable, 2807).
+-define(wxUpdateUIEvent_Show, 2808).
+-define(wxUpdateUIEvent_GetChecked, 2809).
+-define(wxUpdateUIEvent_GetEnabled, 2810).
+-define(wxUpdateUIEvent_GetShown, 2811).
+-define(wxUpdateUIEvent_GetSetChecked, 2812).
+-define(wxUpdateUIEvent_GetSetEnabled, 2813).
+-define(wxUpdateUIEvent_GetSetShown, 2814).
+-define(wxUpdateUIEvent_GetSetText, 2815).
+-define(wxUpdateUIEvent_GetText, 2816).
+-define(wxUpdateUIEvent_GetMode, 2817).
+-define(wxUpdateUIEvent_GetUpdateInterval, 2818).
+-define(wxUpdateUIEvent_ResetUpdateTime, 2819).
+-define(wxUpdateUIEvent_SetMode, 2820).
+-define(wxUpdateUIEvent_SetText, 2821).
+-define(wxUpdateUIEvent_SetUpdateInterval, 2822).
+-define(wxMouseCaptureChangedEvent_GetCapturedWindow, 2823).
+-define(wxPaletteChangedEvent_SetChangedWindow, 2824).
+-define(wxPaletteChangedEvent_GetChangedWindow, 2825).
+-define(wxQueryNewPaletteEvent_SetPaletteRealized, 2826).
+-define(wxQueryNewPaletteEvent_GetPaletteRealized, 2827).
+-define(wxNavigationKeyEvent_GetDirection, 2828).
+-define(wxNavigationKeyEvent_SetDirection, 2829).
+-define(wxNavigationKeyEvent_IsWindowChange, 2830).
+-define(wxNavigationKeyEvent_SetWindowChange, 2831).
+-define(wxNavigationKeyEvent_IsFromTab, 2832).
+-define(wxNavigationKeyEvent_SetFromTab, 2833).
+-define(wxNavigationKeyEvent_GetCurrentFocus, 2834).
+-define(wxNavigationKeyEvent_SetCurrentFocus, 2835).
+-define(wxHelpEvent_GetOrigin, 2836).
+-define(wxHelpEvent_GetPosition, 2837).
+-define(wxHelpEvent_SetOrigin, 2838).
+-define(wxHelpEvent_SetPosition, 2839).
+-define(wxContextMenuEvent_GetPosition, 2840).
+-define(wxContextMenuEvent_SetPosition, 2841).
+-define(wxIdleEvent_CanSend, 2842).
+-define(wxIdleEvent_GetMode, 2843).
+-define(wxIdleEvent_RequestMore, 2844).
+-define(wxIdleEvent_MoreRequested, 2845).
+-define(wxIdleEvent_SetMode, 2846).
+-define(wxGridEvent_AltDown, 2847).
+-define(wxGridEvent_ControlDown, 2848).
+-define(wxGridEvent_GetCol, 2849).
+-define(wxGridEvent_GetPosition, 2850).
+-define(wxGridEvent_GetRow, 2851).
+-define(wxGridEvent_MetaDown, 2852).
+-define(wxGridEvent_Selecting, 2853).
+-define(wxGridEvent_ShiftDown, 2854).
+-define(wxNotifyEvent_Allow, 2855).
+-define(wxNotifyEvent_IsAllowed, 2856).
+-define(wxNotifyEvent_Veto, 2857).
+-define(wxSashEvent_GetEdge, 2858).
+-define(wxSashEvent_GetDragRect, 2859).
+-define(wxSashEvent_GetDragStatus, 2860).
+-define(wxListEvent_GetCacheFrom, 2861).
+-define(wxListEvent_GetCacheTo, 2862).
+-define(wxListEvent_GetKeyCode, 2863).
+-define(wxListEvent_GetIndex, 2864).
+-define(wxListEvent_GetColumn, 2865).
+-define(wxListEvent_GetPoint, 2866).
+-define(wxListEvent_GetLabel, 2867).
+-define(wxListEvent_GetText, 2868).
+-define(wxListEvent_GetImage, 2869).
+-define(wxListEvent_GetData, 2870).
+-define(wxListEvent_GetMask, 2871).
+-define(wxListEvent_GetItem, 2872).
+-define(wxListEvent_IsEditCancelled, 2873).
+-define(wxDateEvent_GetDate, 2874).
+-define(wxCalendarEvent_GetWeekDay, 2875).
+-define(wxFileDirPickerEvent_GetPath, 2876).
+-define(wxColourPickerEvent_GetColour, 2877).
+-define(wxFontPickerEvent_GetFont, 2878).
+-define(wxStyledTextEvent_GetPosition, 2879).
+-define(wxStyledTextEvent_GetKey, 2880).
+-define(wxStyledTextEvent_GetModifiers, 2881).
+-define(wxStyledTextEvent_GetModificationType, 2882).
+-define(wxStyledTextEvent_GetText, 2883).
+-define(wxStyledTextEvent_GetLength, 2884).
+-define(wxStyledTextEvent_GetLinesAdded, 2885).
+-define(wxStyledTextEvent_GetLine, 2886).
+-define(wxStyledTextEvent_GetFoldLevelNow, 2887).
+-define(wxStyledTextEvent_GetFoldLevelPrev, 2888).
+-define(wxStyledTextEvent_GetMargin, 2889).
+-define(wxStyledTextEvent_GetMessage, 2890).
+-define(wxStyledTextEvent_GetWParam, 2891).
+-define(wxStyledTextEvent_GetLParam, 2892).
+-define(wxStyledTextEvent_GetListType, 2893).
+-define(wxStyledTextEvent_GetX, 2894).
+-define(wxStyledTextEvent_GetY, 2895).
+-define(wxStyledTextEvent_GetDragText, 2896).
+-define(wxStyledTextEvent_GetDragAllowMove, 2897).
+-define(wxStyledTextEvent_GetDragResult, 2898).
+-define(wxStyledTextEvent_GetShift, 2899).
+-define(wxStyledTextEvent_GetControl, 2900).
+-define(wxStyledTextEvent_GetAlt, 2901).
+-define(utils_wxGetKeyState, 2902).
+-define(utils_wxGetMousePosition, 2903).
+-define(utils_wxGetMouseState, 2904).
+-define(utils_wxSetDetectableAutoRepeat, 2905).
+-define(utils_wxBell, 2906).
+-define(utils_wxFindMenuItemId, 2907).
+-define(utils_wxGenericFindWindowAtPoint, 2908).
+-define(utils_wxFindWindowAtPoint, 2909).
+-define(utils_wxBeginBusyCursor, 2910).
+-define(utils_wxEndBusyCursor, 2911).
+-define(utils_wxIsBusy, 2912).
+-define(utils_wxShutdown, 2913).
+-define(utils_wxShell, 2914).
+-define(utils_wxLaunchDefaultBrowser, 2915).
+-define(utils_wxGetEmailAddress, 2916).
+-define(utils_wxGetUserId, 2917).
+-define(utils_wxGetHomeDir, 2918).
+-define(utils_wxNewId, 2919).
+-define(utils_wxRegisterId, 2920).
+-define(utils_wxGetCurrentId, 2921).
+-define(utils_wxGetOsDescription, 2922).
+-define(utils_wxIsPlatformLittleEndian, 2923).
+-define(utils_wxIsPlatform64Bit, 2924).
+-define(wxPrintout_new, 2925).
+-define(wxPrintout_destruct, 2926).
+-define(wxPrintout_GetDC, 2927).
+-define(wxPrintout_GetPageSizeMM, 2928).
+-define(wxPrintout_GetPageSizePixels, 2929).
+-define(wxPrintout_GetPaperRectPixels, 2930).
+-define(wxPrintout_GetPPIPrinter, 2931).
+-define(wxPrintout_GetPPIScreen, 2932).
+-define(wxPrintout_GetTitle, 2933).
+-define(wxPrintout_IsPreview, 2934).
+-define(wxPrintout_FitThisSizeToPaper, 2935).
+-define(wxPrintout_FitThisSizeToPage, 2936).
+-define(wxPrintout_FitThisSizeToPageMargins, 2937).
+-define(wxPrintout_MapScreenSizeToPaper, 2938).
+-define(wxPrintout_MapScreenSizeToPage, 2939).
+-define(wxPrintout_MapScreenSizeToPageMargins, 2940).
+-define(wxPrintout_MapScreenSizeToDevice, 2941).
+-define(wxPrintout_GetLogicalPaperRect, 2942).
+-define(wxPrintout_GetLogicalPageRect, 2943).
+-define(wxPrintout_GetLogicalPageMarginsRect, 2944).
+-define(wxPrintout_SetLogicalOrigin, 2945).
+-define(wxPrintout_OffsetLogicalOrigin, 2946).
+-define(wxStyledTextCtrl_new_2, 2947).
+-define(wxStyledTextCtrl_new_0, 2948).
+-define(wxStyledTextCtrl_destruct, 2949).
+-define(wxStyledTextCtrl_Create, 2950).
+-define(wxStyledTextCtrl_AddText, 2951).
+-define(wxStyledTextCtrl_AddStyledText, 2952).
+-define(wxStyledTextCtrl_InsertText, 2953).
+-define(wxStyledTextCtrl_ClearAll, 2954).
+-define(wxStyledTextCtrl_ClearDocumentStyle, 2955).
+-define(wxStyledTextCtrl_GetLength, 2956).
+-define(wxStyledTextCtrl_GetCharAt, 2957).
+-define(wxStyledTextCtrl_GetCurrentPos, 2958).
+-define(wxStyledTextCtrl_GetAnchor, 2959).
+-define(wxStyledTextCtrl_GetStyleAt, 2960).
+-define(wxStyledTextCtrl_Redo, 2961).
+-define(wxStyledTextCtrl_SetUndoCollection, 2962).
+-define(wxStyledTextCtrl_SelectAll, 2963).
+-define(wxStyledTextCtrl_SetSavePoint, 2964).
+-define(wxStyledTextCtrl_GetStyledText, 2965).
+-define(wxStyledTextCtrl_CanRedo, 2966).
+-define(wxStyledTextCtrl_MarkerLineFromHandle, 2967).
+-define(wxStyledTextCtrl_MarkerDeleteHandle, 2968).
+-define(wxStyledTextCtrl_GetUndoCollection, 2969).
+-define(wxStyledTextCtrl_GetViewWhiteSpace, 2970).
+-define(wxStyledTextCtrl_SetViewWhiteSpace, 2971).
+-define(wxStyledTextCtrl_PositionFromPoint, 2972).
+-define(wxStyledTextCtrl_PositionFromPointClose, 2973).
+-define(wxStyledTextCtrl_GotoLine, 2974).
+-define(wxStyledTextCtrl_GotoPos, 2975).
+-define(wxStyledTextCtrl_SetAnchor, 2976).
+-define(wxStyledTextCtrl_GetCurLine, 2977).
+-define(wxStyledTextCtrl_GetEndStyled, 2978).
+-define(wxStyledTextCtrl_ConvertEOLs, 2979).
+-define(wxStyledTextCtrl_GetEOLMode, 2980).
+-define(wxStyledTextCtrl_SetEOLMode, 2981).
+-define(wxStyledTextCtrl_StartStyling, 2982).
+-define(wxStyledTextCtrl_SetStyling, 2983).
+-define(wxStyledTextCtrl_GetBufferedDraw, 2984).
+-define(wxStyledTextCtrl_SetBufferedDraw, 2985).
+-define(wxStyledTextCtrl_SetTabWidth, 2986).
+-define(wxStyledTextCtrl_GetTabWidth, 2987).
+-define(wxStyledTextCtrl_SetCodePage, 2988).
+-define(wxStyledTextCtrl_MarkerDefine, 2989).
+-define(wxStyledTextCtrl_MarkerSetForeground, 2990).
+-define(wxStyledTextCtrl_MarkerSetBackground, 2991).
+-define(wxStyledTextCtrl_MarkerAdd, 2992).
+-define(wxStyledTextCtrl_MarkerDelete, 2993).
+-define(wxStyledTextCtrl_MarkerDeleteAll, 2994).
+-define(wxStyledTextCtrl_MarkerGet, 2995).
+-define(wxStyledTextCtrl_MarkerNext, 2996).
+-define(wxStyledTextCtrl_MarkerPrevious, 2997).
+-define(wxStyledTextCtrl_MarkerDefineBitmap, 2998).
+-define(wxStyledTextCtrl_MarkerAddSet, 2999).
+-define(wxStyledTextCtrl_MarkerSetAlpha, 3000).
+-define(wxStyledTextCtrl_SetMarginType, 3001).
+-define(wxStyledTextCtrl_GetMarginType, 3002).
+-define(wxStyledTextCtrl_SetMarginWidth, 3003).
+-define(wxStyledTextCtrl_GetMarginWidth, 3004).
+-define(wxStyledTextCtrl_SetMarginMask, 3005).
+-define(wxStyledTextCtrl_GetMarginMask, 3006).
+-define(wxStyledTextCtrl_SetMarginSensitive, 3007).
+-define(wxStyledTextCtrl_GetMarginSensitive, 3008).
+-define(wxStyledTextCtrl_StyleClearAll, 3009).
+-define(wxStyledTextCtrl_StyleSetForeground, 3010).
+-define(wxStyledTextCtrl_StyleSetBackground, 3011).
+-define(wxStyledTextCtrl_StyleSetBold, 3012).
+-define(wxStyledTextCtrl_StyleSetItalic, 3013).
+-define(wxStyledTextCtrl_StyleSetSize, 3014).
+-define(wxStyledTextCtrl_StyleSetFaceName, 3015).
+-define(wxStyledTextCtrl_StyleSetEOLFilled, 3016).
+-define(wxStyledTextCtrl_StyleResetDefault, 3017).
+-define(wxStyledTextCtrl_StyleSetUnderline, 3018).
+-define(wxStyledTextCtrl_StyleSetCase, 3019).
+-define(wxStyledTextCtrl_StyleSetHotSpot, 3020).
+-define(wxStyledTextCtrl_SetSelForeground, 3021).
+-define(wxStyledTextCtrl_SetSelBackground, 3022).
+-define(wxStyledTextCtrl_GetSelAlpha, 3023).
+-define(wxStyledTextCtrl_SetSelAlpha, 3024).
+-define(wxStyledTextCtrl_SetCaretForeground, 3025).
+-define(wxStyledTextCtrl_CmdKeyAssign, 3026).
+-define(wxStyledTextCtrl_CmdKeyClear, 3027).
+-define(wxStyledTextCtrl_CmdKeyClearAll, 3028).
+-define(wxStyledTextCtrl_SetStyleBytes, 3029).
+-define(wxStyledTextCtrl_StyleSetVisible, 3030).
+-define(wxStyledTextCtrl_GetCaretPeriod, 3031).
+-define(wxStyledTextCtrl_SetCaretPeriod, 3032).
+-define(wxStyledTextCtrl_SetWordChars, 3033).
+-define(wxStyledTextCtrl_BeginUndoAction, 3034).
+-define(wxStyledTextCtrl_EndUndoAction, 3035).
+-define(wxStyledTextCtrl_IndicatorSetStyle, 3036).
+-define(wxStyledTextCtrl_IndicatorGetStyle, 3037).
+-define(wxStyledTextCtrl_IndicatorSetForeground, 3038).
+-define(wxStyledTextCtrl_IndicatorGetForeground, 3039).
+-define(wxStyledTextCtrl_SetWhitespaceForeground, 3040).
+-define(wxStyledTextCtrl_SetWhitespaceBackground, 3041).
+-define(wxStyledTextCtrl_GetStyleBits, 3042).
+-define(wxStyledTextCtrl_SetLineState, 3043).
+-define(wxStyledTextCtrl_GetLineState, 3044).
+-define(wxStyledTextCtrl_GetMaxLineState, 3045).
+-define(wxStyledTextCtrl_GetCaretLineVisible, 3046).
+-define(wxStyledTextCtrl_SetCaretLineVisible, 3047).
+-define(wxStyledTextCtrl_GetCaretLineBackground, 3048).
+-define(wxStyledTextCtrl_SetCaretLineBackground, 3049).
+-define(wxStyledTextCtrl_AutoCompShow, 3050).
+-define(wxStyledTextCtrl_AutoCompCancel, 3051).
+-define(wxStyledTextCtrl_AutoCompActive, 3052).
+-define(wxStyledTextCtrl_AutoCompPosStart, 3053).
+-define(wxStyledTextCtrl_AutoCompComplete, 3054).
+-define(wxStyledTextCtrl_AutoCompStops, 3055).
+-define(wxStyledTextCtrl_AutoCompSetSeparator, 3056).
+-define(wxStyledTextCtrl_AutoCompGetSeparator, 3057).
+-define(wxStyledTextCtrl_AutoCompSelect, 3058).
+-define(wxStyledTextCtrl_AutoCompSetCancelAtStart, 3059).
+-define(wxStyledTextCtrl_AutoCompGetCancelAtStart, 3060).
+-define(wxStyledTextCtrl_AutoCompSetFillUps, 3061).
+-define(wxStyledTextCtrl_AutoCompSetChooseSingle, 3062).
+-define(wxStyledTextCtrl_AutoCompGetChooseSingle, 3063).
+-define(wxStyledTextCtrl_AutoCompSetIgnoreCase, 3064).
+-define(wxStyledTextCtrl_AutoCompGetIgnoreCase, 3065).
+-define(wxStyledTextCtrl_UserListShow, 3066).
+-define(wxStyledTextCtrl_AutoCompSetAutoHide, 3067).
+-define(wxStyledTextCtrl_AutoCompGetAutoHide, 3068).
+-define(wxStyledTextCtrl_AutoCompSetDropRestOfWord, 3069).
+-define(wxStyledTextCtrl_AutoCompGetDropRestOfWord, 3070).
+-define(wxStyledTextCtrl_RegisterImage, 3071).
+-define(wxStyledTextCtrl_ClearRegisteredImages, 3072).
+-define(wxStyledTextCtrl_AutoCompGetTypeSeparator, 3073).
+-define(wxStyledTextCtrl_AutoCompSetTypeSeparator, 3074).
+-define(wxStyledTextCtrl_AutoCompSetMaxWidth, 3075).
+-define(wxStyledTextCtrl_AutoCompGetMaxWidth, 3076).
+-define(wxStyledTextCtrl_AutoCompSetMaxHeight, 3077).
+-define(wxStyledTextCtrl_AutoCompGetMaxHeight, 3078).
+-define(wxStyledTextCtrl_SetIndent, 3079).
+-define(wxStyledTextCtrl_GetIndent, 3080).
+-define(wxStyledTextCtrl_SetUseTabs, 3081).
+-define(wxStyledTextCtrl_GetUseTabs, 3082).
+-define(wxStyledTextCtrl_SetLineIndentation, 3083).
+-define(wxStyledTextCtrl_GetLineIndentation, 3084).
+-define(wxStyledTextCtrl_GetLineIndentPosition, 3085).
+-define(wxStyledTextCtrl_GetColumn, 3086).
+-define(wxStyledTextCtrl_SetUseHorizontalScrollBar, 3087).
+-define(wxStyledTextCtrl_GetUseHorizontalScrollBar, 3088).
+-define(wxStyledTextCtrl_SetIndentationGuides, 3089).
+-define(wxStyledTextCtrl_GetIndentationGuides, 3090).
+-define(wxStyledTextCtrl_SetHighlightGuide, 3091).
+-define(wxStyledTextCtrl_GetHighlightGuide, 3092).
+-define(wxStyledTextCtrl_GetLineEndPosition, 3093).
+-define(wxStyledTextCtrl_GetCodePage, 3094).
+-define(wxStyledTextCtrl_GetCaretForeground, 3095).
+-define(wxStyledTextCtrl_GetReadOnly, 3096).
+-define(wxStyledTextCtrl_SetCurrentPos, 3097).
+-define(wxStyledTextCtrl_SetSelectionStart, 3098).
+-define(wxStyledTextCtrl_GetSelectionStart, 3099).
+-define(wxStyledTextCtrl_SetSelectionEnd, 3100).
+-define(wxStyledTextCtrl_GetSelectionEnd, 3101).
+-define(wxStyledTextCtrl_SetPrintMagnification, 3102).
+-define(wxStyledTextCtrl_GetPrintMagnification, 3103).
+-define(wxStyledTextCtrl_SetPrintColourMode, 3104).
+-define(wxStyledTextCtrl_GetPrintColourMode, 3105).
+-define(wxStyledTextCtrl_FindText, 3106).
+-define(wxStyledTextCtrl_FormatRange, 3107).
+-define(wxStyledTextCtrl_GetFirstVisibleLine, 3108).
+-define(wxStyledTextCtrl_GetLine, 3109).
+-define(wxStyledTextCtrl_GetLineCount, 3110).
+-define(wxStyledTextCtrl_SetMarginLeft, 3111).
+-define(wxStyledTextCtrl_GetMarginLeft, 3112).
+-define(wxStyledTextCtrl_SetMarginRight, 3113).
+-define(wxStyledTextCtrl_GetMarginRight, 3114).
+-define(wxStyledTextCtrl_GetModify, 3115).
+-define(wxStyledTextCtrl_SetSelection, 3116).
+-define(wxStyledTextCtrl_GetSelectedText, 3117).
+-define(wxStyledTextCtrl_GetTextRange, 3118).
+-define(wxStyledTextCtrl_HideSelection, 3119).
+-define(wxStyledTextCtrl_LineFromPosition, 3120).
+-define(wxStyledTextCtrl_PositionFromLine, 3121).
+-define(wxStyledTextCtrl_LineScroll, 3122).
+-define(wxStyledTextCtrl_EnsureCaretVisible, 3123).
+-define(wxStyledTextCtrl_ReplaceSelection, 3124).
+-define(wxStyledTextCtrl_SetReadOnly, 3125).
+-define(wxStyledTextCtrl_CanPaste, 3126).
+-define(wxStyledTextCtrl_CanUndo, 3127).
+-define(wxStyledTextCtrl_EmptyUndoBuffer, 3128).
+-define(wxStyledTextCtrl_Undo, 3129).
+-define(wxStyledTextCtrl_Cut, 3130).
+-define(wxStyledTextCtrl_Copy, 3131).
+-define(wxStyledTextCtrl_Paste, 3132).
+-define(wxStyledTextCtrl_Clear, 3133).
+-define(wxStyledTextCtrl_SetText, 3134).
+-define(wxStyledTextCtrl_GetText, 3135).
+-define(wxStyledTextCtrl_GetTextLength, 3136).
+-define(wxStyledTextCtrl_GetOvertype, 3137).
+-define(wxStyledTextCtrl_SetCaretWidth, 3138).
+-define(wxStyledTextCtrl_GetCaretWidth, 3139).
+-define(wxStyledTextCtrl_SetTargetStart, 3140).
+-define(wxStyledTextCtrl_GetTargetStart, 3141).
+-define(wxStyledTextCtrl_SetTargetEnd, 3142).
+-define(wxStyledTextCtrl_GetTargetEnd, 3143).
+-define(wxStyledTextCtrl_ReplaceTarget, 3144).
+-define(wxStyledTextCtrl_SearchInTarget, 3145).
+-define(wxStyledTextCtrl_SetSearchFlags, 3146).
+-define(wxStyledTextCtrl_GetSearchFlags, 3147).
+-define(wxStyledTextCtrl_CallTipShow, 3148).
+-define(wxStyledTextCtrl_CallTipCancel, 3149).
+-define(wxStyledTextCtrl_CallTipActive, 3150).
+-define(wxStyledTextCtrl_CallTipPosAtStart, 3151).
+-define(wxStyledTextCtrl_CallTipSetHighlight, 3152).
+-define(wxStyledTextCtrl_CallTipSetBackground, 3153).
+-define(wxStyledTextCtrl_CallTipSetForeground, 3154).
+-define(wxStyledTextCtrl_CallTipSetForegroundHighlight, 3155).
+-define(wxStyledTextCtrl_CallTipUseStyle, 3156).
+-define(wxStyledTextCtrl_VisibleFromDocLine, 3157).
+-define(wxStyledTextCtrl_DocLineFromVisible, 3158).
+-define(wxStyledTextCtrl_WrapCount, 3159).
+-define(wxStyledTextCtrl_SetFoldLevel, 3160).
+-define(wxStyledTextCtrl_GetFoldLevel, 3161).
+-define(wxStyledTextCtrl_GetLastChild, 3162).
+-define(wxStyledTextCtrl_GetFoldParent, 3163).
+-define(wxStyledTextCtrl_ShowLines, 3164).
+-define(wxStyledTextCtrl_HideLines, 3165).
+-define(wxStyledTextCtrl_GetLineVisible, 3166).
+-define(wxStyledTextCtrl_SetFoldExpanded, 3167).
+-define(wxStyledTextCtrl_GetFoldExpanded, 3168).
+-define(wxStyledTextCtrl_ToggleFold, 3169).
+-define(wxStyledTextCtrl_EnsureVisible, 3170).
+-define(wxStyledTextCtrl_SetFoldFlags, 3171).
+-define(wxStyledTextCtrl_EnsureVisibleEnforcePolicy, 3172).
+-define(wxStyledTextCtrl_SetTabIndents, 3173).
+-define(wxStyledTextCtrl_GetTabIndents, 3174).
+-define(wxStyledTextCtrl_SetBackSpaceUnIndents, 3175).
+-define(wxStyledTextCtrl_GetBackSpaceUnIndents, 3176).
+-define(wxStyledTextCtrl_SetMouseDwellTime, 3177).
+-define(wxStyledTextCtrl_GetMouseDwellTime, 3178).
+-define(wxStyledTextCtrl_WordStartPosition, 3179).
+-define(wxStyledTextCtrl_WordEndPosition, 3180).
+-define(wxStyledTextCtrl_SetWrapMode, 3181).
+-define(wxStyledTextCtrl_GetWrapMode, 3182).
+-define(wxStyledTextCtrl_SetWrapVisualFlags, 3183).
+-define(wxStyledTextCtrl_GetWrapVisualFlags, 3184).
+-define(wxStyledTextCtrl_SetWrapVisualFlagsLocation, 3185).
+-define(wxStyledTextCtrl_GetWrapVisualFlagsLocation, 3186).
+-define(wxStyledTextCtrl_SetWrapStartIndent, 3187).
+-define(wxStyledTextCtrl_GetWrapStartIndent, 3188).
+-define(wxStyledTextCtrl_SetLayoutCache, 3189).
+-define(wxStyledTextCtrl_GetLayoutCache, 3190).
+-define(wxStyledTextCtrl_SetScrollWidth, 3191).
+-define(wxStyledTextCtrl_GetScrollWidth, 3192).
+-define(wxStyledTextCtrl_TextWidth, 3193).
+-define(wxStyledTextCtrl_GetEndAtLastLine, 3194).
+-define(wxStyledTextCtrl_TextHeight, 3195).
+-define(wxStyledTextCtrl_SetUseVerticalScrollBar, 3196).
+-define(wxStyledTextCtrl_GetUseVerticalScrollBar, 3197).
+-define(wxStyledTextCtrl_AppendText, 3198).
+-define(wxStyledTextCtrl_GetTwoPhaseDraw, 3199).
+-define(wxStyledTextCtrl_SetTwoPhaseDraw, 3200).
+-define(wxStyledTextCtrl_TargetFromSelection, 3201).
+-define(wxStyledTextCtrl_LinesJoin, 3202).
+-define(wxStyledTextCtrl_LinesSplit, 3203).
+-define(wxStyledTextCtrl_SetFoldMarginColour, 3204).
+-define(wxStyledTextCtrl_SetFoldMarginHiColour, 3205).
+-define(wxStyledTextCtrl_LineDown, 3206).
+-define(wxStyledTextCtrl_LineDownExtend, 3207).
+-define(wxStyledTextCtrl_LineUp, 3208).
+-define(wxStyledTextCtrl_LineUpExtend, 3209).
+-define(wxStyledTextCtrl_CharLeft, 3210).
+-define(wxStyledTextCtrl_CharLeftExtend, 3211).
+-define(wxStyledTextCtrl_CharRight, 3212).
+-define(wxStyledTextCtrl_CharRightExtend, 3213).
+-define(wxStyledTextCtrl_WordLeft, 3214).
+-define(wxStyledTextCtrl_WordLeftExtend, 3215).
+-define(wxStyledTextCtrl_WordRight, 3216).
+-define(wxStyledTextCtrl_WordRightExtend, 3217).
+-define(wxStyledTextCtrl_Home, 3218).
+-define(wxStyledTextCtrl_HomeExtend, 3219).
+-define(wxStyledTextCtrl_LineEnd, 3220).
+-define(wxStyledTextCtrl_LineEndExtend, 3221).
+-define(wxStyledTextCtrl_DocumentStart, 3222).
+-define(wxStyledTextCtrl_DocumentStartExtend, 3223).
+-define(wxStyledTextCtrl_DocumentEnd, 3224).
+-define(wxStyledTextCtrl_DocumentEndExtend, 3225).
+-define(wxStyledTextCtrl_PageUp, 3226).
+-define(wxStyledTextCtrl_PageUpExtend, 3227).
+-define(wxStyledTextCtrl_PageDown, 3228).
+-define(wxStyledTextCtrl_PageDownExtend, 3229).
+-define(wxStyledTextCtrl_EditToggleOvertype, 3230).
+-define(wxStyledTextCtrl_Cancel, 3231).
+-define(wxStyledTextCtrl_DeleteBack, 3232).
+-define(wxStyledTextCtrl_Tab, 3233).
+-define(wxStyledTextCtrl_BackTab, 3234).
+-define(wxStyledTextCtrl_NewLine, 3235).
+-define(wxStyledTextCtrl_FormFeed, 3236).
+-define(wxStyledTextCtrl_VCHome, 3237).
+-define(wxStyledTextCtrl_VCHomeExtend, 3238).
+-define(wxStyledTextCtrl_ZoomIn, 3239).
+-define(wxStyledTextCtrl_ZoomOut, 3240).
+-define(wxStyledTextCtrl_DelWordLeft, 3241).
+-define(wxStyledTextCtrl_DelWordRight, 3242).
+-define(wxStyledTextCtrl_LineCut, 3243).
+-define(wxStyledTextCtrl_LineDelete, 3244).
+-define(wxStyledTextCtrl_LineTranspose, 3245).
+-define(wxStyledTextCtrl_LineDuplicate, 3246).
+-define(wxStyledTextCtrl_LowerCase, 3247).
+-define(wxStyledTextCtrl_UpperCase, 3248).
+-define(wxStyledTextCtrl_LineScrollDown, 3249).
+-define(wxStyledTextCtrl_LineScrollUp, 3250).
+-define(wxStyledTextCtrl_DeleteBackNotLine, 3251).
+-define(wxStyledTextCtrl_HomeDisplay, 3252).
+-define(wxStyledTextCtrl_HomeDisplayExtend, 3253).
+-define(wxStyledTextCtrl_LineEndDisplay, 3254).
+-define(wxStyledTextCtrl_LineEndDisplayExtend, 3255).
+-define(wxStyledTextCtrl_HomeWrapExtend, 3256).
+-define(wxStyledTextCtrl_LineEndWrap, 3257).
+-define(wxStyledTextCtrl_LineEndWrapExtend, 3258).
+-define(wxStyledTextCtrl_VCHomeWrap, 3259).
+-define(wxStyledTextCtrl_VCHomeWrapExtend, 3260).
+-define(wxStyledTextCtrl_LineCopy, 3261).
+-define(wxStyledTextCtrl_MoveCaretInsideView, 3262).
+-define(wxStyledTextCtrl_LineLength, 3263).
+-define(wxStyledTextCtrl_BraceHighlight, 3264).
+-define(wxStyledTextCtrl_BraceBadLight, 3265).
+-define(wxStyledTextCtrl_BraceMatch, 3266).
+-define(wxStyledTextCtrl_GetViewEOL, 3267).
+-define(wxStyledTextCtrl_SetViewEOL, 3268).
+-define(wxStyledTextCtrl_SetModEventMask, 3269).
+-define(wxStyledTextCtrl_GetEdgeColumn, 3270).
+-define(wxStyledTextCtrl_SetEdgeColumn, 3271).
+-define(wxStyledTextCtrl_GetEdgeMode, 3272).
+-define(wxStyledTextCtrl_GetEdgeColour, 3273).
+-define(wxStyledTextCtrl_SetEdgeColour, 3274).
+-define(wxStyledTextCtrl_SearchAnchor, 3275).
+-define(wxStyledTextCtrl_SearchNext, 3276).
+-define(wxStyledTextCtrl_SearchPrev, 3277).
+-define(wxStyledTextCtrl_LinesOnScreen, 3278).
+-define(wxStyledTextCtrl_UsePopUp, 3279).
+-define(wxStyledTextCtrl_SelectionIsRectangle, 3280).
+-define(wxStyledTextCtrl_SetZoom, 3281).
+-define(wxStyledTextCtrl_GetZoom, 3282).
+-define(wxStyledTextCtrl_GetModEventMask, 3283).
+-define(wxStyledTextCtrl_SetSTCFocus, 3284).
+-define(wxStyledTextCtrl_GetSTCFocus, 3285).
+-define(wxStyledTextCtrl_SetStatus, 3286).
+-define(wxStyledTextCtrl_GetStatus, 3287).
+-define(wxStyledTextCtrl_SetMouseDownCaptures, 3288).
+-define(wxStyledTextCtrl_GetMouseDownCaptures, 3289).
+-define(wxStyledTextCtrl_SetSTCCursor, 3290).
+-define(wxStyledTextCtrl_GetSTCCursor, 3291).
+-define(wxStyledTextCtrl_SetControlCharSymbol, 3292).
+-define(wxStyledTextCtrl_GetControlCharSymbol, 3293).
+-define(wxStyledTextCtrl_WordPartLeft, 3294).
+-define(wxStyledTextCtrl_WordPartLeftExtend, 3295).
+-define(wxStyledTextCtrl_WordPartRight, 3296).
+-define(wxStyledTextCtrl_WordPartRightExtend, 3297).
+-define(wxStyledTextCtrl_SetVisiblePolicy, 3298).
+-define(wxStyledTextCtrl_DelLineLeft, 3299).
+-define(wxStyledTextCtrl_DelLineRight, 3300).
+-define(wxStyledTextCtrl_GetXOffset, 3301).
+-define(wxStyledTextCtrl_ChooseCaretX, 3302).
+-define(wxStyledTextCtrl_SetXCaretPolicy, 3303).
+-define(wxStyledTextCtrl_SetYCaretPolicy, 3304).
+-define(wxStyledTextCtrl_GetPrintWrapMode, 3305).
+-define(wxStyledTextCtrl_SetHotspotActiveForeground, 3306).
+-define(wxStyledTextCtrl_SetHotspotActiveBackground, 3307).
+-define(wxStyledTextCtrl_SetHotspotActiveUnderline, 3308).
+-define(wxStyledTextCtrl_SetHotspotSingleLine, 3309).
+-define(wxStyledTextCtrl_ParaDownExtend, 3310).
+-define(wxStyledTextCtrl_ParaUp, 3311).
+-define(wxStyledTextCtrl_ParaUpExtend, 3312).
+-define(wxStyledTextCtrl_PositionBefore, 3313).
+-define(wxStyledTextCtrl_PositionAfter, 3314).
+-define(wxStyledTextCtrl_CopyRange, 3315).
+-define(wxStyledTextCtrl_CopyText, 3316).
+-define(wxStyledTextCtrl_SetSelectionMode, 3317).
+-define(wxStyledTextCtrl_GetSelectionMode, 3318).
+-define(wxStyledTextCtrl_LineDownRectExtend, 3319).
+-define(wxStyledTextCtrl_LineUpRectExtend, 3320).
+-define(wxStyledTextCtrl_CharLeftRectExtend, 3321).
+-define(wxStyledTextCtrl_CharRightRectExtend, 3322).
+-define(wxStyledTextCtrl_HomeRectExtend, 3323).
+-define(wxStyledTextCtrl_VCHomeRectExtend, 3324).
+-define(wxStyledTextCtrl_LineEndRectExtend, 3325).
+-define(wxStyledTextCtrl_PageUpRectExtend, 3326).
+-define(wxStyledTextCtrl_PageDownRectExtend, 3327).
+-define(wxStyledTextCtrl_StutteredPageUp, 3328).
+-define(wxStyledTextCtrl_StutteredPageUpExtend, 3329).
+-define(wxStyledTextCtrl_StutteredPageDown, 3330).
+-define(wxStyledTextCtrl_StutteredPageDownExtend, 3331).
+-define(wxStyledTextCtrl_WordLeftEnd, 3332).
+-define(wxStyledTextCtrl_WordLeftEndExtend, 3333).
+-define(wxStyledTextCtrl_WordRightEnd, 3334).
+-define(wxStyledTextCtrl_WordRightEndExtend, 3335).
+-define(wxStyledTextCtrl_SetWhitespaceChars, 3336).
+-define(wxStyledTextCtrl_SetCharsDefault, 3337).
+-define(wxStyledTextCtrl_AutoCompGetCurrent, 3338).
+-define(wxStyledTextCtrl_Allocate, 3339).
+-define(wxStyledTextCtrl_FindColumn, 3340).
+-define(wxStyledTextCtrl_GetCaretSticky, 3341).
+-define(wxStyledTextCtrl_SetCaretSticky, 3342).
+-define(wxStyledTextCtrl_ToggleCaretSticky, 3343).
+-define(wxStyledTextCtrl_SetPasteConvertEndings, 3344).
+-define(wxStyledTextCtrl_GetPasteConvertEndings, 3345).
+-define(wxStyledTextCtrl_SelectionDuplicate, 3346).
+-define(wxStyledTextCtrl_SetCaretLineBackAlpha, 3347).
+-define(wxStyledTextCtrl_GetCaretLineBackAlpha, 3348).
+-define(wxStyledTextCtrl_StartRecord, 3349).
+-define(wxStyledTextCtrl_StopRecord, 3350).
+-define(wxStyledTextCtrl_SetLexer, 3351).
+-define(wxStyledTextCtrl_GetLexer, 3352).
+-define(wxStyledTextCtrl_Colourise, 3353).
+-define(wxStyledTextCtrl_SetProperty, 3354).
+-define(wxStyledTextCtrl_SetKeyWords, 3355).
+-define(wxStyledTextCtrl_SetLexerLanguage, 3356).
+-define(wxStyledTextCtrl_GetProperty, 3357).
+-define(wxStyledTextCtrl_GetStyleBitsNeeded, 3358).
+-define(wxStyledTextCtrl_GetCurrentLine, 3359).
+-define(wxStyledTextCtrl_StyleSetSpec, 3360).
+-define(wxStyledTextCtrl_StyleSetFont, 3361).
+-define(wxStyledTextCtrl_StyleSetFontAttr, 3362).
+-define(wxStyledTextCtrl_StyleSetCharacterSet, 3363).
+-define(wxStyledTextCtrl_StyleSetFontEncoding, 3364).
+-define(wxStyledTextCtrl_CmdKeyExecute, 3365).
+-define(wxStyledTextCtrl_SetMargins, 3366).
+-define(wxStyledTextCtrl_GetSelection, 3367).
+-define(wxStyledTextCtrl_PointFromPosition, 3368).
+-define(wxStyledTextCtrl_ScrollToLine, 3369).
+-define(wxStyledTextCtrl_ScrollToColumn, 3370).
+-define(wxStyledTextCtrl_SendMsg, 3371).
+-define(wxStyledTextCtrl_SetVScrollBar, 3372).
+-define(wxStyledTextCtrl_SetHScrollBar, 3373).
+-define(wxStyledTextCtrl_GetLastKeydownProcessed, 3374).
+-define(wxStyledTextCtrl_SetLastKeydownProcessed, 3375).
+-define(wxStyledTextCtrl_SaveFile, 3376).
+-define(wxStyledTextCtrl_LoadFile, 3377).
+-define(wxStyledTextCtrl_DoDragOver, 3378).
+-define(wxStyledTextCtrl_DoDropText, 3379).
+-define(wxStyledTextCtrl_GetUseAntiAliasing, 3380).
+-define(wxStyledTextCtrl_AddTextRaw, 3381).
+-define(wxStyledTextCtrl_InsertTextRaw, 3382).
+-define(wxStyledTextCtrl_GetCurLineRaw, 3383).
+-define(wxStyledTextCtrl_GetLineRaw, 3384).
+-define(wxStyledTextCtrl_GetSelectedTextRaw, 3385).
+-define(wxStyledTextCtrl_GetTextRangeRaw, 3386).
+-define(wxStyledTextCtrl_SetTextRaw, 3387).
+-define(wxStyledTextCtrl_GetTextRaw, 3388).
+-define(wxStyledTextCtrl_AppendTextRaw, 3389).
+-define(wxArtProvider_GetBitmap, 3390).
+-define(wxArtProvider_GetIcon, 3391).
+-define(wxTreeEvent_GetKeyCode, 3392).
+-define(wxTreeEvent_GetItem, 3393).
+-define(wxTreeEvent_GetKeyEvent, 3394).
+-define(wxTreeEvent_GetLabel, 3395).
+-define(wxTreeEvent_GetOldItem, 3396).
+-define(wxTreeEvent_GetPoint, 3397).
+-define(wxTreeEvent_IsEditCancelled, 3398).
+-define(wxTreeEvent_SetToolTip, 3399).
+-define(wxNotebookEvent_GetOldSelection, 3400).
+-define(wxNotebookEvent_GetSelection, 3401).
+-define(wxNotebookEvent_SetOldSelection, 3402).
+-define(wxNotebookEvent_SetSelection, 3403).
+-define(wxFileDataObject_new, 3404).
+-define(wxFileDataObject_AddFile, 3405).
+-define(wxFileDataObject_GetFilenames, 3406).
+-define(wxFileDataObject_destroy, 3407).
+-define(wxTextDataObject_new, 3408).
+-define(wxTextDataObject_GetTextLength, 3409).
+-define(wxTextDataObject_GetText, 3410).
+-define(wxTextDataObject_SetText, 3411).
+-define(wxTextDataObject_destroy, 3412).
+-define(wxBitmapDataObject_new_1_1, 3413).
+-define(wxBitmapDataObject_new_1_0, 3414).
+-define(wxBitmapDataObject_GetBitmap, 3415).
+-define(wxBitmapDataObject_SetBitmap, 3416).
+-define(wxBitmapDataObject_destroy, 3417).
+-define(wxClipboard_new, 3419).
+-define(wxClipboard_destruct, 3420).
+-define(wxClipboard_AddData, 3421).
+-define(wxClipboard_Clear, 3422).
+-define(wxClipboard_Close, 3423).
+-define(wxClipboard_Flush, 3424).
+-define(wxClipboard_GetData, 3425).
+-define(wxClipboard_IsOpened, 3426).
+-define(wxClipboard_Open, 3427).
+-define(wxClipboard_SetData, 3428).
+-define(wxClipboard_UsePrimarySelection, 3430).
+-define(wxClipboard_IsSupported, 3431).
+-define(wxClipboard_Get, 3432).
+-define(wxSpinEvent_GetPosition, 3433).
+-define(wxSpinEvent_SetPosition, 3434).
+-define(wxSplitterWindow_new_0, 3435).
+-define(wxSplitterWindow_new_2, 3436).
+-define(wxSplitterWindow_destruct, 3437).
+-define(wxSplitterWindow_Create, 3438).
+-define(wxSplitterWindow_GetMinimumPaneSize, 3439).
+-define(wxSplitterWindow_GetSashGravity, 3440).
+-define(wxSplitterWindow_GetSashPosition, 3441).
+-define(wxSplitterWindow_GetSplitMode, 3442).
+-define(wxSplitterWindow_GetWindow1, 3443).
+-define(wxSplitterWindow_GetWindow2, 3444).
+-define(wxSplitterWindow_Initialize, 3445).
+-define(wxSplitterWindow_IsSplit, 3446).
+-define(wxSplitterWindow_ReplaceWindow, 3447).
+-define(wxSplitterWindow_SetSashGravity, 3448).
+-define(wxSplitterWindow_SetSashPosition, 3449).
+-define(wxSplitterWindow_SetSashSize, 3450).
+-define(wxSplitterWindow_SetMinimumPaneSize, 3451).
+-define(wxSplitterWindow_SetSplitMode, 3452).
+-define(wxSplitterWindow_SplitHorizontally, 3453).
+-define(wxSplitterWindow_SplitVertically, 3454).
+-define(wxSplitterWindow_Unsplit, 3455).
+-define(wxSplitterWindow_UpdateSize, 3456).
+-define(wxSplitterEvent_GetSashPosition, 3457).
+-define(wxSplitterEvent_GetX, 3458).
+-define(wxSplitterEvent_GetY, 3459).
+-define(wxSplitterEvent_GetWindowBeingRemoved, 3460).
+-define(wxSplitterEvent_SetSashPosition, 3461).
+-define(wxHtmlWindow_new_0, 3462).
+-define(wxHtmlWindow_new_2, 3463).
+-define(wxHtmlWindow_AppendToPage, 3464).
+-define(wxHtmlWindow_GetOpenedAnchor, 3465).
+-define(wxHtmlWindow_GetOpenedPage, 3466).
+-define(wxHtmlWindow_GetOpenedPageTitle, 3467).
+-define(wxHtmlWindow_GetRelatedFrame, 3468).
+-define(wxHtmlWindow_HistoryBack, 3469).
+-define(wxHtmlWindow_HistoryCanBack, 3470).
+-define(wxHtmlWindow_HistoryCanForward, 3471).
+-define(wxHtmlWindow_HistoryClear, 3472).
+-define(wxHtmlWindow_HistoryForward, 3473).
+-define(wxHtmlWindow_LoadFile, 3474).
+-define(wxHtmlWindow_LoadPage, 3475).
+-define(wxHtmlWindow_SelectAll, 3476).
+-define(wxHtmlWindow_SelectionToText, 3477).
+-define(wxHtmlWindow_SelectLine, 3478).
+-define(wxHtmlWindow_SelectWord, 3479).
+-define(wxHtmlWindow_SetBorders, 3480).
+-define(wxHtmlWindow_SetFonts, 3481).
+-define(wxHtmlWindow_SetPage, 3482).
+-define(wxHtmlWindow_SetRelatedFrame, 3483).
+-define(wxHtmlWindow_SetRelatedStatusBar, 3484).
+-define(wxHtmlWindow_ToText, 3485).
+-define(wxHtmlWindow_destroy, 3486).
+-define(wxHtmlLinkEvent_GetLinkInfo, 3487).
+-define(wxSystemSettings_GetColour, 3488).
+-define(wxSystemSettings_GetFont, 3489).
+-define(wxSystemSettings_GetMetric, 3490).
+-define(wxSystemSettings_GetScreenType, 3491).
+-define(wxAuiNotebookEvent_SetSelection, 3492).
+-define(wxAuiNotebookEvent_GetSelection, 3493).
+-define(wxAuiNotebookEvent_SetOldSelection, 3494).
+-define(wxAuiNotebookEvent_GetOldSelection, 3495).
+-define(wxAuiNotebookEvent_SetDragSource, 3496).
+-define(wxAuiNotebookEvent_GetDragSource, 3497).
+-define(wxAuiManagerEvent_SetManager, 3498).
+-define(wxAuiManagerEvent_GetManager, 3499).
+-define(wxAuiManagerEvent_SetPane, 3500).
+-define(wxAuiManagerEvent_GetPane, 3501).
+-define(wxAuiManagerEvent_SetButton, 3502).
+-define(wxAuiManagerEvent_GetButton, 3503).
+-define(wxAuiManagerEvent_SetDC, 3504).
+-define(wxAuiManagerEvent_GetDC, 3505).
+-define(wxAuiManagerEvent_Veto, 3506).
+-define(wxAuiManagerEvent_GetVeto, 3507).
+-define(wxAuiManagerEvent_SetCanVeto, 3508).
+-define(wxAuiManagerEvent_CanVeto, 3509).
+-define(wxLogNull_new, 3510).
+-define(wxLogNull_destroy, 3511).
diff --git a/lib/wx/src/wxe_server.erl b/lib/wx/src/wxe_server.erl
index 40412987a5..69e2189fac 100644
--- a/lib/wx/src/wxe_server.erl
+++ b/lib/wx/src/wxe_server.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%%-------------------------------------------------------------------
 %%% File    : wxe_server.erl
@@ -24,7 +24,7 @@
 %%% Created : 17 Jan 2007 by Dan Gudmundsson <[email protected]>
 %%%-------------------------------------------------------------------
 
-%% @hidden 
+%% @hidden
 -module(wxe_server).
 -behaviour(gen_server).
 
@@ -65,7 +65,7 @@ start() ->
 	    end;
 	Env = #wx_env{sv=Pid} ->
 	    case erlang:is_process_alive(Pid) of
-		true ->		    
+		true ->
 		    Env;
 		false ->  %% Ok we got an old wx env, someone forgot
 		    erase(?WXE_IDENTIFIER),  %% to call wx:destroy()
@@ -94,7 +94,7 @@ init([]) ->
     {ok,#state{port=Port, cb_port=CBPort,
 	       users=gb_trees:empty(), cb=gb_trees:empty(), cb_cnt=1}}.
 
-%% Register process 
+%% Register process
 handle_call(register_me, {From,_}, State=#state{users=Users}) ->
     erlang:monitor(process, From),
     case gb_trees:is_defined(From, Users) of
@@ -147,7 +147,7 @@ handle_cast({debug, Level}, State) ->
     put(?WXE_IDENTIFIER, Env#wx_env{debug=Level}),
     {noreply, State};
 
-handle_cast(_Msg, State) ->    
+handle_cast(_Msg, State) ->
     ?log("Unknown message ~p sent to ~p~n",[_Msg, ?MODULE]),
     {noreply, State}.
 
@@ -156,7 +156,7 @@ handle_cast(_Msg, State) ->
 %% Callback request from driver
 handle_info(Cb = {_, _, '_wx_invoke_cb_'}, State) ->
     invoke_cb(Cb, State),
-    {noreply, State}; 
+    {noreply, State};
 handle_info({wx_delete_cb, FunId}, State0 = #state{cb=CB}) when is_integer(FunId) ->
     case get(FunId) of
 	undefined ->
@@ -166,7 +166,7 @@ handle_info({wx_delete_cb, FunId}, State0 = #state{cb=CB}) when is_integer(FunId
 	    {noreply, State0#state{cb=gb_trees:delete(Fun, CB)}}
     end;
 handle_info({'DOWN',_,process,Pid,_}, State=#state{users=Users0,cleaners=Cs}) ->
-    try 
+    try
 	User = gb_trees:get(Pid,Users0),
 	Users = gb_trees:delete(Pid,Users0),
 	Env = wx:get_env(),
@@ -210,7 +210,7 @@ handle_connect(Object, EvData, From, State0 = #state{users=Users}) ->
     case Handler0 of
 	#wx_ref{} when Callback =:= 0 ->
 	    CBHandler = Handler0,
-	    Handler = Handler0;	
+	    Handler = Handler0;
 	undefined when Callback =:= 0 ->
 	    Handler = new_evt_listener(State0),
 	    CBHandler = Handler;
@@ -225,7 +225,7 @@ handle_connect(Object, EvData, From, State0 = #state{users=Users}) ->
 	    {FunId, State} = attach_fun(Callback,State1),
 	    Res = wxEvtHandler:connect_impl(CBHandler,Object,
 					    wxEvtHandler:replace_fun_with_id(EvData,FunId)),
-	    case Res of 
+	    case Res of
 		ok     -> {reply,Res,State};
 		_Error -> {reply,Res,State0}
 	    end;
@@ -238,11 +238,7 @@ invoke_cb({{Ev=#wx{}, Ref=#wx_ref{}}, FunId,_}, _S) ->
     %% Event callbacks
     case get(FunId) of
 	Fun when is_function(Fun) ->
-	    invoke_callback(fun() ->
-			       wxe_util:cast(?WXE_CB_START, <<>>),
-			       Fun(Ev, Ref),
-			       <<>>
-		            end);
+	    invoke_callback(fun() -> Fun(Ev, Ref), <<>> end);
 	Err ->
 	    ?log("Internal Error ~p~n",[Err])
     end;
@@ -254,12 +250,14 @@ invoke_cb({FunId, Args, _}, _S) when is_list(Args), is_integer(FunId) ->
 	Err ->
 	    ?log("Internal Error ~p ~p ~p~n",[Err, FunId, Args])
     end.
-	
+
 invoke_callback(Fun) ->
     Env = get(?WXE_IDENTIFIER),
     CB = fun() ->
 		 wx:set_env(Env),
-		 Res = try Return = Fun(),
+		 wxe_util:cast(?WXE_CB_START, <<>>),
+		 Res = try
+			   Return = Fun(),
 			   true = is_binary(Return),
 			   Return
 		       catch _:Reason ->
@@ -278,9 +276,9 @@ new_evt_listener(State) ->
     get_result(State).
 
 get_result(_State) ->
-    receive 
+    receive
 	{'_wxe_result_', Res} -> Res;
-	{'_wxe_error_', Op, Error} -> 
+	{'_wxe_error_', Op, Error} ->
 	    erlang:error({Error, {wxEvtHandler, {internal_installer, Op}}})
     end.
 
@@ -289,7 +287,7 @@ attach_fun(Fun, S = #state{cb=CB,cb_cnt=Next}) ->
 	{value, ID} ->
 	    {ID,S};
 	none ->
-	    put(Next,Fun), 
+	    put(Next,Fun),
 	    {Next,S#state{cb=gb_trees:insert(Fun,Next,CB),cb_cnt=Next+1}}
     end.
 
@@ -297,7 +295,7 @@ handle_disconnect(Object, Evh, From, State0 = #state{users=Users0}) ->
     User0 = #user{events=Evs0, evt_handler=PidH} = gb_trees:get(From, Users0),
     Fun = wxEvtHandler:get_callback(Evh),
     case find_handler(Evs0, Object, Fun) of
-	[] ->  
+	[] ->
 	    {reply, false, State0};
 	Handlers ->
 	    case disconnect(Object,Evh, Handlers) of
@@ -310,7 +308,7 @@ handle_disconnect(Object, Evh, From, State0 = #state{users=Users0}) ->
 			       [] when PidH =/= undefined ->
 				   wxEvtHandler:destroy_evt_listener(PidH),
 				   User0#user{events=[], evt_handler=undefined};
-			       Evs -> 
+			       Evs ->
 				   User0#user{events=Evs}
 			   end,
 		    {reply, true, State0#state{users=gb_trees:update(From,User,Users0)}};
@@ -345,7 +343,7 @@ find_handler([],_Object,_Fun,Res) ->
 
 
 %% Cleanup
-%% The server handles callbacks from driver so every other wx call must 
+%% The server handles callbacks from driver so every other wx call must
 %% be called from another process, therefore the cleaning must be spawned.
 %%
 cleanup(Env, _Pid, Data) ->
@@ -358,7 +356,7 @@ cleanup(#user{objects=_Os,events=Evs, evt_handler=Handler}) ->
     lists:foreach(fun(#event{object=_O, callback=CB, cb_handler=CbH}) ->
 			  %%catch wxEvtHandler:disconnect_impl(CbH,O),
 			  case is_function(CB) of
-			      true -> 
+			      true ->
 				  wxEvtHandler:destroy_evt_listener(CbH);
 			      false ->
 				  ignore
diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl
index 79e6833e9b..00ef1289ab 100644
--- a/lib/wx/test/wx_class_SUITE.erl
+++ b/lib/wx/test/wx_class_SUITE.erl
@@ -18,14 +18,14 @@
 %%%-------------------------------------------------------------------
 %%% File    : wx_class_SUITE.erl
 %%% Author  : Dan Gudmundsson <[email protected]>
-%%% Description : 
+%%% Description :
 %%%
 %%% Created : 13 Nov 2008 by Dan Gudmundsson <[email protected]>
 %%%-------------------------------------------------------------------
 -module(wx_class_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
-	 init_per_suite/1, end_per_suite/1, 
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_suite/1, end_per_suite/1,
 	 init_per_testcase/2, end_per_testcase/2]).
 
 -compile(export_all).
@@ -41,18 +41,18 @@ end_per_suite(Config) ->
 
 init_per_testcase(Func,Config) ->
     wx_test_lib:init_per_testcase(Func,Config).
-end_per_testcase(Func,Config) -> 
+end_per_testcase(Func,Config) ->
     wx_test_lib:end_per_testcase(Func,Config).
 
 %% SUITE specification
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all() -> 
+all() ->
     [calendarCtrl, treeCtrl, notebook, staticBoxSizer,
-     clipboard, helpFrame, htmlWindow, listCtrlSort,
+     clipboard, helpFrame, htmlWindow, listCtrlSort, listCtrlVirtual,
      radioBox, systemSettings].
 
-groups() -> 
+groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
@@ -70,9 +70,9 @@ calendarCtrl(Config) ->
     Frame = ?mt(wxFrame, wxFrame:new(Wx, 1, "Calendar", [])),
     Panel = wxPanel:new(Frame),
     Sz = wxBoxSizer:new(?wxVERTICAL),
-    
+
     {YMD={_,_,Day},_} = DateTime = calendar:now_to_datetime(erlang:now()),
-    Cal = ?mt(wxCalendarCtrl, wxCalendarCtrl:new(Panel, ?wxID_ANY, 
+    Cal = ?mt(wxCalendarCtrl, wxCalendarCtrl:new(Panel, ?wxID_ANY,
 						 [{date,DateTime}
 						 ])),
     wxSizer:add(Sz,Cal),
@@ -91,25 +91,25 @@ calendarCtrl(Config) ->
     ?m({0,243,0,255}, wxCalendarDateAttr:getBackgroundColour(DateAttr1)),
 
     ?m({YMD, _},wxCalendarCtrl:getDate(Cal)),
-    
-    wxCalendarCtrl:connect(Cal, calendar_weekday_clicked), 
-    wxCalendarCtrl:connect(Cal, calendar_day_changed), 
-    wxCalendarCtrl:connect(Cal, calendar_month_changed), 
+
+    wxCalendarCtrl:connect(Cal, calendar_weekday_clicked),
+    wxCalendarCtrl:connect(Cal, calendar_day_changed),
+    wxCalendarCtrl:connect(Cal, calendar_month_changed),
     wxCalendarCtrl:connect(Cal, calendar_year_changed),
-    wxCalendarCtrl:connect(Cal, calendar_doubleclicked), 
+    wxCalendarCtrl:connect(Cal, calendar_doubleclicked),
     wxCalendarCtrl:connect(Cal, calendar_sel_changed),
-    
+
     wxWindow:setSizer(Panel,Sz),
     wxSizer:setSizeHints(Sz,Frame),
-    wxWindow:show(Frame), 
-    
+    wxWindow:show(Frame),
+
     wx_test_lib:wx_destroy(Frame,Config).
 
 
 treeCtrl(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
 treeCtrl(Config) ->
     Wx = wx:new(),
-    
+
     Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
     Panel = wxPanel:new(Frame, []),
     Tree = ?mt(wxTreeCtrl,wxTreeCtrl:new(Panel, [{style , ?wxTR_HAS_BUTTONS}])),
@@ -122,25 +122,25 @@ treeCtrl(Config) ->
     ?m(ok,  wxTreeCtrl:setItemData(Tree, Item2, {data, item2})),
     Item3 = wxTreeCtrl:appendItem(Tree, Root, "Item3", []),
     ?m(ok, wxTreeCtrl:setItemData(Tree, Item3, {data, item3})),
-    
+
     Sizer = wxBoxSizer:new(?wxVERTICAL),
     wxSizer:add(Sizer, Tree, [{flag, ?wxEXPAND}, {proportion, 1}]),
 
     wxWindow:setSizerAndFit(Panel, Sizer),
     wxFrame:show(Frame),
-    
+
     ?m([], wxTreeCtrl:getItemData(Tree, Root)),
     ?m({data,item1}, wxTreeCtrl:getItemData(Tree, Item1)),
     ?m({data,item2}, wxTreeCtrl:getItemData(Tree, Item2)),
     ?m({data,item3}, wxTreeCtrl:getItemData(Tree, Item3)),
-    
+
     wxFrame:connect(Tree, command_tree_item_expanded),
     wxFrame:connect(Tree, command_tree_item_collapsed),
     wxFrame:connect(Frame, close_window),
 
     wxTreeCtrl:editLabel(Tree, Root),
 
-    
+
     wx_test_lib:wx_destroy(Frame,Config).
 
 notebook(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
@@ -210,13 +210,13 @@ staticBoxSizer(Config) ->
     Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
     Panel = wxPanel:new(Frame, []),
     InclSizer = ?mt(wxStaticBoxSizer,
-		    wxStaticBoxSizer:new(?wxVERTICAL, Panel, 
+		    wxStaticBoxSizer:new(?wxVERTICAL, Panel,
 					 [{label, "Module inclusion policy"}])),
     Sizer = wxBoxSizer:new(?wxVERTICAL),
     wxSizer:add(Sizer, InclSizer,
 		[{border, 2}, {flag, ?wxALL bor ?wxEXPAND}, {proportion, 1}]),
-    wxWindow:setSizerAndFit(Panel, Sizer),    
-    
+    wxWindow:setSizerAndFit(Panel, Sizer),
+
     wxWindow:show(Frame),
     wx_test_lib:wx_destroy(Frame,Config).
 
@@ -263,13 +263,13 @@ clipboard(_Config) ->
     wxClipboard:flush(CB),
     ?log("Stopping ~n",[]),
     ok.
-    
+
 helpFrame(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
 helpFrame(Config) ->
     Wx = wx:new(),
     MFrame = wx:batch(fun() ->
 			      MFrame = wxFrame:new(Wx, ?wxID_ANY, "Main Frame"),
-			      wxPanel:new(MFrame, [{size, {600,400}}]),      
+			      wxPanel:new(MFrame, [{size, {600,400}}]),
 			      wxWindow:show(MFrame),
 			      MFrame
 		      end),
@@ -279,11 +279,11 @@ helpFrame(Config) ->
     {X, Y, W,H} = wxWindow:getScreenRect(MFrame),
     io:format("Pos0: ~p ~p ~p Pos: ~p:~p Size: ~p:~p ~n",
 	      [X0,Y0, wxWindow:clientToScreen(MFrame, {0,0}), X,Y,W,H]),
-    
+
     Pos = {X+5, Y+(H div 2)},
     Size = {W-10, (H div 2) - 5},
 
-    Comp = wxFrame:new(MFrame, ?wxID_ANY, "Completion Window", 
+    Comp = wxFrame:new(MFrame, ?wxID_ANY, "Completion Window",
 		       [{pos, Pos}, {size, Size},
 			{style, ?wxFRAME_FLOAT_ON_PARENT}]),
     LB = wxListBox:new(Comp, 42, [{style, ?wxLB_SINGLE},
@@ -301,7 +301,7 @@ htmlWindow(Config) ->
     {MFrame,HPanel} =
 	wx:batch(fun() ->
 			 MFrame = wxFrame:new(Wx, ?wxID_ANY, "Main Frame"),
-			 HPanel = wxHtmlWindow:new(MFrame, [{size, {600,400}}]),  
+			 HPanel = wxHtmlWindow:new(MFrame, [{size, {600,400}}]),
 			 wxWindow:show(MFrame),
 			 {MFrame, HPanel}
 		 end),
@@ -310,7 +310,7 @@ htmlWindow(Config) ->
     WxMod = code:which(wx),
     WxDir = filename:split(filename:dirname(WxMod)) -- ["ebin"],
     Html = filename:join(filename:join(WxDir),filename:join("doc", "html")),
-    
+
     Index = filename:join(Html, "wx.html"),
 
     ?m(ok, wxHtmlWindow:connect(HPanel, command_html_link_clicked,
@@ -318,7 +318,7 @@ htmlWindow(Config) ->
 				  fun(Ev,_) ->
 					  io:format("Link clicked: ~p~n",[Ev])
 				  end}])),
-    
+
     case filelib:is_file(Index) of
 	true ->
 	    ?m(true, wxHtmlWindow:loadFile(HPanel, Index)),
@@ -326,7 +326,7 @@ htmlWindow(Config) ->
 	false ->
 	    ok
     end,
-    
+
     wx_test_lib:wx_destroy(MFrame,Config).
 
 
@@ -334,18 +334,18 @@ listCtrlSort(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
 listCtrlSort(Config) ->
     Wx = wx:new(),
     Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
-    
+
     LC = wxListCtrl:new(Frame, [{style, ?wxLC_REPORT bor ?wxLC_SORT_ASCENDING}]),
 
     %% must be done crashes in wxwidgets otherwise.
     wxListCtrl:insertColumn(LC, 0, "Column"),
-    
-    Add = fun(Int) ->    
+
+    Add = fun(Int) ->
 		  wxListCtrl:insertItem(LC, Int, integer_to_list(Int)),
 		  %% ItemData Can only be integers currently
 		  wxListCtrl:setItemData(LC, Int, abs(2500-Int))
 	  end,
-    
+
     wx:foreach(Add, lists:seq(0,5000)),
     wxWindow:show(Frame),
 
@@ -360,10 +360,10 @@ listCtrlSort(Config) ->
 						    end
 					    end)
 	   end,
-    
+
     Time = timer:tc(erlang, apply, [Sort,[]]),
     io:format("Sorted ~p ~n",[Time]),
-    
+
     Item = wxListItem:new(),
     _List = wx:map(fun(Int) ->
 			   wxListItem:setId(Item, Int),
@@ -374,6 +374,48 @@ listCtrlSort(Config) ->
 
     wx_test_lib:wx_destroy(Frame,Config).
 
+listCtrlVirtual(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
+listCtrlVirtual(Config) ->
+    Wx = wx:new(),
+    Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
+    IA = wxListItemAttr:new(),
+    wxListItemAttr:setTextColour(IA, {190, 25, 25}),
+    LC = wxListCtrl:new(Frame,
+			[{style, ?wxLC_REPORT bor ?wxLC_VIRTUAL},
+			 {onGetItemText, fun(_This, Item, 0) ->
+						 "Row " ++ integer_to_list(Item);
+					    (_, Item, 1) when Item rem 5 == 0 ->
+						 "Column 2";
+					    (_, _, _) -> ""
+					 end},
+			 {onGetItemAttr, fun(_This, Item) when Item rem 3 == 0 ->
+						 IA;
+					    (_This, _Item)  ->
+						 wx:typeCast(wx:null(), wxListItemAttr)
+					 end},
+			 {onGetItemColumnImage, fun(_This, Item, 1) ->
+							Item rem 4;
+						   (_, _, _) ->
+							-1
+						end}
+			]),
+
+    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}}])),
+    wxListCtrl:assignImageList(LC, IL, ?wxIMAGE_LIST_SMALL),
+
+    wxListCtrl:insertColumn(LC, 0, "Column 1"),
+    wxListCtrl:insertColumn(LC, 1, "Column 2"),
+    wxListCtrl:setColumnWidth(LC, 0, 200),
+    wxListCtrl:setColumnWidth(LC, 1, 200),
+    wxListCtrl:setItemCount(LC, 1000000),
+
+    wxWindow:show(Frame),
+    wx_test_lib:wx_destroy(Frame,Config).
+
 
 radioBox(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
 radioBox(Config) ->
@@ -382,7 +424,7 @@ radioBox(Config) ->
 
     TrSortRadioBox = wxRadioBox:new(Frame, ?wxID_ANY, "Sort by:",
 				    {100, 100},{100, 100}, ["Timestamp"]),
-    
+
     io:format("TrSortRadioBox ~p ~n", [TrSortRadioBox]),
     %% If I uncomment any of these lines, it will crash
 
@@ -398,7 +440,7 @@ systemSettings(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo)
 systemSettings(Config) ->
     Wx = wx:new(),
     Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
-    
+
     ?m({_,_,_,_}, wxSystemSettings:getColour(?wxSYS_COLOUR_DESKTOP)),
     ?mt(wxFont, wxSystemSettings:getFont(?wxSYS_SYSTEM_FONT)),
     ?m(true, is_integer(wxSystemSettings:getMetric(?wxSYS_MOUSE_BUTTONS))),
diff --git a/lib/xmerl/src/xmerl_ucs.erl b/lib/xmerl/src/xmerl_ucs.erl
index 7c45c838ab..feb16070a0 100644
--- a/lib/xmerl/src/xmerl_ucs.erl
+++ b/lib/xmerl/src/xmerl_ucs.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
+%%
 %% Copyright Ericsson AB 2005-2009. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 
@@ -43,6 +43,7 @@
 -export([to_utf16be/1, from_utf16be/1, from_utf16be/2]).
 -export([to_utf16le/1, from_utf16le/1, from_utf16le/2]).
 -export([to_utf8/1, from_utf8/1]).
+-export([from_latin9/1]).
 
 %%% NB: Non-canonical UTF-8 encodings and incorrectly used
 %%% surrogate-pair codes are disallowed by this code.  There are
@@ -177,13 +178,27 @@ to_utf8(List) when is_list(List) -> lists:flatmap(fun to_utf8/1, List);
 to_utf8(Ch) -> char_to_utf8(Ch).
 
 from_utf8(Bin) when is_binary(Bin) -> from_utf8(binary_to_list(Bin));
-from_utf8(List) -> 
+from_utf8(List) ->
     case expand_utf8(List) of
 	{Result,0} -> Result;
 	{_Res,_NumBadChar} ->
 	    exit({ucs,{bad_utf8_character_code}})
     end.
 
+%%% Latin9 support
+from_latin9(Bin) when is_binary(Bin) -> from_latin9(binary_to_list(Bin));
+from_latin9(List) ->
+    [ latin9_to_ucs4(Char) || Char <- List].
+
+latin9_to_ucs4(16#A4) -> 16#20AC;
+latin9_to_ucs4(16#A6) -> 16#160;
+latin9_to_ucs4(16#A8) -> 16#161;
+latin9_to_ucs4(16#B4) -> 16#17D;
+latin9_to_ucs4(16#B8) -> 16#17E;
+latin9_to_ucs4(16#BC) -> 16#152;
+latin9_to_ucs4(16#BD) -> 16#153;
+latin9_to_ucs4(16#BE) -> 16#178;
+latin9_to_ucs4(Other) -> Other.
 
 
 
@@ -238,7 +253,7 @@ from_ucs4le(Bin,Acc,Tail) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% UCS-2 support
-%%% FIXME! Don't know how to encode UCS-2!! 
+%%% FIXME! Don't know how to encode UCS-2!!
 %%% Currently I just encode as UCS-4, but strips the 16 higher bits.
 char_to_ucs2be(Ch) ->
     true = is_iso10646(Ch),
@@ -259,15 +274,15 @@ from_ucs2be(Bin,Acc,Tail) ->
 
 char_to_ucs2le(Ch) ->
     true = is_iso10646(Ch),
-    [(Ch bsr 16) band 16#FF,
-     (Ch bsr 24)].
+    [Ch band 16#FF,
+     (Ch bsr 8) band 16#FF].
 
 
 from_ucs2le(<<Ch:16/little-signed-integer, Rest/binary>>,Acc,Tail) ->
     if Ch < 0; Ch >= 16#D800, Ch < 16#E000; Ch =:= 16#FFFE; Ch =:= 16#FFFF ->
 	    exit({bad_character_code,Ch});
        true ->
-	    from_ucs4le(Rest,[Ch|Acc],Tail)
+	    from_ucs2le(Rest,[Ch|Acc],Tail)
     end;
 from_ucs2le(<<>>,Acc,Tail) ->
     lists:reverse(Acc,Tail);
@@ -476,6 +491,8 @@ to_unicode(Input,Cs) when Cs=='iso_8859-1:1987';Cs=='iso-ir-100';
 			  Cs=='l1';Cs=='ibm819';
 			  Cs=='cp819';Cs=='csisolatin1' ->
     Input;
+to_unicode(Input,Cs) when Cs=='iso_8859-15';Cs=='iso-8859-15';Cs=='latin9' ->
+    from_latin9(Input);
 % to_unicode(Input,Cs) when Cs=='mnemonic';Cs=='"mnemonic+ascii+38';
 % 			  Cs=='mnem';Cs=='"mnemonic+ascii+8200' ->
 %     from_mnemonic(Input);
diff --git a/lib/xmerl/src/xmerl_xsd.erl b/lib/xmerl/src/xmerl_xsd.erl
index f003cc74ba..50c0a79016 100644
--- a/lib/xmerl/src/xmerl_xsd.erl
+++ b/lib/xmerl/src/xmerl_xsd.erl
@@ -742,7 +742,7 @@ element_content({IDC,S},El,Env)
 	    {{IDC,IDConstr},S3};
 	Err ->
 	    S3 = acc_errs(S2,{error_path(El,El#xmlElement.name),?MODULE,
-			      {erronous_content_in_identity_constraint,IDC,Err}}),
+			      {erroneous_content_in_identity_constraint,IDC,Err}}),
 	    {{IDC,[]},S3}
     end;
 element_content({selector,S},Sel,_Env) ->
@@ -5571,7 +5571,7 @@ format_error({incomplete_file,_FileName,_Other}) ->
     "Schema: The file containing a schema state must be produced by xmerl_xsd:state2file/[1,2].";
 format_error({unexpected_content_in_any,A}) ->
     io_lib:format("Schema: The any type is considered to have no content besides annotation. ~p was found.",[A]);
-format_error({erronous_content_in_identity_constraint,IDC,Err}) ->
+format_error({erroneous_content_in_identity_constraint,IDC,Err}) ->
     io_lib:format("Schema: An ~p identity constraint must have one selector and one or more field in content. This case ~p",[IDC,Err]);
 format_error({missing_xpath_attribute,IDCContent}) ->
     io_lib:format("Schema: A ~p in a identity constraint must have a xpath attribute.",[IDCContent]);