diff options
376 files changed, 18402 insertions, 15194 deletions
diff --git a/HOWTO/INSTALL.md b/HOWTO/INSTALL.md index c1b6f44046..43bcdb3a9e 100644 --- a/HOWTO/INSTALL.md +++ b/HOWTO/INSTALL.md @@ -374,9 +374,15 @@ Some of the available `configure` options are: `jinterface` application won't be built) * `--{enable,disable}-dynamic-ssl-lib` - Dynamic OpenSSL libraries * `--{enable,disable}-builtin-zlib` - Use the built-in source for zlib. -* `--with-ssl=PATH` - Specify location of OpenSSL include and lib * `--{with,without}-ssl` - OpenSSL (without implies that the `crypto`, `ssh`, and `ssl` won't be built) +* `--with-ssl=PATH` - Specify location of OpenSSL include and lib +* `--with-ssl-incl=PATH` - Location of OpenSSL `include` directory, + if different than specified by `--with-ssl=PATH` +* `--with-ssl-rpath=yes|no|PATHS` - Runtime library path for OpenSSL. + Default is `yes`, which equates to a number of standard locations. If + `no`, then no runtime library paths will be used. Anything else should be + a comma separated list of paths. * `--with-libatomic_ops=PATH` - Use the `libatomic_ops` library for atomic memory accesses. If `configure` should inform you about no native atomic implementation available, you typically want to try using the @@ -400,7 +406,7 @@ Some of the available `configure` options are: that has to be the same as the filename. You also have to define `STATIC_ERLANG_{NIF,DRIVER}` when compiling the .o files for the nif/driver. If your nif/driver depends on some other dynamic library, you now have to link - that to the Erlang VM binary. This is easily achived by passing `LIBS=-llibname` + that to the Erlang VM binary. This is easily achieved by passing `LIBS=-llibname` to configure. * `--without-$app` - By default all applications in Erlang/OTP will be included in a release. If this is not wanted it is possible to specify that Erlang/OTP diff --git a/OTP_VERSION b/OTP_VERSION index 3cac390ba4..93d4fc0a52 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -18.2.3 +18.2.4 @@ -61,6 +61,12 @@ In short: * Once or twice a week, a status email called ["What's cooking in Erlang/OTP"] [4] will be sent to the [`erlang-patches`] [3] mailing list. +Bug Reports +-------------------------- + +Please look at the [instructions for submitting bugs reports] [6]. + + Copyright and License --------------------- @@ -89,3 +95,4 @@ Copyright and License [3]: http://www.erlang.org/static/doc/mailinglist.html [4]: http://erlang.github.com/otp/ [5]: HOWTO/INSTALL.md + [6]: https://github.com/erlang/otp/wiki/Bug-reports diff --git a/configure.in b/configure.in index 64b0bdac6d..40498f2ff9 100644 --- a/configure.in +++ b/configure.in @@ -271,7 +271,7 @@ AC_ARG_WITH(ssl-rpath, AS_HELP_STRING([--with-ssl-rpath=yes|no|PATHS], [runtime library path for OpenSSL. Default is 'yes', which equates to a number of standard locations. If 'no', then no runtime - library paths wil be used. Anything else should be a + library paths will be used. Anything else should be a comma separated list of paths.])) AC_ARG_ENABLE(dynamic-ssl-lib, diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 index 3d52538933..ec9b66bf29 100644 --- a/erts/aclocal.m4 +++ b/erts/aclocal.m4 @@ -2117,63 +2117,159 @@ esac case "$GCC-$host_cpu" in yes-i86pc | yes-i*86 | yes-x86_64 | yes-amd64) + + if test $ac_cv_sizeof_void_p = 4; then + dw_cmpxchg="cmpxchg8b" + else + dw_cmpxchg="cmpxchg16b" + fi + gcc_dw_cmpxchg_asm=no - AC_MSG_CHECKING([for gcc double word cmpxchg asm support]) - AC_TRY_COMPILE([], + gcc_pic_dw_cmpxchg_asm=no + gcc_cflags_pic=no + gcc_cmpxchg8b_pic_no_clobber_ebx=no + gcc_cmpxchg8b_pic_no_clobber_ebx_register_shortage=no + + save_CFLAGS="$CFLAGS" + + # Check if it works out of the box using passed CFLAGS + # and with -fPIC added to CFLAGS if the passed CFLAGS + # doesn't trigger position independent code + pic_cmpxchg=unknown + while true; do + + case $pic_cmpxchg in + yes) pic_text="pic ";; + *) pic_text="";; + esac + + AC_MSG_CHECKING([for gcc $pic_text$dw_cmpxchg plain asm support]) + + plain_cmpxchg=no + AC_TRY_COMPILE([], [ char xchgd; long new[2], xchg[2], *p; __asm__ __volatile__( -#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__ - "pushl %%ebx\n\t" - "movl %8, %%ebx\n\t" -#endif #if ETHR_SIZEOF_PTR == 4 "lock; cmpxchg8b %0\n\t" #else "lock; cmpxchg16b %0\n\t" #endif "setz %3\n\t" -#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__ - "popl %%ebx\n\t" -#endif - : "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=c"(xchgd) - : "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "3"(new[1]), -#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__ - "r"(new[0]) -#else - "b"(new[0]) -#endif + : "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=q"(xchgd) + : "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "c"(new[1]), "b"(new[0]) : "cc", "memory"); + ], + [plain_cmpxchg=yes]) + AC_MSG_RESULT([$plain_cmpxchg]) + + if test $pic_cmpxchg = yes; then + gcc_pic_dw_cmpxchg_asm=$plain_cmpxchg + break + fi + + gcc_dw_cmpxchg_asm=$plain_cmpxchg + + # If not already compiling to position independent + # code add -fPIC to CFLAGS and do it again. This + # since we want also want to know how to compile + # to position independent code since this might + # cause problems with the use of the EBX register + # as input to the asm on 32-bit x86 and old gcc + # compilers (gcc vsn < 5). + + AC_TRY_COMPILE([], + [ +#if !defined(__PIC__) || !__PIC__ +# error no pic +#endif ], - [gcc_dw_cmpxchg_asm=yes]) - if test $gcc_dw_cmpxchg_asm = no && test $ac_cv_sizeof_void_p = 4; then + [pic_cmpxchg=yes + gcc_cflags_pic=yes], + [pic_cmpxchg=no]) + + if test $pic_cmpxchg = yes; then + gcc_pic_dw_cmpxchg_asm=$gcc_dw_cmpxchg_asm + break + fi + + CFLAGS="$save_CFLAGS -fPIC" + pic_cmpxchg=yes + + done + + if test $gcc_pic_dw_cmpxchg_asm = no && test $ac_cv_sizeof_void_p = 4; then + + AC_MSG_CHECKING([for gcc pic cmpxchg8b asm support with EBX workaround]) + + # Check if we can work around it by managing the ebx + # register explicitly in the asm... + AC_TRY_COMPILE([], + [ + char xchgd; + long new[2], xchg[2], *p; + __asm__ __volatile__( + "pushl %%ebx\n\t" + "movl %8, %%ebx\n\t" + "lock; cmpxchg8b %0\n\t" + "setz %3\n\t" + "popl %%ebx\n\t" + : "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=q"(xchgd) + : "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "c"(new[1]), "r"(new[0]) + : "cc", "memory"); + ], + [gcc_pic_dw_cmpxchg_asm=yes + gcc_cmpxchg8b_pic_no_clobber_ebx=yes]) + + AC_MSG_RESULT([$gcc_pic_dw_cmpxchg_asm]) + + if test $gcc_pic_dw_cmpxchg_asm = no; then + + AC_MSG_CHECKING([for gcc pic cmpxchg8b asm support with EBX and register shortage workarounds]) + # If no optimization is enabled we sometimes get a + # register shortage. Check if we can work around + # this... + + AC_TRY_COMPILE([], [ char xchgd; long new[2], xchg[2], *p; -#if !defined(__PIC__) || !__PIC__ -# error nope -#endif __asm__ __volatile__( - "pushl %%ebx\n\t" - "movl (%7), %%ebx\n\t" - "movl 4(%7), %%ecx\n\t" - "lock; cmpxchg8b %0\n\t" - "setz %3\n\t" - "popl %%ebx\n\t" - : "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=c"(xchgd) - : "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "3"(new) + "pushl %%ebx\n\t" + "movl (%7), %%ebx\n\t" + "movl 4(%7), %%ecx\n\t" + "lock; cmpxchg8b %0\n\t" + "setz %3\n\t" + "popl %%ebx\n\t" + : "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=c"(xchgd) + : "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "r"(new) : "cc", "memory"); ], - [gcc_dw_cmpxchg_asm=yes]) - if test "$gcc_dw_cmpxchg_asm" = "yes"; then - AC_DEFINE(ETHR_CMPXCHG8B_REGISTER_SHORTAGE, 1, [Define if you get a register shortage with cmpxchg8b and position independent code]) + [gcc_pic_dw_cmpxchg_asm=yes + gcc_cmpxchg8b_pic_no_clobber_ebx=yes + gcc_cmpxchg8b_pic_no_clobber_ebx_register_shortage=yes]) + + AC_MSG_RESULT([$gcc_pic_dw_cmpxchg_asm]) fi + + if test $gcc_cflags_pic = yes; then + gcc_dw_cmpxchg_asm=$gcc_pic_dw_cmpxchg_asm + fi + + fi + + CFLAGS="$save_CFLAGS" + + if test "$gcc_cmpxchg8b_pic_no_clobber_ebx" = "yes"; then + AC_DEFINE(ETHR_CMPXCHG8B_PIC_NO_CLOBBER_EBX, 1, [Define if gcc wont let you clobber ebx with cmpxchg8b and position independent code]) + fi + if test "$gcc_cmpxchg8b_pic_no_clobber_ebx_register_shortage" = "yes"; then + AC_DEFINE(ETHR_CMPXCHG8B_REGISTER_SHORTAGE, 1, [Define if you get a register shortage with cmpxchg8b and position independent code]) fi - AC_MSG_RESULT([$gcc_dw_cmpxchg_asm]) if test "$gcc_dw_cmpxchg_asm" = "yes"; then AC_DEFINE(ETHR_GCC_HAVE_DW_CMPXCHG_ASM_SUPPORT, 1, [Define if you use a gcc that supports the double word cmpxchg instruction]) fi;; diff --git a/erts/configure.in b/erts/configure.in index 4fb725ff00..4ade3b3086 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -468,7 +468,7 @@ case $host_os in win32) # The ethread library requires _WIN32_WINNT of at least 0x0403. # -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS. - CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0501 -DWINVER=0x0501" + CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600 -DWINVER=0x0600" ;; darwin*) CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE" @@ -4111,7 +4111,7 @@ AC_ARG_WITH(ssl-rpath, AS_HELP_STRING([--with-ssl-rpath=yes|no|PATHS], [runtime library path for OpenSSL. Default is "yes", which equates to a number of standard locations. If "no", then no runtime - library paths wil be used. Anything else should be a + library paths will be used. Anything else should be a comma separated list of paths.]), [ case X$with_ssl in diff --git a/erts/doc/src/epmd.xml b/erts/doc/src/epmd.xml index 28fcc8f7af..7f61804bea 100644 --- a/erts/doc/src/epmd.xml +++ b/erts/doc/src/epmd.xml @@ -37,7 +37,7 @@ <comsummary> <p>Erlang Port Mapper Daemon</p> <taglist> - <tag><c><![CDATA[epmd [-d|-debug] [DbgExtra...] [-port No] [-daemon] [-relaxed_command_check]]]></c></tag> + <tag><c><![CDATA[epmd [-d|-debug] [DbgExtra...] [-address Addresses] [-port No] [-daemon] [-relaxed_command_check]]]></c></tag> <item> <p>Starts the port mapper daemon</p> </item> diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index e8621fecc3..ed3e7e34c4 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -387,6 +387,28 @@ <p>Replaces the path specified in the boot script. See <seealso marker="sasl:script">script(4)</seealso>.</p> </item> + <tag><c><![CDATA[-proto_dist Proto]]></c></tag> + <item> + <p>Specify a protocol for Erlang distribution.</p> + <taglist> + <tag><c>inet_tcp</c></tag> + <item> + <p>TCP over IPv4 (the default)</p> + </item> + <tag><c>inet_tls</c></tag> + <item> + <p>distribution over TLS/SSL</p> + </item> + <tag><c>inet6_tcp</c></tag> + <item> + <p>TCP over IPv6</p> + </item> + </taglist> + <p>For example, to start up IPv6 distributed nodes:</p> +<pre> +% <input>erl -name [email protected] -proto_dist inet6_tcp</input> +</pre> + </item> <tag><c><![CDATA[-remsh Node]]></c></tag> <item> <p>Starts Erlang with a remote shell connected to <c><![CDATA[Node]]></c>.</p> diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml index e4d5e6e77a..30e6751f41 100644 --- a/erts/doc/src/erlang.xml +++ b/erts/doc/src/erlang.xml @@ -1794,7 +1794,8 @@ os_prompt% </pre> </item> </taglist> <note><p>On many platforms, the OS supports only status - codes 0-255.</p></note> + codes 0-255. A too large status code will be truncated by clearing + the high bits.</p></note> <p>For integer <c><anno>Status</anno></c>, the Erlang runtime system closes all ports and allows async threads to finish their operations before exiting. To exit without such flushing, use diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index 07f6492948..cb6d294a41 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -269,6 +269,7 @@ atom getenv atom gather_gc_info_result atom gather_io_bytes atom gather_sched_wall_time_result +atom gather_system_check_result atom getting_linked atom getting_unlinked atom global diff --git a/erts/emulator/beam/beam_catches.c b/erts/emulator/beam/beam_catches.c index c1fd17c65d..7a1f4901aa 100644 --- a/erts/emulator/beam/beam_catches.c +++ b/erts/emulator/beam/beam_catches.c @@ -143,7 +143,7 @@ BeamInstr *beam_catches_car(unsigned i) struct bc_pool* p = &bccix[erts_active_code_ix()]; if (i >= p->tabsize ) { - erl_exit(1, "beam_catches_delmod: index %#x is out of range\r\n", i); + erts_exit(ERTS_ERROR_EXIT, "beam_catches_delmod: index %#x is out of range\r\n", i); } return p->beam_catches[i].cp; } @@ -157,10 +157,10 @@ void beam_catches_delmod(unsigned head, BeamInstr *code, unsigned code_bytes, ASSERT((code_ix == erts_active_code_ix()) != bccix[erts_staging_code_ix()].is_staging); for(i = head; i != (unsigned)-1;) { if (i >= p->tabsize) { - erl_exit(1, "beam_catches_delmod: index %#x is out of range\r\n", i); + erts_exit(ERTS_ERROR_EXIT, "beam_catches_delmod: index %#x is out of range\r\n", i); } if( (char*)p->beam_catches[i].cp - (char*)code >= code_bytes ) { - erl_exit(1, + erts_exit(ERTS_ERROR_EXIT, "beam_catches_delmod: item %#x has cp %p which is not " "in module's range [%p,%p[\r\n", i, p->beam_catches[i].cp, code, ((char*)code + code_bytes)); diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 73292885ce..1fe4cc9374 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -5018,7 +5018,7 @@ do { \ #ifdef NO_FPE_SIGNALS OpCase(fclearerror): OpCase(i_fcheckerror): - erl_exit(1, "fclearerror/i_fcheckerror without fpe signals (beam_emu)"); + erts_exit(ERTS_ERROR_EXIT, "fclearerror/i_fcheckerror without fpe signals (beam_emu)"); # define ERTS_NO_FPE_CHECK_INIT ERTS_FP_CHECK_INIT # define ERTS_NO_FPE_ERROR ERTS_FP_ERROR #else @@ -5176,7 +5176,7 @@ do { \ I = handle_error(c_p, I, reg, NULL); goto post_error_handling; default: - erl_exit(1, "hipe_mode_switch: result %u\n", c_p->def_arg_reg[3]); + erts_exit(ERTS_ERROR_EXIT, "hipe_mode_switch: result %u\n", c_p->def_arg_reg[3]); } } OpCase(hipe_call_count): { @@ -5256,7 +5256,7 @@ do { \ OpCase(label_L): OpCase(on_load): OpCase(line_I): - erl_exit(1, "meta op\n"); + erts_exit(ERTS_ERROR_EXIT, "meta op\n"); /* * One-time initialization of Beam emulator. @@ -5310,7 +5310,7 @@ do { \ } #ifdef NO_JUMP_TABLE default: - erl_exit(1, "unexpected op code %d\n",Go); + erts_exit(ERTS_ERROR_EXIT, "unexpected op code %d\n",Go); } #endif return; /* Never executed */ @@ -5355,7 +5355,7 @@ translate_gc_bif(void* gcf) } else if (gcf == erts_gc_binary_part_3) { return binary_part_3; } else { - erl_exit(1, "bad gc bif"); + erts_exit(ERTS_ERROR_EXIT, "bad gc bif"); } } @@ -5420,7 +5420,7 @@ handle_error(Process* c_p, BeamInstr* pc, Eterm* reg, BifFunction bf) Eterm* hp; Eterm Value = c_p->fvalue; Eterm Args = am_true; - c_p->i = pc; /* In case we call erl_exit(). */ + c_p->i = pc; /* In case we call erts_exit(). */ ASSERT(c_p->freason != TRAP); /* Should have been handled earlier. */ @@ -5484,7 +5484,7 @@ handle_error(Process* c_p, BeamInstr* pc, Eterm* reg, BifFunction bf) c_p->cp = 0; /* To avoid keeping stale references. */ return new_pc; } - if (c_p->catches > 0) erl_exit(1, "Catch not found"); + if (c_p->catches > 0) erts_exit(ERTS_ERROR_EXIT, "Catch not found"); } ERTS_SMP_UNREQ_PROC_MAIN_LOCK(c_p); terminate_proc(c_p, Value); diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c index a8cc19ee1f..66c2853534 100644 --- a/erts/emulator/beam/bif.c +++ b/erts/emulator/beam/bif.c @@ -2216,7 +2216,7 @@ BIF_RETTYPE send_3(BIF_ALIST_3) erts_dsend_export_trap_context(p, ctx)); break; default: - erl_exit(ERTS_ABORT_EXIT, "send_3 invalid result %d\n", (int)result); + erts_exit(ERTS_ABORT_EXIT, "send_3 invalid result %d\n", (int)result); break; } @@ -2260,7 +2260,7 @@ static BIF_RETTYPE dsend_continue_trap_1(BIF_ALIST_1) BIF_TRAP1(&dsend_continue_trap_export, BIF_P, BIF_ARG_1); } default: - erl_exit(ERTS_ABORT_EXIT, "dsend_continue_trap invalid result %d\n", (int)result); + erts_exit(ERTS_ABORT_EXIT, "dsend_continue_trap invalid result %d\n", (int)result); break; } ASSERT(! "Can not arrive here"); @@ -2332,7 +2332,7 @@ Eterm erl_send(Process *p, Eterm to, Eterm msg) erts_dsend_export_trap_context(p, ctx)); break; default: - erl_exit(ERTS_ABORT_EXIT, "invalid send result %d\n", (int)result); + erts_exit(ERTS_ABORT_EXIT, "invalid send result %d\n", (int)result); break; } @@ -3883,7 +3883,7 @@ BIF_RETTYPE erts_debug_display_1(BIF_ALIST_1) erts_dsprintf_buf_t *dsbufp = erts_create_tmp_dsbuf(64); pres = erts_dsprintf(dsbufp, "%.*T\n", INT_MAX, BIF_ARG_1); if (pres < 0) - erl_exit(1, "Failed to convert term to string: %d (%s)\n", + erts_exit(ERTS_ERROR_EXIT, "Failed to convert term to string: %d (%s)\n", -pres, erl_errno_id(-pres)); hp = HAlloc(BIF_P, 2*dsbufp->str_len); /* we need length * 2 heap words */ res = buf_to_intlist(&hp, dsbufp->str, dsbufp->str_len, NIL); @@ -3905,7 +3905,7 @@ BIF_RETTYPE display_string_1(BIF_ALIST_1) } str = (char *) erts_alloc(ERTS_ALC_T_TMP, sizeof(char)*(len + 1)); if (intlist_to_buf(string, str, len) != len) - erl_exit(1, "%s:%d: Internal error\n", __FILE__, __LINE__); + erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error\n", __FILE__, __LINE__); str[len] = '\0'; erts_fprintf(stderr, "%s", str); erts_free(ERTS_ALC_T_TMP, (void *) str); @@ -3925,7 +3925,7 @@ BIF_RETTYPE display_nl_0(BIF_ALIST_0) BIF_RETTYPE halt_0(BIF_ALIST_0) { VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt()\n")); - erl_halt(0); + erts_halt(0); ERTS_BIF_YIELD1(bif_export[BIF_halt_1], BIF_P, am_undefined); } @@ -3938,17 +3938,18 @@ static char halt_msg[HALT_MSG_SIZE]; /* ARGSUSED */ BIF_RETTYPE halt_1(BIF_ALIST_1) { - Sint code; + Uint code; - if (is_small(BIF_ARG_1) && (code = signed_val(BIF_ARG_1)) >= 0) { + if (term_to_Uint_mask(BIF_ARG_1, &code)) { + int pos_int_code = (int) (code & INT_MAX); VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt(%T)\n", BIF_ARG_1)); - erl_halt((int)(- code)); + erts_halt(pos_int_code); ERTS_BIF_YIELD1(bif_export[BIF_halt_1], BIF_P, am_undefined); } else if (ERTS_IS_ATOM_STR("abort", BIF_ARG_1)) { VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt(%T)\n", BIF_ARG_1)); erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN); - erl_exit(ERTS_ABORT_EXIT, ""); + erts_exit(ERTS_ABORT_EXIT, ""); } else if (is_string(BIF_ARG_1) || BIF_ARG_1 == NIL) { int i; @@ -3959,11 +3960,11 @@ BIF_RETTYPE halt_1(BIF_ALIST_1) halt_msg[i] = '\0'; VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt(%T)\n", BIF_ARG_1)); erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN); - erl_exit(ERTS_DUMP_EXIT, "%s\n", halt_msg); + erts_exit(ERTS_DUMP_EXIT, "%s\n", halt_msg); } else goto error; - return NIL; /* Pedantic (lint does not know about erl_exit) */ + return NIL; /* Pedantic (lint does not know about erts_exit) */ error: BIF_ERROR(BIF_P, BADARG); } @@ -3974,7 +3975,7 @@ BIF_RETTYPE halt_1(BIF_ALIST_1) /* ARGSUSED */ BIF_RETTYPE halt_2(BIF_ALIST_2) { - Sint code; + Uint code; Eterm optlist = BIF_ARG_2; int flush = 1; @@ -4001,23 +4002,24 @@ BIF_RETTYPE halt_2(BIF_ALIST_2) if (is_not_nil(optlist)) goto error; - if (is_small(BIF_ARG_1) && (code = signed_val(BIF_ARG_1)) >= 0) { + if (term_to_Uint_mask(BIF_ARG_1, &code)) { + int pos_int_code = (int) (code & INT_MAX); VERBOSE(DEBUG_SYSTEM, ("System halted by BIF halt(%T, %T)\n", BIF_ARG_1, BIF_ARG_2)); if (flush) { - erl_halt((int)(- code)); + erts_halt(pos_int_code); ERTS_BIF_YIELD1(bif_export[BIF_halt_1], BIF_P, am_undefined); } else { erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN); - erl_exit((int)(- code), ""); + erts_exit(pos_int_code, ""); } } else if (ERTS_IS_ATOM_STR("abort", BIF_ARG_1)) { VERBOSE(DEBUG_SYSTEM, ("System halted by BIF halt(%T, %T)\n", BIF_ARG_1, BIF_ARG_2)); erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN); - erl_exit(ERTS_ABORT_EXIT, ""); + erts_exit(ERTS_ABORT_EXIT, ""); } else if (is_string(BIF_ARG_1) || BIF_ARG_1 == NIL) { int i; @@ -4029,11 +4031,11 @@ BIF_RETTYPE halt_2(BIF_ALIST_2) VERBOSE(DEBUG_SYSTEM, ("System halted by BIF halt(%T, %T)\n", BIF_ARG_1, BIF_ARG_2)); erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN); - erl_exit(ERTS_DUMP_EXIT, "%s\n", halt_msg); + erts_exit(ERTS_DUMP_EXIT, "%s\n", halt_msg); } else goto error; - return NIL; /* Pedantic (lint does not know about erl_exit) */ + return NIL; /* Pedantic (lint does not know about erts_exit) */ error: BIF_ERROR(BIF_P, BADARG); } @@ -4089,7 +4091,7 @@ term2list_dsprintf(Process *p, Eterm term) erts_dsprintf_buf_t *dsbufp = erts_create_tmp_dsbuf(64); pres = erts_dsprintf(dsbufp, "%T", term); if (pres < 0) - erl_exit(1, "Failed to convert term to list: %d (%s)\n", + erts_exit(ERTS_ERROR_EXIT, "Failed to convert term to list: %d (%s)\n", -pres, erl_errno_id(-pres)); hp = HAlloc(p, 2*dsbufp->str_len); /* we need length * 2 heap words */ res = buf_to_intlist(&hp, dsbufp->str, dsbufp->str_len, NIL); diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab index 4f0656d174..3177d5dae7 100644 --- a/erts/emulator/beam/bif.tab +++ b/erts/emulator/beam/bif.tab @@ -174,6 +174,8 @@ bif erts_internal:time_unit/0 bif erts_internal:is_system_process/1 +bif erts_internal:system_check/1 + # inet_db support bif erlang:port_set_data/2 bif erlang:port_get_data/1 diff --git a/erts/emulator/beam/big.c b/erts/emulator/beam/big.c index 15bcd44fb9..87d3be2b0f 100644 --- a/erts/emulator/beam/big.c +++ b/erts/emulator/beam/big.c @@ -2028,6 +2028,32 @@ term_to_Uint(Eterm term, Uint *up) } } +/* same as term_to_Uint() + but also accept larger bignums by masking + */ +int +term_to_Uint_mask(Eterm term, Uint *up) +{ + if (is_small(term)) { + Sint i = signed_val(term); + if (i < 0) { + *up = BADARG; + return 0; + } + *up = (Uint) i; + return 1; + } else if (is_big(term) && !big_sign(term)) { + ErtsDigit* xr = big_v(term); + + ERTS_CT_ASSERT(sizeof(ErtsDigit) == sizeof(Uint)); + *up = (Uint)*xr; /* just pick first word */ + return 1; + } else { + *up = BADARG; + return 0; + } +} + int term_to_UWord(Eterm term, UWord *up) { diff --git a/erts/emulator/beam/big.h b/erts/emulator/beam/big.h index 4aa9724ae3..3c1f1e6b23 100644 --- a/erts/emulator/beam/big.h +++ b/erts/emulator/beam/big.h @@ -161,6 +161,7 @@ Eterm bytes_to_big(byte*, dsize_t, int, Eterm*); byte* big_to_bytes(Eterm, byte*); int term_to_Uint(Eterm, Uint*); +int term_to_Uint_mask(Eterm, Uint*); int term_to_UWord(Eterm, UWord*); int term_to_Sint(Eterm, Sint*); #if HAVE_INT64 diff --git a/erts/emulator/beam/binary.c b/erts/emulator/beam/binary.c index e670fbf31c..247c8f1122 100644 --- a/erts/emulator/beam/binary.c +++ b/erts/emulator/beam/binary.c @@ -47,7 +47,7 @@ erts_init_binary(void) if ((((UWord) &((Binary *) 0)->orig_bytes[0]) % ((UWord) 8)) != 0) { /* I assume that any compiler should be able to optimize this away. If not, this test is not very expensive... */ - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Internal error: Address of orig_bytes[0] of a Binary" " is *not* 8-byte aligned\n"); } diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c index 4ce9d24479..0ddf7f4e6d 100644 --- a/erts/emulator/beam/break.c +++ b/erts/emulator/beam/break.c @@ -104,7 +104,7 @@ process_killer(void) erts_printf("(k)ill (n)ext (r)eturn:\n"); while(1) { if ((j = sys_get_key(0)) <= 0) - erl_exit(0, ""); + erts_exit(0, ""); switch(j) { case 'k': { ErtsProcLocks rp_locks = ERTS_PROC_LOCKS_XSIG_SEND; @@ -493,7 +493,7 @@ do_break(void) halt immediately if break is called */ mode = erts_read_env("ERL_CONSOLE_MODE"); if (mode && strcmp(mode, "window") != 0) - erl_exit(0, ""); + erts_exit(0, ""); erts_free_read_env(mode); #endif /* __WIN32__ */ @@ -503,7 +503,7 @@ do_break(void) while (1) { if ((i = sys_get_key(0)) <= 0) - erl_exit(0, ""); + erts_exit(0, ""); switch (i) { case 'q': case 'a': @@ -513,9 +513,9 @@ do_break(void) * The usual reason for a read error is Ctrl-C. Treat this as * 'a' to avoid infinite loop. */ - erl_exit(0, ""); + erts_exit(0, ""); case 'A': /* Halt generating crash dump */ - erl_exit(1, "Crash dump requested by user"); + erts_exit(ERTS_ERROR_EXIT, "Crash dump requested by user"); case 'c': return; case 'p': @@ -785,7 +785,7 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args) erts_fdprintf(fd, "Atoms: %d\n", atom_table_size()); #ifdef USE_THREADS - /* We want to note which thread it was that called erl_exit */ + /* We want to note which thread it was that called erts_exit */ if (erts_get_scheduler_data()) { erts_fdprintf(fd, "Calling Thread: scheduler:%d\n", erts_get_scheduler_data()->no); diff --git a/erts/emulator/beam/copy.c b/erts/emulator/beam/copy.c index 8849dadd00..64be43edb4 100644 --- a/erts/emulator/beam/copy.c +++ b/erts/emulator/beam/copy.c @@ -59,7 +59,7 @@ copy_object(Eterm obj, Process* to) res = copy_struct(obj, size, &hp, &to->off_heap); #ifdef DEBUG if (eq(obj, res) == 0) { - erl_exit(ERTS_ABORT_EXIT, "copy not equal to source\n"); + erts_exit(ERTS_ABORT_EXIT, "copy not equal to source\n"); } #endif return res; @@ -171,7 +171,7 @@ Uint size_object(Eterm obj) } break; default: - erl_exit(ERTS_ABORT_EXIT, "size_object: bad hashmap type %d\n", MAP_HEADER_TYPE(hdr)); + erts_exit(ERTS_ABORT_EXIT, "size_object: bad hashmap type %d\n", MAP_HEADER_TYPE(hdr)); } break; case SUB_BINARY_SUBTAG: @@ -202,7 +202,7 @@ Uint size_object(Eterm obj) } break; case BIN_MATCHSTATE_SUBTAG: - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "size_object: matchstate term not allowed"); default: sum += thing_arityval(hdr) + 1; @@ -219,7 +219,7 @@ Uint size_object(Eterm obj) obj = ESTACK_POP(s); break; default: - erl_exit(ERTS_ABORT_EXIT, "size_object: bad tag for %#x\n", obj); + erts_exit(ERTS_ABORT_EXIT, "size_object: bad tag for %#x\n", obj); } } } @@ -272,7 +272,7 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap) goto L_copy_list; case TAG_PRIMARY_BOXED: argp = &res; goto L_copy_boxed; default: - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s, line %d: Internal error in copy_struct: 0x%08x\n", __FILE__, __LINE__,obj); } @@ -331,7 +331,7 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap) case TAG_PRIMARY_IMMED1: *tailp = obj; goto L_copy; case TAG_PRIMARY_BOXED: argp = tailp; goto L_copy_boxed; default: - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s, line %d: Internal error in copy_struct: 0x%08x\n", __FILE__, __LINE__,obj); } @@ -512,11 +512,11 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap) *argp = make_hashmap_rel(tp, dst_base); break; default: - erl_exit(ERTS_ABORT_EXIT, "copy_struct: bad hashmap type %d\n", MAP_HEADER_TYPE(hdr)); + erts_exit(ERTS_ABORT_EXIT, "copy_struct: bad hashmap type %d\n", MAP_HEADER_TYPE(hdr)); } break; case BIN_MATCHSTATE_SUBTAG: - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "copy_struct: matchstate term not allowed"); default: i = thing_arityval(hdr)+1; @@ -540,13 +540,13 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap) #ifdef DEBUG if (htop != hbot) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Internal error in copy_struct() when copying %T:" " htop=%p != hbot=%p (sz=%beu)\n", org_obj, htop, hbot, org_sz); #else if (htop > hbot) { - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Internal error in copy_struct(): htop, hbot overrun\n"); } #endif diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c index 7be2b77a3b..787241b960 100644 --- a/erts/emulator/beam/dist.c +++ b/erts/emulator/beam/dist.c @@ -1959,7 +1959,7 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx) goto done; } default: - erl_exit(ERTS_ABORT_EXIT, "dsig_send invalid phase (%d)\n", (int)ctx->phase); + erts_exit(ERTS_ABORT_EXIT, "dsig_send invalid phase (%d)\n", (int)ctx->phase); } } @@ -1980,7 +1980,7 @@ dist_port_command(Port *prt, ErtsDistOutputBuf *obuf) ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt)); if (size > (Uint) INT_MAX) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Absurdly large distribution output data buffer " "(%beu bytes) passed.\n", size); @@ -2020,7 +2020,7 @@ dist_port_commandv(Port *prt, ErtsDistOutputBuf *obuf) ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt)); if (size > (Uint) INT_MAX) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Absurdly large distribution output data buffer " "(%beu bytes) passed.\n", size); @@ -3382,7 +3382,7 @@ send_nodes_mon_msgs(Process *c_p, Eterm what, Eterm node, Eterm type, Eterm reas continue; break; default: - erl_exit(ERTS_ABORT_EXIT, "Bad node type found\n"); + erts_exit(ERTS_ABORT_EXIT, "Bad node type found\n"); } } @@ -3691,7 +3691,7 @@ erts_processes_monitoring_nodes(Process *c_p) case ERTS_NODES_MON_OPT_TYPES: type = am_all; break; case ERTS_NODES_MON_OPT_TYPE_VISIBLE: type = am_visible; break; case ERTS_NODES_MON_OPT_TYPE_HIDDEN: type = am_hidden; break; - default: erl_exit(ERTS_ABORT_EXIT, "Bad node type found\n"); + default: erts_exit(ERTS_ABORT_EXIT, "Bad node type found\n"); } olist = erts_bld_cons(hpp, szp, erts_bld_tuple(hpp, szp, 2, diff --git a/erts/emulator/beam/erl_afit_alloc.c b/erts/emulator/beam/erl_afit_alloc.c index 47dafa53c0..4b0541c10e 100644 --- a/erts/emulator/beam/erl_afit_alloc.c +++ b/erts/emulator/beam/erl_afit_alloc.c @@ -241,7 +241,7 @@ info_options(Allctr_t *allctr, if (hpp || szp) { if (!atoms_initialized) - erl_exit(1, "%s:%d: Internal error: Atoms not initialized", + erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error: Atoms not initialized", __FILE__, __LINE__);; res = NIL; diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index 2a97069ac2..0877c24404 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -653,11 +653,11 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop) if (mlockall(MCL_CURRENT|MCL_FUTURE) != 0) { int err = errno; char *errstr = err ? strerror(err) : "unknown"; - erl_exit(-1, "Failed to lock physical memory: %s (%d)\n", + erts_exit(1, "Failed to lock physical memory: %s (%d)\n", errstr, err); } #else - erl_exit(-1, "Failed to lock physical memory: Not supported\n"); + erts_exit(1, "Failed to lock physical memory: Not supported\n"); #endif } @@ -806,13 +806,13 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop) for (i = ERTS_ALC_A_MIN; i <= ERTS_ALC_A_MAX; i++) { if (!erts_allctrs[i].alloc) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Missing alloc function for %s\n", ERTS_ALC_A2AD(i)); if (!erts_allctrs[i].realloc) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Missing realloc function for %s\n", ERTS_ALC_A2AD(i)); if (!erts_allctrs[i].free) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Missing free function for %s\n", ERTS_ALC_A2AD(i)); } @@ -890,7 +890,7 @@ erts_alloc_late_init(void) static void * erts_realloc_fixed_size(ErtsAlcType_t type, void *extra, void *p, Uint size) { - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Attempt to reallocate a block of the fixed size type %s\n", ERTS_ALC_T2TD(type)); } @@ -1012,7 +1012,7 @@ start_au_allocator(ErtsAlcType_t alctr_n, * tspec->size) + ERTS_CACHE_LINE_SIZE - 1)); if (!states) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Failed to allocate allocator states for %salloc\n", init->init.util.name_prefix); tspec->allctr = (Allctr_t **) states; @@ -1040,7 +1040,7 @@ start_au_allocator(ErtsAlcType_t alctr_n, (tot_fix_list_size + ERTS_CACHE_LINE_SIZE - 1)); if (!fix_lists) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Failed to allocate fix lists for %salloc\n", init->init.util.name_prefix); @@ -1114,7 +1114,7 @@ start_au_allocator(ErtsAlcType_t alctr_n, } if (!as) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Failed to start %salloc\n", init->init.util.name_prefix); ASSERT(as == (void *) as0); @@ -1909,7 +1909,7 @@ erts_alc_fatal_error(int error, int func, ErtsAlcType_t n, ...) case ERTS_ALC_O_FREE: op_str = "free"; break; default: op_str = "UNKNOWN"; break; } - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s: %s operation not supported (memory type: \"%s\")\n", allctr_str, op_str, t_str); break; @@ -1923,18 +1923,18 @@ erts_alc_fatal_error(int error, int func, ErtsAlcType_t n, ...) va_start(argp, n); size = va_arg(argp, Uint); va_end(argp); - erl_exit(-1, + erts_exit(1, "%s: Cannot %s %lu bytes of memory (of type \"%s\").\n", allctr_str, op, size, t_str); break; } case ERTS_ALC_E_NOALLCTR: - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "erts_alloc: Unknown allocator type: %d\n", ERTS_ALC_T2A(ERTS_ALC_N2T(n))); break; default: - erl_exit(ERTS_ABORT_EXIT, "erts_alloc: Unknown error: %d\n", error); + erts_exit(ERTS_ABORT_EXIT, "erts_alloc: Unknown error: %d\n", error); break; } } @@ -3189,7 +3189,7 @@ reply_alloc_info(void *vair) make_small(0), ainfo); } else { - erl_exit(ERTS_ABORT_EXIT, "%s:%d: internal error\n", + erts_exit(ERTS_ABORT_EXIT, "%s:%d: internal error\n", __FILE__, __LINE__); } } @@ -3426,7 +3426,7 @@ void *safe_realloc(void *ptr, Uint sz) * Keep alloc_SUITE_data/allocator_test.h updated if changes are made * * to erts_alc_test() * \* */ -#define ERTS_ALC_TEST_ABORT erl_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error\n") +#define ERTS_ALC_TEST_ABORT erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error\n") UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3) { @@ -3888,7 +3888,7 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func) found_type = GET_TYPE_OF_PATTERN(pre_pattern); if (pre_pattern != MK_PATTERN(n)) { if ((FIXED_FENCE_PATTERN_MASK & pre_pattern) != FIXED_FENCE_PATTERN) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "ERROR: Fence at beginning of memory block (p=0x%u) " "clobbered.\n", (UWord) ptr); @@ -3905,12 +3905,12 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func) char *op_str; if ((FIXED_FENCE_PATTERN_MASK & post_pattern) != FIXED_FENCE_PATTERN) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "ERROR: Fence at end of memory block (p=0x%u, sz=%u) " "clobbered.\n", (UWord) ptr, (UWord) sz); if (found_type != GET_TYPE_OF_PATTERN(post_pattern)) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "ERROR: Fence around memory block (p=0x%u, sz=%u) " "clobbered.\n", (UWord) ptr, (UWord) sz); @@ -3933,7 +3933,7 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func) default: op_str = "???"; break; } - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "ERROR: Memory block (p=0x%u, sz=%u) allocated as type \"%s\"," " but %s as type \"%s\".\n", (UWord) ptr, (UWord) sz, ftype, op_str, otype); diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types index 1ecebdeb07..7738531142 100644 --- a/erts/emulator/beam/erl_alloc.types +++ b/erts/emulator/beam/erl_alloc.types @@ -369,6 +369,7 @@ type AINFO_REQ STANDARD_LOW SYSTEM alloc_info_request type SCHED_WTIME_REQ STANDARD_LOW SYSTEM sched_wall_time_request type GC_INFO_REQ STANDARD_LOW SYSTEM gc_info_request type PORT_DATA_HEAP STANDARD_LOW SYSTEM port_data_heap +type SYS_CHECK_REQ STANDARD_LOW SYSTEM system_check_request +else # "fullword" @@ -389,6 +390,7 @@ type AINFO_REQ SHORT_LIVED SYSTEM alloc_info_request type SCHED_WTIME_REQ SHORT_LIVED SYSTEM sched_wall_time_request type GC_INFO_REQ SHORT_LIVED SYSTEM gc_info_request type PORT_DATA_HEAP STANDARD SYSTEM port_data_heap +type SYS_CHECK_REQ SHORT_LIVED SYSTEM system_check_request +endif diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c index 8229a15824..18312eacde 100644 --- a/erts/emulator/beam/erl_alloc_util.c +++ b/erts/emulator/beam/erl_alloc_util.c @@ -4518,7 +4518,7 @@ make_name_atoms(Allctr_t *allctr) size_t prefix_len = strlen(allctr->name_prefix); if (prefix_len > MAX_ATOM_CHARACTERS + sizeof(realloc) - 1) - erl_exit(1,"Too long allocator name: %salloc\n",allctr->name_prefix); + erts_exit(ERTS_ERROR_EXIT,"Too long allocator name: %salloc\n",allctr->name_prefix); memcpy((void *) buf, (void *) allctr->name_prefix, prefix_len); @@ -5720,7 +5720,7 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init) /* erts_alcu_start assumes that allctr has been zeroed */ if (((UWord)allctr & ERTS_CRR_ALCTR_FLG_MASK) != 0) { - erl_exit(ERTS_ABORT_EXIT, "%s:%d:erts_alcu_start: Alignment error\n", + erts_exit(ERTS_ABORT_EXIT, "%s:%d:erts_alcu_start: Alignment error\n", __FILE__, __LINE__); } @@ -5904,7 +5904,7 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init) if (allctr->thread_safe) erts_mtx_destroy(&allctr->mutex); #endif - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Failed to create main carrier for %salloc\n", init->name_prefix); } @@ -6120,7 +6120,7 @@ erts_alcu_verify_unused(Allctr_t *allctr) if (no) { UWord sz = allctr->sbcs.blocks.curr.size; sz += allctr->mbcs.blocks.curr.size; - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%salloc() used when expected to be unused!\n" "Total amount of blocks allocated: %bpu\n" "Total amount of bytes allocated: %bpu\n", diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.c b/erts/emulator/beam/erl_ao_firstfit_alloc.c index 19420af8ab..5cd067ff54 100644 --- a/erts/emulator/beam/erl_ao_firstfit_alloc.c +++ b/erts/emulator/beam/erl_ao_firstfit_alloc.c @@ -1035,7 +1035,7 @@ info_options(Allctr_t *allctr, if (hpp || szp) { if (!atoms_initialized) - erl_exit(1, "%s:%d: Internal error: Atoms not initialized", + erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error: Atoms not initialized", __FILE__, __LINE__);; res = NIL; diff --git a/erts/emulator/beam/erl_bestfit_alloc.c b/erts/emulator/beam/erl_bestfit_alloc.c index fb853b65ab..f39a18ac88 100644 --- a/erts/emulator/beam/erl_bestfit_alloc.c +++ b/erts/emulator/beam/erl_bestfit_alloc.c @@ -940,7 +940,7 @@ info_options(Allctr_t *allctr, if (hpp || szp) { if (!atoms_initialized) - erl_exit(1, "%s:%d: Internal error: Atoms not initialized", + erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error: Atoms not initialized", __FILE__, __LINE__);; res = NIL; diff --git a/erts/emulator/beam/erl_bif_ddll.c b/erts/emulator/beam/erl_bif_ddll.c index 28bec6325c..f4ef59993a 100644 --- a/erts/emulator/beam/erl_bif_ddll.c +++ b/erts/emulator/beam/erl_bif_ddll.c @@ -1309,7 +1309,7 @@ static Eterm notify_when_loaded(Process *p, Eterm name_term, char *name, ErtsPro case ERL_DE_FORCE_RELOAD: break; default: - erl_exit(1,"Internal error, unknown state %u in dynamic driver.", drv->handle->status); + erts_exit(ERTS_ERROR_EXIT,"Internal error, unknown state %u in dynamic driver.", drv->handle->status); } p->flags |= F_USING_DDLL; r = add_monitor(p, drv->handle, ERL_DE_PROC_AWAIT_LOAD); diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 414ff6711a..2c232c6c03 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -65,6 +65,7 @@ static Export* gather_io_bytes_trap = NULL; static Export *gather_sched_wall_time_res_trap; static Export *gather_gc_info_res_trap; +static Export *gather_system_check_res_trap; #define DECL_AM(S) Eterm AM_ ## S = am_atom_put(#S, sizeof(#S) - 1) @@ -914,7 +915,7 @@ BIF_RETTYPE process_info_1(BIF_ALIST_1) case ERTS_PI_FAIL_TYPE_AWAIT_EXIT: ERTS_BIF_AWAIT_X_DATA_TRAP(BIF_P, BIF_ARG_1, am_undefined); default: - erl_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error", __FILE__, __LINE__); + erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error", __FILE__, __LINE__); } } @@ -954,7 +955,7 @@ BIF_RETTYPE process_info_2(BIF_ALIST_2) case ERTS_PI_FAIL_TYPE_AWAIT_EXIT: ERTS_BIF_AWAIT_X_DATA_TRAP(BIF_P, BIF_ARG_1, am_undefined); default: - erl_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error", + erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error", __FILE__, __LINE__); } } @@ -1759,7 +1760,7 @@ info_1_tuple(Process* BIF_P, /* Pointer to current process. */ return res; buf = (char *) erts_alloc(ERTS_ALC_T_TMP, len+1); if (intlist_to_buf(*tp, buf, len) != len) - erl_exit(1, "%s:%d: Internal error\n", __FILE__, __LINE__); + erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error\n", __FILE__, __LINE__); buf[len] = '\0'; res = erts_instr_dump_memory_map(buf) ? am_true : am_false; erts_free(ERTS_ALC_T_TMP, (void *) buf); @@ -1778,7 +1779,7 @@ info_1_tuple(Process* BIF_P, /* Pointer to current process. */ return res; buf = (char *) erts_alloc(ERTS_ALC_T_TMP, len+1); if (intlist_to_buf(tp[1], buf, len) != len) - erl_exit(1, "%s:%d: Internal error\n", __FILE__, __LINE__); + erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error\n", __FILE__, __LINE__); buf[len] = '\0'; res = erts_instr_dump_stat(buf, 1) ? am_true : am_false; erts_free(ERTS_ALC_T_TMP, (void *) buf); @@ -3784,6 +3785,18 @@ BIF_RETTYPE erts_internal_is_system_process_1(BIF_ALIST_1) BIF_ERROR(BIF_P, BADARG); } +BIF_RETTYPE erts_internal_system_check_1(BIF_ALIST_1) +{ + Eterm res; + if (ERTS_IS_ATOM_STR("schedulers", BIF_ARG_1)) { + res = erts_system_check_request(BIF_P); + if (is_non_value(res)) + BIF_RET(am_undefined); + BIF_TRAP1(gather_system_check_res_trap, BIF_P, res); + } + + BIF_ERROR(BIF_P, BADARG); +} static erts_smp_atomic_t hipe_test_reschedule_flag; @@ -3798,7 +3811,7 @@ static void broken_halt_test(Eterm bif_arg_2) #if defined(ERTS_HAVE_TRY_CATCH) erts_get_scheduler_data()->run_queue = NULL; #endif - erl_exit(ERTS_DUMP_EXIT, "%T", bif_arg_2); + erts_exit(ERTS_DUMP_EXIT, "%T", bif_arg_2); } @@ -4045,7 +4058,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2) BIF_RET(am_true); } else if (ERTS_IS_ATOM_STR("abort", BIF_ARG_1)) { - erl_exit(ERTS_ABORT_EXIT, "%T\n", BIF_ARG_2); + erts_exit(ERTS_ABORT_EXIT, "%T\n", BIF_ARG_2); } else if (ERTS_IS_ATOM_STR("kill_dist_connection", BIF_ARG_1)) { DistEntry *dep = erts_sysname_to_connected_dist_entry(BIF_ARG_2); @@ -4391,6 +4404,8 @@ erts_bif_info_init(void) = erts_export_put(am_erlang, am_gather_gc_info_result, 1); gather_io_bytes_trap = erts_export_put(am_erts_internal, am_gather_io_bytes, 2); + gather_system_check_res_trap + = erts_export_put(am_erts_internal, am_gather_system_check_result, 1); process_info_init(); os_info_init(); } diff --git a/erts/emulator/beam/erl_bif_port.c b/erts/emulator/beam/erl_bif_port.c index e47d7bcbbb..27c24197ea 100644 --- a/erts/emulator/beam/erl_bif_port.c +++ b/erts/emulator/beam/erl_bif_port.c @@ -791,7 +791,7 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_typep, int *err_nump) } else { name_buf = (char *) erts_alloc(ERTS_ALC_T_TMP, i + 1); if (intlist_to_buf(name, name_buf, i) != i) - erl_exit(1, "%s:%d: Internal error\n", __FILE__, __LINE__); + erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error\n", __FILE__, __LINE__); name_buf[i] = '\0'; } driver = &vanilla_driver; @@ -1169,7 +1169,7 @@ static Eterm http_bld_uri(struct packet_callback_args* pca, return erts_bld_tuple(hpp, szp, 3, am_scheme, s1, s2); default: - erl_exit(1, "%s, line %d: type=%u\n", __FILE__, __LINE__, uri->type); + erts_exit(ERTS_ERROR_EXIT, "%s, line %d: type=%u\n", __FILE__, __LINE__, uri->type); } } diff --git a/erts/emulator/beam/erl_cpu_topology.c b/erts/emulator/beam/erl_cpu_topology.c index 8395f6ecc6..c263eebfcc 100644 --- a/erts/emulator/beam/erl_cpu_topology.c +++ b/erts/emulator/beam/erl_cpu_topology.c @@ -402,7 +402,7 @@ cpu_bind_order_sort(erts_cpu_topology_t *cpudata, break; default: cmp_func = NULL; - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Bad cpu bind type: %d\n", (int) cpu_bind_order); break; @@ -1590,7 +1590,7 @@ get_cpu_topology_term(Process *c_p, int type) } break; default: - erl_exit(ERTS_ABORT_EXIT, "Bad cpu topology type: %d\n", type); + erts_exit(ERTS_ABORT_EXIT, "Bad cpu topology type: %d\n", type); break; } @@ -1967,7 +1967,7 @@ cpu_group_insert(erts_cpu_groups_map_t *map, ix = 0; } while (ix != start); - erl_exit(ERTS_ABORT_EXIT, "Reader groups map full\n"); + erts_exit(ERTS_ABORT_EXIT, "Reader groups map full\n"); } @@ -2290,7 +2290,7 @@ remove_cpu_groups(erts_cpu_groups_callback_t callback, void *arg) prev_cgm = cgm; } - erl_exit(ERTS_ABORT_EXIT, "Cpu groups not found\n"); + erts_exit(ERTS_ABORT_EXIT, "Cpu groups not found\n"); } static int @@ -2320,7 +2320,7 @@ cpu_groups_lookup(erts_cpu_groups_map_t *map, ix = 0; } while (ix != start); - erl_exit(ERTS_ABORT_EXIT, "Logical cpu id %d not found\n", logical); + erts_exit(ERTS_ABORT_EXIT, "Logical cpu id %d not found\n", logical); } static void diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c index 645f9e3c28..870b556851 100644 --- a/erts/emulator/beam/erl_db.c +++ b/erts/emulator/beam/erl_db.c @@ -1295,7 +1295,7 @@ BIF_RETTYPE ets_rename_2(BIF_ALIST_2) goto badarg; if (!remove_named_tab(tb, 1)) - erl_exit(1,"Could not find named tab %s", tb->common.id); + erts_exit(ERTS_ERROR_EXIT,"Could not find named tab %s", tb->common.id); tb->common.id = tb->common.the_name = BIF_ARG_2; @@ -1580,7 +1580,7 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2) BIF_P->common.id, make_small(slot)), 0) != DB_ERROR_NONE) { - erl_exit(1,"Could not update ets metadata."); + erts_exit(ERTS_ERROR_EXIT,"Could not update ets metadata."); } db_meta_unlock(meta_pid_to_tab, LCK_WRITE_REC); @@ -2939,7 +2939,7 @@ void init_db(ErtsDbSpinCount db_spin_count) bits = erts_fit_in_bits_int32(db_max_tabs-1); if (bits > SMALL_BITS) { - erl_exit(1,"Max limit for ets tabled too high %u (max %u).", + erts_exit(ERTS_ERROR_EXIT,"Max limit for ets tabled too high %u (max %u).", db_max_tabs, ((Uint)1)<<SMALL_BITS); } meta_main_tab_slot_mask = (((Uint)1)<<bits) - 1; @@ -3000,7 +3000,7 @@ void init_db(ErtsDbSpinCount db_spin_count) db_init_lock(meta_pid_to_tab, "meta_pid_to_tab", "meta_pid_to_tab_FIX");*/ if (db_create_hash(NULL, meta_pid_to_tab) != DB_ERROR_NONE) { - erl_exit(1,"Unable to create ets metadata tables."); + erts_exit(ERTS_ERROR_EXIT,"Unable to create ets metadata tables."); } erts_smp_atomic_set_nob(&init_tb.common.memory_size, 0); @@ -3031,7 +3031,7 @@ void init_db(ErtsDbSpinCount db_spin_count) db_init_lock(meta_pid_to_fixed_tab, "meta_pid_to_fixed_tab", "meta_pid_to_fixed_tab_FIX");*/ if (db_create_hash(NULL, meta_pid_to_fixed_tab) != DB_ERROR_NONE) { - erl_exit(1,"Unable to create ets metadata tables."); + erts_exit(ERTS_ERROR_EXIT,"Unable to create ets metadata tables."); } /* Non visual BIF to trap to. */ @@ -3228,7 +3228,7 @@ retry: * yielding. */ #define ERTS_DB_INTERNAL_ERROR(LSTR) \ - erl_exit(ERTS_ABORT_EXIT, "%s:%d:erts_db_process_exiting(): " LSTR "\n", \ + erts_exit(ERTS_ABORT_EXIT, "%s:%d:erts_db_process_exiting(): " LSTR "\n", \ __FILE__, __LINE__) int @@ -3500,7 +3500,7 @@ static void fix_table_locked(Process* p, DbTable* tb) make_small(tb->common.slot)), 0) != DB_ERROR_NONE) { UnUseTmpHeap(3,p); - erl_exit(1,"Could not insert ets metadata in safe_fixtable."); + erts_exit(ERTS_ERROR_EXIT,"Could not insert ets metadata in safe_fixtable."); } UnUseTmpHeap(3,p); db_meta_unlock(meta_pid_to_fixed_tab, LCK_WRITE_REC); diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c index 98a2e2842a..fa925c94a5 100644 --- a/erts/emulator/beam/erl_db_hash.c +++ b/erts/emulator/beam/erl_db_hash.c @@ -3028,7 +3028,7 @@ void db_check_table_hash(DbTable *tbl) if ((list = BUCKET(tb,j)) != 0) { while (list != 0) { if (!is_tuple(make_tuple(list->dbterm.tpl))) { - erl_exit(1, "Bad term in slot %d of ets table", j); + erts_exit(ERTS_ERROR_EXIT, "Bad term in slot %d of ets table", j); } list = list->next; } diff --git a/erts/emulator/beam/erl_db_tree.c b/erts/emulator/beam/erl_db_tree.c index 465aa566ad..61293fbf9a 100644 --- a/erts/emulator/beam/erl_db_tree.c +++ b/erts/emulator/beam/erl_db_tree.c @@ -1213,7 +1213,7 @@ static int db_select_count_continue_tree(Process *p, tptr = tuple_val(continuation); if (arityval(*tptr) != 5) - erl_exit(1,"Internal error in ets:select_count/1"); + erts_exit(ERTS_ERROR_EXIT,"Internal error in ets:select_count/1"); lastkey = tptr[2]; end_condition = tptr[3]; diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c index dab357a079..af5b611afd 100644 --- a/erts/emulator/beam/erl_db_util.c +++ b/erts/emulator/beam/erl_db_util.c @@ -1946,11 +1946,11 @@ restart: #ifdef DMC_DEBUG if (*heap_fence != FENCE_PATTERN) { - erl_exit(1, "Heap fence overwritten in db_prog_match after op " + erts_exit(ERTS_ERROR_EXIT, "Heap fence overwritten in db_prog_match after op " "0x%08x, overwritten with 0x%08x.", save_op, *heap_fence); } if (*stack_fence != FENCE_PATTERN) { - erl_exit(1, "Stack fence overwritten in db_prog_match after op " + erts_exit(ERTS_ERROR_EXIT, "Stack fence overwritten in db_prog_match after op " "0x%08x, overwritten with 0x%08x.", save_op, *stack_fence); } @@ -2615,7 +2615,7 @@ restart: case matchHalt: goto success; default: - erl_exit(1, "Internal error: unexpected opcode in match program."); + erts_exit(ERTS_ERROR_EXIT, "Internal error: unexpected opcode in match program."); } } fail: @@ -2639,11 +2639,11 @@ success: #ifdef DMC_DEBUG if (*heap_fence != FENCE_PATTERN) { - erl_exit(1, "Heap fence overwritten in db_prog_match after op " + erts_exit(ERTS_ERROR_EXIT, "Heap fence overwritten in db_prog_match after op " "0x%08x, overwritten with 0x%08x.", save_op, *heap_fence); } if (*stack_fence != FENCE_PATTERN) { - erl_exit(1, "Stack fence overwritten in db_prog_match after op " + erts_exit(ERTS_ERROR_EXIT, "Stack fence overwritten in db_prog_match after op " "0x%08x, overwritten with 0x%08x.", save_op, *stack_fence); } @@ -3683,7 +3683,7 @@ static DMCRet dmc_one_term(DMCContext *context, break; } default: - erl_exit(1, "db_match_compile: " + erts_exit(ERTS_ERROR_EXIT, "db_match_compile: " "Bad object on heap: 0x%bex\n", c); } return retOk; @@ -4930,7 +4930,7 @@ static DMCRet dmc_fun(DMCContext *context, DMC_PUSH(*text, matchCall3); break; default: - erl_exit(1,"ets:match() internal error, " + erts_exit(ERTS_ERROR_EXIT,"ets:match() internal error, " "guard with more than 3 arguments."); } DMC_PUSH(*text, (UWord) b->biff); @@ -5210,7 +5210,7 @@ static Uint my_size_object(Eterm t) tmp == am_const) { sum += size_object(tuple_val(t)[2]); } else { - erl_exit(1,"Internal error, sizing unrecognized object in " + erts_exit(ERTS_ERROR_EXIT,"Internal error, sizing unrecognized object in " "(d)ets:match compilation."); } break; @@ -5255,7 +5255,7 @@ static Eterm my_copy_struct(Eterm t, Eterm **hp, ErlOffHeap* off_heap) sz = size_object(b); ret = copy_struct(b,sz,hp,off_heap); } else { - erl_exit(1, "Trying to constant-copy non constant expression " + erts_exit(ERTS_ERROR_EXIT, "Trying to constant-copy non constant expression " "0x%bex in (d)ets:match compilation.", t); } } else { diff --git a/erts/emulator/beam/erl_debug.c b/erts/emulator/beam/erl_debug.c index 2dcfb79f00..4928aae9c2 100644 --- a/erts/emulator/beam/erl_debug.c +++ b/erts/emulator/beam/erl_debug.c @@ -255,14 +255,14 @@ void erts_check_stack(Process *p) Eterm *stack_end = p->htop; if (p->stop > stack_start) - erl_exit(1, + erts_exit(ERTS_ERROR_EXIT, "<%lu.%lu.%lu>: Stack underflow\n", internal_pid_channel_no(p->common.id), internal_pid_number(p->common.id), internal_pid_serial(p->common.id)); if (p->stop < stack_end) - erl_exit(1, + erts_exit(ERTS_ERROR_EXIT, "<%lu.%lu.%lu>: Stack overflow\n", internal_pid_channel_no(p->common.id), internal_pid_number(p->common.id), @@ -287,7 +287,7 @@ void erts_check_stack(Process *p) if (in_mbuf) continue; - erl_exit(1, + erts_exit(ERTS_ERROR_EXIT, "<%lu.%lu.%lu>: Wild stack pointer\n", internal_pid_channel_no(p->common.id), internal_pid_number(p->common.id), @@ -372,7 +372,7 @@ void erts_check_memory(Process *p, Eterm *start, Eterm *end) #ifdef DEBUG if (hval == DEBUG_BAD_WORD) { print_untagged_memory(start, end); - erl_exit(1, "Uninitialized HAlloc'ed memory found @ 0x%0*lx!\n", + erts_exit(ERTS_ERROR_EXIT, "Uninitialized HAlloc'ed memory found @ 0x%0*lx!\n", PTR_SIZE,(unsigned long)(pos - 1)); } #endif @@ -385,7 +385,7 @@ void erts_check_memory(Process *p, Eterm *start, Eterm *end) if (verify_eterm(p,hval)) continue; - erl_exit(1, "Wild pointer found @ 0x%0*lx!\n", + erts_exit(ERTS_ERROR_EXIT, "Wild pointer found @ 0x%0*lx!\n", PTR_SIZE,(unsigned long)(pos - 1)); } } @@ -395,11 +395,11 @@ void verify_process(Process *p) #define VERIFY_AREA(name,ptr,sz) { \ int n = (sz); \ while (n--) if(!verify_eterm(p,*(ptr+n))) \ - erl_exit(1,"Wild pointer found in " name " of %T!\n",p->common.id); } + erts_exit(ERTS_ERROR_EXIT,"Wild pointer found in " name " of %T!\n",p->common.id); } #define VERIFY_ETERM(name,eterm) { \ if(!verify_eterm(p,eterm)) \ - erl_exit(1,"Wild pointer found in " name " of %T!\n",p->common.id); } + erts_exit(ERTS_ERROR_EXIT,"Wild pointer found in " name " of %T!\n",p->common.id); } ErlMessage* mp = p->msg.first; diff --git a/erts/emulator/beam/erl_drv_thread.c b/erts/emulator/beam/erl_drv_thread.c index e0404eb5c9..184f8e8931 100644 --- a/erts/emulator/beam/erl_drv_thread.c +++ b/erts/emulator/beam/erl_drv_thread.c @@ -43,7 +43,7 @@ fatal_error(int err, char *func) else estr = "Unknown error"; } - erl_exit(ERTS_ABORT_EXIT, "Fatal error in %s: %s [%d]\n", func, estr, err); + erts_exit(ERTS_ABORT_EXIT, "Fatal error in %s: %s [%d]\n", func, estr, err); } #define ERL_DRV_TSD_KEYS_INC 10 diff --git a/erts/emulator/beam/erl_fun.c b/erts/emulator/beam/erl_fun.c index 4268e2d40a..2f13aa364f 100644 --- a/erts/emulator/beam/erl_fun.c +++ b/erts/emulator/beam/erl_fun.c @@ -185,7 +185,7 @@ erts_erase_fun_entry(ErlFunEntry* fe) #endif { if (fe->address != unloaded_fun) - erl_exit(1, + erts_exit(ERTS_ERROR_EXIT, "Internal error: " "Invalid reference count found on #Fun<%T.%d.%d>: " " About to erase fun still referred by code.\n", diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c index 2f21111a2e..f48c46ca33 100644 --- a/erts/emulator/beam/erl_gc.c +++ b/erts/emulator/beam/erl_gc.c @@ -59,7 +59,7 @@ erts_fprintf(stderr, "stop=%p\n", (p)->stop); \ erts_fprintf(stderr, "htop=%p\n", (p)->htop); \ erts_fprintf(stderr, "heap=%p\n", (p)->heap); \ - erl_exit(ERTS_ABORT_EXIT, "%s, line %d: %T: Overrun stack and heap\n", \ + erts_exit(ERTS_ABORT_EXIT, "%s, line %d: %T: Overrun stack and heap\n", \ __FILE__,__LINE__,(P)->common.id); \ } @@ -268,7 +268,7 @@ erts_next_heap_size(Uint size, Uint offset) low = mid + 1; } } - erl_exit(1, "no next heap size found: %beu, offset %beu\n", size, offset); + erts_exit(ERTS_ERROR_EXIT, "no next heap size found: %beu, offset %beu\n", size, offset); } return 0; } @@ -2788,7 +2788,7 @@ within(Eterm *ptr, Process *p) #define ERTS_CHK_OFFHEAP_ASSERT(EXP) \ do { \ if (!(EXP)) \ - erl_exit(ERTS_ABORT_EXIT, \ + erts_exit(ERTS_ABORT_EXIT, \ "%s:%d: Assertion failed: %s\n", \ __FILE__, __LINE__, #EXP); \ } while (0) diff --git a/erts/emulator/beam/erl_goodfit_alloc.c b/erts/emulator/beam/erl_goodfit_alloc.c index f89f8723d9..9b4aad9d91 100644 --- a/erts/emulator/beam/erl_goodfit_alloc.c +++ b/erts/emulator/beam/erl_goodfit_alloc.c @@ -571,8 +571,8 @@ info_options(Allctr_t *allctr, if (hpp || szp) { if (!atoms_initialized) - erl_exit(1, "%s:%d: Internal error: Atoms not initialized", - __FILE__, __LINE__);; + erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error: Atoms not initialized", + __FILE__, __LINE__); res = NIL; add_2tup(hpp, szp, &res, am.as, am.gf); diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index d9c3b0dcf4..e729574ec7 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -269,7 +269,7 @@ this_rel_num(void) i++; this_rel = atoi(&this_rel_str[i]); if (this_rel < 1) - erl_exit(-1, "Unexpected ERLANG_OTP_RELEASE format\n"); + erts_exit(1, "Unexpected ERLANG_OTP_RELEASE format\n"); } return this_rel; } @@ -415,7 +415,7 @@ erl_first_process_otp(char* modname, void* code, unsigned size, int argc, char** start_mod = erts_atom_put((byte *) modname, sys_strlen(modname), ERTS_ATOM_ENC_LATIN1, 1); if (erts_find_function(start_mod, am_start, 2, erts_active_code_ix()) == NULL) { - erl_exit(5, "No function %s:start/2\n", modname); + erts_exit(ERTS_ERROR_EXIT, "No function %s:start/2\n", modname); } /* @@ -512,12 +512,12 @@ load_preloaded(void) length = preload_p[i].size; module_name = erts_atom_put((byte *) name, sys_strlen(name), ERTS_ATOM_ENC_LATIN1, 1); if ((code = sys_preload_begin(&preload_p[i])) == 0) - erl_exit(1, "Failed to find preloaded code for module %s\n", + erts_exit(ERTS_ERROR_EXIT, "Failed to find preloaded code for module %s\n", name); res = erts_preload_module(NULL, 0, NIL, &module_name, code, length); sys_preload_end(&preload_p[i]); if (res != NIL) - erl_exit(1,"Failed loading preloaded module %s (%T)\n", + erts_exit(ERTS_ERROR_EXIT,"Failed loading preloaded module %s (%T)\n", name, res); i++; } @@ -648,7 +648,7 @@ void erts_usage(void) erts_fprintf(stderr, "Note that if the emulator is started with erlexec (typically\n"); erts_fprintf(stderr, "from the erl script), these flags should be specified with +.\n"); erts_fprintf(stderr, "\n\n"); - erl_exit(-1, ""); + erts_exit(1, ""); } #ifdef USE_THREADS @@ -1445,7 +1445,7 @@ erl_start(int argc, char **argv) } erts_fprintf(stderr, "(" EMULATOR ") emulator version " ERLANG_VERSION "\n"); - erl_exit(0, ""); + erts_exit(0, ""); } break; @@ -2247,23 +2247,17 @@ system_cleanup(int flush_async) } static __decl_noreturn void __noreturn -erl_exit_vv(int n, int flush_async, char *fmt, va_list args1, va_list args2) +erts_exit_vv(int n, int flush_async, char *fmt, va_list args1, va_list args2) { - unsigned int an; - system_cleanup(flush_async); save_statistics(); - if (n < 0) - an = -(unsigned int)n; - else - an = n; if (erts_mtrace_enabled) - erts_mtrace_exit((Uint32) an); + erts_mtrace_exit((Uint32) n); /* Produce an Erlang core dump if error */ - if (((n > 0 && erts_no_crash_dump == 0) || n == ERTS_DUMP_EXIT) + if (((n == ERTS_ERROR_EXIT && erts_no_crash_dump == 0) || n == ERTS_DUMP_EXIT) && erts_initialized) { erl_crash_dump_v((char*) NULL, 0, fmt, args1); } @@ -2276,29 +2270,29 @@ erl_exit_vv(int n, int flush_async, char *fmt, va_list args1, va_list args2) exit(0); else if (n == ERTS_DUMP_EXIT) ERTS_EXIT_AFTER_DUMP(1); - else if (n > 0 || n == ERTS_ABORT_EXIT) + else if (n == ERTS_ERROR_EXIT || n == ERTS_ABORT_EXIT) abort(); - exit(an); + exit(n); } /* Exit without flushing async threads */ -__decl_noreturn void __noreturn erl_exit(int n, char *fmt, ...) +__decl_noreturn void __noreturn erts_exit(int n, char *fmt, ...) { va_list args1, args2; va_start(args1, fmt); va_start(args2, fmt); - erl_exit_vv(n, 0, fmt, args1, args2); + erts_exit_vv(n, 0, fmt, args1, args2); va_end(args2); va_end(args1); } /* Exit after flushing async threads */ -__decl_noreturn void __noreturn erl_exit_flush_async(int n, char *fmt, ...) +__decl_noreturn void __noreturn erts_flush_async_exit(int n, char *fmt, ...) { va_list args1, args2; va_start(args1, fmt); va_start(args2, fmt); - erl_exit_vv(n, 1, fmt, args1, args2); + erts_exit_vv(n, 1, fmt, args1, args2); va_end(args2); va_end(args1); } diff --git a/erts/emulator/beam/erl_map.c b/erts/emulator/beam/erl_map.c index ff2a355309..3c066cea7b 100644 --- a/erts/emulator/beam/erl_map.c +++ b/erts/emulator/beam/erl_map.c @@ -1274,7 +1274,7 @@ recurse: break; } default: - erl_exit(ERTS_ABORT_EXIT, "bad header %ld\r\n", hdrA); + erts_exit(ERTS_ABORT_EXIT, "bad header %ld\r\n", hdrA); } } @@ -1301,7 +1301,7 @@ recurse: break; } default: - erl_exit(ERTS_ABORT_EXIT, "bad header %ld\r\n", hdrB); + erts_exit(ERTS_ABORT_EXIT, "bad header %ld\r\n", hdrB); } } } @@ -1391,7 +1391,7 @@ resume_from_trap: res = make_boxed(nhp); break; default: - erl_exit(ERTS_ABORT_EXIT, "strange mix %d\r\n", sp->mix); + erts_exit(ERTS_ABORT_EXIT, "strange mix %d\r\n", sp->mix); } } @@ -1886,7 +1886,7 @@ void hashmap_iterator_init(ErtsWStack* s, Eterm node, int reverse) { sz = hashmap_bitcount(MAP_HEADER_VAL(hdr)); break; default: - erl_exit(ERTS_ABORT_EXIT, "bad header"); + erts_exit(ERTS_ABORT_EXIT, "bad header"); } WSTACK_PUSH3((*s), (UWord)THE_NON_VALUE, /* end marker */ @@ -1923,7 +1923,7 @@ Eterm* hashmap_iterator_next(ErtsWStack* s) { ASSERT(sz < 17); break; default: - erl_exit(ERTS_ABORT_EXIT, "bad header"); + erts_exit(ERTS_ABORT_EXIT, "bad header"); } idx++; @@ -1973,7 +1973,7 @@ Eterm* hashmap_iterator_prev(ErtsWStack* s) { ASSERT(sz < 17); break; default: - erl_exit(1, "bad header"); + erts_exit(ERTS_ERROR_EXIT, "bad header"); } if (idx > sz) @@ -2161,12 +2161,12 @@ int erts_hashmap_insert_down(Uint32 hx, Eterm key, Eterm node, Uint *sz, size += HAMT_HEAD_BITMAP_SZ(n+1); goto unroll; default: - erl_exit(1, "bad header tag %ld\r\n", hdr & _HEADER_MAP_SUBTAG_MASK); + erts_exit(ERTS_ERROR_EXIT, "bad header tag %ld\r\n", hdr & _HEADER_MAP_SUBTAG_MASK); break; } break; default: - erl_exit(1, "bad primary tag %p\r\n", node); + erts_exit(ERTS_ERROR_EXIT, "bad primary tag %p\r\n", node); break; } } @@ -2281,12 +2281,12 @@ Eterm erts_hashmap_insert_up(Eterm *hp, Eterm key, Eterm value, res = make_hashmap(nhp); break; default: - erl_exit(1, "bad header tag %x\r\n", hdr & _HEADER_MAP_SUBTAG_MASK); + erts_exit(ERTS_ERROR_EXIT, "bad header tag %x\r\n", hdr & _HEADER_MAP_SUBTAG_MASK); break; } break; default: - erl_exit(1, "bad primary tag %x\r\n", primary_tag(node)); + erts_exit(ERTS_ERROR_EXIT, "bad primary tag %x\r\n", primary_tag(node)); break; } @@ -2404,12 +2404,12 @@ static Eterm hashmap_delete(Process *p, Uint32 hx, Eterm key, Eterm map) { /* not occupied */ goto not_found; default: - erl_exit(1, "bad header tag %ld\r\n", hdr & _HEADER_MAP_SUBTAG_MASK); + erts_exit(ERTS_ERROR_EXIT, "bad header tag %ld\r\n", hdr & _HEADER_MAP_SUBTAG_MASK); break; } break; default: - erl_exit(1, "bad primary tag %p\r\n", node); + erts_exit(ERTS_ERROR_EXIT, "bad primary tag %p\r\n", node); break; } } @@ -2586,7 +2586,7 @@ unroll: res = make_hashmap(nhp); break; default: - erl_exit(1, "bad header tag %x\r\n", hdr & _HEADER_MAP_SUBTAG_MASK); + erts_exit(ERTS_ERROR_EXIT, "bad header tag %x\r\n", hdr & _HEADER_MAP_SUBTAG_MASK); break; } } while(!ESTACK_ISEMPTY(stack)); @@ -2727,7 +2727,7 @@ BIF_RETTYPE erts_internal_map_type_1(BIF_ALIST_1) { case HAMT_SUBTAG_NODE_BITMAP: BIF_RET(AM_hashmap_node); default: - erl_exit(1, "bad header"); + erts_exit(ERTS_ERROR_EXIT, "bad header"); } } BIF_P->fvalue = BIF_ARG_1; @@ -2763,7 +2763,7 @@ BIF_RETTYPE erts_internal_map_hashmap_children_1(BIF_ALIST_1) { ptr += 2; break; default: - erl_exit(1, "bad header\r\n"); + erts_exit(ERTS_ERROR_EXIT, "bad header\r\n"); break; } ASSERT(sz < 17); @@ -2841,7 +2841,7 @@ static Eterm hashmap_info(Process *p, Eterm node) { } break; default: - erl_exit(1, "bad header\r\n"); + erts_exit(ERTS_ERROR_EXIT, "bad header\r\n"); break; } } diff --git a/erts/emulator/beam/erl_monitors.c b/erts/emulator/beam/erl_monitors.c index 7dfa01c8ac..bd899fa2f9 100644 --- a/erts/emulator/beam/erl_monitors.c +++ b/erts/emulator/beam/erl_monitors.c @@ -356,7 +356,7 @@ void erts_add_monitor(ErtsMonitor **root, Uint type, Eterm ref, Eterm pid, tstack[tpos++] = this; this = &((*this)->right); } else { /* Equal key is an error for monitors */ - erl_exit(1,"Insertion of already present monitor!"); + erts_exit(ERTS_ERROR_EXIT,"Insertion of already present monitor!"); break; } } diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index 3141b05e2b..1097916c97 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -330,7 +330,7 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid, #ifdef ERTS_SMP c_p = NULL; #else - erl_exit(ERTS_ABORT_EXIT,"enif_send: env==NULL on non-SMP VM"); + erts_exit(ERTS_ABORT_EXIT,"enif_send: env==NULL on non-SMP VM"); #endif } diff --git a/erts/emulator/beam/erl_node_tables.c b/erts/emulator/beam/erl_node_tables.c index 707de39556..e69bd49c42 100644 --- a/erts/emulator/beam/erl_node_tables.c +++ b/erts/emulator/beam/erl_node_tables.c @@ -1050,7 +1050,7 @@ insert_dist_entry(DistEntry *dist, int type, Eterm id, Uint creation) } if(!rdp) - erl_exit(1, + erts_exit(ERTS_ERROR_EXIT, "Reference to non-existing distribution table entry found!\n"); insert_dist_referrer(rdp, type, id, creation); @@ -1111,7 +1111,7 @@ insert_node(ErlNode *node, int type, Eterm id) } if (!rnp) - erl_exit(1, "Reference to non-existing node table entry found!\n"); + erts_exit(ERTS_ERROR_EXIT, "Reference to non-existing node table entry found!\n"); insert_node_referrer(rnp, type, id); } diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c index 5c38db1cbc..ddcca06b0a 100644 --- a/erts/emulator/beam/erl_port_task.c +++ b/erts/emulator/beam/erl_port_task.c @@ -1784,7 +1784,7 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp) reds = erts_dist_command(pp, CONTEXT_REDS - pp->reds); break; default: - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Invalid port task type: %d\n", (int) ptp->type); break; @@ -2048,7 +2048,7 @@ begin_port_cleanup(Port *pp, ErtsPortTask **execqp, int *processing_busy_q_p) break; } default: - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Invalid port task type: %d\n", (int) ptp->type); } diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index b24f26138c..c2afcc9c4f 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -516,7 +516,7 @@ dbg_chk_aux_work_val(erts_aint32_t value) valid |= ERTS_SSI_AUX_WORK_DEBUG_WAIT_COMPLETED; if (~valid & value) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Invalid aux_work value found: 0x%x\n", ~valid & value); } @@ -967,11 +967,25 @@ typedef struct { erts_smp_atomic32_t refc; } ErtsSchedWallTimeReq; +typedef struct { + Process *proc; + Eterm ref; + Eterm ref_heap[REF_THING_SIZE]; + Uint req_sched; + erts_smp_atomic32_t refc; +} ErtsSystemCheckReq; + + #if !HALFWORD_HEAP ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(swtreq, ErtsSchedWallTimeReq, 5, ERTS_ALC_T_SCHED_WTIME_REQ) + +ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(screq, + ErtsSystemCheckReq, + 5, + ERTS_ALC_T_SYS_CHECK_REQ) #else static ERTS_INLINE ErtsSchedWallTimeReq * swtreq_alloc(void) @@ -985,6 +999,19 @@ swtreq_free(ErtsSchedWallTimeReq *ptr) { erts_free(ERTS_ALC_T_SCHED_WTIME_REQ, ptr); } + +static ERTS_INLINE ErtsSystemCheckReq * +screq_alloc(void) +{ + return erts_alloc(ERTS_ALC_T_SYS_CHECK_REQ, + sizeof(ErtsSystemCheckReq)); +} + +static ERTS_INLINE void +screq_free(ErtsSystemCheckReq *ptr) +{ + erts_free(ERTS_ALC_T_SYS_CHECK_REQ, ptr); +} #endif static void @@ -1118,6 +1145,75 @@ erts_sched_wall_time_request(Process *c_p, int set, int enable) return ref; } +static void +reply_system_check(void *vscrp) +{ + ErtsSchedulerData *esdp = erts_get_scheduler_data(); + ErtsSystemCheckReq *scrp = (ErtsSystemCheckReq *) vscrp; + ErtsProcLocks rp_locks = (scrp->req_sched == esdp->no ? ERTS_PROC_LOCK_MAIN : 0); + Process *rp = scrp->proc; + Eterm msg; + Eterm *hp = NULL; + Eterm **hpp; + Uint sz; + ErlOffHeap *ohp = NULL; + ErlHeapFragment *bp = NULL; + + ASSERT(esdp); +#ifdef ERTS_DIRTY_SCHEDULERS + ASSERT(!ERTS_SCHEDULER_IS_DIRTY(esdp)); +#endif + + sz = REF_THING_SIZE; + hp = erts_alloc_message_heap(sz, &bp, &ohp, rp, &rp_locks); + hpp = &hp; + msg = STORE_NC(hpp, ohp, scrp->ref); + + erts_queue_message(rp, &rp_locks, bp, msg, NIL); + + if (scrp->req_sched == esdp->no) + rp_locks &= ~ERTS_PROC_LOCK_MAIN; + + if (rp_locks) + erts_smp_proc_unlock(rp, rp_locks); + + erts_proc_dec_refc(rp); + + if (erts_smp_atomic32_dec_read_nob(&scrp->refc) == 0) + screq_free(vscrp); +} + + +Eterm erts_system_check_request(Process *c_p) { + ErtsSchedulerData *esdp = ERTS_PROC_GET_SCHDATA(c_p); + Eterm ref; + ErtsSystemCheckReq *scrp; + Eterm *hp; + + scrp = screq_alloc(); + ref = erts_make_ref(c_p); + hp = &scrp->ref_heap[0]; + + scrp->proc = c_p; + scrp->ref = STORE_NC(&hp, NULL, ref); + scrp->req_sched = esdp->no; + erts_smp_atomic32_init_nob(&scrp->refc, (erts_aint32_t) erts_no_schedulers); + + erts_proc_add_refc(c_p, (Sint) erts_no_schedulers); + +#ifdef ERTS_SMP + if (erts_no_schedulers > 1) + erts_schedule_multi_misc_aux_work(1, + erts_no_schedulers, + reply_system_check, + (void *) scrp); +#endif + + reply_system_check((void *) scrp); + + return ref; +} + static ERTS_INLINE ErtsProcList * proclist_create(Process *p) { @@ -1212,7 +1308,7 @@ erts_sched_finish_poke(ErtsSchedulerSleepInfo *ssi, erts_aint32_t flags) case 0: break; default: - erl_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error\n", + erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error\n", __FILE__, __LINE__); break; } @@ -2196,7 +2292,7 @@ handle_reap_ports(ErtsAuxWorkData *awdp, erts_aint32_t aux_work, int waiting) erts_port_release(prt); } if (erts_smp_atomic32_dec_read_nob(&erts_halt_progress) == 0) { - erl_exit_flush_async(erts_halt_code, ""); + erts_flush_async_exit(erts_halt_code, ""); } } return aux_work & ~ERTS_SSI_AUX_WORK_REAP_PORTS; @@ -3715,7 +3811,7 @@ immigrate(ErtsRunQueue *c_rq, ErtsMigrationPath *mp) prio = ERTS_PORT_PRIO_LEVEL; break; default: - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s:%d:%s(): Invalid immigrate queue mask", __FILE__, __LINE__, __func__); prio = 0; @@ -3739,7 +3835,7 @@ immigrate(ErtsRunQueue *c_rq, ErtsMigrationPath *mp) rq = erts_port_runq(prt); if (rq) { if (rq != c_rq) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s:%d:%s(): Internal error", __FILE__, __LINE__, __func__); erts_enqueue_port(c_rq, prt); @@ -3930,7 +4026,7 @@ evacuate_run_queue(ErtsRunQueue *rq, prt_rq = erts_port_runq(prt); if (prt_rq) { if (prt_rq != to_rq) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s:%d:%s() internal error\n", __FILE__, __LINE__, __func__); erts_enqueue_port(to_rq, prt); @@ -4131,7 +4227,7 @@ no_procs: return 0; else { if (prt_rq != rq) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s:%d:%s() internal error\n", __FILE__, __LINE__, __func__); *rq_lockedp = 1; @@ -5792,6 +5888,7 @@ erts_init_scheduling(int no_schedulers, int no_schedulers_online init_misc_aux_work(); #if !HALFWORD_HEAP init_swtreq_alloc(); + init_screq_alloc(); #endif erts_atomic32_init_nob(&debug_wait_completed_count, 0); /* debug only */ @@ -6462,9 +6559,6 @@ suspend_process(Process *c_p, Process *p) if (suspended) { - ASSERT(!(ERTS_PSFLG_RUNNING & state) - || p == erts_get_current_process()); - if (suspended > 0 && erts_system_profile_flags.runnable_procs) { /* 'state' is before our change... */ @@ -8023,7 +8117,7 @@ sched_thread_func(void *vesdp) process_main(); /* No schedulers should *ever* terminate */ - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Scheduler thread number %beu terminated\n", no); return NULL; @@ -8088,7 +8182,7 @@ sched_dirty_cpu_thread_func(void *vesdp) process_main(); /* No schedulers should *ever* terminate */ - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Dirty CPU scheduler thread number %beu terminated\n", no); return NULL; @@ -8151,7 +8245,7 @@ sched_dirty_io_thread_func(void *vesdp) process_main(); /* No schedulers should *ever* terminate */ - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Dirty I/O scheduler thread number %beu terminated\n", no); return NULL; @@ -8181,12 +8275,12 @@ erts_start_schedulers(void) erts_snprintf(opts.name, 16, "runq_supervisor"); erts_atomic_init_nob(&runq_supervisor_sleeping, 0); if (0 != ethr_event_init(&runq_supervision_event)) - erl_exit(1, "Failed to create run-queue supervision event\n"); + erts_exit(ERTS_ERROR_EXIT, "Failed to create run-queue supervision event\n"); if (0 != ethr_thr_create(&runq_supervisor_tid, runq_supervisor, NULL, &opts)) - erl_exit(1, "Failed to create run-queue supervision thread\n"); + erts_exit(ERTS_ERROR_EXIT, "Failed to create run-queue supervision thread\n"); } #endif @@ -8230,14 +8324,14 @@ erts_start_schedulers(void) erts_snprintf(opts.name, 16, "%d_dirty_cpu_scheduler", ix + 1); res = ethr_thr_create(&esdp->tid,sched_dirty_cpu_thread_func,(void*)esdp,&opts); if (res != 0) - erl_exit(1, "Failed to create dirty cpu scheduler thread %d\n", ix); + erts_exit(ERTS_ERROR_EXIT, "Failed to create dirty cpu scheduler thread %d\n", ix); } for (ix = 0; ix < erts_no_dirty_io_schedulers; ix++) { ErtsSchedulerData *esdp = ERTS_DIRTY_IO_SCHEDULER_IX(ix); erts_snprintf(opts.name, 16, "%d_dirty_io_scheduler", ix + 1); res = ethr_thr_create(&esdp->tid,sched_dirty_io_thread_func,(void*)esdp,&opts); if (res != 0) - erl_exit(1, "Failed to create dirty io scheduler thread %d\n", ix); + erts_exit(ERTS_ERROR_EXIT, "Failed to create dirty io scheduler thread %d\n", ix); } } #endif @@ -8253,10 +8347,10 @@ erts_start_schedulers(void) res = ethr_thr_create(&aux_tid, aux_thread, NULL, &opts); if (res != 0) - erl_exit(1, "Failed to create aux thread\n"); + erts_exit(ERTS_ERROR_EXIT, "Failed to create aux thread\n"); if (actual < 1) - erl_exit(1, + erts_exit(ERTS_ERROR_EXIT, "Failed to create any scheduler-threads: %s (%d)\n", erl_errno_id(res), res); @@ -8411,9 +8505,8 @@ pid2proc_not_running(Process *c_p, ErtsProcLocks c_p_locks, resume_process(rp, rp_locks); } else { - rp = erts_pid2proc(c_p, c_p_locks|ERTS_PROC_LOCK_STATUS, - pid, pid_locks|ERTS_PROC_LOCK_STATUS); + pid, ERTS_PROC_LOCK_STATUS); if (!rp) { c_p->flags &= ~F_P2PNR_RESCHED; @@ -8422,40 +8515,84 @@ pid2proc_not_running(Process *c_p, ErtsProcLocks c_p_locks, ASSERT(!(c_p->flags & F_P2PNR_RESCHED)); - if (suspend) { - if (suspend_process(c_p, rp)) - goto done; - } - else { - if (!((ERTS_PSFLG_RUNNING|ERTS_PSFLG_RUNNING_SYS) - & erts_smp_atomic32_read_acqb(&rp->state))) - goto done; + /* + * Suspend the other process in order to prevent + * it from being selected for normal execution. + * This will however not prevent it from being + * selected for execution of a system task. If + * it is selected for execution of a system task + * we might be blocked for quite a while if the + * try-lock below fails. That is, there is room + * for improvement here... + */ - } + if (!suspend_process(c_p, rp)) { + /* Other process running */ - /* Other process running */ + ASSERT(ERTS_PSFLG_RUNNING + & erts_smp_atomic32_read_nob(&rp->state)); - /* - * If we got pending suspenders and suspend ourselves waiting - * to suspend another process we might deadlock. - * In this case we have to yield, be suspended by - * someone else and then do it all over again. - */ - if (!c_p->pending_suspenders) { - /* Mark rp pending for suspend by c_p */ - add_pend_suspend(rp, c_p->common.id, handle_pend_sync_suspend); - ASSERT(is_nil(c_p->suspendee)); + running: - /* Suspend c_p; when rp is suspended c_p will be resumed. */ - suspend_process(c_p, c_p); - c_p->flags |= F_P2PNR_RESCHED; + /* + * If we got pending suspenders and suspend ourselves waiting + * to suspend another process we might deadlock. + * In this case we have to yield, be suspended by + * someone else and then do it all over again. + */ + if (!c_p->pending_suspenders) { + /* Mark rp pending for suspend by c_p */ + add_pend_suspend(rp, c_p->common.id, handle_pend_sync_suspend); + ASSERT(is_nil(c_p->suspendee)); + + /* Suspend c_p; when rp is suspended c_p will be resumed. */ + suspend_process(c_p, c_p); + c_p->flags |= F_P2PNR_RESCHED; + } + /* Yield (caller is assumed to yield immediately in bif). */ + erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_STATUS); + rp = ERTS_PROC_LOCK_BUSY; + } + else { + ErtsProcLocks need_locks = pid_locks & ~ERTS_PROC_LOCK_STATUS; + if (need_locks && erts_smp_proc_trylock(rp, need_locks) == EBUSY) { + if (ERTS_PSFLG_RUNNING_SYS + & erts_smp_atomic32_read_nob(&rp->state)) { + /* Executing system task... */ + resume_process(rp, ERTS_PROC_LOCK_STATUS); + goto running; + } + erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_STATUS); + /* + * If we are unlucky, the process just got selected for + * execution of a system task. In this case we may be + * blocked here for quite a while... Execution of system + * tasks are fortunately quite rare events. We try to + * avoid this by checking if it is in a state executing + * system tasks (above), but it will not prevent all + * scenarios for a long block here... + */ + rp = erts_pid2proc(c_p, c_p_locks|ERTS_PROC_LOCK_STATUS, + pid, pid_locks|ERTS_PROC_LOCK_STATUS); + if (!rp) + goto done; + } + + /* + * The previous suspend has prevented the process + * from being selected for normal execution regardless + * of locks held or not held on it... + */ + ASSERT(!(ERTS_PSFLG_RUNNING + & erts_smp_atomic32_read_nob(&rp->state))); + + if (!suspend) + resume_process(rp, pid_locks|ERTS_PROC_LOCK_STATUS); } - /* Yield (caller is assumed to yield immediately in bif). */ - erts_smp_proc_unlock(rp, pid_locks|ERTS_PROC_LOCK_STATUS); - rp = ERTS_PROC_LOCK_BUSY; } done: + if (rp && rp != ERTS_PROC_LOCK_BUSY && !(pid_locks & ERTS_PROC_LOCK_STATUS)) erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_STATUS); if (unlock_c_p_status) @@ -12115,7 +12252,7 @@ static void doit_exit_link(ErtsLink *lnk, void *vpcontext) break; default: - erl_exit(1, "bad type in link list\n"); + erts_exit(ERTS_ERROR_EXIT, "bad type in link list\n"); break; } erts_destroy_link(lnk); @@ -12156,7 +12293,7 @@ erts_do_exit_process(Process* p, Eterm reason) #endif if (p->static_flags & ERTS_STC_FLG_SYSTEM_PROC) - erl_exit(ERTS_DUMP_EXIT, "System process %T terminated: %T\n", + erts_exit(ERTS_DUMP_EXIT, "System process %T terminated: %T\n", p->common.id, reason); #ifdef ERTS_SMP @@ -12274,7 +12411,7 @@ erts_continue_exit_process(Process *p) break; case ERTS_SCHDLR_SSPND_EINVAL: default: - erl_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error: %d\n", + erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error: %d\n", __FILE__, __LINE__, (int) ssr); } } @@ -12771,10 +12908,10 @@ erts_print_scheduler_info(int to, void *to_arg, ErtsSchedulerData *esdp) { * The same global atomic is used as refcount. * * A BIF that calls this should make sure to schedule out to never come back: - * erl_halt((int)(- code)); + * erts_halt(code); * ERTS_BIF_YIELD1(bif_export[BIF_erlang_halt_1], BIF_P, NIL); */ -void erl_halt(int code) +void erts_halt(int code) { if (-1 == erts_smp_atomic32_cmpxchg_acqb(&erts_halt_progress, erts_no_schedulers, diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 799e49005c..b536426b0f 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -1187,7 +1187,7 @@ void erts_check_for_holes(Process* p); #define ERTS_PSFLGS_GET_USR_PRIO(PSFLGS) \ (((PSFLGS) >> ERTS_PSFLGS_USR_PRIO_OFFSET) & ERTS_PSFLGS_PRIO_MASK) #define ERTS_PSFLGS_GET_PRQ_PRIO(PSFLGS) \ - (((PSFLGS) >> ERTS_PSFLGS_USR_PRIO_OFFSET) & ERTS_PSFLGS_PRIO_MASK) + (((PSFLGS) >> ERTS_PSFLGS_PRQ_PRIO_OFFSET) & ERTS_PSFLGS_PRIO_MASK) /* * Static flags that do not change after process creation. @@ -1483,6 +1483,7 @@ void erts_init_scheduling(int, int int erts_set_gc_state(Process *c_p, int enable); Eterm erts_sched_wall_time_request(Process *c_p, int set, int enable); +Eterm erts_system_check_request(Process *c_p); Eterm erts_gc_info_request(Process *c_p); Uint64 erts_get_proc_interval(void); Uint64 erts_ensure_later_proc_interval(Uint64); @@ -2350,6 +2351,6 @@ erts_sched_poke(ErtsSchedulerSleepInfo *ssi) #endif -void erl_halt(int code); +void erts_halt(int code); extern erts_smp_atomic32_t erts_halt_progress; extern int erts_halt_code; diff --git a/erts/emulator/beam/erl_process_dict.c b/erts/emulator/beam/erl_process_dict.c index 8606371bdf..3253ee6b70 100644 --- a/erts/emulator/beam/erl_process_dict.c +++ b/erts/emulator/beam/erl_process_dict.c @@ -374,7 +374,7 @@ static void pd_hash_erase(Process *p, Eterm id, Eterm *ret) "display term found in line %d:\n" "%T\n", p->common.id, __LINE__, old); #endif - erl_exit(1, "Damaged process dictionary found during erase/1."); + erts_exit(ERTS_ERROR_EXIT, "Damaged process dictionary found during erase/1."); } if ((range = HASH_RANGE(p->dictionary)) > INITIAL_SIZE && range / 2 > (p->dictionary->numElements)) { @@ -419,7 +419,7 @@ Eterm erts_pd_hash_get(Process *p, Eterm id) "display term found in line %d:\n" "%T\n", p->common.id, __LINE__, tmp); #endif - erl_exit(1, "Damaged process dictionary found during get/1."); + erts_exit(ERTS_ERROR_EXIT, "Damaged process dictionary found during get/1."); } return am_undefined; } @@ -670,7 +670,7 @@ static Eterm pd_hash_put(Process *p, Eterm id, Eterm value) "%T\n", p->common.id, __LINE__, old); #endif - erl_exit(1, "Damaged process dictionary found during put/2."); + erts_exit(ERTS_ERROR_EXIT, "Damaged process dictionary found during put/2."); } if (HASH_RANGE(p->dictionary) <= p->dictionary->numElements) { grow(p); @@ -1024,7 +1024,7 @@ static void pd_check(ProcDict *pd) } continue; } else { - erl_exit(1, + erts_exit(ERTS_ERROR_EXIT, "Found tag 0x%08x in process dictionary at position %d", (unsigned long) t, (int) i); } diff --git a/erts/emulator/beam/erl_process_lock.h b/erts/emulator/beam/erl_process_lock.h index a64c993e8f..9c59301086 100644 --- a/erts/emulator/beam/erl_process_lock.h +++ b/erts/emulator/beam/erl_process_lock.h @@ -523,6 +523,10 @@ erts_smp_proc_lock__(Process *p, ERTS_LC_ASSERT((locks & ~ERTS_PROC_LOCKS_ALL) == 0); +#ifdef ERTS_ENABLE_LOCK_CHECK + erts_proc_lc_lock(p, locks, file, line); +#endif + old_lflgs = erts_smp_proc_raw_trylock__(p, locks); if (old_lflgs != 0) { @@ -544,9 +548,6 @@ erts_smp_proc_lock__(Process *p, #ifdef ERTS_ENABLE_LOCK_COUNT erts_lcnt_proc_lock_post_x(&(p->lock), locks, file, line); #endif -#ifdef ERTS_ENABLE_LOCK_CHECK - erts_proc_lc_lock(p, locks, file, line); -#endif #ifdef ERTS_PROC_LOCK_DEBUG erts_proc_lock_op_debug(p, locks, 1); diff --git a/erts/emulator/beam/erl_ptab.c b/erts/emulator/beam/erl_ptab.c index f7997df051..9ed175fe01 100644 --- a/erts/emulator/beam/erl_ptab.c +++ b/erts/emulator/beam/erl_ptab.c @@ -1255,7 +1255,7 @@ ptab_list_bif_engine(Process *c_p, Eterm *res_accp, Binary *mbp) return 1; default: - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s:%d:ptab_list_bif_engine(): Invalid state: %d\n", __FILE__, __LINE__, (int) ptlbdp->state); } diff --git a/erts/emulator/beam/erl_term.c b/erts/emulator/beam/erl_term.c index e5050bfaa5..bae3385d3f 100644 --- a/erts/emulator/beam/erl_term.c +++ b/erts/emulator/beam/erl_term.c @@ -41,7 +41,7 @@ et_abort(const char *expr, const char *file, unsigned line) * Prevent infinite loop. */ have_been_called = 1; - erl_exit(1, "TYPE ASSERTION FAILED, file %s, line %u: %s\n", file, line, expr); + erts_exit(ERTS_ERROR_EXIT, "TYPE ASSERTION FAILED, file %s, line %u: %s\n", file, line, expr); } #else erts_fprintf(stderr, "TYPE ASSERTION FAILED, file %s, line %u: %s\n", file, line, expr); diff --git a/erts/emulator/beam/erl_thr_progress.c b/erts/emulator/beam/erl_thr_progress.c index 7148b756e7..7b06fd840f 100644 --- a/erts/emulator/beam/erl_thr_progress.c +++ b/erts/emulator/beam/erl_thr_progress.c @@ -502,7 +502,7 @@ erts_thr_progress_register_unmanaged_thread(ErtsThrPrgrCallbacks *callbacks) if (tpd) { if (!tpd->is_temporary) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s:%d:%s(): Double register of thread\n", __FILE__, __LINE__, __func__); is_blocking = tpd->is_blocking; @@ -524,7 +524,7 @@ erts_thr_progress_register_unmanaged_thread(ErtsThrPrgrCallbacks *callbacks) #endif ASSERT(tpd->id >= 0); if (tpd->id >= intrnl->unmanaged.no) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s:%d:%s(): Too many unmanaged registered threads\n", __FILE__, __LINE__, __func__); @@ -547,7 +547,7 @@ erts_thr_progress_register_managed_thread(ErtsSchedulerData *esdp, if (tpd) { if (!tpd->is_temporary) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s:%d:%s(): Double register of thread\n", __FILE__, __LINE__, __func__); is_blocking = tpd->is_blocking; @@ -568,7 +568,7 @@ erts_thr_progress_register_managed_thread(ErtsSchedulerData *esdp, tpd->id = erts_atomic32_inc_read_nob(&intrnl->misc.data.managed_id); ASSERT(tpd->id >= 0); if (tpd->id >= intrnl->managed.no) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s:%d:%s(): Too many managed registered threads\n", __FILE__, __LINE__, __func__); @@ -1033,7 +1033,7 @@ has_reached_wakeup(ErtsThrPrgrVal wakeup) limit += 1; if (!erts_thr_progress_has_passed__(limit, wakeup)) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Invalid wakeup request value found:" " current=%b64u, wakeup=%b64u, limit=%b64u", current, wakeup, limit); @@ -1102,7 +1102,7 @@ request_wakeup_managed(ErtsThrPrgrData *tpd, ErtsThrPrgrVal value) ix = erts_atomic32_inc_read_nob(&mwd->len) - 1; #if ERTS_THR_PRGR_DBG_CHK_WAKEUP_REQUEST_VALUE if (ix >= intrnl->managed.no) - erl_exit(ERTS_ABORT_EXIT, "Internal error: Too many wakeup requests\n"); + erts_exit(ERTS_ABORT_EXIT, "Internal error: Too many wakeup requests\n"); #endif mwd->id[ix] = tpd->id; diff --git a/erts/emulator/beam/erl_thr_queue.c b/erts/emulator/beam/erl_thr_queue.c index 3a91ca9dbe..7ff456b915 100644 --- a/erts/emulator/beam/erl_thr_queue.c +++ b/erts/emulator/beam/erl_thr_queue.c @@ -224,7 +224,7 @@ ErtsThrQCleanState_t erts_thr_q_destroy(ErtsThrQ_t *q) { if (!q->q.blk) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Trying to destroy not created thread queue\n"); return erts_thr_q_finalize(q); } @@ -589,7 +589,7 @@ enqueue(ErtsThrQ_t *q, void *data, ErtsThrQElement_t *this) #if ERTS_THR_Q_DBG_CHK_DATA if (!data) - erl_exit(ERTS_ABORT_EXIT, "Missing data in enqueue\n"); + erts_exit(ERTS_ABORT_EXIT, "Missing data in enqueue\n"); #endif ASSERT(!q->q.finalizing); @@ -771,7 +771,7 @@ erts_thr_q_dequeue(ErtsThrQ_t *q) #if ERTS_THR_Q_DBG_CHK_DATA head->data.ptr = NULL; if (!res) - erl_exit(ERTS_ABORT_EXIT, "Missing data in dequeue\n"); + erts_exit(ERTS_ABORT_EXIT, "Missing data in dequeue\n"); #endif clean(q, (q->head.deq_fini.automatic diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c index 5f12c7809a..99005356ed 100644 --- a/erts/emulator/beam/erl_time_sup.c +++ b/erts/emulator/beam/erl_time_sup.c @@ -289,7 +289,7 @@ read_corrected_time(int os_drift_corrected) ci = time_sup.inf.c.parmon.cdata.insts.curr; else { if (os_mtime < time_sup.inf.c.parmon.cdata.insts.prev.os_mtime) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "OS monotonic time stepped backwards\n"); ci = time_sup.inf.c.parmon.cdata.insts.prev; } @@ -381,7 +381,7 @@ check_time_correction(void *vesdp) erts_smp_rwmtx_runlock(&time_sup.inf.c.parmon.rwmtx); if (os_mtime < ci.os_mtime) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "OS monotonic time stepped backwards\n"); erl_mtime = calc_corrected_erl_mtime(os_mtime, &ci, &mdiff, @@ -798,7 +798,7 @@ finalize_corrected_time_offset(ErtsSystemTime *stimep) erts_smp_rwmtx_runlock(&time_sup.inf.c.parmon.rwmtx); if (os_mtime < ci.os_mtime) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "OS monotonic time stepped backwards\n"); return calc_corrected_erl_mtime(os_mtime, &ci, NULL, diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c index 8a4c0ab1f2..114853cac4 100644 --- a/erts/emulator/beam/erl_trace.c +++ b/erts/emulator/beam/erl_trace.c @@ -662,7 +662,7 @@ WRITE_SYS_MSG_TO_PORT(Eterm unused_to, erts_encode_ext(message, &ptr); if (!(ptr <= buffer+size)) { - erl_exit(1, "Internal error in do_send_to_port: %d\n", ptr-buffer); + erts_exit(ERTS_ERROR_EXIT, "Internal error in do_send_to_port: %d\n", ptr-buffer); } #ifndef ERTS_SMP @@ -1289,7 +1289,7 @@ seq_trace_output_generic(Eterm token, Eterm msg, Uint type, case SEQ_TRACE_PRINT: type_atom = am_print; break; case SEQ_TRACE_RECEIVE: type_atom = am_receive; break; default: - erl_exit(1, "invalid type in seq_trace_output_generic: %d:\n", type); + erts_exit(ERTS_ERROR_EXIT, "invalid type in seq_trace_output_generic: %d:\n", type); return; /* To avoid warning */ } diff --git a/erts/emulator/beam/erl_unicode.c b/erts/emulator/beam/erl_unicode.c index 551717139d..36d85b0a22 100644 --- a/erts/emulator/beam/erl_unicode.c +++ b/erts/emulator/beam/erl_unicode.c @@ -2507,7 +2507,7 @@ void erts_copy_utf8_to_utf16_little(byte *target, byte *bytes, int num_chars) ((Uint) (bytes[3] & ((byte) 0x3F))); bytes += 4; } else { - erl_exit(1,"Internal unicode error in prim_file:internal_name2native/1"); + erts_exit(ERTS_ERROR_EXIT,"Internal unicode error in prim_file:internal_name2native/1"); } *target++ = (byte) (unipoint & 0xFF); *target++ = (byte) ((unipoint >> 8) & 0xFF); diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c index a85aa15403..ffe3303796 100644 --- a/erts/emulator/beam/external.c +++ b/erts/emulator/beam/external.c @@ -570,7 +570,7 @@ void erts_encode_ext(Eterm term, byte **ext) *ep++ = VERSION_MAGIC; ep = enc_term(NULL, term, ep, TERM_TO_BINARY_DFLAGS, NULL); if (!ep) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s:%d:erts_encode_ext(): Internal data structure error\n", __FILE__, __LINE__); *ext = ep; @@ -1559,7 +1559,7 @@ static BIF_RETTYPE binary_to_term_int(Process* p, Uint32 flags, Eterm bin, Binar b2t_destroy_context(ctx); if (ctx->u.dc.factory.hp > ctx->u.dc.factory.hp_end) { - erl_exit(1, ":%s, line %d: heap overrun by %d words(s)\n", + erts_exit(ERTS_ERROR_EXIT, ":%s, line %d: heap overrun by %d words(s)\n", __FILE__, __LINE__, ctx->u.dc.factory.hp - ctx->u.dc.factory.hp_end); } erts_factory_close(&ctx->u.dc.factory); @@ -1708,12 +1708,12 @@ erts_term_to_binary_simple(Process* p, Eterm Term, Uint size, int level, Uint fl if ((endp = enc_term(NULL, Term, bytes, flags, NULL)) == NULL) { - erl_exit(1, "%s, line %d: bad term: %x\n", + erts_exit(ERTS_ERROR_EXIT, "%s, line %d: bad term: %x\n", __FILE__, __LINE__, Term); } real_size = endp - bytes; if (real_size > size) { - erl_exit(1, "%s, line %d: buffer overflow: %d word(s)\n", + erts_exit(ERTS_ERROR_EXIT, "%s, line %d: buffer overflow: %d word(s)\n", __FILE__, __LINE__, real_size - size); } @@ -1753,12 +1753,12 @@ erts_term_to_binary_simple(Process* p, Eterm Term, Uint size, int level, Uint fl bytes[0] = VERSION_MAGIC; if ((endp = enc_term(NULL, Term, bytes+1, flags, NULL)) == NULL) { - erl_exit(1, "%s, line %d: bad term: %x\n", + erts_exit(ERTS_ERROR_EXIT, "%s, line %d: bad term: %x\n", __FILE__, __LINE__, Term); } real_size = endp - bytes; if (real_size > size) { - erl_exit(1, "%s, line %d: buffer overflow: %d word(s)\n", + erts_exit(ERTS_ERROR_EXIT, "%s, line %d: buffer overflow: %d word(s)\n", __FILE__, __LINE__, endp - (bytes + size)); } return erts_realloc_binary(bin, real_size); @@ -2650,7 +2650,7 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, ASSERT(node_sz < 17); break; default: - erl_exit(1, "bad header\r\n"); + erts_exit(ERTS_ERROR_EXIT, "bad header\r\n"); } ptr++; @@ -4110,7 +4110,7 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, ASSERT(node_sz < 17); break; default: - erl_exit(1, "bad header\r\n"); + erts_exit(ERTS_ERROR_EXIT, "bad header\r\n"); } ptr++; @@ -4202,7 +4202,7 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, break; default: - erl_exit(1,"Internal data structure error (in encode_size_struct2)%x\n", + erts_exit(ERTS_ERROR_EXIT,"Internal data structure error (in encode_size_struct2)%x\n", obj); } diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index ec9296d034..1b8595fe57 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -428,7 +428,7 @@ void erl_grow_estack(ErtsEStack*, Uint need); #define ESTACK_CHANGE_ALLOCATOR(s,t) \ do { \ if ((s).start != ESTK_DEF_STACK(s)) { \ - erl_exit(1, "Internal error - trying to change allocator " \ + erts_exit(ERTS_ERROR_EXIT, "Internal error - trying to change allocator " \ "type of active estack\n"); \ } \ (s).alloc_type = (t); \ @@ -589,7 +589,7 @@ do { \ #define WSTACK_CHANGE_ALLOCATOR(s,t) \ do { \ if (s.wstart != WSTK_DEF_STACK(s)) { \ - erl_exit(1, "Internal error - trying to change allocator " \ + erts_exit(ERTS_ERROR_EXIT, "Internal error - trying to change allocator " \ "type of active wstack\n"); \ } \ s.alloc_type = (t); \ @@ -781,7 +781,7 @@ ErtsPStack s = { (byte*)PSTK_DEF_STACK(s), /* pstart */ \ #define PSTACK_CHANGE_ALLOCATOR(s,t) \ do { \ if (s.pstart != (byte*)PSTK_DEF_STACK(s)) { \ - erl_exit(1, "Internal error - trying to change allocator " \ + erts_exit(ERTS_ERROR_EXIT, "Internal error - trying to change allocator " \ "type of active pstack\n"); \ } \ s.alloc_type = (t); \ @@ -952,8 +952,8 @@ double erts_get_positive_zero_float(void); /* config.c */ -__decl_noreturn void __noreturn erl_exit(int n, char*, ...); -__decl_noreturn void __noreturn erl_exit_flush_async(int n, char*, ...); +__decl_noreturn void __noreturn erts_exit(int n, char*, ...); +__decl_noreturn void __noreturn erts_flush_async_exit(int n, char*, ...); void erl_error(char*, va_list); /* copy.c */ @@ -1398,7 +1398,7 @@ erts_alloc_message_heap_state(Uint size, #endif if (size > (Uint) INT_MAX) - erl_exit(ERTS_ABORT_EXIT, "HUGE size (%beu)\n", size); + erts_exit(ERTS_ABORT_EXIT, "HUGE size (%beu)\n", size); if ( #if defined(ERTS_SMP) diff --git a/erts/emulator/beam/hash.c b/erts/emulator/beam/hash.c index e0fde337f2..895fe657d1 100644 --- a/erts/emulator/beam/hash.c +++ b/erts/emulator/beam/hash.c @@ -133,7 +133,7 @@ Hash* hash_init(ErtsAlcType_t type, Hash* h, char* name, int size, HashFunctions while (h_size_table[ix] != -1 && h_size_table[ix] < size) ix++; if (h_size_table[ix] == -1) - erl_exit(1, "panic: too large hash table size (%d)\n", size); + erts_exit(ERTS_ERROR_EXIT, "panic: too large hash table size (%d)\n", size); size = h_size_table[ix]; sz = size*sizeof(HashBucket*); diff --git a/erts/emulator/beam/index.c b/erts/emulator/beam/index.c index 06d0b5123d..5f6ea14732 100644 --- a/erts/emulator/beam/index.c +++ b/erts/emulator/beam/index.c @@ -84,7 +84,7 @@ index_put_entry(IndexTable* t, void* tmpl) Uint sz; if (ix >= t->limit) { /* A core dump is unnecessary */ - erl_exit(ERTS_DUMP_EXIT, "no more index entries in %s (max=%d)\n", + erts_exit(ERTS_DUMP_EXIT, "no more index entries in %s (max=%d)\n", t->htable.name, t->limit); } sz = INDEX_PAGE_SIZE*sizeof(IndexSlot*); @@ -123,7 +123,7 @@ void erts_index_merge(Hash* src, IndexTable* dst) ix = dst->entries++; if (ix >= dst->size) { if (ix >= dst->limit) { - erl_exit(1, "no more index entries in %s (max=%d)\n", + erts_exit(ERTS_ERROR_EXIT, "no more index entries in %s (max=%d)\n", dst->htable.name, dst->limit); } sz = INDEX_PAGE_SIZE*sizeof(IndexSlot*); diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c index 2bd31ee97e..81a05a6b87 100644 --- a/erts/emulator/beam/io.c +++ b/erts/emulator/beam/io.c @@ -3467,7 +3467,7 @@ terminate_port(Port *prt) if ((state & ERTS_PORT_SFLG_HALT) && (erts_smp_atomic32_dec_read_nob(&erts_halt_progress) == 0)) { erts_port_release(prt); /* We will exit and never return */ - erl_exit_flush_async(erts_halt_code, ""); + erts_flush_async_exit(erts_halt_code, ""); } if (is_internal_port(send_closed_port_id)) deliver_result(send_closed_port_id, connected_id, am_closed); @@ -4882,7 +4882,7 @@ void erts_raw_port_command(Port* p, byte* buf, Uint len) ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(p)); if (len > (Uint) INT_MAX) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Absurdly large data buffer (%beu bytes) passed to" "output callback of %s driver.\n", len, @@ -7312,7 +7312,7 @@ driver_system_info(ErlDrvSysInfo *sip, size_t si_size) * of ErlDrvSysInfo (introduced in driver version 1.0). */ if (!sip || si_size < ERL_DRV_SYS_INFO_SIZE(smp_support)) - erl_exit(1, + erts_exit(ERTS_ERROR_EXIT, "driver_system_info(%p, %ld) called with invalid arguments\n", sip, si_size); diff --git a/erts/emulator/beam/register.c b/erts/emulator/beam/register.c index 7ade8bca0f..020e61d136 100644 --- a/erts/emulator/beam/register.c +++ b/erts/emulator/beam/register.c @@ -125,7 +125,7 @@ static RegProc* reg_alloc(RegProc *tmpl) { RegProc* obj = (RegProc*) erts_alloc(ERTS_ALC_T_REG_PROC, sizeof(RegProc)); if (!obj) { - erl_exit(1, "Can't allocate %d bytes of memory\n", sizeof(RegProc)); + erts_exit(ERTS_ERROR_EXIT, "Can't allocate %d bytes of memory\n", sizeof(RegProc)); } obj->name = tmpl->name; obj->p = tmpl->p; diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index 03e30573de..6497a1e648 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -611,15 +611,16 @@ static unsigned long zero_value = 0, one_value = 1; # endif /* !__WIN32__ */ #endif /* WANT_NONBLOCKING */ -__decl_noreturn void __noreturn erl_exit(int n, char*, ...); +__decl_noreturn void __noreturn erts_exit(int n, char*, ...); -/* Some special erl_exit() codes: */ -#define ERTS_INTR_EXIT INT_MIN /* called from signal handler */ -#define ERTS_ABORT_EXIT (INT_MIN + 1) /* no crash dump; only abort() */ -#define ERTS_DUMP_EXIT (INT_MIN + 2) /* crash dump; then exit() */ +/* Some special erts_exit() codes: */ +#define ERTS_INTR_EXIT -1 /* called from signal handler */ +#define ERTS_ABORT_EXIT -2 /* no crash dump; only abort() */ +#define ERTS_DUMP_EXIT -3 /* crash dump; then exit() */ +#define ERTS_ERROR_EXIT -4 /* crash dump; then abort() */ #define ERTS_INTERNAL_ERROR(What) \ - erl_exit(ERTS_ABORT_EXIT, "%s:%d:%s(): Internal error: %s\n", \ + erts_exit(ERTS_ABORT_EXIT, "%s:%d:%s(): Internal error: %s\n", \ __FILE__, __LINE__, __func__, What) Eterm erts_check_io_info(void *p); @@ -933,7 +934,7 @@ erts_refc_inc(erts_refc_t *refcp, erts_aint_t min_val) #ifdef ERTS_REFC_DEBUG erts_aint_t val = erts_smp_atomic_inc_read_nob((erts_smp_atomic_t *) refcp); if (val < min_val) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "erts_refc_inc(): Bad refc found (refc=%ld < %ld)!\n", val, min_val); #else @@ -947,7 +948,7 @@ erts_refc_inctest(erts_refc_t *refcp, erts_aint_t min_val) erts_aint_t val = erts_smp_atomic_inc_read_nob((erts_smp_atomic_t *) refcp); #ifdef ERTS_REFC_DEBUG if (val < min_val) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "erts_refc_inctest(): Bad refc found (refc=%ld < %ld)!\n", val, min_val); #endif @@ -960,7 +961,7 @@ erts_refc_dec(erts_refc_t *refcp, erts_aint_t min_val) #ifdef ERTS_REFC_DEBUG erts_aint_t val = erts_smp_atomic_dec_read_nob((erts_smp_atomic_t *) refcp); if (val < min_val) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "erts_refc_dec(): Bad refc found (refc=%ld < %ld)!\n", val, min_val); #else @@ -974,7 +975,7 @@ erts_refc_dectest(erts_refc_t *refcp, erts_aint_t min_val) erts_aint_t val = erts_smp_atomic_dec_read_nob((erts_smp_atomic_t *) refcp); #ifdef ERTS_REFC_DEBUG if (val < min_val) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "erts_refc_dectest(): Bad refc found (refc=%ld < %ld)!\n", val, min_val); #endif @@ -987,7 +988,7 @@ erts_refc_add(erts_refc_t *refcp, erts_aint_t diff, erts_aint_t min_val) #ifdef ERTS_REFC_DEBUG erts_aint_t val = erts_smp_atomic_add_read_nob((erts_smp_atomic_t *) refcp, diff); if (val < min_val) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "erts_refc_add(%ld): Bad refc found (refc=%ld < %ld)!\n", diff, val, min_val); #else @@ -1001,7 +1002,7 @@ erts_refc_read(erts_refc_t *refcp, erts_aint_t min_val) erts_aint_t val = erts_smp_atomic_read_nob((erts_smp_atomic_t *) refcp); #ifdef ERTS_REFC_DEBUG if (val < min_val) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "erts_refc_read(): Bad refc found (refc=%ld < %ld)!\n", val, min_val); #endif diff --git a/erts/emulator/beam/time.c b/erts/emulator/beam/time.c index 0ab6661c9f..988338ed81 100644 --- a/erts/emulator/beam/time.c +++ b/erts/emulator/beam/time.c @@ -555,7 +555,7 @@ erts_init_time(int time_correction, ErtsTimeWarpMode time_warp_mode) itime = erts_init_time_sup(time_correction, time_warp_mode); #ifdef TIW_ITIME_IS_CONSTANT if (itime != TIW_ITIME) { - erl_exit(ERTS_ABORT_EXIT, "timer resolution mismatch %d != %d", itime, TIW_ITIME); + erts_exit(ERTS_ABORT_EXIT, "timer resolution mismatch %d != %d", itime, TIW_ITIME); } #else tiw_itime = itime; diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index 5286391746..b9ce70e364 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -1055,7 +1055,7 @@ tail_recur: } default: - erl_exit(1, "Invalid tag in make_hash(0x%X,0x%X)\n", term, op); + erts_exit(ERTS_ERROR_EXIT, "Invalid tag in make_hash(0x%X,0x%X)\n", term, op); return 0; } if (WSTACK_ISEMPTY(stack)) break; @@ -1328,7 +1328,7 @@ make_hash2(Eterm term) i = hashmap_bitcount(MAP_HEADER_VAL(hdr)); break; default: - erl_exit(1, "bad header"); + erts_exit(ERTS_ERROR_EXIT, "bad header"); } while (i) { if (is_list(*ptr)) { @@ -1491,7 +1491,7 @@ make_hash2(Eterm term) break; default: - erl_exit(1, "Invalid tag in make_hash2(0x%X)\n", term); + erts_exit(ERTS_ERROR_EXIT, "Invalid tag in make_hash2(0x%X)\n", term); } } break; @@ -1522,7 +1522,7 @@ make_hash2(Eterm term) UINT32_HASH(NIL_DEF, HCONST_2); goto hash2_common; default: - erl_exit(1, "Invalid tag in make_hash2(0x%X)\n", term); + erts_exit(ERTS_ERROR_EXIT, "Invalid tag in make_hash2(0x%X)\n", term); } case _TAG_IMMED1_SMALL: { @@ -1538,7 +1538,7 @@ make_hash2(Eterm term) } break; default: - erl_exit(1, "Invalid tag in make_hash2(0x%X)\n", term); + erts_exit(ERTS_ERROR_EXIT, "Invalid tag in make_hash2(0x%X)\n", term); hash2_common: /* Uint32 hash always has the hash value of the previous term, @@ -1733,7 +1733,7 @@ make_internal_hash(Eterm term) i = hashmap_bitcount(MAP_HEADER_VAL(hdr)); break; default: - erl_exit(1, "bad header"); + erts_exit(ERTS_ERROR_EXIT, "bad header"); } while (i) { if (is_list(*ptr)) { @@ -1909,7 +1909,7 @@ make_internal_hash(Eterm term) goto pop_next; } default: - erl_exit(1, "Invalid tag in make_hash2(0x%X)\n", term); + erts_exit(ERTS_ERROR_EXIT, "Invalid tag in make_hash2(0x%X)\n", term); } } break; @@ -1922,7 +1922,7 @@ make_internal_hash(Eterm term) goto pop_next; default: - erl_exit(1, "Invalid tag in make_hash2(0x%X)\n", term); + erts_exit(ERTS_ERROR_EXIT, "Invalid tag in make_hash2(0x%X)\n", term); pop_next: if (ESTACK_ISEMPTY(s)) { @@ -2205,7 +2205,7 @@ tail_recur: } default: - erl_exit(1, "Invalid tag in make_broken_hash\n"); + erts_exit(ERTS_ERROR_EXIT, "Invalid tag in make_broken_hash\n"); return 0; } if (WSTACK_ISEMPTY(stack)) break; @@ -2879,7 +2879,7 @@ tailrecur_ne: ASSERT(sz > 0 && sz < 17); break; default: - erl_exit(1, "Unknown hashmap subsubtag\n"); + erts_exit(ERTS_ERROR_EXIT, "Unknown hashmap subsubtag\n"); } goto term_array; } diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c index a5a5dfb7f8..5e25747ddf 100644 --- a/erts/emulator/drivers/common/efile_drv.c +++ b/erts/emulator/drivers/common/efile_drv.c @@ -125,8 +125,6 @@ #include "dtrace-wrapper.h" -void erl_exit(int n, char *fmt, ...); - static ErlDrvSysInfo sys_info; /* For explanation of this var, see comment for same var in erl_async.c */ @@ -515,21 +513,10 @@ struct t_data static void *ef_safe_alloc(Uint s) { void *p = EF_ALLOC(s); - if (!p) erl_exit(1, "efile drv: Can't allocate %lu bytes of memory\n", (unsigned long)s); - return p; -} - -#if 0 /* Currently not used */ - -static void *ef_safe_realloc(void *op, Uint s) -{ - void *p = EF_REALLOC(op, s); - if (!p) erl_exit(1, "efile drv: Can't reallocate %lu bytes of memory\n", (unsigned long)s); + if (!p) erts_exit(ERTS_ERROR_EXIT, "efile drv: Can't allocate %lu bytes of memory\n", (unsigned long)s); return p; } -#endif - /********************************************************************* * ErlIOVec manipulation functions. */ diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index 43cb15a25f..2d2bd80783 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -1574,7 +1574,7 @@ static const struct in6_addr in6addr_loopback = #endif /* HAVE_IN6 */ /* XXX: is this a driver interface function ??? */ -void erl_exit(int n, char*, ...); +void erts_exit(int n, char*, ...); /* * Malloc wrapper, @@ -1587,7 +1587,7 @@ void erl_exit(int n, char*, ...); static void *alloc_wrapper(ErlDrvSizeT size){ void *ret = driver_alloc(size); if(ret == NULL) - erl_exit(1,"Out of virtual memory in malloc (%s)", __FILE__); + erts_exit(ERTS_ERROR_EXIT,"Out of virtual memory in malloc (%s)", __FILE__); return ret; } #define ALLOC(X) alloc_wrapper(X) @@ -1595,7 +1595,7 @@ static void *alloc_wrapper(ErlDrvSizeT size){ static void *realloc_wrapper(void *current, ErlDrvSizeT size){ void *ret = driver_realloc(current,size); if(ret == NULL) - erl_exit(1,"Out of virtual memory in realloc (%s)", __FILE__); + erts_exit(ERTS_ERROR_EXIT,"Out of virtual memory in realloc (%s)", __FILE__); return ret; } #define REALLOC(X,Y) realloc_wrapper(X,Y) @@ -1856,7 +1856,7 @@ check_double_release(InetDrvBufStk *bs, ErlDrvBinary* buf) int i; for (i = 0; i < bs->buf.pos; ++i) { if (bs->buf.stk[i] == buf) { - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Multiple buffer release in inet_drv, this " "is a bug, save the core and send it to " "[email protected]!"); @@ -7117,7 +7117,7 @@ static ErlDrvSSizeT inet_fill_opts(inet_descriptor* desc, do { \ ErlDrvSizeT new_need = ((Ptr) - (*dest)) + (Size); \ if (new_need > dest_used) { \ - erl_exit(1,"Internal error in inet_drv, " \ + erts_exit(ERTS_ERROR_EXIT,"Internal error in inet_drv, " \ "miscalculated buffer size"); \ } \ dest_used = new_need; \ @@ -7494,7 +7494,7 @@ static ErlDrvSSizeT sctp_fill_opts(inet_descriptor* desc, do { \ int need; \ if ((Index) > spec_allocated) { \ - erl_exit(1,"Internal error in inet_drv, " \ + erts_exit(ERTS_ERROR_EXIT,"Internal error in inet_drv, " \ "miscalculated buffer size"); \ } \ need = (Index) + (N); \ diff --git a/erts/emulator/drivers/win32/win_con.c b/erts/emulator/drivers/win32/win_con.c index 0d63d46698..7fe708dc7b 100644 --- a/erts/emulator/drivers/win32/win_con.c +++ b/erts/emulator/drivers/win32/win_con.c @@ -279,7 +279,7 @@ ConInit(void) } /* - ConNormalExit() is called from erl_exit() when the emulator + ConNormalExit() is called from erts_exit() when the emulator is stopping. If the exit has not been initiated by this console thread (WM_DESTROY or ID_BREAK), the function must invoke the console thread to save the user preferences. @@ -529,7 +529,7 @@ ConThreadInit(LPVOID param) /* PostQuitMessage() results in WM_QUIT which makes GetMessage() return 0 (which stops the main loop). Before we return from - the console thread, the ctrl_handler is called to do erl_exit. + the console thread, the ctrl_handler is called to do erts_exit. */ (*ctrl_handler)(CTRL_CLOSE_EVENT); return msg.wParam; diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c index cc68e1f74d..c838150db8 100644 --- a/erts/emulator/hipe/hipe_bif0.c +++ b/erts/emulator/hipe/hipe_bif0.c @@ -406,7 +406,7 @@ BIF_RETTYPE hipe_bifs_enter_code_2(BIF_ALIST_2) nrcallees = arityval(tuple_val(BIF_ARG_2)[0]); else nrcallees = 0; - erl_exit(1, "%s: failed to allocate %lu bytes and %lu trampolines\r\n", + erts_exit(ERTS_ERROR_EXIT, "%s: failed to allocate %lu bytes and %lu trampolines\r\n", __func__, (unsigned long)nrbytes, (unsigned long)nrcallees); } memcpy(address, bytes, nrbytes); @@ -1311,7 +1311,7 @@ static void *hipe_make_stub(Eterm m, Eterm f, unsigned int arity, int is_remote) export_entry = erts_export_get_or_make_stub(m, f, arity); StubAddress = hipe_make_native_stub(export_entry, arity); if (!StubAddress) - erl_exit(1, "hipe_make_stub: code allocation failed\r\n"); + erts_exit(ERTS_ERROR_EXIT, "hipe_make_stub: code allocation failed\r\n"); return StubAddress; } diff --git a/erts/emulator/hipe/hipe_mode_switch.c b/erts/emulator/hipe/hipe_mode_switch.c index 968452a641..9243e029f6 100644 --- a/erts/emulator/hipe/hipe_mode_switch.c +++ b/erts/emulator/hipe/hipe_mode_switch.c @@ -108,7 +108,7 @@ static const char *code_str(unsigned code) static void __noreturn hipe_abort(const char *expr, const char *file, unsigned line) { - erl_exit(1, "ASSERTION FAILED, file %s, line %u: %s\r\n", file, line, expr); + erts_exit(ERTS_ERROR_EXIT, "ASSERTION FAILED, file %s, line %u: %s\r\n", file, line, expr); } #define HIPE_ASSERT3(expr, file, line) \ @@ -316,7 +316,7 @@ Process *hipe_mode_switch(Process *p, unsigned cmd, Eterm reg[]) break; } default: - erl_exit(1, "hipe_mode_switch: cmd %#x\r\n", cmd); + erts_exit(ERTS_ERROR_EXIT, "hipe_mode_switch: cmd %#x\r\n", cmd); } do_return_from_native: DPRINTF("result == %#x (%s)", result, code_str(result)); @@ -560,7 +560,7 @@ Process *hipe_mode_switch(Process *p, unsigned cmd, Eterm reg[]) goto do_throw_to_native; } default: - erl_exit(1, "hipe_mode_switch: result %#x\r\n", result); + erts_exit(ERTS_ERROR_EXIT, "hipe_mode_switch: result %#x\r\n", result); } HIPE_CHECK_PCB(p); p->def_arg_reg[3] = result; diff --git a/erts/emulator/hipe/hipe_native_bif.c b/erts/emulator/hipe/hipe_native_bif.c index 119b0b0895..994f963ece 100644 --- a/erts/emulator/hipe/hipe_native_bif.c +++ b/erts/emulator/hipe/hipe_native_bif.c @@ -171,7 +171,7 @@ void hipe_fclearerror_error(Process *p) #if !defined(NO_FPE_SIGNALS) erts_fp_check_init_error(&p->fp_exception); #else - erl_exit(ERTS_ABORT_EXIT, "Emulated FPE not cleared by HiPE"); + erts_exit(ERTS_ABORT_EXIT, "Emulated FPE not cleared by HiPE"); #endif } diff --git a/erts/emulator/sys/common/erl_mmap.c b/erts/emulator/sys/common/erl_mmap.c index 754047829f..4180e65fdc 100644 --- a/erts/emulator/sys/common/erl_mmap.c +++ b/erts/emulator/sys/common/erl_mmap.c @@ -1334,7 +1334,7 @@ os_unreserve_physical(char *ptr, UWord size) void *res = mmap((void *) ptr, (size_t) size, ERTS_MMAP_UNRESERVE_PROT, ERTS_MMAP_UNRESERVE_FLAGS, ERTS_MMAP_FD, 0); if (res == (void *) MAP_FAILED) - erl_exit(ERTS_ABORT_EXIT, "Failed to unreserve memory"); + erts_exit(ERTS_ABORT_EXIT, "Failed to unreserve memory"); } static void * @@ -2126,7 +2126,7 @@ erts_mmap_init(ErtsMMapInit *init) #endif erts_page_inv_mask = pagesize - 1; if (pagesize & erts_page_inv_mask) - erl_exit(-1, "erts_mmap: Invalid pagesize: %bpu\n", + erts_exit(1, "erts_mmap: Invalid pagesize: %bpu\n", pagesize); ERTS_MMAP_OP_RINGBUF_INIT(); @@ -2140,7 +2140,7 @@ erts_mmap_init(ErtsMMapInit *init) #if HAVE_MMAP && !defined(MAP_ANON) mmap_state.mmap_fd = open("/dev/zero", O_RDWR); if (mmap_state.mmap_fd < 0) - erl_exit(-1, "erts_mmap: Failed to open /dev/zero\n"); + erts_exit(1, "erts_mmap: Failed to open /dev/zero\n"); #endif erts_smp_mtx_init(&mmap_state.mtx, "erts_mmap"); @@ -2155,7 +2155,7 @@ erts_mmap_init(ErtsMMapInit *init) sz = end - ptr; start = os_mmap_virtual(ptr, sz); if (!start || start > ptr || start >= end) - erl_exit(-1, + erts_exit(1, "erts_mmap: Failed to create virtual range for super carrier\n"); sz = start - ptr; if (sz) @@ -2193,7 +2193,7 @@ erts_mmap_init(ErtsMMapInit *init) start = os_mmap(NULL, sz, 1); } if (!start) - erl_exit(-1, + erts_exit(1, "erts_mmap: Failed to create super carrier of size %bpu MB\n", init->scs/1024/1024); end = start + sz; @@ -2242,7 +2242,7 @@ erts_mmap_init(ErtsMMapInit *init) if ((desc_size + ERTS_SUPERALIGNED_SIZE + ERTS_PAGEALIGNED_SIZE) > end - start) - erl_exit(-1, "erts_mmap: No space for segments in super carrier\n"); + erts_exit(1, "erts_mmap: No space for segments in super carrier\n"); mmap_state.sa.bot = start; mmap_state.sa.bot += desc_size; @@ -2280,7 +2280,7 @@ erts_mmap_init(ErtsMMapInit *init) */ #ifdef ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION if (virtual_map && !os_reserve_physical(start, mmap_state.sa.bot - start)) - erl_exit(-1, "erts_mmap: Failed to reserve physical memory for descriptors\n"); + erts_exit(1, "erts_mmap: Failed to reserve physical memory for descriptors\n"); #endif mmap_state.desc.unused_start = start; mmap_state.desc.unused_end = mmap_state.sa.bot; diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c index 0d51aad863..3398be2b07 100644 --- a/erts/emulator/sys/common/erl_mseg.c +++ b/erts/emulator/sys/common/erl_mseg.c @@ -1490,7 +1490,7 @@ erts_mseg_init(ErtsMsegInit_t *init) #if HALFWORD_HEAP if (sizeof(void *) != 8) - erl_exit(-1,"Halfword emulator cannot be run in 32bit mode"); + erts_exit(1,"Halfword emulator cannot be run in 32bit mode"); init->mmap.virtual_range.start = (char *) sbrk(0); init->mmap.virtual_range.end = (char *) 0x100000000UL; @@ -1500,7 +1500,7 @@ erts_mseg_init(ErtsMsegInit_t *init) erts_mmap_init(&init->mmap); if (!IS_2POW(GET_PAGE_SIZE)) - erl_exit(ERTS_ABORT_EXIT, "erts_mseg: Unexpected page_size %beu\n", GET_PAGE_SIZE); + erts_exit(ERTS_ABORT_EXIT, "erts_mseg: Unexpected page_size %beu\n", GET_PAGE_SIZE); ASSERT((MSEG_ALIGNED_SIZE % GET_PAGE_SIZE) == 0); diff --git a/erts/emulator/sys/common/erl_os_monotonic_time_extender.c b/erts/emulator/sys/common/erl_os_monotonic_time_extender.c index b79485241f..367b22d989 100644 --- a/erts/emulator/sys/common/erl_os_monotonic_time_extender.c +++ b/erts/emulator/sys/common/erl_os_monotonic_time_extender.c @@ -44,7 +44,7 @@ static void *os_monotonic_time_extender(void *vstatep) erts_milli_sleep(sleep_time); } - erl_exit(ERTS_ABORT_EXIT, "os_monotonic_time_extender thread terminating"); + erts_exit(ERTS_ABORT_EXIT, "os_monotonic_time_extender thread terminating"); return NULL; } diff --git a/erts/emulator/sys/ose/erl_poll.c b/erts/emulator/sys/ose/erl_poll.c index 5cee582a00..c690f08dea 100644 --- a/erts/emulator/sys/ose/erl_poll.c +++ b/erts/emulator/sys/ose/erl_poll.c @@ -658,7 +658,7 @@ int erts_poll_wait(ErtsPollSet ps, break; default: res = 0; - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error: Invalid wakeup_state=%d\n", __FILE__, __LINE__, (int) wakeup_state); } diff --git a/erts/emulator/sys/ose/sys.c b/erts/emulator/sys/ose/sys.c index bcd0ffa0b6..e354faf02c 100644 --- a/erts/emulator/sys/ose/sys.c +++ b/erts/emulator/sys/ose/sys.c @@ -570,7 +570,7 @@ break_requested(void) fprintf(stderr,"break!\n"); #endif if (ERTS_BREAK_REQUESTED) - erl_exit(ERTS_INTR_EXIT, ""); + erts_exit(ERTS_INTR_EXIT, ""); ERTS_SET_BREAK_REQUESTED; ERTS_CHK_IO_AS_INTR(); /* Make sure we don't sleep in poll */ diff --git a/erts/emulator/sys/ose/sys_float.c b/erts/emulator/sys/ose/sys_float.c index 3d9abc6bd1..51875792ae 100644 --- a/erts/emulator/sys/ose/sys_float.c +++ b/erts/emulator/sys/ose/sys_float.c @@ -90,7 +90,7 @@ void erts_fp_check_init_error(volatile unsigned long *fpexnp) snprintf(buf, sizeof buf, "ERTS_FP_CHECK_INIT at %p: detected unhandled FPE at %p\r\n", __builtin_return_address(0), (void*)*fpexnp); if (write(2, buf, strlen(buf)) <= 0) - erl_exit(ERTS_ABORT_EXIT, "%s", buf); + erts_exit(ERTS_ABORT_EXIT, "%s", buf); *fpexnp = 0; #if defined(__i386__) || defined(__x86_64__) erts_restore_fpu(); diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index 8d7da3e47e..d94b37430e 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -638,14 +638,14 @@ erl_sys_init(void) res = erts_sys_getenv_raw("BINDIR", bindir, &bindirsz); if (res != 0) { if (res < 0) - erl_exit(-1, + erts_exit(1, "Environment variable BINDIR is not set\n"); if (res > 0) - erl_exit(-1, + erts_exit(1, "Value of environment variable BINDIR is too large\n"); } if (bindir[0] != DIR_SEPARATOR_CHAR) - erl_exit(-1, + erts_exit(1, "Environment variable BINDIR does not contain an" " absolute path\n"); csp_path_sz = (strlen(bindir) @@ -825,7 +825,7 @@ break_requested(void) fprintf(stderr,"break!\n"); #endif if (ERTS_BREAK_REQUESTED) - erl_exit(ERTS_INTR_EXIT, ""); + erts_exit(ERTS_INTR_EXIT, ""); ERTS_SET_BREAK_REQUESTED; ERTS_CHK_IO_AS_INTR(); /* Make sure we don't sleep in poll */ @@ -864,7 +864,7 @@ sigusr1_exit(void) } prepare_crash_dump(secs); - erl_exit(1, "Received SIGUSR1\n"); + erts_exit(ERTS_ERROR_EXIT, "Received SIGUSR1\n"); } #ifdef ETHR_UNUSABLE_SIGUSRX @@ -920,7 +920,7 @@ static RETSIGTYPE suspend_signal(int signum) static void quit_requested(void) { - erl_exit(ERTS_INTR_EXIT, ""); + erts_exit(ERTS_INTR_EXIT, ""); } #if (defined(SIG_SIGSET) || defined(SIG_SIGNAL)) @@ -3165,7 +3165,7 @@ signal_dispatcher_thread_func(void *unused) if (res < 0) { if (errno == EINTR) continue; - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "signal-dispatcher thread got unexpected error: %s (%d)\n", erl_errno_id(errno), errno); @@ -3214,7 +3214,7 @@ signal_dispatcher_thread_func(void *unused) sigusr1_exit(); break; default: - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "signal-dispatcher thread received unknown " "signal notification: '%c'\n", buf[i]); @@ -3233,7 +3233,7 @@ init_smp_sig_notify(void) thr_opts.name = "sys_sig_dispatcher"; if (pipe(sig_notify_fds) < 0) { - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Failed to create signal-dispatcher pipe: %s (%d)\n", erl_errno_id(errno), errno); @@ -3249,7 +3249,7 @@ init_smp_sig_notify(void) static void init_smp_sig_suspend(void) { if (pipe(sig_suspend_fds) < 0) { - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Failed to create sig_suspend pipe: %s (%d)\n", erl_errno_id(errno), errno); @@ -3265,7 +3265,7 @@ static void initialize_darwin_main_thread_pipes(void) { if (pipe(erts_darwin_main_thread_pipe) < 0 || pipe(erts_darwin_main_thread_result_pipe) < 0) { - erl_exit(1,"Fatal error initializing Darwin main thread stealing"); + erts_exit(ERTS_ERROR_EXIT,"Fatal error initializing Darwin main thread stealing"); } } diff --git a/erts/emulator/sys/unix/sys_float.c b/erts/emulator/sys/unix/sys_float.c index 1ef9e5eef7..8fe7e599e5 100644 --- a/erts/emulator/sys/unix/sys_float.c +++ b/erts/emulator/sys/unix/sys_float.c @@ -90,7 +90,7 @@ void erts_fp_check_init_error(volatile unsigned long *fpexnp) snprintf(buf, sizeof buf, "ERTS_FP_CHECK_INIT at %p: detected unhandled FPE at %p\r\n", __builtin_return_address(0), (void*)*fpexnp); if (write(2, buf, strlen(buf)) <= 0) - erl_exit(ERTS_ABORT_EXIT, "%s", buf); + erts_exit(ERTS_ABORT_EXIT, "%s", buf); *fpexnp = 0; #if defined(__i386__) || defined(__x86_64__) erts_restore_fpu(); diff --git a/erts/emulator/sys/unix/sys_time.c b/erts/emulator/sys/unix/sys_time.c index 2e1914f564..95b3daa4ed 100644 --- a/erts/emulator/sys/unix/sys_time.c +++ b/erts/emulator/sys/unix/sys_time.c @@ -342,7 +342,7 @@ sys_init_time(ErtsSysInitTimeResult *init_resp) * times() (CLK_TCK), the resolution is always one millisecond.. */ if ((erts_sys_time_data__.r.o.ticks_per_sec = TICKS_PER_SEC()) < 0) - erl_exit(ERTS_ABORT_EXIT, "Can't get clock ticks/sec\n"); + erts_exit(ERTS_ABORT_EXIT, "Can't get clock ticks/sec\n"); #if defined(OS_MONOTONIC_TIME_USING_TIMES) #if ERTS_COMPILE_TIME_MONOTONIC_TIME_UNIT @@ -450,7 +450,7 @@ posix_clock_gettime(clockid_t id, char *name) if (clock_gettime(id, &ts) != 0) { int err = errno; char *errstr = err ? strerror(err) : "unknown"; - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "clock_gettime(%s, _) failed: %s (%d)\n", name, errstr, err); } @@ -495,13 +495,13 @@ posix_clock_gettime_times(clockid_t mid, char *mname, if (mres != 0) { char *errstr = merr ? strerror(merr) : "unknown"; - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "clock_gettime(%s, _) failed: %s (%d)\n", mname, errstr, merr); } if (sres != 0) { char *errstr = serr ? strerror(serr) : "unknown"; - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "clock_gettime(%s, _) failed: %s (%d)\n", sname, errstr, serr); } @@ -674,7 +674,7 @@ mach_clocks_init(void) clck_srv_p = &internal_state.r.o.mach.clock.monotonic.srv; kret = host_get_clock_service(host, id, clck_srv_p); if (kret != KERN_SUCCESS) { - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "host_get_clock_service(_, %s, _) failed\n", name); } @@ -686,7 +686,7 @@ mach_clocks_init(void) clck_srv_p = &internal_state.r.o.mach.clock.wall.srv; kret = host_get_clock_service(host, id, clck_srv_p); if (kret != KERN_SUCCESS) { - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "host_get_clock_service(_, %s, _) failed\n", name); } @@ -695,7 +695,7 @@ mach_clocks_init(void) if (atexit(mach_clocks_fini) != 0) { int err = errno; char *errstr = err ? strerror(err) : "unknown"; - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "Failed to register mach_clocks_fini() " "for call at exit: %s (%d)\n", errstr, err); @@ -717,7 +717,7 @@ mach_clock_getres(ErtsMachClock *clk) (clock_attr_t) attr, &cnt); if (kret != KERN_SUCCESS || cnt != 1) { - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "clock_get_attributes(%s, _) failed\n", clk->name); } @@ -735,7 +735,7 @@ mach_clock_get_time(ErtsMachClock *clk) kret = clock_get_time(clk->srv, &time_spec); if (kret != KERN_SUCCESS) - erl_exit(ERTS_ABORT_EXIT, "clock_get_time(%s, _) failed\n", clk->name); + erts_exit(ERTS_ABORT_EXIT, "clock_get_time(%s, _) failed\n", clk->name); return ERTS_TimeSpec2Sint64(&time_spec); } @@ -781,11 +781,11 @@ erts_os_times(ErtsMonotonicTime *mtimep, ErtsSystemTime *stimep) &sys_time_spec); if (mkret != KERN_SUCCESS) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "clock_get_time(%s, _) failed\n", internal_state.r.o.mach.clock.monotonic.name); if (skret != KERN_SUCCESS) - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "clock_get_time(%s, _) failed\n", internal_state.r.o.mach.clock.wall.name); @@ -850,7 +850,7 @@ erts_os_system_time(void) if (gettimeofday(&tv, NULL) != 0) { int err = errno; char *errstr = err ? strerror(err) : "unknown"; - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "gettimeofday(_, NULL) failed: %s (%d)\n", errstr, err); } diff --git a/erts/emulator/sys/win32/erl_poll.c b/erts/emulator/sys/win32/erl_poll.c index 466f4a3b48..547d4b1d21 100644 --- a/erts/emulator/sys/win32/erl_poll.c +++ b/erts/emulator/sys/win32/erl_poll.c @@ -436,7 +436,7 @@ wakeup_cause(ErtsPollSet ps) break; default: res = 0; - erl_exit(ERTS_ABORT_EXIT, + erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error: Invalid wakeup_state=%d\n", __FILE__, __LINE__, (int) wakeup_state); } @@ -576,7 +576,7 @@ static void signal_standby(ErtsPollSet ps) --(ps->standby_wait_counter); if (ps->standby_wait_counter < 0) { LeaveCriticalSection(&(ps->standby_crit)); - erl_exit(1,"Standby signalled by more threads than expected"); + erts_exit(ERTS_ERROR_EXIT,"Standby signalled by more threads than expected"); } if (!(ps->standby_wait_counter)) { SetEvent(ps->standby_wait_event); @@ -738,7 +738,7 @@ static void *break_waiter(void *param) erts_mtx_unlock(&break_waiter_lock); break; default: - erl_exit(1,"Unexpected event in break_waiter"); + erts_exit(ERTS_ERROR_EXIT,"Unexpected event in break_waiter"); } } } @@ -1157,7 +1157,7 @@ int erts_poll_wait(ErtsPollSet ps, HARDDEBUGF(("Oups!")); /* Oups, got signalled before we took the lock, can't reset */ if(!is_io_ready(ps)) { - erl_exit(1,"Internal error: " + erts_exit(ERTS_ERROR_EXIT,"Internal error: " "Inconsistent io structures in erl_poll.\n"); } START_WAITER(ps,w); @@ -1215,7 +1215,7 @@ int erts_poll_wait(ErtsPollSet ps, ERTS_SET_BREAK_REQUESTED; break; case BREAK_WAITER_GOT_HALT: - erl_exit(0,""); + erts_exit(0,""); break; default: break; diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c index fce76db28f..37d3e16256 100644 --- a/erts/emulator/sys/win32/sys.c +++ b/erts/emulator/sys/win32/sys.c @@ -38,7 +38,7 @@ void erts_sys_init_float(void); void erl_start(int, char**); -void erl_exit(int n, char*, ...); +void erts_exit(int n, char*, ...); void erl_error(char*, va_list); void erl_crash_dump(char*, int, char*, ...); @@ -200,7 +200,7 @@ erts_sys_misc_mem_sz(void) */ void sys_tty_reset(int exit_code) { - if (exit_code > 0) + if (exit_code == ERTS_ERROR_EXIT) ConWaitForExit(); else ConNormalExit(); @@ -3110,13 +3110,13 @@ check_supported_os_version(void) || int_os_version.dwMajorVersion < major || (int_os_version.dwMajorVersion == major && int_os_version.dwMinorVersion < minor)) - erl_exit(-1, + erts_exit(1, "Windows version not supported " "(min required: winnt %d.%d)\n", major, minor); } #else - erl_exit(-1, + erts_exit(1, "Windows version not supported " "(min required: win %d.%d)\n", nt_major, nt_minor); diff --git a/erts/emulator/sys/win32/sys_interrupt.c b/erts/emulator/sys/win32/sys_interrupt.c index d6178de03c..a89211fa8e 100644 --- a/erts/emulator/sys/win32/sys_interrupt.c +++ b/erts/emulator/sys/win32/sys_interrupt.c @@ -81,7 +81,7 @@ BOOL WINAPI ctrl_handler_ignore_break(DWORD dwCtrlType) return TRUE; /* else pour through... */ case CTRL_CLOSE_EVENT: - erl_exit(0, ""); + erts_exit(0, ""); break; } return TRUE; @@ -106,7 +106,7 @@ BOOL WINAPI ctrl_handler_replace_intr(DWORD dwCtrlType) /* else pour through... */ case CTRL_CLOSE_EVENT: case CTRL_SHUTDOWN_EVENT: - erl_exit(0, ""); + erts_exit(0, ""); break; } return TRUE; @@ -133,7 +133,7 @@ BOOL WINAPI ctrl_handler(DWORD dwCtrlType) return TRUE; /* else pour through... */ case CTRL_CLOSE_EVENT: - erl_exit(0, ""); + erts_exit(0, ""); break; } return TRUE; diff --git a/erts/emulator/sys/win32/sys_time.c b/erts/emulator/sys/win32/sys_time.c index 9e5f78703a..3cf7f7cf07 100644 --- a/erts/emulator/sys/win32/sys_time.c +++ b/erts/emulator/sys/win32/sys_time.c @@ -147,7 +147,7 @@ os_monotonic_time_qpc(void) LARGE_INTEGER pc; if (!(*internal_state.r.o.pQueryPerformanceCounter)(&pc)) - erl_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n"); + erts_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n"); return (ErtsMonotonicTime) pc.QuadPart; } @@ -164,7 +164,7 @@ os_times_qpc(ErtsMonotonicTime *mtimep, ErtsSystemTime *stimep) GetSystemTime(&st); if (!qpcr) - erl_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n"); + erts_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n"); *mtimep = (ErtsMonotonicTime) pc.QuadPart; @@ -251,7 +251,7 @@ sys_hrtime_qpc(void) LARGE_INTEGER pc; if (!(*internal_state.r.o.pQueryPerformanceCounter)(&pc)) - erl_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n"); + erts_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n"); ASSERT(pc.QuadPart > 0); diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl index d71cedbdc5..151fab0a0e 100644 --- a/erts/emulator/test/distribution_SUITE.erl +++ b/erts/emulator/test/distribution_SUITE.erl @@ -164,7 +164,7 @@ bulk_send(Terms, BinSize) -> ?line stop_node(Node), ?line test_server:timetrap_cancel(Dog), - {comment, integer_to_list(trunc(Size/1024/Elapsed+0.5)) ++ " K/s"}. + {comment, integer_to_list(trunc(Size/1024/max(1,Elapsed)+0.5)) ++ " K/s"}. bulk_sendsend(Terms, BinSize) -> {Rate1, MonitorCount1} = bulk_sendsend2(Terms, BinSize, 5), diff --git a/erts/emulator/test/estone_SUITE.erl b/erts/emulator/test/estone_SUITE.erl index dc8f0aaee9..d49ab3de4d 100644 --- a/erts/emulator/test/estone_SUITE.erl +++ b/erts/emulator/test/estone_SUITE.erl @@ -382,11 +382,11 @@ apply_micro(M) -> {weight_percentage, M#micro.weight}, {loops, M#micro.loops}, {microsecs,MicroSecs}, - {estones, (M#micro.weight * M#micro.weight * ?STONEFACTOR) div MicroSecs}, + {estones, (M#micro.weight * M#micro.weight * ?STONEFACTOR) div max(1,MicroSecs)}, {gcs, GC1 - GC0}, {kilo_word_reclaimed, (Words1 - Words0) div 1000}, {kilo_reductions, Reds div 1000}, - {gc_intensity, gci(Elapsed, GC1 - GC0, Words1 - Words0)}]. + {gc_intensity, gci(max(1,Elapsed), GC1 - GC0, Words1 - Words0)}]. monotonic_time() -> try erlang:monotonic_time() catch error:undef -> erlang:now() end. diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl index 3d478654b1..e10460ce78 100644 --- a/erts/emulator/test/nif_SUITE.erl +++ b/erts/emulator/test/nif_SUITE.erl @@ -617,7 +617,6 @@ resource_new_do2(Type) -> ?line {PtrA,BinA} = get_resource(Type, ResA), ?line {PtrB,BinB} = get_resource(Type, ResB), ?line true = (PtrA =/= PtrB), - ?line [] = last_resource_dtor_call(), %% forget ResA and make it garbage {{PtrA,BinA}, {ResB,PtrB,BinB}}. diff --git a/erts/emulator/valgrind/suppress.patched.3.6.0 b/erts/emulator/valgrind/suppress.patched.3.6.0 index 16cecf2dba..fcde4a0123 100644 --- a/erts/emulator/valgrind/suppress.patched.3.6.0 +++ b/erts/emulator/valgrind/suppress.patched.3.6.0 @@ -368,7 +368,7 @@ Memcheck:Addr4 ... fun:erts_print_scheduler_info ... -fun:erl_exit +fun:erts_exit fun:broken_halt_test fun:erts_debug_set_internal_state_2 fun:process_main diff --git a/erts/emulator/valgrind/suppress.standard b/erts/emulator/valgrind/suppress.standard index a1f3f82364..bb07c92fc1 100644 --- a/erts/emulator/valgrind/suppress.standard +++ b/erts/emulator/valgrind/suppress.standard @@ -336,7 +336,7 @@ Memcheck:Addr4 ... fun:erts_print_scheduler_info ... -fun:erl_exit +fun:erts_exit fun:broken_halt_test fun:erts_debug_set_internal_state_2 fun:process_main diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c index 63ec18d939..5513cb2d7e 100644 --- a/erts/epmd/src/epmd.c +++ b/erts/epmd/src/epmd.c @@ -343,7 +343,7 @@ static void run_daemon(EpmdVars *g) for (fd = 0; fd < g->max_conn ; fd++) /* close all files ... */ close(fd); /* Syslog on linux will try to write to whatever if we dont - inform it of that the log is closed. */ + inform it that the log is closed. */ closelog(); /* These shouldn't be needed but for safety... */ diff --git a/erts/epmd/src/epmd_cli.c b/erts/epmd/src/epmd_cli.c index a8fe865d9a..6fc05e153e 100644 --- a/erts/epmd/src/epmd_cli.c +++ b/erts/epmd/src/epmd_cli.c @@ -136,19 +136,33 @@ void epmd_call(EpmdVars *g,int what) static int conn_to_epmd(EpmdVars *g) { struct EPMD_SOCKADDR_IN address; + size_t salen = 0; int connect_sock; - - connect_sock = socket(FAMILY, SOCK_STREAM, 0); - if (connect_sock<0) - goto error; + unsigned short sport = g->port; + +#if defined(EPMD6) + SET_ADDR6(address, in6addr_loopback, sport); + salen = sizeof(struct sockaddr_in6); + + connect_sock = socket(AF_INET6, SOCK_STREAM, 0); + if (connect_sock>=0) { + + if (connect(connect_sock, (struct sockaddr*)&address, salen) == 0) + return connect_sock; - { /* store port number in unsigned short */ - unsigned short sport = g->port; - SET_ADDR(address, EPMD_ADDR_LOOPBACK, sport); + close(connect_sock); } +#endif + SET_ADDR(address, htonl(INADDR_LOOPBACK), sport); + salen = sizeof(struct sockaddr_in); - if (connect(connect_sock, (struct sockaddr*)&address, sizeof address) < 0) + connect_sock = socket(AF_INET, SOCK_STREAM, 0); + if (connect_sock<0) goto error; + + if (connect(connect_sock, (struct sockaddr*)&address, salen) < 0) + goto error; + return connect_sock; error: diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h index 26100afc93..09317094c7 100644 --- a/erts/epmd/src/epmd_int.h +++ b/erts/epmd/src/epmd_int.h @@ -55,6 +55,7 @@ # ifndef WINDOWS_H_INCLUDES_WINSOCK2_H # include <winsock2.h> # endif +# include <ws2tcpip.h> # include <windows.h> # include <process.h> #endif @@ -130,6 +131,10 @@ # include <systemd/sd-daemon.h> #endif /* HAVE_SYSTEMD_DAEMON */ +#if defined(HAVE_IN6) && defined(AF_INET6) && defined(HAVE_INET_PTON) +# define EPMD6 +#endif + /* ************************************************************************ */ /* Replace some functions by others by making the function name a macro */ @@ -183,33 +188,53 @@ /* ************************************************************************ */ /* Macros that let us use IPv6 */ -#if defined(HAVE_IN6) && defined(AF_INET6) && defined(EPMD6) +#if HAVE_IN6 +# if ! defined(HAVE_IN6ADDR_ANY) || ! HAVE_IN6ADDR_ANY +# if HAVE_DECL_IN6ADDR_ANY_INIT +static const struct in6_addr in6addr_any = { { IN6ADDR_ANY_INIT } }; +# else +static const struct in6_addr in6addr_any = + { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }; +# endif /* HAVE_IN6ADDR_ANY_INIT */ +# endif /* ! HAVE_DECL_IN6ADDR_ANY */ + +# if ! defined(HAVE_IN6ADDR_LOOPBACK) || ! HAVE_IN6ADDR_LOOPBACK +# if HAVE_DECL_IN6ADDR_LOOPBACK_INIT +static const struct in6_addr in6addr_loopback = + { { IN6ADDR_LOOPBACK_INIT } }; +# else +static const struct in6_addr in6addr_loopback = + { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }; +# endif /* HAVE_IN6ADDR_LOOPBACK_INIT */ +# endif /* ! HAVE_DECL_IN6ADDR_LOOPBACK */ +#endif /* HAVE_IN6 */ + +#define IS_ADDR_LOOPBACK(addr) ((addr).s_addr == htonl(INADDR_LOOPBACK)) + +#if defined(EPMD6) -#define EPMD_SOCKADDR_IN sockaddr_in6 -#define EPMD_IN_ADDR in6_addr -#define EPMD_S_ADDR s6_addr -#define EPMD_ADDR_LOOPBACK in6addr_loopback.s6_addr -#define EPMD_ADDR_ANY in6addr_any.s6_addr +#define EPMD_SOCKADDR_IN sockaddr_storage #define FAMILY AF_INET6 -#define SET_ADDR(dst, addr, port) do { \ - memset((char*)&(dst), 0, sizeof(dst)); \ - memcpy((char*)&(dst).sin6_addr.s6_addr, (char*)&(addr), 16); \ - (dst).sin6_family = AF_INET6; \ - (dst).sin6_flowinfo = 0; \ - (dst).sin6_port = htons(port); \ +#define SET_ADDR6(dst, addr, port) do { \ + struct sockaddr_in6 *sa = (struct sockaddr_in6 *)&(dst); \ + memset(sa, 0, sizeof(dst)); \ + sa->sin6_family = AF_INET6; \ + sa->sin6_addr = (addr); \ + sa->sin6_port = htons(port); \ } while(0) -#define IS_ADDR_LOOPBACK(addr) \ - (memcmp((addr).s6_addr, in6addr_loopback.s6_addr, 16) == 0) +#define SET_ADDR(dst, addr, port) do { \ + struct sockaddr_in *sa = (struct sockaddr_in *)&(dst); \ + memset(sa, 0, sizeof(dst)); \ + sa->sin_family = AF_INET; \ + sa->sin_addr.s_addr = (addr); \ + sa->sin_port = htons(port); \ + } while(0) #else /* Not IP v6 */ #define EPMD_SOCKADDR_IN sockaddr_in -#define EPMD_IN_ADDR in_addr -#define EPMD_S_ADDR s_addr -#define EPMD_ADDR_LOOPBACK htonl(INADDR_LOOPBACK) -#define EPMD_ADDR_ANY htonl(INADDR_ANY) #define FAMILY AF_INET #define SET_ADDR(dst, addr, port) do { \ @@ -219,8 +244,6 @@ (dst).sin_port = htons(port); \ } while(0) -#define IS_ADDR_LOOPBACK(addr) ((addr).s_addr == htonl(INADDR_LOOPBACK)) - #endif /* Not IP v6 */ /* ************************************************************************ */ diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c index 7100855407..e1bac99ef9 100644 --- a/erts/epmd/src/epmd_srv.c +++ b/erts/epmd/src/epmd_srv.c @@ -76,6 +76,7 @@ static time_t current_time(EpmdVars*); static Connection *conn_init(EpmdVars*); static int conn_open(EpmdVars*,int); +static int conn_local_peer_check(EpmdVars*, int); static int conn_close_fd(EpmdVars*,int); static void node_init(EpmdVars*); @@ -206,10 +207,11 @@ void run(EpmdVars *g) { struct EPMD_SOCKADDR_IN iserv_addr[MAX_LISTEN_SOCKETS]; int listensock[MAX_LISTEN_SOCKETS]; - int num_sockets; + int num_sockets = 0; int i; int opt; unsigned short sport = g->port; + int bound = 0; node_init(g); g->conn = conn_init(g); @@ -252,64 +254,82 @@ void run(EpmdVars *g) if (g->addresses != NULL && /* String contains non-separator characters if: */ g->addresses[strspn(g->addresses," ,")] != '\000') { - char *tmp; - char *token; - int loopback_ok = 0; + char *tmp = NULL; + char *token = NULL; + + /* Always listen on the loopback. */ + SET_ADDR(iserv_addr[num_sockets],htonl(INADDR_LOOPBACK),sport); + num_sockets++; +#if defined(EPMD6) + SET_ADDR6(iserv_addr[num_sockets],in6addr_loopback,sport); + num_sockets++; +#endif - if ((tmp = (char *)malloc(strlen(g->addresses) + 1)) == NULL) + if ((tmp = strdup(g->addresses)) == NULL) { dbg_perror(g,"cannot allocate memory"); epmd_cleanup_exit(g,1); } - strcpy(tmp,g->addresses); - for(token = strtok(tmp,", "), num_sockets = 0; + for(token = strtok(tmp,", "); token != NULL; - token = strtok(NULL,", "), num_sockets++) + token = strtok(NULL,", ")) { - struct EPMD_IN_ADDR addr; -#ifdef HAVE_INET_PTON - int ret; + struct in_addr addr; +#if defined(EPMD6) + struct in6_addr addr6; + struct sockaddr_storage *sa = &iserv_addr[num_sockets]; - if ((ret = inet_pton(FAMILY,token,&addr)) == -1) + if (inet_pton(AF_INET6,token,&addr6) == 1) { - dbg_perror(g,"cannot convert IP address to network format"); - epmd_cleanup_exit(g,1); + SET_ADDR6(iserv_addr[num_sockets],addr6,sport); + } + else if (inet_pton(AF_INET,token,&addr) == 1) + { + SET_ADDR(iserv_addr[num_sockets],addr.s_addr,sport); + } + else +#else + if ((addr.s_addr = inet_addr(token)) != INADDR_NONE) + { + SET_ADDR(iserv_addr[num_sockets],addr.s_addr,sport); } - else if (ret == 0) -#elif !defined(EPMD6) - if ((addr.EPMD_S_ADDR = inet_addr(token)) == INADDR_NONE) + else #endif { dbg_tty_printf(g,0,"cannot parse IP address \"%s\"",token); epmd_cleanup_exit(g,1); } +#if defined(EPMD6) + if (sa->ss_family == AF_INET6 && IN6_IS_ADDR_LOOPBACK(&addr6)) + continue; + + if (sa->ss_family == AF_INET) +#endif if (IS_ADDR_LOOPBACK(addr)) - loopback_ok = 1; + continue; - if (num_sockets - loopback_ok == MAX_LISTEN_SOCKETS - 1) + num_sockets++; + + if (num_sockets >= MAX_LISTEN_SOCKETS) { dbg_tty_printf(g,0,"cannot listen on more than %d IP addresses", MAX_LISTEN_SOCKETS); epmd_cleanup_exit(g,1); } - - SET_ADDR(iserv_addr[num_sockets],addr.EPMD_S_ADDR,sport); } free(tmp); - - if (!loopback_ok) - { - SET_ADDR(iserv_addr[num_sockets],EPMD_ADDR_LOOPBACK,sport); - num_sockets++; - } } else { - SET_ADDR(iserv_addr[0],EPMD_ADDR_ANY,sport); - num_sockets = 1; + SET_ADDR(iserv_addr[num_sockets],htonl(INADDR_ANY),sport); + num_sockets++; +#if defined(EPMD6) + SET_ADDR6(iserv_addr[num_sockets],in6addr_any,sport); + num_sockets++; +#endif } #ifdef HAVE_SYSTEMD_DAEMON } @@ -340,13 +360,39 @@ void run(EpmdVars *g) #endif /* HAVE_SYSTEMD_DAEMON */ for (i = 0; i < num_sockets; i++) { - if ((listensock[i] = socket(FAMILY,SOCK_STREAM,0)) < 0) + struct sockaddr *sa = (struct sockaddr *)&iserv_addr[i]; +#if defined(EPMD6) + size_t salen = (sa->sa_family == AF_INET6 ? + sizeof(struct sockaddr_in6) : + sizeof(struct sockaddr_in)); +#else + size_t salen = sizeof(struct sockaddr_in); +#endif + + if ((listensock[i] = socket(sa->sa_family,SOCK_STREAM,0)) < 0) { - dbg_perror(g,"error opening stream socket"); + switch (errno) { + case EAFNOSUPPORT: + case EPROTONOSUPPORT: + continue; + default: + dbg_perror(g,"error opening stream socket"); + epmd_cleanup_exit(g,1); + } + } + g->listenfd[bound++] = listensock[i]; + +#if HAVE_DECL_IPV6_V6ONLY + opt = 1; + if (sa->sa_family == AF_INET6 && + setsockopt(listensock[i],IPPROTO_IPV6,IPV6_V6ONLY,&opt, + sizeof(opt)) <0) + { + dbg_perror(g,"can't set IPv6 only socket option"); epmd_cleanup_exit(g,1); } - g->listenfd[i] = listensock[i]; - +#endif + /* * Note that we must not enable the SO_REUSEADDR on Windows, * because addresses will be reused even if they are still in use. @@ -378,8 +424,7 @@ void run(EpmdVars *g) dbg_perror(g,"failed to set non-blocking mode of listening socket %d", listensock[i]); - if (bind(listensock[i], (struct sockaddr*) &iserv_addr[i], - sizeof(iserv_addr[i])) < 0) + if (bind(listensock[i], (struct sockaddr*) &iserv_addr[i], salen) < 0) { if (errno == EADDRINUSE) { @@ -400,6 +445,11 @@ void run(EpmdVars *g) } select_fd_set(g, listensock[i]); } + if (bound == 0) { + dbg_perror(g,"unable to bind any address"); + epmd_cleanup_exit(g,1); + } + num_sockets = bound; #ifdef HAVE_SYSTEMD_DAEMON } sd_notifyf(0, "READY=1\n" @@ -444,8 +494,8 @@ void run(EpmdVars *g) } for (i = 0; i < num_sockets; i++) - if (FD_ISSET(listensock[i],&read_mask)) { - if (do_accept(g, listensock[i]) && g->active_conn < g->max_conn) { + if (FD_ISSET(g->listenfd[i],&read_mask)) { + if (do_accept(g, g->listenfd[i]) && g->active_conn < g->max_conn) { /* * The accept() succeeded, and we have at least one file * descriptor still free, which means that another accept() @@ -1005,15 +1055,6 @@ static int conn_open(EpmdVars *g,int fd) for (i = 0; i < g->max_conn; i++) { if (g->conn[i].open == EPMD_FALSE) { - struct sockaddr_in si; - struct sockaddr_in di; -#ifdef HAVE_SOCKLEN_T - socklen_t st; -#else - int st; -#endif - st = sizeof(si); - g->active_conn++; s = &g->conn[i]; @@ -1024,20 +1065,7 @@ static int conn_open(EpmdVars *g,int fd) s->open = EPMD_TRUE; s->keep = EPMD_FALSE; - /* Determine if connection is from localhost */ - if (getpeername(s->fd,(struct sockaddr*) &si,&st) || - st < sizeof(si)) { - /* Failure to get peername is regarded as non local host */ - s->local_peer = EPMD_FALSE; - } else { - /* Only 127.x.x.x and connections from the host's IP address - allowed, no false positives */ - s->local_peer = - (((((unsigned) ntohl(si.sin_addr.s_addr)) & 0xFF000000U) == - 0x7F000000U) || - (getsockname(s->fd,(struct sockaddr*) &di,&st) ? - EPMD_FALSE : si.sin_addr.s_addr == di.sin_addr.s_addr)); - } + s->local_peer = conn_local_peer_check(g, s->fd); dbg_tty_printf(g,2,(s->local_peer) ? "Local peer connected" : "Non-local peer connected"); @@ -1045,7 +1073,7 @@ static int conn_open(EpmdVars *g,int fd) s->got = 0; s->mod_time = current_time(g); /* Note activity */ - s->buf = (char *)malloc(INBUF_SIZE); + s->buf = malloc(INBUF_SIZE); if (s->buf == NULL) { dbg_printf(g,0,"epmd: Insufficient memory"); @@ -1063,6 +1091,60 @@ static int conn_open(EpmdVars *g,int fd) return EPMD_FALSE; } +static int conn_local_peer_check(EpmdVars *g, int fd) +{ + struct EPMD_SOCKADDR_IN si; + struct EPMD_SOCKADDR_IN di; + + struct sockaddr_in *si4 = (struct sockaddr_in *)&si; + struct sockaddr_in *di4 = (struct sockaddr_in *)&di; + +#if defined(EPMD6) + struct sockaddr_in6 *si6 = (struct sockaddr_in6 *)&si; + struct sockaddr_in6 *di6 = (struct sockaddr_in6 *)&di; +#endif + +#ifdef HAVE_SOCKLEN_T + socklen_t st; +#else + int st; +#endif + + st = sizeof(si); + + /* Determine if connection is from localhost */ + if (getpeername(fd,(struct sockaddr*) &si,&st) || + st > sizeof(si)) { + /* Failure to get peername is regarded as non local host */ + return EPMD_FALSE; + } + + /* Only 127.x.x.x and connections from the host's IP address + allowed, no false positives */ +#if defined(EPMD6) + if (si.ss_family == AF_INET6 && IN6_IS_ADDR_LOOPBACK(&(si6->sin6_addr))) + return EPMD_TRUE; + + if (si.ss_family == AF_INET) +#endif + if ((((unsigned) ntohl(si4->sin_addr.s_addr)) & 0xFF000000U) == + 0x7F000000U) + return EPMD_TRUE; + + if (getsockname(fd,(struct sockaddr*) &di,&st)) + return EPMD_FALSE; + +#if defined(EPMD6) + if (si.ss_family == AF_INET6) + return IN6_ARE_ADDR_EQUAL( &(si6->sin6_addr), &(di6->sin6_addr)); + if (si.ss_family == AF_INET) +#endif + return si4->sin_addr.s_addr == di4->sin_addr.s_addr; +#if defined(EPMD6) + return EPMD_FALSE; +#endif +} + static int conn_close_fd(EpmdVars *g,int fd) { int i; diff --git a/erts/epmd/test/epmd_SUITE.erl b/erts/epmd/test/epmd_SUITE.erl index 4de65500e9..d5837e5b8c 100644 --- a/erts/epmd/test/epmd_SUITE.erl +++ b/erts/epmd/test/epmd_SUITE.erl @@ -43,6 +43,7 @@ -export( [ register_name/1, + register_name_ipv6/1, register_names_1/1, register_names_2/1, register_duplicate_name/1, @@ -113,7 +114,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> - [register_name, register_names_1, register_names_2, + [register_name, register_name_ipv6, + register_names_1, register_names_2, register_duplicate_name, unicode_name, long_unicode_name, get_port_nr, slow_get_port_nr, unregister_others_name_1, unregister_others_name_2, @@ -172,6 +174,24 @@ register_name(Config) when is_list(Config) -> ?line ok = close(Sock), % Unregister ok. +register_name_ipv6(doc) -> + ["Register a name over IPv6"]; +register_name_ipv6(suite) -> + []; +register_name_ipv6(Config) when is_list(Config) -> + % Test if the host has an IPv6 loopback address + Res = gen_tcp:listen(0, [inet6, {ip, {0,0,0,0,0,0,0,1}}]), + case Res of + {ok,LSock} -> + gen_tcp:close(LSock), + ?line ok = epmdrun(), + ?line {ok,Sock} = register_node6("foobar6"), + ?line ok = close(Sock), % Unregister + ok; + _Error -> + {skip, "Host does not have an IPv6 loopback address"} + end. + register_names_1(doc) -> ["Register and unregister two nodes"]; register_names_1(suite) -> @@ -245,9 +265,14 @@ register_node(Name) -> register_node(Name,Port) -> register_node_v2(Port,$M,0,5,5,Name,""). +register_node6(Name) -> + register_node_v2({0,0,0,0,0,0,0,1},?DUMMY_PORT,$M,0,5,5,Name,""). + register_node_v2(Port, NodeType, Prot, HVsn, LVsn, Name, Extra) -> + register_node_v2("localhost", Port, NodeType, Prot, HVsn, LVsn, Name, Extra). +register_node_v2(Addr, Port, NodeType, Prot, HVsn, LVsn, Name, Extra) -> Req = alive2_req(Port, NodeType, Prot, HVsn, LVsn, Name, Extra), - case send_req(Req) of + case send_req(Req, Addr) of {ok,Sock} -> case recv(Sock,4) of {ok, [?EPMD_ALIVE2_RESP,_Res=0,_C0,_C1]} -> @@ -1186,7 +1211,9 @@ send_direct(Sock, Bytes) -> end. send_req(Req) -> - case connect() of + send_req(Req, "localhost"). +send_req(Req, Addr) -> + case connect(Addr) of {ok,Sock} -> case send(Sock, [size16(Req), Req]) of ok -> diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c index 9571b83ffd..1a826221fb 100644 --- a/erts/etc/common/heart.c +++ b/erts/etc/common/heart.c @@ -472,10 +472,6 @@ message_loop(erlin_fd, erlout_fd) switch (mp->op) { case HEART_BEAT: timestamp(&last_received); -#ifdef USE_WATCHDOG - /* reset the hardware watchdog timer */ - wd_reset(); -#endif break; case SHUT_DOWN: return R_SHUT_DOWN; diff --git a/erts/etc/win32/cygwin_tools/vc/cc.sh b/erts/etc/win32/cygwin_tools/vc/cc.sh index 48a579d5f0..651b6e098d 100755 --- a/erts/etc/win32/cygwin_tools/vc/cc.sh +++ b/erts/etc/win32/cygwin_tools/vc/cc.sh @@ -267,7 +267,7 @@ for x in $SOURCES; do echo echo after_sed=`date '+%s'` - echo Made dependencises for $x':' `expr $after_sed '-' $start_time` 's' >&2 + echo Made dependencies for $x':' `expr $after_sed '-' $start_time` 's' >&2 fi else cat $MSG_FILE diff --git a/erts/etc/win32/msys_tools/vc/cc.sh b/erts/etc/win32/msys_tools/vc/cc.sh index ac89aac34e..72005862ed 100644 --- a/erts/etc/win32/msys_tools/vc/cc.sh +++ b/erts/etc/win32/msys_tools/vc/cc.sh @@ -268,7 +268,7 @@ for x in $SOURCES; do echo echo after_sed=`date '+%s'` - echo Made dependencises for $x':' `expr $after_sed '-' $start_time` 's' >&2 + echo Made dependencies for $x':' `expr $after_sed '-' $start_time` 's' >&2 fi else cat $MSG_FILE diff --git a/erts/include/internal/ethread_header_config.h.in b/erts/include/internal/ethread_header_config.h.in index 9cabd0591a..f4b08cfced 100644 --- a/erts/include/internal/ethread_header_config.h.in +++ b/erts/include/internal/ethread_header_config.h.in @@ -166,6 +166,10 @@ /* Define if you use a gcc that supports the double word cmpxchg instruction */ #undef ETHR_GCC_HAVE_DW_CMPXCHG_ASM_SUPPORT +/* Define if gcc wont let you clobber ebx with cmpxchg8b and position + independent code */ +#undef ETHR_CMPXCHG8B_PIC_NO_CLOBBER_EBX + /* Define if you get a register shortage with cmpxchg8b and position independent code */ #undef ETHR_CMPXCHG8B_REGISTER_SHORTAGE diff --git a/erts/include/internal/i386/ethr_dw_atomic.h b/erts/include/internal/i386/ethr_dw_atomic.h index e8c4119ef0..5444a6345c 100644 --- a/erts/include/internal/i386/ethr_dw_atomic.h +++ b/erts/include/internal/i386/ethr_dw_atomic.h @@ -115,13 +115,19 @@ ethr_native_dw_atomic_addr(ethr_native_dw_atomic_t *var) return (ethr_sint_t *) ETHR_DW_NATMC_MEM__(var); } -#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__ +#if defined(ETHR_CMPXCHG8B_PIC_NO_CLOBBER_EBX) && defined(__PIC__) && __PIC__ +#if ETHR_SIZEOF_PTR != 4 +# error unexpected pic issue +#endif /* * When position independent code is used in 32-bit mode, the EBX register - * is used for storage of global offset table address, and we may not - * use it as input or output in an asm. We need to save and restore the - * EBX register explicitly (for some reason gcc doesn't provide this - * service to us). + * is used for storage of global offset table address. When compiling with + * an old gcc (< vsn 5) we may not use it as input or output in an inline + * asm. We then need to save and restore the EBX register explicitly (for + * some reason old gcc compilers didn't provide this service to us). + * ETHR_CMPXCHG8B_PIC_NO_CLOBBER_EBX will be defined if we need to + * explicitly manage EBX ourselves. + * */ # define ETHR_NO_CLOBBER_EBX__ 1 #else @@ -151,36 +157,53 @@ ethr_native_dw_atomic_cmpxchg_mb(ethr_native_dw_atomic_t *var, ETHR_DW_DBG_ALIGNED__(p); +#if ETHR_NO_CLOBBER_EBX__ && ETHR_CMPXCHG8B_REGISTER_SHORTAGE + /* + * gcc wont let us use ebx as input and we + * get a register shortage + */ + __asm__ __volatile__( -#if ETHR_NO_CLOBBER_EBX__ "pushl %%ebx\n\t" -# if ETHR_CMPXCHG8B_REGISTER_SHORTAGE "movl (%7), %%ebx\n\t" "movl 4(%7), %%ecx\n\t" -# else - "movl %8, %%ebx\n\t" -# endif -#endif - "lock; cmpxchg" ETHR_DW_CMPXCHG_SFX__ " %0\n\t" + "lock; cmpxchg8b %0\n\t" "setz %3\n\t" -#if ETHR_NO_CLOBBER_EBX__ "popl %%ebx\n\t" -#endif : "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=c"(xchgd) - : "m"(*p), "1"(xchg[1]), "2"(xchg[0]), -#if ETHR_NO_CLOBBER_EBX__ -# if ETHR_CMPXCHG8B_REGISTER_SHORTAGE - "3"(new) -# else - "3"(new[1]), - "r"(new[0]) -# endif + : "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "r"(new) + : "cc", "memory"); + +#elif ETHR_NO_CLOBBER_EBX__ + /* + * gcc wont let us use ebx as input + */ + + __asm__ __volatile__( + "pushl %%ebx\n\t" + "movl %8, %%ebx\n\t" + "lock; cmpxchg8b %0\n\t" + "setz %3\n\t" + "popl %%ebx\n\t" + : "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=q"(xchgd) + : "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "c"(new[1]), "r"(new[0]) + : "cc", "memory"); + #else - "3"(new[1]), - "b"(new[0]) -#endif + /* + * gcc lets us place values in the registers where + * we want them + */ + + __asm__ __volatile__( + "lock; cmpxchg" ETHR_DW_CMPXCHG_SFX__ " %0\n\t" + "setz %3\n\t" + : "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=q"(xchgd) + : "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "c"(new[1]), "b"(new[0]) : "cc", "memory"); +#endif + return (int) xchgd; } diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam Binary files differindex 32d5d70122..21dde7f257 100644 --- a/erts/preloaded/ebin/erts_internal.beam +++ b/erts/preloaded/ebin/erts_internal.beam diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam Binary files differindex 97170551bf..9256e35553 100644 --- a/erts/preloaded/ebin/prim_file.beam +++ b/erts/preloaded/ebin/prim_file.beam diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl index 7ed4efea4b..6db77a8482 100644 --- a/erts/preloaded/src/erts_internal.erl +++ b/erts/preloaded/src/erts_internal.erl @@ -35,6 +35,9 @@ -export([port_command/3, port_connect/2, port_close/1, port_control/3, port_call/3, port_info/1, port_info/2]). +-export([system_check/1, + gather_system_check_result/1]). + -export([request_system_task/3]). -export([check_process_code/2]). @@ -197,6 +200,23 @@ request_system_task(_Pid, _Prio, _Request) -> check_process_code(_Module, _OptionList) -> erlang:nif_error(undefined). +-spec system_check(Type) -> 'ok' when + Type :: 'schedulers'. + +system_check(_Type) -> + erlang:nif_error(undefined). + +gather_system_check_result(Ref) when is_reference(Ref) -> + gather_system_check_result(Ref, erlang:system_info(schedulers)). + +gather_system_check_result(_Ref, 0) -> + ok; +gather_system_check_result(Ref, N) -> + receive + Ref -> + gather_system_check_result(Ref, N - 1) + end. + %% term compare where integer() < float() = true -spec cmp_term(A,B) -> Result when diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl index c87b2645ec..ab5359ebbc 100644 --- a/erts/preloaded/src/prim_file.erl +++ b/erts/preloaded/src/prim_file.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2013. All Rights Reserved. +%% Copyright Ericsson AB 2000-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -1276,6 +1276,7 @@ lseek_position(_) -> %% Translates the response from the driver into %% {ok, Result} or {error, Reason}. +-dialyzer({no_improper_lists, translate_response/2}). translate_response(?FILE_RESP_OK, []) -> ok; translate_response(?FILE_RESP_ERROR, List) when is_list(List) -> diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl index 4d17cfb966..f2c895bfaa 100644 --- a/lib/asn1/src/asn1ct_check.erl +++ b/lib/asn1/src/asn1ct_check.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2013. All Rights Reserved. +%% Copyright Ericsson AB 1997-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -1552,9 +1552,11 @@ match_syntax_objset_1(_, {object,_,_}=Object, ClassDef) -> make_objset(ClassDef, Set) -> #typedef{typespec=#'ObjectSet'{class=ClassDef,set=Set}}. +-spec syntax_match_error(_) -> no_return(). syntax_match_error(S) -> asn1_error(S, syntax_nomatch). +-spec syntax_match_error(_, _) -> no_return(). syntax_match_error(S, What0) -> What = printable_string(What0), asn1_error(S, {syntax_nomatch,What}). @@ -5745,6 +5747,7 @@ return_asn1_error(#state{mname=Where}, Item, Error) -> Pos = asn1ct:get_pos_of_def(Item), {structured_error,{Where,Pos},?MODULE,Error}. +-spec asn1_error(_, _) -> no_return(). asn1_error(S, Error) -> throw({error,return_asn1_error(S, Error)}). diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl index 093bcb5a6c..6d5062a118 100644 --- a/lib/asn1/src/asn1ct_gen.erl +++ b/lib/asn1/src/asn1ct_gen.erl @@ -1289,6 +1289,7 @@ gen_head(Erules,Mod,Hrl) -> emit({"-module('",Mod,"').",nl}), put(currmod,Mod), emit({"-compile(nowarn_unused_vars).",nl}), + emit({"-dialyzer(no_improper_lists).",nl}), case Hrl of 0 -> ok; _ -> emit({"-include(\"",Mod,".hrl\").",nl}) diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl index ce87fd3180..6dea1787a8 100644 --- a/lib/asn1/test/asn1_SUITE.erl +++ b/lib/asn1/test/asn1_SUITE.erl @@ -628,12 +628,22 @@ ber_other(Config, Rule, Opts) -> der(Config) -> asn1_test_lib:compile_all(ber_modules(), Config, [der]). -module_test(M, Config, Rule, Opts) -> - asn1_test_lib:compile(M, Config, [Rule|Opts]), - case asn1ct:test(list_to_atom(M), [{i, ?config(case_dir, Config)}]) of - ok -> ok; - Error -> - erlang:error({test_failed, M, Opts, Error}) +module_test(M0, Config, Rule, Opts) -> + asn1_test_lib:compile(M0, Config, [Rule|Opts]), + case list_to_atom(M0) of + 'LDAP' -> + %% Because of the recursive definition of 'Filter' in + %% the LDAP module, the construction of a sample + %% value for 'Filter' is not guaranteed to terminate. + ok; + M -> + TestOpts = [{i, ?config(case_dir, Config)}], + case asn1ct:test(M, TestOpts) of + ok -> + ok; + Error -> + erlang:error({test_failed, M, Opts, Error}) + end end. diff --git a/lib/asn1/test/asn1_test_lib.erl b/lib/asn1/test/asn1_test_lib.erl index 4fee5a64cc..ae2e5641ec 100644 --- a/lib/asn1/test/asn1_test_lib.erl +++ b/lib/asn1/test/asn1_test_lib.erl @@ -58,7 +58,7 @@ dialyze(Files) -> Beams0 = [code:which(module(F)) || F <- Files], Beams = [code:which(asn1rt_nif)|Beams0], case dialyzer:run([{files,Beams}, - {warnings,[no_improper_lists]}, + {warnings,[]}, {get_warnings,true}]) of [] -> ok; diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml index 9906db2c90..57a8c6c9e2 100644 --- a/lib/common_test/doc/src/notes.xml +++ b/lib/common_test/doc/src/notes.xml @@ -33,6 +33,26 @@ <file>notes.xml</file> </header> +<section><title>Common_Test 1.11.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + If a ssh package contained more than one netconf end tag, + then the second end tag was never detected in + ct_netconfc:handle_data. Instead it was included in the + XML data given to the xmerl parser, which then failed. + The problem was introduced by OTP-13007, and has now been + corrected.</p> + <p> + Own Id: OTP-13323</p> + </item> + </list> + </section> + +</section> + <section><title>Common_Test 1.11.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/common_test/src/ct_conn_log_h.erl b/lib/common_test/src/ct_conn_log_h.erl index f7615fdc14..93f358462d 100644 --- a/lib/common_test/src/ct_conn_log_h.erl +++ b/lib/common_test/src/ct_conn_log_h.erl @@ -117,7 +117,7 @@ write_report(Time,#conn_log{module=ConnMod}=Info,Data,GL,State) -> ok; {LogType,Fd} -> case format_data(ConnMod,LogType,Data) of - [] -> + [] when Info#conn_log.action==send; Info#conn_log.action==recv -> ok; FormattedData -> io:format(Fd,"~n~ts~ts~ts",[format_head(ConnMod,LogType,Time), diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl index f792269c41..8fb7a03bb0 100644 --- a/lib/common_test/src/ct_framework.erl +++ b/lib/common_test/src/ct_framework.erl @@ -28,7 +28,7 @@ -export([init_tc/3, end_tc/3, end_tc/4, get_suite/2, get_all_cases/1]). -export([report/2, warn/1, error_notification/4]). --export([get_logopts/0, format_comment/1, get_html_wrapper/4]). +-export([get_log_dir/0, get_logopts/0, format_comment/1, get_html_wrapper/4]). -export([error_in_suite/1, init_per_suite/1, end_per_suite/1, init_per_group/2, end_per_group/2]). @@ -1480,3 +1480,8 @@ get_html_wrapper(TestName, PrintLabel, Cwd, TableCols) -> get_html_wrapper(TestName, PrintLabel, Cwd, TableCols, Encoding) -> ct_logs:get_ts_html_wrapper(TestName, PrintLabel, Cwd, TableCols, Encoding). + +%%%----------------------------------------------------------------- +%%% @spec get_log_dir() -> {ok,LogDir} +get_log_dir() -> + ct_logs:get_log_dir(true). diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl index 6e3d1ab1d8..8812514ad9 100644 --- a/lib/common_test/src/ct_netconfc.erl +++ b/lib/common_test/src/ct_netconfc.erl @@ -234,7 +234,6 @@ %% Internal defines %%---------------------------------------------------------------------- -define(APPLICATION,?MODULE). --define(VALID_SSH_OPTS,[user, password, user_dir]). -define(DEFAULT_STREAM,"NETCONF"). -define(error(ConnName,Report), @@ -264,6 +263,7 @@ session_id, msg_id = 1, hello_status, + no_end_tag_buff = <<>>, buff = <<>>, pending = [], % [#pending] event_receiver}).% pid @@ -1170,7 +1170,7 @@ handle_msg({Ref,timeout},#state{pending=Pending} = State) -> end, %% Halfhearted try to get in correct state, this matches %% the implementation before this patch - {R,State#state{pending=Pending1, buff= <<>>}}. + {R,State#state{pending=Pending1, no_end_tag_buff= <<>>, buff= <<>>}}. %% @private %% Called by ct_util_server to close registered connections before terminate. @@ -1205,7 +1205,7 @@ call(Client, Msg, Timeout, WaitStop) -> {error,no_such_client}; {error,{process_down,Pid,normal}} when WaitStop -> %% This will happen when server closes connection - %% before clien received rpc-reply on + %% before client received rpc-reply on %% close-session. ok; {error,{process_down,Pid,normal}} -> @@ -1256,13 +1256,11 @@ check_options([{port,Port}|T], Host, _, #options{} = Options) -> check_options([{timeout, Timeout}|T], Host, Port, Options) when is_integer(Timeout); Timeout==infinity -> check_options(T, Host, Port, Options#options{timeout = Timeout}); -check_options([{X,_}=Opt|T], Host, Port, #options{ssh=SshOpts}=Options) -> - case lists:member(X,?VALID_SSH_OPTS) of - true -> - check_options(T, Host, Port, Options#options{ssh=[Opt|SshOpts]}); - false -> - {error, {invalid_option, Opt}} - end. +check_options([{timeout, _} = Opt|_T], _Host, _Port, _Options) -> + {error, {invalid_option, Opt}}; +check_options([Opt|T], Host, Port, #options{ssh=SshOpts}=Options) -> + %% Option verified by ssh + check_options(T, Host, Port, Options#options{ssh=[Opt|SshOpts]}). %%%----------------------------------------------------------------- set_request_timer(infinity) -> @@ -1372,24 +1370,37 @@ to_xml_doc(Simple) -> %%%----------------------------------------------------------------- %%% Parse and handle received XML data -handle_data(NewData,#state{connection=Connection,buff=Buff0} = State0) -> +%%% Two buffers are used: +%%% * 'no_end_tag_buff' contains data that is checked and does not +%%% contain any (part of an) end tag. +%%% * 'buff' contains all other saved data - it may or may not +%%% include (a part of) an end tag. +%%% The reason for this is to avoid running binary:split/3 multiple +%%% times on the same data when it does not contain an end tag. This +%%% can be a considerable optimation in the case when a lot of data is +%%% received (e.g. when fetching all data from a node) and the data is +%%% sent in multiple ssh packages. +handle_data(NewData,#state{connection=Connection} = State0) -> log(Connection,recv,NewData), - {Start,AddSz} = - case byte_size(Buff0) of - BSz when BSz<5 -> {0,BSz}; - BSz -> {BSz-5,5} - end, - Length = byte_size(NewData) + AddSz, + NoEndTag0 = State0#state.no_end_tag_buff, + Buff0 = State0#state.buff, Data = <<Buff0/binary, NewData/binary>>, - case binary:split(Data,?END_TAG,[{scope,{Start,Length}}]) of + case binary:split(Data,?END_TAG,[]) of [_NoEndTagFound] -> - {noreply, State0#state{buff=Data}}; + NoEndTagSize = case byte_size(Data) of + Sz when Sz<5 -> 0; + Sz -> Sz-5 + end, + <<NoEndTag1:NoEndTagSize/binary,Buff/binary>> = Data, + NoEndTag = <<NoEndTag0/binary,NoEndTag1/binary>>, + {noreply, State0#state{no_end_tag_buff=NoEndTag, buff=Buff}}; [FirstMsg0,Buff1] -> - FirstMsg = remove_initial_nl(FirstMsg0), + FirstMsg = remove_initial_nl(<<NoEndTag0/binary,FirstMsg0/binary>>), SaxArgs = [{event_fun,fun sax_event/3}, {event_state,[]}], case xmerl_sax_parser:stream(FirstMsg, SaxArgs) of {ok, Simple, _Thrash} -> - case decode(Simple, State0#state{buff=Buff1}) of + case decode(Simple, State0#state{no_end_tag_buff= <<>>, + buff=Buff1}) of {noreply, #state{buff=Buff} = State} when Buff =/= <<>> -> %% Recurse if we have more data in buffer handle_data(<<>>, State); @@ -1401,10 +1412,12 @@ handle_data(NewData,#state{connection=Connection,buff=Buff0} = State0) -> [{parse_error,Reason}, {buffer, Buff0}, {new_data,NewData}]), - handle_error(Reason, State0#state{buff= <<>>}) + handle_error(Reason, State0#state{no_end_tag_buff= <<>>, + buff= <<>>}) end end. + %% xml does not accept a leading nl and some netconf server add a nl after %% each ?END_TAG, ignore them remove_initial_nl(<<"\n", Data/binary>>) -> diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl index 1c4267395b..ceb94ceee5 100644 --- a/lib/common_test/src/ct_run.erl +++ b/lib/common_test/src/ct_run.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2014. All Rights Reserved. +%% Copyright Ericsson AB 2004-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -909,7 +909,7 @@ run_test(StartOpt) when is_tuple(StartOpt) -> run_test([StartOpt]); run_test(StartOpts) when is_list(StartOpts) -> - CTPid = spawn(fun() -> run_test1(StartOpts) end), + CTPid = spawn(run_test1_fun(StartOpts)), Ref = monitor(process, CTPid), receive {'DOWN',Ref,process,CTPid,{user_error,Error}} -> @@ -918,6 +918,11 @@ run_test(StartOpts) when is_list(StartOpts) -> Other end. +-spec run_test1_fun(_) -> fun(() -> no_return()). + +run_test1_fun(StartOpts) -> + fun() -> run_test1(StartOpts) end. + run_test1(StartOpts) when is_list(StartOpts) -> case proplists:get_value(refresh_logs, StartOpts) of undefined -> @@ -1369,7 +1374,7 @@ run_dir(Opts = #opts{logdir = LogDir, %%% @equiv ct:run_testspec/1 %%%----------------------------------------------------------------- run_testspec(TestSpec) -> - CTPid = spawn(fun() -> run_testspec1(TestSpec) end), + CTPid = spawn(run_testspec1_fun(TestSpec)), Ref = monitor(process, CTPid), receive {'DOWN',Ref,process,CTPid,{user_error,Error}} -> @@ -1378,6 +1383,11 @@ run_testspec(TestSpec) -> Other end. +-spec run_testspec1_fun(_) -> fun(() -> no_return()). + +run_testspec1_fun(TestSpec) -> + fun() -> run_testspec1(TestSpec) end. + run_testspec1(TestSpec) -> {ok,Cwd} = file:get_cwd(), io:format("~nCommon Test starting (cwd is ~ts)~n~n", [Cwd]), diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl index 0cd83b9f04..3ad3937548 100644 --- a/lib/common_test/src/ct_slave.erl +++ b/lib/common_test/src/ct_slave.erl @@ -1,7 +1,7 @@ %%-------------------------------------------------------------------- %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2015. All Rights Reserved. +%% Copyright Ericsson AB 2010-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -315,7 +315,7 @@ enodename(Host, Node) -> do_start(Host, Node, Options) -> ENode = enodename(Host, Node), Functions = - lists:concat([[{ct_slave, slave_started, [ENode, self()]}], + lists:append([[{ct_slave, slave_started, [ENode, self()]}], Options#options.startup_functions, [{ct_slave, slave_ready, [ENode, self()]}]]), Functions2 = if diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl index ea49e36608..9d4c798795 100644 --- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl +++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl @@ -99,7 +99,10 @@ all() -> connection_crash, get_event_streams, create_subscription, - receive_event + receive_one_event, + receive_multiple_events, + receive_event_and_rpc, + receive_event_and_rpc_in_chunks ] end. @@ -329,7 +332,8 @@ invalid_opt(Config) -> Opts1 = ?DEFAULT_SSH_OPTS(DataDir) ++ [{timeout,invalidvalue}], {error,{invalid_option,{timeout,invalidvalue}}} = ct_netconfc:open(Opts1), Opts2 = ?DEFAULT_SSH_OPTS(DataDir) ++ [{some_other_opt,true}], - {error,{invalid_option,{some_other_opt,true}}} = ct_netconfc:open(Opts2), + {error,{ssh,could_not_connect_to_server,{options,_}}} = + ct_netconfc:open(Opts2), ok. timeout_close_session(Config) -> @@ -354,7 +358,7 @@ get(Config) -> get_a_lot(Config) -> DataDir = ?config(data_dir,Config), {ok,Client} = open_success(DataDir), - Descr = lists:append(lists:duplicate(100,"Description of myserver! ")), + Descr = lists:append(lists:duplicate(1000,"Description of myserver! ")), Server = {server,[{xmlns,"myns"}],[{name,[],["myserver"]}, {description,[],[Descr]}]}, Data = lists:duplicate(100,Server), @@ -964,16 +968,16 @@ create_subscription(Config) -> ok. -receive_event(Config) -> +receive_one_event(Config) -> DataDir = ?config(data_dir,Config), {ok,Client} = open_success(DataDir), ?NS:expect_reply({'create-subscription',[stream]},ok), ?ok = ct_netconfc:create_subscription(Client), - ?NS:hupp(send_event), + ?NS:hupp({send_events,1}), receive - %% Matching ?NS:make_msg(event) + %% Matching ?NS:make_msg({event,_}) {notification,?NETCONF_NOTIF_NAMESPACE_ATTR, [{eventTime,[],[_Time]}, {event,[{xmlns,"http://my.namespaces.com/event"}], @@ -991,6 +995,187 @@ receive_event(Config) -> ok. +receive_multiple_events(Config) -> + DataDir = ?config(data_dir,Config), + {ok,Client} = open_success(DataDir), + ?NS:expect_reply({'create-subscription',[stream]},ok), + ?ok = ct_netconfc:create_subscription(Client), + + ?NS:hupp({send_events,3}), + + receive + %% Matching ?NS:make_msg({event,_}) + {notification,_,_} -> + ok; + Other1 -> + ct:fail({got_unexpected_while_waiting_for_event, Other1}) + after 3000 -> + ct:fail(timeout_waiting_for_event) + end, + receive + %% Matching ?NS:make_msg({event,_}) + {notification,_,_} -> + ok; + Other2 -> + ct:fail({got_unexpected_while_waiting_for_event, Other2}) + after 3000 -> + ct:fail(timeout_waiting_for_event) + end, + receive + %% Matching ?NS:make_msg({event,_}) + {notification,_,_} -> + ok; + Other3 -> + ct:fail({got_unexpected_while_waiting_for_event, Other3}) + after 3000 -> + ct:fail(timeout_waiting_for_event) + end, + + ?NS:expect_do_reply('close-session',close,ok), + ?ok = ct_netconfc:close_session(Client), + + ok. + +receive_event_and_rpc(Config) -> + DataDir = ?config(data_dir,Config), + {ok,Client} = open_success(DataDir), + + ?NS:expect_reply({'create-subscription',[stream]},ok), + ?ok = ct_netconfc:create_subscription(Client), + + %% Construct the data to return from netconf server - one + %% rpc-reply and one notification - to be sent in the same ssh + %% package. + Data = [{servers,[{xmlns,"myns"}],[{server,[],[{name,[],["myserver"]}]}]}], + Rpc = {'rpc-reply',?NETCONF_NAMESPACE_ATTR ++ [{'message-id',"2"}], + [{data,Data}]}, + RpcXml = list_to_binary(xmerl:export_simple_element(Rpc,xmerl_xml)), + + Notification = + {notification,?NETCONF_NOTIF_NAMESPACE_ATTR, + [{eventTime,["2012-06-14T14:50:54+02:00"]}, + {event,[{xmlns,"http://my.namespaces.com/event"}], + [{severity,["major"]}, + {description,["Something terrible happened"]}]}]}, + NotifXml = + list_to_binary(xmerl:export_simple_element(Notification,xmerl_xml)), + + ?NS:expect_reply('get',[RpcXml,NotifXml]), + {ok,Data} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}), + + receive + {notification,_,_} -> + ok; + Other1 -> + ct:fail({got_unexpected_while_waiting_for_event, Other1}) + after 3000 -> + ct:fail(timeout_waiting_for_event) + end, + + + %% Then do the same again, but now send notification first then + %% the rpc-reply. + Rpc2 = {'rpc-reply',?NETCONF_NAMESPACE_ATTR ++ [{'message-id',"3"}], + [{data,Data}]}, + RpcXml2 = list_to_binary(xmerl:export_simple_element(Rpc2,xmerl_xml)), + ?NS:expect_reply('get',[NotifXml,RpcXml2]), + {ok,Data} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}), + + receive + {notification,_,_} -> + ok; + Other2 -> + ct:fail({got_unexpected_while_waiting_for_event, Other2}) + after 3000 -> + ct:fail(timeout_waiting_for_event) + end, + + ?NS:expect_do_reply('close-session',close,ok), + ?ok = ct_netconfc:close_session(Client), + + ok. + + +receive_event_and_rpc_in_chunks(Config) -> + DataDir = ?config(data_dir,Config), + {ok,Client} = open_success(DataDir), + + ?NS:expect_reply({'create-subscription',[stream]},ok), + ?ok = ct_netconfc:create_subscription(Client), + + %% Construct the data to return from netconf server + Data = [{servers,[{xmlns,"myns"}], + [{server,[],[{name,[],["server0"]}]}, + {server,[],[{name,[],["server1"]}]}, + {server,[],[{name,[],["server2"]}]}, + {server,[],[{name,[],["server3"]}]}, + {server,[],[{name,[],["server4"]}]}, + {server,[],[{name,[],["server5"]}]}, + {server,[],[{name,[],["server6"]}]}, + {server,[],[{name,[],["server7"]}]}, + {server,[],[{name,[],["server8"]}]}, + {server,[],[{name,[],["server9"]}]}] + }], + Rpc = {'rpc-reply',?NETCONF_NAMESPACE_ATTR ++ [{'message-id',"2"}], + [{data,Data}]}, + RpcXml = list_to_binary(xmerl:export_simple_element(Rpc,xmerl_xml)), + + Notification = + {notification,?NETCONF_NOTIF_NAMESPACE_ATTR, + [{eventTime,["2012-06-14T14:50:54+02:00"]}, + {event,[{xmlns,"http://my.namespaces.com/event"}], + [{severity,["major"]}, + {description,["Something terrible happened"]}]}]}, + NotifXml = + list_to_binary(xmerl:export_simple_element(Notification,xmerl_xml)), + + + %% First part contains a notif, but only parts of the end tag + Part1 = + <<"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", + NotifXml/binary,"\n]]">>, + + %% Second part contains rest of end tag, full rpc-reply and full + %% notif except end tag + Part2 = + <<">]]>\n",RpcXml/binary,"\n",?END_TAG/binary,NotifXml/binary>>, + + %% Third part contains last end tag + Part3 = <<"\n",?END_TAG/binary,"\n">>, + + %% Spawn a process which will wait a bit for the client to send + %% the request (below), then order the server to the chunks of the + %% rpc-reply one by one. + spawn(fun() -> ct:sleep(500),?NS:hupp(send,Part1), + ct:sleep(100),?NS:hupp(send,Part2), + ct:sleep(100),?NS:hupp(send,Part3) + end), + + %% Order server to expect a get - then the process above will make + %% sure the rpc-reply is sent. + ?NS:expect('get'), + {ok,Data} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}), + + receive + {notification,_,_} -> + ok; + Other1 -> + ct:fail({got_unexpected_while_waiting_for_event, Other1}) + after 3000 -> + ct:fail(timeout_waiting_for_event) + end, + receive + {notification,_,_} -> + ok; + Other2 -> + ct:fail({got_unexpected_while_waiting_for_event, Other2}) + after 3000 -> + ct:fail(timeout_waiting_for_event) + end, + ?NS:expect_do_reply('close-session',close,ok), + ?ok = ct_netconfc:close_session(Client), + ok. + %%%----------------------------------------------------------------- break(_Config) -> diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl index 07893faabc..67827a053f 100644 --- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl +++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl @@ -144,8 +144,8 @@ expect_do_reply(SessionId,Expect,Do,Reply) -> %% Hupp the server - i.e. tell it to do something - %% e.g. hupp(send_event) will cause send_event(State) to be called on %% the session channel process. -hupp(send_event) -> - hupp(send,[make_msg(event)]); +hupp({send_events,N}) -> + hupp(send,[make_msg({event,N})]); hupp(kill) -> hupp(1,fun hupp_kill/1,[]). @@ -446,9 +446,12 @@ reply(ConnRef,Reply) -> from_simple(Simple) -> unicode_c2b(xmerl:export_simple_element(Simple,xmerl_xml)). -xml(Content) -> - <<"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", - Content/binary,"\n",?END_TAG/binary>>. +xml(Content) when is_binary(Content) -> + xml([Content]); +xml(Content) when is_list(Content) -> + Msgs = [<<Msg/binary,"\n",?END_TAG/binary>> || Msg <- Content], + MsgsBin = list_to_binary(Msgs), + <<"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", MsgsBin/binary>>. rpc_reply(Content) when is_binary(Content) -> MsgId = case erase(msg_id) of @@ -571,15 +574,17 @@ make_msg({ok,Data}) -> make_msg({data,Data}) -> xml(rpc_reply(from_simple({data,Data}))); -make_msg(event) -> - xml(<<"<notification xmlns=\"",?NETCONF_NOTIF_NAMESPACE,"\">" +make_msg({event,N}) -> + Notification = <<"<notification xmlns=\"",?NETCONF_NOTIF_NAMESPACE,"\">" "<eventTime>2012-06-14T14:50:54+02:00</eventTime>" "<event xmlns=\"http://my.namespaces.com/event\">" "<severity>major</severity>" "<description>Something terrible happened</description>" "</event>" - "</notification>">>); -make_msg(Xml) when is_binary(Xml) -> + "</notification>">>, + xml(lists:duplicate(N,Notification)); +make_msg(Xml) when is_binary(Xml) orelse + (is_list(Xml) andalso is_binary(hd(Xml))) -> xml(Xml); make_msg(Simple) when is_tuple(Simple) -> xml(from_simple(Simple)). diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk index f33b705dcb..34ed657e01 100644 --- a/lib/common_test/vsn.mk +++ b/lib/common_test/vsn.mk @@ -1 +1 @@ -COMMON_TEST_VSN = 1.11.1 +COMMON_TEST_VSN = 1.11.2 diff --git a/lib/compiler/src/beam_bsm.erl b/lib/compiler/src/beam_bsm.erl index 4f76350269..62356928ae 100644 --- a/lib/compiler/src/beam_bsm.erl +++ b/lib/compiler/src/beam_bsm.erl @@ -421,7 +421,8 @@ btb_follow_branches([], _, D) -> D. btb_follow_branch(0, _Regs, D) -> D; btb_follow_branch(Lbl, Regs, #btb{ok_br=Br0,index=Li}=D) -> - case gb_sets:is_member(Lbl, Br0) of + Key = {Lbl,Regs}, + case gb_sets:is_member(Key, Br0) of true -> %% We have already followed this branch and it was OK. D; @@ -432,7 +433,7 @@ btb_follow_branch(Lbl, Regs, #btb{ok_br=Br0,index=Li}=D) -> btb_reaches_match_1(Is, Regs, D), %% Since we got back, this branch is OK. - D#btb{ok_br=gb_sets:insert(Lbl, Br),must_not_save=MustNotSave, + D#btb{ok_br=gb_sets:insert(Key, Br),must_not_save=MustNotSave, must_save=MustSave} end. diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl index b4601b0798..7fb0a16540 100644 --- a/lib/compiler/test/bs_match_SUITE.erl +++ b/lib/compiler/test/bs_match_SUITE.erl @@ -36,7 +36,8 @@ match_string/1,zero_width/1,bad_size/1,haystack/1, cover_beam_bool/1,matched_out_size/1,follow_fail_branch/1, no_partition/1,calling_a_binary/1,binary_in_map/1, - match_string_opt/1,map_and_binary/1]). + match_string_opt/1,map_and_binary/1, + unsafe_branch_caching/1]). -export([coverage_id/1,coverage_external_ignore/2]). @@ -62,7 +63,8 @@ groups() -> otp_7498,match_string,zero_width,bad_size,haystack, cover_beam_bool,matched_out_size,follow_fail_branch, no_partition,calling_a_binary,binary_in_map, - match_string_opt,map_and_binary]}]. + match_string_opt,map_and_binary, + unsafe_branch_caching]}]. init_per_suite(Config) -> @@ -1243,6 +1245,32 @@ do_map_and_binary(#{time := _} = T) -> do_map_and_binary(#{hour := Hour, min := Min} = T) -> {Hour, Min, T}. +%% Unsafe caching of branch outcomes in beam_bsm would cause the +%% delayed creation of sub-binaries optimization to be applied even +%% when it was unsafe. + +unsafe_branch_caching(_Config) -> + <<>> = do_unsafe_branch_caching(<<42,1>>), + <<>> = do_unsafe_branch_caching(<<42,2>>), + <<>> = do_unsafe_branch_caching(<<42,3>>), + <<17,18>> = do_unsafe_branch_caching(<<42,3,17,18>>), + <<>> = do_unsafe_branch_caching(<<1,3,42,2>>), + + ok. + +do_unsafe_branch_caching(<<Code/integer, Bin/binary>>) -> + <<C1/integer, B1/binary>> = Bin, + case C1 of + X when X =:= 1 orelse X =:= 2 -> + Bin2 = <<>>; + _ -> + Bin2 = B1 + end, + case Code of + 1 -> do_unsafe_branch_caching(Bin2); + _ -> Bin2 + end. + check(F, R) -> R = F(). diff --git a/lib/cosNotification/src/CosNotifyFilter_Filter_impl.erl b/lib/cosNotification/src/CosNotifyFilter_Filter_impl.erl index 75510ebeca..0f997049e0 100644 --- a/lib/cosNotification/src/CosNotifyFilter_Filter_impl.erl +++ b/lib/cosNotification/src/CosNotifyFilter_Filter_impl.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. +%% Copyright Ericsson AB 1999-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -336,6 +336,7 @@ match_structured(_,_,What) -> %% Returns : boolean() | %% {'EXCEPTION', CosNotifyFilter::UnsupportedFilterableData} %%----------------------------------------------------------- +-spec match_typed(_, _, _) -> no_return(). match_typed(_OE_THIS, _State, _Data) -> corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO}). diff --git a/lib/cosNotification/src/CosNotifyFilter_MappingFilter_impl.erl b/lib/cosNotification/src/CosNotifyFilter_MappingFilter_impl.erl index 3718664674..03c0e03be6 100644 --- a/lib/cosNotification/src/CosNotifyFilter_MappingFilter_impl.erl +++ b/lib/cosNotification/src/CosNotifyFilter_MappingFilter_impl.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. +%% Copyright Ericsson AB 1999-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -298,6 +298,7 @@ match_structured(_,_,_) -> %% Returns : boolean() , #any{} (out-type) | %% {'EXCEPTION', CosNotifyFilter::UnsupportedFilterableData} %%----------------------------------------------------------- +-spec match_typed(_, _, _) -> no_return(). match_typed(_OE_THIS, _State, _Data) -> corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO}). diff --git a/lib/cosTime/src/CosTime_TimeService_impl.erl b/lib/cosTime/src/CosTime_TimeService_impl.erl index f139998f42..72c65757ad 100644 --- a/lib/cosTime/src/CosTime_TimeService_impl.erl +++ b/lib/cosTime/src/CosTime_TimeService_impl.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2009. All Rights Reserved. +%% Copyright Ericsson AB 2000-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -107,6 +107,7 @@ universal_time(OE_THIS, State) -> %% Arguments: %% Returns : {'EXCEPTION", #'CosTime_TimeUnavailable'{}} %%----------------------------------------------------------- +-spec secure_universal_time(_, _) -> no_return(). secure_universal_time(_OE_THIS, _State) -> corba:raise(#'CosTime_TimeUnavailable'{}). diff --git a/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl b/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl index e0d14299a3..e24bcb9a04 100644 --- a/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl +++ b/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2015. All Rights Reserved. +%% Copyright Ericsson AB 1999-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -169,6 +169,7 @@ create(_Self, _State, _TimeOut) -> %% Effect : %%------------------------------------------------------------ +-spec recreate(_, _, _) -> no_return(). recreate(_Self, _State, #'CosTransactions_PropagationContext'{current = _C}) -> corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_YES}). %recreate(Self, State, #'CosTransactions_PropagationContext'{current = C}) -> diff --git a/lib/cosTransactions/src/ETraP_Server_impl.erl b/lib/cosTransactions/src/ETraP_Server_impl.erl index 7b451e1762..5c7b5f6350 100644 --- a/lib/cosTransactions/src/ETraP_Server_impl.erl +++ b/lib/cosTransactions/src/ETraP_Server_impl.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2015. All Rights Reserved. +%% Copyright Ericsson AB 1999-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -675,6 +675,7 @@ is_same_transaction(Self, {Env, Local}, Coordinator) -> %% Effect : %%------------------------------------------------------------ +-spec is_related_transaction(_, _, _) -> no_return(). is_related_transaction(_Self, {_Env, _Local}, _Coordinator) -> corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_YES}). % type_check(?tr_get_typeCheck(Env), ?tr_Coordinator, @@ -689,6 +690,7 @@ is_related_transaction(_Self, {_Env, _Local}, _Coordinator) -> %% Effect : %%------------------------------------------------------------ +-spec is_ancestor_transaction(_, _, _) -> no_return(). is_ancestor_transaction(_Self, {_Env, _Local}, _Coordinator) -> corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_YES}). % type_check(?tr_get_typeCheck(Env), ?tr_Coordinator, @@ -826,6 +828,7 @@ register_subtran_aware(Self, {Env, Local}, SubTrAwareResource) -> %% Effect : %%------------------------------------------------------------ +-spec register_synchronization(_, _, _) -> no_return(). register_synchronization(_Self, {_Env, _Local}, _Synchronization) -> corba:raise(#'CosTransactions_SynchronizationUnavailable'{}). @@ -950,6 +953,7 @@ create_subtransaction(Self, {Env, Local}) -> %% Effect : %%------------------------------------------------------------ +-spec get_txcontext(_, _) -> no_return(). get_txcontext(_Self, {_Env, _Local}) -> corba:raise(#'CosTransactions_Unavailable'{}). diff --git a/lib/debugger/doc/src/book.xml b/lib/debugger/doc/src/book.xml index 071a04eb61..5424ef2c04 100644 --- a/lib/debugger/doc/src/book.xml +++ b/lib/debugger/doc/src/book.xml @@ -47,4 +47,3 @@ <index/> </book> - diff --git a/lib/debugger/doc/src/debugger.xml b/lib/debugger/doc/src/debugger.xml index 15d498d5ae..1ecdbcd064 100644 --- a/lib/debugger/doc/src/debugger.xml +++ b/lib/debugger/doc/src/debugger.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2002</year><year>2013</year> + <year>2002</year><year>2016</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -29,7 +29,7 @@ <rev></rev> </header> <module>debugger</module> - <modulesummary>Erlang Debugger</modulesummary> + <modulesummary>Erlang Debugger.</modulesummary> <description> <p>Erlang Debugger for debugging and testing of Erlang programs.</p> </description> @@ -48,14 +48,14 @@ <desc> <p>Starts Debugger.</p> - <p>If given a file name as argument, Debugger will try to load - its settings from this file. Refer to Debugger User's Guide - for more information about settings.</p> + <p>If a filename is specified as argument, Debugger tries to load + its settings from this file. For details about settings, see + the User's Guide.</p> - <p>If given <c>local</c> as argument, Debugger will interpret - code only at the current node. If given <c>global</c> as - argument, Debugger will interpret code at all known nodes, - this is the default.</p> + <p>If <c>local</c> is specified as argument, Debugger interprets + code only at the current node. If <c>global</c> is specified as + argument, Debugger interprets code at all known nodes, this + is the default.</p> </desc> </func> @@ -67,11 +67,9 @@ <v>Args = [term()]</v> </type> <desc> - <p>This function can be used to debug a single process. - The module <c>Module</c> is interpreted and - <c>apply(Module,Name,Args)</c> is called. This will open an - Attach Process window, refer to Debugger User's Guide for - more information.</p> + <p>Debugs a single process. The module <c>Module</c> is interpreted + and <c>apply(Module,Name,Args)</c> is called. This opens an + Attach Process window. For details, see the User's Guide.</p> </desc> </func> </funcs> diff --git a/lib/debugger/doc/src/debugger_chapter.xml b/lib/debugger/doc/src/debugger_chapter.xml index 98fe4ae377..45dfdb3776 100644 --- a/lib/debugger/doc/src/debugger_chapter.xml +++ b/lib/debugger/doc/src/debugger_chapter.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>1997</year><year>2013</year> + <year>1997</year><year>2016</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -31,97 +31,92 @@ </header> <section> - <title>Introduction</title> + <title>Getting Started</title> - <p><em>Debugger</em> is a graphical user interface for the Erlang - interpreter, which can be used for debugging and testing of - Erlang programs. For example, breakpoints can be set, code can be - single stepped and variable values can be displayed and changed. - </p> + <p>To use Debugger, the basic steps are as follows:</p> - <p>The Erlang interpreter can also be accessed via the interface - module <c>int</c>, see <seealso marker="int">int(3)</seealso>. - </p> + <p><em>Step 1.</em> Start Debugger by calling + <c>debugger:start()</c>.</p> - <p><em>Warning:</em> Note that the Debugger at some point might - start tracing on the processes which execute the interpreted - code. This means that a conflict will occur if tracing by other - means is started on any of these processes.</p> - </section> + <p>The <seealso marker="#monitor">Monitor window</seealso> is + displayed with information about all debugged processes, + interpreted modules, and selected options. Initially there are + normally no debugged processes. First, it must be specified which + modules that are to be <em>debugged</em> (also called + <em>interpreted</em>). Proceed as follows:</p> - <section> - <title>Getting Started with Debugger</title> + <p><em>Step 2.</em> Select <em>Module > Interpret...</em> in the + Monitor window.</p> - <p>Start Debugger by calling <c>debugger:start()</c>. It will start - the <seealso marker="#monitor">Monitor window</seealso> showing - information about all debugged processes, interpreted modules and - selected options.</p> + <p>The <seealso marker="#interpret">Interpret Modules window</seealso> + is displayed.</p> - <p>Initially there are normally no debugged processes. First, it - must be specified which modules should be <em>debugged</em>, or - <em>interpreted</em> as it is also called. This is done by - choosing <em>Module->Interpret...</em> in the Monitor window and - then selecting the appropriate modules from the - <seealso marker="#interpret">Interpret Dialog window</seealso>. - </p> + <p><em>Step 3.</em> Select the appropriate modules from the Interpret + Dialog window.</p> <note> - <p>Only modules compiled with the option <c>debug_info</c> set - can be interpreted. Non-interpretable modules are shown within - parenthesis in the Interpret Dialog window.</p> + <p>Only modules compiled with option <c>debug_info</c> set can be + interpreted. Non-interpretable modules are displayed within + parenthesis in the Interpret Modules window.</p> </note> - <p>When a module is interpreted, it can be viewed in a - <seealso marker="#view">View Module window</seealso>. This is done - by selecting the module from the <em>Module->module->View</em> - menu. The contents of the source file is shown and it is possible - to set <seealso marker="#breakpoints">breakpoints</seealso>.</p> - - <p>Now the program that should be debugged can be started. This is - done the normal way from the Erlang shell. All processes executing - code in interpreted modules will be displayed in the Monitor - window. It is possible to <em>attach</em> to one of these - processes, by double-clicking it, or by selecting the process and - then choosing <em>Process->Attach</em>.</p> - - <p>Attaching to a process will result in a - <seealso marker="#attach">Attach Process window</seealso> being - opened for this process. From the Attach Process window, it is - possible to control the process execution, inspect variable - values, set breakpoints etc.</p> + <p><em>Step 4.</em> In the Monitor window, select + <em>Module > the module to be interpreted > View</em>.</p> + + <p>The contents of the source file is displayed in the + <seealso marker="#view">View Module window</seealso>.</p> + + <p><em>Step 5.</em> Set the + <seealso marker="#breakpoints">breakpoints</seealso>, if any.</p> + + <p><em>Step 6.</em> Start the program to be debugged. This is done + the normal way from the Erlang shell.</p> + + <p>All processes executing code in interpreted modules are displayed + in the Monitor window.</p> + + <p><em>Step 7.</em> To <em>attach</em> to one of these processes, + double-click it, or select the process and then choose + <em>Process > Attach</em>. Attaching to a process opens an + <seealso marker="#attach">Attach Process window</seealso> for this + process.</p> + + <p><em>Step 8.</em> From the Attach Process window, you can control + the process execution, inspect variable values, set breakpoints, + and so on.</p> </section> <section> <marker id="breakpoints"/> - <title>Breakpoints and Break Dialogue Windows</title> + <title>Breakpoints and Break Dialog Windows</title> <p>Once the appropriate modules are interpreted, breakpoints can be set at relevant locations in the source code. Breakpoints are specified on a line basis. When a process reaches a breakpoint, - it stops and waits for commands (step, skip, continue,...) from - the user.</p> + it stops and waits for commands (<em>Step</em>, <em>Skip</em>, + <em>Continue</em> ...) from the user.</p> <note> <p>When a process reaches a breakpoint, only that process is - stopped. Other processes are not affected.</p> + stopped. Other processes are not affected.</p> </note> - <p>Breakpoints are created and deleted using the Break menu of - the Monitor window, View Module window and Attach Process window. - </p> + <p>Breakpoints are created and deleted using the <em>Break</em> menu of + either the Monitor window, View Module window, or Attach Process + window.</p> <section> <title>Executable Lines</title> - <p>To have effect, a breakpoint must be set at an - <em>executable line</em>, which is a line of code containing an - executable expression such as a matching or a function call. - A blank line or a line containing a comment, function head or - pattern in a <c>case</c>- or <c>receive</c> statement is not - executable.</p> + <p>To have an effect, a breakpoint must be set at an + <em>executable line</em>, which is a line of code containing an + executable expression such as a matching or a function call. + A blank line or a line containing a comment, function head, or + pattern in a <c>case</c> statement or <c>receive</c> statement is not + executable.</p> - <p>In the example below, lines number 2, 4, 6, 8 and 11 are - executable lines:</p> + <p>In the following example, lines 2, 4, 6, 8, and 11 are + executable lines:</p> <pre> 1: is_loaded(Module,Compiled) -> 2: case get_file(Module,Compiled) of @@ -141,17 +136,15 @@ <title>Status and Trigger Action</title> <p>A breakpoint can be either <em>active</em> or - <em>inactive</em>. Inactive breakpoints are ignored.</p> - - <p>Each breakpoint has a <em>trigger action</em> which specifies - what should happen when a process has reached it (and stopped): - </p> - <list> - <item><em>enable</em> Breakpoint should remain active (default). - </item> - <item><em>disable</em> Breakpoint should be made inactive. - </item> - <item><em>delete</em> Breakpoint should be deleted.</item> + <em>inactive</em>. Inactive breakpoints are ignored.</p> + + <p>Each breakpoint has a <em>trigger action</em> that specifies + what is to happen when a process has reached it (and stopped):</p> + <list type="bulleted"> + <item><em>Enable</em> - Breakpoint is to remain active (default). + </item> + <item><em>Disable</em> - Breakpoint is to be made inactive.</item> + <item><em>Delete</em> - Breakpoint is to be deleted.</item> </list> </section> @@ -161,54 +154,56 @@ <p>A line breakpoint is created at a certain line in a module.</p> <image file="images/line_break_dialog.jpg"> - <icaption>The Line Break Dialog Window.</icaption> + <icaption>Line Break Dialog Window</icaption> </image> - <p>Right-clicking the Module entry will open a popup menu from - which the appropriate module can be selected.</p> + <p>Right-click the <em>Module</em> entry to open a popup menu from + which the appropriate module can be selected.</p> - <p>A line breakpoint can also be created (and deleted) by - double-clicking the line when the module is displayed in - the View Module or Attach Process window.</p> + <p>A line breakpoint can also be created (and deleted) by + double-clicking the line when the module is displayed in + the View Module window or Attach Process window.</p> </section> <section> <title>Conditional Breakpoints</title> <p>A conditional breakpoint is created at a certain line in - the module, but a process reaching the breakpoint will stop - only if a given condition is true.</p> + the module, but a process reaching the breakpoint stops + only if a specified condition is true.</p> <p>The condition is specified by the user as a module name - <c>CModule</c> and a function name <c>CFunction</c>. When a - process reaches the breakpoint, - <c>CModule:CFunction(Bindings)</c> will be evaluated. If and - only if this function call returns <c>true</c>, the process - will stop. If the function call returns <c>false</c>, - the breakpoint will be silently ignored.</p> - - <p><c>Bindings</c> is a list of variable bindings. Use - the function <c>int:get_binding(Variable,Bindings)</c> to - retrieve the value of <c>Variable</c> (given as an atom). - The function returns <c>unbound</c> or <c>{value,Value}</c>.</p> + <c>CModule</c> and a function name <c>CFunction</c>. When a + process reaches the breakpoint, + <c>CModule:CFunction(Bindings)</c> is evaluated. If and + only if this function call returns <c>true</c>, the process + stops. If the function call returns <c>false</c>, + the breakpoint is silently ignored.</p> + + <p><c>Bindings</c> is a list of variable bindings. To retrieve the + value of <c>Variable</c> (given as an atom), use function + <seealso marker="int#get_binding/2"><c>int:get_binding(Variable,Bindings)</c></seealso>. + The function returns <c>unbound</c> or <c>{value,Value}</c>.</p> <image file="images/cond_break_dialog.jpg"> - <icaption>The Conditional Break Dialog Window.</icaption> + <icaption>Conditional Break Dialog Window</icaption> </image> - <p>Right-clicking the Module entry will open a popup menu from - which the appropriate module can be selected.</p> + <p>Right-click the <em>Module</em> entry to open a popup menu from + which the appropriate module can be selected.</p> - <p>Example: A conditional breakpoint calling - <c>c_test:c_break/1</c> is added at line 6 in the module + <p><em>Example:</em></p> + + <p>A conditional breakpoint calling + <c>c_test:c_break/1</c> is added at line 6 in module <c>fact</c>. Each time the breakpoint is reached, the function is - called, and when <c>N</c> is equal to 3 it returns <c>true</c>, - and the process stops.</p> - + called. When <c>N</c> is equal to 3, the function returns + <c>true</c> and the process stops.</p> + <p>Extract from <c>fact.erl</c>:</p> <pre> -5. fac(0) -> 1; -6. fac(N) when N > 0, is_integer(N) -> N * fac(N-1).</pre> +5. fac(0) -> 1; +6. fac(N) when N > 0, is_integer(N) -> N * fac(N-1).</pre> <p>Definition of <c>c_test:c_break/1</c>:</p> <pre> @@ -228,18 +223,18 @@ c_break(Bindings) -> <title>Function Breakpoints</title> <p>A function breakpoint is a set of line breakpoints, one at - the first line of each clause in the given function.</p> + the first line of each clause in the specified function.</p> <image file="images/function_break_dialog.jpg"> - <icaption>The Function Break Dialog Window.</icaption> + <icaption>Function Break Dialog Window</icaption> </image> - <p>Right-clicking the Module entry will open a popup menu from - which the appropriate module can be selected.</p> + <p>To open a popup menu from which the appropriate module can be + selected, right-click the <em>Module</em> entry.</p> - <p>Clicking the Ok button (or 'Return' or 'Tab') when a module - name has been given, will bring up all functions of the module - in the listbox.</p> + <p>To bring up all functions of the module in the listbox, + click the <em>OK</em> button (or press the <em>Return</em> + or <em>Tab</em> key) when a module name has been specified,.</p> </section> </section> @@ -249,7 +244,7 @@ c_break(Bindings) -> <p>The Erlang emulator keeps track of a <em>stack trace</em>, information about recent function calls. This information is - used, for example, if an error occurs:</p> + used if an error occurs, for example:</p> <pre> 1> <input>catch a+1.</input> {'EXIT',{badarith,[{erlang,'+',[a,1],[]}, @@ -259,602 +254,597 @@ c_break(Bindings) -> {shell,eval_exprs,7,[{file,"shell.erl"},{line,629}]}, {shell,eval_loop,3,[{file,"shell.erl"},{line,614}]}]}}</pre> - <p>See the Erlang Reference Manual, - <seealso marker="doc/reference_manual:errors"> - Errors and Error Handling</seealso>, - for more information about the stack trace.</p> + <p>For details about the stack trace, see section + <seealso marker="doc/reference_manual:errors">Errors and Error Handling</seealso> + in the Erlang Reference Manual.</p> - <p>The Debugger emulates the stack trace by keeping track of recently + <p>Debugger emulates the stack trace by keeping track of recently called interpreted functions. (The real stack trace cannot be - used, as it shows which functions of the Debugger have been - called, rather than which interpreted functions).</p> + used, as it shows which functions of Debugger have been + called, rather than which interpreted functions.)</p> <p>This information can be used to traverse the chain of function - calls, using the 'Up' and 'Down' buttons of - <seealso marker="#attach">the Attach Process window</seealso>. - </p> + calls, using the <em>Up</em> and <em>Down</em> buttons in the + <seealso marker="#attach">Attach Process window</seealso>.</p> - <p>By default, the Debugger only saves information about recursive + <p>By default, Debugger only saves information about recursive function calls, that is, function calls that have not yet returned - a value (option 'Stack On, No Tail').</p> + a value (option <em>Stack On, No Tail</em>).</p> <p>Sometimes, however, it can be useful to save all calls, even - tail-recursive calls. That can be done with the 'Stack On, Tail' - option. Note that this option will consume more memory and slow - down execution of interpreted functions when there are many - tail-recursive calls. - </p> - - <p>It is also possible to turn off the Debugger stack trace - facility ('Stack Off'). <em>Note:</em> If an error occurs, in this - case the stack trace will be empty.</p> - - <p>See the section about <seealso marker="#monitor">the Monitor - Window</seealso> for information about how to change the stack - trace option.</p> + tail-recursive calls. This is done with option + <em>Stack On, Tail</em>. Notice that this option consumes more + memory and slows down execution of interpreted functions when there + are many tail-recursive calls.</p> + + <p>To turn off the Debugger stack trace facility, select option + <em>Stack Off</em>.</p> + + <note> + <p>If an error occurs, the stack trace becomes empty in this + case.</p> + </note> + + <p>For information about how to change the stack trace option, see + section <seealso marker="#monitor">Monitor Window</seealso>.</p> </section> <section> <marker id="monitor"/> - <title>The Monitor Window</title> + <title>Monitor Window</title> + + <p>The Monitor window is the main window of Debugger and displays the + following:</p> - <p>The Monitor window is the main window of Debugger and shows a - listbox containing the names of all interpreted modules - (double-clicking a module brings up the View Module window), - which options are selected, and information about all debugged - processes, that is all processes which have been/are executing - code in interpreted modules.</p> + <list type="bulleted"> + <item><p>A listbox containing the names of all interpreted + modules</p> + <p>Double-clicking a module brings up the View Module window.</p> + </item> + <item><p>Which options are selected</p></item> + <item><p>Information about all debugged processes, that is, all + processes that have been or are executing code in interpreted + modules</p></item> + </list> <image file="images/monitor.jpg"> - <icaption>The Monitor Window.</icaption> + <icaption>Monitor Window</icaption> </image> - <p>The Auto Attach buttons, Stack Trace label, Back Trace Size - label, and Strings button show some options set, see - <seealso marker="#options">Options Menu</seealso> for further - information about these options.</p> + <p>The <em>Auto Attach</em> boxes, <em>Stack Trace</em> label, + <em>Back Trace Size</em> label, and <em>Strings</em> box display + some options set. For details about these options, see section + <seealso marker="#options">Options Menu</seealso>.</p> <section> <title>Process Grid</title> - <taglist> <tag><em>Pid</em></tag> <item><p>The process identifier.</p></item> - + <tag><em>Initial Call</em></tag> <item><p>The first call to an interpreted function by this - process. (<c>Module:Function/Arity</c>)</p></item> + process. (<c>Module:Function/Arity</c>)</p></item> <tag><em>Name</em></tag> - <item><p>The registered name, if any. If a registered name does - not show up, it may be that the Debugger received - information about the process before the name had been - registered. Try selecting <em>Edit->Refresh</em>.</p></item> + <item><p>The registered name, if any. If a registered name is not + displayed, it can be that Debugger received information about + the process before the name was registered. Try selecting + <em>Edit > Refresh</em>.</p></item> <tag><em>Status</em></tag> <item><p>The current status, one of the following:</p> <taglist> <tag><em>idle</em></tag> - <item><p>The interpreted function call has returned a value, - and the process is no longer executing interpreted code. - </p></item> + <item><p>The interpreted function call has returned a value, and + the process is no longer executing interpreted code.</p></item> <tag><em>running</em></tag> <item><p>The process is running.</p></item> - + <tag><em>waiting</em></tag> <item><p>The process is waiting in a <c>receive</c> - statement.</p></item> - + statement.</p></item> + <tag><em>break</em></tag> <item><p>The process is stopped at a breakpoint.</p></item> - + <tag><em>exit</em></tag> <item><p>The process has terminated.</p></item> - + <tag><em>no_conn</em></tag> <item><p>There is no connection to the node where - the process is located.</p></item> + the process is located.</p></item> </taglist> </item> <tag><em>Information</em></tag> - <item><p>Additional information, if any. If the process is - stopped at a breakpoint, the field contains information - about the location <c>{Module,Line}</c>. If the process has - terminated, the field contains the exit reason.</p></item> + <item><p>More information, if any. If the process is + stopped at a breakpoint, the field contains information + about the location <c>{Module,Line}</c>. If the process has + terminated, the field contains the exit reason.</p></item> </taglist> </section> <section> - <title>The File Menu</title> - + <title>File Menu</title> + <taglist> <tag><em>Load Settings...</em></tag> - <item> - <p>Try to load and restore Debugger settings from a file - previously saved using <em>Save Settings...</em>, see below. - Any errors are silently ignored. - <em>Note:</em> Settings saved by Erlang R16B01 or later - cannot be read by Erlang R16B or earlier.</p> + <item><p>Tries to load and restore Debugger settings from a file + previously saved using <em>Save Settings...</em> (see below). + Any errors are silently ignored.</p> + <p>Notice that settings saved by Erlang/OTP R16B01 or later + cannot be read by Erlang/OTP R16B or earlier.</p> </item> - + <tag><em>Save Settings...</em></tag> - <item><p>Save Debugger settings to a file. The settings include - the set of interpreted files, breakpoints, and the selected - options. The settings can be restored in a later Debugger - session using <em>Load Settings...</em>, see above. - Any errors are silently ignored.</p> + <item><p>Saves Debugger settings to a file. The settings include + the set of interpreted files, breakpoints, and the selected + options. The settings can be restored in a later Debugger + session using <em>Load Settings...</em> (see above). + Any errors are silently ignored.</p> </item> - + <tag><em>Exit</em></tag> - <item><p>Stop Debugger.</p></item> + <item><p>Stops Debugger.</p></item> </taglist> </section> <section> - <title>The Edit Menu</title> + <title>Edit Menu</title> <taglist> <tag><em>Refresh</em></tag> - <item><p>Update information about debugged processes. Removes - information about all terminated processes from the window, - and also closes all Attach Process windows for terminated - processes.</p></item> + <item><p>Updates information about debugged processes. Information + about all terminated processes are removed from the window. All + Attach Process windows for terminated processes are closed.</p></item> <tag><em>Kill All</em></tag> - <item><p>Terminate all processes listed in the window using - <c>exit(Pid,kill)</c>.</p></item> + <item><p>Terminates all processes listed in the window using + <c>exit(Pid,kill)</c>.</p></item> </taglist> </section> <section> - <title>The Module Menu</title> + <title>Module Menu</title> <taglist> <tag><em>Interpret...</em></tag> - <item><p>Open the <seealso marker="#interpret">Interpret Dialog - window</seealso> where new modules to be interpreted can - be specified.</p></item> - + <item><p>Opens the + <seealso marker="#interpret">Interpret Modules window</seealso>, + where new modules to be interpreted can be specified.</p></item> + <tag><em>Delete All</em></tag> - <item><p>Stop interpreting all modules. Processes executing in - interpreted modules will terminate.</p></item> + <item><p>Stops interpreting all modules. Processes executing in + interpreted modules terminate.</p></item> </taglist> <p>For each interpreted module, a corresponding entry is added to - the Module menu, with the following submenu:</p> + the <em>Module</em> menu, with the following submenu:</p> <taglist> <tag><em>Delete</em></tag> - <item><p>Stop interpreting the selected module. Processes - executing in this module will terminate.</p></item> - + <item><p>Stops interpreting the selected module. Processes + executing in this module terminate.</p></item> + <tag><em>View</em></tag> - <item><p>Open a <seealso marker="#view">View Module - window</seealso> showing the contents of the selected - module.</p></item> + <item><p>Opens a + <seealso marker="#view">View Module window</seealso>, displaying the + contents of the selected module.</p></item> </taglist> </section> <section> - <title>The Process Menu</title> + <title>Process Menu</title> <p>The following menu items apply to the currently selected - process, provided it is stopped at a breakpoint. See the chapter - about the <seealso marker="#attach">Attach Process - window</seealso> for more information.</p> + process, provided it is stopped at a breakpoint (for details, see + section + <seealso marker="#attach">Attach Process window</seealso>):</p> <taglist> <tag><em>Step</em></tag><item></item> <tag><em>Next</em></tag><item></item> <tag><em>Continue</em></tag><item></item> <tag><em>Finish</em></tag><item></item> </taglist> + <p>The following menu items apply to the currently selected - process.</p> + process:</p> <taglist> <tag><em>Attach</em></tag> - <item><p>Attach to the process and open a - <seealso marker="#attach">Attach Process window</seealso>. - </p></item> - + <item><p>Attaches to the process and open an + <seealso marker="#attach">Attach Process window</seealso>.</p></item> + <tag><em>Kill</em></tag> - <item><p>Terminate the process using <c>exit(Pid,kill)</c>.</p> - </item> + <item><p>Terminates the process using <c>exit(Pid,kill)</c>.</p></item> </taglist> </section> - <section> - <title>The Break Menu</title> - <p>The items in this menu are used to create and delete - breakpoints. - See the <seealso marker="#breakpoints">Breakpoints</seealso> - chapter for more information.</p> + <section> + <title>Break Menu</title> + <p>The items in this menu are used to create and delete breakpoints. + For details, see section + <seealso marker="#breakpoints">Breakpoints</seealso>.</p> + <taglist> <tag><em>Line Break...</em></tag> - <item><p>Set a line breakpoint.</p></item> + <item><p>Sets a line breakpoint.</p></item> <tag><em>Conditional Break...</em></tag> - <item><p>Set a conditional breakpoint.</p></item> + <item><p>Sets a conditional breakpoint.</p></item> <tag><em>Function Break...</em></tag> - <item><p>Set a function breakpoint.</p></item> + <item><p>Sets a function breakpoint.</p></item> <tag><em>Enable All</em></tag> - <item><p>Enable all breakpoints.</p></item> + <item><p>Enables all breakpoints.</p></item> <tag><em>Disable All</em></tag> - <item><p>Disable all breakpoints.</p></item> + <item><p>Disables all breakpoints.</p></item> - <tag><em>Delete All</em></tag> - <item><p>Remove all breakpoints.</p></item> + <tag><em>Delete All</em></tag> + <item><p>Removes all breakpoints.</p></item> </taglist> - <p>For each breakpoint, a corresponding entry is added to - the Break - menu, from which it is possible to disable/enable or delete - the breakpoint, and to change its trigger action.</p> + <p>For each breakpoint, a corresponding entry is added to the + <em>Break</em> menu, from which it is possible to disable, enable, + or delete the breakpoint, and to change its trigger action.</p> </section> <section> <marker id="options"/> - <title>The Options Menu</title> + <title>Options Menu</title> <taglist> <tag><em>Trace Window</em></tag> - <item><p>Set which areas should be visible in - an <seealso marker="#attach">Attach Process - window</seealso>. Does not affect already existing - Attach Process windows.</p> + <item><p>Sets the areas to be visible in an + <seealso marker="#attach">Attach Process window</seealso>. + Does not affect existing Attach Process windows.</p> </item> <tag><em>Auto Attach</em></tag> - <item><p>Set at which events a debugged process should be - automatically attached to. Affects existing debugged - processes.</p> - <list> - <item><em>First Call</em> - the first time a process calls a - function in an interpreted module.</item> - <item><em>On Exit</em> - at process termination.</item> - <item><em>On Break</em> - when a process reaches a - breakpoint.</item> + <item><p>Sets the events a debugged process is to be attached + to automatically. Affects existing debugged processes.</p> + <list type="bulleted"> + <item><p><em>First Call</em> - The first time a process calls + a function in an interpreted module.</p></item> + <item><p><em>On Exit</em> - At process termination.</p></item> + <item><p><em>On Break</em> - When a process reaches a + breakpoint.</p></item> </list> </item> <tag><em>Stack Trace</em></tag> - <item><p>Set stack trace option, see section + <item><p>Sets the stack trace option, see section <seealso marker="#stack_trace">Stack Trace</seealso>. Does not - affect already existing debugged processes.</p> - <list> - <item><em>Stack On, Tail</em> - save information about all - current calls.</item> - <item><em>Stack On, No Tail</em> - save information about + affect existing debugged processes.</p> + <list type="bulleted"> + <item><p><em>Stack On, Tail</em> - Saves information about all + current calls.</p></item> + <item><p><em>Stack On, No Tail</em> - Saves information about current calls, discarding previous information when a tail - recursive call is made.</item> - <item><em>Stack Off</em> - do not save any information about - current calls.</item> + recursive call is made.</p></item> + <item><p><em>Stack Off</em> - Does not save any information about + current calls.</p></item> </list> </item> <tag><em>Strings</em></tag> - <item><p>Set which integer lists should be printed as strings. - Does not affect already existing debugged processes.</p> - <list> - - <item><em>Use range of +pc flag</em> - use the printable - character range set by the - <seealso marker="erts:erl#printable_character_range"> - <c>erl(1)</c></seealso> flag <c>+pc</c>. - </item> + <item><p>Sets the integer lists to be printed as strings. + Does not affect existing debugged processes.</p> + <list type="bulleted"> + <item><p><em>Use range of +pc flag</em> - Uses the printable + character range set by the <c>erl(1)</c> flag + <seealso marker="erts:erl#printable_character_range"><c>+pc</c></seealso>.</p> + </item> </list> </item> <tag><em>Back Trace Size...</em></tag> - <item><p>Set how many call frames should be fetched when - inspecting the call stack from the Attach Process window. - Does not affect already existing Attach Process windows.</p> + <item><p>Sets how many call frames to be fetched when + inspecting the call stack from the Attach Process window. + Does not affect existing Attach Process windows.</p> </item> </taglist> </section> <section> - <title>The Windows Menu</title> + <title>Windows Menu</title> <p>Contains a menu item for each open Debugger window. Selecting - one of the items will raise the corresponding window.</p> + one of the items raises the corresponding window.</p> </section> <section> - <title>The Help Menu</title> + <title>Help Menu</title> <taglist> <tag><em>Help</em></tag> - <item><p>View the Debugger documentation. Currently this - function requires a web browser to be up and running.</p></item> + <item><p>Shows the Debugger documentation. This function requires a + web browser.</p></item> </taglist> </section> </section> - + <section> <marker id="interpret"/> - <title>The Interpret Dialog Window</title> + <title>Interpret Modules Window</title> - <p>The interpret dialog module is used for selecting which modules - to interpret. Initially, the window shows the modules (<c>erl</c> - files) and subdirectories of the current working directory.</p> + <p>The Interpret Modules window is used for selecting which modules + to interpret. Initially, the window displays the modules (<c>erl</c> + files) and subdirectories of the current working directory.</p> - <p>Interpretable modules are modules for which a BEAM file, compiled - with the option <c>debug_info</c> set, can be found in the same + <p>Interpretable modules are modules for which a <c>.beam</c> file, + compiled with option <c>debug_info</c> set, is located in the same directory as the source code, or in an <c>ebin</c> directory next to it.</p> - <p>Modules, for which the above requirements are not fulfilled, are - not interpretable and are therefore displayed within parentheses. - </p> + <p>Modules for which these requirements are not fulfilled are + not interpretable and are therefore displayed within parentheses.</p> - <p>The <c>debug_info</c> option causes <em>debug information</em> or - <em>abstract code</em> to be added to the BEAM file. This will - increase the size of the file, and also makes it possible to + <p>Option <c>debug_info</c> causes <em>debug information</em> or + <em>abstract code</em> to be added to the <c>.beam</c> file. + This increases the file size and makes it possible to reconstruct the source code. It is therefore recommended not to include debug information in code aimed for target systems.</p> <p>An example of how to compile code with debug information using - <c>erlc</c>:<br/> - <c>% erlc +debug_info module.erl</c></p> - + <c>erlc</c>:</p> + <pre> +% erlc +debug_info module.erl</pre> + <p>An example of how to compile code with debug information from - the Erlang shell:<br/> - <c>4> c(module, debug_info).</c></p> - + the Erlang shell:</p> + <pre> +4> c(module, debug_info).</pre> + <image file="images/interpret.jpg"> - <icaption>The Interpret Dialog Window.</icaption> + <icaption>Interpret Modules Window</icaption> </image> - <p>Browse the file hierarchy and interpret the appropriate modules - by selecting a module name and pressing <em>Choose</em> (or - carriage return), or by double clicking the module name. - Interpreted modules have the type <c>erl src</c>. - </p> + <p>To browse the file hierarchy and interpret the appropriate modules, + either select a module name and click <em>Choose</em> (or + press carriage return), or double-click the module name. + Interpreted modules have the type <c>erl src</c>.</p> - <p>Pressing <em>All</em> will interpret all displayed modules in - the chosen directory.</p> + <p>To interpret all displayed modules in the chosen directory, click + <em>All</em>.</p> - <p>Pressing <em>Done</em> will close the window.</p> + <p>To close the window, click <em>Done</em>.</p> <note> - <p>When the Debugger is started in global mode (which is - the default, see - <seealso marker="debugger:debugger#start/0">debugger:start/0</seealso>), - modules added (or deleted) for interpretation will be added (or - deleted) on all known Erlang nodes.</p> + <p>When Debugger is started in global mode (which is the default, see + <seealso marker="debugger#start/0">debugger:start/0</seealso>), + modules added (or deleted) for interpretation are added (or + deleted) on all known Erlang nodes.</p> </note> </section> <section> <marker id="attach"/> - <title>The Attach Process Window</title> + <title>Attach Process Window</title> - <p>From an Attach Process window the user can interact with a + <p>From an Attach Process window, you can interact with a debugged process. One window is opened for each process that has - been attached to. Note that when attaching to a process, its - execution is automatically stopped. - </p> + been attached to. Notice that when attaching to a process, its + execution is automatically stopped.</p> <image file="images/attach.jpg"> - <icaption>The Attach Process Window.</icaption> + <icaption>Attach Process Window</icaption> </image> - <p>The window is divided into five parts:</p> - <list> - <item><p>The Code area, showing the code being executed. The code - is indented and each line is prefixed with its line number. - If the process execution is stopped, the current line is - marked with <em>--></em>. An existing break point at a line - is marked with a stop symbol. In the example above, - the execution has been stopped at line 6, before - the execution of <c>fac/1</c>.</p> - <p>Active breakpoints are shown in red, while inactive - breakpoints are shown in blue.</p> + <p>The window is divided into the following five parts:</p> + <list type="bulleted"> + <item><p>The Code area, displaying the code being executed. The code + is indented and each line is prefixed with its line number. + If the process execution is stopped, the current line is + marked with <c>--></c>. An existing break point at a line + is marked with a stop symbol. In the example shown in the + illustration, the execution stopped at line 6, before + the execution of <c>fac/1</c>.</p> + + <p>Active breakpoints are displayed in red and inactive + breakpoints in blue.</p> </item> - <item>The Button area, with buttons for quick access to frequently - used functions in the Process menu.</item> - <item>The Evaluator area, where the user can evaluate functions - within the context of the debugged process, provided that - process execution has been stopped.</item> - <item>The Bindings area, showing all variables bindings. - Clicking on a variable name will result in the value being - displayed in the Evaluator area. - Double-clicking on a variable name will open a window where - the variable value may be edited. Note however that pid, - reference, binary or port values can not be edited. + + <item><p>The Button area, with buttons for quick access to frequently + used functions in the <em>Process</em> menu.</p></item> + + <item><p>The Evaluator area, where you can evaluate functions + within the context of the debugged process, if that + process execution is stopped.</p></item> + + <item><p>The Bindings area, displaying all variables bindings. If you + click a variable name, the value is displayed in the Evaluator area. + Double-click a variable name to open a window where + the variable value can be edited. Notice however that pid, + reference, binary, or port values cannot be edited.</p> </item> - <item><p>The Trace area, showing a trace output for the process. - </p> + + <item><p>The Trace area, which displays a trace output for the + process.</p> <taglist> - <tag><c>++ (N) <L></c></tag> - <item>Function call, where <c>N</c> is the call level and - <c>L</c> the line number.</item> + <tag><c>++ (N) <L></c></tag> + <item><p>Function call, where <c>N</c> is the call level and + <c>L</c> the line number.</p></item> - <tag><c>-- (N)</c></tag> - <item>Function return value.</item> + <tag><c>-- (N)</c></tag> + <item><p>Function return value</p>.</item> - <tag><c>==> Pid : Msg</c></tag> - <item>The message <c>Msg</c> is sent to process <c>Pid</c>. - </item> + <tag><c>==> Pid : Msg</c></tag> + <item><p>The message <c>Msg</c> is sent to process + <c>Pid</c>.</p></item> - <tag><c><![CDATA[<== Msg]]></c></tag> - <item>The message <c>Msg</c> is received.</item> + <tag><c><![CDATA[<== Msg]]></c></tag> + <item><p>The message <c>Msg</c> is received.</p></item> - <tag><c>++ (N) receive</c></tag> - <item>Waiting in a <c>receive</c>.</item> + <tag><c>++ (N) receive</c></tag> + <item><p>Waiting in a <c>receive</c>.</p></item> - <tag><c>++ (N) receive with timeout</c></tag> - <item>Waiting in a <c>receive...after</c>.</item> - </taglist> + <tag><c>++ (N) receive with timeout</c></tag> + <item><p>Waiting in a <c>receive...after</c>.</p></item> + </taglist> - <p>Also the back trace, a summary of the current function calls - on the stack, is displayed in the Trace area.</p> + <p>The Trace area also displays Back Trace, a summary of the + current function calls on the stack.</p> </item> </list> - <p>It is configurable using the Options menu which areas should - be shown or hidden. By default, all areas except the Trace area - are shown.</p> + <p>Using the <em>Options</em> menu, you can set which areas to be + displayed. By default, all areas except the Trace area are displayed.</p> <section> - <title>The File Menu</title> + <title>File Menu</title> <taglist> <tag><em>Close</em></tag> - <item><p>Close this window and detach from the process.</p> + <item><p>Closes this window and detach from the process.</p> </item> </taglist> </section> <section> - <title>The Edit Menu</title> + <title>Edit Menu</title> <taglist> <tag><em>Go to line...</em></tag> - <item><p>Go to a specified line number.</p></item> + <item><p>Goes to a specified line number.</p></item> <tag><em>Search...</em></tag> - <item><p>Search for a specified string.</p></item> + <item><p>Searches for a specified string.</p></item> </taglist> </section> <section> - <title>The Process Menu</title> + <title>Process Menu</title> <taglist> <tag><em>Step</em></tag> - <item><p>Execute the current line of code, stepping into any + <item><p>Executes the current code line, stepping into any (interpreted) function calls.</p></item> <tag><em>Next</em></tag> - <item><p>Execute the current line of code and stop at the next + <item><p>Executes the current code line and stop at the next line.</p></item> <tag><em>Continue</em></tag> - <item><p>Continue the execution.</p></item> + <item><p>Continues the execution.</p></item> <tag><em>Finish</em></tag> - <item><p>Continue the execution until the current function + <item><p>Continues the execution until the current function returns.</p></item> <tag><em>Skip</em></tag> - <item><p>Skip the current line of code and stop at the next + <item><p>Skips the current code line and stop at the next line. If used on the last line in a function body, - the function will return <c>skipped</c>.</p></item> + the function returns <c>skipped</c>.</p></item> <tag><em>Time Out</em></tag> - <item><p>Simulate a timeout when executing a + <item><p>Simulates a time-out when executing a <c>receive...after</c> statement.</p></item> <tag><em>Stop</em></tag> - <item><p>Stop the execution of a running process, that is, make - the process stop as at a breakpoint. The command will take + <item><p>Stops the execution of a running process, that is, make + the process stop at a breakpoint. The command takes effect (visibly) the next time the process receives a message.</p></item> <tag><em>Where</em></tag> - <item><p>Make sure the current location of the execution is + <item><p>Verifies that the current location of the execution is visible in the code area.</p></item> <tag><em>Kill</em></tag> - <item><p>Terminate the process using <c>exit(Pid,kill)</c>.</p> + <item><p>Terminates the process using <c>exit(Pid,kill)</c>.</p> </item> <tag><em>Messages</em></tag> - <item><p>Inspect the message queue of the process. The queue is - printed in the evaluator area.</p></item> + <item><p>Inspects the message queue of the process. The queue is + displayed in the Evaluator area.</p></item> <tag><em>Back Trace</em></tag> - <item><p>Display the back trace of the process, a summary of - the current function calls on the stack, in the trace area. - Requires that the Trace area is visible and that the stack - trace option is 'Stack On, Tail' or 'Stack On, No Tail'.</p> + <item><p>Displays the back trace of the process, a summary of + the current function calls on the stack, in the Trace area. + Requires that the Trace area is visible and that the Stack + Trace option is <em>Stack On, Tail</em> or + <em>Stack On, No Tail</em>.</p> </item> <tag><em>Up</em></tag> - <item><p>Inspect the previous function call on the stack, + <item><p>Inspects the previous function call on the stack, showing the location and variable bindings.</p></item> <tag><em>Down</em></tag> - <item><p>Inspect the next function call on the stack, showing + <item><p>Inspects the next function call on the stack, showing the location and variable bindings.</p></item> </taglist> </section> <section> - <title>The Options Menu</title> + <title>Options Menu</title> <taglist> <tag><em>Trace Window</em></tag> - <item><p>Set which areas should be visible. Does not affect - other Attach Process windows.</p> - </item> + <item><p>Sets which areas are to be visible. Does not affect + other Attach Process windows.</p></item> <tag><em>Stack Trace</em></tag> - <item><p>Same as in <seealso marker="#monitor">the Monitor - window</seealso>, but only affects the debugged - process the window is attached to.</p> - </item> + <item><p>Same as in the <seealso marker="#monitor">Monitor + window</seealso>, but only affects the debugged + process the window is attached to.</p></item> <tag><em>Strings</em></tag> - <item><p>Same as in <seealso marker="#monitor">the Monitor - window</seealso>, but only affects the debugged - process the window is attached to.</p> - </item> + <item><p>Same as in the <seealso marker="#monitor">Monitor + window</seealso>, but only affects the debugged + process the window is attached to.</p></item> <tag><em>Back Trace Size...</em></tag> - <item><p>Set how many call frames should be fetched when + <item><p>Sets how many call frames are to be fetched when inspecting the call stack. Does not affect other Attach - Process windows.</p> - </item> + Process windows.</p></item> </taglist> </section> <section> - <title>Break, Windows and Help Menus</title> + <title>Break, Windows, and Help Menus</title> - <p>The Break, Windows and Help menus look the same as in - the Monitor window, see the chapter - <seealso marker="#monitor">The Monitor Window</seealso>, except - that the Breaks menu apply to the local breakpoints only.</p> + <p>The <em>Break</em>, <em>Windows</em>, and <em>Help</em> menus + are the same as in the + <seealso marker="#monitor">Monitor Window</seealso>, except + that the <em>Breaks</em> menu applies only to local + breakpoints.</p> </section> </section> <section> <marker id="view"/> - <title>The View Module Window</title> + <title>View Module Window</title> - <p>The View Module window shows the contents of an interpreted + <p>The View Module window displays the contents of an interpreted module and makes it possible to set breakpoints.</p> <image file="images/view.jpg"> - <icaption>The View Module Window.</icaption> + <icaption>View Module Window</icaption> </image> <p>The source code is indented and each line is prefixed with its line number.</p> - <p>Clicking a line will highlight it and select it to be the target - of the breakpoint functions available from the Break menu. - Doubleclicking a line will set a line breakpoint on that line. - Doubleclicking a line with an existing breakpoint will remove - the breakpoint.</p> + <p>Clicking a line highlights it and selects it to be the target + of the breakpoint functions available from the <em>Break</em> menu. + To set a line breakpoint on a line, double-click it. + To remove the breakpoint, double-click the line with an existing + breakpoint.</p> <p>Breakpoints are marked with a stop symbol.</p> <section> <title>File and Edit Menus</title> - <p>The File and Edit menus look the same as in the Attach Process - window, see the chapter <seealso marker="#attach">The Attach - Process Window</seealso>.</p> + <p>The <em>File</em> and <em>Edit</em> menus are the same as in the + <seealso marker="#attach">Attach Process Window</seealso>.</p> </section> <section> - <title>Break, Windows and Help Menus</title> + <title>Break, Windows, and Help Menus</title> - <p>The Break, Windows and Help menus look the same as in - the Monitor window, see the chapter - <seealso marker="#monitor">The Monitor Window</seealso>, except - that the Breaks menu apply to the local breakpoints only.</p> + <p>The <em>Break</em>, <em>Windows</em>, and <em>Help</em> menus + are the same as in the + <seealso marker="#monitor">Monitor Window</seealso>, except + that the <em>Break</em> menu applies only to local breakpoints.</p> </section> </section> @@ -862,14 +852,14 @@ c_break(Bindings) -> <title>Performance</title> <p>Execution of interpreted code is naturally slower than for - regularly compiled modules. Using the Debugger also increases + regularly compiled modules. Using Debugger also increases the number of processes in the system, as for each debugged process another process (the meta process) is created.</p> - <p>It is also worth to keep in mind that programs with timers may + <p>It is also worth to keep in mind that programs with timers can behave differently when debugged. This is especially true when - stopping the execution of a process, for example at a - breakpoint. Timeouts can then occur in other processes that + stopping the execution of a process (for example, at a + breakpoint). Time-outs can then occur in other processes that continue execution as normal.</p> </section> @@ -878,8 +868,8 @@ c_break(Bindings) -> <p>Code loading works almost as usual, except that interpreted modules are also stored in a database and debugged processes - uses only this stored code. Re-interpreting an interpreted - module will result in the new version being stored as well, but + use only this stored code. Reinterpreting an interpreted + module results in the new version being stored as well, but does not affect existing processes executing an older version of the code. This means that the code replacement mechanism of Erlang does not work for debugged processes.</p> @@ -888,22 +878,24 @@ c_break(Bindings) -> <section> <title>Debugging Remote Nodes</title> - <p>By using <c>debugger:start/1</c>, it can be specified if Debugger - should be started in local or global mode.</p> + <p>By using + <seealso marker="debugger#start/1">debugger:start/1</seealso>, + you can specify if Debugger is to be started in local or global + mode:</p> <pre> debugger:start(local | global)</pre> - <p>If no argument is provided, Debugger is started in global mode. - </p> + + <p>If no argument is provided, Debugger starts in global mode.</p> <p>In local mode, code is interpreted only at the current node. In global mode, code is interpreted at all known nodes. Processes - at other nodes executing interpreted code will automatically be - shown in the Monitor window and can be attached to like any other + at other nodes executing interpreted code are automatically + displayed in the Monitor window and can be attached to like any other debugged process.</p> - <p>It is possible, but definitely not recommended to start Debugger - in global mode on more than one node in a network, as they will - interfere with each other leading to inconsistent behaviour.</p> + <p>It is possible, but definitely not recommended, to start Debugger + in global mode on more than one node in a network, as the nodes + interfere with each other, leading to inconsistent behavior.</p> </section> </chapter> diff --git a/lib/debugger/doc/src/i.xml b/lib/debugger/doc/src/i.xml index 9ceba94b44..db89f23494 100644 --- a/lib/debugger/doc/src/i.xml +++ b/lib/debugger/doc/src/i.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>1998</year><year>2013</year> + <year>1998</year><year>2016</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -29,35 +29,36 @@ <rev></rev> </header> <module>i</module> - <modulesummary>Debugger/Interpreter Interface</modulesummary> + <modulesummary>Debugger/Interpreter Interface.</modulesummary> <description> - <p>The module <c>i</c> provides short forms for some of + <p>The <c>i</c> module provides short forms for some of the functions used by the graphical Debugger and some of - the functions in the <c>int</c> module, the Erlang interpreter. - </p> + the functions in module + <seealso marker="int"><c>int</c></seealso>, the Erlang interpreter.</p> <p>This module also provides facilities for displaying status information about interpreted processes and break points.</p> <p>It is possible to attach to interpreted processes by giving the corresponding process identity only. By default, an attachment - window pops up. Processes at other Erlang nodes can be + window is displayed. Processes at other Erlang nodes can be attached manually or automatically.</p> - <p>By preference, these functions can be included in the module - <c>shell_default</c>. By default, they are.</p> + <p>By preference, these functions can be included in module + <seealso marker="stdlib:shell_default"><c>stdlib:shell_default</c></seealso>. + By default, they are included in that module.</p> </description> <funcs> <func> <name>im() -> pid()</name> - <fsummary>Start a graphical monitor</fsummary> + <fsummary>Start a graphical monitor.</fsummary> <desc> <p>Starts a new graphical monitor. This is the Monitor window, - the main window of the Debugger. All of the Debugger and + the main window of Debugger. All the Debugger and interpreter functionality is accessed from the Monitor window. - The Monitor window displays the status of all processes that - have been/are executing interpreted modules.</p> + This window displays the status of all processes that + have been or are executing interpreted modules.</p> </desc> </func> @@ -66,7 +67,7 @@ <name>ii(AbsModule) -> {module, Module} | error</name> <name>ini(AbsModules) -> ok</name> <name>ini(AbsModule) -> {module, Module} | error</name> - <fsummary>Interpret a module</fsummary> + <fsummary>Interpret a module.</fsummary> <type> <v>AbsModules = [AbsModule]</v> <v>AbsModule = Module | File</v> @@ -85,7 +86,7 @@ <func> <name>iq(AbsModule) -> ok</name> <name>inq(AbsModule) -> ok</name> - <fsummary>Stop interpreting a module</fsummary> + <fsummary>Stop interpreting a module.</fsummary> <type> <v>AbsModule = Module | File</v> <v> Module = atom()</v> @@ -110,28 +111,27 @@ <func> <name>ip() -> ok</name> - <fsummary>Make a printout of the current status of all interpreted - processes</fsummary> + <fsummary>Print the current status of all interpreted + processes.</fsummary> <desc> - <p>Makes a printout of the current status of all interpreted - processes.</p> + <p>Prints the current status of all interpreted processes.</p> </desc> </func> <func> <name>ic() -> ok</name> <fsummary>Clear information about processes executing interpreted - code</fsummary> + code.</fsummary> <desc> <p>Clears information about processes executing interpreted code - byt removing all information about terminated processes.</p> + by removing all information about terminated processes.</p> </desc> </func> <func> <name>iaa(Flags) -> true</name> <name>iaa(Flags, Function) -> true</name> - <fsummary>Set when and how to attach to a process</fsummary> + <fsummary>Set when and how to attach to a process.</fsummary> <type> <v>Flags = [init | break | exit]</v> <v>Function = {Module,Name,Args}</v> @@ -139,42 +139,41 @@ <v> Args = [term()]</v> </type> <desc> - <p>Sets when and how to automatically attach to a debugged - process, see + <p>Sets when and how to attach to a debugged process + automatically, see <seealso marker="int#auto_attach/0">int:auto_attach/2</seealso>. <c>Function</c> defaults to the standard function used by - the Debugger.</p> + Debugger.</p> </desc> </func> <func> <name>ist(Flag) -> true</name> - <fsummary>Set how to save call frames</fsummary> + <fsummary>Set how to save call frames.</fsummary> <type> <v>Flag = all | no_tail | false</v> </type> <desc> <p>Sets how to save call frames in the stack, see - <seealso marker="int#stack_trace/0">int:stack_trace/1</seealso>. - </p> + <seealso marker="int#stack_trace/0">int:stack_trace/1</seealso>.</p> </desc> </func> <func> <name>ia(Pid) -> ok | no_proc</name> - <fsummary>Attach to a process</fsummary> + <fsummary>Attache to a process.</fsummary> <type> <v>Pid = pid()</v> </type> <desc> - <p>Attaches to the debugged process <c>Pid</c>. A Debugger + <p>Attaches to the debugged process <c>Pid</c>. An Attach Process window is opened for the process.</p> </desc> </func> <func> <name>ia(X,Y,Z) -> ok | no_proc</name> - <fsummary>Attach to a process</fsummary> + <fsummary>Attache to a process.</fsummary> <type> <v>X = Y = Z = int()</v> </type> @@ -186,7 +185,7 @@ <func> <name>ia(Pid, Function) -> ok | no_proc</name> - <fsummary>Attach to a process</fsummary> + <fsummary>Attache to a process.</fsummary> <type> <v>Pid = pid()</v> <v>Function = {Module,Name}</v> @@ -194,14 +193,14 @@ </type> <desc> <p>Attaches to the debugged process <c>Pid</c>. The interpreter - will call <c>spawn(Module, Name, [Pid])</c> (and ignore + calls <c>spawn(Module, Name, [Pid])</c> (and ignores the result).</p> </desc> </func> <func> <name>ia(X,Y,Z, Function) -> ok | no_proc</name> - <fsummary>Attach to a process</fsummary> + <fsummary>Attache to a process.</fsummary> <type> <v>X = Y = Z = int()</v> <v>Function = {Module,Name}</v> @@ -211,15 +210,15 @@ <p>Same as <c>ia(Pid, Function)</c>, where <c>Pid</c> is the result of calling the shell function <c>pid(X,Y,Z)</c>. An attached process is expected to call the unofficial - <c>int:attached(Pid)</c> function and to be able to handle - messages from the interpreter, see <c>dbg_wx_trace.erl</c> for - an example.</p> + function <c>int:attached(Pid)</c> and to be able to handle + messages from the interpreter. For an example, see + <c>dbg_wx_trace.erl</c>.</p> </desc> </func> <func> <name>ib(Module, Line) -> ok | {error, break_exists}</name> - <fsummary>Create a breakpoint</fsummary> + <fsummary>Create a breakpoint.</fsummary> <type> <v>Module = atom()</v> <v>Line = int()</v> @@ -232,20 +231,20 @@ <func> <name>ib(Module, Name, Arity) -> ok | {error, function_not_found} </name> - <fsummary>Create breakpoints in the specified function</fsummary> + <fsummary>Create breakpoints in the specified function.</fsummary> <type> <v>Module = Name = atom()</v> <v>Arity = int()</v> </type> <desc> <p>Creates breakpoints at the first line of every clause of - the <c>Module:Name/Arity</c> function.</p> + function <c>Module:Name/Arity</c>.</p> </desc> </func> <func> <name>ir() -> ok</name> - <fsummary>Delete all breakpoints</fsummary> + <fsummary>Delete all breakpoints.</fsummary> <desc> <p>Deletes all breakpoints.</p> </desc> @@ -253,7 +252,7 @@ <func> <name>ir(Module) -> ok</name> - <fsummary>Delete all breakpoints in a module</fsummary> + <fsummary>Delete all breakpoints in a module.</fsummary> <type> <v>Module = atom()</v> </type> @@ -264,61 +263,57 @@ <func> <name>ir(Module, Line) -> ok</name> - <fsummary>Delete a breakpoint</fsummary> + <fsummary>Delete a breakpoint.</fsummary> <type> <v>Module = atom()</v> <v>Line = int()</v> </type> <desc> - <p>Deletes the breakpoint located at <c>Line</c> in - <c>Module</c>.</p> + <p>Deletes the breakpoint at <c>Line</c> in <c>Module</c>.</p> </desc> </func> <func> <name>ir(Module, Name, Arity) -> ok | {error, function_not_found} </name> - <fsummary>Delete breakpoints from the specified function - </fsummary> + <fsummary>Delete breakpoints from the specified function.</fsummary> <type> <v>Module = Name = atom()</v> <v>Arity = int()</v> </type> <desc> <p>Deletes the breakpoints at the first line of every clause of - the <c>Module:Name/Arity</c> function.</p> + function <c>Module:Name/Arity</c>.</p> </desc> </func> <func> <name>ibd(Module, Line) -> ok</name> - <fsummary>Make a breakpoint inactive</fsummary> + <fsummary>Make a breakpoint inactive.</fsummary> <type> <v>Module = atom()</v> <v>Line = int()</v> </type> <desc> - <p>Makes the breakpoint at <c>Line</c> in <c>Module</c> - inactive.</p> + <p>Makes the breakpoint at <c>Line</c> in <c>Module</c> inactive.</p> </desc> </func> <func> <name>ibe(Module, Line) -> ok</name> - <fsummary>Make a breakpoint active</fsummary> + <fsummary>Make a breakpoint active.</fsummary> <type> <v>Module = atom()</v> <v>Line = int()</v> </type> <desc> - <p>Makes the breakpoint at <c>Line</c> in <c>Module</c> active. - </p> + <p>Makes the breakpoint at <c>Line</c> in <c>Module</c> active.</p> </desc> </func> <func> <name>iba(Module, Line, Action) -> ok</name> - <fsummary>Set the trigger action of a breakpoint</fsummary> + <fsummary>Set the trigger action of a breakpoint.</fsummary> <type> <v>Module = atom()</v> <v>Line = int()</v> @@ -332,7 +327,7 @@ <func> <name>ibc(Module, Line, Function) -> ok</name> - <fsummary>Set the conditional test of a breakpoint</fsummary> + <fsummary>Set the conditional test of a breakpoint.</fsummary> <type> <v>Module = atom()</v> <v>Line = int()</v> @@ -346,46 +341,44 @@ <p>The conditional test is performed by calling <c>Module:Name(Bindings)</c>, where <c>Bindings</c> is the current variable bindings. The function must return - <c>true</c> (break) or <c>false</c> (do not break). Use - <c>int:get_binding(Var, Bindings)</c> to retrieve the value - of a variable <c>Var</c>.</p> + <c>true</c> (break) or <c>false</c> (do not break). + To retrieve the value of a variable <c>Var</c>, use + <seealso marker="int#get_binding/2">int:get_binding(Var, Bindings)</seealso>.</p> </desc> </func> <func> <name>ipb() -> ok</name> - <fsummary>Make a printout of all existing breakpoints</fsummary> + <fsummary>Print all existing breakpoints.</fsummary> <desc> - <p>Makes a printout of all existing breakpoints.</p> + <p>Prints all existing breakpoints.</p> </desc> </func> <func> <name>ipb(Module) -> ok</name> - <fsummary>Make a printout of all breakpoints in a module - </fsummary> + <fsummary>Print all existing breakpoints in a module.</fsummary> <type> <v>Module = atom()</v> </type> <desc> - <p>Makes a printout of all existing breakpoints in - <c>Module</c>.</p> + <p>Prints all existing breakpoints in <c>Module</c>.</p> </desc> </func> <func> <name>iv() -> atom()</name> - <fsummary>Current version number of the interpreter</fsummary> + <fsummary>Return the current version number of the interpreter. + </fsummary> <desc> <p>Returns the current version number of the interpreter. - The same as the version number of the Debugger application. - </p> + Same as the version number of the <c>Debugger</c> application.</p> </desc> </func> <func> <name>help() -> ok</name> - <fsummary>Print help text</fsummary> + <fsummary>Print help text.</fsummary> <desc> <p>Prints help text.</p> </desc> @@ -393,15 +386,8 @@ </funcs> <section> - <title>Usage</title> - - <p>Refer to the Debugger User's Guide for information about - the Debugger.</p> - </section> - - <section> <title>See Also</title> - <p><c>int(3)</c></p> + <p><seealso marker="int"><c>int(3)</c></seealso></p> </section> </erlref> diff --git a/lib/debugger/doc/src/int.xml b/lib/debugger/doc/src/int.xml index ea21d04a07..31e9dfe923 100644 --- a/lib/debugger/doc/src/int.xml +++ b/lib/debugger/doc/src/int.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>1998</year><year>2013</year> + <year>1998</year><year>2016</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -29,16 +29,16 @@ <rev></rev> </header> <module>int</module> - <modulesummary>Interpreter Interface</modulesummary> + <modulesummary>Interpreter Interface.</modulesummary> <description> <p>The Erlang interpreter provides mechanisms for breakpoints and - stepwise execution of code. It is mainly intended to be used by - the <em>Debugger</em>, see Debugger User's Guide and - <c>debugger(3)</c>.</p> + stepwise execution of code. It is primarily intended to be used by + Debugger, see the User's Guide and + <seealso marker="debugger"><c>debugger(3)</c></seealso>.</p> - <p>From the shell, it is possible to:</p> - <list> - <item>Specify which modules should be interpreted.</item> + <p>The following can be done from the shell:</p> + <list type="bulleted"> + <item>Specify the modules to be interpreted.</item> <item>Specify breakpoints.</item> <item>Monitor the current status of all processes executing code in interpreted modules, also processes at other Erlang nodes. @@ -48,45 +48,48 @@ <p>By <em>attaching to</em> a process executing interpreted code, it is possible to examine variable bindings and order stepwise execution. This is done by sending and receiving information - to/from the process via a third process, called the meta process. - It is possible to implement your own attached process. See + to/from the process through a third process, called the meta + process. You can implement your own attached process. See <c>int.erl</c> for available functions and <c>dbg_wx_trace.erl</c> for possible messages.</p> - <p>The interpreter depends on the Kernel, STDLIB and GS - applications, which means modules belonging to any of these - applications are not allowed to be interpreted as it could lead + <p>The interpreter depends on the Kernel, STDLIB, and + GS applications. This means that modules belonging to any of + these applications are not allowed to be interpreted, as it could lead to a deadlock or emulator crash. This also applies to modules - belonging to the Debugger application itself.</p> + belonging to the Debugger application.</p> </description> <section> + <marker id="int_breakpoints"/> <title>Breakpoints</title> <p>Breakpoints are specified on a line basis. When a process executing code in an interpreted module reaches a breakpoint, it - will stop. This means that that a breakpoint must be set at an - executable line, that is, a line of code containing an executable + stops. This means that a breakpoint must be set at an + executable line, that is, a code line containing an executable expression.</p> - <p>A breakpoint have a status, a trigger action and may have a - condition associated with it. The status is either <em>active</em> - or <em>inactive</em>. An inactive breakpoint is ignored. When a - breakpoint is reached, the trigger action specifies if - the breakpoint should continue to be active (<em>enable</em>), if - it should become inactive (<em>disable</em>), or if it should be - removed (<em>delete</em>). A condition is a tuple - <c>{Module,Name}</c>. When the breakpoint is reached, - <c>Module:Name(Bindings)</c> is called. If this evaluates to - <c>true</c>, execution will stop. If this evaluates to - <c>false</c>, the breakpoint is ignored. <c>Bindings</c> contains - the current variable bindings, use <c>get_binding</c> to retrieve - the value for a given variable.</p> + <p>A breakpoint has the following:</p> + <list type="bulleted"> + <item>A status, which is <em>active</em> or <em>inactive</em>. An + inactive breakpoint is ignored.</item> + <item>A trigger action. When a breakpoint is reached, the trigger + action specifies if the breakpoint is to continue as active + (<em>enable</em>), or to become inactive (<em>disable</em>), or + to be removed (<em>delete</em>).</item> + <item>Optionally an associated condition. A condition is a tuple + <c>{Module,Name}</c>. When the breakpoint is reached, + <c>Module:Name(Bindings)</c> is called. If it evaluates to + <c>true</c>, execution stops. If it evaluates to <c>false</c>, + the breakpoint is ignored. <c>Bindings</c> contains the current + variable bindings. To retrieve the value for a specified variable, + use <c>get_binding</c>.</item> + </list> <p>By default, a breakpoint is active, has trigger action - <c>enable</c> and has no condition associated with it. For more - detailed information about breakpoints, refer to Debugger User's - Guide.</p> + <c>enable</c>, and has no associated condition. For details + about breakpoints, see the User's Guide.</p> </section> <funcs> @@ -95,7 +98,7 @@ <name>i(AbsModules) -> ok</name> <name>ni(AbsModule) -> {module,Module} | error</name> <name>ni(AbsModules) -> ok</name> - <fsummary>Interpret a module</fsummary> + <fsummary>Interpret a module.</fsummary> <type> <v>AbsModules = [AbsModule]</v> <v>AbsModule = Module | File | [Module | File]</v> @@ -107,41 +110,43 @@ the module only at the current node. <c>ni/1</c> interprets the module at all known nodes.</p> - <p>A module may be given by its module name (atom) or by its - file name. If given by its module name, the object code + <p>A module can be specified by its module name (atom) or + filename.</p> + + <p>If specified by its module name, the object code <c>Module.beam</c> is searched for in the current path. The source code <c>Module.erl</c> is searched for first in - the same directory as the object code, then in a <c>src</c> + the same directory as the object code, then in an <c>src</c> directory next to it.</p> - <p>If given by its file name, the file name may include a path - and the <c>.erl</c> extension may be omitted. The object code + <p>If specified by its filename, the filename can include a path + and the <c>.erl</c> extension can be omitted. The object code <c>Module.beam</c> is searched for first in the same directory as the source code, then in an <c>ebin</c> directory next to it, and then in the current path.</p> <note> - <p>The interpreter needs both the source code and the object - code, and the object code <em>must</em> include debug - information. That is, only modules compiled with the option + <p>The interpreter requires both the source code and the object + code. The object code <em>must</em> include debug + information, that is, only modules compiled with option <c>debug_info</c> set can be interpreted.</p> </note> <p>The functions returns <c>{module,Module}</c> if the module - was interpreted, or <c>error</c> if it was not.</p> + was interpreted, otherwise <c>error</c> is returned.</p> - <p>The argument may also be a list of modules/file names, in + <p>The argument can also be a list of modules or filenames, in which case the function tries to interpret each module as - specified above. The function then always returns <c>ok</c>, - but prints some information to stdout if a module could not be - interpreted.</p> + specified earlier. The function then always returns <c>ok</c>, + but prints some information to <c>stdout</c> if a module + cannot be interpreted.</p> </desc> </func> <func> <name>n(AbsModule) -> ok</name> <name>nn(AbsModule) -> ok</name> - <fsummary>Stop interpreting a module</fsummary> + <fsummary>Stop interpreting a module.</fsummary> <type> <v>AbsModule = Module | File | [Module | File]</v> <v> Module = atom()</v> @@ -152,14 +157,14 @@ interpreting the module only at the current node. <c>nn/1</c> stops interpreting the module at all known nodes.</p> - <p>As for <c>i/1</c> and <c>ni/1</c>, a module may be given by - either its module name or its file name.</p> + <p>As for <c>i/1</c> and <c>ni/1</c>, a module can be specified by + its module name or filename.</p> </desc> </func> <func> <name>interpreted() -> [Module]</name> - <fsummary>Get all interpreted modules</fsummary> + <fsummary>Get all interpreted modules.</fsummary> <type> <v>Module = atom()</v> </type> @@ -170,20 +175,20 @@ <func> <name>file(Module) -> File | {error,not_loaded}</name> - <fsummary>Get the file name for an interpreted module</fsummary> + <fsummary>Get the filename for an interpreted module.</fsummary> <type> <v>Module = atom()</v> <v>File = string()</v> </type> <desc> - <p>Returns the source code file name <c>File</c> for an + <p>Returns the source code filename <c>File</c> for an interpreted module <c>Module</c>.</p> </desc> </func> <func> <name>interpretable(AbsModule) -> true | {error,Reason}</name> - <fsummary>Check if a module is possible to interpret</fsummary> + <fsummary>Check if a module can be interpreted.</fsummary> <type> <v>AbsModule = Module | File</v> <v> Module = atom()</v> @@ -193,45 +198,59 @@ <v> App = atom()</v> </type> <desc> - <p>Checks if a module is possible to interpret. The module can - be given by its module name <c>Module</c> or its source file - name <c>File</c>. If given by a module name, the module is - searched for in the code path.</p> - - <p>The function returns <c>true</c> if both source code and - object code for the module is found, the module has been - compiled with the option <c>debug_info</c> set and does not - belong to any of the applications Kernel, STDLIB, GS or - Debugger itself.</p> - - <p>The function returns <c>{error,Reason}</c> if the module for - some reason is not possible to interpret.</p> - - <p><c>Reason</c> is <c>no_src</c> if no source code is found or - <c>no_beam</c> if no object code is found. It is assumed that - the source- and object code are located either in the same - directory, or in <c>src</c> and <c>ebin</c> directories next - to each other.</p> - - <p><c>Reason</c> is <c>no_debug_info</c> if the module has not - been compiled with the option <c>debug_info</c> set.</p> - - <p><c>Reason</c> is <c>badarg</c> if <c>AbsModule</c> is not - found. This could be because the specified file does not - exist, or because <c>code:which/1</c> does not return a - beam file name, which is the case not only for non-existing - modules but also for modules which are preloaded or cover - compiled.</p> - - <p><c>Reason</c> is <c>{app,App}</c> where <c>App</c> is - <c>kernel</c>, <c>stdlib</c>, <c>gs</c> or <c>debugger</c> if - <c>AbsModule</c> belongs to one of these applications.</p> - - <p>Note that the function can return <c>true</c> for a module - which in fact is not interpretable in the case where + <p>Checks if a module can be interpreted. The module can be + specified by its module name <c>Module</c> or its source + filename <c>File</c>. If specified by a module name, the module + is searched for in the code path.</p> + + <p>The function returns <c>true</c> if all of the following + apply:</p> + <list type="bulleted"> + <item>Both source code and object code for the module is + found.</item> + <item>The module has been compiled with option <c>debug_info</c> + set.</item> + <item>The module does not belong to any of the applications + Kernel, STDLIB, GS, or Debugger.</item> + </list> + + <p>The function returns <c>{error,Reason}</c> if the module cannot + be interpreted. <c>Reason</c> can have the following values:</p> + <taglist> + <tag><c>no_src</c></tag> + <item><p>No source code is found. + It is assumed that the source code and object code are located + either in the same directory, or in <c>src</c> and <c>ebin</c> + directories next to each other.</p></item> + + <tag><c>no_beam</c></tag> + <item><p>No object code is found. + It is assumed that the source code and object code are located + either in the same directory, or in <c>src</c> and <c>ebin</c> + directories next to each other.</p></item> + + <tag><c>no_debug_info</c></tag> + <item><p>The module has not been compiled with option + <c>debug_info</c> set.</p></item> + + <tag><c>badarg</c></tag> + <item><p><c>AbsModule</c> is not found. This could be because + the specified file does not exist, or because + <c>code:which/1</c> does not return a BEAM filename, + which is the case not only for non-existing modules but also + for modules that are preloaded or cover-compiled.</p></item> + + <tag><c>{app,App}</c></tag> + <item><p><c>App</c> is <c>kernel</c>, <c>stdlib</c>, <c>gs</c>, + or <c>debugger</c> if <c>AbsModule</c> belongs to one of these + applications.</p></item> + </taglist> + + <p>Notice that the function can return <c>true</c> for a module + that in fact is not interpretable in the case where the module is marked as sticky or resides in a directory - marked as sticky, as this is not discovered until - the interpreter actually tries to load the module.</p> + marked as sticky. The reason is that this is not discovered + until the interpreter tries to load the module.</p> </desc> </func> @@ -239,7 +258,7 @@ <name>auto_attach() -> false | {Flags,Function}</name> <name>auto_attach(false)</name> <name>auto_attach(Flags, Function)</name> - <fsummary>Get/set when and how to attach to a process</fsummary> + <fsummary>Get and set when and how to attach to a process.</fsummary> <type> <v>Flags = [init | break | exit]</v> <v>Function = {Module,Name,Args}</v> @@ -247,24 +266,24 @@ <v> Args = [term()]</v> </type> <desc> - <p>Gets and sets when and how to automatically attach to a + <p>Gets and sets when and how to attach automatically to a process executing code in interpreted modules. <c>false</c> - means never automatically attach, this is the default. + means never attach automatically, this is the default. Otherwise automatic attach is defined by a list of flags and - a function. The following flags may be specified:</p> - <list> - <item><c>init</c> - attach when a process for the very first + a function. The following flags can be specified:</p> + <list type="bulleted"> + <item><c>init</c> - Attach when a process for the first time calls an interpreted function.</item> - <item><c>break</c> - attach whenever a process reaches a + <item><c>break</c> - Attach whenever a process reaches a breakpoint.</item> - <item><c>exit</c> - attach when a process terminates.</item> + <item><c>exit</c> - Attach when a process terminates.</item> </list> <p>When the specified event occurs, the function <c>Function</c> - will be called as:</p> + is called as:</p> <pre> -spawn(Module, Name, [Pid | Args]) - </pre> +spawn(Module, Name, [Pid | Args])</pre> + <p><c>Pid</c> is the pid of the process executing interpreted code.</p> </desc> @@ -273,7 +292,7 @@ spawn(Module, Name, [Pid | Args]) <func> <name>stack_trace() -> Flag</name> <name>stack_trace(Flag)</name> - <fsummary>Get/set if and how to save call frames</fsummary> + <fsummary>Get and set if and how to save call frames.</fsummary> <type> <v>Flag = all | no_tail | false</v> </type> @@ -281,25 +300,30 @@ spawn(Module, Name, [Pid | Args]) <p>Gets and sets how to save call frames in the stack. Saving call frames makes it possible to inspect the call chain of a process, and is also used to emulate the stack trace if an - error (an exception of class error) occurs.</p> - <list> - <item><c>all</c> - save information about all current calls, - that is, function calls that have not yet returned a value. - </item> - <item><c>no_tail</c> - save information about current calls, + error (an exception of class error) occurs. The following + flags can be specified:</p> + <taglist> + <tag><c>all</c></tag> + <item><p>Save information about all current calls, + that is, function calls that have not yet returned a value.</p> + </item> + + <tag><c>no_tail</c></tag> + <item><p>Save information about current calls, but discard previous information when a tail recursive call - is made. This option consumes less memory and may be + is made. This option consumes less memory and can be necessary to use for processes with long lifetimes and many - tail recursive calls. This is the default.</item> - <item><c>false</c> - do not save any information about current - calls.</item> - </list> + tail recursive calls. This is the default.</p></item> + + <tag><c>false</c></tag> + <item><p>Save no information about currentcalls.</p></item> + </taglist> </desc> </func> <func> <name>break(Module, Line) -> ok | {error,break_exists}</name> - <fsummary>Create a breakpoint</fsummary> + <fsummary>Create a breakpoint.</fsummary> <type> <v>Module = atom()</v> <v>Line = int()</v> @@ -311,86 +335,80 @@ spawn(Module, Name, [Pid | Args]) <func> <name>delete_break(Module, Line) -> ok</name> - <fsummary>Delete a breakpoint</fsummary> + <fsummary>Delete a breakpoint.</fsummary> <type> <v>Module = atom()</v> <v>Line = int()</v> </type> <desc> - <p>Deletes the breakpoint located at <c>Line</c> in - <c>Module</c>.</p> + <p>Deletes the breakpoint at <c>Line</c> in <c>Module</c>.</p> </desc> </func> <func> <name>break_in(Module, Name, Arity) -> ok | {error,function_not_found}</name> - <fsummary>Create breakpoints in the specified function</fsummary> + <fsummary>Create breakpoints in the specified function.</fsummary> <type> <v>Module = Name = atom()</v> <v>Arity = int()</v> </type> <desc> <p>Creates a breakpoint at the first line of every clause of - the <c>Module:Name/Arity</c> function.</p> + function <c>Module:Name/Arity</c>.</p> </desc> </func> <func> <name>del_break_in(Module, Name, Arity) -> ok | {error,function_not_found}</name> - <fsummary>Delete breakpoints from the specified function - </fsummary> + <fsummary>Delete breakpoints from the specified function.</fsummary> <type> <v>Module = Name = atom()</v> <v>Arity = int()</v> </type> <desc> <p>Deletes the breakpoints at the first line of every clause of - the <c>Module:Name/Arity</c> function. - </p> + function <c>Module:Name/Arity</c>.</p> </desc> </func> <func> <name>no_break() -> ok</name> <name>no_break(Module) -> ok</name> - <fsummary>Delete all breakpoints</fsummary> + <fsummary>Delete all breakpoints.</fsummary> <desc> - <p>Deletes all breakpoints, or all breakpoints in <c>Module</c>. - </p> + <p>Deletes all breakpoints, or all breakpoints in <c>Module</c>.</p> </desc> </func> <func> <name>disable_break(Module, Line) -> ok</name> - <fsummary>Make a breakpoint inactive</fsummary> + <fsummary>Make a breakpoint inactive.</fsummary> <type> <v>Module = atom()</v> <v>Line = int()</v> </type> <desc> - <p>Makes the breakpoint at <c>Line</c> in <c>Module</c> - inactive.</p> + <p>Makes the breakpoint at <c>Line</c> in <c>Module</c> inactive.</p> </desc> </func> <func> <name>enable_break(Module, Line) -> ok</name> - <fsummary>Make a breakpoint active</fsummary> + <fsummary>Make a breakpoint active.</fsummary> <type> <v>Module = atom()</v> <v>Line = int()</v> </type> <desc> - <p>Makes the breakpoint at <c>Line</c> in <c>Module</c> active. - </p> + <p>Makes the breakpoint at <c>Line</c> in <c>Module</c> active.</p> </desc> </func> <func> <name>action_at_break(Module, Line, Action) -> ok</name> - <fsummary>Set the trigger action of a breakpoint</fsummary> + <fsummary>Set the trigger action of a breakpoint.</fsummary> <type> <v>Module = atom()</v> <v>Line = int()</v> @@ -404,7 +422,7 @@ spawn(Module, Name, [Pid | Args]) <func> <name>test_at_break(Module, Line, Function) -> ok</name> - <fsummary>Set the conditional test of a breakpoint</fsummary> + <fsummary>Set the conditional test of a breakpoint.</fsummary> <type> <v>Module = atom()</v> <v>Line = int()</v> @@ -414,14 +432,14 @@ spawn(Module, Name, [Pid | Args]) <desc> <p>Sets the conditional test of the breakpoint at <c>Line</c> in <c>Module</c> to <c>Function</c>. The function must - fulfill the requirements specified in the section - <em>Breakpoints</em> above.</p> + fulfill the requirements specified in section + <seealso marker="#int_breakpoints">Breakpoints</seealso>.</p> </desc> </func> <func> <name>get_binding(Var, Bindings) -> {value,Value} | unbound</name> - <fsummary>Retrieve a variable binding</fsummary> + <fsummary>Retrieve a variable binding.</fsummary> <type> <v>Var = atom()</v> <v>Bindings = term()</v> @@ -437,7 +455,7 @@ spawn(Module, Name, [Pid | Args]) <func> <name>all_breaks() -> [Break]</name> <name>all_breaks(Module) -> [Break]</name> - <fsummary>Get all breakpoints</fsummary> + <fsummary>Get all breakpoints.</fsummary> <type> <v>Break = {Point,Options}</v> <v> Point = {Module,Line}</v> @@ -451,15 +469,14 @@ spawn(Module, Name, [Pid | Args]) <v> Name = atom()</v> </type> <desc> - <p>Gets all breakpoints, or all breakpoints in <c>Module</c>. - </p> + <p>Gets all breakpoints, or all breakpoints in <c>Module</c>.</p> </desc> </func> <func> <name>snapshot() -> [Snapshot]</name> <fsummary>Get information about all processes executing interpreted - code</fsummary> + code.</fsummary> <type> <v>Snapshot = {Pid, Function, Status, Info}</v> <v> Pid = pid()</v> @@ -475,26 +492,27 @@ spawn(Module, Name, [Pid | Args]) <desc> <p>Gets information about all processes executing interpreted code. </p> - <list> - <item><c>Pid</c> - process identifier.</item> - <item><c>Function</c> - first interpreted function called by + <list type="bulleted"> + <item><c>Pid</c> - Process identifier.</item> + <item><c>Function</c> - First interpreted function called by the process.</item> - <item><c>Status</c> - current status of the process.</item> - <item><c>Info</c> - additional information.</item> + <item><c>Status</c> - Current status of the process.</item> + <item><c>Info</c> - More information.</item> </list> - <p><c>Status</c> is one of:</p> - <list> - <item><c>idle</c> - the process is no longer executing + + <p><c>Status</c> is one of the following:</p> + <list type="bulleted"> + <item><c>idle</c> - The process is no longer executing interpreted code. <c>Info={}</c>.</item> - <item><c>running</c> - the process is running. <c>Info={}</c>. + <item><c>running</c> - The process is running. <c>Info={}</c>. </item> - <item><c>waiting</c> - the process is waiting at a + <item><c>waiting</c> - The process is waiting at a <c>receive</c>. <c>Info={}</c>.</item> - <item><c>break</c> - process execution has been stopped, + <item><c>break</c> - Process execution is stopped, normally at a breakpoint. <c>Info={Module,Line}</c>.</item> - <item><c>exit</c> - the process has terminated. + <item><c>exit</c> - The process is terminated. <c>Info=ExitReason</c>.</item> - <item><c>no_conn</c> - the connection is down to the node + <item><c>no_conn</c> - The connection is down to the node where the process is running. <c>Info={}</c>.</item> </list> </desc> @@ -503,7 +521,7 @@ spawn(Module, Name, [Pid | Args]) <func> <name>clear() -> ok</name> <fsummary>Clear information about processes executing interpreted - code</fsummary> + code.</fsummary> <desc> <p>Clears information about processes executing interpreted code by removing all information about terminated processes.</p> @@ -513,13 +531,13 @@ spawn(Module, Name, [Pid | Args]) <func> <name>continue(Pid) -> ok | {error,not_interpreted}</name> <name>continue(X,Y,Z) -> ok | {error,not_interpreted}</name> - <fsummary>Resume process execution</fsummary> + <fsummary>Resume process execution.</fsummary> <type> <v>Pid = pid()</v> <v>X = Y = Z = int()</v> </type> <desc> - <p>Resume process execution for <c>Pid</c>, or for + <p>Resumes process execution for <c>Pid</c> or <c>c:pid(X,Y,Z)</c>.</p> </desc> </func> diff --git a/lib/debugger/doc/src/introduction.xml b/lib/debugger/doc/src/introduction.xml new file mode 100644 index 0000000000..9f5f279bb0 --- /dev/null +++ b/lib/debugger/doc/src/introduction.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE chapter SYSTEM "chapter.dtd"> + +<chapter> +<header> + <copyright> + <year>1997</year><year>2013</year> + <holder>Ericsson AB. All Rights Reserved.</holder> + </copyright> + <legalnotice> + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + </legalnotice> + + <title>Introduction</title> + <prepared></prepared> + <docno></docno> + <date></date> + <rev></rev> + <file>introduction.xml</file> + </header> + + <section> + <title>Scope</title> + <p>Debugger is a graphical user interface for the Erlang + interpreter, which can be used for debugging and testing of + Erlang programs. For example, breakpoints can be set, code can be + single-stepped and variable values can be displayed and changed. + </p> + + <p>The Erlang interpreter can also be accessed through the interface + module <seealso marker="int"><c>int(3)</c></seealso>. + </p> + + <warning> + <p>Debugger might at some point + start tracing on the processes that execute the interpreted + code. This means that a conflict occurs if tracing by other + means is started on any of these processes.</p> + </warning> + </section> + + <section> + <title>Prerequisites</title> + <p>It is assumed that the reader is familiar with the Erlang + programming language.</p> + <p>Modules to be debugged must include debug information, + for example, <c>erlc +debug_info MODULE.erl</c>.</p> + </section> + +</chapter> + + diff --git a/lib/debugger/doc/src/part.xml b/lib/debugger/doc/src/part.xml index 7515c0ad5b..ce1edbd978 100644 --- a/lib/debugger/doc/src/part.xml +++ b/lib/debugger/doc/src/part.xml @@ -4,7 +4,7 @@ <part xmlns:xi="http://www.w3.org/2001/XInclude"> <header> <copyright> - <year>1997</year><year>2013</year> + <year>1997</year><year>2016</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -27,14 +27,10 @@ <docno></docno> <date>1998-05-12</date> <rev>B</rev> - <file>part.sgml</file> + <file>part.xml</file> </header> - <description> - <p><em>Debugger</em> is a graphical tool which can be used for - debugging and testing of Erlang programs. For example, breakpoints - can be set, code can be single stepped and variable values can be - displayed and changed.</p> - </description> + <description></description> + <xi:include href="introduction.xml"/> <xi:include href="debugger_chapter.xml"/> </part> diff --git a/lib/debugger/doc/src/ref_man.xml b/lib/debugger/doc/src/ref_man.xml index 6df9e90c2c..c44f07f912 100644 --- a/lib/debugger/doc/src/ref_man.xml +++ b/lib/debugger/doc/src/ref_man.xml @@ -28,12 +28,7 @@ <date></date> <rev></rev> </header> - <description> - <p><em>Debugger</em> is a graphical tool which can be used for - debugging and testing of Erlang programs. For example, breakpoints - can be set, code can be single stepped and variable values can be - displayed and changed.</p> - </description> + <description></description> <xi:include href="debugger.xml"/> <xi:include href="i.xml"/> <xi:include href="int.xml"/> diff --git a/lib/debugger/src/dbg_icmd.erl b/lib/debugger/src/dbg_icmd.erl index 4c34f253c6..1b274e20ae 100644 --- a/lib/debugger/src/dbg_icmd.erl +++ b/lib/debugger/src/dbg_icmd.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1998-2015. All Rights Reserved. +%% Copyright Ericsson AB 1998-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -267,7 +267,7 @@ handle_int_msg({old_code,Mod}, Status, Bs, #ieval{level=Le,module=M}=Ieval) -> if Status =:= idle, Le =:= 1 -> - erase([Mod|db]), + erase(?DB_REF_KEY(Mod)), put(cache, []); true -> case dbg_istk:in_use_p(Mod, M) of @@ -277,7 +277,7 @@ handle_int_msg({old_code,Mod}, Status, Bs, exit(get(self), kill), dbg_ieval:exception(exit, old_code, Bs, Ieval); false -> - erase([Mod|db]), + erase(?DB_REF_KEY(Mod)), put(cache, []) end end; diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl index 7ed371a653..f5e079ef7e 100644 --- a/lib/debugger/src/dbg_ieval.erl +++ b/lib/debugger/src/dbg_ieval.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1998-2015. All Rights Reserved. +%% Copyright Ericsson AB 1998-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -560,7 +560,7 @@ get_function(Mod, Name, Args, extern) -> end. db_ref(Mod) -> - case get([Mod|db]) of + case get(?DB_REF_KEY(Mod)) of undefined -> case dbg_iserver:call(get(int), {get_module_db, Mod, get(self)}) of @@ -572,7 +572,7 @@ db_ref(Mod) -> Node =/= node() -> {Node,ModDb}; true -> ModDb end, - put([Mod|db], DbRef), + put(?DB_REF_KEY(Mod), DbRef), DbRef end; DbRef -> diff --git a/lib/debugger/src/dbg_ieval.hrl b/lib/debugger/src/dbg_ieval.hrl index 95d0842b19..ad422a9e4a 100644 --- a/lib/debugger/src/dbg_ieval.hrl +++ b/lib/debugger/src/dbg_ieval.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2011. All Rights Reserved. +%% Copyright Ericsson AB 2005-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -27,3 +27,5 @@ %% (i.e. the next call will leave interpreted code). top = false }). + +-define(DB_REF_KEY(Mod), {Mod,db}). diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl index 5fd1519ba0..f9c60f9b72 100644 --- a/lib/debugger/src/dbg_wx_trace.erl +++ b/lib/debugger/src/dbg_wx_trace.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2014. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -811,7 +811,7 @@ gui_show_module(Win, Mod, Line, Mod, _Pid, How) -> dbg_wx_trace_win:mark_line(Win, Line, How); gui_show_module(Win, Mod, Line, _Cm, Pid, How) -> Win2 = case dbg_wx_trace_win:is_shown(Win, Mod) of - {true, Win3} -> Win3; + %% {true, Win3} -> Win3; false -> gui_load_module(Win, Mod, Pid) end, dbg_wx_trace_win:mark_line(Win2, Line, How). diff --git a/lib/dialyzer/test/small_SUITE_data/results/comparisons b/lib/dialyzer/test/small_SUITE_data/results/comparisons index 642585d25e..5083d2695a 100644 --- a/lib/dialyzer/test/small_SUITE_data/results/comparisons +++ b/lib/dialyzer/test/small_SUITE_data/results/comparisons @@ -1,50 +1,43 @@ 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:101: The pattern 'false' can never match the type 'true' 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:103: The pattern 'true' can never match the type 'false' 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:119: The pattern 'false' can never match the type 'true' +comparisons.erl:120: The pattern 'true' can never match the type 'false' +comparisons.erl:121: The pattern 'true' can never match the type 'false' +comparisons.erl:122: 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:124: The pattern 'true' can never match the type 'false' 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:126: The pattern 'false' can never match the type 'true' 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:128: The pattern 'true' can never match the type 'false' 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:130: The pattern 'false' can never match the type 'true' +comparisons.erl:131: The pattern 'false' can never match the type 'true' 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:139: The pattern 'true' can never match the type 'false' 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:141: The pattern 'false' can never match the type 'true' 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:143: The pattern 'true' can never match the type 'false' 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:145: The pattern 'false' can never match the type 'true' 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:147: The pattern 'true' can never match the type 'false' +comparisons.erl:148: The pattern 'true' can never match the type 'false' +comparisons.erl:149: The pattern 'false' can never match the type 'true' +comparisons.erl:150: The pattern 'false' can never match the type 'true' +comparisons.erl:155: The pattern 'false' can never match the type 'true' +comparisons.erl:156: The pattern 'false' can never match the type 'true' 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' @@ -59,36 +52,62 @@ 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:172: The pattern 'true' can never match the type 'false' 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:174: The pattern 'false' can never match the type 'true' 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:176: The pattern 'true' can never match the type 'false' +comparisons.erl:177: The pattern 'true' can never match the type 'false' +comparisons.erl:178: The pattern 'false' can never match the type 'true' +comparisons.erl:179: The pattern 'false' can never match the type 'true' +comparisons.erl:180: The pattern 'true' can never match the type 'false' +comparisons.erl:181: The pattern 'true' can never match the type 'false' +comparisons.erl:182: The pattern 'false' can never match the type 'true' +comparisons.erl:183: The pattern 'false' can never match the type 'true' +comparisons.erl:184: The pattern 'true' can never match the type 'false' +comparisons.erl:185: The pattern 'true' can never match the type 'false' 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:192: The pattern 'false' can never match the type 'true' +comparisons.erl:193: The pattern 'false' can never match the type 'true' +comparisons.erl:194: The pattern 'true' can never match the type 'false' +comparisons.erl:195: The pattern 'true' can never match the type 'false' +comparisons.erl:196: The pattern 'false' can never match the type 'true' +comparisons.erl:197: The pattern 'false' can never match the type 'true' +comparisons.erl:198: The pattern 'true' can never match the type 'false' +comparisons.erl:199: The pattern 'true' can never match the type 'false' +comparisons.erl:200: The pattern 'false' can never match the type 'true' +comparisons.erl:201: The pattern 'false' can never match the type 'true' +comparisons.erl:202: The pattern 'true' can never match the type 'false' +comparisons.erl:203: The pattern 'true' can never match the type 'false' 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:207: The pattern 'false' can never match the type 'true' +comparisons.erl:208: The pattern 'false' can never match the type 'true' 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:210: The pattern 'true' can never match the type 'false' comparisons.erl:211: The pattern 'false' can never match the type 'true' +comparisons.erl:212: The pattern 'false' can never match the type 'true' +comparisons.erl:213: The pattern 'true' can never match the type 'false' +comparisons.erl:214: The pattern 'true' can never match the type 'false' +comparisons.erl:215: The pattern 'false' can never match the type 'true' +comparisons.erl:216: The pattern 'false' can never match the type 'true' +comparisons.erl:217: The pattern 'true' can never match the type 'false' +comparisons.erl:218: The pattern 'true' can never match the type 'false' +comparisons.erl:219: The pattern 'false' can never match the type 'true' +comparisons.erl:220: 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:229: The pattern 'true' can never match the type 'false' +comparisons.erl:230: The pattern 'true' can never match the type 'false' +comparisons.erl:231: The pattern 'false' can never match the type 'true' +comparisons.erl:232: The pattern 'false' can never match the type 'true' +comparisons.erl:233: The pattern 'false' can never match the type 'true' +comparisons.erl:234: The pattern 'false' can never match the type 'true' +comparisons.erl:235: The pattern 'true' can never match the type 'false' +comparisons.erl:236: The pattern 'true' can never match the type 'false' 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' @@ -97,57 +116,86 @@ 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:259: The pattern 'false' can never match the type 'true' +comparisons.erl:260: The pattern 'false' can never match the type 'true' +comparisons.erl:261: The pattern 'true' can never match the type 'false' +comparisons.erl:262: The pattern 'true' can never match the type 'false' +comparisons.erl:264: The pattern 'true' can never match the type 'false' 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:266: The pattern 'false' can never match the type 'true' +comparisons.erl:267: The pattern 'false' can never match the type 'true' +comparisons.erl:277: The pattern 'true' can never match the type 'false' +comparisons.erl:278: The pattern 'true' can never match the type 'false' +comparisons.erl:279: The pattern 'false' can never match the type 'true' +comparisons.erl:280: The pattern 'false' can never match the type 'true' +comparisons.erl:281: The pattern 'true' can never match the type 'false' +comparisons.erl:282: The pattern 'true' can never match the type 'false' +comparisons.erl:283: The pattern 'false' can never match the type 'true' +comparisons.erl:284: The pattern 'false' can never match the type 'true' +comparisons.erl:298: The pattern 'false' can never match the type 'true' +comparisons.erl:299: The pattern 'false' can never match the type 'true' +comparisons.erl:300: The pattern 'true' can never match the type 'false' +comparisons.erl:301: The pattern 'true' can never match the type 'false' +comparisons.erl:302: The pattern 'false' can never match the type 'true' +comparisons.erl:303: The pattern 'false' can never match the type 'true' +comparisons.erl:304: The pattern 'true' can never match the type 'false' +comparisons.erl:305: The pattern 'true' can never match the type 'false' +comparisons.erl:307: The pattern 'true' can never match the type 'false' +comparisons.erl:308: The pattern 'true' can never match the type 'false' +comparisons.erl:309: The pattern 'false' can never match the type 'true' +comparisons.erl:310: The pattern 'false' can never match the type 'true' +comparisons.erl:319: The pattern 'false' can never match the type 'true' +comparisons.erl:320: The pattern 'false' can never match the type 'true' +comparisons.erl:321: The pattern 'true' can never match the type 'false' +comparisons.erl:322: The pattern 'true' can never match the type 'false' +comparisons.erl:324: The pattern 'true' can never match the type 'false' +comparisons.erl:325: The pattern 'true' can never match the type 'false' +comparisons.erl:326: The pattern 'false' can never match the type 'true' +comparisons.erl:327: The pattern 'false' can never match the type 'true' +comparisons.erl:328: The pattern 'true' can never match the type 'false' +comparisons.erl:329: The pattern 'true' can never match the type 'false' +comparisons.erl:330: The pattern 'false' can never match the type 'true' +comparisons.erl:331: The pattern 'false' can never match the type 'true' +comparisons.erl:349: The pattern 'false' can never match the type 'true' +comparisons.erl:350: The pattern 'false' can never match the type 'true' +comparisons.erl:351: The pattern 'true' can never match the type 'false' +comparisons.erl:352: The pattern 'true' can never match the type 'false' +comparisons.erl:367: The pattern 'true' can never match the type 'false' +comparisons.erl:368: The pattern 'true' can never match the type 'false' +comparisons.erl:369: The pattern 'false' can never match the type 'true' +comparisons.erl:370: The pattern 'false' can never match the type 'true' 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:56: The pattern 'false' can never match the type 'true' +comparisons.erl:57: The pattern 'false' can never match the type 'true' +comparisons.erl:58: The pattern 'true' can never match the type 'false' +comparisons.erl:59: The pattern 'true' can never match the type 'false' +comparisons.erl:60: The pattern 'false' can never match the type 'true' +comparisons.erl:61: The pattern 'false' can never match the type 'true' +comparisons.erl:62: The pattern 'true' can never match the type 'false' +comparisons.erl:63: The pattern 'true' can never match the type 'false' +comparisons.erl:64: The pattern 'false' can never match the type 'true' +comparisons.erl:65: The pattern 'false' can never match the type 'true' +comparisons.erl:66: The pattern 'true' can never match the type 'false' +comparisons.erl:67: The pattern 'true' can never match the type 'false' +comparisons.erl:68: The pattern 'false' can never match the type 'true' 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:70: The pattern 'true' can never match the type 'false' 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:85: The pattern 'false' can never match the type 'true' +comparisons.erl:86: The pattern 'false' can never match the type 'true' +comparisons.erl:87: The pattern 'true' can never match the type 'false' +comparisons.erl:88: The pattern 'true' can never match the type 'false' +comparisons.erl:89: The pattern 'false' can never match the type 'true' +comparisons.erl:90: The pattern 'false' can never match the type 'true' +comparisons.erl:91: The pattern 'true' can never match the type 'false' +comparisons.erl:92: The pattern 'true' can never match the type 'false' +comparisons.erl:93: The pattern 'false' can never match the type 'true' 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:95: The pattern 'true' can never match the type 'false' 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:97: The pattern 'false' can never match the type 'true' comparisons.erl:98: The pattern 'false' can never match the type 'true' -comparisons.erl:99: The pattern 'false' can never match the type 'true' +comparisons.erl:99: The pattern 'true' can never match the type 'false' diff --git a/lib/dialyzer/test/small_SUITE_data/src/comparisons.erl b/lib/dialyzer/test/small_SUITE_data/src/comparisons.erl index 70e3cb6af4..64927c6c91 100644 --- a/lib/dialyzer/test/small_SUITE_data/src/comparisons.erl +++ b/lib/dialyzer/test/small_SUITE_data/src/comparisons.erl @@ -19,12 +19,20 @@ tuple(X) when is_tuple(X) -> X. list() -> list(?r). list(X) when is_list(X) -> X. +map() -> map(?r). +map(X) when is_map(X) -> #{}. + +bitstring() -> bitstring(?r). +bitstring(X) when is_bitstring(X) -> <<0:63>>. + i() -> integer(). f() -> mfloat(). n() -> case ?r of 1 -> i(); 2 -> f() end. a() -> atom(). t() -> tuple(). l() -> list(). +m() -> map(). +b() -> bitstring(). 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. @@ -53,6 +61,14 @@ 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_i_ll_m() -> case i() < m() of true -> always; false -> never end. +test_i_le_m() -> case i() =< m() of true -> always; false -> never end. +test_i_gg_m() -> case i() > m() of true -> never; false -> always end. +test_i_ge_m() -> case i() >= m() of true -> never; false -> always end. +test_i_ll_b() -> case i() < b() of true -> always; false -> never end. +test_i_le_b() -> case i() =< b() of true -> always; false -> never end. +test_i_gg_b() -> case i() > b() of true -> never; false -> always end. +test_i_ge_b() -> case i() >= b() 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. @@ -78,6 +94,14 @@ 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_f_ll_m() -> case f() < m() of true -> always; false -> never end. +test_f_le_m() -> case f() =< m() of true -> always; false -> never end. +test_f_gg_m() -> case f() > m() of true -> never; false -> always end. +test_f_ge_m() -> case f() >= m() of true -> never; false -> always end. +test_f_ll_b() -> case f() < b() of true -> always; false -> never end. +test_f_le_b() -> case f() =< b() of true -> always; false -> never end. +test_f_gg_b() -> case f() > b() of true -> never; false -> always end. +test_f_ge_b() -> case f() >= b() 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. @@ -103,6 +127,14 @@ 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_n_ll_m() -> case n() < m() of true -> always; false -> never end. +test_n_le_m() -> case n() =< m() of true -> always; false -> never end. +test_n_gg_m() -> case n() > m() of true -> never; false -> always end. +test_n_ge_m() -> case n() >= m() of true -> never; false -> always end. +test_n_ll_b() -> case n() < b() of true -> always; false -> never end. +test_n_le_b() -> case n() =< b() of true -> always; false -> never end. +test_n_gg_b() -> case n() > b() of true -> never; false -> always end. +test_n_ge_b() -> case n() >= b() 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. @@ -128,6 +160,14 @@ 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_a_ll_m() -> case a() < m() of true -> always; false -> never end. +test_a_le_m() -> case a() =< m() of true -> always; false -> never end. +test_a_gg_m() -> case a() > m() of true -> never; false -> always end. +test_a_ge_m() -> case a() >= m() of true -> never; false -> always end. +test_a_ll_b() -> case a() < b() of true -> always; false -> never end. +test_a_le_b() -> case a() =< b() of true -> always; false -> never end. +test_a_gg_b() -> case a() > b() of true -> never; false -> always end. +test_a_ge_b() -> case a() >= b() 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. @@ -153,6 +193,14 @@ 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_t_ll_m() -> case t() < m() of true -> always; false -> never end. +test_t_le_m() -> case t() =< m() of true -> always; false -> never end. +test_t_gg_m() -> case t() > m() of true -> never; false -> always end. +test_t_ge_m() -> case t() >= m() of true -> never; false -> always end. +test_t_ll_b() -> case t() < b() of true -> always; false -> never end. +test_t_le_b() -> case t() =< b() of true -> always; false -> never end. +test_t_gg_b() -> case t() > b() of true -> never; false -> always end. +test_t_ge_b() -> case t() >= b() 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. @@ -178,6 +226,14 @@ 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_l_ll_m() -> case l() < m() of true -> never; false -> always end. +test_l_le_m() -> case l() =< m() of true -> never; false -> always end. +test_l_gg_m() -> case l() > m() of true -> always; false -> never end. +test_l_ge_m() -> case l() >= m() of true -> always; false -> never end. +test_l_ll_b() -> case l() < b() of true -> always; false -> never end. +test_l_le_b() -> case l() =< b() of true -> always; false -> never end. +test_l_gg_b() -> case l() > b() of true -> never; false -> always end. +test_l_ge_b() -> case l() >= b() of true -> never; false -> always 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. diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl index d49176ec3e..66c4a7582f 100644 --- a/lib/diameter/src/base/diameter_service.erl +++ b/lib/diameter/src/base/diameter_service.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2015. All Rights Reserved. +%% Copyright Ericsson AB 2010-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -83,16 +83,8 @@ -define(DEFAULT_TC, 30000). %% RFC 3588 ch 2.1 -define(RESTART_TC, 1000). %% if restart was this recent -%% Used to be able to swap this with anything else dict-like but now -%% rely on the fact that a service's #state{} record does not change -%% in storing in it ?STATE table and not always going through the -%% service process. In particular, rely on the fact that operations on -%% a ?Dict don't change the handle to it. --define(Dict, diameter_dict). - -%% Maintains state in a table. In contrast to previously, a service's -%% stat is not constant and is accessed outside of the service -%% process. +%% Maintain state in a table since a service's state is accessed +%% outside of the service process. -define(STATE_TABLE, ?MODULE). %% The default sequence mask. @@ -117,12 +109,11 @@ service :: #diameter_service{}, watchdogT = ets_new(watchdogs) %% #watchdog{} at start :: ets:tid(), - peerT = ets_new(peers) %% #peer{pid = TPid} at okay/reopen - :: ets:tid(), - shared_peers = ?Dict:new() %% Alias -> [{TPid, Caps}, ...] - :: ets:tid(), - local_peers = ?Dict:new() %% Alias -> [{TPid, Caps}, ...] - :: ets:tid(), + peerT, %% undefined in new code, but remain for upgrade + shared_peers, %% reasons. Replaced by local/remote. + local_peers, %% + local :: {ets:tid(), ets:tid(), ets:tid()}, + remote :: {ets:tid(), ets:tid(), ets:tid()}, monitor = false :: false | pid(), %% process to die with options :: [{sequence, diameter:sequence()} %% sequence mask @@ -150,10 +141,12 @@ %% diameter_peer_fsm. -record(peer, {pid :: pid(), - apps :: [{0..16#FFFFFFFF, diameter:app_alias()}], %% {Id, Alias} + apps :: [{0..16#FFFFFFFF, diameter:app_alias()}] %% {Id, Alias} + | [diameter:app_alias()], %% remote caps :: #diameter_caps{}, - started = diameter_lib:now(), %% at process start - watchdog :: pid()}). %% key into watchdogT + started = diameter_lib:now(), %% at process start or sharing + watchdog :: pid() %% key into watchdogT + | undefined}). %% undefined if remote %% --------------------------------------------------------------------------- %% # start/1 @@ -181,7 +174,7 @@ stop(SvcName) -> end. stop(ok, Pid) -> - MRef = erlang:monitor(process, Pid), + MRef = monitor(process, Pid), receive {'DOWN', MRef, process, _, _} -> ok end; stop(No, _) -> No. @@ -495,6 +488,9 @@ transition({service, Pid}, S) -> transition({peer, TPid, Aliases, Caps}, S) -> remote_peer_up(TPid, Aliases, Caps, S), ok; +transition({peer, TPid}, S) -> + remote_peer_down(TPid, S), + ok; %% Remote peer process has died. transition({'DOWN', _, process, TPid, _}, S) -> @@ -514,7 +510,7 @@ transition(Req, S) -> %% # terminate/2 %% --------------------------------------------------------------------------- -terminate(Reason, #state{service_name = Name, peerT = PeerT} = S) -> +terminate(Reason, #state{service_name = Name, local = {PeerT, _, _}} = S) -> send_event(Name, stop), ets:delete(?STATE_TABLE, Name), @@ -536,23 +532,81 @@ terminate(Reason, #state{service_name = Name, peerT = PeerT} = S) -> %% # code_change/3 %% --------------------------------------------------------------------------- -code_change(FromVsn, - #state{service_name = SvcName, - service = #diameter_service{applications = Apps}} - = S, - Extra) -> - lists:foreach(fun(A) -> - code_change(FromVsn, SvcName, Extra, A) - end, - Apps), +code_change(_FromVsn, #state{} = S, _Extra) -> + {ok, S}; + +%% Don't support downgrade since we won't in appup. +code_change({down = T, _}, _, _Extra) -> + {error, T}; + +%% Upgrade local/shared peers dicts populated in old code. Don't +code_change(_FromVsn, S0, _Extra) -> + {state, Id, SvcName, Svc, WT, PeerT, SDict, LDict, Monitor, Opts} + = S0, + + init_peers(LT = setelement(1, {PT, _, _} = init_peers(), PeerT), + fun({_,A}) -> A end), + init_peers(init_peers(RT = init_peers(), SDict), + fun(A) -> A end), + + S = #state{id = Id, + service_name = SvcName, + service = Svc, + watchdogT = WT, + peerT = PT, %% empty + shared_peers = SDict, + local_peers = LDict, + local = LT, + remote = RT, + monitor = Monitor, + options = Opts}, + + %% Replacing the table entry and deleting the old shared tables + %% can make outgoing requests return {error, no_connection} until + %% everyone is running new code. Don't delete the tables to avoid + %% crashing request processes. + ets:delete_all_objects(SDict), + ets:delete_all_objects(LDict), + ets:insert(?STATE_TABLE, S), {ok, S}. -code_change(FromVsn, SvcName, Extra, #diameter_app{alias = Alias} = A) -> - {ok, S} = cb(A, code_change, [FromVsn, - mod_state(Alias), - Extra, - SvcName]), - mod_state(Alias, S). +%% init_peers/2 + +%% Populate app and identity bags from a new-style #peer{} sets. +init_peers({PeerT, _, _} = T, F) + when is_function(F) -> + ets:foldl(fun(#peer{pid = P, apps = As, caps = C}, N) -> + insert_peer(P, lists:map(F, As), C, T), + N+1 + end, + 0, + PeerT); + +%% Populate #peer{} table given a shared peers dict. +init_peers({PeerT, _, _}, SDict) + when is_integer(SDict) -> + dict:fold(fun(P, As, N) -> + ets:update_element(PeerT, P, {#peer.apps, As}), + N+1 + end, + 0, + diameter_dict:fold(fun(A, Ps, D) -> + init_peers(A, Ps, PeerT, D) + end, + dict:new(), + SDict)). + +%% init_peers/4 + +init_peers(App, TCs, PeerT, Dict) -> + lists:foldl(fun({P,C}, D) -> + ets:insert(PeerT, #peer{pid = P, + apps = [], + caps = C}), + dict:append(P, App, D) + end, + Dict, + TCs). %% =========================================================================== %% =========================================================================== @@ -560,9 +614,6 @@ code_change(FromVsn, SvcName, Extra, #diameter_app{alias = Alias} = A) -> unexpected(F, A, #state{service_name = Name}) -> ?UNEXPECTED(F, A ++ [Name]). -cb(#diameter_app{module = [_|_] = M}, F, A) -> - eval(M, F, A). - eval([M|X], F, A) -> apply(M, F, A ++ X). @@ -582,10 +633,6 @@ choose(false, _, X) -> X. ets_new(Tbl) -> ets:new(Tbl, [{keypos, 2}]). -insert(Tbl, Rec) -> - ets:insert(Tbl, Rec), - Rec. - %% Using the process dictionary for the callback state was initially %% just a way to make what was horrendous trace (big state record and %% much else everywhere) somewhat more readable. There's not as much @@ -686,6 +733,8 @@ cfg_acc({SvcName, #diameter_service{applications = Apps} = Rec, Opts}, lists:foreach(fun init_mod/1, Apps), S = #state{service_name = SvcName, service = Rec#diameter_service{pid = self()}, + local = init_peers(), + remote = init_peers(), monitor = mref(get_value(monitor, Opts)), options = service_options(Opts)}, {S, Acc}; @@ -695,6 +744,13 @@ cfg_acc({_Ref, Type, _Opts} = T, {S, Acc}) Type == listen -> {S, [T | Acc]}. +init_peers() -> + {ets_new(caps), %% #peer{} + ets:new(apps, [bag]), %% {Alias, TPid} + ets:new(idents, [bag])}. %% {{host, OH} | {realm, OR} | {OR, OH}, + %% Alias, + %% TPid} + service_options(Opts) -> [{sequence, proplists:get_value(sequence, Opts, ?NOMASK)}, {share_peers, get_value(share_peers, Opts)}, @@ -711,7 +767,7 @@ service_options(Opts) -> mref(false = No) -> No; mref(P) -> - erlang:monitor(process, P). + monitor(process, P). init_shared(#state{options = [_, _, {_,T} | _], service_name = Svc}) -> @@ -810,7 +866,7 @@ start(Ref, Type, Opts, State) -> %% start/5 start(Ref, Type, Opts, N, #state{watchdogT = WatchdogT, - peerT = PeerT, + local = {PeerT, _, _}, options = SvcOpts, service_name = SvcName, service = Svc0}) @@ -841,7 +897,7 @@ binary_caps(#diameter_service{capabilities = Caps} = Svc, false) -> wd(Type, Ref, T, WatchdogT, Rec) -> Pid = start_watchdog(Type, Ref, T), - insert(WatchdogT, Rec#watchdog{pid = Pid}), + ets:insert(WatchdogT, Rec#watchdog{pid = Pid}), Pid. %% Note that the service record passed into the watchdog is the merged @@ -898,8 +954,8 @@ accepted(Pid, _TPid, #state{watchdogT = WatchdogT} = S) -> #watchdog{ref = Ref, type = accept = T, peer = false, options = Opts} = Wd = fetch(WatchdogT, Pid), - insert(WatchdogT, Wd#watchdog{peer = true}),%% mark replacement as started - start(Ref, T, Opts, S). %% start new watchdog + ets:insert(WatchdogT, Wd#watchdog{peer = true}),%% mark replacement started + start(Ref, T, Opts, S). %% start new watchdog fetch(Tid, Key) -> [T] = ets:lookup(Tid, Key), @@ -925,13 +981,14 @@ watchdog(TPid, [], ?WD_SUSPECT, ?WD_OKAY, Wd, State) -> #watchdog{peer = TPid} = Wd, %% assert connection_up(Wd, State); -%% Watchdog has an unresponsive connection. +%% Watchdog has an unresponsive connection. Note that the peer table +%% entry isn't removed until DOWN. watchdog(TPid, [], ?WD_OKAY, ?WD_SUSPECT = To, Wd, State) -> #watchdog{peer = TPid} = Wd, %% assert watchdog_down(Wd, To, State); %% Watchdog has lost its connection. -watchdog(TPid, [], _, ?WD_DOWN = To, Wd, #state{peerT = PeerT} = S) -> +watchdog(TPid, [], _, ?WD_DOWN = To, Wd, #state{local = {PeerT, _, _}} = S) -> close(Wd), watchdog_down(Wd, To, S), ets:delete(PeerT, TPid); @@ -940,7 +997,7 @@ watchdog(_, [], _, _, _, _) -> ok. watchdog_down(Wd, To, #state{watchdogT = WatchdogT} = S) -> - insert(WatchdogT, Wd#watchdog{state = To}), + ets:insert(WatchdogT, Wd#watchdog{state = To}), connection_down(Wd, To, S). %% --------------------------------------------------------------------------- @@ -952,14 +1009,14 @@ watchdog_down(Wd, To, #state{watchdogT = WatchdogT} = S) -> connection_up({TPid, {Caps, SupportedApps, Pkt}}, #watchdog{pid = Pid} = Wd, - #state{peerT = PeerT} + #state{local = {PeerT, _, _}} = S) -> - Pr = #peer{pid = TPid, - apps = SupportedApps, - caps = Caps, - watchdog = Pid}, - insert(PeerT, Pr), - connection_up([Pkt], Wd#watchdog{peer = TPid}, Pr, S). + Rec = #peer{pid = TPid, + apps = SupportedApps, + caps = Caps, + watchdog = Pid}, + ets:insert(PeerT, Rec), + connection_up([Pkt], Wd#watchdog{peer = TPid}, Rec, S). %% --------------------------------------------------------------------------- %% # reopen/3 @@ -969,22 +1026,23 @@ reopen({TPid, {Caps, SupportedApps, _Pkt}}, #watchdog{pid = Pid} = Wd, #state{watchdogT = WatchdogT, - peerT = PeerT}) -> - insert(PeerT, #peer{pid = TPid, - apps = SupportedApps, - caps = Caps, - watchdog = Pid}), - insert(WatchdogT, Wd#watchdog{state = ?WD_REOPEN, - peer = TPid}). + local = {PeerT, _, _}}) -> + ets:insert(PeerT, #peer{pid = TPid, + apps = SupportedApps, + caps = Caps, + watchdog = Pid}), + ets:insert(WatchdogT, Wd#watchdog{state = ?WD_REOPEN, + peer = TPid}). %% --------------------------------------------------------------------------- %% # connection_up/2 %% --------------------------------------------------------------------------- -%% Watchdog has recovered as suspect connection. Note that there has +%% Watchdog has recovered a suspect connection. Note that there has %% been no new capabilties exchange in this case. -connection_up(#watchdog{peer = TPid} = Wd, #state{peerT = PeerT} = S) -> +connection_up(#watchdog{peer = TPid} = Wd, #state{local = {PeerT, _, _}} + = S) -> connection_up([], Wd, fetch(PeerT, TPid), S). %% connection_up/4 @@ -995,23 +1053,23 @@ connection_up(Extra, #peer{apps = SApps, caps = Caps} = Pr, #state{watchdogT = WatchdogT, - local_peers = LDict, + local = LT, service_name = SvcName, service = #diameter_service{applications = Apps}} = S) -> - insert(WatchdogT, Wd#watchdog{state = ?WD_OKAY}), + ets:insert(WatchdogT, Wd#watchdog{state = ?WD_OKAY}), diameter_traffic:peer_up(TPid), - insert_local_peer(SApps, {{TPid, Caps}, {SvcName, Apps}}, LDict), + local_peer_up(SApps, {TPid, Caps}, {SvcName, Apps}, LT), report_status(up, Wd, Pr, S, Extra). -insert_local_peer(SApps, T, LDict) -> - lists:foldl(fun(A,D) -> ilp(A, T, D) end, LDict, SApps). +local_peer_up(SApps, {TPid, Caps} = TC, SA, LT) -> + insert_peer(TPid, [A || {_,A} <- SApps], Caps, LT), + lists:foreach(fun(A) -> peer_up(A, TC, SA) end, SApps). -ilp({Id, Alias}, {TC, SA}, LDict) -> - init_conn(Id, Alias, TC, SA), - ?Dict:append(Alias, TC, LDict). +peer_up({Id, Alias}, TC, SA) -> + peer_up(Id, Alias, TC, SA). -init_conn(Id, Alias, {TPid, _} = TC, {SvcName, Apps}) -> +peer_up(Id, Alias, {TPid, _} = TC, {SvcName, Apps}) -> #diameter_app{id = Id} %% assert = App = find_app(Alias, Apps), @@ -1109,17 +1167,17 @@ connection_down(#watchdog{state = ?WD_OKAY, = Pr, #state{service_name = SvcName, service = #diameter_service{applications = Apps}, - local_peers = LDict} + local = LT} = S) -> report_status(down, Wd, Pr, S, []), - remove_local_peer(SApps, {{TPid, Caps}, {SvcName, Apps}}, LDict), + local_peer_down(SApps, {TPid, Caps}, {SvcName, Apps}, LT), diameter_traffic:peer_down(TPid); connection_down(#watchdog{state = ?WD_OKAY, peer = TPid} = Wd, To, - #state{peerT = PeerT} + #state{local = {PeerT, _, _}} = S) when is_atom(To) -> connection_down(Wd, #peer{} = fetch(PeerT, TPid), S); @@ -1127,15 +1185,14 @@ connection_down(#watchdog{state = ?WD_OKAY, connection_down(#watchdog{}, _, _) -> ok. -remove_local_peer(SApps, T, LDict) -> - lists:foldl(fun(A,D) -> rlp(A, T, D) end, LDict, SApps). +local_peer_down(SApps, {TPid, _Caps} = TC, SA, LT) -> + delete_peer(TPid, LT), + lists:foreach(fun(A) -> peer_down(A, TC, SA) end, SApps). -rlp({Id, Alias}, {TC, SA}, LDict) -> - L = ?Dict:fetch(Alias, LDict), - down_conn(Id, Alias, TC, SA), - ?Dict:store(Alias, lists:delete(TC, L), LDict). +peer_down({Id, Alias}, TC, SA) -> + peer_down(Id, Alias, TC, SA). -down_conn(Id, Alias, TC, {SvcName, Apps}) -> +peer_down(Id, Alias, TC, {SvcName, Apps}) -> #diameter_app{id = Id} %% assert = App = find_app(Alias, Apps), @@ -1160,7 +1217,7 @@ wd_down(#watchdog{peer = B}, _) ok; %% ... or maybe it has. -wd_down(#watchdog{peer = TPid} = Wd, #state{peerT = PeerT} = S) -> +wd_down(#watchdog{peer = TPid} = Wd, #state{local = {PeerT, _, _}} = S) -> connection_down(Wd, ?WD_DOWN, S), ets:delete(PeerT, TPid). @@ -1368,19 +1425,37 @@ share_peer(up, Caps, Apps, TPid, #state{options = [_, {_,T} | _], service_name = Svc}) -> notify(T, Svc, {peer, TPid, [A || {_,A} <- Apps], Caps}); -share_peer(_, _, _, _, _) -> - ok. +share_peer(down, _Caps, _Apps, TPid, #state{options = [_, {_,T} | _], + service_name = Svc}) -> + notify(T, Svc, {peer, TPid}). %% --------------------------------------------------------------------------- %% # share_peers/2 %% --------------------------------------------------------------------------- -share_peers(Pid, #state{options = [_, {_,T} | _], local_peers = PDict}) -> - is_remote(Pid, T) - andalso ?Dict:fold(fun(A,Ps,ok) -> sp(Pid, A, Ps), ok end, ok, PDict). - -sp(Pid, Alias, Peers) -> - lists:foreach(fun({P,C}) -> Pid ! {peer, P, [Alias], C} end, Peers). +share_peers(Pid, #state{options = [_, {_,SP} | _], + local = {PeerT, AppT, _}}) -> + is_remote(Pid, SP) + andalso ets:foldl(fun(T, N) -> N + sp(Pid, AppT, T) end, + 0, + PeerT). + +%% An entry in the peer table doesn't mean the watchdog state is OKAY, +%% an entry in the app table does. + +sp(Pid, AppT, #peer{pid = TPid, + apps = [{_, Alias} | _] = Apps, + caps = Caps}) -> + Spec = [{{'$1', TPid}, + [{'==', '$1', {const, Alias}}], + ['$_']}], + case ets:select(AppT, Spec, 1) of + '$end_of_table' -> + 0; + _ -> + Pid ! {peer, TPid, [A || {_,A} <- Apps], Caps}, + 1 + end. is_remote(Pid, T) -> Node = node(Pid), @@ -1390,32 +1465,49 @@ is_remote(Pid, T) -> %% # remote_peer_up/4 %% --------------------------------------------------------------------------- -remote_peer_up(Pid, Aliases, Caps, #state{options = [_, _, {_,T} | _]} = S) -> - is_remote(Pid, T) - andalso rpu(Pid, Aliases, Caps, S). +remote_peer_up(TPid, Aliases, Caps, #state{options = [_, _, {_,T} | _]} = S) -> + is_remote(TPid, T) andalso rpu(TPid, Aliases, Caps, S). -rpu(Pid, Aliases, Caps, #state{service = Svc, shared_peers = PDict}) -> +rpu(TPid, Aliases, Caps, #state{service = Svc, remote = RT}) -> #diameter_service{applications = Apps} = Svc, Key = #diameter_app.alias, F = fun(A) -> lists:keymember(A, Key, Apps) end, - rpu(Pid, lists:filter(F, Aliases), Caps, PDict); + rpu(TPid, lists:filter(F, Aliases), Caps, RT); rpu(_, [] = No, _, _) -> No; -rpu(Pid, Aliases, Caps, PDict) -> - erlang:monitor(process, Pid), - T = {Pid, Caps}, - lists:foreach(fun(A) -> ?Dict:append(A, T, PDict) end, Aliases). +rpu(TPid, Aliases, Caps, {PeerT, _, _} = RT) -> + monitor(process, TPid), + ets:insert(PeerT, #peer{pid = TPid, + apps = Aliases, + caps = Caps}), + insert_peer(TPid, Aliases, Caps, RT). + +%% insert_peer/4 + +insert_peer(TPid, Aliases, Caps, {_PeerT, AppT, IdentT}) -> + #diameter_caps{origin_host = {_, OH}, + origin_realm = {_, OR}} + = Caps, + ets:insert(AppT, [{A, TPid} || A <- Aliases]), + H = iolist_to_binary(OH), + R = iolist_to_binary(OR), + ets:insert(IdentT, [{T, A, TPid} || T <- [{host, H}, {realm, R}, {R, H}], + A <- Aliases]). %% --------------------------------------------------------------------------- %% # remote_peer_down/2 %% --------------------------------------------------------------------------- -remote_peer_down(Pid, #state{shared_peers = PDict}) -> - lists:foreach(fun(A) -> rpd(Pid, A, PDict) end, ?Dict:fetch_keys(PDict)). +remote_peer_down(TPid, #state{remote = {PeerT, _, _} = RT}) -> + ets:delete(PeerT, TPid), + delete_peer(TPid, RT). + +%% delete_peer/2 -rpd(Pid, Alias, PDict) -> - ?Dict:update(Alias, fun(Ps) -> lists:keydelete(Pid, 1, Ps) end, PDict). +delete_peer(TPid, {_PeerT, AppT, IdentT}) -> + ets:select_delete(AppT, [{{'_', TPid}, [], [true]}]), + ets:select_delete(IdentT, [{{'_', '_', TPid}, [], [true]}]). %% --------------------------------------------------------------------------- %% pick_peer/4 @@ -1425,12 +1517,12 @@ pick_peer(#diameter_app{alias = Alias} = App, RealmAndHost, Filter, - #state{local_peers = L, - shared_peers = S, + #state{local = LT, + remote = RT, service_name = SvcName, service = #diameter_service{pid = Pid}}) -> - pick_peer(peers(Alias, RealmAndHost, Filter, L), - peers(Alias, RealmAndHost, Filter, S), + pick_peer(peers(Alias, RealmAndHost, Filter, LT), + peers(Alias, RealmAndHost, Filter, RT), Pid, SvcName, App). @@ -1495,54 +1587,196 @@ pick_peer(Local, %% peers/4 -peers(Alias, RH, Filter, Peers) -> - case ?Dict:find(Alias, Peers) of - {ok, L} -> - filter(L, RH, Filter); - error -> +peers(Alias, RH, Filter, T) -> + filter(Alias, RH, Filter, T, true). + +%% filter/5 +%% +%% Try to limit the peers list by starting with a host/realm lookup. + +filter(Alias, RH, {neg, F}, T, B) -> + filter(Alias, RH, F, T, not B); + +filter(_, _, none, _, false) -> + []; + +filter(Alias, _, none, T, true) -> + all_peers(Alias, T); + +filter(Alias, [DR,DH] = RH, K, T, B) + when K == realm, DR == undefined; + K == host, DH == undefined -> + filter(Alias, RH, none, T, B); + +filter(Alias, [DR,_] = RH, realm = K, T, B) -> + filter(Alias, RH, {K, DR}, T, B); + +filter(Alias, [_,DH] = RH, host = K, T, B) -> + filter(Alias, RH, {K, DH}, T, B); + +filter(Alias, _, {K, D}, {PeerT, _AppT, IdentT}, true) + when K == host; + K == realm -> + try iolist_to_binary(D) of + B -> + caps(PeerT, ets:select(IdentT, [{{{K, B}, '$1', '$2'}, + [{'==', '$1', {const, Alias}}], + ['$2']}])) + catch + error:_ -> [] - end. + end; -%% filter/3 +filter(Alias, RH, {all, Filters}, T, B) + when is_list(Filters) -> + fltr_all(Alias, RH, Filters, T, B); + +filter(Alias, RH, {first, Filters}, T, B) + when is_list(Filters) -> + fltr_first(Alias, RH, Filters, T, B); + +filter(Alias, RH, Filter, T, B) -> + {Ts, Fs} = filter(all_peers(Alias, T), RH, Filter), + choose(B, Ts, Fs). + +%% fltr_all/5 + +fltr_all(Alias, RH, [{K, any} | Filters], T, B) + when K == host; + K == realm -> + fltr_all(Alias, RH, Filters, T, B); + +fltr_all(Alias, RH, [{host, _} = H, {realm, _} = R | Filters], T, B) -> + fltr_all(Alias, RH, [R, H | Filters], T, B); + +fltr_all(Alias, RH, [{realm, _} = R, {host, any} | Filters], T, B) -> + fltr_all(Alias, RH, [R | Filters], T, B); + +fltr_all(Alias, RH, [{realm, OR}, {host, OH} | Filters], T, true) -> + {PeerT, _AppT, IdentT} = T, + try {iolist_to_binary(OR), iolist_to_binary(OH)} of + BT -> + Peers = caps(PeerT, + ets:select(IdentT, [{{BT, '$1', '$2'}, + [{'==', '$1', {const, Alias}}], + ['$2']}])), + {Ts, _} = filter(Peers, RH, {all, Filters}), + Ts + catch + error:_ -> + [] + end; + +fltr_all(Alias, [undefined,_] = RH, [realm | Filters], T, B) -> + fltr_all(Alias, RH, Filters, T, B); + +fltr_all(Alias, [DR,_] = RH, [realm | Filters], T, B) -> + fltr_all(Alias, RH, [{realm, DR} | Filters], T, B); + +fltr_all(Alias, [_,undefined] = RH, [host | Filters], T, B) -> + fltr_all(Alias, RH, Filters, T, B); + +fltr_all(Alias, [_,DH] = RH, [host | Filters], T, B) -> + fltr_all(Alias, RH, [{host, DH} | Filters], T, B); + +fltr_all(Alias, RH, [{K, _} = KT, KA | Filters], T, B) + when K == host, KA == realm; + K == realm, KA == host -> + fltr_all(Alias, RH, [KA, KT | Filters], T, B); + +fltr_all(Alias, RH, [F | Filters], T, B) -> + {Ts, Fs} = filter(filter(Alias, RH, F, T, B), RH, {all, Filters}), + choose(B, Ts, Fs); + +fltr_all(Alias, RH, [], T, B) -> + filter(Alias, RH, none, T, B). + +%% fltr_first/5 %% -%% Return peers in match order. +%% Like any, but stop at the first filter with any matches. + +fltr_first(Alias, RH, [F | Filters], T, B) -> + case filter(Alias, RH, F, T, B) of + [] -> + fltr_first(Alias, RH, Filters, T, B); + [_|_] = Ts -> + Ts + end; -filter(Peers, RH, Filter) -> - {Ts, _} = fltr(Peers, RH, Filter), - Ts. +fltr_first(Alias, RH, [], T, B) -> + filter(Alias, RH, none, T, not B). -%% fltr/4 +%% all_peers/2 + +all_peers(Alias, {PeerT, AppT, _}) -> + ets:select(PeerT, [{#peer{pid = P, caps = '$1', _ = '_'}, + [], + [{{P, '$1'}}]} + || {_,P} <- ets:lookup(AppT, Alias)]). -fltr(Peers, _, none) -> +%% caps/2 + +caps(PeerT, Pids) -> + ets:select(PeerT, [{#peer{pid = P, caps = '$1', _ = '_'}, + [], + [{{P, '$1'}}]} + || P <- Pids]). + +%% filter/3 +%% +%% Return peers in match order. + +filter(Peers, _, none) -> {Peers, []}; -fltr(Peers, RH, {neg, F}) -> - {Ts, Fs} = fltr(Peers, RH, F), +filter(Peers, RH, {neg, F}) -> + {Ts, Fs} = filter(Peers, RH, F), {Fs, Ts}; -fltr(Peers, RH, {all, L}) +filter(Peers, RH, {all, L}) when is_list(L) -> lists:foldl(fun(F,A) -> fltr_all(F, A, RH) end, {Peers, []}, L); -fltr(Peers, RH, {any, L}) +filter(Peers, RH, {any, L}) when is_list(L) -> lists:foldl(fun(F,A) -> fltr_any(F, A, RH) end, {[], Peers}, L); -fltr(Peers, RH, F) -> +filter(Peers, RH, {first, L}) + when is_list(L) -> + fltr_first(Peers, RH, L); + +filter(Peers, RH, F) -> lists:partition(fun({_,C}) -> caps_filter(C, RH, F) end, Peers). +%% fltr_all/3 + fltr_all(F, {Ts0, Fs0}, RH) -> - {Ts1, Fs1} = fltr(Ts0, RH, F), + {Ts1, Fs1} = filter(Ts0, RH, F), {Ts1, Fs0 ++ Fs1}. +%% fltr_any/3 + fltr_any(F, {Ts0, Fs0}, RH) -> - {Ts1, Fs1} = fltr(Fs0, RH, F), + {Ts1, Fs1} = filter(Fs0, RH, F), {Ts0 ++ Ts1, Fs1}. +%% fltr_first/3 + +fltr_first(Peers, _, []) -> + {[], Peers}; + +fltr_first(Peers, RH, [F | Filters]) -> + case filter(Peers, RH, F) of + {[], _} -> + fltr_first(Peers, RH, Filters); + {_, _} = T -> + T + end. + %% caps_filter/3 caps_filter(#diameter_caps{origin_host = {_,OH}}, [_,DH], host) -> @@ -1586,8 +1820,8 @@ eq(Any, Id, PeerId) -> transports(#state{watchdogT = WatchdogT}) -> ets:select(WatchdogT, [{#watchdog{peer = '$1', _ = '_'}, - [{'is_pid', '$1'}], - ['$1']}]). + [{'is_pid', '$1'}], + ['$1']}]). %% --------------------------------------------------------------------------- %% # service_info/2 @@ -1640,7 +1874,7 @@ tagged_info(Item, S) undefined end; -tagged_info(TPid, #state{watchdogT = WatchdogT, peerT = PeerT}) +tagged_info(TPid, #state{watchdogT = WatchdogT, local = {PeerT, _, _}}) when is_pid(TPid) -> try [#peer{watchdog = Pid}] = ets:lookup(PeerT, TPid), @@ -1790,7 +2024,7 @@ keys(connect = T, Opts) -> keys(_, _) -> [{listen, accept}]. -peer_dict(#state{watchdogT = WatchdogT, peerT = PeerT}, Dict0) -> +peer_dict(#state{watchdogT = WatchdogT, local = {PeerT, _, _}}, Dict0) -> try ets:tab2list(WatchdogT) of L -> lists:foldl(fun(T,A) -> peer_acc(PeerT, A, T) end, Dict0, L) catch diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl index 07f39c562f..516353219a 100644 --- a/lib/diameter/src/base/diameter_traffic.erl +++ b/lib/diameter/src/base/diameter_traffic.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2013-2015. All Rights Reserved. +%% Copyright Ericsson AB 2013-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -41,7 +41,6 @@ -export([make_recvdata/1, peer_up/1, peer_down/1, - failover/1, pending/1]). %% towards ?MODULE @@ -1814,7 +1813,7 @@ store_request(T, TPid) -> ets:member(?REQUEST_TABLE, TPid) orelse begin {_Seqs, _Req, TRef} = T, - (self() ! {failover, TRef}) %% failover/1 may have missed + self() ! {failover, TRef} %% failover/1 may have missed end. %% lookup_request/2 @@ -1864,7 +1863,7 @@ failover(TPid) %% notifications are sent here: store_request/2 sends the notification %% in that case. -%% Failover as a consequence of request_peer_down/1: inform the +%% Failover as a consequence of peer_down/1: inform the %% request process. failover({_, Req, TRef}) -> #request{handler = Pid, diff --git a/lib/eldap/doc/src/eldap.xml b/lib/eldap/doc/src/eldap.xml index 8f4479a730..43873e44e2 100644 --- a/lib/eldap/doc/src/eldap.xml +++ b/lib/eldap/doc/src/eldap.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2012</year><year>2013</year> + <year>2012</year><year>2016</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -29,7 +29,7 @@ <rev>B</rev> </header> <module>eldap</module> - <modulesummary>Eldap Functions</modulesummary> + <modulesummary>LDAP Client</modulesummary> <description> <p>This module provides a client api to the Lightweight Directory Access Protocol (LDAP). </p> @@ -40,20 +40,67 @@ </list> <p>The above publications can be found at <url href="http://www.ietf.org">IETF</url>. </p> - <p><em>Types</em></p> - <pre> -handle() Connection handle -attribute() {Type = string(), Values=[string()]} -modify_op() See mod_add/2, mod_delete/2, mod_replace/2 -scope() See baseObject/0, singleLevel/0, wholeSubtree/0 -dereference() See neverDerefAliases/0, derefInSearching/0, derefFindingBaseObj/0, derefAlways/0 -filter() See present/1, substrings/2, - equalityMatch/2, greaterOrEqual/2, lessOrEqual/2, - approxMatch/2, extensibleMatch/2, - 'and'/1, 'or'/1, 'not'/1. - </pre> - <p></p> </description> + + <section> + <title>DATA TYPES</title> + <p>Type definitions that are used more than once in this module: + </p> + <taglist> + <tag><c>handle()</c></tag> + <item><p>Connection handle</p></item> + + <tag><c>attribute() =</c></tag> + <item><p><c>{Type = string(), Values=[string()]}</c></p></item> + + <tag><c>modify_op()</c></tag> + <item><p>See + <seealso marker="#mod_add/2">mod_add/2</seealso>, + <seealso marker="#mod_delete/2">mod_delete/2</seealso>, + <seealso marker="#mod_replace/2">mod_replace/2</seealso> + </p></item> + + <tag><c>scope()</c></tag> + <item><p>See + <seealso marker="#baseObject/0">baseObject/0</seealso>, + <seealso marker="#singleLevel/0">singleLevel/0</seealso>, + <seealso marker="#wholeSubtree/0">wholeSubtree/0</seealso> + </p></item> + + <tag><c>dereference()</c></tag> + <item><p>See + <seealso marker="#neverDerefAliases/0">neverDerefAliases/0</seealso>, + <seealso marker="#derefInSearching/0">derefInSearching/0</seealso>, + <seealso marker="#derefFindingBaseObj/0">derefFindingBaseObj/0</seealso>, + <seealso marker="#derefAlways/0">derefAlways/0</seealso> + </p></item> + + <tag><c>filter()</c></tag> + <item><p>See + <seealso marker="#present/1">present/1</seealso>, + <seealso marker="#substrings/2">substrings/2</seealso>, + <seealso marker="#equalityMatch/2">equalityMatch/2</seealso>, + <seealso marker="#greaterOrEqual/2">greaterOrEqual/2</seealso>, + <seealso marker="#lessOrEqual/2">lessOrEqual/2</seealso>, + <seealso marker="#approxMatch/2">approxMatch/2</seealso>, + <seealso marker="#extensibleMatch/2">extensibleMatch/2</seealso>, + <seealso marker="#'and'/1">'and'/1</seealso>, + <seealso marker="#'or'/1">'or'/1</seealso>, + <seealso marker="#'not'/1">'not'/1</seealso> + </p></item> + + <tag><c>return_value() = </c></tag> + <item><p><c>ok | {ok, {referral,referrals()}} | {error,Error}</c> + </p></item> + + <tag><c>referrals() =</c></tag> + <item><p><c>[Address = string()]</c> The contents of <c>Address</c> is server dependent. + </p></item> + + </taglist> + </section> + + <funcs> <func> <name>open([Host]) -> {ok, Handle} | {error, Reason}</name> @@ -88,18 +135,19 @@ filter() See present/1, substrings/2, <v>Handle = handle()</v> </type> <desc> - <p>Shutdown the connection.</p> + <p>Shutdown the connection after sending an unbindRequest to the server. If the connection is tls the connection + will be closed with <c>ssl:close/1</c>, otherwise with <c>gen_tcp:close/1</c>.</p> </desc> </func> <func> - <name>start_tls(Handle, Options) -> ok | {error,Error}</name> + <name>start_tls(Handle, Options) -> return_value()</name> <fsummary>Upgrade a connection to TLS.</fsummary> <desc> <p>Same as start_tls(Handle, Options, infinity)</p> </desc> </func> <func> - <name>start_tls(Handle, Options, Timeout) -> ok | {error,Error}</name> + <name>start_tls(Handle, Options, Timeout) -> return_value()</name> <fsummary>Upgrade a connection to TLS.</fsummary> <type> <v>Handle = handle()</v> @@ -128,7 +176,7 @@ filter() See present/1, substrings/2, </desc> </func> <func> - <name>simple_bind(Handle, Dn, Password) -> ok | {error, Reason}</name> + <name>simple_bind(Handle, Dn, Password) -> return_value()</name> <fsummary>Authenticate the connection.</fsummary> <type> <v>Handle = handle()</v> @@ -140,7 +188,7 @@ filter() See present/1, substrings/2, </desc> </func> <func> - <name>add(Handle, Dn, [Attribute]) -> ok | {error, Reason}</name> + <name>add(Handle, Dn, [Attribute]) -> return_value()</name> <fsummary>Add an entry.</fsummary> <type> <v>Handle = handle()</v> @@ -161,7 +209,7 @@ filter() See present/1, substrings/2, </desc> </func> <func> - <name>delete(Handle, Dn) -> ok | {error, Reason}</name> + <name>delete(Handle, Dn) -> return_value()</name> <fsummary>Delete an entry.</fsummary> <type> <v>Dn = string()</v> @@ -203,7 +251,7 @@ filter() See present/1, substrings/2, </func> <func> - <name>modify(Handle, Dn, [ModifyOp]) -> ok | {error, Reason}</name> + <name>modify(Handle, Dn, [ModifyOp]) -> return_value()</name> <fsummary>Modify an entry.</fsummary> <type> <v>Dn = string()</v> @@ -219,7 +267,7 @@ filter() See present/1, substrings/2, </desc> </func> <func> - <name>modify_password(Handle, Dn, NewPasswd) -> ok | {ok, GenPasswd} | {error, Reason}</name> + <name>modify_password(Handle, Dn, NewPasswd) -> return_value() | {ok, GenPasswd}</name> <fsummary>Modify the password of a user.</fsummary> <type> <v>Dn = string()</v> @@ -230,7 +278,7 @@ filter() See present/1, substrings/2, </desc> </func> <func> - <name>modify_password(Handle, Dn, NewPasswd, OldPasswd) -> ok | {ok, GenPasswd} | {error, Reason}</name> + <name>modify_password(Handle, Dn, NewPasswd, OldPasswd) -> return_value() | {ok, GenPasswd}</name> <fsummary>Modify the password of a user.</fsummary> <type> <v>Dn = string()</v> @@ -259,7 +307,7 @@ filter() See present/1, substrings/2, </desc> </func> <func> - <name>modify_dn(Handle, Dn, NewRDN, DeleteOldRDN, NewSupDN) -> ok | {error, Reason}</name> + <name>modify_dn(Handle, Dn, NewRDN, DeleteOldRDN, NewSupDN) -> return_value()</name> <fsummary>Modify the DN of an entry.</fsummary> <type> <v>Dn = string()</v> @@ -279,7 +327,7 @@ filter() See present/1, substrings/2, </desc> </func> <func> - <name>search(Handle, SearchOptions) -> {ok, #eldap_search_result{}} | {error, Reason}</name> + <name>search(Handle, SearchOptions) -> {ok, #eldap_search_result{}} | {ok, {referral,referrals()}} | {error, Reason}</name> <fsummary>Search the Directory</fsummary> <type> <v>SearchOptions = #eldap_search{} | [SearchOption]</v> diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl index ae47c815c9..0c03021bd0 100644 --- a/lib/eldap/src/eldap.erl +++ b/lib/eldap/src/eldap.erl @@ -10,16 +10,23 @@ %%% See MIT-LICENSE at the top dir for licensing information. %%% -------------------------------------------------------------------- -vc('$Id$ '). --export([open/1,open/2,simple_bind/3,controlling_process/2, - start_tls/2, start_tls/3, - modify_password/3, modify_password/4, +-export([open/1, open/2, + simple_bind/3, simple_bind/4, + controlling_process/2, + start_tls/2, start_tls/3, start_tls/4, + modify_password/3, modify_password/4, modify_password/5, getopts/2, baseObject/0,singleLevel/0,wholeSubtree/0,close/1, equalityMatch/2,greaterOrEqual/2,lessOrEqual/2, extensibleMatch/2, - approxMatch/2,search/2,substrings/2,present/1, - 'and'/1,'or'/1,'not'/1,modify/3, mod_add/2, mod_delete/2, - mod_replace/2, add/3, delete/2, modify_dn/5,parse_dn/1, + search/2, search/3, + approxMatch/2,substrings/2,present/1, + 'and'/1,'or'/1,'not'/1,mod_add/2, mod_delete/2, + mod_replace/2, + modify/3, modify/4, + add/3, add/4, + delete/2, delete/3, + modify_dn/5,parse_dn/1, parse_ldap_url/1]). -export([neverDerefAliases/0, derefInSearching/0, @@ -91,7 +98,10 @@ start_tls(Handle, TlsOptions) -> start_tls(Handle, TlsOptions, infinity). start_tls(Handle, TlsOptions, Timeout) -> - send(Handle, {start_tls,TlsOptions,Timeout}), + start_tls(Handle, TlsOptions, Timeout, asn1_NOVALUE). + +start_tls(Handle, TlsOptions, Timeout, Controls) -> + send(Handle, {start_tls,TlsOptions,Timeout,Controls}), recv(Handle). %%% -------------------------------------------------------------------- @@ -108,7 +118,11 @@ modify_password(Handle, Dn, NewPasswd) -> modify_password(Handle, Dn, NewPasswd, OldPasswd) when is_pid(Handle), is_list(Dn), is_list(NewPasswd), is_list(OldPasswd) -> - send(Handle, {passwd_modify,optional(Dn),optional(NewPasswd),optional(OldPasswd)}), + modify_password(Handle, Dn, NewPasswd, OldPasswd, asn1_NOVALUE). + +modify_password(Handle, Dn, NewPasswd, OldPasswd, Controls) + when is_pid(Handle), is_list(Dn), is_list(NewPasswd), is_list(OldPasswd) -> + send(Handle, {passwd_modify,optional(Dn),optional(NewPasswd),optional(OldPasswd),Controls}), recv(Handle). %%% -------------------------------------------------------------------- @@ -147,7 +161,10 @@ controlling_process(Handle, Pid) when is_pid(Handle), is_pid(Pid) -> %%% Returns: ok | {error, Error} %%% -------------------------------------------------------------------- simple_bind(Handle, Dn, Passwd) when is_pid(Handle) -> - send(Handle, {simple_bind, Dn, Passwd}), + simple_bind(Handle, Dn, Passwd, asn1_NOVALUE). + +simple_bind(Handle, Dn, Passwd, Controls) when is_pid(Handle) -> + send(Handle, {simple_bind, Dn, Passwd, Controls}), recv(Handle). %%% -------------------------------------------------------------------- @@ -164,7 +181,10 @@ simple_bind(Handle, Dn, Passwd) when is_pid(Handle) -> %%% ) %%% -------------------------------------------------------------------- add(Handle, Entry, Attributes) when is_pid(Handle),is_list(Entry),is_list(Attributes) -> - send(Handle, {add, Entry, add_attrs(Attributes)}), + add(Handle, Entry, Attributes, asn1_NOVALUE). + +add(Handle, Entry, Attributes, Controls) when is_pid(Handle),is_list(Entry),is_list(Attributes) -> + send(Handle, {add, Entry, add_attrs(Attributes), Controls}), recv(Handle). %%% Do sanity check ! @@ -188,7 +208,10 @@ add_attrs(Attrs) -> %%% ) %%% -------------------------------------------------------------------- delete(Handle, Entry) when is_pid(Handle), is_list(Entry) -> - send(Handle, {delete, Entry}), + delete(Handle, Entry, asn1_NOVALUE). + +delete(Handle, Entry, Controls) when is_pid(Handle), is_list(Entry) -> + send(Handle, {delete, Entry, Controls}), recv(Handle). %%% -------------------------------------------------------------------- @@ -203,7 +226,10 @@ delete(Handle, Entry) when is_pid(Handle), is_list(Entry) -> %%% ) %%% -------------------------------------------------------------------- modify(Handle, Object, Mods) when is_pid(Handle), is_list(Object), is_list(Mods) -> - send(Handle, {modify, Object, Mods}), + modify(Handle, Object, Mods, asn1_NOVALUE). + +modify(Handle, Object, Mods, Controls) when is_pid(Handle), is_list(Object), is_list(Mods) -> + send(Handle, {modify, Object, Mods, Controls}), recv(Handle). %%% @@ -236,8 +262,12 @@ m(Operation, Type, Values) -> %%% -------------------------------------------------------------------- modify_dn(Handle, Entry, NewRDN, DelOldRDN, NewSup) when is_pid(Handle),is_list(Entry),is_list(NewRDN),is_atom(DelOldRDN),is_list(NewSup) -> + modify_dn(Handle, Entry, NewRDN, DelOldRDN, NewSup, asn1_NOVALUE). + +modify_dn(Handle, Entry, NewRDN, DelOldRDN, NewSup, Controls) + when is_pid(Handle),is_list(Entry),is_list(NewRDN),is_atom(DelOldRDN),is_list(NewSup) -> send(Handle, {modify_dn, Entry, NewRDN, - bool_p(DelOldRDN), optional(NewSup)}), + bool_p(DelOldRDN), optional(NewSup), Controls}), recv(Handle). %%% Sanity checks ! @@ -272,16 +302,19 @@ optional(Value) -> Value. %%% []}} %%% %%% -------------------------------------------------------------------- -search(Handle, A) when is_pid(Handle), is_record(A, eldap_search) -> - call_search(Handle, A); -search(Handle, L) when is_pid(Handle), is_list(L) -> +search(Handle, X) when is_pid(Handle), is_record(X,eldap_search) ; is_list(X) -> + search(Handle, X, asn1_NOVALUE). + +search(Handle, A, Controls) when is_pid(Handle), is_record(A, eldap_search) -> + call_search(Handle, A, Controls); +search(Handle, L, Controls) when is_pid(Handle), is_list(L) -> case catch parse_search_args(L) of {error, Emsg} -> {error, Emsg}; - A when is_record(A, eldap_search) -> call_search(Handle, A) + A when is_record(A, eldap_search) -> call_search(Handle, A, Controls) end. -call_search(Handle, A) -> - send(Handle, {search, A}), +call_search(Handle, A, Controls) -> + send(Handle, {search, A, Controls}), recv(Handle). parse_search_args(Args) -> @@ -484,33 +517,33 @@ do_connect(Host, Data, Opts) when Data#eldap.ldaps == true -> loop(Cpid, Data) -> receive - {From, {search, A}} -> - {Res,NewData} = do_search(Data, A), + {From, {search, A, Controls}} -> + {Res,NewData} = do_search(Data, A, Controls), send(From,Res), ?MODULE:loop(Cpid, NewData); - {From, {modify, Obj, Mod}} -> - {Res,NewData} = do_modify(Data, Obj, Mod), + {From, {modify, Obj, Mod, Controls}} -> + {Res,NewData} = do_modify(Data, Obj, Mod, Controls), send(From,Res), ?MODULE:loop(Cpid, NewData); - {From, {modify_dn, Obj, NewRDN, DelOldRDN, NewSup}} -> - {Res,NewData} = do_modify_dn(Data, Obj, NewRDN, DelOldRDN, NewSup), + {From, {modify_dn, Obj, NewRDN, DelOldRDN, NewSup, Controls}} -> + {Res,NewData} = do_modify_dn(Data, Obj, NewRDN, DelOldRDN, NewSup, Controls), send(From,Res), ?MODULE:loop(Cpid, NewData); - {From, {add, Entry, Attrs}} -> - {Res,NewData} = do_add(Data, Entry, Attrs), + {From, {add, Entry, Attrs, Controls}} -> + {Res,NewData} = do_add(Data, Entry, Attrs, Controls), send(From,Res), ?MODULE:loop(Cpid, NewData); - {From, {delete, Entry}} -> - {Res,NewData} = do_delete(Data, Entry), + {From, {delete, Entry, Controls}} -> + {Res,NewData} = do_delete(Data, Entry, Controls), send(From,Res), ?MODULE:loop(Cpid, NewData); - {From, {simple_bind, Dn, Passwd}} -> - {Res,NewData} = do_simple_bind(Data, Dn, Passwd), + {From, {simple_bind, Dn, Passwd, Controls}} -> + {Res,NewData} = do_simple_bind(Data, Dn, Passwd, Controls), send(From,Res), ?MODULE:loop(Cpid, NewData); @@ -520,17 +553,18 @@ loop(Cpid, Data) -> ?PRINT("New Cpid is: ~p~n",[NewCpid]), ?MODULE:loop(NewCpid, Data); - {From, {start_tls,TlsOptions,Timeout}} -> - {Res,NewData} = do_start_tls(Data, TlsOptions, Timeout), + {From, {start_tls,TlsOptions,Timeout,Controls}} -> + {Res,NewData} = do_start_tls(Data, TlsOptions, Timeout, Controls), send(From,Res), ?MODULE:loop(Cpid, NewData); - {From, {passwd_modify,Dn,NewPasswd,OldPasswd}} -> - {Res,NewData} = do_passwd_modify(Data, Dn, NewPasswd, OldPasswd), + {From, {passwd_modify,Dn,NewPasswd,OldPasswd,Controls}} -> + {Res,NewData} = do_passwd_modify(Data, Dn, NewPasswd, OldPasswd, Controls), send(From, Res), ?MODULE:loop(Cpid, NewData); {_From, close} -> + {no_reply,_NewData} = do_unbind(Data), unlink(Cpid), exit(closed); @@ -578,11 +612,10 @@ loop(Cpid, Data) -> %%% -------------------------------------------------------------------- %%% startTLS Request %%% -------------------------------------------------------------------- - -do_start_tls(Data=#eldap{using_tls=true}, _, _) -> +do_start_tls(Data=#eldap{using_tls=true}, _, _, _) -> {{error,tls_already_started}, Data}; -do_start_tls(Data=#eldap{fd=FD} , TlsOptions, Timeout) -> - case catch exec_start_tls(Data) of +do_start_tls(Data=#eldap{fd=FD} , TlsOptions, Timeout, Controls) -> + case catch exec_start_tls(Data, Controls) of {ok,NewData} -> case ssl:connect(FD,TlsOptions,Timeout) of {ok, SslSocket} -> @@ -593,15 +626,16 @@ do_start_tls(Data=#eldap{fd=FD} , TlsOptions, Timeout) -> {error,Error} -> {{error,Error}, Data} end; - {error,Error} -> {{error,Error},Data}; - Else -> {{error,Else},Data} + {{ok,Val},NewData} -> {{ok,Val},NewData}; + {error,Error} -> {{error,Error},Data}; + Else -> {{error,Else},Data} end. -define(START_TLS_OID, "1.3.6.1.4.1.1466.20037"). -exec_start_tls(Data) -> +exec_start_tls(Data, Controls) -> Req = #'ExtendedRequest'{requestName = ?START_TLS_OID}, - Reply = request(Data#eldap.fd, Data, Data#eldap.id, {extendedReq, Req}), + Reply = request(Data#eldap.fd, Data, Data#eldap.id, {extendedReq, Req, Controls}), exec_extended_req_reply(Data, Reply). exec_extended_req_reply(Data, {ok,Msg}) when @@ -611,6 +645,8 @@ exec_extended_req_reply(Data, {ok,Msg}) when case Result#'ExtendedResponse'.resultCode of success -> {ok,Data}; + referral -> + {{ok, {referral,Result#'ExtendedResponse'.referral}}, Data}; Error -> {error, {response,Error}} end; @@ -626,30 +662,32 @@ exec_extended_req_reply(_, Error) -> %%% Authenticate ourselves to the directory using %%% simple authentication. -do_simple_bind(Data, anon, anon) -> %% For testing - do_the_simple_bind(Data, "", ""); -do_simple_bind(Data, Dn, _Passwd) when Dn=="",Data#eldap.anon_auth==false -> +do_simple_bind(Data, anon, anon, Controls) -> %% For testing + do_the_simple_bind(Data, "", "", Controls); +do_simple_bind(Data, Dn, _Passwd,_) when Dn=="",Data#eldap.anon_auth==false -> {{error,anonymous_auth},Data}; -do_simple_bind(Data, _Dn, Passwd) when Passwd=="",Data#eldap.anon_auth==false -> +do_simple_bind(Data, _Dn, Passwd,_) when Passwd=="",Data#eldap.anon_auth==false -> {{error,anonymous_auth},Data}; -do_simple_bind(Data, Dn, Passwd) -> - do_the_simple_bind(Data, Dn, Passwd). +do_simple_bind(Data, Dn, Passwd, Controls) -> + do_the_simple_bind(Data, Dn, Passwd, Controls). -do_the_simple_bind(Data, Dn, Passwd) -> +do_the_simple_bind(Data, Dn, Passwd, Controls) -> case catch exec_simple_bind(Data#eldap{binddn = Dn, passwd = Passwd, - id = bump_id(Data)}) of - {ok,NewData} -> {ok,NewData}; - {error,Emsg} -> {{error,Emsg},Data}; - Else -> {{error,Else},Data} + id = bump_id(Data)}, + Controls) of + {ok,NewData} -> {ok,NewData}; + {{ok,Val},NewData} -> {{ok,Val},NewData}; + {error,Emsg} -> {{error,Emsg},Data}; + Else -> {{error,Else},Data} end. -exec_simple_bind(Data) -> +exec_simple_bind(Data, Controls) -> Req = #'BindRequest'{version = Data#eldap.version, name = Data#eldap.binddn, authentication = {simple, Data#eldap.passwd}}, log2(Data, "bind request = ~p~n", [Req]), - Reply = request(Data#eldap.fd, Data, Data#eldap.id, {bindRequest, Req}), + Reply = request(Data#eldap.fd, Data, Data#eldap.id, {bindRequest, Req, Controls}), log2(Data, "bind reply = ~p~n", [Reply]), exec_simple_bind_reply(Data, Reply). @@ -659,6 +697,7 @@ exec_simple_bind_reply(Data, {ok,Msg}) when {bindResponse, Result} -> case Result#'BindResponse'.resultCode of success -> {ok,Data}; + referral -> {{ok, {referral,Result#'BindResponse'.referral}}, Data}; Error -> {error, Error} end; Other -> {error, Other} @@ -671,10 +710,11 @@ exec_simple_bind_reply(_, Error) -> %%% searchRequest %%% -------------------------------------------------------------------- -do_search(Data, A) -> - case catch do_search_0(Data, A) of +do_search(Data, A, Controls) -> + case catch do_search_0(Data, A, Controls) of {error,Emsg} -> {ldap_closed_p(Data, Emsg),Data}; {'EXIT',Error} -> {ldap_closed_p(Data, Error),Data}; + {{ok,Val},NewData} -> {{ok,Val},NewData}; {ok,Res,Ref,NewData} -> {{ok,polish(Res, Ref)},NewData}; {{error,Reason},NewData} -> {{error,Reason},NewData}; Else -> {ldap_closed_p(Data, Else),Data} @@ -700,7 +740,7 @@ polish_result([H|T]) when is_record(H, 'SearchResultEntry') -> polish_result([]) -> []. -do_search_0(Data, A) -> +do_search_0(Data, A, Controls) -> Req = #'SearchRequest'{baseObject = A#eldap_search.base, scope = v_scope(A#eldap_search.scope), derefAliases = v_deref(A#eldap_search.deref), @@ -711,15 +751,15 @@ do_search_0(Data, A) -> attributes = v_attributes(A#eldap_search.attributes) }, Id = bump_id(Data), - collect_search_responses(Data#eldap{id=Id}, Req, Id). + collect_search_responses(Data#eldap{id=Id}, Req, Id, Controls). %%% The returned answers cames in one packet per entry %%% mixed with possible referals -collect_search_responses(Data, Req, ID) -> +collect_search_responses(Data, Req, ID, Controls) -> S = Data#eldap.fd, log2(Data, "search request = ~p~n", [Req]), - send_request(S, Data, ID, {searchRequest, Req}), + send_request(S, Data, ID, {searchRequest, Req, Controls}), Resp = recv_response(S, Data), log2(Data, "search reply = ~p~n", [Resp]), collect_search_responses(Data, S, ID, Resp, [], []). @@ -732,6 +772,8 @@ collect_search_responses(Data, S, ID, {ok,Msg}, Acc, Ref) success -> log2(Data, "search reply = searchResDone ~n", []), {ok,Acc,Ref,Data}; + referral -> + {{ok, {referral,R#'LDAPResult'.referral}}, Data}; Reason -> {{error,Reason},Data} end; @@ -756,21 +798,22 @@ collect_search_responses(_, _, _, Else, _, _) -> %%% addRequest %%% -------------------------------------------------------------------- -do_add(Data, Entry, Attrs) -> - case catch do_add_0(Data, Entry, Attrs) of +do_add(Data, Entry, Attrs, Controls) -> + case catch do_add_0(Data, Entry, Attrs, Controls) of {error,Emsg} -> {ldap_closed_p(Data, Emsg),Data}; {'EXIT',Error} -> {ldap_closed_p(Data, Error),Data}; {ok,NewData} -> {ok,NewData}; + {{ok,Val},NewData} -> {{ok,Val},NewData}; Else -> {ldap_closed_p(Data, Else),Data} end. -do_add_0(Data, Entry, Attrs) -> +do_add_0(Data, Entry, Attrs, Controls) -> Req = #'AddRequest'{entry = Entry, attributes = Attrs}, S = Data#eldap.fd, Id = bump_id(Data), log2(Data, "add request = ~p~n", [Req]), - Resp = request(S, Data, Id, {addRequest, Req}), + Resp = request(S, Data, Id, {addRequest, Req, Controls}), log2(Data, "add reply = ~p~n", [Resp]), check_reply(Data#eldap{id = Id}, Resp, addResponse). @@ -779,19 +822,20 @@ do_add_0(Data, Entry, Attrs) -> %%% deleteRequest %%% -------------------------------------------------------------------- -do_delete(Data, Entry) -> - case catch do_delete_0(Data, Entry) of +do_delete(Data, Entry, Controls) -> + case catch do_delete_0(Data, Entry, Controls) of {error,Emsg} -> {ldap_closed_p(Data, Emsg),Data}; {'EXIT',Error} -> {ldap_closed_p(Data, Error),Data}; {ok,NewData} -> {ok,NewData}; + {{ok,Val},NewData} -> {{ok,Val},NewData}; Else -> {ldap_closed_p(Data, Else),Data} end. -do_delete_0(Data, Entry) -> +do_delete_0(Data, Entry, Controls) -> S = Data#eldap.fd, Id = bump_id(Data), log2(Data, "del request = ~p~n", [Entry]), - Resp = request(S, Data, Id, {delRequest, Entry}), + Resp = request(S, Data, Id, {delRequest, Entry, Controls}), log2(Data, "del reply = ~p~n", [Resp]), check_reply(Data#eldap{id = Id}, Resp, delResponse). @@ -800,22 +844,23 @@ do_delete_0(Data, Entry) -> %%% modifyRequest %%% -------------------------------------------------------------------- -do_modify(Data, Obj, Mod) -> - case catch do_modify_0(Data, Obj, Mod) of +do_modify(Data, Obj, Mod, Controls) -> + case catch do_modify_0(Data, Obj, Mod, Controls) of {error,Emsg} -> {ldap_closed_p(Data, Emsg),Data}; {'EXIT',Error} -> {ldap_closed_p(Data, Error),Data}; {ok,NewData} -> {ok,NewData}; + {{ok,Val},NewData} -> {{ok,Val},NewData}; Else -> {ldap_closed_p(Data, Else),Data} end. -do_modify_0(Data, Obj, Mod) -> +do_modify_0(Data, Obj, Mod, Controls) -> v_modifications(Mod), Req = #'ModifyRequest'{object = Obj, changes = Mod}, S = Data#eldap.fd, Id = bump_id(Data), log2(Data, "modify request = ~p~n", [Req]), - Resp = request(S, Data, Id, {modifyRequest, Req}), + Resp = request(S, Data, Id, {modifyRequest, Req, Controls}), log2(Data, "modify reply = ~p~n", [Resp]), check_reply(Data#eldap{id = Id}, Resp, modifyResponse). @@ -825,16 +870,17 @@ do_modify_0(Data, Obj, Mod) -> -define(PASSWD_MODIFY_OID, "1.3.6.1.4.1.4203.1.11.1"). -do_passwd_modify(Data, Dn, NewPasswd, OldPasswd) -> - case catch do_passwd_modify_0(Data, Dn, NewPasswd, OldPasswd) of +do_passwd_modify(Data, Dn, NewPasswd, OldPasswd, Controls) -> + case catch do_passwd_modify_0(Data, Dn, NewPasswd, OldPasswd, Controls) of {error,Emsg} -> {ldap_closed_p(Data, Emsg),Data}; {'EXIT',Error} -> {ldap_closed_p(Data, Error),Data}; {ok,NewData} -> {ok,NewData}; + {{ok,Val},NewData} -> {{ok,Val},NewData}; {ok,Passwd,NewData} -> {{ok, Passwd},NewData}; Else -> {ldap_closed_p(Data, Else),Data} end. -do_passwd_modify_0(Data, Dn, NewPasswd, OldPasswd) -> +do_passwd_modify_0(Data, Dn, NewPasswd, OldPasswd, Controls) -> Req = #'PasswdModifyRequestValue'{userIdentity = Dn, oldPasswd = OldPasswd, newPasswd = NewPasswd}, @@ -844,7 +890,7 @@ do_passwd_modify_0(Data, Dn, NewPasswd, OldPasswd) -> requestValue = Bytes}, Id = bump_id(Data), log2(Data, "extended request = ~p~n", [ExtReq]), - Reply = request(Data#eldap.fd, Data, Id, {extendedReq, ExtReq}), + Reply = request(Data#eldap.fd, Data, Id, {extendedReq, ExtReq, Controls}), log2(Data, "modify password reply = ~p~n", [Reply]), exec_passwd_modify_reply(Data#eldap{id = Id}, Reply). @@ -865,6 +911,8 @@ exec_passwd_modify_reply(Data, {ok,Msg}) when throw(Error) end end; + referral -> + {{ok, {referral,Result#'ExtendedResponse'.referral}}, Data}; Error -> {error, {response,Error}} end; @@ -877,15 +925,16 @@ exec_passwd_modify_reply(_, Error) -> %%% modifyDNRequest %%% -------------------------------------------------------------------- -do_modify_dn(Data, Entry, NewRDN, DelOldRDN, NewSup) -> - case catch do_modify_dn_0(Data, Entry, NewRDN, DelOldRDN, NewSup) of +do_modify_dn(Data, Entry, NewRDN, DelOldRDN, NewSup, Controls) -> + case catch do_modify_dn_0(Data, Entry, NewRDN, DelOldRDN, NewSup, Controls) of {error,Emsg} -> {ldap_closed_p(Data, Emsg),Data}; {'EXIT',Error} -> {ldap_closed_p(Data, Error),Data}; {ok,NewData} -> {ok,NewData}; + {{ok,Val},NewData} -> {{ok,Val},NewData}; Else -> {ldap_closed_p(Data, Else),Data} end. -do_modify_dn_0(Data, Entry, NewRDN, DelOldRDN, NewSup) -> +do_modify_dn_0(Data, Entry, NewRDN, DelOldRDN, NewSup, Controls) -> Req = #'ModifyDNRequest'{entry = Entry, newrdn = NewRDN, deleteoldrdn = DelOldRDN, @@ -893,22 +942,51 @@ do_modify_dn_0(Data, Entry, NewRDN, DelOldRDN, NewSup) -> S = Data#eldap.fd, Id = bump_id(Data), log2(Data, "modify DN request = ~p~n", [Req]), - Resp = request(S, Data, Id, {modDNRequest, Req}), + Resp = request(S, Data, Id, {modDNRequest, Req, Controls}), log2(Data, "modify DN reply = ~p~n", [Resp]), check_reply(Data#eldap{id = Id}, Resp, modDNResponse). +%%%-------------------------------------------------------------------- +%%% unbindRequest +%%%-------------------------------------------------------------------- +do_unbind(Data) -> + Req = "", + log2(Data, "unbind request = ~p (has no reply)~n", [Req]), + send_request(Data#eldap.fd, Data, Data#eldap.id, {unbindRequest, Req}), + case Data#eldap.using_tls of + true -> ssl:close(Data#eldap.fd); + false -> gen_tcp:close(Data#eldap.fd) + end, + {no_reply, Data#eldap{binddn = (#eldap{})#eldap.binddn, + passwd = (#eldap{})#eldap.passwd, + fd = (#eldap{})#eldap.fd, + using_tls = false + }}. + + %%% -------------------------------------------------------------------- %%% Send an LDAP request and receive the answer %%% -------------------------------------------------------------------- - request(S, Data, ID, Request) -> send_request(S, Data, ID, Request), recv_response(S, Data). -send_request(S, Data, ID, Request) -> - Message = #'LDAPMessage'{messageID = ID, - protocolOp = Request}, - {ok,Bytes} = 'ELDAPv3':encode('LDAPMessage', Message), +send_request(S, Data, Id, {T,P}) -> + send_the_LDAPMessage(S, Data, #'LDAPMessage'{messageID = Id, + protocolOp = {T,P}}); +send_request(S, Data, Id, {T,P,asn1_NOVALUE}) -> + send_the_LDAPMessage(S, Data, #'LDAPMessage'{messageID = Id, + protocolOp = {T,P}}); +send_request(S, Data, Id, {T,P,Controls0}) -> + Controls = [#'Control'{controlType=F1, + criticality=F2, + controlValue=F3} || {control,F1,F2,F3} <- Controls0], + send_the_LDAPMessage(S, Data, #'LDAPMessage'{messageID = Id, + protocolOp = {T,P}, + controls = Controls}). + +send_the_LDAPMessage(S, Data, LDAPMessage) -> + {ok,Bytes} = 'ELDAPv3':encode('LDAPMessage', LDAPMessage), case do_send(S, Data, Bytes) of {error,Reason} -> throw({gen_tcp_error,Reason}); Else -> Else @@ -942,6 +1020,7 @@ check_reply(Data, {ok,Msg}, Op) when {Op, Result} -> case Result#'LDAPResult'.resultCode of success -> {ok,Data}; + referral -> {{ok, {referral,Result#'LDAPResult'.referral}}, Data}; Error -> {error, Error} end; Other -> {error, Other} diff --git a/lib/eldap/test/eldap_basic_SUITE.erl b/lib/eldap/test/eldap_basic_SUITE.erl index 638a609346..8414ca6e46 100644 --- a/lib/eldap/test/eldap_basic_SUITE.erl +++ b/lib/eldap/test/eldap_basic_SUITE.erl @@ -30,6 +30,11 @@ -define(TIMEOUT, 120000). % 2 min + +%% Control to delete a referral object: +-define(manageDsaIT, {control,"2.16.840.1.113730.3.4.2",false,asn1_NOVALUE}). + + all() -> [app, appup, @@ -59,6 +64,7 @@ groups() -> {api_bound, [], [add_when_bound, add_already_exists, more_add, + add_referral, search_filter_equalityMatch, search_filter_substring_any, search_filter_initial, @@ -67,8 +73,11 @@ groups() -> search_filter_or, search_filter_and_not, search_two_hits, + search_referral, modify, + modify_referral, delete, + delete_referral, modify_dn_delete_old, modify_dn_keep_old]}, {v4_connections, [], connection_tests()}, @@ -92,11 +101,16 @@ connection_tests() -> init_per_suite(Config) -> SSL_available = init_ssl_certs_et_al(Config), - LDAP_server = find_first_server(false, [{config,eldap_server}, {config,ldap_server}, {"localhost",9876}]), + LDAP_server = find_first_server(false, [{config,eldap_server}, + {config,ldap_server}, + {"localhost",9876}, + {"aramis.otp.ericsson.se",9876}]), LDAPS_server = case SSL_available of true -> - find_first_server(true, [{config,ldaps_server}, {"localhost",9877}]); + find_first_server(true, [{config,ldaps_server}, + {"localhost",9877}, + {"aramis.otp.ericsson.se",9877}]); false -> undefined end, @@ -454,6 +468,16 @@ more_add(Config) -> [{"objectclass", ["organizationalUnit"]}, {"ou", ["Team"]}]). +%%%---------------------------------------------------------------- +add_referral(Config) -> + H = ?config(handle, Config), + BasePath = ?config(eldap_path, Config), + {ok,{referral,["ldap://nowhere.example.com"++_]}} = + eldap:add(H, "cn=Foo Bar,dc=notHere," ++ BasePath, + [{"objectclass", ["person"]}, + {"cn", ["Foo Bar"]}, + {"sn", ["Bar"]}, + {"telephoneNumber", ["555-1232", "555-5432"]}]). %%%---------------------------------------------------------------- search_filter_equalityMatch(Config) -> @@ -569,6 +593,16 @@ search_two_hits(Config) -> [ok=eldap:delete(H,DN) || DN <- ExpectedDNs]. %%%---------------------------------------------------------------- +search_referral(Config) -> + H = ?config(handle, Config), + BasePath = ?config(eldap_path, Config), + DN = "cn=Santa Claus,dc=notHere," ++ BasePath, + {ok,{referral,["ldap://nowhere.example.com"++_]}} = + eldap:search(H, #eldap_search{base = DN, + filter = eldap:present("description"), + scope=eldap:singleLevel()}). + +%%%---------------------------------------------------------------- modify(Config) -> H = ?config(handle, Config), BasePath = ?config(eldap_path, Config), @@ -602,6 +636,19 @@ modify(Config) -> restore_original_object(H, DN, OriginalAttrs). %%%---------------------------------------------------------------- +modify_referral(Config) -> + H = ?config(handle, Config), + BasePath = ?config(eldap_path, Config), + %% The object to modify + DN = "cn=Foo Bar,dc=notHere," ++ BasePath, + + %% Do a change + Mod = [eldap:mod_replace("telephoneNumber", ["555-12345"]), + eldap:mod_add("description", ["Nice guy"])], + {ok,{referral,["ldap://nowhere.example.com"++_]}} = + eldap:modify(H, DN, Mod). + +%%%---------------------------------------------------------------- delete(Config) -> H = ?config(handle, Config), BasePath = ?config(eldap_path, Config), @@ -620,6 +667,14 @@ delete(Config) -> restore_original_object(H, DN, OriginalAttrs). %%%---------------------------------------------------------------- +delete_referral(Config) -> + H = ?config(handle, Config), + BasePath = ?config(eldap_path, Config), + %% The element to play with: + DN = "cn=Jonas Jonsson,dc=notHere," ++ BasePath, + {ok,{referral,["ldap://nowhere.example.com"++_]}} = eldap:delete(H, DN). + +%%%---------------------------------------------------------------- modify_dn_delete_old(Config) -> H = ?config(handle, Config), BasePath = ?config(eldap_path, Config), @@ -817,25 +872,44 @@ delete_old_contents(H, Path) -> {filter, eldap:present("objectclass")}, {scope, eldap:wholeSubtree()}]) of - {ok, #eldap_search_result{entries=Entries}} -> + {ok, _R=#eldap_search_result{entries=Entries}} -> + case eldap:delete(H, "dc=notHere,"++Path, [?manageDsaIT]) of + ok -> ok; + {error,noSuchObject} -> ok; + Other -> ct:fail("eldap:delete notHere ret ~p",[Other]) + end, [ok = eldap:delete(H,DN) || #eldap_entry{object_name=DN} <- Entries]; _Res -> ignore end. + +-define(ok(X), ok(?MODULE,?LINE,X)). + add_new_contents(H, Path, MyHost) -> - ok(eldap:add(H,"dc=ericsson,dc=se", + ?ok(eldap:add(H,"dc=ericsson,dc=se", [{"objectclass", ["dcObject", "organization"]}, {"dc", ["ericsson"]}, {"o", ["Testing"]}])), - ok(eldap:add(H,Path, + ?ok(eldap:add(H,Path, [{"objectclass", ["dcObject", "organization"]}, {"dc", [MyHost]}, - {"o", ["Test machine"]}])). - - -ok({error,entryAlreadyExists}) -> ok; -ok(X) -> ok=X. + {"o", ["Test machine"]}])), + ?ok(eldap:add(H, "dc=notHere,"++Path, + [{"objectclass", ["referral", + "dcObject" + ]}, + {"ref", ["ldap://nowhere.example.com/notHere,"++Path]}, + {"dc", ["notHere"]} + ])). + + + +ok(_, _, {error,entryAlreadyExists}) -> ok; +ok(_, _, ok) -> ok; +ok(MODULE, LINE, X) -> + ct:pal("~p:~p add_new_contents: ret from eldap:add = ~p",[MODULE,LINE,X]), + X. diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk index 105a2bcdbb..99c474d588 100644 --- a/lib/eldap/vsn.mk +++ b/lib/eldap/vsn.mk @@ -1 +1 @@ -ELDAP_VSN = 1.2 +ELDAP_VSN = 1.2.1 diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in index 3ac9212085..7a3b5ce378 100644 --- a/lib/erl_interface/configure.in +++ b/lib/erl_interface/configure.in @@ -251,7 +251,7 @@ case "$threads_disabled" in ;; win32_threads) EI_THREADS="true" - THR_DEFS="$THR_DEFS -D_WIN32_WINNT=0x0500 -DWINVER=0x0500" + THR_DEFS="$THR_DEFS -D_WIN32_WINNT=0x0600 -DWINVER=0x0600" ;; pthread) EI_THREADS="true" diff --git a/lib/erl_interface/doc/src/ei.xml b/lib/erl_interface/doc/src/ei.xml index 6044ac8ef7..8ef433d10f 100644 --- a/lib/erl_interface/doc/src/ei.xml +++ b/lib/erl_interface/doc/src/ei.xml @@ -264,9 +264,9 @@ typedef enum { <fsummary>Encode an atom</fsummary> <desc> <p>Encodes an atom in the binary format with character encoding - <c><seealso marker="#erlang_char_encoding">to_enc</seealso></c> (latin1 or utf8). + <seealso marker="#erlang_char_encoding"><c>to_enc</c></seealso> (latin1 or utf8). The <c>p</c> parameter is the name of the atom with character encoding - <c><seealso marker="#erlang_char_encoding">from_enc</seealso></c> (ascii, latin1 or utf8). + <seealso marker="#erlang_char_encoding"><c>from_enc</c></seealso> (ascii, latin1 or utf8). The name must either be zero-terminated or a function variant with a <c>len</c> parameter must be used. If <c>to_enc</c> is set to the bitwise-or'd combination <c>(ERLANG_LATIN1|ERLANG_UTF8)</c>, utf8 encoding is only used if the atom string @@ -569,8 +569,8 @@ ei_x_encode_string(&x, "Banana"); <p>This function decodes an atom from the binary format. The null terminated name of the atom is placed in buffer at <c>p</c> of length <c>plen</c> bytes.</p> - <p>The wanted string encoding is specified by <c><seealso marker="#erlang_char_encoding"> - want</seealso></c>. The original encoding used in the + <p>The wanted string encoding is specified by <seealso marker="#erlang_char_encoding"> + <c>want</c></seealso>. The original encoding used in the binary format (latin1 or utf8) can be obtained from <c>*was</c>. The actual encoding of the resulting string (7-bit ascii, latin1 or utf8) can be obtained from <c>*result</c>. Both <c>was</c> and <c>result</c> can be <c>NULL</c>. diff --git a/lib/erl_interface/doc/src/erl_call.xml b/lib/erl_interface/doc/src/erl_call.xml index aed1ba0ac9..e982bf89e1 100644 --- a/lib/erl_interface/doc/src/erl_call.xml +++ b/lib/erl_interface/doc/src/erl_call.xml @@ -178,7 +178,7 @@ erl_call -s -a 'erlang halt' -n madonna <code type="none"><![CDATA[ erl_call -s -a 'lists map [{math,sqrt},[1,4,9,16,25]]' -n madonna ]]></code> - <p>Evaluates a couple of expressions. <b>The input ends with EOF (Control-D)</b>.</p> + <p>Evaluates a couple of expressions. <em>The input ends with EOF (Control-D)</em>.</p> <code type="none"><![CDATA[ erl_call -s -e -n madonna statistics(runtime), @@ -189,7 +189,7 @@ Y=2, ^D {ok,{3,0}} ]]></code> - <p>Compiles a module and runs it. <b>Again, the input ends with EOF (Control-D)</b>. (In the example shown, the output has been formatted afterwards).</p> + <p>Compiles a module and runs it. <em>Again, the input ends with EOF (Control-D)</em>. (In the example shown, the output has been formatted afterwards).</p> <code type="none"><![CDATA[ erl_call -s -m -a lolita -n madonna -module(lolita). diff --git a/lib/erl_interface/doc/src/erl_eterm.xml b/lib/erl_interface/doc/src/erl_eterm.xml index 9a53a137c2..713a90a390 100644 --- a/lib/erl_interface/doc/src/erl_eterm.xml +++ b/lib/erl_interface/doc/src/erl_eterm.xml @@ -78,10 +78,12 @@ </p> <taglist> <tag><c><![CDATA[char *ERL_ATOM_PTR(t)]]></c></tag> + <item/> <tag><c><![CDATA[char *ERL_ATOM_PTR_UTF8(t)]]></c></tag> <item>A string representing atom <c><![CDATA[t]]></c>. </item> <tag><c><![CDATA[int ERL_ATOM_SIZE(t)]]></c></tag> + <item/> <tag><c><![CDATA[int ERL_ATOM_SIZE_UTF8(t)]]></c></tag> <item>The length (in bytes) of atom t.</item> <tag><c><![CDATA[void *ERL_BIN_PTR(t)]]></c></tag> @@ -95,6 +97,7 @@ <tag><c><![CDATA[double ERL_FLOAT_VALUE(t)]]></c></tag> <item>The floating point value of <c><![CDATA[t]]></c>.</item> <tag><c><![CDATA[ETERM *ERL_PID_NODE(t)]]></c></tag> + <item/> <tag><c><![CDATA[ETERM *ERL_PID_NODE_UTF8(t)]]></c></tag> <item>The Node in pid <c><![CDATA[t]]></c>.</item> <tag><c><![CDATA[int ERL_PID_NUMBER(t)]]></c></tag> @@ -108,6 +111,7 @@ <tag><c><![CDATA[int ERL_PORT_CREATION(t)]]></c></tag> <item>The creation number in port <c><![CDATA[t]]></c>.</item> <tag><c><![CDATA[ETERM *ERL_PORT_NODE(t)]]></c></tag> + <item/> <tag><c><![CDATA[ETERM *ERL_PORT_NODE_UTF8(t)]]></c></tag> <item>The node in port <c><![CDATA[t]]></c>.</item> <tag><c><![CDATA[int ERL_REF_NUMBER(t)]]></c></tag> diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c index 6381b02393..414cb8be3e 100644 --- a/lib/erl_interface/src/connect/ei_resolve.c +++ b/lib/erl_interface/src/connect/ei_resolve.c @@ -601,16 +601,6 @@ struct hostent *ei_gethostbyaddr(const char *addr, int len, int type) return gethostbyaddr(addr, len, type); } -/* - * Imprecise way to select the actually available gethostbyname_r and - * gethostbyaddr_r. - * - * TODO: check this properly in configure.in - */ -#if (defined(__linux__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__)) - #define HAVE_GETHOSTBYADDR_R_8 1 -#endif - struct hostent *ei_gethostbyaddr_r(const char *addr, int length, int type, @@ -626,7 +616,7 @@ struct hostent *ei_gethostbyaddr_r(const char *addr, #ifndef HAVE_GETHOSTBYNAME_R return my_gethostbyaddr_r(addr,length,type,hostp,buffer,buflen,h_errnop); #else -#ifdef HAVE_GETHOSTBYADDR_R_8 +#if (defined(__GLIBC__) || defined(__linux__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__)) struct hostent *result; gethostbyaddr_r(addr, length, type, hostp, buffer, buflen, &result, @@ -653,7 +643,7 @@ struct hostent *ei_gethostbyname_r(const char *name, #ifndef HAVE_GETHOSTBYNAME_R return my_gethostbyname_r(name,hostp,buffer,buflen,h_errnop); #else -#ifdef HAVE_GETHOSTBYADDR_R_8 +#if (defined(__GLIBC__) || defined(__linux__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__)) struct hostent *result; gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop); diff --git a/lib/eunit/src/eunit_data.erl b/lib/eunit/src/eunit_data.erl index 8b53a3681d..cc002cb449 100644 --- a/lib/eunit/src/eunit_data.erl +++ b/lib/eunit/src/eunit_data.erl @@ -761,6 +761,7 @@ lazy_test_() -> lazy_gen(7), ?_assertMatch(7, get(count))]}. +-dialyzer({no_improper_lists, lazy_gen/1}). lazy_gen(N) -> {generator, fun () -> diff --git a/lib/eunit/src/eunit_lib.erl b/lib/eunit/src/eunit_lib.erl index d8f98cffa5..4dbe023257 100644 --- a/lib/eunit/src/eunit_lib.erl +++ b/lib/eunit/src/eunit_lib.erl @@ -192,6 +192,7 @@ error_msg(Title, Fmt, Args) -> io_lib:fwrite("*** ~ts ***\n~ts\n\n", [Title, Msg]). -ifdef(TEST). +-dialyzer({no_match, format_exception_test_/0}). format_exception_test_() -> [?_assertMatch( "\nymmud:rorre"++_, @@ -273,6 +274,7 @@ dlist_next([], Xs) -> -ifdef(TEST). +-dialyzer({no_match, dlist_test_/0}). dlist_test_() -> {"deep list traversal", [{"non-list term -> singleton list", @@ -338,6 +340,7 @@ is_nonempty_string([]) -> false; is_nonempty_string(Cs) -> is_string(Cs). -ifdef(TEST). +-dialyzer({no_match, is_string_test_/0}). is_string_test_() -> {"is_string", [{"no non-lists", ?_assert(not is_string($A))}, @@ -399,6 +402,7 @@ uniq([X | Xs]) -> [X | uniq(Xs)]; uniq([]) -> []. -ifdef(TEST). +-dialyzer({[no_match, no_fail_call, no_improper_lists], uniq_test_/0}). uniq_test_() -> {"uniq", [?_assertError(function_clause, uniq(ok)), @@ -459,6 +463,7 @@ normalize([]) -> -ifdef(TEST). +-dialyzer({no_match, cmd_test_/0}). cmd_test_() -> ([?_test({0, "hello\n"} = ?_cmd_("echo hello"))] ++ case os:type() of @@ -576,6 +581,7 @@ trie_match([], _T) -> -ifdef(TEST). +-dialyzer({no_match, trie_test_/0}). trie_test_() -> [{"basic representation", [?_assert(trie_new() =:= gb_trees:empty()), diff --git a/lib/eunit/src/eunit_listener.erl b/lib/eunit/src/eunit_listener.erl index ecaac424a2..c34eacb1d6 100644 --- a/lib/eunit/src/eunit_listener.erl +++ b/lib/eunit/src/eunit_listener.erl @@ -27,14 +27,11 @@ -export([start/1, start/2]). --export([behaviour_info/1]). - - -behaviour_info(callbacks) -> - [{init,1},{handle_begin,3},{handle_end,3},{handle_cancel,3}, - {terminate,2}]; -behaviour_info(_Other) -> - undefined. +-callback init(_) -> _. +-callback handle_begin(_, _, _) -> _. +-callback handle_end(_, _, _) -> _. +-callback handle_cancel(_, _, _) -> _. +-callback terminate(_, _) -> _. -record(state, {callback, % callback module @@ -50,18 +47,22 @@ start(Callback) -> start(Callback, Options) -> St = #state{callback = Callback}, - spawn_opt(fun () -> init(St, Options) end, + spawn_opt(init_fun(St, Options), proplists:get_all_values(spawn, Options)). -init(St0, Options) -> - St1 = call(init, [Options], St0), - St2 = expect([], undefined, St1), - Data = [{pass, St2#state.pass}, - {fail, St2#state.fail}, - {skip, St2#state.skip}, - {cancel, St2#state.cancel}], - call(terminate, [{ok, Data}, St2#state.state], St2), - exit(normal). +-spec init_fun(_, _) -> fun(() -> no_return()). + +init_fun(St0, Options) -> + fun () -> + St1 = call(init, [Options], St0), + St2 = expect([], undefined, St1), + Data = [{pass, St2#state.pass}, + {fail, St2#state.fail}, + {skip, St2#state.skip}, + {cancel, St2#state.cancel}], + call(terminate, [{ok, Data}, St2#state.state], St2), + exit(normal) + end. expect(Id, ParentId, St) -> case wait_for(Id, 'begin', ParentId) of diff --git a/lib/eunit/src/eunit_proc.erl b/lib/eunit/src/eunit_proc.erl index 98ae31d54b..8bdf94c877 100644 --- a/lib/eunit/src/eunit_proc.erl +++ b/lib/eunit/src/eunit_proc.erl @@ -268,6 +268,8 @@ insulator_wait(Child, Parent, Buf, St) -> kill_task(Child, St) end. +-spec kill_task(_, _) -> no_return(). + kill_task(Child, St) -> exit(Child, kill), terminate_insulator(St). diff --git a/lib/eunit/src/eunit_serial.erl b/lib/eunit/src/eunit_serial.erl index 1a0179a5df..da76064a53 100644 --- a/lib/eunit/src/eunit_serial.erl +++ b/lib/eunit/src/eunit_serial.erl @@ -61,14 +61,16 @@ messages = dict:new() :: dict:dict()}). start(Pids) -> - spawn(fun () -> serializer(Pids) end). - -serializer(Pids) -> - St = #state{listeners = sets:from_list(Pids), - cancelled = eunit_lib:trie_new(), - messages = dict:new()}, - expect([], undefined, 0, St), - exit(normal). + spawn(serializer_fun(Pids)). + +serializer_fun(Pids) -> + fun () -> + St = #state{listeners = sets:from_list(Pids), + cancelled = eunit_lib:trie_new(), + messages = dict:new()}, + expect([], undefined, 0, St), + exit(normal) + end. %% collect beginning and end of an expected item; return {Done, NewSt} %% where Done is true if there are no more items of this group diff --git a/lib/eunit/src/eunit_test.erl b/lib/eunit/src/eunit_test.erl index 9cf40a738d..62d30b1930 100644 --- a/lib/eunit/src/eunit_test.erl +++ b/lib/eunit/src/eunit_test.erl @@ -40,6 +40,7 @@ get_stacktrace() -> get_stacktrace(Ts) -> eunit_lib:uniq(prune_trace(erlang:get_stacktrace(), Ts)). +-dialyzer({no_match, prune_trace/2}). prune_trace([{eunit_data, _, _} | Rest], Tail) -> prune_trace(Rest, Tail); prune_trace([{eunit_data, _, _, _} | Rest], Tail) -> @@ -75,6 +76,7 @@ run_testfun(F) -> -ifdef(TEST). +-dialyzer({[no_match, no_fail_call, no_return], macro_test_/0}). macro_test_() -> {"macro definitions", [{?LINE, fun () -> @@ -301,6 +303,7 @@ wrapper_test_() -> ]}. %% this must be exported (done automatically by the autoexport transform) +-dialyzer({no_missing_calls, wrapper_test_exported_/0}). wrapper_test_exported_() -> {ok, ?MODULE:nonexisting_function()}. -endif. diff --git a/lib/eunit/src/eunit_tests.erl b/lib/eunit/src/eunit_tests.erl index 47ea0aaf46..5dee1cb49e 100644 --- a/lib/eunit/src/eunit_tests.erl +++ b/lib/eunit/src/eunit_tests.erl @@ -23,6 +23,8 @@ -include("eunit.hrl"). +-dialyzer(no_match). + -ifdef(TEST). id(X) -> X. % for suppressing compiler warnings -endif. diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl index c2fb79c089..9f23b6a9b3 100644 --- a/lib/hipe/cerl/erl_bif_types.erl +++ b/lib/hipe/cerl/erl_bif_types.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2015. All Rights Reserved. +%% Copyright Ericsson AB 2003-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -2200,7 +2200,7 @@ type_ranks(Type, I, Min, Max, [TypeClass|Rest], Opaques) -> type_order() -> [t_number(), t_atom(), t_reference(), t_fun(), t_port(), t_pid(), t_tuple(), - t_list(), t_binary()]. + t_map(), t_list(), t_bitstr()]. key_comparisons_fail(X0, KeyPos, TupleList, Opaques) -> X = case t_is_number(t_inf(X0, t_number(), Opaques), Opaques) of @@ -2300,7 +2300,7 @@ arg_types(erlang, bit_size, 1) -> [t_bitstr()]; %% Guard bif, needs to be here. arg_types(erlang, byte_size, 1) -> - [t_binary()]; + [t_bitstr()]; arg_types(erlang, disconnect_node, 1) -> [t_node()]; arg_types(erlang, halt, 0) -> diff --git a/lib/hipe/icode/hipe_icode_primops.erl b/lib/hipe/icode/hipe_icode_primops.erl index 84aae30291..a0deb31c42 100644 --- a/lib/hipe/icode/hipe_icode_primops.erl +++ b/lib/hipe/icode/hipe_icode_primops.erl @@ -504,16 +504,16 @@ type(Primop, Args) -> NewBinType = match_bin(erl_types:t_bitstr(0, Size), BinType), NewMatchState = erl_types:t_matchstate_update_present(NewBinType, MatchState), - if Signed =:= 0 -> - UpperBound = inf_add(safe_bsl(1, Size), -1), - erl_types:t_product([erl_types:t_from_range(0, UpperBound), - NewMatchState]); - Signed =:= 4 -> - erl_types:t_product([erl_types:t_from_range( - inf_inv(safe_bsl(1, Size-1)), - inf_add(safe_bsl(1, Size-1), -1)), - NewMatchState]) - end; + Range = + case Signed of + 0 -> + UpperBound = inf_add(safe_bsl_1(Size), -1), + erl_types:t_from_range(0, UpperBound); + 4 -> + Bound = safe_bsl_1(Size - 1), + erl_types:t_from_range(inf_inv(Bound), inf_add(Bound, -1)) + end, + erl_types:t_product([Range, NewMatchState]); [_Arg] -> NewBinType = match_bin(erl_types:t_bitstr(Size, 0), BinType), NewMatchState = @@ -969,18 +969,19 @@ check_fun_args(_, _) -> match_bin(Pattern, Match) -> erl_types:t_bitstr_match(Pattern, Match). -safe_bsl(0, _) -> 0; -safe_bsl(Base, Shift) when Shift =< 128 -> Base bsl Shift; -safe_bsl(Base, _Shift) when Base > 0 -> pos_inf; -safe_bsl(Base, _Shift) when Base < 0 -> neg_inf. +-spec safe_bsl_1(non_neg_integer()) -> non_neg_integer() | 'pos_inf'. + +safe_bsl_1(Shift) when Shift =< 128 -> 1 bsl Shift; +safe_bsl_1(_Shift) -> pos_inf. + +%% +%% The following two functions are stripped-down versions of more +%% general functions that exist in hipe_icode_range.erl +%% inf_inv(pos_inf) -> neg_inf; -inf_inv(neg_inf) -> pos_inf; -inf_inv(Number) -> -Number. +inf_inv(Number) when is_integer(Number) -> -Number. inf_add(pos_inf, _Number) -> pos_inf; -inf_add(neg_inf, _Number) -> neg_inf; -inf_add(_Number, pos_inf) -> pos_inf; -inf_add(_Number, neg_inf) -> neg_inf; inf_add(Number1, Number2) when is_integer(Number1), is_integer(Number2) -> Number1 + Number2. diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl index 134576059d..8fae9ac46e 100644 --- a/lib/inets/src/http_server/httpd_request_handler.erl +++ b/lib/inets/src/http_server/httpd_request_handler.erl @@ -102,8 +102,8 @@ init([Manager, ConfigDB, AcceptTimeout]) -> KeepAliveTimeOut = 1000 * httpd_util:lookup(ConfigDB, keep_alive_timeout, 150), case http_transport:negotiate(SocketType, Socket, ?HANDSHAKE_TIMEOUT) of - {error, _Error} -> - exit(shutdown); %% Can be 'normal'. + {error, Error} -> + exit({shutdown, Error}); %% Can be 'normal'. ok -> continue_init(Manager, ConfigDB, SocketType, Socket, KeepAliveTimeOut) end. @@ -294,7 +294,10 @@ handle_info(Info, #state{mod = ModData} = State) -> %% cleaning up. When it returns, the gen_server terminates with Reason. %% The return value is ignored. %%-------------------------------------------------------------------- -terminate(normal, State) -> +terminate(Reason, State) when Reason == normal; + Reason == shutdown -> + do_terminate(State); +terminate({shutdown,_}, State) -> do_terminate(State); terminate(Reason, #state{response_sent = false, mod = ModData} = State) -> httpd_response:send_status(ModData, 500, none), diff --git a/lib/inets/src/tftp/tftp_engine.erl b/lib/inets/src/tftp/tftp_engine.erl index 8d282a1e9d..493a29a68f 100644 --- a/lib/inets/src/tftp/tftp_engine.erl +++ b/lib/inets/src/tftp/tftp_engine.erl @@ -656,22 +656,11 @@ common_read(Config, Callback, Req, _LocalAccess, ExpectedBlockNo, ActualBlockNo, do_common_read(Config, Callback, Req, LocalAccess, BlockNo, Data, Prepared) when is_binary(Data), is_record(Prepared, prepared) -> - NextBlockNo = BlockNo + 1, - case NextBlockNo =< 65535 of - true -> - Reply = #tftp_msg_data{block_no = NextBlockNo, data = Data}, - {Config2, Callback2, TransferRes} = - transfer(Config, Callback, Req, Reply, LocalAccess, NextBlockNo, Prepared), - ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, NextBlockNo); - false -> - Code = badblk, - Text = "Too big transfer ID = " ++ - integer_to_list(NextBlockNo) ++ " > 65535", - {undefined, Error} = - callback({abort, {Code, Text}}, Config, Callback, Req), - send_msg(Config, Req, Error), - terminate(Config, Req, ?ERROR(read, Code, Text, Req#tftp_msg_req.filename)) - end. + NextBlockNo = (BlockNo + 1) rem 65536, + Reply = #tftp_msg_data{block_no = NextBlockNo, data = Data}, + {Config2, Callback2, TransferRes} = + transfer(Config, Callback, Req, Reply, LocalAccess, NextBlockNo, Prepared), + ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, NextBlockNo). -spec common_write(#config{}, #callback{}, _, 'write', integer(), integer(), _, #prepared{}) -> no_return(). @@ -715,21 +704,10 @@ common_write(Config, Callback, Req, _, ExpectedBlockNo, ActualBlockNo, Data, Pre common_ack(Config, Callback, Req, LocalAccess, BlockNo, Prepared) when is_record(Prepared, prepared) -> Reply = #tftp_msg_ack{block_no = BlockNo}, - NextBlockNo = BlockNo + 1, + NextBlockNo = (BlockNo + 1) rem 65536, {Config2, Callback2, TransferRes} = transfer(Config, Callback, Req, Reply, LocalAccess, NextBlockNo, Prepared), - case NextBlockNo =< 65535 of - true -> - ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, NextBlockNo); - false -> - Code = badblk, - Text = "Too big transfer ID = " ++ - integer_to_list(NextBlockNo) ++ " > 65535", - {undefined, Error} = - callback({abort, {Code, Text}}, Config, Callback2, Req), - send_msg(Config, Req, Error), - terminate(Config, Req, ?ERROR(read, Code, Text, Req#tftp_msg_req.filename)) - end. + ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, NextBlockNo). pre_terminate(Config, Req, Result) -> if diff --git a/lib/inets/test/tftp_SUITE.erl b/lib/inets/test/tftp_SUITE.erl index d29d210d7d..497a50e654 100644 --- a/lib/inets/test/tftp_SUITE.erl +++ b/lib/inets/test/tftp_SUITE.erl @@ -76,7 +76,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> [simple, extra, reuse_connection, resend_client, - resend_server]. + resend_server, large_file]. groups() -> []. @@ -902,6 +902,41 @@ reuse_connection(Config) when is_list(Config) -> ok. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% Large file: transfer > 65535 blocks +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +large_file(doc) -> + ["Start the daemon and test transfer of files greater than 32M."]; +large_file(suite) -> + []; +large_file(Config) when is_list(Config) -> + ?VERIFY(ok, application:start(inets)), + + {Port, DaemonPid} = ?IGNORE(?START_DAEMON(0, [{debug, brief}])), + + %% Read fail + RemoteFilename = "tftp_temporary_large_file_remote_test_file.txt", + LocalFilename = "tftp_temporary_large_file_local_test_file.txt", + + {ok, FH} = file:open(LocalFilename, [write,exclusive]), + {ok, Size} = file:position(FH, {eof, 2*512*65535}), + ok = file:truncate(FH), + ?IGNORE(file:close(FH)), + + %% Write and read + ?VERIFY({ok, Size}, tftp:write_file(RemoteFilename, LocalFilename, [{port, Port}])), + ?IGNORE(file:delete(LocalFilename)), + ?VERIFY({ok, Size}, tftp:read_file(RemoteFilename, LocalFilename, [{port, Port}])), + + %% Cleanup + unlink(DaemonPid), + exit(DaemonPid, kill), + ?VERIFY(ok, file:delete(LocalFilename)), + ?VERIFY(ok, file:delete(RemoteFilename)), + ?VERIFY(ok, application:stop(inets)), + ok. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Goodies %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/lib/kernel/doc/src/app.xml b/lib/kernel/doc/src/app.xml index d6d6167923..35feec144e 100644 --- a/lib/kernel/doc/src/app.xml +++ b/lib/kernel/doc/src/app.xml @@ -201,7 +201,7 @@ RTDeps [ApplicationVersion] [] how to compare application versions see <seealso marker="doc/system_principles:versions">the documentation of versions in the system principles - guide</seealso>. Note that that the application version + guide</seealso>. Note that the application version specifies a source code version. An additional indirect requirement is that installed binary application of the specified version has been built so that it is diff --git a/lib/kernel/doc/src/heart.xml b/lib/kernel/doc/src/heart.xml index b9fad17ce1..9da4773f2d 100644 --- a/lib/kernel/doc/src/heart.xml +++ b/lib/kernel/doc/src/heart.xml @@ -118,6 +118,13 @@ <p>In the following descriptions, all function fails with reason <c>badarg</c> if <c>heart</c> is not started.</p> </description> + + <datatypes> + <datatype> + <name name="heart_option"/> + </datatype> + </datatypes> + <funcs> <func> <name name="set_cmd" arity="1"/> @@ -154,6 +161,62 @@ the empty string will be returned.</p> </desc> </func> + + <func> + <name name="set_callback" arity="2"/> + <fsummary>Set a validation callback</fsummary> + <desc> + <p> This validation callback will be executed before any heartbeat sent + to the port program. For the validation to succeed it needs to return + with the value <c>ok</c>. + </p> + <p> An exception within the callback will be treated as a validation failure. </p> + <p> The callback will be removed if the system reboots. </p> + </desc> + </func> + <func> + <name name="clear_callback" arity="0"/> + <fsummary>Clear the validation callback</fsummary> + <desc> + <p>Removes the validation callback call before heartbeats.</p> + </desc> + </func> + <func> + <name name="get_callback" arity="0"/> + <fsummary>Get the validation callback</fsummary> + <desc> + <p>Get the validation callback. If the callback is cleared, <c>none</c> will be returned.</p> + </desc> + </func> + + <func> + <name name="set_options" arity="1"/> + <fsummary>Set a list of options</fsummary> + <desc> + <p> Valid options <c>set_options</c> are: </p> + <taglist> + <tag><c>check_schedulers</c></tag> + <item> + <p>If enabled, a signal will be sent to each scheduler to check its + responsiveness. The system check occurs before any heartbeat sent + to the port program. If any scheduler is not responsive enough the + heart program will not receive its heartbeat and thus eventually terminate the node. + </p> + </item> + </taglist> + <p> Returns with the value <c>ok</c> if the options are valid.</p> + </desc> + </func> + <func> + <name name="get_options" arity="0"/> + <fsummary>Get the temporary reboot command</fsummary> + <desc> + <p>Returns <c>{ok, Options}</c> where <c>Options</c> is a list of current options enabled for heart. + If the callback is cleared, <c>none</c> will be returned.</p> + </desc> + </func> + + </funcs> </erlref> 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 e32ad69adf..8c028ba910 100644 --- a/lib/kernel/examples/uds_dist/c_src/uds_drv.c +++ b/lib/kernel/examples/uds_dist/c_src/uds_drv.c @@ -957,28 +957,24 @@ static void put_packet_length(char *b, int len) /* ** Malloc wrappers -** Note! -** The function erl_exit is actually not a pert of the -** driver interface, but it is very nice to use if one wants to halt -** with a core and an erlang crash dump. */ static void *my_malloc(size_t size) { - void erl_exit(int, char *, ...); void *ptr; if ((ptr = driver_alloc(size)) == NULL) { - erl_exit(1,"Could not allocate %lu bytes of memory",(unsigned long) size); + fprintf(stderr, "Could not allocate %lu bytes of memory",(unsigned long) size); + abort(); } return ptr; } static void *my_realloc(void *ptr, size_t size) { - void erl_exit(int, char *, ...); void *nptr; if ((nptr = driver_realloc(ptr, size)) == NULL) { - erl_exit(1,"Could not reallocate %lu bytes of memory",(unsigned long) size); + fprintf(stderr, "Could not reallocate %lu bytes of memory",(unsigned long) size); + abort(); } return nptr; } diff --git a/lib/kernel/src/disk_log_1.erl b/lib/kernel/src/disk_log_1.erl index 9b9fd086f1..2e61363aa6 100644 --- a/lib/kernel/src/disk_log_1.erl +++ b/lib/kernel/src/disk_log_1.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2013. All Rights Reserved. +%% Copyright Ericsson AB 1997-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -79,6 +79,7 @@ log(FdC, FileName, X) -> logl(X) -> logl(X, [], 0). +-dialyzer({no_improper_lists, logl/3}). logl([X | T], Bs, Size) -> Sz = byte_size(X), BSz = <<Sz:?SIZESZ/unit:8>>, @@ -1142,6 +1143,7 @@ write_index_file(read_write, FName, NewFile, OldFile, OldCnt) -> file_error(FileName, E) end. +-dialyzer({no_improper_lists, to_8_bytes/4}). to_8_bytes(<<N:32,T/binary>>, NT, FileName, Fd) -> to_8_bytes(T, [NT | <<N:64>>], FileName, Fd); to_8_bytes(B, NT, _FileName, _Fd) when byte_size(B) =:= 0 -> @@ -1276,6 +1278,7 @@ ext_split_bins(CurB, MaxB, FirstPos, Bins) -> MaxBs = MaxB - CurB, IsFirst = CurB =:= FirstPos, ext_split_bins(MaxBs, IsFirst, [], Bins, 0, 0). +-dialyzer({no_improper_lists, ext_split_bins/6}). ext_split_bins(MaxBs, IsFirst, First, [X | Last], Bs, N) -> NBs = Bs + byte_size(X), if @@ -1296,6 +1299,7 @@ int_split_bins(CurB, MaxB, FirstPos, Bins) -> MaxBs = MaxB - CurB, IsFirst = CurB =:= FirstPos, int_split_bins(MaxBs, IsFirst, [], Bins, 0, 0). +-dialyzer({no_improper_lists, int_split_bins/6}). int_split_bins(MaxBs, IsFirst, First, [X | Last], Bs, N) -> Sz = byte_size(X), NBs = Bs + Sz + ?HEADERSZ, diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl index 55ce9a7e64..c6202dd796 100644 --- a/lib/kernel/src/erl_epmd.erl +++ b/lib/kernel/src/erl_epmd.erl @@ -32,7 +32,7 @@ %% External exports -export([start/0, start_link/0, stop/0, port_please/2, port_please/3, names/0, names/1, - register_node/2, open/0, open/1, open/2]). + register_node/2, register_node/3, open/0, open/1, open/2]). %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, @@ -102,7 +102,9 @@ names(EpmdAddr) -> register_node(Name, PortNo) -> - gen_server:call(erl_epmd, {register, Name, PortNo}, infinity). + register_node(Name, PortNo, inet). +register_node(Name, PortNo, Family) -> + gen_server:call(erl_epmd, {register, Name, PortNo, Family}, infinity). %%%---------------------------------------------------------------------- %%% Callback functions from gen_server @@ -120,10 +122,10 @@ init(_) -> -spec handle_call(calls(), term(), state()) -> {'reply', term(), state()} | {'stop', 'shutdown', 'ok', state()}. -handle_call({register, Name, PortNo}, _From, State) -> +handle_call({register, Name, PortNo, Family}, _From, State) -> case State#state.socket of P when P < 0 -> - case do_register_node(Name, PortNo) of + case do_register_node(Name, PortNo, Family) of {alive, Socket, Creation} -> S = State#state{socket = Socket, port_no = PortNo, @@ -206,8 +208,12 @@ open({A,B,C,D,E,F,G,H}=EpmdAddr, Timeout) when ?ip6(A,B,C,D,E,F,G,H) -> close(Socket) -> gen_tcp:close(Socket). -do_register_node(NodeName, TcpPort) -> - case open() of +do_register_node(NodeName, TcpPort, Family) -> + Localhost = case Family of + inet -> open({127,0,0,1}); + inet6 -> open({0,0,0,0,0,0,0,1}) + end, + case Localhost of {ok, Socket} -> Name = to_string(NodeName), Extra = "", diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl index d7dba4ac80..8cb2a725e8 100644 --- a/lib/kernel/src/gen_tcp.erl +++ b/lib/kernel/src/gen_tcp.erl @@ -114,7 +114,8 @@ option(). -type socket() :: port(). --export_type([option/0, option_name/0, connect_option/0, listen_option/0]). +-export_type([option/0, option_name/0, connect_option/0, listen_option/0, + socket/0]). %% %% Connect a socket diff --git a/lib/kernel/src/heart.erl b/lib/kernel/src/heart.erl index 464b6919f1..eea78aabdf 100644 --- a/lib/kernel/src/heart.erl +++ b/lib/kernel/src/heart.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2013. All Rights Reserved. +%% Copyright Ericsson AB 1996-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,7 +34,11 @@ %%% %%% It recognizes the flag '-heart' %%%-------------------------------------------------------------------- --export([start/0, init/2, set_cmd/1, clear_cmd/0, get_cmd/0, cycle/0]). +-export([start/0, init/2, + set_cmd/1, clear_cmd/0, get_cmd/0, + set_callback/2, clear_callback/0, get_callback/0, + set_options/1, get_options/0, + cycle/0]). -define(START_ACK, 1). -define(HEART_BEAT, 2). @@ -49,6 +53,16 @@ -define(CYCLE_TIMEOUT, 10000). -define(HEART_PORT_NAME, heart_port). +%% valid heart options +-define(SCHEDULER_CHECK_OPT, check_schedulers). + +-type heart_option() :: ?SCHEDULER_CHECK_OPT. + +-record(state,{port :: port(), + cmd :: [] | binary(), + options :: [heart_option()], + callback :: 'undefined' | {atom(), atom()}}). + %%--------------------------------------------------------------------- -spec start() -> 'ignore' | {'error', term()} | {'ok', pid()}. @@ -81,11 +95,11 @@ wait_for_init_ack(From) -> init(Starter, Parent) -> process_flag(trap_exit, true), process_flag(priority, max), - register(heart, self()), + register(?MODULE, self()), case catch start_portprogram() of {ok, Port} -> Starter ! {ok, self()}, - loop(Parent, Port, ""); + loop(Parent, #state{port=Port, cmd=[], options=[]}); no_heart -> Starter ! {no_heart, self()}; error -> @@ -96,33 +110,68 @@ init(Starter, Parent) -> Cmd :: string(). set_cmd(Cmd) -> - heart ! {self(), set_cmd, Cmd}, + ?MODULE ! {self(), set_cmd, Cmd}, wait(). -spec get_cmd() -> {ok, Cmd} when Cmd :: string(). get_cmd() -> - heart ! {self(), get_cmd}, + ?MODULE ! {self(), get_cmd}, wait(). -spec clear_cmd() -> ok. clear_cmd() -> - heart ! {self(), clear_cmd}, + ?MODULE ! {self(), clear_cmd}, + wait(). + +-spec set_callback(Module,Function) -> 'ok' | {'error', {'bad_callback', {Module, Function}}} when + Module :: atom(), + Function :: atom(). + +set_callback(Module, Function) -> + ?MODULE ! {self(), set_callback, {Module,Function}}, + wait(). + +-spec get_callback() -> {'ok', {Module, Function}} | 'none' when + Module :: atom(), + Function :: atom(). + +get_callback() -> + ?MODULE ! {self(), get_callback}, + wait(). + +-spec clear_callback() -> ok. + +clear_callback() -> + ?MODULE ! {self(), clear_callback}, + wait(). + +-spec set_options(Options) -> 'ok' | {'error', {'bad_options', Options}} when + Options :: [heart_option()]. + +set_options(Options) -> + ?MODULE ! {self(), set_options, Options}, wait(). +-spec get_options() -> {'ok', Options} | 'none' when + Options :: [atom()]. + +get_options() -> + ?MODULE ! {self(), get_options}, + wait(). %%% Should be used solely by the release handler!!!!!!! -spec cycle() -> 'ok' | {'error', term()}. cycle() -> - heart ! {self(), cycle}, + ?MODULE ! {self(), cycle}, wait(). wait() -> receive - {heart, Res} -> + {?MODULE, Res} -> Res end. @@ -182,8 +231,8 @@ wait_ack(Port) -> {error, Reason} end. -loop(Parent, Port, Cmd) -> - _ = send_heart_beat(Port), +loop(Parent, #state{port=Port}=S) -> + _ = send_heart_beat(S), receive {From, set_cmd, NewCmd0} -> Enc = file:native_name_encoding(), @@ -191,37 +240,72 @@ loop(Parent, Port, Cmd) -> NewCmd when is_binary(NewCmd), byte_size(NewCmd) < 2047 -> _ = send_heart_cmd(Port, NewCmd), _ = wait_ack(Port), - From ! {heart, ok}, - loop(Parent, Port, NewCmd); + From ! {?MODULE, ok}, + loop(Parent, S#state{cmd=NewCmd}); _ -> - From ! {heart, {error, {bad_cmd, NewCmd0}}}, - loop(Parent, Port, Cmd) + From ! {?MODULE, {error, {bad_cmd, NewCmd0}}}, + loop(Parent, S) end; {From, clear_cmd} -> - From ! {heart, ok}, - _ = send_heart_cmd(Port, ""), + From ! {?MODULE, ok}, + _ = send_heart_cmd(Port, []), _ = wait_ack(Port), - loop(Parent, Port, ""); + loop(Parent, S#state{cmd = []}); {From, get_cmd} -> - From ! {heart, get_heart_cmd(Port)}, - loop(Parent, Port, Cmd); + From ! {?MODULE, get_heart_cmd(Port)}, + loop(Parent, S); + {From, set_callback, Callback} -> + case Callback of + {M,F} when is_atom(M), is_atom(F) -> + From ! {?MODULE, ok}, + loop(Parent, S#state{callback=Callback}); + _ -> + From ! {?MODULE, {error, {bad_callback, Callback}}}, + loop(Parent, S) + end; + {From, get_callback} -> + Res = case S#state.callback of + undefined -> none; + Cb -> {ok, Cb} + end, + From ! {?MODULE, Res}, + loop(Parent, S); + {From, clear_callback} -> + From ! {?MODULE, ok}, + loop(Parent, S#state{callback=undefined}); + {From, set_options, Options} -> + case validate_options(Options) of + Validated when is_list(Validated) -> + From ! {?MODULE, ok}, + loop(Parent, S#state{options=Validated}); + _ -> + From ! {?MODULE, {error, {bad_options, Options}}}, + loop(Parent, S) + end; + {From, get_options} -> + Res = case S#state.options of + [] -> none; + Cb -> {ok, Cb} + end, + From ! {?MODULE, Res}, + loop(Parent, S); {From, cycle} -> %% Calls back to loop - do_cycle_port_program(From, Parent, Port, Cmd); + do_cycle_port_program(From, Parent, S); {'EXIT', Parent, shutdown} -> no_reboot_shutdown(Port); {'EXIT', Parent, Reason} -> exit(Port, Reason), exit(Reason); {'EXIT', Port, badsig} -> % we can ignore badsig-messages! - loop(Parent, Port, Cmd); + loop(Parent, S); {'EXIT', Port, _Reason} -> - exit({port_terminated, {heart, loop, [Parent, Port, Cmd]}}); + exit({port_terminated, {?MODULE, loop, [Parent, S]}}); _ -> - loop(Parent, Port, Cmd) + loop(Parent, S) after ?TIMEOUT -> - loop(Parent, Port, Cmd) + loop(Parent, S) end. -spec no_reboot_shutdown(port()) -> no_return(). @@ -233,38 +317,47 @@ no_reboot_shutdown(Port) -> exit(normal) end. -do_cycle_port_program(Caller, Parent, Port, Cmd) -> +validate_options(Opts) -> validate_options(Opts,[]). +validate_options([],Res) -> Res; +validate_options([?SCHEDULER_CHECK_OPT=Opt|Opts],Res) -> validate_options(Opts,[Opt|Res]); +validate_options(_,_) -> error. + +do_cycle_port_program(Caller, Parent, #state{port=Port} = S) -> unregister(?HEART_PORT_NAME), case catch start_portprogram() of {ok, NewPort} -> _ = send_shutdown(Port), receive {'EXIT', Port, _Reason} -> - _ = send_heart_cmd(NewPort, Cmd), - Caller ! {heart, ok}, - loop(Parent, NewPort, Cmd) + _ = send_heart_cmd(NewPort, S#state.cmd), + Caller ! {?MODULE, ok}, + loop(Parent, S#state{port=NewPort}) after ?CYCLE_TIMEOUT -> %% Huh! Two heart port programs running... %% well, the old one has to be sick not to respond %% so we'll settle for the new one... - _ = send_heart_cmd(NewPort, Cmd), - Caller ! {heart, {error, stop_error}}, - loop(Parent, NewPort, Cmd) + _ = send_heart_cmd(NewPort, S#state.cmd), + Caller ! {?MODULE, {error, stop_error}}, + loop(Parent, S#state{port=NewPort}) end; no_heart -> - Caller ! {heart, {error, no_heart}}, - loop(Parent, Port, Cmd); + Caller ! {?MODULE, {error, no_heart}}, + loop(Parent, S); error -> - Caller ! {heart, {error, start_error}}, - loop(Parent, Port, Cmd) + Caller ! {?MODULE, {error, start_error}}, + loop(Parent, S) end. %% "Beates" the heart once. -send_heart_beat(Port) -> Port ! {self(), {command, [?HEART_BEAT]}}. +send_heart_beat(#state{port=Port, callback=Cb, options=Opts}) -> + ok = check_system(Opts), + ok = check_callback(Cb), + Port ! {self(), {command, [?HEART_BEAT]}}. %% Set a new HEART_COMMAND. +-dialyzer({no_improper_lists, send_heart_cmd/2}). send_heart_cmd(Port, []) -> Port ! {self(), {command, [?CLEAR_CMD]}}; send_heart_cmd(Port, Cmd) -> @@ -277,6 +370,24 @@ get_heart_cmd(Port) -> {ok, Cmd} end. +check_system([]) -> ok; +check_system([?SCHEDULER_CHECK_OPT|Opts]) -> + ok = erts_internal:system_check(schedulers), + check_system(Opts). + +%% validate system by performing a check before the heartbeat +%% return 'ok' if everything is alright. +%% Terminate if with reason if something is a miss. +%% It is fine to timeout in the callback, in fact that is the intention +%% if something goes wront -> no heartbeat. + +check_callback(Callback) -> + case Callback of + undefined -> ok; + {M,F} -> + erlang:apply(M,F,[]) + end. + %% Sends shutdown command to the port. send_shutdown(Port) -> Port ! {self(), {command, [?SHUT_DOWN]}}. diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl index b573112445..c1ae99ea24 100644 --- a/lib/kernel/src/inet.erl +++ b/lib/kernel/src/inet.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2015. All Rights Reserved. +%% Copyright Ericsson AB 1997-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -289,7 +289,7 @@ getifaddrs(Socket) -> -spec getifaddrs() -> {ok, Iflist} | {error, posix()} when Iflist :: [{Ifname,[Ifopt]}], Ifname :: string(), - Ifopt :: {flag,[Flag]} | {addr,Addr} | {netmask,Netmask} + Ifopt :: {flags,[Flag]} | {addr,Addr} | {netmask,Netmask} | {broadaddr,Broadaddr} | {dstaddr,Dstaddr} | {hwaddr,Hwaddr}, Flag :: up | broadcast | loopback | pointtopoint diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index 860d3640d0..cc9e6f771a 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -18,9 +18,9 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"4\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.* + [{<<"4\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.* {<<"3\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17 %% Down to - max one major revision back - [{<<"4\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.* + [{<<"4\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.* {<<"3\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-17 }. diff --git a/lib/kernel/src/user_drv.erl b/lib/kernel/src/user_drv.erl index ca3c53ff93..b794d4f45e 100644 --- a/lib/kernel/src/user_drv.erl +++ b/lib/kernel/src/user_drv.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2013. All Rights Reserved. +%% Copyright Ericsson AB 1996-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -559,6 +559,7 @@ put_int16(N, Tail) -> %% is sent back to the process sending the request. This command was added in %% OTP 18 to make sure that data sent from io:format is actually printed %% to the console before the vm stops when calling erlang:halt(integer()). +-dialyzer({no_improper_lists, io_command/1}). io_command({put_chars_sync, unicode,Cs,Reply}) -> {{command,[?OP_PUTC_SYNC|unicode:characters_to_binary(Cs,utf8)]},Reply}; io_command({put_chars, unicode,Cs}) -> diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl index 83efbb4c35..39cd29cea0 100644 --- a/lib/kernel/test/heart_SUITE.erl +++ b/lib/kernel/test/heart_SUITE.erl @@ -27,6 +27,8 @@ node_start_immediately_after_crash/1, node_start_soon_after_crash/1, set_cmd/1, clear_cmd/1, get_cmd/1, + callback_api/1, + options_api/1, dont_drop/1, kill_pid/1]). -export([init_per_testcase/2, end_per_testcase/2]). @@ -66,6 +68,8 @@ all() -> [ node_start_immediately_after_crash, node_start_soon_after_crash, set_cmd, clear_cmd, get_cmd, + callback_api, + options_api, kill_pid ]. @@ -358,6 +362,69 @@ get_cmd(Config) when is_list(Config) -> stop_node(Node), ok. +callback_api(Config) when is_list(Config) -> + {ok, Node} = start_check(slave, heart_test), + none = rpc:call(Node, heart, get_callback, []), + M0 = self(), + F0 = ok, + {error, {bad_callback, {M0,F0}}} = rpc:call(Node, heart, set_callback, [M0,F0]), + none = rpc:call(Node, heart, get_callback, []), + M1 = lists:duplicate(28, $a), + F1 = lists:duplicate(28, $b), + {error, {bad_callback, {M1,F1}}} = rpc:call(Node, heart, set_callback, [M1,F1]), + none = rpc:call(Node, heart, get_callback, []), + + M2 = heart_check_module, + F2 = cb_ok, + F3 = cb_error, + Code0 = generate(M2, [], [ + atom_to_list(F2) ++ "() -> ok.", + atom_to_list(F3) ++ "() -> exit(\"callback_error (as intended)\")." + ]), + {module, M2} = rpc:call(Node, erlang, load_module, [M2, Code0]), + ok = rpc:call(Node, M2, F2, []), + ok = rpc:call(Node, heart, set_callback, [M2,F2]), + {ok, {M2,F2}} = rpc:call(Node, heart, get_callback, []), + ok = rpc:call(Node, heart, clear_callback, []), + none = rpc:call(Node, heart, get_callback, []), + ok = rpc:call(Node, heart, set_callback, [M2,F2]), + {ok, {M2,F2}} = rpc:call(Node, heart, get_callback, []), + ok = rpc:call(Node, heart, set_callback, [M2,F3]), + receive {nodedown, Node} -> ok + after 5000 -> test_server:fail(node_not_killed) + end, + stop_node(Node), + ok. + +options_api(Config) when is_list(Config) -> + {ok, Node} = start_check(slave, heart_test), + none = rpc:call(Node, heart, get_options, []), + M0 = self(), + F0 = ok, + {error, {bad_options, {M0,F0}}} = rpc:call(Node, heart, set_options, [{M0,F0}]), + none = rpc:call(Node, heart, get_options, []), + Ls = lists:duplicate(28, $b), + {error, {bad_options, Ls}} = rpc:call(Node, heart, set_options, [Ls]), + none = rpc:call(Node, heart, get_options, []), + + ok = rpc:call(Node, heart, set_options, [[check_schedulers]]), + {ok, [check_schedulers]} = rpc:call(Node, heart, get_options, []), + ok = rpc:call(Node, heart, set_options, [[]]), + none = rpc:call(Node, heart, get_options, []), + + ok = rpc:call(Node, heart, set_options, [[check_schedulers]]), + {ok, [check_schedulers]} = rpc:call(Node, heart, get_options, []), + {error, {bad_options, Ls}} = rpc:call(Node, heart, set_options, [Ls]), + {ok, [check_schedulers]} = rpc:call(Node, heart, get_options, []), + + receive after 3000 -> ok end, %% wait 3 secs + + ok = rpc:call(Node, heart, set_options, [[]]), + none = rpc:call(Node, heart, get_options, []), + stop_node(Node), + ok. + + dont_drop(suite) -> %%% Removed as it may crash epmd/distribution in colourful %%% ways. While we ARE finding out WHY, it would diff --git a/lib/mnesia/src/mnesia_bup.erl b/lib/mnesia/src/mnesia_bup.erl index 1f150ae38b..8b1143a352 100644 --- a/lib/mnesia/src/mnesia_bup.erl +++ b/lib/mnesia/src/mnesia_bup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% Copyright Ericsson AB 1996-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -112,7 +112,7 @@ iter(R, Header, Schema, Fun, Acc, BupItems) -> safe_apply(R, write, [_, Items]) when Items =:= [] -> R; safe_apply(R, What, Args) -> - Abort = fun(Re) -> abort_restore(R, What, Args, Re) end, + Abort = abort_restore_fun(R, What, Args), Mod = R#restore.bup_module, try apply(Mod, What, Args) of {ok, Opaque, Items} when What =:= read -> @@ -127,6 +127,10 @@ safe_apply(R, What, Args) -> Abort(Re) end. +-spec abort_restore_fun(_, _, _) -> fun((_) -> no_return()). +abort_restore_fun(R, What, Args) -> + fun(Re) -> abort_restore(R, What, Args, Re) end. + abort_restore(R = #restore{bup_module=Mod}, What, Args, Reason) -> dbg_out("Restore aborted. ~p:~p~p -> ~p~n", [Mod, What, Args, Reason]), diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl index 02c175760e..69ccc1d2c9 100644 --- a/lib/mnesia/src/mnesia_controller.erl +++ b/lib/mnesia/src/mnesia_controller.erl @@ -78,7 +78,7 @@ change_table_majority/1, del_active_replica/2, wait_for_tables/2, - get_network_copy/2, + get_network_copy/3, merge_schema/0, start_remote_sender/4, schedule_late_disc_load/2 @@ -329,14 +329,14 @@ release_schema_commit_lock() -> unlink(whereis(?SERVER_NAME)). %% Special for preparation of add table copy -get_network_copy(Tab, Cs) -> +get_network_copy(Tid, Tab, Cs) -> % We can't let the controller queue this one % because that may cause a deadlock between schema_operations % and initial tableloadings which both takes schema locks. % But we have to get copier_done msgs when the other side % goes down. call({add_other, self()}), - Reason = {dumper,add_table_copy}, + Reason = {dumper,{add_table_copy, Tid}}, Work = #net_load{table = Tab,reason = Reason,cstruct = Cs}, %% I'll need this cause it's linked trough the subscriber %% might be solved by using monitor in subscr instead. @@ -775,7 +775,7 @@ handle_call({net_load, Tab, Cs}, From, State) -> true -> Worker = #net_load{table = Tab, opt_reply_to = From, - reason = {dumper,add_table_copy}, + reason = {dumper,{add_table_copy, unknown}}, cstruct = Cs }, add_worker(Worker, State); @@ -1180,11 +1180,11 @@ handle_info(Done = #loader_done{worker_pid=WPid, table_name=Tab}, State0) -> Done#loader_done.needs_announce == true, Done#loader_done.needs_reply == true -> i_have_tab(Tab), - %% Should be {dumper,add_table_copy} only + %% Should be {dumper,{add_table_copy, _}} only reply(Done#loader_done.reply_to, Done#loader_done.reply); Done#loader_done.needs_reply == true -> - %% Should be {dumper,add_table_copy} only + %% Should be {dumper,{add_table_copy,_}} only reply(Done#loader_done.reply_to, Done#loader_done.reply); Done#loader_done.needs_announce == true, Tab == schema -> @@ -2148,6 +2148,10 @@ load_table_fun(#net_load{cstruct=Cs, table=Tab, reason=Reason, opt_reply_to=Repl reply_to = ReplyTo, reply = {loaded, ok} }, + AddTableCopy = case Reason of + {dumper,{add_table_copy,_}} -> true; + _ -> false + end, if ReadNode == node() -> %% Already loaded locally @@ -2157,7 +2161,7 @@ load_table_fun(#net_load{cstruct=Cs, table=Tab, reason=Reason, opt_reply_to=Repl Res = mnesia_loader:disc_load_table(Tab, load_local_content), Done#loader_done{reply = Res, needs_announce = true, needs_sync = true} end; - AccessMode == read_only, Reason /= {dumper,add_table_copy} -> + AccessMode == read_only, not AddTableCopy -> fun() -> disc_load_table(Tab, Reason, ReplyTo) end; true -> fun() -> diff --git a/lib/mnesia/src/mnesia_lib.erl b/lib/mnesia/src/mnesia_lib.erl index 77c7a7638d..0f1354f43e 100644 --- a/lib/mnesia/src/mnesia_lib.erl +++ b/lib/mnesia/src/mnesia_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2014. All Rights Reserved. +%% Copyright Ericsson AB 1996-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -403,6 +403,7 @@ other_val_1(Var) -> _ -> error end. +-spec pr_other(_) -> no_return(). pr_other(Var) -> Why = case is_running() of diff --git a/lib/mnesia/src/mnesia_loader.erl b/lib/mnesia/src/mnesia_loader.erl index da8549be50..41fcd76fcb 100644 --- a/lib/mnesia/src/mnesia_loader.erl +++ b/lib/mnesia/src/mnesia_loader.erl @@ -180,8 +180,7 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_only_copies - -define(MAX_RAM_TRANSFERS, (?MAX_RAM_FILE_SIZE div ?MAX_TRANSFER_SIZE) + 1). -define(MAX_NOPACKETS, 20). -net_load_table(Tab, Reason, Ns, Cs) - when Reason == {dumper,add_table_copy} -> +net_load_table(Tab, {dumper,{add_table_copy, _}}=Reason, Ns, Cs) -> try_net_load_table(Tab, Reason, Ns, Cs); net_load_table(Tab, Reason, Ns, _Cs) -> try_net_load_table(Tab, Reason, Ns, val({Tab, cstruct})). @@ -233,7 +232,8 @@ do_snmpify(Tab, Us, Storage) -> set({Tab, {index, snmp}}, Snmp). %% Start the recieiver -init_receiver(Node, Tab, Storage, Cs, Reas={dumper,add_table_copy}) -> +init_receiver(Node, Tab, Storage, Cs, Reas={dumper,{add_table_copy, Tid}}) -> + rpc:call(Node, mnesia_lib, set, [{?MODULE, active_trans}, Tid]), case start_remote_sender(Node, Tab, Storage) of {SenderPid, TabSize, DetsData} -> start_receiver(Tab,Storage,Cs,SenderPid,TabSize,DetsData,Reas); @@ -307,7 +307,7 @@ table_init_fun(SenderPid) -> 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, _} -> @@ -658,9 +658,10 @@ send_table(Pid, Tab, RemoteS) -> {Init, Chunk} = reader_funcs(UseDetsChunk, Tab, Storage, KeysPerTransfer), SendIt = fun() -> - {atomic, ok} = prepare_copy(Pid, Tab, Storage), + NeedLock = need_lock(Tab), + {atomic, ok} = prepare_copy(Pid, Tab, Storage, NeedLock), send_more(Pid, 1, Chunk, Init(), Tab), - finish_copy(Pid, Tab, Storage, RemoteS) + finish_copy(Pid, Tab, Storage, RemoteS, NeedLock) end, try SendIt() of @@ -678,10 +679,10 @@ send_table(Pid, Tab, RemoteS) -> end end. -prepare_copy(Pid, Tab, Storage) -> +prepare_copy(Pid, Tab, Storage, NeedLock) -> Trans = fun() -> - mnesia:lock_table(Tab, load), + NeedLock andalso mnesia:lock_table(Tab, load), mnesia_subscr:subscribe(Pid, {table, Tab}), update_where_to_write(Tab, node(Pid)), mnesia_lib:db_fixtable(Storage, Tab, true), @@ -689,6 +690,21 @@ prepare_copy(Pid, Tab, Storage) -> end, mnesia:transaction(Trans). + +need_lock(Tab) -> + case ?catch_val({?MODULE, active_trans}) of + #tid{} = Tid -> + %% move_table_copy grabs it's own table-lock + %% do not deadlock with it + mnesia_lib:unset({?MODULE, active_trans}), + case mnesia_locker:get_held_locks(Tab) of + [{write, Tid}|_] -> false; + _Locks -> true + end; + _ -> + true + end. + update_where_to_write(Tab, Node) -> case val({Tab, access_mode}) of read_only -> @@ -783,12 +799,12 @@ send_packet(N, Pid, Chunk, {Recs, Cont}) when N < ?MAX_NOPACKETS -> send_packet(_N, _Pid, _Chunk, DataState) -> DataState. -finish_copy(Pid, Tab, Storage, RemoteS) -> +finish_copy(Pid, Tab, Storage, RemoteS, NeedLock) -> RecNode = node(Pid), DatBin = dat2bin(Tab, Storage, RemoteS), Trans = fun() -> - mnesia:read_lock_table(Tab), + NeedLock andalso mnesia:read_lock_table(Tab), A = val({Tab, access_mode}), mnesia_controller:sync_and_block_table_whereabouts(Tab, RecNode, RemoteS, A), cleanup_tab_copier(Pid, Storage, Tab), diff --git a/lib/mnesia/src/mnesia_locker.erl b/lib/mnesia/src/mnesia_locker.erl index 89feeba2c3..5766f22e92 100644 --- a/lib/mnesia/src/mnesia_locker.erl +++ b/lib/mnesia/src/mnesia_locker.erl @@ -22,7 +22,7 @@ -module(mnesia_locker). -export([ - get_held_locks/0, + get_held_locks/0, get_held_locks/1, get_lock_queue/0, global_lock/5, ixrlock/5, @@ -236,6 +236,11 @@ loop(State) -> From ! {Ref, ok}, loop(State); + {From, {is_locked, Oid}} -> + Held = ?ets_lookup(mnesia_held_locks, Oid), + reply(From, Held), + loop(State); + {'EXIT', Pid, _} when Pid == State#state.supervisor -> do_stop(); @@ -1151,6 +1156,19 @@ get_held_locks() -> Locks = receive {mnesia_held_locks, Ls} -> Ls after 5000 -> [] end, rewrite_locks(Locks, []). +%% Mnesia internal usage only +get_held_locks(Tab) when is_atom(Tab) -> + Oid = {Tab, ?ALL}, + ?MODULE ! {self(), {is_locked, Oid}}, + receive + {?MODULE, _Node, Locks} -> + case Locks of + [] -> []; + [{Oid, _Prev, What}] -> What + end + end. + + rewrite_locks([{Oid, _, Ls}|Locks], Acc0) -> Acc = rewrite_locks(Ls, Oid, Acc0), rewrite_locks(Locks, Acc); diff --git a/lib/mnesia/src/mnesia_log.erl b/lib/mnesia/src/mnesia_log.erl index 8b19e13ff6..36135418c8 100644 --- a/lib/mnesia/src/mnesia_log.erl +++ b/lib/mnesia/src/mnesia_log.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2014. All Rights Reserved. +%% Copyright Ericsson AB 1996-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -734,7 +734,7 @@ backup_schema(B, Tabs) -> safe_apply(B, write, [_, Items]) when Items == [] -> B; safe_apply(B, What, Args) -> - Abort = fun(R) -> abort_write(B, What, Args, R) end, + Abort = abort_write_fun(B, What, Args), receive {'EXIT', Pid, R} -> Abort({'EXIT', Pid, R}) after 0 -> @@ -746,6 +746,10 @@ safe_apply(B, What, Args) -> end end. +-spec abort_write_fun(_, _, _) -> fun((_) -> no_return()). +abort_write_fun(B, What, Args) -> + fun(R) -> abort_write(B, What, Args, R) end. + abort_write(B, What, Args, Reason) -> Mod = B#backup_args.module, Opaque = B#backup_args.opaque, diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl index 8313c3bda5..081d746257 100644 --- a/lib/mnesia/src/mnesia_monitor.erl +++ b/lib/mnesia/src/mnesia_monitor.erl @@ -82,9 +82,9 @@ going_down = [], tm_started = false, early_connects = [], connecting, mq = [], remote_node_status = []}). --define(current_protocol_version, {8,1}). +-define(current_protocol_version, {8,2}). --define(previous_protocol_version, {8,0}). +-define(previous_protocol_version, {8,1}). start() -> gen_server:start_link({local, ?MODULE}, ?MODULE, @@ -193,7 +193,7 @@ protocol_version() -> %% A sorted list of acceptable protocols the %% preferred protocols are first in the list acceptable_protocol_versions() -> - [protocol_version(), ?previous_protocol_version, {7,6}]. + [protocol_version(), ?previous_protocol_version]. needs_protocol_conversion(Node) -> case {?catch_val({protocol, Node}), protocol_version()} of @@ -424,8 +424,6 @@ handle_call({negotiate_protocol, Mon, Version, Protocols}, From, State) case hd(Protocols) of ?previous_protocol_version -> accept_protocol(Mon, MyVersion, ?previous_protocol_version, From, State); - {7,6} -> - accept_protocol(Mon, MyVersion, {7,6}, From, State); _ -> verbose("Connection with ~p rejected. " "version = ~p, protocols = ~p, " diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl index 593360415d..782493fb4f 100644 --- a/lib/mnesia/src/mnesia_schema.erl +++ b/lib/mnesia/src/mnesia_schema.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% Copyright Ericsson AB 1996-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -646,54 +646,18 @@ cs2list(Cs) when is_record(Cs, cstruct) -> rec2list(Tags, Tags, 2, Cs); cs2list(CreateList) when is_list(CreateList) -> CreateList; -%% 4.6 + +%% since 4.6 cs2list(Cs) when element(1, Cs) == cstruct, tuple_size(Cs) == 19 -> 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,storage_properties, cookie,version], - rec2list(Tags, Tags, 2, Cs); -%% 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) -> %% Or earlier - 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); -cs2list(ver4_6, 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,storage_properties, - cookie,version], - rec2list(Tags, Orig, 2, Cs). - + cs2list(Cs). rec2list([Tag | Tags], [Tag | Orig], Pos, Rec) -> Val = element(Pos, Rec), @@ -703,19 +667,8 @@ rec2list([], _, _Pos, _Rec) -> rec2list(Tags, [_|Orig], Pos, Rec) -> rec2list(Tags, Orig, Pos+1, Rec). -normalize_cs(Cstructs, Node) -> - %% backward-compatibility hack; normalize before returning - case need_old_cstructs([Node]) of - false -> - Cstructs; - Version -> - %% some other format - [convert_cs(Version, Cs) || Cs <- Cstructs] - end. - -convert_cs(Version, Cs) -> - Fields = [Value || {_, Value} <- cs2list(Version, Cs)], - list_to_tuple([cstruct|Fields]). +normalize_cs(Cstructs, _Node) -> + Cstructs. list2cs(List) when is_list(List) -> Name = pick(unknown, name, List, must), @@ -1142,6 +1095,7 @@ do_delete_table(Tab) -> ensure_writable(schema), insert_schema_ops(TidTs, make_delete_table(Tab, whole_table)). +-dialyzer({no_improper_lists, make_delete_table/2}). make_delete_table(Tab, Mode) -> case existed_before(Tab) of false -> @@ -1297,6 +1251,7 @@ make_del_table_copy(Tab, Node) -> _ -> ensure_active(Cs), verify_cstruct(Cs2), + get_tid_ts_and_lock(Tab, write), [{op, del_table_copy, Storage, Node, vsn_cs2list(Cs2)}] end. @@ -1324,6 +1279,7 @@ remove_node_from_tabs([Tab|Rest], Node) -> remove_node_from_tabs(Rest, Node)]; _Ns -> verify_cstruct(Cs2), + get_tid_ts_and_lock(Tab, write), [{op, del_table_copy, ram_copies, Node, vsn_cs2list(Cs2)}| remove_node_from_tabs(Rest, Node)] end @@ -1355,6 +1311,11 @@ do_move_table(schema, _FromNode, _ToNode) -> mnesia:abort({bad_type, schema}); do_move_table(Tab, FromNode, ToNode) when is_atom(FromNode), is_atom(ToNode) -> TidTs = get_tid_ts_and_lock(schema, write), + AnyOld = lists:any(fun(Node) -> mnesia_monitor:needs_protocol_conversion(Node) end, + [ToNode|val({Tab, where_to_write})]), + if AnyOld -> ignore; %% Leads to deadlock on old nodes + true -> get_tid_ts_and_lock(Tab, write) + end, insert_schema_ops(TidTs, make_move_table(Tab, FromNode, ToNode)); do_move_table(Tab, FromNode, ToNode) -> mnesia:abort({badarg, Tab, FromNode, ToNode}). @@ -1962,7 +1923,7 @@ prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}, _WaitFor) -> end, %% Tables are created by mnesia_loader get_network code insert_cstruct(Tid, Cs, true), - case mnesia_controller:get_network_copy(Tab, Cs) of + case mnesia_controller:get_network_copy(Tid, Tab, Cs) of {loaded, ok} -> {true, optional}; {not_loaded, ErrReason} -> @@ -1993,28 +1954,11 @@ prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}, _WaitFor) -> {true, optional} end; -prepare_op(Tid, {op, del_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 -> - Self = self(), - Pid = spawn_link(fun() -> lock_del_table(Tab, Node, Cs, Self) end), - put(mnesia_lock, Pid), - receive - {Pid, updated} -> - {true, optional}; - {Pid, FailReason} -> - mnesia:abort(FailReason); - {'EXIT', Pid, Reason} -> - mnesia:abort(Reason) - end; - true -> - {true, optional} - end; + set_where_to_read(Tab, Node, Cs), + {true, optional}; prepare_op(_Tid, {op, change_table_copy_type, N, FromS, ToS, TabDef}, _WaitFor) when N == node() -> @@ -2228,46 +2172,6 @@ receive_sync(Nodes, Pids) -> {abort, Else} end. -lock_del_table(Tab, NewNode, Cs0, Father) -> - Ns = val({schema, active_replicas}), - process_flag(trap_exit,true), - Lock = fun() -> - mnesia:write_lock_table(Tab), - %% Sigh using cs record - Set = fun(Node) -> - [Cs] = normalize_cs([Cs0], Node), - rpc:call(Node, ?MODULE, set_where_to_read, [Tab, NewNode, Cs]) - end, - Res = [Set(Node) || Node <- Ns], - Filter = fun(ok) -> - 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. - false; - (_) -> - true - end, - case lists:filter(Filter, Res) of - [] -> - Father ! {self(), updated}, - %% When transaction is commited the process dies - %% and the lock is released. - receive _ -> ok end; - Err -> - Father ! {self(), {bad_commit, Err}} - end, - ok - end, - case mnesia:transaction(Lock) of - {atomic, ok} -> ok; - {aborted, R} -> Father ! {self(), R} - end, - unlink(Father), - unlink(whereis(mnesia_tm)), - exit(normal). - set_where_to_read(Tab, Node, Cs) -> case mnesia_lib:val({Tab, where_to_read}) of Node -> @@ -2418,13 +2322,19 @@ undo_prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}) -> insert_cstruct(Tid, Cs2, true) % Don't care about the version end; -undo_prepare_op(_Tid, {op, del_table_copy, _, Node, TabDef}) - when Node == node() -> - WriteLocker = get(mnesia_lock), - WriteLocker =/= undefined andalso (WriteLocker ! die), +undo_prepare_op(_Tid, {op, del_table_copy, _, Node, TabDef}) -> Cs = list2cs(TabDef), Tab = Cs#cstruct.name, - mnesia_lib:set({Tab, where_to_read}, Node); + if node() =:= Node -> + mnesia_lib:set({Tab, where_to_read}, Node); + true -> + case mnesia_lib:val({Tab, where_to_read}) of + nowhere -> + mnesia_lib:set_remote_where_to_read(Tab); + _ -> + ignore + end + end; undo_prepare_op(_Tid, {op, change_table_copy_type, N, FromS, ToS, TabDef}) when N == node() -> @@ -2885,40 +2795,11 @@ do_merge_schema(LockTabs0) -> end. fetch_cstructs(Node) -> - case need_old_cstructs([Node]) of - false -> - rpc:call(Node, mnesia_controller, get_remote_cstructs, []); - _Ver -> - case rpc:call(Node, mnesia_controller, get_cstructs, []) of - {cstructs, Cs0, RR} -> - {cstructs, [list2cs(cs2list(Cs)) || Cs <- Cs0], RR}; - Err -> Err - end - end. + rpc:call(Node, mnesia_controller, get_remote_cstructs, []). -need_old_cstructs() -> - need_old_cstructs(val({schema, where_to_write})). - -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 - Cs when element(1, Cs) == cstruct, tuple_size(Cs) == 19 -> - ver4_6 % With storage_properties - end - end. +need_old_cstructs() -> false. + +need_old_cstructs(_Nodes) -> false. tab_to_nodes(Tab) when is_atom(Tab) -> Cs = val({Tab, cstruct}), diff --git a/lib/mnesia/test/mnesia_isolation_test.erl b/lib/mnesia/test/mnesia_isolation_test.erl index b66da6e390..4dd0c01d05 100644 --- a/lib/mnesia/test/mnesia_isolation_test.erl +++ b/lib/mnesia/test/mnesia_isolation_test.erl @@ -39,7 +39,7 @@ groups() -> [{locking, [], [no_conflict, simple_queue_conflict, advanced_queue_conflict, simple_deadlock_conflict, - advanced_deadlock_conflict, lock_burst, + advanced_deadlock_conflict, schema_deadlock, lock_burst, {group, sticky_locks}, {group, unbound_locking}, {group, admin_conflict}, nasty]}, {sticky_locks, [], [basic_sticky_functionality]}, @@ -148,20 +148,32 @@ simple_queue_conflict(Config) when is_list(Config) -> fun_loop(Fun, AllSharedLocks, OneExclusiveLocks), ok. -wait_for_lock(Pid, _Nodes, 0) -> +wait_for_lock(Pid, Nodes, Retry) -> + wait_for_lock(Pid, Nodes, Retry, queue). + +wait_for_lock(Pid, _Nodes, 0, queue) -> Queue = mnesia:system_info(lock_queue), ?error("Timeout while waiting for lock on Pid ~p in queue ~p~n", [Pid, Queue]); -wait_for_lock(Pid, Nodes, N) -> - rpc:multicall(Nodes, sys, get_status, [mnesia_locker]), - List = [rpc:call(Node, mnesia, system_info, [lock_queue]) || Node <- Nodes], +wait_for_lock(Pid, _Nodes, 0, held) -> + Held = mnesia:system_info(held_locks), + ?error("Timeout while waiting for lock on Pid ~p (held) ~p~n", [Pid, Held]); +wait_for_lock(Pid, Nodes, N, Where) -> + rpc:multicall(Nodes, sys, get_status, [mnesia_locker]), + List = case Where of + queue -> + [rpc:call(Node, mnesia, system_info, [lock_queue]) || Node <- Nodes]; + held -> + [rpc:call(Node, mnesia, system_info, [held_locks]) || Node <- Nodes] + end, Q = lists:append(List), - check_q(Pid, Q, Nodes, N). + check_q(Pid, Q, Nodes, N, Where). -check_q(Pid, [{_Oid, _Op, Pid, _Tid, _WFT} | _Tail], _N, _Count) -> ok; -check_q(Pid, [_ | Tail], N, Count) -> check_q(Pid, Tail, N, Count); -check_q(Pid, [], N, Count) -> - timer:sleep(500), - wait_for_lock(Pid, N, Count - 1). +check_q(Pid, [{_Oid, _Op, Pid, _Tid, _WFT} | _Tail], _N, _Count, _Where) -> ok; +check_q(Pid, [{_Oid, _Op, {tid,_,Pid}} | _Tail], _N, _Count, _Where) -> ok; +check_q(Pid, [_ | Tail], N, Count, Where) -> check_q(Pid, Tail, N, Count, Where); +check_q(Pid, [], N, Count, Where) -> + timer:sleep(200), + wait_for_lock(Pid, N, Count - 1, Where). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -270,6 +282,43 @@ advanced_deadlock_conflict(Config) when is_list(Config) -> ?match([], mnesia:system_info(lock_queue)), ok. +%% Verify (and regression test) deadlock in del_table_copy(schema, Node) +schema_deadlock(Config) when is_list(Config) -> + Ns = [Node1, Node2] = ?acquire_nodes(2, Config), + ?match({atomic, ok}, mnesia:create_table(a, [{disc_copies, Ns}])), + ?match({atomic, ok}, mnesia:create_table(b, [{disc_copies, Ns}])), + + Tester = self(), + + Deadlocker = fun() -> + mnesia:write({a,1,1}), %% grab write lock on A + receive + continue -> + mnesia:write({b,1,1}), %% grab write lock on B + end_trans + end + end, + + ?match(stopped, rpc:call(Node2, mnesia, stop, [])), + timer:sleep(500), %% Let Node1 reconfigure + sys:get_status(mnesia_monitor), + + DoingTrans = spawn_link(fun() -> Tester ! {self(),mnesia:transaction(Deadlocker)} end), + wait_for_lock(DoingTrans, [Node1], 10, held), + %% Will grab write locks on schema, a, and b + DoingSchema = spawn_link(fun() -> Tester ! {self(), mnesia:del_table_copy(schema, Node2)} end), + timer:sleep(500), %% Let schema trans start, and try to grab locks + DoingTrans ! continue, + + ?match(ok, receive {DoingTrans, {atomic, end_trans}} -> ok after 5000 -> timeout end), + ?match(ok, receive {DoingSchema, {atomic, ok}} -> ok after 5000 -> timeout end), + + sys:get_status(whereis(mnesia_locker)), % Explicit sync, release locks is async + ?match([], mnesia:system_info(held_locks)), + ?match([], mnesia:system_info(lock_queue)), + ok. + + one_oid(Tab) -> {Tab, 1}. other_oid(Tab) -> {Tab, 2}. diff --git a/lib/observer/doc/src/cdv.xml b/lib/observer/doc/src/cdv.xml index ee629bbd3f..df1032780a 100644 --- a/lib/observer/doc/src/cdv.xml +++ b/lib/observer/doc/src/cdv.xml @@ -4,7 +4,7 @@ <comref> <header> <copyright> - <year>2013</year> + <year>2003</year><year>2016</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -33,16 +33,16 @@ <file>cdv.xml</file> </header> <com>cdv</com> - <comsummary>Script used for starting the Crashdump Viewer from the + <comsummary>Script to start the Crashdump Viewer from the OS command line. </comsummary> <description> - <p>The <c>cdv</c> shell script can be found under the <c>priv</c> - directory of the <c>observer</c> application. The script is used + <p>The <c>cdv</c> shell script is located in directory <c>priv</c> + of the Observer application. The script is used for starting the Crashdump Viewer tool from the OS command line.</p> - <p>For Windows users, <c>cdv.bat</c> can be found in the same + <p>For Windows users, <c>cdv.bat</c> is found in the same location.</p> </description> @@ -51,8 +51,8 @@ <name>cdv [file]</name> <fsummary>Start the Crashdump Viewer and load the given file.</fsummary> <desc> - <p>The <c>file</c> arguments is optional. If not given, a file - dialog will pop up allowing the user to select a crashdump + <p>Argument <c>file</c> is optional. If not specified, a file + dialog is displayed, allowing you to select a crashdump from the file system.</p> </desc> </func> diff --git a/lib/observer/doc/src/crashdump.xml b/lib/observer/doc/src/crashdump.xml index 76deee45f6..27e88d07e5 100644 --- a/lib/observer/doc/src/crashdump.xml +++ b/lib/observer/doc/src/crashdump.xml @@ -25,7 +25,7 @@ </legalnotice> <title>crashdump_viewer</title> - <prepared>Siri hansen</prepared> + <prepared>Siri Hansen</prepared> <responsible></responsible> <docno>1</docno> <approved></approved> @@ -41,32 +41,31 @@ <p>The Crashdump Viewer is a WxWidgets based tool for browsing Erlang crashdumps.</p> - <p>See the <seealso marker="crashdump_ug">user's guide</seealso> - for more information about how to get started with the Crashdump - Viewer.</p> + <p>For details about how to get started with the Crashdump Viewer, see the + <seealso marker="crashdump_ug"><c>User's Guide</c></seealso>.</p> </description> <funcs> <func> <name>start() -> ok</name> <name>start(File) -> ok</name> - <fsummary>Start the crashdump_viewer</fsummary> + <fsummary>Start the Crashdump Viewer.</fsummary> <type> <v>File = string()</v> - <d>The file name of the crashdump.</d> + <d>The filename of the crashdump.</d> </type> <desc> - <p>This function starts the <c>crashdump_viewer</c> GUI and - loads the given crashdump.</p> + <p>Starts the Crashdump Viewer GUI and + loads the specified crashdump.</p> - <p>If <c>File</c> is not given, a file dialog will be opened + <p>If <c>File</c> is not specified, a file dialog is opened where the crashdump can be selected.</p> </desc> </func> <func> <name>stop() -> ok</name> - <fsummary>Stop the crashdump_viewer</fsummary> + <fsummary>Terminate the Crashdump Viewer.</fsummary> <desc> - <p>This function stops the <c>crashdump_viewer</c> and closes + <p>Terminates the Crashdump Viewer and closes all GUI windows.</p> </desc> </func> diff --git a/lib/observer/doc/src/crashdump_ug.xml b/lib/observer/doc/src/crashdump_ug.xml index 4bb3628ab5..4ba057c3fb 100644 --- a/lib/observer/doc/src/crashdump_ug.xml +++ b/lib/observer/doc/src/crashdump_ug.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2003</year><year>2013</year> + <year>2003</year><year>2016</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -39,371 +39,390 @@ <section> <title>Getting Started</title> - <p>The easiest way to start Crashdump Viewer is to use the - provided shell script named <c>cdv</c> with the full path to the - erlang crashdump as an argument. The script can be found in the - priv directory of the <c>observer</c> application. This starts the - Crashdump Viewer GUI and loads the given file. If no file name is - given, a file dialog will be opened where the file can be + <p>The easiest way to start Crashdump Viewer is to use + shell script <c>cdv</c> with the full path to the + Erlang crashdump as argument. The script is located in + directory <c>priv</c> of the Observer application. This starts the + Crashdump Viewer GUI and loads the specified file. If no filename is + specified, a file dialog is opened where the file can be selected.</p> - <p>Under Windows the batch file <c>cdv.bat</c> can be used.</p> + <p>Under Windows, the batch file <c>cdv.bat</c> can be used.</p> - <p>It is also possible to start the Crashdump Viewer from within - an erlang node by calling <seealso + <p>Crashdump Viewer can also be started from + an Erlang node by calling <seealso marker="crashdump_viewer#start/0">crashdump_viewer:start/0</seealso> or <seealso marker="crashdump_viewer#start/1">crashdump_viewer:start/1</seealso>.</p> </section> <section> - <title>The graphical interface</title> + <title>GUI</title> - <p>The main window is opened when Crashdump Viewer has loaded a - crashdump. It contains a title bar, a menu bar, a number of - information panels and a status bar.</p> + <p>The GUI main window is opened when Crashdump Viewer has loaded a + crashdump. It contains a title bar, a menu bar, + information tabs, and a status bar.</p> <p>The title bar shows the name of the currently loaded crashdump.</p> <p>The menu bar contains a <em>File</em> menu and a <em>Help</em> - menu. From the File menu a new crashdump can be loaded or the tool - can be terminated. From the Help menu this user's guide and the - chapter "How to interpret the Erlang crash dumps" from the user's - guide for Erlang runtime system can be opened. "How to interpret + menu. From the <em>File</em> menu, a new crashdump can be loaded or + the tool can be terminated. From the <em>Help</em> menu, this User's Guide + and section "How to interpret the Erlang crash dumps" from the + ERTS application can be opened. "How to interpret the Erlang crash dumps" describes the raw crashdumps in - detail. Here you will also find information about each single - field in the different information pages. This document can also - be found directly in the OTP online documentation, via the Erlang - runtime system user's guide.</p> + detail and includes information about each + field in the information pages."How to interpret the Erlang crash dumps" + is also available in the OTP online documentation.</p> - <p>The status bar at the bottom of the window will show a warning + <p>The status bar at the bottom of the window shows a warning if the currently loaded dump is truncated.</p> - <p>The centre area of the main window contains the information - panels. Each panel displays information about a specific item or a - list of items. A panel is selected by clicking the title of the - tab.</p> + <p>The center area of the main window contains the information + tabs. Each tab displays information about a specific item or a + list of items. Select a tab by clicking the tab title.</p> - <p>From panels that display lists of items, for example the - Processes- or the Ports panel, a new window with further - information can be opened by double clicking a row or by right - clicking the row and selecting an item from the drop down + <p>From tabs displaying lists of items, for example, the + <em>Processes</em> tab or the <em>Ports</em> tab, a new window with + more information can be opened by double-clicking a row or by right- + clicking the row and selecting an item from the drop-down menu. The new window is called a detail window. Detail windows can - be opened for processes, ports, nodes and modules.</p> + be opened for processes, ports, nodes, and modules.</p> - <p>The various information shown in a detail window might contain - links to processes or ports. Clicking one of these links will open + <p>The information shown in a detail window can contain + links to processes or ports. Clicking one of these links opens the detail window for the process or port in question. If the - process or port resided on a remote node, there will be no - information available. Clicking the link will then pop up a dialog - where you can choose whether to open the detail window for the - remote node or not. + process or port resides on a remote node, no + information is available. Clicking the link then displays a dialog + where you can choose to open the detail window for the + remote node. </p> - <p>Some of the panels contain a left hand menu where sub items of - the panel's information area can be selected. Click on one of the - rows, and the information will be displayed in the right hand + <p>Some tabs contain a left-hand menu where subitems of + the information area can be selected. Click one of the + rows, and the information is displayed in the right-hand information area.</p> </section> <section> - <title>Data content</title> - - <p>Each panel in the main window contains an information - page. If no information is found for an item, the page will be - empty. The reason for not finding any information about an item - can be that the dump is truncated, that it is a dump from an old - OTP release in which this item was not written or that the item - simply wasn't present in the system at the point of failure.</p> - - <p>If the dump was truncated, a warning is displayed in the - status bar of the main window.</p> - - <p>Even if some information about an item exists, there might be + <title>Tab Content</title> + + <p>Each tab in the main window contains an information + page. If no information is found for an item, the page is + empty. The reason for not finding information about an item + can be the following:</p> + <list type="bulleted"> + <item>It is a dump from an old OTP release in which this item was not written.</item> + <item>The item was not present in the system at the point of failure.</item> + <item>The dump is truncated. In this case, a warning is displayed in the + status bar of the main window.</item> + </list> + + <p></p> + + <p>Even if some information about an item exists, there can be empty fields if the dump originates from an old OTP release.</p> - <p>The value "-1" in any field means "unknown", and in most + <p>The value <c>-1</c> in any field means "unknown", and in most cases it means that the dump was truncated somewhere around this field.</p> - <p>The sections below describe some of the fields in the - different information panels. These are fields that do not exist + <p>The following sections describe some of the fields in the + information tabs. These are fields that do not exist in the raw crashdump, or in some way differ from the fields in - the raw crashdump. Details about other fields can be found in - the user's guide for the Erlang runtime system, in the chapter - "How to interpret the Erlang crash dumps". That chapter can also - be opened from the Help menu in the Crashdump Viewer's main - window, and there are also direct links from the specific - sections below to related information in "How to interpret the - Erlang crash dumps".</p> + the raw crashdump. For details about other fields, see + the + <seealso marker="erts:users_guide">ERTS User's Guide</seealso>, section + "How to interpret the Erlang crash dumps". That section can also + be opened from the <em>Help</em> menu in the main window. + There are also links from the following sections to related information + in "How to interpret the Erlang crash dumps".</p> </section> <section> <marker id="general_info"/> - <title>General information</title> + <title>General Tab</title> - <p>The <em>General information</em> panel shows a short overview + <p>Tab <em>General</em> shows a short overview of the dump.</p> - <p>The following fields are not described in the Erlang runtime - system user's guide:</p> + <p>The following fields are not described in the ERTS + User's Guide:</p> <taglist> - <tag><em>Crashdump created on</em></tag> - <item>Time of failure.</item> - - <tag><em>Memory allocated</em></tag> - <item>The total number of bytes allocated, equivalent to - <c>c:memory(total)</c>.</item> - - <tag><em>Memory maximum</em></tag> - <item>The maximum number of bytes that has been allocated during - the lifetime of the originating node. This will only be shown if - the Erlang runtime system was run instrumented.</item> - - <tag><em>Atoms</em></tag> - <item>If available in the dump, this is the total number of - atoms in the atom table. If the size of the atom table is not - available, the number of atoms visible in the dump is - presented.</item> - - <tag><em>Processes, ETS tables and Funs</em></tag> - <item>The number of processes, ETS tables and funs visible in - the dump.</item> + <tag><c>Crashdump created on</c></tag> + <item><p>Time of failure.</p></item> + + <tag><c>Memory allocated</c></tag> + <item><p>The total number of bytes allocated, equivalent to + <c>c:memory(total)</c>.</p></item> + + <tag><c>Memory maximum</c></tag> + <item><p>The maximum number of bytes that has been allocated during + the lifetime of the originating node. This is only shown if + the Erlang runtime system is run instrumented.</p></item> + + <tag><c>Atoms</c></tag> + <item><p>If available in the dump, this is the total number of + atoms in the atom table. If the size of the atom table is + unavailable, the number of atoms visible in the dump is + displayed.</p></item> + + <tag><c>Processes</c></tag> + <item><p>The number of processes visible in the dump.</p></item> + + <tag><c>ETS tables</c></tag> + <item><p>The number of ETS tables visible in the dump.</p></item> + + <tag><c>Funs</c></tag> + <item><p>The number of funs visible in the dump.</p></item> </taglist> - <p> - <seealso marker="erts:crash_dump#general_info">More...</seealso> + <p>For details, see + <seealso marker="erts:crash_dump#general_info">General Information</seealso> + in section "How to Interpret the Erlang Crash Dumps" in ERTS. </p> </section> <section> <marker id="processes"/> - <title>Processes</title> + <title>Processes Tab</title> - <p>The <em>Processes</em> panel shows a list of all processes - found in the crashdump, including some short information about - each process. By default the processes are sorted by their - pids. To sort by other topic, click the desired column - heading.</p> + <p>Tab <em>Processes</em> shows a list of all processes + found in the crashdump, including brief information about + each process. By default, the processes are sorted by their + pids. To sort by another topic, click the desired column heading.</p> - <p>The <em>Memory</em> column shows the 'Memory' field which was - added to crashdumps in R16B01. This is the total amount of memory + <p>Column <em>Memory</em> shows the 'Memory' field that was + added to crashdumps in Erlang/OTP R16B01. This is the total amount of memory used by the process. For crashdumps from earlier releases, this - column shows the 'Stack+heap' field. The value shown is always in - bytes.</p> + column shows the 'Stack+heap' field. The value is always in bytes.</p> - <p>To view detailed information about a specific process, double - click the row in the list or right click the row and select - "Properties for <pid>".</p> + <p>To view detailed information about a specific process, double- + click the row in the list, or right-click the row and select + <em>Properties for <pid></em>.</p> - <p> - <seealso marker="erts:crash_dump#processes">More...</seealso> + <p>For details, see + <seealso marker="erts:crash_dump#processes">Process Information</seealso> + in section "How to Interpret the Erlang Crash Dumps" in ERTS. </p> </section> <section> <marker id="ports"/> - <title>Ports</title> + <title>Ports Tab</title> - <p>The <em>Ports</em> panel is similar to the <em>Processes</em> - panel, except it lists all ports found in the crashdump.</p> + <p>Tab <em>Ports</em> is similar to the <em>Processes</em> + tab, except it lists all ports found in the crashdump.</p> - <p>To see more details about a specific port, dobule click the row - or right click it and select "Properties for <port>". From - the right click menu you can also select "Properties for - <pid>", where <pid> is the process connected to the + <p>To view more details about a specific port, double-click the row + or right-click it and select <em>Properties for <port></em>. From + the right-click menu, you can also select <em>Properties for + <pid></em>, where <c><pid></c> is the process connected to the port.</p> - <p> - <seealso marker="erts:crash_dump#ports"> - More...</seealso> + <p>For details, see + <seealso marker="erts:crash_dump#ports">Port Information</seealso> + in section "How to Interpret the Erlang Crash Dumps" in ERTS. </p> </section> <section> <marker id="ets_tables"/><marker id="internal_ets_tables"/> - <title>ETS tables</title> + <title>ETS Tables Tab</title> - <p>The <em>ETS Tables</em> panel shows all ETS table information - found in the dump. The 'Id' is the same as the 'Table' field found - in the raw crashdump, and 'Memory' is the 'Words' field from the - raw crashdump translated into bytes. For tree tables there will - be no value in the 'Objects' field.</p> + <p>Tab <em>ETS Tables</em> shows all ETS table information + found in the dump. <em>Id</em> is the same as the 'Table' field + in the raw crashdump. <em>Memory</em> is the 'Words' field from the + raw crashdump translated into bytes. For tree tables, there is + no value in the 'Objects' field.</p> - <p>To open the detailed information page about the table, double - click or right click the row and select "Properties for - 'Identifier'".</p> + <p>To open the detailed information page about the table, double- + click, or right-click the row and select <em>Properties for + 'Identifier'</em>.</p> <p>To open the detailed information page about the owner process - of an ETS table, right click the row and select "Properties for - <pid>".</p> + of an ETS table, right-click the row and select <em>Properties for + <pid></em>.</p> - <p> - <seealso marker="erts:crash_dump#ets_tables"> - More...</seealso> + <p>For details, see + <seealso marker="erts:crash_dump#ets_tables">ETS Tables</seealso> + in section "How to Interpret the Erlang Crash Dumps" in ERTS. </p> </section> <section> <marker id="timers"/> - <title>Timers</title> + <title>Timers Tab</title> - <p>The <em>Timers</em> panel shows all timer information found in + <p>Tab <em>Timers</em> shows all timer information found in the dump.</p> <p>To open the detailed information page about the owner process - of a timer, right click the row and select "Properties for - <pid>".</p> + of a timer, right-click the row and select <em>Properties for + <pid></em>.</p> - <p>Double clicking a row in the Timers panel has no effect.</p> + <p>Double-clicking a row in the <em>Timers</em> tab has no effect.</p> - <p> - <seealso marker="erts:crash_dump#timers">More...</seealso> + <p>For details, see + <seealso marker="erts:crash_dump#timers">Timers</seealso> + in section "How to Interpret the Erlang Crash Dumps" in ERTS. </p> </section> <section> <marker id="schedulers"/> - <title>Schedulers</title> + <title>Schedulers Tab</title> - <p>The <em>Schedulers</em> panel shows all scheduler information + <p>Tab <em>Schedulers</em> shows all scheduler information found in the dump.</p> <p>To open the detailed information page about the scheduler, - double click or right click the row and select "Properties for - 'Identifier'".</p> + double-click, or right-click the row and select <em>Properties for + 'Identifier'</em>.</p> - <p> - <seealso marker="erts:crash_dump">More...</seealso> + <p>For details, see + <seealso marker="erts:crash_dump#scheduler">Scheduler Information</seealso> + in section "How to Interpret the Erlang Crash Dumps" in ERTS. </p> </section> <section> <marker id="funs"/> - <title>Funs</title> + <title>Funs Tab</title> - <p>The <em>Funs</em> panel shows all Fun information found in the + <p>Tab <em>Funs</em> shows all fun information found in the dump.</p> <p>To open the detailed information page about the module to which - the fun belongs, right click the row and select "Properties for - <mod>".</p> + the fun belongs, right-click the row and select <em>Properties for + <mod></em>.</p> - <p>Double clicking a row in the Funs panel has no effect.</p> + <p>Double-clicking a row in the <em>Funs</em> tab has no effect.</p> - <p> - <seealso marker="erts:crash_dump#funs">More...</seealso> + <p>For details, see + <seealso marker="erts:crash_dump#funs">Fun Information</seealso> + in section "How to Interpret the Erlang Crash Dumps" in ERTS. </p> </section> <section> <marker id="atoms"/> - <title>Atoms</title> + <title>Atoms Tab</title> - <p>The <em>Atoms</em> panel lists all atoms found in the dump. By + <p>Tab <em>Atoms</em> lists all atoms found in the dump. By default the atoms are sorted in creation order from first to last. This is opposite of the raw crashdump where atoms are listed from last to first, meaning that if the dump was truncated in the - middle of the atom list only the last created atoms will be seen - in the <em>Atoms</em> panel.</p> + middle of the atom list, only the last created atoms are visible + in the <em>Atoms</em> tab.</p> - <p> - <seealso marker="erts:crash_dump#atoms">More...</seealso> + <p>For details, see + <seealso marker="erts:crash_dump#atoms">Atoms</seealso> + in section "How to Interpret the Erlang Crash Dumps" in ERTS. </p> </section> <section> <marker id="distribution_info"/> - <title>Nodes</title> + <title>Nodes Tab</title> - <p>The <em>Nodes</em> panel shows a list of all external erlang - nodes which are referenced from the crashdump.</p> + <p>Tab <em>Nodes</em> shows a list of all external Erlang + nodes that are referenced from the crashdump.</p> - <p>If the page is empty it either means that the crashed node was - not distributed, that it was distributed but had no references to - other nodes or that the dump was truncated.</p> + <p>If the page is empty, it means either of the following:</p> + <list type="bulleted"> + <item>The crashed node is not distributed.</item> + <item>The crashed node is distributed but has no references to other nodes.</item> + <item>The dump is truncated.</item> + </list> - <p>If the node was distributed, all referenced nodes are - shown. The column named <em>Connection type</em> shows if the node - is visible, hidden or not connected. Visible nodes are alive nodes + <p>If the node is distributed, all referenced nodes are + visible. Column <em>Connection type</em> shows if the node + is visible, hidden, or not connected. Visible nodes are alive nodes with a living connection to the originating node. Hidden nodes are - the same as visible nodes, except they are started with the - <c>-hidden</c> flag. Not connected nodes are nodes that are not + the same as visible nodes, except they are started with flag + <c>-hidden</c>. Not connected nodes are nodes that are not connected to the originating node anymore, but references - (i.e. process or port identifiers) exist.</p> + (that is, process or port identifiers) exist.</p> - <p>To see more detailed information about a node, double click the - row or right click the row and select "Properties for node - <node>". From the right click menu you can also select - "Properties for <port>", to open the detailed information + <p>To see more detailed information about a node, double-click the + row, or right-click the row and select <em>Properties for node + <node></em>. From the right-click menu, you can also select + <em>Properties for <port></em>, to open the detailed information window for the controlling port.</p> - <p>In the detailed information window for a node, any exsisting + <p>In the detailed information window for a node, any existing links and monitors between processes on the originating node and - the connected node are shown. <em>Extra Info</em> may contain - debug information (i.e. special information written if the - emulator is debug compiled) or error information.</p> + the connected node are displayed. <em>Extra Info</em> can contain + debug information (that is, special information written if the + emulator is debug-compiled) or error information.</p> - <p> - <seealso marker="erts:crash_dump#distribution_info"> - More...</seealso> + <p>For details, see + <seealso marker="erts:crash_dump#distribution_info">Distribution Information</seealso> + in section "How to Interpret the Erlang Crash Dumps" in ERTS. </p> </section> <section> <marker id="loaded_modules"/> - <title>Loaded modules</title> + <title>Modules Tab</title> - <p>The <em>Modules</em> panel lists all modules that were loaded - on the originating node, and the current size of the code. If old - code exsits, the old size is also shown.</p> + <p>Tab <em>Modules</em> lists all modules loaded + on the originating node, and the current code size. If old + code exists, the old size is also shown.</p> - <p>To see detailed information about a specific module, double - click the row or right click it and select "Properties for - <mod>".</p> + <p>To view detailed information about a specific module, double- + click the row, or right-click it and select <em>Properties for + <mod></em>.</p> - <p> - <seealso marker="erts:crash_dump#loaded_modules"> - More...</seealso> + <p>For details, see + <seealso marker="erts:crash_dump#loaded_modules">Loaded Module Information</seealso> + in section "How to Interpret the Erlang Crash Dumps" in ERTS. </p> </section> <section> <marker id="memory"/> - <title>Memory</title> - - <p>The <em>Memory</em> panel shows memory and allocator - information. From the left hand menu you can select:</p> + <title>Memory Tab</title> - <list> + <p>Tab <em>Memory</em> shows memory and allocator + information. From the left-hand menu you can select the following:</p> - <item><em>Memory</em> <seealso - marker="erts:crash_dump#memory">More...</seealso></item> + <taglist> + <tag><em>Memory</em></tag> + <item><p>See + <seealso marker="erts:crash_dump#memory">Memory Information</seealso> + in section "How to Interpret the Erlang Crash Dumps" in ERTS.</p></item> - <item><em>Allocator Summary</em> - this page presents a - summary of values from all allocators below.</item> + <tag><em>Allocator Summary</em></tag> + <item><p>This page presents a summary of values from all allocators underneath it.</p></item> - <item><em><Allocator></em> - one entry per allocator - <seealso - marker="erts:crash_dump#allocator">More...</seealso></item> + <tag><em><Allocator></em></tag> + <item><p>One entry per allocator. See + <seealso marker="erts:crash_dump#allocator">Allocator</seealso> + in section "How to Interpret the Erlang Crash Dumps" in ERTS.</p></item> - <item><em>Allocated Areas</em> <seealso - marker="erts:crash_dump#allocated_areas">More...</seealso></item> + <tag><em>Allocated Areas</em></tag> + <item><p>See + <seealso marker="erts:crash_dump#allocated_areas">Allocated Areas</seealso> + in section "How to Interpret the Erlang Crash Dumps" in ERTS.</p></item> - </list> + </taglist> </section> <section> <marker id="internal_tables"/> - <title>Internal tables</title> + <title>Internal Tables Tab</title> - <p>On the <em>Internal Tables</em> panel you can choose from the - left hand menu to see hash tables or index tables.</p> + <p>On tab <em>Internal Tables</em> you can from the + left-hand menu select <em>Hash Tables</em>, <em>Index Tables</em>, + or <em>Internal ETS Tables</em>.</p> - <p> - <seealso marker="erts:crash_dump#internal_tables">More...</seealso> + <p>For details, see + <seealso marker="erts:crash_dump#internal_tables">Internal Table Information</seealso> + in section "How to Interpret the Erlang Crash Dumps" in ERTS. </p> </section> </chapter> diff --git a/lib/observer/doc/src/etop.xml b/lib/observer/doc/src/etop.xml index c1e336177f..52f3b2a156 100644 --- a/lib/observer/doc/src/etop.xml +++ b/lib/observer/doc/src/etop.xml @@ -25,7 +25,7 @@ </legalnotice> <title>etop</title> - <prepared>Siri hansen</prepared> + <prepared>Siri Hansen</prepared> <responsible></responsible> <docno></docno> <approved></approved> @@ -35,89 +35,79 @@ <file></file> </header> <module>etop</module> - <modulesummary>Erlang Top is a tool for presenting information about erlang processes similar to the information presented by "top" in UNIX.</modulesummary> + <modulesummary>Erlang Top is a tool for presenting information about Erlang + processes similar to the information presented by "top" in UNIX.</modulesummary> <description> - <p><c>etop</c> should be started with the provided scripts - <c>etop</c>. This will start a hidden erlang node - which connects to the node to be measured. The measured node is - given with the <c>-node</c> option. If the measured node has a + <p>Start Erlang Top with the provided scripts + <c>etop</c>. This starts a hidden Erlang node + that connects to the node to be measured. The measured node is + specified with option <c>-node</c>. If the measured node has a different cookie than the default cookie for the user who - invokes the script, the cookie must be explicitly given witht - the <c>-setcookie</c> option.</p> + invokes the script, the cookie must be explicitly specified with + option <c>-setcookie</c>.</p> - <p>Under Windows the batch file <c>etop.bat</c> can be used.</p> + <p>Under Windows, batch file <c>etop.bat</c> can be used.</p> - <p>The following configuration parameters exist for the - <c>etop</c> tool. When executing the <c>etop</c> script, - these parameters can be given as command line options, - e.g. <c>etop -node testnode@myhost -setcookie MyCookie</c>.</p> + <p>When executing the <c>etop</c> script, configuration + parameters can be specified as command-line options, + for example, <c>etop -node testnode@myhost -setcookie MyCookie</c>. + The following configuration parameters exist for the + tool:</p> <taglist> - <tag>node</tag> - <item>The measured node. - <br></br> -Value: atom() - <br></br> -Mandatory</item> - <tag>setcookie</tag> - <item>Cookie to use for the etop node - must be the same - as the cookie on the measured node. - <br></br> -Value: atom()</item> - <tag>lines</tag> - <item>Number of lines (processes) to display. - <br></br> -Value: integer() - <br></br> -Default: 10</item> - <tag>interval</tag> - <item>The time interval (in seconds) between each update of - the display. - <br></br> -Value: integer() - <br></br> -Default: 5</item> - <tag>accumulate</tag> - <item>If <c>true</c> the execution time and reductions are - accumulated. - <br></br> -Value: boolean() - <br></br> -Default: <c>false</c></item> - <tag>sort</tag> - <item>Identifies what information to sort by. - <br></br> -Value: <c>runtime | reductions | memory | msg_q</c> <br></br> -Default: <c>runtime</c> (<c>reductions</c> if - <c>tracing=off</c>)</item> - <tag>tracing</tag> - <item><c>etop</c> uses the erlang trace facility, and thus no + <tag><c>node</c></tag> + <item><p>The measured node.</p> + <p>Value: <c>atom()</c></p> + <p>Mandatory</p></item> + <tag><c>setcookie</c></tag> + <item><p>Cookie to use for the <c>etop</c> node. Must be same as the + cookie on the measured node.</p> + <p>Value: <c>atom()</c></p></item> + <tag><c>lines</c></tag> + <item><p>Number of lines (processes) to display.</p> + <p>Value: <c>integer()</c></p> + <p>Default: <c>10</c></p></item> + <tag><c>interval</c></tag> + <item><p>Time interval (in seconds) between each update of + the display.</p> + <p>Value: <c>integer()</c></p> + <p>Default: <c>5</c></p></item> + <tag><c>accumulate</c></tag> + <item><p>If <c>true</c>, the execution time and reductions are + accumulated.</p> + <p>Value: <c>boolean()</c></p> + <p>Default: <c>false</c></p></item> + <tag><c>sort</c></tag> + <item><p>Identifies what information to sort by.</p> + <p>Value: <c>runtime | reductions | memory | msg_q</c></p> + <p>Default: <c>runtime</c> (<c>reductions</c> if <c>tracing=off</c>)</p></item> + <tag><c>tracing</c></tag> + <item><p><c>etop</c> uses the Erlang trace facility, and thus no other tracing is possible on the measured node while <c>etop</c> is running, unless this option is set to <c>off</c>. Also helpful if the <c>etop</c> tracing causes too high load on the measured node. With tracing off, runtime is - not measured. - <br></br> -Value: <c>on | off</c> <br></br> -Default: <c>on</c></item> + not measured.</p> + <p>Value: <c>on | off</c></p> + <p>Default: <c>on</c></p></item> </taglist> - <p>See the <seealso marker="etop_ug">user's guide</seealso> for - more information about the <c>etop</c> tool.</p> + <p>For detalis about Erlang Top, see the + <seealso marker="etop_ug">User's Guide</seealso>.</p> </description> <funcs> <func> <name>start() -> ok</name> - <fsummary>Start etop</fsummary> + <fsummary>Start etop.</fsummary> <desc> - <p>This function starts <c>etop</c>. - Note that etop is preferably started with the etop script.</p> + <p>Starts <c>etop</c>. + Notice that <c>etop</c> is preferably started with the <c>etop</c> script.</p> </desc> </func> <func> <name>start(Options) -> ok</name> - <fsummary>Start etop</fsummary> + <fsummary>Start etop.</fsummary> <type> <v>Options = [Option]</v> <v>Option = {Key, Value}</v> @@ -125,31 +115,30 @@ Default: <c>on</c></item> <v>Value = term()</v> </type> <desc> - <p>This function starts <c>etop</c>. Use - <seealso marker="#help/0">help/0</seealso> to see a - description of the possible options.</p> + <p>Starts <c>etop</c>. To view the possible options, use + <seealso marker="#help/0"><c>help/0</c></seealso>.</p> </desc> </func> <func> <name>help() -> ok</name> - <fsummary>Print etop's help</fsummary> + <fsummary>Display the etop help.</fsummary> <desc> - <p>This function prints the help of <c>etop</c> and + <p>Displays the help of <c>etop</c> and its options.</p> </desc> </func> <func> <name>config(Key,Value) -> Result</name> - <fsummary>Change tool's configuration</fsummary> + <fsummary>Change the configuration of the tool.</fsummary> <type> <v>Result = ok | {error,Reason}</v> <v>Key = lines | interval | accumulate | sort</v> <v>Value = term()</v> </type> <desc> - <p>This function is used to change the tool's configuration - parameters during runtime. The table above indicates the - allowed values for each parameter.</p> + <p>Changes the configuration parameters of the tool during runtime. + Allowed parameters are <c>lines</c>, <c>interval</c>, <c>accumulate</c>, + and <c>sort</c>.</p> </desc> </func> <func> @@ -160,14 +149,14 @@ Default: <c>on</c></item> <v>File = string()</v> </type> <desc> - <p>This function dumps the current display to a text file.</p> + <p>Dumps the current display to a text file.</p> </desc> </func> <func> <name>stop() -> stop</name> - <fsummary>Terminate etop</fsummary> + <fsummary>Terminate etop.</fsummary> <desc> - <p>This function terminates <c>etop</c>.</p> + <p>Terminates <c>etop</c>.</p> </desc> </func> </funcs> diff --git a/lib/observer/doc/src/etop_ug.xml b/lib/observer/doc/src/etop_ug.xml index 7059f689d3..d663b089c2 100644 --- a/lib/observer/doc/src/etop_ug.xml +++ b/lib/observer/doc/src/etop_ug.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2002</year><year>2013</year> + <year>2002</year><year>2016</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -32,15 +32,25 @@ <section> <title>Introduction</title> - <p>Erlang Top, <c>etop</c> is a tool for presenting information - about erlang processes similar to the information presented by + <p>Erlang Top, <c>etop</c>, is a tool for presenting information + about Erlang processes similar to the information presented by <c>top</c> in UNIX. </p> </section> + <section> + <title>Getting Started</title> + <p>Start Erlang Top in either of the following ways:</p> + <list type="bulleted"> + <item>Use script <c>etop</c>.</item> + <item>Use batch file <c>etop.bat</c>, for example, + <c>etop -node tiger@durin</c>.</item> + </list> + </section> + <section> <title>Output</title> - <p>The output from <c>etop</c> looks like this:</p> + <p>The output from Erlang Top is as follows:</p> <code type="none"><![CDATA[ ======================================================================================== tiger@durin 13:40:32 @@ -65,59 +75,60 @@ Pid Name or Initial Func Time Reds Memory MsgQ Current Func <p>The header includes some system information: </p> <taglist> - <tag>Load</tag> - <item><c>cpu</c> is <c>Runtime/Wallclock</c>, i.e. the - percentage of time where the node has been - active, <c>procs</c> is the number of processes on the node, - and <c>runq</c> is the number of processes that are ready to - run.</item> - <tag>Memory</tag> - <item>This is the memory allocated by the node in kilo bytes.</item> + <tag><c>Load</c></tag> + <item> + <taglist> + <tag><c>cpu</c></tag> + <item><p><c>Runtime/Wallclock</c>, that is, the percentage of time + where the node has been active.</p></item> + <tag><c>procs</c></tag> + <item><p>The number of processes on the node.</p></item> + <tag><c>runq</c></tag> + <item><p>The number of processes that are ready to run.</p></item> + </taglist> + </item> + <tag><c>Memory</c></tag> + <item><p>The memory allocated by the node in kilobytes.</p></item> </taglist> <p>For each process the following information is presented: </p> <taglist> - <tag>Time</tag> - <item>This is the runtime for the process, i.e. the actual - time the process has been scheduled in.</item> - <tag>Reds</tag> - <item>This is the number of reductions that has been executed - on the process</item> - <tag>Memory</tag> - <item>This is the size of the process in bytes, obtained by a - call to <c>process_info(Pid,memory)</c>.</item> - <tag>MsgQ</tag> - <item>This is the length of the message queue for the process.</item> + <tag><c>Time</c></tag> + <item><p>The runtime for the process, that is, the time that the process + has been scheduled in.</p></item> + <tag><c>Reds</c></tag> + <item><p>The number of reductions executed on the process.</p></item> + <tag><c>Memory</c></tag> + <item><p>The size of the process in bytes, obtained by a + call to <c>process_info(Pid,memory)</c>.</p></item> + <tag><c>MsgQ</c></tag> + <item><p>The length of the message queue for the process.</p></item> </taglist> <note> <p><em>Time</em> and <em>Reds</em> can be presented as - accumulated values or as values since last update.</p> + accumulated values or as values since the last update.</p> </note> </section> - <section> - <title>Start</title> - <p>To start etop use the script - <c>etop</c> or the batch file <c>etop.bat</c>, e.g. <c>etop -node tiger@durin</c>, - </p> - </section> - - <section> + <section> <title>Configuration</title> <p>All configuration parameters can be set at start by adding - <c>-OptName Value</c> to the command line, e.g. <c>etop -node tiger@durin -setcookie mycookie -lines 15</c>. - </p> - <p>The parameters <c>lines</c>, <c>interval</c>, <c>accumulate</c> - and <c>sort</c> can be changed during runtime by the - function <c>etop:config/2</c>. - </p> - <p>A list of all valid configuration parameters can be found in - the reference manual for <c>etop</c>. + <c>-OptName Value</c> to the command line, for example:</p> + <pre> +% <input>etop -node tiger@durin -setcookie mycookie -lines 15</input></pre> + + <p>A list of all valid Erlang Top configuration parameters is available in + module <seealso marker="etop"><c>etop</c></seealso>. </p> - <section> - <title>Example: Change configuration with text based presentation</title> - <code type="none"><![CDATA[ + <p>The parameters <c>lines</c>, <c>interval</c>, <c>accumulate</c>, + and <c>sort</c> can be changed during runtime with function + <seealso marker="etop#config/2"><c>etop:config/2</c></seealso>. + </p> + <p><em>Example:</em></p> + <p>Change configuration parameter <c>lines</c> with text-based presentation. + Before the change, 10 lines are presented as follows:</p> + <code type="none"><![CDATA[ ======================================================================================== tiger@durin 10:12:39 Load: cpu 0 Memory: total 1858 binary 33 @@ -137,8 +148,14 @@ Pid Name or Initial Func Time Reds Memory MsgQ Current Func <127.43.0> ddll_server 0 582 3744 0 gen_server:loop/6 <127.5.0> application_controll 0 569 6756 0 gen_server:loop/6 ======================================================================================== ]]></code> - <p><em><c>etop:config(lines,5).</c></em> <br></br> -<em><c>ok</c></em></p> + <p>Function <c>etop:config/2</c> is called to change the number of showed + lines to 5:</p> + + <pre> +> <input>etop:config(lines,5).</input> +ok</pre> + + <p>After the change, 5 lines are presented as follows:</p> <code type="none"><![CDATA[ (etop@durin)2> ======================================================================================== @@ -156,19 +173,20 @@ Pid Name or Initial Func Time Reds Memory MsgQ Current Func <127.43.0> ddll_server 0 0 3744 0 gen_server:loop/6 ======================================================================================== ]]></code> - </section> </section> <section> - <title>Print to file</title> - <p>At any time, the current <c>etop</c> display can be dumped to a - text file with the function <c>etop:dump/1</c>. + <title>Print to File</title> + <p>At any time, the current Erlang Top display can be dumped to a + text file with function + <seealso marker="etop#dump/1"><c>etop:dump/1</c></seealso>. </p> </section> <section> <title>Stop</title> - <p>Use the function <c>etop:stop/0</c> to stop <c>etop</c>. + <p>To stop Erlang Top, use function + <seealso marker="etop#stop/0"><c>etop:stop/0</c></seealso>. </p> </section> </chapter> diff --git a/lib/observer/doc/src/introduction_ug.xml b/lib/observer/doc/src/introduction_ug.xml new file mode 100644 index 0000000000..21f0dc709f --- /dev/null +++ b/lib/observer/doc/src/introduction_ug.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE chapter SYSTEM "chapter.dtd"> + +<chapter> + <header> + <copyright> + <year>2016</year><year>2016</year> + <holder>Ericsson AB. All Rights Reserved.</holder> + </copyright> + <legalnotice> + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + </legalnotice> + + <title>Introduction</title> + <prepared></prepared> + <docno></docno> + <date></date> + <rev></rev> + <file>introduction_ug.xml</file> + </header> +<section> + <title>Scope</title> + <p>The Observer application is a container including the following + tools for tracing and investigation of distributed systems:</p> + <list type="bulleted"> + <item>Observer</item> + <item>Trace Tool Builder</item> + <item>Erlang Top</item> + <item>Crashdump Viewer</item> + </list> + </section> + + <section> + <title>Prerequisites</title> + <p>It is assumed that the reader is familiar with the Erlang + programming language.</p> + </section> +</chapter> diff --git a/lib/observer/doc/src/observer.xml b/lib/observer/doc/src/observer.xml index bba5b1e33c..4d43ffe39f 100644 --- a/lib/observer/doc/src/observer.xml +++ b/lib/observer/doc/src/observer.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2011</year><year>2013</year> + <year>2011</year><year>2016</year> <holder>Ericsson AB, All Rights Reserved</holder> </copyright> <legalnotice> @@ -34,24 +34,25 @@ <file>observer.xml</file> </header> <module>observer</module> - <modulesummary>A GUI tool for observing an erlang system.</modulesummary> + <modulesummary>A GUI tool for observing an Erlang system.</modulesummary> <description> - <p>The observer is gui frontend containing various tools to - inspect a system. It displays system information, application - structures, process information, ets or mnesia tables and a frontend - for tracing with <seealso marker="ttb">ttb</seealso>. + <p>Observer is a graphical tool for observing the characteristics of + Erlang systems. The tool Observer displays system information, application + supervisor trees, process information, ETS tables, Mnesia tables, + and contains a front end for Erlang tracing with module + <seealso marker="ttb"><c>ttb</c></seealso>. </p> - <p>See the <seealso marker="observer_ug">user's guide</seealso> - for more information about how to get started.</p> + <p>For detalis about how to get started, see the + <seealso marker="observer_ug"><c>User's Guide</c></seealso>.</p> </description> <funcs> <func> <name>start() -> ok</name> - <fsummary>Start the observer gui</fsummary> + <fsummary>Start the Observer GUI.</fsummary> <desc> - <p>This function starts the <c>observer</c> gui. - Close the window to stop the application. + <p>Starts the Observer GUI. + To stop the tool, close the window. </p> </desc> </func> diff --git a/lib/observer/doc/src/observer_app.xml b/lib/observer/doc/src/observer_app.xml index 543216cee9..a52d6cb4d9 100644 --- a/lib/observer/doc/src/observer_app.xml +++ b/lib/observer/doc/src/observer_app.xml @@ -4,8 +4,7 @@ <appref> <header> <copyright> - <year>2002</year> - <year>2013</year> + <year>2002</year><year>2016</year> <holder>Ericsson AB, All Rights Reserved</holder> </copyright> <legalnotice> @@ -24,7 +23,7 @@ The Initial Developer of the Original Code is Ericsson AB. </legalnotice> - <title>observer</title> + <title>Observer</title> <prepared>Siri Hansen</prepared> <responsible>Siri Hansen</responsible> <docno></docno> @@ -32,26 +31,21 @@ <checked></checked> <date>2002-04-08</date> <rev>PA1</rev> - <file>observer_app.sgml</file> + <file>observer_app.xml</file> </header> - <app>observer</app> + <app>Observer</app> <appsummary>The Observer Application</appsummary> <description> - <p>This chapter describes the <em>OBSERVER</em> application in - OTP, which provides tools for tracing and investigation of - distributed systems.</p> + <p>The Observer application contains tools for tracing and + investigation of distributed systems.</p> </description> <section> <title>Configuration</title> - <p>There are currently no configuration parameters available for + <p>No configuration parameters are available for this application. </p> </section> - <section> - <title>SEE ALSO</title> - <p></p> - </section> </appref> diff --git a/lib/observer/doc/src/observer_ug.xml b/lib/observer/doc/src/observer_ug.xml index ff30d70913..ca354df864 100644 --- a/lib/observer/doc/src/observer_ug.xml +++ b/lib/observer/doc/src/observer_ug.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2011</year><year>2014</year> + <year>2011</year><year>2016</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -32,179 +32,253 @@ <section> <title>Introduction</title> - <p>Observer, is a graphical tool for observing the characteristics of - erlang systems. Observer displays system information, application - supervisor trees, process information, ets or mnesia tables and contains - a frontend for erlang tracing. + <p>Observer is a graphical tool for observing the characteristics of + Erlang systems. Observer displays system information, application + supervisor trees, process information, ETS tables, Mnesia tables + and contains a front end for Erlang tracing. </p> </section> <section> - <title>General</title> - <p>Normally observer should be run from a standalone node to minimize - the impact of the system being observed. Example: + <title>Getting Started</title> + <p>Run Observer from a standalone node to minimize the impact of the + system being observed. </p> - <code> - > erl -sname observer -hidden -setcookie MyCookie -run observer - </code> + <p><em>Example:</em></p> + <pre> +% <input>erl -sname observer -hidden -setcookie MyCookie -run observer</input></pre> <p> - Choose which node to observe via <c>Nodes</c> menu. The <c>View/Refresh - Interval</c> controls how frequent the view should be updated. + Select the node to observe with menu <em>Nodes</em>. + Menu <em>View > Refresh interval</em> controls how often + the view is to be updated. The refresh interval is set per viewer so you can have different settings for each viewer. To minimize the system - impact only the active viewer is updated and the other - views will be updated when activated. + impact, only the active viewer is updated. Other views are updated + when activated. </p> - <p> In general the mouse buttons behaves as expected, use left click - to select objects, right click to pop up a menu with most used - choices and double click to bring up information about the - selected object. In most viewers with several columns you can change - sort order by left clicking on column header. + <p>The mouse buttons behave as expected. Use left-click + to select objects, right-click to get a menu with the most used + options, and double-click to display information about the + selected object. In most viewers with many columns, you can change + the sort order by left-clicking the column header. </p> </section> <section> - <title>Applications</title> - <p>The <c>Applications</c> view lists application information. + <title>System Tab</title> + <p>Tab <em>System</em> displays general information about the active Erlang node + and its runtime system, such as build configuration, system capabilities, and + overall use statistics. +</p> + </section> + + <section> + <title>Load Charts Tab</title> + <p>Tab <em>Load Charts</em> displays graphs of the current resource use on + the active Erlang node.</p> + <p>Graph <c>Scheduler Utilization</c> shows scheduler use per scheduler, + where each scheduler use has a unique color.</p> + <p>Graph <c>Memory Usage</c> shows the total memory use and per memory category + use, where each category has a unique color. The categories are as + follows:</p> + <taglist> + <tag><c>Total</c></tag> + <item><p>The sum of all memory categories.</p></item> + <tag><c>Processes</c></tag> + <item><p>The sum of all process memory used.</p></item> + <tag><c>Atom</c></tag> + <item><p>The size used by the atom table.</p></item> + <tag><c>Binary</c></tag> + <item><p>The sum of all off-heap binaries allocated.</p></item> + <tag><c>Code</c></tag> + <item><p>The memory allocated for code storage.</p></item> + <tag><c>Ets</c></tag> + <item><p>The used memory for all ETS tables.</p></item> + </taglist> + + <p>Graph <c>IO Usage</c> shows the current I/O load on the system.</p> + </section> + + <section> + <title>Memory Allocators Tab</title> + <p>Tab <em>Memory Allocators</em> displays detailed information of the carrier + size and current memory carriers. For details about memory carriers, + see module + <seealso marker="erts:erts_alloc"><c>erts_alloc</c></seealso> + in application ERTS.</p> + </section> + + <section> + <title>Applications Tab</title> + <p>Tab <em>Applications</em> presents application information. Select an application in the left list to display its supervisor - tree. - </p> - <p><c>Trace process</c> will add the selected process identifier - to <c>Trace Overview</c> view and the node the process resides on - will be added as well. - </p> - <p><c>Trace named process</c> will add the - registered name of the process. This can be useful when tracing on - several nodes, then processes with that name will be traced on all traced - nodes. - </p> - <p><c>Trace process tree</c> and <c>Trace named process - tree</c> will add the selected process and all processes below, - right of, it to the <c>Trace Overview</c> view. + tree. The right-click options in the tree are as follows: </p> + <taglist> + <tag>Process info</tag> + <item><p>Opens a detailed information window on the selected process, + including the following:</p> + <taglist> + <tag>Process Information</tag> + <item><p>Shows the process information.</p></item> + <tag>Messages</tag> + <item><p>Shows the process messages.</p></item> + <tag>Dictionary</tag> + <item><p>Shows the process dictionary.</p></item> + <tag>Stack Trace</tag> + <item><p>Shows the process current stack trace.</p></item> + <tag>State</tag> + <item><p>Shows the process state.</p></item> + <tag>Log</tag> + <item><p>If enabled and available, shows the process SASL + log entries.</p></item> + </taglist> + </item> + <tag>Trace process</tag> + <item><p>Adds the selected process identifier to tab <em>Trace Overview</em> + plus the node that the process resides on.</p></item> + <tag>Trace named process</tag> + <item><p>Adds the registered name of the process. This can be useful when tracing on + many nodes, as processes with that name are then traced on all traced nodes.</p></item> + <tag>Trace process tree</tag> + <item><p>Adds the selected process and all processes below, + right of it, to tab <em>Trace Overview</em>.</p></item> + <tag>Trace named process tree</tag> + <item><p>Adds the selected process and all processes below, + right of it, to tab <em>Trace Overview</em>.</p></item> + </taglist> </section> <section> - <title>Processes</title> - <p>The <c>Processes</c> view lists process information. - For each process the following information is presented: + <title>Processes Tab</title> + <p>Tab <em>Processes</em> lists process information in columns. + For each process the following information is displayed: </p> <taglist> <tag>Pid</tag> - <item>The process identifier.</item> + <item><p>The process identifier.</p></item> <tag>Reds</tag> - <item>This is the number of reductions that has been executed - on the process</item> + <item><p>The number of reductions executed on the process. + This can be presented as accumulated values or as values since the last update.</p></item> <tag>Memory</tag> - <item>This is the size of the process in bytes, obtained by a - call to <c>process_info(Pid,memory)</c>.</item> + <item><p>The size of the process, in bytes, obtained by a + call to <c>process_info(Pid,memory)</c>.</p></item> <tag>MsgQ</tag> - <item>This is the length of the message queue for the process.</item> + <item><p>The length of the message queue for the process.</p></item> </taglist> - <note> - <p><em>Reds</em> can be presented as accumulated values or as values since last update.</p> - </note> - <p><c>Process info</c> open a detailed information window on the selected process.</p> + + <p>Option <em>Process info</em> opens a detailed information window on the selected process, + including the following:</p> <taglist> <tag>Process Information</tag> - <item>Shows the process information.</item> + <item><p>Shows the process information.</p></item> <tag>Messages</tag> - <item>Shows the process messages.</item> + <item><p>Shows the process messages.</p></item> <tag>Dictionary</tag> - <item>Shows the process dictionary.</item> + <item><p>Shows the process dictionary.</p></item> <tag>Stack Trace</tag> - <item>Shows the process current stack trace.</item> + <item><p>Shows the process current stack trace.</p></item> <tag>State</tag> - <item>Show the process state.</item> + <item><p>Shows the process state.</p></item> <tag>Log</tag> - <item>If enabled and available, show the process SASL log entries.</item> + <item><p>If enabled and available, shows the process SASL log entries.</p></item> </taglist> + <note> - <p><c>Log</c> needs SASL application to be started on the observed node, with log_mf_h as log handler. - The Observed node must be R16B02 or higher. - <c>rb</c> server must not be started on the observed node when clicking on menu 'Log/Toggle log view'. - <c>rb</c> server will be stopped on the observed node when exiting or changing observed node. + <p><em>Log</em> requires application SASL to be started on the observed node, + with <c>log_mf_h</c> as log handler. + The Observed node must be Erlang/OTP R16B02 or higher. + The <c>rb</c> server must not be started on the observed node when clicking menu + <em>Log > Toggle log view</em>. The <c>rb</c> server is stopped on the observed node + when exiting or changing the observed node. </p> </note> - <p><c>Trace Processes</c> will add the selected process identifiers to the <c>Trace Overview</c> view and the - node the processes reside on will be added as well. - <c>Trace Named Processes</c> will add the registered name of processes. This can be useful - when tracing is done on several nodes, then processes with that name will be traced on all traced nodes. + + <p>Option <em>Trace Processes</em> adds the selected process identifiers to tab + <em>Trace Overview</em> plus the node that the processes reside on. </p> + <p>Option <em>Trace Named Processes</em> adds the registered name of the processes. This can be + useful when tracing is done on many nodes, as processes with that name are then traced on + all traced nodes.</p> + </section> <section> - <title>Table Viewer</title> - <p>The <c>Table Viewer</c> view lists tables. By default ets tables - are visible and unreadable, private ets, tables and tables created by the OTP - applications are not visible. Use <c>View</c> menu to view "system" - ets tables, unreadable ets tables or mnesia tables. + <title>Table Viewer Tab</title> + <p>Tab <em>Table Viewer</em> lists tables. By default, ETS tables + are displayed whereas unreadable private ETS tables and tables created by OTP + applications are not diplayed. Use menu <em>View</em> to view "system" + ETS tables, unreadable ETS tables, or Mnesia tables. </p> - <p>Double click to view the content of the table. Select table and activate <c>View/Table Information</c> - menu to view table information. - </p> - <p>In the table viewer you can regexp search for objects, edit and delete objects. + <p>Double-click to view the table content. To view table information, select the table + and activate menu <em>View > Table information</em>.</p> + <p>You can use <seealso marker="stdlib:re">regular + expressions</seealso> and search for objects, and edit or delete them. </p> </section> <section> - <title>Trace Overview</title> - <p>The <c>Trace Overview</c> view handles tracing. Tracing is done - by selecting which processes to be traced and how to trace - them. You can trace messages, function calls and events, where - events are process related events such as <c>spawn</c>, - <c>exit</c> and several others. - </p> - - <p>When you want to trace function calls, you also need to setup - <c>trace patterns</c>. Trace patterns selects the function calls - that will be traced. The number of traced function calls can be - further reduced with <c>match specifications</c>. Match - specifications can also be used to trigger additional information + <title>Trace Overview Tab</title> + <p>Tab <em>Trace Overview</em> handles tracing. Trace + by selecting the processes to be traced and how to trace + them. You can trace messages, function calls, and events, where + events are process-related events such as <c>spawn</c>, + <c>exit</c>, and many others. + </p> + + <p>To trace function calls, you also need to set up + <em>trace patterns</em>. Trace patterns select the function calls + to be traced. The number of traced function calls can be + further reduced with <em>match specifications</em>. Match + specifications can also be used to trigger more information in the trace messages. </p> - <note><p>Trace patterns only applies to the traced processes.</p></note> + <note><p>Trace patterns only apply to the traced processes.</p></note> <p> - Processes are added from the <c>Applications</c> or <c>Processes</c> views. - A special <c>new</c> identifier, meaning all processes spawned after trace start, - can be added with the <c>Add 'new' Process</c> button. + Processes are added from the <em>Applications</em> or <em>Processes</em> tabs. + A special <em>new</em> identifier, meaning all processes spawned after trace + start, can be added with button <em>Add 'new' Process</em>. </p> <p> - When adding processes, a window with trace options will pop up. The chosen options will - be set for the selected processes. - Process options can be changed by right clicking on a process. + When adding processes, a window with trace options is displayed. The chosen + options are set for the selected processes. + Process options can be changed by right-clicking a process. </p> <p> - Processes added by process identifiers will add the nodes these - processes resides on in the node list. Additional nodes can be added by the <c>Add - Nodes</c> button. + Processes added by process identifiers add the nodes these + processes reside on in the node list. More nodes can be added by clicking + button <em>Add Nodes</em>. </p> <p> - If function calls are traced, trace patterns must be added by <c>Add Trace Pattern</c> button. - Select a module, function(s) and a match specification. - If no functions are selected, all functions in the module will be traced. + If function calls are traced, trace patterns must be added by clicking button + <em>Add Trace Pattern</em>. Select a module, function(s), and a match specification. + If no functions are selected, all functions in the module are traced. A few basic match specifications are provided in the tool, and you can provide your own match specifications. The syntax of match - specifications are described in the <seealso - marker="erts:match_spec">ERTS User's Guide</seealso>. To simplify - the writing of a match specification they can also be written as - <c>fun/1</c> see <seealso marker="stdlib:ms_transform">ms_transform manual page</seealso> for - further information. - </p> - - <p>Use the <c>Start trace</c> button to start the trace. - By default trace output is written to a new window, tracing is stopped when the - window is closed, or with <c>Stop Trace</c> button. - Trace output can be changed via <c>Options/Output</c> menu. - The trace settings, including match specifications, can be saved to, or loaded from, a file. - </p> - <p>More information about tracing can be found in <seealso - marker="runtime_tools:dbg">dbg</seealso> and in the chapter "Match - specifications in Erlang" in <seealso marker="erts:match_spec">ERTS User's - Guide</seealso> and the - <seealso marker="stdlib:ms_transform">ms_transform manual page</seealso>. + specifications is described in the <seealso + marker="erts:match_spec"><c>ERTS User's Guide</c></seealso>. To simplify + the writing of a match specification, they can also be written as + <c>fun/1</c>. For details, see module + <seealso marker="stdlib:ms_transform">ms_transform</seealso> + in application STDLIB. + </p> + + <p>Click button <em>Start Trace</em> to start the trace. + By default, trace output is written to a new window. Tracing is stopped + when the window is closed, or when clicking button <em>Stop Trace</em>. + Trace output can be changed with menu <em>Options > Output</em>. + The trace settings, including match specifications, can be saved to, + or loaded from, a file. + </p> + <p>For details about tracing, see module <seealso + marker="runtime_tools:dbg">dbg</seealso> in application Runtime_Tools + and in section "Match specifications in Erlang" in + <seealso marker="erts:match_spec"><c>ERTS User's Guide</c></seealso> + and in module + <seealso marker="stdlib:ms_transform"><c>ms_transform</c></seealso> + in application STDLIB. </p> </section> </chapter> diff --git a/lib/observer/doc/src/part.xml b/lib/observer/doc/src/part.xml index 27b4e93d2d..d8ec7664d9 100644 --- a/lib/observer/doc/src/part.xml +++ b/lib/observer/doc/src/part.xml @@ -29,9 +29,8 @@ <rev></rev> </header> <description> - <p>The <em>Observer</em> application contains tools for tracing - and investigation of distributed systems.</p> </description> + <xi:include href="introduction_ug.xml"/> <xi:include href="observer_ug.xml"/> <xi:include href="ttb_ug.xml"/> <xi:include href="etop_ug.xml"/> diff --git a/lib/observer/doc/src/ref_man.xml b/lib/observer/doc/src/ref_man.xml index 03d7dbe9df..37e20b2643 100644 --- a/lib/observer/doc/src/ref_man.xml +++ b/lib/observer/doc/src/ref_man.xml @@ -30,10 +30,7 @@ <file>application.sgml</file> </header> <description> - <p>The <em>Observer</em> application contains tools for tracing - and investigation of distributed systems.</p> - <br></br> - </description> + </description> <xi:include href="observer_app.xml"/> <xi:include href="observer.xml"/> <xi:include href="ttb.xml"/> diff --git a/lib/observer/doc/src/ttb.xml b/lib/observer/doc/src/ttb.xml index 0a50a20716..2b637551db 100644 --- a/lib/observer/doc/src/ttb.xml +++ b/lib/observer/doc/src/ttb.xml @@ -4,8 +4,7 @@ <erlref> <header> <copyright> - <year>2002</year> - <year>2013</year> + <year>2002</year><year>2016</year> <holder>Ericsson AB, All Rights Reserved</holder> </copyright> <legalnotice> @@ -25,27 +24,28 @@ </legalnotice> <title>ttb</title> - <prepared>Siri hansen, Bartlomiej Puzon</prepared> + <prepared>Siri Hansen, Bartlomiej Puzon</prepared> <responsible></responsible> <docno>1</docno> <approved></approved> <checked></checked> <date>2010-08-13</date> <rev>PA1</rev> - <file>ttb.sgml</file> + <file>ttb.xml</file> </header> <module>ttb</module> <modulesummary>A base for building trace tools for distributed systems.</modulesummary> <description> - <p>The Trace Tool Builder <c>ttb</c> is a base for building trace + <p>The Trace Tool Builder, <c>ttb</c>, is a base for building trace tools for distributed systems. </p> - <p>When using <c>ttb</c>, <c>dbg</c> shall not be used in parallel.</p> + <p>When using <c>ttb</c>, do not use module <c>dbg</c> in application + Runtime_Tools in parallel.</p> </description> <funcs> <func> <name>start_trace(Nodes, Patterns, FlagSpec, Opts) -> Result</name> - <fsummary>Start a trace port on each given node.</fsummary> + <fsummary>Start a trace port on each specified node.</fsummary> <type> <v>Result = see p/2</v> <v>Nodes = see tracer/2</v> @@ -57,48 +57,56 @@ </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:</p><code type="none"> -ttb:start_trace([Node, OtherNode], -[{mod, foo, []}, {mod, bar, 2}], -{all, call}, -[{file, File}, {handler,{fun myhandler/4, S}}])</code> - <p>is equivalent to</p> <code type="none"> -ttb:start_trace([Node, OtherNode], [{file, File}, {handler,{fun myhandler/4, S}}]), + tuple in <c>Patterns</c> is converted to a list, which in turn is passed to + <c>ttb:tpl/2,3,4</c>.</p> + <p>The call:</p> + <pre> +> <input>ttb:start_trace([Node, OtherNode], + [{mod, foo, []}, {mod, bar, 2}], + {all, call}, + [{file, File}, {handler,{fun myhandler/4, S}}]).</input></pre> + <p> is equivalent to:</p> + <pre> +> <input>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> +ttb:p(all, call).</input></pre> </desc> </func> + <func> <name>tracer() -> Result</name> - <fsummary>This is equivalent to tracer(node()).</fsummary> + <fsummary>Equivalent to tracer(node()).</fsummary> <desc> - <p>This is equivalent to <c>tracer(node())</c>.</p> + <p>Equivalent to <c>tracer(node())</c>.</p> </desc> </func> + <func> <name>tracer(Shortcut) -> Result</name> - <fsummary>Handy shortcuts for common tracing settings</fsummary> + <fsummary>Handy shortcuts for common tracing settings.</fsummary> <type> <v>Shortcut = shell | dbg</v> </type> <desc> + <p>Handy shortcuts for common tracing settings.</p> <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> + <fsummary>Equivalent to tracer(Nodes,[]).</fsummary> <desc> - <p>This is equivalent to <c>tracer(Nodes,[])</c>.</p> + <p>Equivalent to <c>tracer(Nodes,[])</c>.</p> </desc> </func> + <func> <name>tracer(Nodes,Opts) -> Result</name> - <fsummary>Start a trace port on each given node.</fsummary> + <fsummary>Start a trace port on each specified node.</fsummary> <type> <v>Result = {ok, ActivatedNodes} | {error,Reason}</v> <v>Nodes = atom() | [atom()] | all | existing | new</v> @@ -120,98 +128,109 @@ ttb:p(all, call)</code> <v>ShellSpec = true | false | only</v> </type> <desc> - <p>This function starts a file trace port on all given nodes - and also points the system tracer for sequential tracing to + <p>Starts a file trace port on all specified nodes + and points the system tracer for sequential tracing to the same port. </p> - <p>The given <c>Filename</c> will be prefixed with the node - name. Default <c>Filename</c> is "ttb". - </p> - <p><c>File={wrap,Filename,Size,Count}</c> can be used if - the size of the trace logs must be limited. Default values are - <c>Size=128*1024</c> and <c>Count=8</c>. - </p> - <p>When tracing diskless nodes, <c>ttb</c> must be started + <p><em>Options:</em></p> + <taglist> + <tag><c>Filename</c></tag> + <item><p>The specified <c>Filename</c> is prefixed with the node name. + Default <c>Filename</c> is <c>ttb</c>.</p></item> + <tag><c>File={wrap,Filename,Size,Count}</c></tag> + <item><p>Can be used if the size of the trace logs must be limited. + Default values are + <c>Size=128*1024</c> and <c>Count=8</c>.</p></item> + <tag><c>Client</c></tag> + <item><p>When tracing diskless nodes, <c>ttb</c> must be started from an external "trace control node" with disk access, and <c>Client</c> must be <c>{local, File}</c>. All trace information is then sent to the trace control node where - it is written to file. - </p> - <p>The <c>process_info</c> option indicates if process - information should be collected. If <c>PI = true</c> (which is + it is written to file.</p></item> + <tag><c>process_info</c></tag> + <item><p>Indicates if process + information is to be collected. If <c>PI = true</c> (which is default), each process identifier <c>Pid</c> is replaced by a tuple <c>{Pid,ProcessInfo,Node}</c>, where <c>ProcessInfo</c> - 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>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 + is the registered process name, its globally registered name, + or its initial function. To turn off this functionality, + set <c>PI = false</c>.</p></item> + <tag><c>{shell, ShellSpec}</c></tag> + <item><p>Indicates that trace messages are to be printed on the + console as they are received by the tracing process. This implies + trace client <c>{local, File}</c>. If <c>ShellSpec</c> + is <c>only</c> (instead of <c>true</c>), no trace logs are stored.</p></item> + <tag><c>shell</c></tag> + <item><p>Shortcut for <c>{shell, true}</c>.</p></item> + <tag><c>timer</c></tag> + <item><p>Indicates that the trace is to 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 + are passed to command <c>ttb:stop/2</c> if specified (default is <c>[]</c>). + Notice 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_check</c> option allows to enable overload + <c>ttb:p/2</c> is issued, so you can set up your trace patterns before.</p></item> + <tag><c>overload_check</c></tag> + <item><p>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 + is performed each <c>MSec</c> millisecond. If the check returns + <c>true</c>, the tracing is disabled on a specified node.</p> + <p><c>Module:Function</c> must 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> allows you to initialize and clean + up the check environment.</p> + <p>When a node gets overloaded, it is not possible to issue <c>ttb:p/2</c> + or any command from the <c>ttb:tp/2,3,4</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 + different nodes).</p></item> + <tag><c>flush</c></tag> + <item><p>Periodically flushes all file trace + port clients (see + <seealso marker="runtime_tools:dbg#flush_trace_port/1"> + <c>dbg:flush_trace_port/1</c></seealso>). When enabled, + the buffers are freed each <c>MSec</c> millisecond. This option is + not allowed with <c>{file, {local, File}}</c> tracing.</p></item> + <tag><c>{resume, FetchTimeout}</c></tag> + <item><p>Enables the autoresume feature. + When enabled, remote nodes try to reconnect to the controlling node + if they are restarted. The feature requires application Runtime_Tools + 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 can be performed manually by starting + <c>Runtime_Tools</c> remotely using + <seealso marker="kernel:rpc#call/4"><c>rpc:call/4</c></seealso>.</p> + <p><c>ttb</c> tries to fetch all logs from a reconnecting node before + reinitializing the trace. This must finish within <c>FetchTimeout</c> + milliseconds or is aborted.</p> + <p>By default, autostart information is stored in a file named <c>ttb_autostart.bin</c> on each node. If this is not desired - (i.e. on diskless nodes), a custom module to handle autostart + (for example, on diskless nodes), a custom module handling 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:</p> - <taglist> + environment variable <c>ttb_autostart_module</c> for the application + Runtime_Tools. The module must respond to the following API:</p> + <taglist> <tag><c>write_config(Data) -> ok</c></tag> - <item>Store the provided data for further retrieval. It is + <item><p>Stores 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> + be affected by the node crash.</p></item> <tag><c>read_config() -> {ok, Data} | {error, Error}</c></tag> - <item>Retrieve configuration stored with <c>write_config(Data)</c>.</item> + <item><p>Retrieves configuration stored with <c>write_config(Data)</c>.</p></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><p>Deletes configuration stored with <c>write_config(Data)</c>. + Notice that after this call any subsequent calls to <c>read_config</c> + must return <c>{error, Error}</c>.</p> </item> - </taglist> - <p>The <c>resume</c> option implies the default <c>FetchTimeout</c>, which is + </taglist> + <p><c>resume</c> implies the default <c>FetchTimeout</c>, which is 10 seconds</p> + </item> + </taglist> + </desc> </func> + <func> <name>p(Procs,Flags) -> Return</name> - <fsummary>Sets the given trace flags on the given processes.</fsummary> + <fsummary>Set the specified trace flags on the specified processes.</fsummary> <type> <v>Return = {ok,[{Procs,MatchDesc}]}</v> <v>Procs = Process | [Process] | all | new | existing</v> @@ -219,95 +238,101 @@ ttb:p(all, call)</code> <v>Flags = Flag | [Flag]</v> </type> <desc> - <p>This function sets the given trace flags on the given - processes. The <c>timestamp</c> flag is always turned on. + <p>Sets the specified trace flags on the specified + processes. Flag <c>timestamp</c> 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 - <c>MatchDesc</c> is the same as returned from <c>dbg:p/2</c></p> - <p>Processes can be given as registered names, globally - registered names or process identifiers. If a registered name - is given, the flags are set on processes with this name on all + <p>See the Reference Manual for module + <seealso marker="runtime_tools:dbg"><c>dbg</c></seealso> + and the possible trace flags. Parameter + <c>MatchDesc</c> is the same as returned from + <c>dbg:p/2</c>.</p> + <p>Processes can be specified as registered names, globally + registered names, or process identifiers. If a registered name + is specified, 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>Issuing this command starts the timer for this trace if option + <c>timer</c> is specified with <c>tracer/2</c>. </p> </desc> </func> + <func> <name>tp, tpl, ctp, ctpl, ctpg</name> <fsummary>Set and clear trace patterns.</fsummary> <desc> - <p>These functions should be used in combination with the - <c>call</c> trace flag for setting and clearing trace - patterns. When the <c>call</c> trace flag is set on a process, - function calls will be traced on that process if a trace - pattern has been set for the called function. Trace patterns - specifies how to trace a function by using match + <p>These functions are to be used with + trace flag <c>call</c> for setting and clearing trace + patterns. When trace flag <c>call</c> is set on a process, + function calls are traced on that process if a trace + pattern is set for the called function. Trace patterns + specify how to trace a function by using match specifications. Match specifications are described in the - User's Guide for the erlang runtime system <c>erts</c>. + <seealso marker="erts:users_guide"><c>ERTS User's Guide</c></seealso>. </p> <p>These functions are equivalent to the corresponding - functions in <c>dbg</c>, but all calls are stored in the - history. The history buffer makes it easy to create config - files so that the same trace environment can be setup several - times, e.g. if you want to compare two test runs. It also + functions in module + <seealso marker="runtime_tools:dbg">dbg</seealso>, + but all calls are stored in the + history. The history buffer makes it easy to create configuration + files; the same trace environment can be set up many + times, for example, to compare two test runs. It also reduces the amount of typing when using <c>ttb</c> from the - erlang shell. + Erlang shell. </p> <taglist> <tag><c>tp</c></tag> - <item>Set trace pattern on global function calls</item> + <item><p>Sets trace patterns on global function calls.</p></item> <tag><c>tpl</c></tag> - <item>Set trace pattern on local and global function calls</item> + <item><p>Sets trace patterns on local and global function calls.</p></item> <tag><c>ctp</c></tag> - <item>Clear trace pattern on local and global function - calls</item> + <item><p>Clears trace patterns on local and global function + calls.</p></item> <tag><c>ctpl</c></tag> - <item>Clear trace pattern on local function calls</item> + <item><p>Clears trace patterns on local function calls.</p></item> <tag><c>ctpg</c></tag> - <item>Clear trace pattern on global function calls</item> + <item><p>Clears trace patterns on global function calls.</p></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:</p> - <taglist> - <tag/> + <p>With <c>tp</c> and <c>tpl</c>, one of the match specification shortcuts + can be used (for example, <c>ttb:tp(foo_module, caller)</c>).</p> + <p>The shortcuts are as follows:</p> + <list type="bulleted"> <item><c>return</c> - for <c>[{'_',[],[{return_trace}]}]</c> (report the return value)</item> - <tag/> <item><c>caller</c> - for <c>[{'_',[],[{message,{caller}}]}]</c> (report the calling function)</item> - <tag/> <item><c>{codestr, Str}</c> - for <c>dbg:fun2ms/1</c> arguments passed as strings (example: <c>"fun(_) -> return_trace() end"</c>) </item> - </taglist> + </list> </desc> </func> + <func> <name>list_history() -> History</name> - <fsummary>Returns all calls stored in history</fsummary> + <fsummary>Return all calls stored in history.</fsummary> <type> <v>History = [{N,Func,Args}]</v> </type> <desc> <p>All calls to <c>ttb</c> is stored in the history. This function returns the current content of the history. Any entry - can be re-executed with <c>run_history/1</c> or stored in a - config file with <c>write_config/2/3</c>.</p> + can be reexecuted with <c>run_history/1</c> or stored in a + configuration file with <c>write_config/2,3</c>.</p> </desc> </func> + <func> <name>run_history(N) -> ok | {error, Reason}</name> - <fsummary>Executes one entry of the history</fsummary> + <fsummary>Execute one entry of the history.</fsummary> <type> <v>N = integer() | [integer()]</v> </type> <desc> - <p>Executes the given entry or entries from the history - list. History can be listed with <c>list_history/0</c>.</p> + <p>Executes the specified entry or entries from the history + list. To list history, use <c>list_history/0</c>.</p> </desc> </func> + <func> <name>write_config(ConfigFile,Config)</name> <fsummary>Equivalent to write_config(ConfigFile,Config,[]).</fsummary> @@ -315,9 +340,10 @@ ttb:p(all, call)</code> <p>Equivalent to <c>write_config(ConfigFile,Config,[])</c>.</p> </desc> </func> + <func> <name>write_config(ConfigFile,Config,Opts) -> ok | {error,Reason}</name> - <fsummary>Creates a config file.</fsummary> + <fsummary>Create a configuration file.</fsummary> <type> <v>ConfigFile = string()</v> <v>Config = all | [integer()] | [{Mod,Func,Args}]</v> @@ -328,92 +354,97 @@ ttb:p(all, call)</code> <v>Opt = append</v> </type> <desc> - <p>This function creates or extends a config file which can be + <p>Creates or extends a configuration file, which can be used for restoring a specific configuration later. </p> - <p>The content of the config file can either be fetched from - the history or given directly as a list of + <p>The contents of the configuration file can either be fetched from + the history or specified directly as a list of <c>{Mod,Func,Args}</c>. </p> - <p>If the complete history is to be stored in the config file - <c>Config</c> should be <c>all</c>. If only a selected number - of entries from the history should be stored, <c>Config</c> - should be a list of integers pointing out the entries to be + <p>If the complete history is to be stored in the configuration file, + <c>Config</c> must be <c>all</c>. If only a selected number + of entries from the history are to be stored, <c>Config</c> + must be a list of integers pointing out the entries to be stored. </p> - <p>If <c>Opts</c> is not given or if it is <c>[]</c>, + <p>If <c>Opts</c> is not specified or if it is <c>[]</c>, <c>ConfigFile</c> is deleted and a new file is created. If - <c>Opts = [append]</c>, <c>ConfigFile</c> will not be deleted. - The new information will be appended at the end of the file.</p> + <c>Opts = [append]</c>, <c>ConfigFile</c> is not deleted. + The new information is appended at the end of the file.</p> </desc> </func> + <func> <name>run_config(ConfigFile) -> ok | {error,Reason}</name> - <fsummary>Executes all entries in a config file.</fsummary> + <fsummary>Execute all entries in a configuration file.</fsummary> <type> <v>ConfigFile = string()</v> </type> <desc> - <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> + <p>Executes all entries in the specified configuration file. + Notice that the history of the last trace is always available + in file <c>ttb_last_config</c>.</p> </desc> </func> + <func> <name>run_config(ConfigFile,NumList) -> ok | {error,Reason}</name> - <fsummary>Executes selected entries from a config file.</fsummary> + <fsummary>Execute selected entries from a configuration file.</fsummary> <type> <v>ConfigFile = string()</v> <v>NumList = [integer()]</v> </type> <desc> - <p>Executes selected entries from the given config + <p>Executes selected entries from the specified configuration file. <c>NumList</c> is a list of integers pointing out the entries to be executed. </p> - <p>The content of a config file can be listed with + <p>To list the contents of a configuration file, use <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> + <p>Notice that the history of the last trace is always available + in file <c>ttb_last_config</c>.</p> </desc> </func> + <func> <name>list_config(ConfigFile) -> Config | {error,Reason}</name> - <fsummary>Lists all entries in a config file.</fsummary> + <fsummary>List all entries in a configuration file.</fsummary> <type> <v>ConfigFile = string()</v> <v>Config = [{N,Func,Args}]</v> </type> <desc> - <p>Lists all entries in the given config file.</p> + <p>Lists all entries in the specified configuration file.</p> </desc> </func> + <func> <name>write_trace_info(Key,Info) -> ok</name> - <fsummary>Writes any information to the <c>.ti</c>file.</fsummary> + <fsummary>Write any information to file <c>.ti</c>.</fsummary> <type> <v>Key = term()</v> <v>Info = Data | fun() -> Data</v> <v>Data = term()</v> </type> <desc> - <p>The <c>.ti</c> file contains <c>{Key,ValueList}</c> - tuples. This function adds <c>Data</c> to the ValueList + <p>File <c>.ti</c> contains <c>{Key,ValueList}</c> + tuples. This function adds <c>Data</c> to the <c>ValueList</c> associated with <c>Key</c>. All information written with this - function will be included in the call to the format handler.</p> + function is included in the call to the format handler.</p> </desc> </func> + <func> <name>seq_trigger_ms() -> MatchSpec</name> - <fsummary>Equivalent to seq_trigger_ms(all)</fsummary> + <fsummary>Equivalent to seq_trigger_ms(all).</fsummary> <desc> - <p>Equivalent to <c>seq_trigger_ms(all)</c></p> + <p>Equivalent to <c>seq_trigger_ms(all)</c>.</p> </desc> </func> + <func> <name>seq_trigger_ms(Flags) -> MatchSpec</name> - <fsummary>Returns a match_spec() which starts sequential tracing</fsummary> + <fsummary>Return a match_spec() which starts sequential tracing.</fsummary> <type> <v>MatchSpec = match_spec()</v> <v>Flags = all | SeqTraceFlag | [SeqTraceFlag]</v> @@ -421,54 +452,55 @@ ttb:p(all, call)</code> </type> <desc> <p>A match specification can turn on or off sequential - tracing. This function returns a match specification which - turns on sequential tracing with the given <c>Flags</c>. + tracing. This function returns a match specification, which + turns on sequential tracing with the specified <c>Flags</c>. </p> - <p>This match specification can be given as the last argument - to <c>tp</c> or <c>tpl</c>. The activated <c>Item</c> will - then become a <em>trigger</em> for sequential tracing. This - means that if the item is called on a process with the - <c>call</c> trace flag set, the process will be "contaminated" - with the seq_trace token. + <p>This match specification can be specified as the last argument + to <c>tp</c> or <c>tpl</c>. The activated <c>Item</c> + then becomes a <em>trigger</em> for sequential tracing. This + means that if the item is called on a process with trace flag + <c>call</c> set, the process is "contaminated" + with token <c>seq_trace</c>. </p> <p>If <c>Flags = all</c>, all possible flags are set. </p> - <p>Please turn to the reference manual for the - <em><c>seq_trace</c></em> module in the <em><c>kernel</c></em> - application to see the possible values for - <c>SeqTraceFlag</c>. For a description of the match_spec() - syntax, please turn to the <em>User's guide</em> for the - runtime system (<em>erts</em>). The chapter <em>Match Specification in Erlang</em> explains the general match - specification "language". + <p>The possible values for <c>SeqTraceFlag</c> are available in + <seealso marker="kernel:seq_trace"><c>seq_trace</c></seealso>.</p> + <p>For a description of the <c>match_spec()</c> syntax, + see section + <seealso marker="erts:match_spec"><c>Match Specifications in Erlang</c></seealso> + in <c>ERTS</c>, which explains the general match specification "language". </p> <note> <p>The <em>system tracer</em> for sequential tracing is automatically initiated by <c>ttb</c> when a trace port is - started with <c>ttb:tracer/0/1/2</c>.</p> + started with <c>ttb:tracer/0,1,2</c>.</p> </note> - <p>Example of how to use the <c>seq_trigger_ms/0/1</c> function:</p> - <code type="none"> -(tiger@durin)5> ttb:tracer(). + <p>An example of how to use function <c>seq_trigger_ms/0,1</c> follows:</p> + <pre> +(tiger@durin)5> <input>ttb:tracer().</input> {ok,[tiger@durin]} -(tiger@durin)6> ttb:p(all,call). +(tiger@durin)6> <input>ttb:p(all,call).</input> {ok,{[all],[call]}} -(tiger@durin)7> ttb:tp(mod,func,ttb:seq_trigger_ms()). +(tiger@durin)7> <input>ttb:tp(mod,func,ttb:seq_trigger_ms()).</input> {ok,[{matched,1},{saved,1}]} -(tiger@durin)8> </code> - <p>Whenever <c>mod:func(...)</c> is called after this, the - seq_trace token will be set on the executing process.</p> +(tiger@durin)8></pre> + <p>Whenever <c>mod:func(...)</c> is called after this, + token <c>seq_trace</c> is set on the executing process.</p> </desc> </func> + <func> <name>stop()</name> - <fsummary>Equivalent to stop([])</fsummary> + <fsummary>Equivalent to stop([]).</fsummary> <desc> <p>Equivalent to <c>stop([])</c>.</p> </desc> </func> + <func> <name>stop(Opts) -> stopped | {stopped, Dir}</name> - <fsummary>Stop tracing and fetch/format logs from all nodes</fsummary> + <fsummary>Stop tracing and fetch/format logs from all nodes.</fsummary> <type> <v>Opts = Opt | [Opt]</v> <v>Opt = nofetch | {fetch_dir, Dir} | format | {format, FormatOpts} | return_fetch_dir</v> @@ -485,88 +517,103 @@ ttb:p(all, call)</code> form <c>yyyymmdd-hhmmss</c>. Even logs from nodes on the same machine as the trace control node are moved to this directory. 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 + for further reference (as it is no 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 + <p><em>Options:</em></p> + <taglist> + <tag><c>nofetch</c></tag> + <item><p>Indicates that trace logs are not to be + collected after tracing is stopped.</p></item> + <tag><c>{fetch, Dir}</c></tag> + <item><p>Allows specification of 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. 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> + error is thrown.</p></item> + <tag><c>format</c></tag> + <item><p>Indicates the trace logs to be formatted after tracing + is stopped. All logs in the fetch directory are merged.</p></item> + <tag><c>return_fetch_dir</c></tag> + <item><p>Indicates the return value + to be <c>{stopped, Dir}</c> and not just <c>stopped</c>. + This implies <c>fetch</c>.</p></item> + </taglist> + </desc> </func> + <func> <name>get_et_handler()</name> - <fsummary>Returns <c>et</c> handler.</fsummary> + <fsummary>Return the <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> + <p>Returns the <c>et</c> handler, which can be used with <c>format/2</c> + or <c>tracer/2</c>.</p> + <p>Example: <c>ttb:format(Dir, [{handler, ttb:get_et_handler()}])</c>.</p> </desc> </func> + <func> <name>format(File)</name> - <fsummary>Same as <c>format(File,[])</c>.</fsummary> + <fsummary>Equivalent to <c>format(File,[])</c>.</fsummary> <desc> - <p>Same as <c>format(File,[])</c>.</p> + <p>Equivalent to <c>format(File,[])</c>.</p> </desc> </func> + <func> <name>format(File,Options) -> ok | {error, Reason}</name> - <fsummary>Format a binary trace log</fsummary> + <fsummary>Format a binary trace log.</fsummary> <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> + <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 | [Opt]</v> <v>Opt = {out,Out} | {handler,FormatHandler} | disable_sort</v> <v>Out = standard_io | string()</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> + <d>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> + <d>The trace message. For details, see the Reference Manual for + module <c>erlang</c>.</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>Includes the keys <c>flags</c>, <c>client</c>, and <c>node</c>. + If <c>handler</c> is specified as option to the tracer function, this + is also included. Also, all information written with function + <c>write_trace_info/2</c> is included.</d> </type> <desc> - <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>Reads the specified binary trace log(s). The logs are processed + in the order of their time stamps as long as option <c>disable_sort</c> + is not specified. </p> <p>If <c>FormatHandler = {Function,InitialState}</c>, - <c>Function</c> will be called for each trace message. If - <c>FormatHandler = get_et_handler()</c>, <c>et_viewer</c> in - the <em>Event Tracer</em> application (<c>et</c>) is used for presenting + <c>Function</c> is called for each trace message.</p> + <p>If <c>FormatHandler = get_et_handler()</c>, <c>et_viewer</c> in + application ET 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. + filters that can be selected from menu <em>Filters and scaling</em> + in the <c>et_viewer</c>.</p> + <p>If <c>FormatHandler</c> is not specified, a + default handler is used presenting each trace message as a + text line. </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>The state returned from each call of <c>Function</c> is passed to + the next call, even if the next call is to format a message from another + log file. </p> - <p>If <c>Out</c> is given, <c>FormatHandler</c> gets the + <p>If <c>Out</c> is specified, <c>FormatHandler</c> gets the file descriptor to <c>Out</c> as the first parameter. </p> - <p><c>Out</c> is ignored if <c>et</c> format handler is used. + <p><c>Out</c> is ignored if the <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 - the file. To format the whole set of wrap logs, give the name - with '*' instead of the wrap count. See examples in the - <c>ttb</c> User's Guide.</p> + <p>Wrap logs can be formatted one by one or all at once. To + format one of the wrap logs in a set, specify the exact file name. + To format the whole set of wrap logs, specify the name + with <c>*</c> instead of the wrap count. For examples, see the + <seealso marker="ttb_ug#format"><c>User's Guide</c></seealso>. + </p> </desc> </func> </funcs> diff --git a/lib/observer/doc/src/ttb_ug.xml b/lib/observer/doc/src/ttb_ug.xml index e2a28d67d0..34591ae8de 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>2013</year> + <year>2002</year><year>2016</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -32,78 +32,85 @@ <section> <title>Introduction</title> - <p>The Trace Tool Builder is a base for building trace tools for - single node or distributed erlang systems. It requires the - <c>runtime_tools</c> application to be available on the traced + <p>Trace Tool Builder is a base for building trace tools for + single node or distributed Erlang systems. It requires the + Runtime_Tools application to be available on the traced node. </p> - <p>The main features of the Trace Tool Builder are:</p> + <p>The following are the main features of Trace Tool Builder:</p> <list type="bulleted"> - <item>Start tracing to file ports on several nodes with one + <item>Start tracing to file ports on many nodes with one function call.</item> - <item>Write additional information to a trace information file, + <item>Write more information to a trace information file, which is read during formatting.</item> - <item>Restoring of previous configuration by maintaining a + <item>Restore previous configuration by maintaining a history buffer and handling configuration files.</item> - <item>Some simple support for sequential tracing.</item> - <item>Formatting of binary trace logs and merging of logs from + <item>Provide some simple support for sequential tracing.</item> + <item>Format binary trace logs and merge logs from multiple nodes.</item> </list> - <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> + <p>The intention of Trace Tool Builder is to serve + as a base for tailor-made trace tools, but it can also be used directly + from the Erlang shell (it can mimic <c>dbg</c> behaviour while + still providing useful additions, such as match specification shortcuts). + Trace Tool Builder only allows the use of file port tracer, so to use + other types of trace clients it is better to use <c>dbg</c> directly.</p> </section> <section> <title>Getting Started</title> - <p>The <c>ttb</c> module is the interface to all functions in the - Trace Tool Builder. To get started the least you need to do is to - start a tracer with <c>ttb:tracer/0/1/2</c>, and set the required - 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> (as long as there is anything to format, of - course). + <p>Module <c>ttb</c> is the interface to all functions in + Trace Tool Builder.</p> + <p>To get started, the least you need to do is to + start a tracer with + <seealso marker="ttb#tracer/0"><c>ttb:tracer/0,1,2</c></seealso>, + and set the required + trace flags on the processes you want to trace with + <seealso marker="ttb#p/2"><c>ttb:p/2</c></seealso>.</p> + <p>When the tracing is completed, stop the tracer with + <seealso marker="ttb#stop/0"><c>ttb:stop/0,1</c></seealso> + and format the trace log with + <seealso marker="ttb#format/1"><c>ttb:format/1,2</c></seealso> + (if there is anything to format). </p> - <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 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> - <p>If you want to trace function calls (i.e. if you have the - <c>call</c> trace flag set on any of your processes), you must + <p><em>Useful functions:</em></p> + <taglist> + <tag><c>ttb:tracer/0,1,2</c></tag> + <item><p>Opens a trace port on each node to be traced. By default, + trace messages are written to binary files on remote nodes (the + binary trace log).</p></item> + <tag><c>ttb:p/2</c></tag> + <item><p>Specifies the processes to be traced. Trace flags specified + in this call specify what to trace on each process. This function can be + called many times if you like different trace flags to be set on different + processes.</p></item> + <tag><c>ttb:tp/2,3,4</c> or <c>ttb:tpl/2,3,4</c></tag> + <item><p>If you want to trace function calls (that is, if you have + trace flag <c>call</c> set on any process), you must also set trace patterns on the required function(s) with - <c>ttb:tp</c> or <c>ttb:tpl</c>. A function is only traced if it - has a trace pattern. The trace pattern specifies how to trace the + <seealso marker="ttb#/0"><c>ttb:tp/2,3,4</c></seealso> or + <seealso marker="ttb#/0"><c>ttb:tpl/2,3,4</c></seealso>. + A function is only traced + if it has a trace pattern. The trace pattern specifies how to trace the function by using match specifications. Match specifications are - described in the User's Guide for the erlang runtime system - <c>erts</c>. - </p> - <p><c>ttb:stop/0/1</c> stops tracing on all nodes, deletes all - trace patterns and flushes the trace port buffer. - </p> - <p><c>ttb:format/1/2</c> translates the binary trace logs into - something readable. By default <c>ttb</c> presents each trace - message as a line of text, but you can also write your own handler - to make more complex interpretations of the trace information. A - trace log can even be presented graphically via the Event Tracer - application. Note that if you give the <c>format</c> option to - <c>ttb:stop/1</c> the formatting is automatically done when - stopping <c>ttb</c>. - </p> - + described in the + <seealso marker="erts:users_guide">ERTS User's Guide</seealso>.</p></item> + <tag><c>ttb:stop/0,1</c></tag> + <item><p>Stops tracing on all nodes, deletes all trace patterns, and + flushes the trace port buffer.</p></item> + <tag><c>ttb:format/1/2</c></tag> + <item><p>Translates the binary trace logs into something readable. + By default, <c>ttb</c> presents each trace message as a line of text, + but you can also write your own handler to make more complex interpretations + of the trace information. A trace log can also be presented graphically + with application Event Tracer (ET).</p> + <p>If option <c>format</c> is specified to <c>ttb:stop/1</c>, the formatting + is automatically done when stopping <c>ttb</c>.</p></item> + </taglist> + <section> - <title>Example: Tracing the local node from the erlang shell</title> - <p>This small module is used in the example:</p> + <title>Tracing Local Node from Erlang Shell</title> + <p>The following small module is used in the subsequent example:</p> <code type="none"> -module(m). -export([f/0]). @@ -114,25 +121,25 @@ f() -> 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 (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 + the Erlang shell. Default options are used both for starting the + tracer and for formatting (the custom fetch directory is however provided). + This gives a trace log named <c>Node-ttb</c> in the newly created + directory, where <c>Node</c> is the node name. The default handler prints the formatted trace messages in the - shell.</p> - <code type="none"><![CDATA[ + shell:</p> + <pre> (tiger@durin)47> %% First I spawn a process running my test function -(tiger@durin)47> Pid = spawn(m,f,[]). -<0.125.0> +(tiger@durin)47> <input>Pid = spawn(m,f,[]).</input> +<0.125.0> (tiger@durin)48> (tiger@durin)48> %% Then I start a tracer... -(tiger@durin)48> ttb:tracer(). +(tiger@durin)48> <input>ttb:tracer().</input> {ok,[tiger@durin]} (tiger@durin)49> (tiger@durin)49> %% and activate the new process for tracing (tiger@durin)49> %% function calls and sent messages. -(tiger@durin)49> ttb:p(Pid,[call,send]). -{ok,[{<0.125.0>,[{matched,tiger@durin,1}]}]} +(tiger@durin)49> <input>ttb:p(Pid,[call,send]).</input> +{ok,[{<0.125.0>,[{matched,tiger@durin,1}]}]} (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 @@ -140,33 +147,33 @@ f() -> (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). +(tiger@durin)51> <input>ttb:tp(erlang,now,return).</input> {ok,[{matched,tiger@durin,1},{saved,1}]} (tiger@durin)52> (tiger@durin)52> %% I run my test (i.e. send a message to (tiger@durin)52> %% my new process) -(tiger@durin)52> Pid ! self(). -<0.72.0> +(tiger@durin)52> <input>Pid ! self().</input> +<0.72.0> (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([return, {fetch_dir, "fetch"}]). +(tiger@durin)53> <input>ttb:stop([return, {fetch_dir, "fetch"}]).</input> {stopped, "fetch"} (tiger@durin)54> (tiger@durin)54> %% Finally I format my trace log -(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 -> +(tiger@durin)54> <input>ttb:format("fetch").</input> +({<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} -({<0.125.0>,{m,f,0},tiger@durin}) <0.72.0> ! -{<0.125.0>,{1031,133451,667611}} -ok ]]></code> +({<0.125.0>,{m,f,0},tiger@durin}) <0.72.0> ! +{<0.125.0>,{1031,133451,667611}} +ok</pre> </section> <section> - <title>Example: Build your own tool</title> - <p>This small example shows a simple tool for "debug tracing", - i.e. tracing of function calls with return values.</p> + <title>Build Your Own Tool</title> + <p>The following example shows a simple tool for "debug tracing", + that is, tracing of function calls with return values:</p> <code type="none"><![CDATA[ -module(mydebug). -export([start/0,trc/1,stop/0,format/1]). @@ -228,124 +235,127 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) -> "Return value :~p~n~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 fetched to a directory named + logs, option <c>file</c> is used in + <seealso marker="ttb#tracer/2"><c>tracer/2</c></seealso>. The + logs are therefore 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, + <p>By using option <c>handler</c> 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 - it might be given at the time of formatting instead. It can - however be useful if you e.g. want to automatically format your - trace logs by using the <c>format</c> option in - <c>ttb:stop/1</c>. It also means that you don't need any - knowledge of the content of a binary log to be able to format it - the way it was intended. If the <c>handler</c> option is given - both when starting the tracer and when formatting, the one given - when formatting is used. + it can be specified when formatting instead. However, It can + be useful if you, for example, want to format trace logs automatically + using option <c>format</c> in <c>ttb:stop/1</c>. Also, you do not need + any knowledge of the content of a binary log to format it the way it + is intended. If option <c>handler</c> is specified both when starting + the tracer and when formatting, the one specified when formatting is used. </p> - <p>The <c>call</c> trace flag is set on all processes. This - means that any function activated with the <c>trc/1</c> command - will be traced on all existing and new processes. + <p>Trace flag <c>call</c> is set on all processes. This + means that any function activated with command <c>trc/1</c> + is traced on all existing and new processes. </p> </section> </section> <section> - <title>Running the Trace Tool Builder against a remote node</title> + <title>Running Trace Tool Builder against Remote Node</title> <p>The Observer application might not always be available on the - node that shall be traced (in the following called the "traced - node"). It is still possible to run the Trace Tool Builder from + node to be traced (in the following called the "traced + node"). However, Trace Tool Builder can still be run from another node (in the following called the "trace control node") as - long as + long as the following is fulfilled: </p> <list type="bulleted"> <item>The Observer application is available on the trace control node.</item> - <item>The Runtime Tools application is available on both the + <item>The Runtime_Tools application is available on both the trace control node and the traced node.</item> </list> - <p>If the Trace Tool Builder shall be used against a remote node, + <p>If Trace Tool Builder is to be used against a remote node, it is highly recommended to start the trace control node as <em>hidden</em>. This way it can connect to the traced node - without the traced node "seeing" it, i.e. if the <c>nodes()</c> - BIF is called on the traced node, the trace control node will not - show. To start a hidden node, add the <c>-hidden</c> option to the - <c>erl</c> command, e.g.</p> - <code type="none"> -% erl -sname trace_control -hidden </code> + without being "seen" by it, that is, if the <c>nodes()</c> + BIF is called on the traced node, the trace control node does not + show. To start a hidden node, add option <c>-hidden</c> to the + <c>erl</c> command, for example:</p> + <pre> +% <input>erl -sname trace_control -hidden</input></pre> <section> - <title>Diskless node</title> + <title>Diskless Node</title> <p>If the traced node is diskless, <c>ttb</c> must be started from - a trace control node with disk access, and the <c>file</c> option - 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"}}}). -{ok,[mynode@diskless]} </code> + a trace control node with disk access, and option <c>file</c> + must be specified to function <c>tracer/2</c> with value + <c>{local, File}</c>, for example:</p> + <pre> +(trace_control@durin)1> <input>ttb:tracer(mynode@diskless, + {file,{local,{wrap,"mytrace"}}}).</input> +{ok,[mynode@diskless]}</pre> </section> </section> <section> - <title>Additional tracing options</title> - <p>When setting up a trace, several features may be turned on:</p> + <title>More Tracing Options</title> + <p>When setting up a trace, the following features can also be activated:</p> <list type="bulleted"> - <item>time-constrained tracing,</item> - <item>overload protection,</item> - <item>autoresuming.</item> + <item>Time-constrained tracing</item> + <item>Overload protection</item> + <item>Autoresume</item> + <item><c>dbg</c> mode</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 + <title>Time-Constrained Tracing</title> + <p>It can sometimes be helpful to enable trace for a + specified period of time (for example, to monitor a system for 24 hours + or half a second). This can be done with option + <c>{timer, TimerSpec}</c>. 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> + milliseconds using + <seealso marker="ttb#stop/0"><c>ttb:stop/0</c></seealso>. If more + options are provided (<c>TimerSpec = {MSec, Opts}</c>), + <seealso marker="ttb#stop/1"><c>ttb:stop/1</c></seealso> + is called instead with <c>Opts</c> as argument.</p> + <p>The timer is started with + <seealso marker="ttb#p/2"><c>ttb:p/2</c></seealso>, so any trace patterns + must be set up in advance. + <seealso marker="ttb#start_trace/4"><c>ttb:start_trace/4</c></seealso> + always sets up all patterns before invoking <c>ttb:p/2</c>.</p> + <p>The following example shows how to set up a trace that is + automatically stopped and formatted after 5 seconds: + </p><pre> +(tiger@durin)1> <input>ttb:start_trace([node()], + [{erlang, now,[]}], + {all, call}, + [{timer, {5000, format}}]).</input></pre> + <note><p>Because of network and processing delays, the period + of tracing is approximate.</p></note> + </section> <section> - <title>Overload protection</title> - <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 + <title>Overload Protection</title> + <p>When tracing live systems, always take special care to not + overload a node with too heavy tracing. <c>ttb</c> provides + option <c>overload</c> to address this problem.</p> + <p><c>{overload, MSec, Module, Function}</c> instructs the <c>ttb</c> back end + (a part of the <seealso marker="runtime_tools:index">Runtime_Tools</seealso> + application) to perform overload check every <c>MSec</c> millisecond. + If the check (named <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> + <c>ttb:stop/0,1</c> fetches data from all clients, including everything + collected before the activation of overload protection.</p> + + <note><p> + It is not allowed to change trace details + (with <c>ttb:p</c> and <c>ttb:tp/tpl...</c>) once overload + protection is activated in one of the traced nodes. This is to + avoid trace setup being inconsistent between nodes.</p></note> + + <p><c>Module:Function</c> provided with option <c>overload</c> must + handle three calls: <c>init</c>, <c>check</c>, and <c>stop</c>. <c>init</c> + and <c>stop</c> allow some setup and teardown required by + the check. An overload check module can look as follows: + </p><code type="none"> -module(overload). -export([check/1]). @@ -362,33 +372,37 @@ check(check) -> end; check(stop) -> get(pid) ! stop.</code> + <note><p> + <c>check</c> is always called by the same process, so <c>put</c> and + <c>get</c> are possible.</p></note> </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 + <p>A node can crash (probably a buggy one, hence traced). + Use <c>resume</c> to resume tracing on the node automatically + when it gets back. The failing node then tries to reconnect + to trace control node when <c>Runtime_Tools</c> is started. + This implies that <c>Runtime_Tools</c> must be included in + the startup chain of other nodes (if not, you can still + resume tracing by starting <c>Runtime_Tools</c> manually, + that is, by an RPC call).</p> + <p>To not lose the data that the failing node stored + up to the point of crash, the control node tries to fetch + it before restarting trace. This must occur within the allowed + time frame, otherwise it is aborted (default is 10 seconds, but it + can be changed with <c>{resume, MSec}</c>). The data fetched + this way is then merged with all other traces.</p> + <p>The autostart feature requires more 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 + to the file named "ttb_autostart.bin" in the currect working directory + (cwd) of the traced node. + Users can change this behaviour (that is, 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> + environment variable of <c>runtime_tools</c>). For information + about the API, see module + <seealso marker="ttb"><c>ttb</c></seealso>. + The following example shows the default handler:</p> <code> -module(ttb_autostart). -export([read_config/0, @@ -407,54 +421,60 @@ read_config() -> end. write_config(Data) -> - file:write_file(?AUTOSTART_FILENAME, term_to_binary(Data)). - </code> - <p>Remember that file trace ports buffer the data + file:write_file(?AUTOSTART_FILENAME, term_to_binary(Data)).</code> + + <note><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> + flushed to the binary log. If the risk of failure is + high, it can be a good idea to flush the buffers every + now and then automatically. Passing <c>{flush, MSec}</c> + as an option of <c>ttb:tracer/2</c> flushes all buffers + every <c>MSec</c> millisecond.</p></note> </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> + <title>dbg Mode</title> + <p>Option <c>{shell, ShellType}</c> allows making <c>ttb</c> + operation similar to + <seealso marker="runtime_tools:dbg"><c>dbg</c></seealso>. + 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>). + (making the tool to behave exactly like <c>dbg</c>). 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> + <p>Command <c>ttb:tracer(dbg)</c> is a shortcut for the pure + <c>dbg</c> 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 - <c>.ti</c> is created when the Trace Tool Builder is started. This - is the trace information file. It is a binary file, and it + <title>Trace Information and File .ti</title> + <p>In addition to the trace log file(s), a file with extension + <c>.ti</c> is created when Trace Tool Builder is started. This + is the trace information file. It is a binary file, which 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. .ti files are always fetched - with other logs when the trace is stopped. + the node to which it belongs, and all information written with + function + <seealso marker="ttb#write_trace_info/2"><c>ttb:write_trace_info/2</c></seealso>. + <c>.ti</c> 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 + formatting. Parameter <c>TI</c> is a list of <c>{Key,ValueList}</c> tuples. The keys <c>flags</c>, - <c>handler</c>, <c>file</c> and <c>node</c> are used for + <c>handler</c>, <c>file</c>, and <c>node</c> are used for information written directly by <c>ttb</c>. </p> - <p>You can add information to the trace information file by - calling <c>write_trace_info/2</c>. Note that <c>ValueList</c> - always will be a list, and if you call <c>write_trace_info/2</c> - several times with the same <c>Key</c>, the <c>ValueList</c> will - be extended with a new value each time. Example: + <p>Information to the trace information file by + can be added by calling + <seealso marker="ttb#write_trace_info/2"><c>ttb:write_trace_info/2</c></seealso>. + Notice that <c>ValueList</c> + always is a list, and if you call <c>write_trace_info/2</c> + many times with the same <c>Key</c>, the <c>ValueList</c> is + extended with a new value each time. </p> + <p><em>Example:</em></p> <p><c>ttb:write_trace_info(mykey,1)</c> gives the entry <c>{mykey,[1]}</c> in <c>TI</c>. Another call, <c>ttb:write_trace_info(mykey,2)</c>, changes this entry to @@ -467,15 +487,15 @@ write_config(Data) -> <p>If you want to limit the size of the trace logs, you can use wrap logs. This works almost like a circular buffer. You can specify the maximum number of binary logs and the maximum size of - 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 + each log. <c>ttb</c> then creates a new binary log each time a log + reaches the maximum size. When the maximum number of logs are reached, the oldest log is deleted before a new one is created. </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 + <note><p>The overall size of data generated by <c>ttb</c> can be greater + than the wrap specification suggests. If a traced node restarts + and autoresume is enabled, the old wrap log is always stored and a new one is created. - </p> + </p></note> <p>Wrap logs can be formatted one by one or all at once. See <seealso marker="#format">Formatting</seealso>. </p> @@ -485,52 +505,61 @@ write_config(Data) -> <marker id="format"></marker> <title>Formatting</title> <p>Formatting can be done automatically when stopping <c>ttb</c> - (see <seealso marker="#fetch_format">Automatically collect and format logs from all nodes</seealso>), or explicitly by calling - the <c>ttb:format/1/2</c> function. + (see section + <seealso marker="#fetch_format">Automatically Collect and Format Logs from All Nodes</seealso>), or explicitly by calling function + <c>ttb:format/1,2</c>. </p> <p>Formatting means to read a binary log and present it in a readable format. You can use the default format handler in <c>ttb</c> to present each trace message as a line of text, or write your own handler to make more complex interpretations of the - trace information. You can even use the Event Tracer <c>et</c> to - present the trace log graphically (see <seealso marker="#et_viewer">Presenting trace logs with Event Tracer</seealso>). + trace information. You can also use application ET to + present the trace log graphically (see section + <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 + <p>The first argument to <c>ttb:format/1,2</c> specifies which 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. + that <c>ttb</c> created during log fetch. Unless option + <c>disable_sort</c> is provided, the logs from different files + are always sorted according to time-stamp 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 - formatted text shall be written. Default destination is - <c>standard_io</c>, but a filename can also be given. The - <c>handler</c> option specifies the format handler to use. If this - 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. 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). + options as follows: </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 - example which only prints each trace message could be like this:</p> + <taglist> + <tag><c>out</c></tag> + <item><p>Specifies the destination to write the formatted text. + Default destination is <c>standard_io</c>, but a filename can + also be specified.</p></item> + <tag><c>handler</c></tag> + <item><p>Specifies the format handler to use. If this option is + not specified, option <c>handler</c> that is specified when starting + the tracer is used. If option <c>handler</c> is not specified + when starting the tracer either, a default handler is used, which + prints each trace message as a text line.</p></item> + <tag><c>disable_sort</c></tag> + <item><p>Indicates that the logs are not to be merged according to + time-stamp, but processed one file after another (this can be + a bit faster).</p></item> + </taglist> + <p>A format handler is a fun taking four arguments. This fun is + called for each trace message in the binary log(s). A simple + example that only prints each trace message can be as follows:</p> <code type="none"> fun(Fd, Trace, _TraceInfo, State) -> io:format(Fd, "Trace: ~p~n", [Trace]), State end. </code> - <p><c>Fd</c> is the file descriptor for the destination file, or + <p>Here, <c>Fd</c> is the file descriptor for the destination file, or the atom <c>standard_io</c>. <c>_TraceInfo</c> contains information - from the trace information file (see <seealso marker="#trace_info">Trace Information and the .ti File</seealso>). <c>State</c> is a state variable for the format - handler fun. The initial value of the <c>State</c> variable is - given with the handler option, e.g.</p> + from the trace information file (see section + <seealso marker="#trace_info">Trace Information and File .ti</seealso>). <c>State</c> is a state variable for the format + handler fun. The initial value of variable <c>State</c> is + specified with the handler option, for example:</p> <code type="none"> ttb:format("tiger@durin-ttb", [{handler, {{Mod,Fun}, initial_state}}]) ^^^^^^^^^^^^^ </code> - <p>Another format handler could be used to calculate time spent by + <p>Another format handler can be used to calculate the time spent by the garbage collector:</p> <code type="none"> fun(_Fd,{trace_ts,P,gc_start,_Info,StartTs},_TraceInfo,State) -> @@ -541,111 +570,118 @@ fun(_Fd,{trace_ts,P,gc_start,_Info,StartTs},_TraceInfo,State) -> io:format("GC in process ~w: ~w milliseconds~n", [P,Time]), State -- [{P,StartTs}] end </code> - <p>A more refined version of this format handler is the function - <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>A more refined version of this format handler is function + <c>handle_gc/4</c> in module <c>multitrace.erl</c> + included in directory <c>src</c> of the Observer application. </p> - <p>The actual trace message is passed as the second argument (<c>Trace</c>). - The possible values of <c>Trace</c> are:</p> + <p>The trace message is passed as the second argument (<c>Trace</c>). + The possible values of <c>Trace</c> are the following:</p> <list type="bulleted"> - <item>all trace messages described in <c>erlang:trace/3</c> documentation, + <item>All trace messages described in + <seealso marker="erts:erlang#trace/3"><c>erlang:trace/3</c></seealso> </item> - <item><c>{drop, N}</c> if ip tracer is used (see <c>dbg:trace_port/2</c>), + <item><c>{drop, N}</c> if IP tracer is used (see + <seealso marker="runtime_tools:dbg#trace_port/2"><c>dbg:trace_port/2</c></seealso>) </item> - <item><c>end_of_trace</c> received once when all trace messages have - been processed.</item> + <item><c>end_of_trace</c> received once when all trace messages are + 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>By giving the format handler + <seealso marker="ttb#get_et_handler/0"><c>ttb:get_et_handler()</c></seealso>, + you can have the trace + log presented graphically with <c>et_viewer</c> in the ET + application (see section + <seealso marker="#et_viewer">Presenting Trace Logs with Event Tracer</seealso>). </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 '*' - instead of the wrap count. An example: + <p>You can always decide not to format the whole trace data contained + in the fetch directory, but analyze single files instead. To do so, + a single file (or list of files) must be passed as the first argument + to <c>format/1,2</c>.</p> + <p>Wrap logs can be formatted one by one or all at once. To + format one of the wrap logs in a set, specify the exact file name. + To format the whole set of wrap logs, specify the name with <c>*</c> + instead of the wrap count. </p> + <p><em>Example:</em></p> <p>Start tracing:</p> - <code type="none"> -(tiger@durin)1> ttb:tracer(node(),{file,{wrap,"trace"}}). + <pre> +(tiger@durin)1> <input>ttb:tracer(node(),{file,{wrap,"trace"}}).</input> {ok,[tiger@durin]} -(tiger@durin)2> ttb:p(...) -... </code> - <p>This will give a set of binary logs, like:</p> +(tiger@durin)2> <input>ttb:p(...)</input> +...</pre> + <p>This gives a set of binary logs, for example:</p> <code type="none"> ... </code> <p>Format the whole set of logs:</p> - <code type="none"> -1> ttb:format("tiger@durin-trace.*.wrp"). + <pre> +1> <input>ttb:format("tiger@durin-trace.*.wrp").</input> .... ok -2> </code> +2> </pre> <p>Format only the first log:</p> - <code type="none"> -1> ttb:format("[email protected]"). + <pre> +1> <input>ttb:format("[email protected]").</input> .... ok -2> </code> +2> </pre> <p>To merge all wrap logs from two nodes:</p> - <code type="none"> -1> ttb:format(["tiger@durin-trace.*.wrp","lion@durin-trace.*.wrp"]). + <pre> +1> <input>ttb:format(["tiger@durin-trace.*.wrp","lion@durin-trace.*.wrp"]).</input> .... ok -2> </code> +2> </pre> <section> <marker id="et_viewer"></marker> - <title>Presenting trace logs with Event Tracer</title> - <p>For detailed information about the Event Tracer, please turn - to the User's Guide and Reference Manuals for the <c>et</c> - application. + <title>Presenting Trace Logs with Event Tracer</title> + <p>For detailed information about the Event Tracer, see the + <seealso marker="et:users_guide">ET</seealso> application. </p> - <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 - <c>et_viewer</c> window. The filters are names according to the - type of actors they present (i.e. what each vertical line in the - sequence diagram represent). Interaction between actors is shown - as red arrows between two vertical lines, and activities within - an actor are shown as blue text to the right of the actors line. + <p>By giving the format handler + <seealso marker="ttb#get_et_handler/0"><c>ttb:get_et_handler()</c></seealso>, + you can have the trace log presented graphically with + <c>et_viewer</c> in the ET application. + <c>ttb</c> provides filters that can be selected from the + menu <em>Filter</em> in the <c>et_viewer</c> window. The filters + are names according to the type of actors they present + (that is, what each vertical line in the sequence diagram represents). + Interaction between actors is shown as red arrows between two + vertical lines, and activities within an actor are shown as + blue text to the right of the actors line. </p> - <p>The <c>processes</c> filter is the only filter which will - show all trace messages from a trace log. Each vertical line in + <p>The <c>processes</c> filter is the only filter showing all + trace messages from a trace log. Each vertical line in the sequence diagram represents a process. Erlang messages, - spawn and link/unlink are typical interactions between - processes. Function calls, scheduling and garbage collection are - typical activities within a process. <c>processes</c> is the - default filter. + spawn, and link/unlink are typical interactions between + processes. Function calls, scheduling, and garbage collection, + are typical activities within a process. <c>processes</c> is + the default filter. </p> - <p>The rest of the filters will only show function calls and + <p>The remaining filters only show function calls and function returns. All other trace message are discarded. To get - the most out of these filters, <c>et_viewer</c> needs to known + the most out of these filters, <c>et_viewer</c> must know the caller of each function and the time of return. This can be - obtained by using both the <c>call</c> and <c>return_to</c> - flags when tracing. Note that the <c>return_to</c> flag only - works with local call trace, i.e. when trace patterns are set + obtained using both the <c>call</c> and <c>return_to</c> + flags when tracing. Notice that flag <c>return_to</c> only + works with local call trace, that is, when trace patterns are set with <c>ttb:tpl</c>. </p> - <p>The same result can be obtained by using the <c>call</c> flag - only and setting a match specification like this on local or - global function calls:</p> - <code type="none"> -1> dbg:fun2ms(fun(_) -> return_trace(),message(caller()) end). -[{'_',[],[{return_trace},{message,{caller}}]}] </code> - <p>This should however be done with care, since the - <c>{return_trace}</c> function in the match specification will - destroy tail recursiveness. + <p>The same result can be obtained by using the flag <c>call</c> + only and setting a match specification on local or + global function calls as follows:</p> + <pre> +1> <input>dbg:fun2ms(fun(_) -> return_trace(),message(caller()) end).</input> +[{'_',[],[{return_trace},{message,{caller}}]}]</pre> + <p>This must however be done with care, as function + <c>{return_trace}</c> in the match specification + destroys tail recursiveness. </p> <p>The <c>modules</c> filter shows each module as a vertical line in the sequence diagram. External function calls/returns - are shown as interactions between modules and internal function + are shown as interactions between modules, and internal function calls/returns are shown as activities within a module. </p> <p>The <c>functions</c> filter shows each function as a vertical @@ -656,9 +692,9 @@ ok <p>The <c>mods_and_procs</c> and <c>funcs_and_procs</c> filters are equivalent to the <c>modules</c> and <c>functions</c> filters respectively, except that each module or function can - have several vertical lines, one for each process it resides on. + have many vertical lines, one for each process it resides on. </p> - <p>In the next example, modules <c>foo</c> and <c>bar</c> are used:</p> + <p>In the following example, modules <c>foo</c> and <c>bar</c> are used:</p> <code type="none"> -module(foo). -export([start/0,go/0]). @@ -673,8 +709,9 @@ go() -> go -> bar:f1(), go() - end. -</code><code type="none"> + end.</code> + +<code type="none"> -module(bar). -export([f1/0,f3/0]). f1() -> @@ -685,57 +722,56 @@ f2() -> f3() -> 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 should render a result similar to the - following: + <p>Setting up the trace:</p> +<pre> +(tiger@durin)1> %%First we retrieve the Pid to limit traced processes set +(tiger@durin)1> <input>Pid = foo:start().</input> +(tiger@durin)2> %%Now we set up tracing +(tiger@durin)2> <input>ttb:tracer().</input> +(tiger@durin)3> <input>ttb:p(Pid, [call, return_to, procs, set_on_spawn]).</input> +(tiger@durin)4> <input>ttb:tpl(bar, []).</input> +(tiger@durin)5> %%Invoke our test function and see output with et viewer +(tiger@durin)5> <input>Pid ! go.</input> +(tiger@durin)6> <input>ttb:stop({format, {handler, ttb:get_et_handler()}}).</input></pre> + + <p>This renders a result similar to the following: </p> - <p></p> <image file="et_processes.gif"> <icaption>Filter: "processes"</icaption> </image> + <p></p> <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> + <p>Notice that function + <seealso marker="ttb#start_trace/4"><c>ttb:start_trace/4</c></seealso> + can be used as help as follows:</p> +<pre> +(tiger@durin)1> <input>Pid = foo:start().</input> +(tiger@durin)2> <input>ttb:start_trace([node()], + [{bar,[]}], + {Pid, [call, return_to, procs, set_on_spawn]} + {handler, ttb:get_et_handler()}).</input> +(tiger@durin)3> <input>Pid ! go.</input> +(tiger@durin)4> <input>ttb:stop(format).</input></pre> </section> </section> <section> <marker id="fetch_format"></marker> - <title>Automatically collect and format logs from all nodes</title> - <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. + <title>Automatically Collect and Format Logs from All Nodes</title> + <p>By default, + + <seealso marker="ttb#stop/1"><c>ttb:stop/1</c></seealso> 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 can be disabled + by providing option <c>nofetch</c> to <c>ttb:stop/1</c>. The user can + specify a fetch directory by passing option <c>{fetch_dir, Dir}</c>. </p> - <p>If the option <c>format</c> is given to <c>ttb:stop/1</c>, the + <p>If option <c>format</c> is specified to <c>ttb:stop/1</c>, the trace logs are automatically formatted after tracing is stopped. </p> @@ -743,116 +779,122 @@ f3() -> <section> <title>History and Configuration Files</title> - <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>. There are only - two things added by <c>ttb</c> for these functions:</p> + <p>For the tracing functionality, + <seealso marker="runtime_tools:dbg"><c>dbg</c></seealso> + can be used instead + of <c>ttb</c> for setting trace flags on processes and trace + patterns for call trace, that is, the functions + <c>p</c>, <c>tp</c>, <c>tpl</c>, <c>ctp</c>, <c>ctpl</c>, and <c>ctpg</c>. Only the + following two things are added by <c>ttb</c> for these functions:</p> <list type="bulleted"> - <item>all calls are stored in the history buffer and can be + <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> + easy to set up the same trace environment, for example, 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 (to not force you to use + <seealso marker="runtime_tools:dbg#fun2ms/1"><c>dbg:fun2ms</c></seealso> + continually).</item> </list> - <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. + <p>Use + <seealso marker="ttb#list_history/0"><c>ttb:list_history/0</c></seealso> + to see the content of the history buffer and + <seealso marker="ttb#run_history/1"><c>ttb:run_history/1</c></seealso> + to re-execute one of the entries. </p> <p>The main purpose of the history buffer is the possibility to create configuration files. Any function stored in the history buffer can be written to a configuration file and used for - creating a specific configuration at any time with one single + creating a specific configuration at any time with a single function call. </p> <p>A configuration file is created or extended with - <c>write_config/2/3</c>. Configuration files are binary files + <seealso marker="ttb#write_config/2"><c>ttb:write_config/2,3</c></seealso>. + Configuration files are binary files and can therefore only be read and written with functions provided by <c>ttb</c>. </p> - <p>You can write the complete content of the history buffer to a - config file by calling - <c>ttb:write_config(ConfigFile,all)</c>. And you can write - selected entries from the history by calling + <p>The complete content of the history buffer can be written to a + configuration file by calling + <c>ttb:write_config(ConfigFile,all)</c>. Selected entries from + the history can be written 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. Moreover, the history buffer is always dumped - to <c>ttb_last_config</c> when <c>ttb:stop/0/1</c> is called. + 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 - <c>ttb:write_config(ConfigFile,ConfigList)</c> where + <p>User-defined entries can also be written to a configuration file + by calling function + <c>ttb:write_config(ConfigFile,ConfigList)</c>, where <c>ConfigList</c> is a list of <c>{Module,Function,Args}</c>. </p> <p>Any existing file <c>ConfigFile</c> is deleted and a new file - is created when <c>write_config/2</c> is called. The option - <c>append</c> can be used if you wish to add something at the end - of an existing config file, e.g. + is created when <c>write_config/2</c> is called. Option + <c>append</c> can be used to add something at the end + of an existing configuration file, for example, <c>ttb:write_config(ConfigFile,What,[append])</c>. </p> - <section> - <title>Example: History and configuration files</title> - <p>See the content of the history buffer</p> - <code type="none"><![CDATA[ -(tiger@durin)191> ttb:tracer(). + <p><em>Example:</em></p> + <p>See the content of the history buffer:</p> + <pre> +(tiger@durin)191> <input>ttb:tracer().</input> {ok,[tiger@durin]} -(tiger@durin)192> ttb:p(self(),[garbage_collection,call]). -{ok,{[<0.1244.0>],[garbage_collection,call]}} -(tiger@durin)193> ttb:tp(ets,new,2,[]). +(tiger@durin)192> <input>ttb:p(self(),[garbage_collection,call]).</input> +{ok,{[<0.1244.0>],[garbage_collection,call]}} +(tiger@durin)193> <input>ttb:tp(ets,new,2,[]).</input> {ok,[{matched,1}]} -(tiger@durin)194> ttb:list_history(). +(tiger@durin)194> <input>ttb:list_history().</input> [{1,{ttb,tracer,[tiger@durin,[]]}}, - {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}}, - {3,{ttb,tp,[ets,new,2,[]]}}] ]]></code> + {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}}, + {3,{ttb,tp,[ets,new,2,[]]}}]</pre> <p>Execute an entry from the history buffer:</p> - <code type="none"><![CDATA[ -(tiger@durin)195> ttb:ctp(ets,new,2). + <pre> +(tiger@durin)195> <input>ttb:ctp(ets,new,2).</input> {ok,[{matched,1}]} -(tiger@durin)196> ttb:list_history(). +(tiger@durin)196> <input>ttb:list_history().</input> [{1,{ttb,tracer,[tiger@durin,[]]}}, - {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}}, + {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}}, {3,{ttb,tp,[ets,new,2,[]]}}, {4,{ttb,ctp,[ets,new,2]}}] -(tiger@durin)197> ttb:run_history(3). +(tiger@durin)197> <input>ttb:run_history(3).</input> ttb:tp(ets,new,2,[]) -> -{ok,[{matched,1}]} ]]></code> +{ok,[{matched,1}]}</pre> <p>Write the content of the history buffer to a configuration file:</p> - <code type="none"><![CDATA[ -(tiger@durin)198> ttb:write_config("myconfig",all). + <pre> +(tiger@durin)198> <input>ttb:write_config("myconfig",all).</input> ok -(tiger@durin)199> ttb:list_config("myconfig"). +(tiger@durin)199> <input>ttb:list_config("myconfig").</input> [{1,{ttb,tracer,[tiger@durin,[]]}}, - {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}}, + {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}}, {3,{ttb,tp,[ets,new,2,[]]}}, {4,{ttb,ctp,[ets,new,2]}}, - {5,{ttb,tp,[ets,new,2,[]]}}] ]]></code> + {5,{ttb,tp,[ets,new,2,[]]}}]</pre> <p>Extend an existing configuration:</p> - <code type="none"><![CDATA[ -(tiger@durin)200> ttb:write_config("myconfig",[{ttb,tp,[ets,delete,1,[]]}], -[append]). + <pre> +(tiger@durin)200> <input>ttb:write_config("myconfig",[{ttb,tp,[ets,delete,1,[]]}], +[append]).</input> ok -(tiger@durin)201> ttb:list_config("myconfig"). +(tiger@durin)201> <input>ttb:list_config("myconfig").</input> [{1,{ttb,tracer,[tiger@durin,[]]}}, - {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}}, + {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}}, {3,{ttb,tp,[ets,new,2,[]]}}, {4,{ttb,ctp,[ets,new,2]}}, {5,{ttb,tp,[ets,new,2,[]]}}, - {6,{ttb,tp,[ets,delete,1,[]]}}] ]]></code> + {6,{ttb,tp,[ets,delete,1,[]]}}]</pre> <p>Go back to a previous configuration after stopping Trace Tool Builder:</p> - <code type="none"><![CDATA[ -(tiger@durin)202> ttb:stop(). + <pre> +(tiger@durin)202> <input>ttb:stop().</input> ok -(tiger@durin)203> ttb:run_config("myconfig"). +(tiger@durin)203> <input>ttb:run_config("myconfig").</input> ttb:tracer(tiger@durin,[]) -> {ok,[tiger@durin]} -ttb:p(<0.1244.0>,[garbage_collection,call]) -> -{ok,{[<0.1244.0>],[garbage_collection,call]}} +ttb:p(<0.1244.0>,[garbage_collection,call]) -> +{ok,{[<0.1244.0>],[garbage_collection,call]}} ttb:tp(ets,new,2,[]) -> {ok,[{matched,1}]} @@ -866,133 +908,135 @@ ttb:tp(ets,new,2,[]) -> ttb:tp(ets,delete,1,[]) -> {ok,[{matched,1}]} -ok ]]></code> +ok</pre> <p>Write selected entries from the history buffer to a configuration file:</p> - <code type="none"><![CDATA[ -(tiger@durin)204> ttb:list_history(). + <pre> +(tiger@durin)204> <input>ttb:list_history().</input> [{1,{ttb,tracer,[tiger@durin,[]]}}, - {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}}, + {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}}, {3,{ttb,tp,[ets,new,2,[]]}}, {4,{ttb,ctp,[ets,new,2]}}, {5,{ttb,tp,[ets,new,2,[]]}}, {6,{ttb,tp,[ets,delete,1,[]]}}] -(tiger@durin)205> ttb:write_config("myconfig",[1,2,3,6]). +(tiger@durin)205> <input>ttb:write_config("myconfig",[1,2,3,6]).</input> ok -(tiger@durin)206> ttb:list_config("myconfig"). +(tiger@durin)206> <input>ttb:list_config("myconfig").</input> [{1,{ttb,tracer,[tiger@durin,[]]}}, - {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}}, + {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}}, {3,{ttb,tp,[ets,new,2,[]]}}, {4,{ttb,tp,[ets,delete,1,[]]}}] -(tiger@durin)207> ]]></code> - </section> +(tiger@durin)207></pre> </section> <section> <title>Sequential Tracing</title> <p>To learn what sequential tracing is and how it can be used, - please turn to the reference manual for the - <em><c>seq_trace</c></em> module in the <em><c>kernel</c></em> - application. + see the Reference Manual for + <seealso marker="kernel:seq_trace"><c>seq_trace</c></seealso>. </p> - <p>The support for sequential tracing provided by the Trace Tool - Builder includes </p> + <p>The support for sequential tracing provided by Trace Tool + Builder includes the following:</p> <list type="bulleted"> <item>Initiation of the system tracer. This is automatically - done when a trace port is started with <c>ttb:tracer/0/1/2</c></item> - <item>Creation of match specifications which activates - sequential tracing</item> + done when a trace port is started with + <seealso marker="ttb#tracer/0"><c>ttb:tracer/0,1,2</c></seealso>.</item> + <item>Creation of match specifications that activates + sequential tracing.</item> </list> - <p>Starting sequential tracing requires that a tracer has been - started with the <c>ttb:tracer/0/1/2</c> function. Sequential - tracing can then either be started via a trigger function with a - match specification created with <c>ttb:seq_trigger_ms/0/1</c>, - or directly by using the <c>seq_trace</c> module in the - <c>kernel</c> application. + <p>Starting sequential tracing requires that a tracer is + started with function <c>ttb:tracer/0,1,2</c>. Sequential + tracing can then be started in either of the following ways: </p> + <list type="bulleted"> + <item>Through a trigger function with a match specification + created with + <seealso marker="ttb#seq_trigger_ms/0"><c>ttb:seq_trigger_ms/0,1</c></seealso>.</item> + <item>Directly by using module + <seealso marker="kernel:seq_trace"><c>seq_trace</c></seealso>.</item> + </list> - <section> - <title>Example: Sequential tracing</title> - <p>In the following example, the function + <p><em>Example 1:</em></p> + <p>In the following example, function <c>dbg:get_tracer/0</c> is used as trigger for sequential tracing:</p> - <code type="none"><![CDATA[ -(tiger@durin)110> ttb:tracer(). + <pre> +(tiger@durin)110> <input>ttb:tracer().</input> {ok,[tiger@durin]} -(tiger@durin)111> ttb:p(self(),call). -{ok,{[<0.158.0>],[call]}} -(tiger@durin)112> ttb:tp(dbg,get_tracer,0,ttb:seq_trigger_ms(send)). +(tiger@durin)111> <input>ttb:p(self(),call).</input> +{ok,{[<0.158.0>],[call]}} +(tiger@durin)112> <input>ttb:tp(dbg,get_tracer,0,ttb:seq_trigger_ms(send)).</input> {ok,[{matched,1},{saved,1}]} -(tiger@durin)113> dbg:get_tracer(), seq_trace:reset_trace(). +(tiger@durin)113> <input>dbg:get_tracer(), seq_trace:reset_trace().</input> true -(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}} +(tiger@durin)114> <input>ttb:stop(format).</input> +({<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}} [Serial: {0,1}] -SeqTrace [0]: ({<0.237.0>,dbg,tiger@durin}) -{<0.158.0>,{shell,evaluator,3},tiger@durin} ! {dbg,{ok,#Port<0.222>}} +SeqTrace [0]: ({<0.237.0>,dbg,tiger@durin}) +{<0.158.0>,{shell,evaluator,3},tiger@durin} ! {dbg,{ok,#Port<0.222>}} [Serial: {1,2}] ok -(tiger@durin)116> ]]></code> - <p>Starting sequential tracing with a trigger is actually more +(tiger@durin)116></pre> + <p><em>Example 2:</em></p> + <p>Starting sequential tracing with a trigger is more useful if the trigger function is not called directly from the shell, but rather implicitly within a larger system. When calling a function from the shell, it is simpler to start - sequential tracing directly, e.g.</p> - <code type="none"><![CDATA[ -(tiger@durin)116> ttb:tracer(). + sequential tracing directly, for example, as follows:</p> + <pre> +(tiger@durin)116> <input>ttb:tracer().</input> {ok,[tiger@durin]} -(tiger@durin)117> seq_trace:set_token(send,true), dbg:get_tracer(), -seq_trace:reset_trace(). +(tiger@durin)117> <input>seq_trace:set_token(send,true), dbg:get_tracer(), +seq_trace:reset_trace().</input> true -(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}} +(tiger@durin)118> <input>ttb:stop(format).</input> +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}] -SeqTrace [0]: ({<0.246.0>,dbg,tiger@durin}) -{<0.158.0>,{shell,evaluator,3},tiger@durin} ! {dbg,{ok,#Port<0.229>}} +SeqTrace [0]: ({<0.246.0>,dbg,tiger@durin}) +{<0.158.0>,{shell,evaluator,3},tiger@durin} ! {dbg,{ok,#Port<0.229>}} [Serial: {1,2}] ok -(tiger@durin)120> ]]></code> - <p>In both examples above, the <c>seq_trace:reset_trace/0</c> - resets the trace token immediately after the traced function in - order to avoid lots of trace messages due to the printouts in - the erlang shell. +(tiger@durin)120></pre> + <p>In both previous examples, <c>seq_trace:reset_trace/0</c> + resets the trace token immediately after the traced function + to avoid many trace messages because of the printouts in + the Erlang shell. </p> - <p>All functions in the <c>seq_trace</c> module, except - <c>set_system_tracer/1</c>, can be used after the trace port has - been started with <c>ttb:tracer/0/1/2</c>. + <p>All functions in module <c>seq_trace</c>, except + <c>set_system_tracer/1</c>, can be used after the trace port + is started with <c>ttb:tracer/0,1,2</c>. </p> - </section> </section> <section> - <title>Example: Multipurpose trace tool</title> - <p>The module <c>multitrace.erl</c> which can be found in the - <c>src</c> directory of the Observer application implements a + <title>Multipurpose Trace Tool</title> + <p>Module <c>multitrace</c> in + directory <c>src</c> of the Observer application provides a small tool with three possible trace settings. The trace messages - are written to binary files which can be formatted with the - function <em><c>multitrace:format/1/2</c></em>. + are written to binary files, which can be formatted with + function <c>multitrace:format/1,2</c>: </p> <taglist> - <tag><em><c>multitrace:debug(What)</c></em></tag> - <item>Start calltrace on all processes and trace the given + <tag><c>multitrace:debug(What)</c></tag> + <item><p>Start calltrace on all processes and trace the specified function(s). The format handler used is - <c>multitrace:handle_debug/4</c> which prints each call and - return. <c>What</c> must be an item or a list of items to trace, - given on the format <c>{Module,Function,Arity}</c>, - <c>{Module,Function}</c> or just <c>Module</c>.</item> - <tag><em><c>multitrace:gc(Procs)</c></em></tag> - <item>Trace garbage collection on the given process(es). The - format handler used is <c>multitrace:handle_gc/4</c> which - prints start and stop and the time spent for each GC.</item> - <tag><em><c>multitrace:schedule(Procs)</c></em></tag> - <item>Trace in- and out-scheduling on the given process(es). The - format handler used is <c>multitrace:handle_schedule/4</c> which - prints each in and out scheduling with process, timestamp and + <c>multitrace:handle_debug/4</c> that prints each call and + returns. <c>What</c> must be an item or a list of items to trace, + specified on the format <c>{Module,Function,Arity}</c>, + <c>{Module,Function}</c>, or only <c>Module</c>.</p></item> + <tag><c>multitrace:gc(Procs)</c></tag> + <item><p>Trace garbage collection on the specified process(es). The + format handler used is <c>multitrace:handle_gc/4</c> that + prints start, stop, and the time spent for each garbage collection.</p></item> + <tag><c>multitrace:schedule(Procs)</c></tag> + <item><p>Trace in-scheduling and out-scheduling on the specified process(es). + The format handler used is <c>multitrace:handle_schedule/4</c> that + prints each in-scheduling and out-scheduling with process, time-stamp, and current function. It also prints the total time each traced - process was scheduled in.</item> + process was scheduled in.</p></item> </taglist> </section> </chapter> diff --git a/lib/observer/src/observer_traceoptions_wx.erl b/lib/observer/src/observer_traceoptions_wx.erl index 56ac96a91f..9ba9b72b6f 100644 --- a/lib/observer/src/observer_traceoptions_wx.erl +++ b/lib/observer/src/observer_traceoptions_wx.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2011-2012. All Rights Reserved. +%% Copyright Ericsson AB 2011-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -665,7 +665,7 @@ get_file(Text) -> Str = wxTextCtrl:getValue(Text), Dialog = wxFileDialog:new(Text, [{message, "Select a file"}, - {default_file, Str}]), + {defaultFile, Str}]), case wxDialog:showModal(Dialog) of ?wxID_OK -> Dir = wxFileDialog:getDirectory(Dialog), diff --git a/lib/observer/src/observer_tv_table.erl b/lib/observer/src/observer_tv_table.erl index 88f606b3e4..75e6919642 100644 --- a/lib/observer/src/observer_tv_table.erl +++ b/lib/observer/src/observer_tv_table.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2011-2014. All Rights Reserved. +%% Copyright Ericsson AB 2011-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -669,6 +669,7 @@ merge([], New, _Key) -> merge(Old, New, Key) -> merge2(keysort(Key, Old), keysort(Key, New), Key). +-dialyzer({no_improper_lists, merge2/3}). merge2([[Obj|_]|Old], [Obj|New], Key) -> [[Obj]|merge2(Old, New, Key)]; merge2([[A|Op]|Old], [B|New], Key) diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl index 84af440245..eae4ee01b9 100644 --- a/lib/observer/test/crashdump_viewer_SUITE.erl +++ b/lib/observer/test/crashdump_viewer_SUITE.erl @@ -564,22 +564,11 @@ dump_with_strange_module_name(DataDir,Rel,DumpName) -> CD. dump(Node,DataDir,Rel,DumpName) -> + Crashdump = filename:join(DataDir, dump_prefix(Rel)++DumpName), + rpc:call(Node,os,putenv,["ERL_CRASH_DUMP",Crashdump]), rpc:call(Node,erlang,halt,[DumpName]), - Crashdump0 = filename:join(filename:dirname(code:which(?t)), - "erl_crash_dump.n1"), - Crashdump1 = filename:join(DataDir, dump_prefix(Rel)++DumpName), - ok = rename(Crashdump0,Crashdump1), - Crashdump1. - -rename(From,To) -> - ok = check_complete(From), - case file:rename(From,To) of - {error,exdev} -> - {ok,_} = file:copy(From,To), - ok = file:delete(From); - ok -> - ok - end. + ok = check_complete(Crashdump), + Crashdump. check_complete(File) -> check_complete1(File,10). diff --git a/lib/orber/src/orber_ifr.erl b/lib/orber/src/orber_ifr.erl index cc23d9e242..70e0cb3fca 100644 --- a/lib/orber/src/orber_ifr.erl +++ b/lib/orber/src/orber_ifr.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2012. All Rights Reserved. +%% Copyright Ericsson AB 1997-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -780,6 +780,7 @@ find_repository() -> 'Repository__get_def_kind'(Objref) -> orber_ifr_repository:'_get_def_kind'(Objref). +-spec 'Repository_destroy'(_) -> no_return(). 'Repository_destroy'(Objref) -> orber_ifr_repository:destroy(Objref). 'Repository_lookup'(Objref,Search_name) -> @@ -1405,6 +1406,7 @@ find_repository() -> orber_ifr_orb:create_wstring_tc(Bound). 'ORB_create_sequence_tc'(Bound,Element_type) -> orber_ifr_orb:create_sequence_tc(Bound,Element_type). +-spec 'ORB_create_recursive_sequence_tc'(_,_) -> no_return(). 'ORB_create_recursive_sequence_tc'(Bound,Offset) -> orber_ifr_orb:create_recursive_sequence_tc(Bound,Offset). 'ORB_create_array_tc'(Length,Element_type) -> diff --git a/lib/orber/src/orber_ifr_orb.erl b/lib/orber/src/orber_ifr_orb.erl index a408a9a749..3969bbf37a 100644 --- a/lib/orber/src/orber_ifr_orb.erl +++ b/lib/orber/src/orber_ifr_orb.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2009. All Rights Reserved. +%% Copyright Ericsson AB 1997-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -89,6 +89,7 @@ create_wstring_tc(Bound) -> create_sequence_tc(Bound, Element_type) -> {tk_sequence,Element_type,Bound}. +-spec create_recursive_sequence_tc(_, _) -> no_return(). create_recursive_sequence_tc(Bound, Offset) -> orber:dbg("[~p] ~p:create_recursive_sequence_tc(~p, ~p);~n" "Create_recursive_sequence is not implemented.~n", diff --git a/lib/orber/src/orber_ifr_repository.erl b/lib/orber/src/orber_ifr_repository.erl index 898fba99f3..8d52573e53 100644 --- a/lib/orber/src/orber_ifr_repository.erl +++ b/lib/orber/src/orber_ifr_repository.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2009. All Rights Reserved. +%% Copyright Ericsson AB 1997-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -66,6 +66,7 @@ '_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_Repository, ObjType) -> orber_ifr_irobject:'_get_def_kind'({ObjType, ObjID}). +-spec destroy(_) -> no_return(). destroy({ObjType, ObjID}) ?tcheck(ir_Repository, ObjType) -> orber:dbg("[~p] ~p:destroy(~p, ~p);~n" "Destroying a repository is an error.~n", diff --git a/lib/orber/src/orber_iiop.erl b/lib/orber/src/orber_iiop.erl index d23cd74146..8cb39c7365 100644 --- a/lib/orber/src/orber_iiop.erl +++ b/lib/orber/src/orber_iiop.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2009. All Rights Reserved. +%% Copyright Ericsson AB 1997-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -176,7 +176,7 @@ request({Host, Port, InitObjkey, Index, TaggedProfile, HostData}, corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO}) end. - +-dialyzer({no_improper_lists, encode_request/1}). encode_request(#giop_env{interceptors = false} = Env) -> case catch cdr_encode:enc_request(Env) of {'EXCEPTION', Exc} -> diff --git a/lib/orber/src/orber_iiop_inrequest.erl b/lib/orber/src/orber_iiop_inrequest.erl index 625bfd3e86..9d84b63398 100644 --- a/lib/orber/src/orber_iiop_inrequest.erl +++ b/lib/orber/src/orber_iiop_inrequest.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. +%% Copyright Ericsson AB 1999-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -240,6 +240,7 @@ check_context([_|Rest], Acc, Env) -> %%----------------------------------------------------------------- %% Func: call_interceptors %%----------------------------------------------------------------- +-dialyzer({no_improper_lists, call_interceptors/7}). call_interceptors(SocketType, #giop_env{interceptors = {native, Ref, PIs}, ctx = Ctx} = Env, ReqHdr, Rest, Len, ByteOrder, Msg) -> @@ -276,6 +277,7 @@ call_interceptors(SocketType, #giop_env{interceptors = {portable, _PIs}} = Env, %%----------------------------------------------------------------- %% Func: call_interceptors_out %%----------------------------------------------------------------- +-dialyzer({no_improper_lists, call_interceptors_out/7}). call_interceptors_out(#giop_env{interceptors = {native, Ref, PIs}, ctx = Ctx} = Env, ReqId, Result, Obj, Type, Operation, TypeCodes) -> ReqHdr = #request_header{object_key = Obj, diff --git a/lib/orber/src/orber_pi.erl b/lib/orber/src/orber_pi.erl index 11c489bb17..19bb7af6c0 100644 --- a/lib/orber/src/orber_pi.erl +++ b/lib/orber/src/orber_pi.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2009. All Rights Reserved. +%% Copyright Ericsson AB 2000-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -1030,6 +1030,7 @@ receive_exception(CRI, Mod) -> %% SlotId - ulong() %% Returns : {'EXCEPTION', #'PortableInterceptor_InvalidSlot'{}} %%------------------------------------------------------------ +-spec get_slot(_, _) -> no_return(). get_slot(_XRI, _SlotId) -> corba:raise(#'PortableInterceptor_InvalidSlot'{}). @@ -1185,6 +1186,7 @@ get_server_policy(#'ServerRequestInfo'{contexts = Ctxs}, _PolicyType) -> %% Data - #any{} %% Returns : {'EXCEPTION', #'PortableInterceptor_InvalidSlot'{}} %%------------------------------------------------------------ +-spec set_slot(_, _, _) -> no_return(). set_slot(_SRI, _SlotId, _Data) -> corba:raise(#'PortableInterceptor_InvalidSlot'{}). diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml index 258e7cd1b9..16a7497a22 100644 --- a/lib/public_key/doc/src/public_key.xml +++ b/lib/public_key/doc/src/public_key.xml @@ -114,8 +114,8 @@ </item> <tag><c>pem_entry () =</c></tag> - <item><p><c>{pki_asn1_type(), binary(), %% DER or encrypted DER not_encrypted</c></p> - <p><c>| cipher_info()}</c></p></item> + <item><p><c>{pki_asn1_type(), binary(), %% DER or encrypted DER</c></p> + <p><c> not_encrypted | cipher_info()}</c></p></item> <tag><c>cipher_info() = </c></tag> <item><p><c>{"RC2-CBC" | "DES-CBC" | "DES-EDE3-CBC", crypto:rand_bytes(8)</c></p> @@ -786,13 +786,13 @@ fun(#'DistributionPoint'{}, #'CertificateList'{}, <fsummary>Decodes an SSH file-binary.</fsummary> <type> <v>SshBin = binary()</v> - <d>Example {ok, SshBin} = file:read_file("known_hosts").</d> + <d>Example <c>{ok, SshBin} = file:read_file("known_hosts")</c>.</d> <v>Type = public_key | ssh_file()</v> <d>If <c>Type</c> is <c>public_key</c> the binary can be either an RFC4716 public key or an OpenSSH public key.</d> </type> <desc> - <p>Decodes an SSH file-binary. In the case of <c>know_hosts</c> or + <p>Decodes an SSH file-binary. In the case of <c>known_hosts</c> or <c>auth_keys</c>, the binary can include one or more lines of the file. Returns a list of public keys and their attributes, possible attribute values depends on the file type represented by the @@ -842,7 +842,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{}, <v>Key = rsa_public_key() | dsa_public_key() | ec_public_key()</v> </type> <desc> - <p>Veryfies a digital signature.</p> + <p>Verifies a digital signature.</p> </desc> </func> diff --git a/lib/public_key/doc/src/public_key_records.xml b/lib/public_key/doc/src/public_key_records.xml index fb03da3150..d34f3ed9a3 100644 --- a/lib/public_key/doc/src/public_key_records.xml +++ b/lib/public_key/doc/src/public_key_records.xml @@ -57,9 +57,9 @@ <taglist> <tag><c>time() =</c></tag> - <item><p><c>uct_time() | general_time()</c></p></item> + <item><p><c>utc_time() | general_time()</c></p></item> - <tag><c>uct_time() =</c></tag> + <tag><c>utc_time() =</c></tag> <item><p><c>{utcTime, "YYMMDDHHMMSSZ"}</c></p></item> <tag><c>general_time() =</c></tag> @@ -144,7 +144,7 @@ <section> <title>DSA</title> - <p>Erlang representation of <url href="http://www.ietf.org/rfc/rfc6979.txt">Digigital Signature Algorithm (DSA)</url> keys</p> + <p>Erlang representation of <url href="http://www.ietf.org/rfc/rfc6979.txt">Digital Signature Algorithm (DSA)</url> keys</p> <code> #'DSAPrivateKey',{ version, % integer() diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl index 6a722b0525..d163004c7c 100644 --- a/lib/public_key/src/pubkey_pem.erl +++ b/lib/public_key/src/pubkey_pem.erl @@ -103,7 +103,7 @@ encode_pem_entry({'PrivateKeyInfo', Der, EncParams}) -> [StartStr, "\n", b64encode_and_split(EncDer), "\n", pem_end(StartStr) ,"\n\n"]; encode_pem_entry({Type, Der, {Cipher, Salt}}) -> StartStr = pem_start(Type), - [StartStr,"\n", pem_decrypt(),"\n", pem_decrypt_info(Cipher, Salt),"\n", + [StartStr,"\n", pem_decrypt(),"\n", pem_decrypt_info(Cipher, Salt),"\n\n", b64encode_and_split(Der), "\n", pem_end(StartStr) ,"\n\n"]. decode_pem_entries([], Entries) -> diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl index 5e677f31d6..ea5e036a7e 100644 --- a/lib/public_key/test/public_key_SUITE.erl +++ b/lib/public_key/test/public_key_SUITE.erl @@ -189,6 +189,8 @@ encrypted_pem(Config) when is_list(Config) -> erl_make_certs:der_to_pem(DesKeyFile, [Entry1]), [{'RSAPrivateKey', _, {"DES-CBC", Salt1}} =Entry2] = erl_make_certs:pem_to_der(DesKeyFile), + {ok, Pem} = file:read_file(DesKeyFile), + check_encapsulated_header(Pem), true = check_entry_type(public_key:pem_entry_decode(Entry2, "4567efgh"), 'RSAPrivateKey'). @@ -826,6 +828,15 @@ check_entry_type(#'Certificate'{}, 'Certificate') -> check_entry_type(_,_) -> false. +check_encapsulated_header(Pem) when is_binary(Pem)-> + check_encapsulated_header( binary:split(Pem, <<"\n">>, [global])); +check_encapsulated_header([<<"DEK-Info: DES-CBC,FB7577791A9056A1">>, <<>> | _]) -> + true; +check_encapsulated_header([ _ | Rest]) -> + check_encapsulated_header(Rest); +check_encapsulated_header([]) -> + false. + strip_ending_newlines(Bin) -> string:strip(binary_to_list(Bin), right, 10). diff --git a/lib/runtime_tools/c_src/trace_file_drv.c b/lib/runtime_tools/c_src/trace_file_drv.c index a63a7d3ad9..8863b0d6ac 100644 --- a/lib/runtime_tools/c_src/trace_file_drv.c +++ b/lib/runtime_tools/c_src/trace_file_drv.c @@ -75,12 +75,8 @@ #ifdef DEBUG -#ifndef __WIN32__ -#define ASSERT(X) do {if (!(X)) {erl_exit(1,"%s",#X);} } while(0) -#else #include <assert.h> #define ASSERT(X) assert(X) -#endif #else #define ASSERT(X) #endif diff --git a/lib/runtime_tools/c_src/trace_ip_drv.c b/lib/runtime_tools/c_src/trace_ip_drv.c index f7b5ea65cb..5b43f8179e 100644 --- a/lib/runtime_tools/c_src/trace_ip_drv.c +++ b/lib/runtime_tools/c_src/trace_ip_drv.c @@ -44,19 +44,8 @@ #endif #ifdef DEBUG -# ifndef __WIN32__ - /* erl_exit is not available to dll_drivers on windows. */ - void erl_exit(int, char *, ...); -# define ASSERT(X) \ - do { \ - if (!(X)) { \ - erl_exit(1,"%s",#X); \ - } \ - } while(0) -# else -# include <assert.h> -# define ASSERT(X) assert(X) -# endif +# include <assert.h> +# define ASSERT(X) assert(X) #else # define ASSERT(X) #endif diff --git a/lib/runtime_tools/src/dbg.erl b/lib/runtime_tools/src/dbg.erl index 22b531e6ee..6eea1a0917 100644 --- a/lib/runtime_tools/src/dbg.erl +++ b/lib/runtime_tools/src/dbg.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2013. All Rights Reserved. +%% Copyright Ericsson AB 1996-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -1276,6 +1276,8 @@ gen_reader_file(ReadFun, Filename) -> exit({client_cannot_open, Error}) end. +-dialyzer({no_improper_lists, mk_reader/2}). + %% Creates and returns a reader (lazy list). mk_reader(ReadFun, Source) -> fun() -> @@ -1301,6 +1303,8 @@ mk_reader_wrap([Hd | _] = WrapFiles) -> exit({client_cannot_open, Error}) end. +-dialyzer({no_improper_lists, mk_reader_wrap/2}). + mk_reader_wrap([_Hd | Tail] = WrapFiles, File) -> fun() -> case read_term(fun file_read/2, File) of diff --git a/lib/sasl/src/release_handler_1.erl b/lib/sasl/src/release_handler_1.erl index 5e9a35ab4c..a6325270a5 100644 --- a/lib/sasl/src/release_handler_1.erl +++ b/lib/sasl/src/release_handler_1.erl @@ -676,48 +676,19 @@ maybe_get_dynamic_mods(Name, Pid) -> error(get_modules_failed) end. -%% XXXX -%% Note: The following is a terrible hack done in order to resolve the -%% problem stated in ticket OTP-3452. - -%% XXXX NOTE WELL: This record is from supervisor.erl. Also the record -%% name is really `state'. --record(supervisor_state, {name, - strategy, - children = [], - dynamics = [], - intensity, - period, - restarts = [], - module, - args}). - %% Return the name of the call-back module that implements the %% (top) supervisor SupPid. %% Returns: {ok, Module} | {error,undefined} %% get_supervisor_module(SupPid) -> - case catch get_supervisor_module1(SupPid) of - {ok, Module} when is_atom(Module) -> + case catch supervisor:get_callback_module(SupPid) of + Module when is_atom(Module) -> {ok, Module}; _Other -> io:format("~w: reason: ~w~n", [SupPid, _Other]), {error, undefined} end. -get_supervisor_module1(SupPid) -> - {status, _Pid, {module, _Mod}, - [_PDict, _SysState, _Parent, _Dbg, Misc]} = sys:get_status(SupPid), - %% supervisor Misc field changed at R13B04, handle old and new variants here - State = case Misc of - [_Name, State1, _Type, _Time] -> - State1; - [_Header, _Data, {data, [{"State", State2}]}] -> - State2 - end, - %% Cannot use #supervisor_state{module = Module} = State. - {ok, element(#supervisor_state.module, State)}. - %%----------------------------------------------------------------- %% Func: do_soft_purge/3 %% Args: Mod = atom() diff --git a/lib/sasl/src/sasl.app.src b/lib/sasl/src/sasl.app.src index 705bb73fc5..507e2dc229 100644 --- a/lib/sasl/src/sasl.app.src +++ b/lib/sasl/src/sasl.app.src @@ -46,6 +46,6 @@ {env, [{sasl_error_logger, tty}, {errlog_type, all}]}, {mod, {sasl, []}}, - {runtime_dependencies, ["tools-2.6.14","stdlib-2.6","kernel-4.1", + {runtime_dependencies, ["tools-2.6.14","stdlib-2.8","kernel-4.1", "erts-6.0"]}]}. diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src index 8faa0afbd4..e08ae369b8 100644 --- a/lib/sasl/src/sasl.appup.src +++ b/lib/sasl/src/sasl.appup.src @@ -18,9 +18,9 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"2\\.[5-6](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.* + [{<<"2\\.[5-7](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.* {<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17 %% Down to - max one major revision back - [{<<"2\\.[5-6](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.* + [{<<"2\\.[5-7](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.* {<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-17 }. diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl index d57de2593a..ee620dcdb4 100644 --- a/lib/sasl/test/release_handler_SUITE.erl +++ b/lib/sasl/test/release_handler_SUITE.erl @@ -1363,7 +1363,7 @@ upgrade_supervisor(Conf) when is_list(Conf) -> %% Check that the restart strategy and child spec is updated {status, _, {module, _}, [_, _, _, _, [_,_,{data,[{"State",State}]}]]} = rpc:call(Node,sys,get_status,[a_sup]), - {state,_,RestartStrategy,[Child],_,_,_,_,_,_} = State, + {state,_,RestartStrategy,[Child],_,_,_,_,_,_,_} = State, one_for_all = RestartStrategy, % changed from one_for_one {child,_,_,_,_,brutal_kill,_,_} = Child, % changed from timeout 2000 diff --git a/lib/ssh/doc/src/ssh_sftp.xml b/lib/ssh/doc/src/ssh_sftp.xml index c6ca0f161a..f4b41b74f3 100644 --- a/lib/ssh/doc/src/ssh_sftp.xml +++ b/lib/ssh/doc/src/ssh_sftp.xml @@ -333,7 +333,7 @@ <func> <name>position(ChannelPid, Handle, Location) -></name> - <name>position(ChannelPid, Handle, Location, Timeout) -> {ok, NewPosition | {error, Error}</name> + <name>position(ChannelPid, Handle, Location, Timeout) -> {ok, NewPosition} | {error, Reason}</name> <fsummary>Sets the file position of a file.</fsummary> <type> <v>ChannelPid = pid()</v> @@ -399,7 +399,7 @@ <func> <name>pwrite(ChannelPid, Handle, Position, Data) -> ok</name> - <name>pwrite(ChannelPid, Handle, Position, Data, Timeout) -> ok | {error, Error}</name> + <name>pwrite(ChannelPid, Handle, Position, Data, Timeout) -> ok | {error, Reason}</name> <fsummary>Writes to an open file.</fsummary> <type> <v>ChannelPid = pid()</v> @@ -592,7 +592,7 @@ <func> <name>write(ChannelPid, Handle, Data) -></name> - <name>write(ChannelPid, Handle, Data, Timeout) -> ok | {error, Error}</name> + <name>write(ChannelPid, Handle, Data, Timeout) -> ok | {error, Reason}</name> <fsummary>Writes to an open file.</fsummary> <type> <v>ChannelPid = pid()</v> diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl index f0ac92fef6..49ed15698c 100644 --- a/lib/ssh/test/ssh_algorithms_SUITE.erl +++ b/lib/ssh/test/ssh_algorithms_SUITE.erl @@ -35,7 +35,8 @@ %%-------------------------------------------------------------------- suite() -> - [{ct_hooks,[ts_install_cth]}]. + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,10}}]. all() -> %% [{group,kex},{group,cipher}... etc @@ -90,18 +91,12 @@ init_per_suite(Config) -> ?MAX_NUM_ALGORITHMS ]), ct:log("all() ->~n ~p.~n~ngroups()->~n ~p.~n",[all(),groups()]), - catch crypto:stop(), - case catch crypto:start() of - ok -> - ssh:start(), - [{std_simple_sftp_size,25000} % Sftp transferred data size - | setup_pubkey(Config)]; - _Else -> - {skip, "Crypto could not be started!"} - end. + ssh:start(), + [{std_simple_sftp_size,25000} % Sftp transferred data size + | setup_pubkey(Config)]. + end_per_suite(_Config) -> - ssh:stop(), - crypto:stop(). + ssh:stop(). init_per_group(Group, Config) -> @@ -231,8 +226,11 @@ sshc_simple_exec(Config) -> " ",Host," 1+1."]), ct:log("~p",[Cmd]), SshPort = open_port({spawn, Cmd}, [binary]), + Expect = <<"2\n">>, receive - {SshPort,{data, <<"2\n">>}} -> + {SshPort, {data,Expect}} -> + ct:log("Got expected ~p from ~p",[Expect,SshPort]), + catch port_close(SshPort), ok after ?TIMEOUT -> ct:fail("Did not receive answer") @@ -273,7 +271,9 @@ sshd_simple_exec(_Config) -> ConnectionRef, ChannelId1); Other1 -> ct:fail(Other1) - end. + end, + ssh:close(ConnectionRef). + %%%================================================================ %%% diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl index 4b53f6ec57..094d28e879 100644 --- a/lib/ssh/test/ssh_basic_SUITE.erl +++ b/lib/ssh/test/ssh_basic_SUITE.erl @@ -78,7 +78,8 @@ %%-------------------------------------------------------------------- suite() -> - [{ct_hooks,[ts_install_cth]}]. + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,10}}]. all() -> [app_test, @@ -129,16 +130,11 @@ basic_tests() -> %%-------------------------------------------------------------------- init_per_suite(Config) -> - catch crypto:stop(), - case catch crypto:start() of - ok -> - Config; - _Else -> - {skip, "Crypto could not be started!"} - end. + Config. + end_per_suite(_Config) -> - ssh:stop(), - crypto:stop(). + ssh:stop(). + %%-------------------------------------------------------------------- init_per_group(dsa_key, Config) -> DataDir = ?config(data_dir, Config), @@ -441,6 +437,7 @@ exec(Config) when is_list(Config) -> ct:fail(Other1) end, ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId1), + ssh:close(ConnectionRef), ssh:stop_daemon(Pid). %%-------------------------------------------------------------------- @@ -474,6 +471,7 @@ exec_compressed(Config) when is_list(Config) -> ct:fail(Other) end, ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId), + ssh:close(ConnectionRef), ssh:stop_daemon(Pid) end. @@ -979,7 +977,10 @@ shell_no_unicode(Config) -> new_do_shell(?config(io,Config), [new_prompt, {type,"io:format(\"hej ~p~n\",[42])."}, - {expect,"hej 42"} + {expect,"hej 42"}, + {expect,"ok"}, + new_prompt, + {type,"exit()."} ]). %%-------------------------------------------------------------------- @@ -988,7 +989,9 @@ shell_unicode_string(Config) -> [new_prompt, {type,"io:format(\"こにちわ~ts~n\",[\"四二\"])."}, {expect,"こにちわ四二"}, - {expect,"ok"} + {expect,"ok"}, + new_prompt, + {type,"exit()."} ]). %%-------------------------------------------------------------------- diff --git a/lib/ssh/test/ssh_benchmark_SUITE.erl b/lib/ssh/test/ssh_benchmark_SUITE.erl index e90bfa3d16..fe90da3028 100644 --- a/lib/ssh/test/ssh_benchmark_SUITE.erl +++ b/lib/ssh/test/ssh_benchmark_SUITE.erl @@ -44,9 +44,7 @@ groups() -> init_per_suite(Config) -> catch ssh:stop(), - catch crypto:stop(), try - ok = crypto:start(), report_client_algorithms(), ok = ssh:start(), {ok,TracerPid} = erlang_trace(), @@ -58,7 +56,6 @@ init_per_suite(Config) -> end_per_suite(_Config) -> catch ssh:stop(), - catch crypto:stop(), ok. @@ -406,7 +403,7 @@ function_algs_times_sizes(EncDecs, L) -> end || EncDec <- EncDecs, C = #call{mfa = ED, - args = Args, %%[S,Data], + % args = Args, %%[S,Data], t_call = T0, t_return = T1} <- L, ED == EncDec diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl index 1b93cc9c32..6e90faf0e8 100644 --- a/lib/ssh/test/ssh_connection_SUITE.erl +++ b/lib/ssh/test/ssh_connection_SUITE.erl @@ -36,6 +36,9 @@ %% suite() -> %% [{ct_hooks,[ts_install_cth]}]. +suite() -> + [{timetrap,{minutes,2}}]. + all() -> [ {group, openssh}, @@ -67,16 +70,10 @@ ptty() -> %%-------------------------------------------------------------------- init_per_suite(Config) -> - catch crypto:stop(), - case catch crypto:start() of - ok -> - Config; - _Else -> - {skip, "Crypto could not be started!"} - end. + Config. -end_per_suite(_Config) -> - crypto:stop(). +end_per_suite(Config) -> + Config. %%-------------------------------------------------------------------- init_per_group(openssh, Config) -> diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl index 6a201d401f..ba0107efd6 100644 --- a/lib/ssh/test/ssh_options_SUITE.erl +++ b/lib/ssh/test/ssh_options_SUITE.erl @@ -79,7 +79,8 @@ %%-------------------------------------------------------------------- suite() -> - [{ct_hooks,[ts_install_cth]}]. + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,6}}]. all() -> [connectfun_disconnectfun_server, @@ -125,16 +126,11 @@ groups() -> %%-------------------------------------------------------------------- init_per_suite(Config) -> - catch crypto:stop(), - case catch crypto:start() of - ok -> - Config; - _Else -> - {skip, "Crypto could not be started!"} - end. + Config. + end_per_suite(_Config) -> - ssh:stop(), - crypto:stop(). + ssh:stop(). + %%-------------------------------------------------------------------- init_per_group(hardening_tests, Config) -> DataDir = ?config(data_dir, Config), diff --git a/lib/ssh/test/ssh_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl index fe197f8672..44da0f4d6f 100644 --- a/lib/ssh/test/ssh_protocol_SUITE.erl +++ b/lib/ssh/test/ssh_protocol_SUITE.erl @@ -42,7 +42,8 @@ %%-------------------------------------------------------------------- suite() -> - [{ct_hooks,[ts_install_cth]}]. + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,2}}]. all() -> [{group,tool_tests}, @@ -579,23 +580,11 @@ client_handles_keyboard_interactive_0_pwds(Config) -> %%%---- init_suite and end_suite --------------------------------------- start_apps(Config) -> - catch crypto:stop(), - case catch crypto:start() of - ok -> - catch ssh:stop(), - ok = ssh:start(), - [{stop_apps, - fun() -> - ssh:stop(), - crypto:stop() - end} | Config]; - _Else -> - {skip, "Crypto could not be started!"} - end. - + catch ssh:stop(), + ok = ssh:start(), + Config. -stop_apps(Config) -> - (?v(stop_apps, Config, fun()-> ok end))(), +stop_apps(_Config) -> ssh:stop(). diff --git a/lib/ssh/test/ssh_renegotiate_SUITE.erl b/lib/ssh/test/ssh_renegotiate_SUITE.erl index e5cfa58bad..6d2c97aa68 100644 --- a/lib/ssh/test/ssh_renegotiate_SUITE.erl +++ b/lib/ssh/test/ssh_renegotiate_SUITE.erl @@ -30,7 +30,9 @@ %% Common Test interface functions ----------------------------------- %%-------------------------------------------------------------------- -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,12}}]. + all() -> [{group,default_algs}, {group,aes_gcm} @@ -44,16 +46,10 @@ tests() -> [rekey, rekey_limit, renegotiate1, renegotiate2]. %%-------------------------------------------------------------------- init_per_suite(Config) -> - catch crypto:stop(), - case catch crypto:start() of - ok -> - Config; - _Else -> - {skip, "Crypto could not be started!"} - end. + Config. + end_per_suite(_Config) -> - ssh:stop(), - crypto:stop(). + ssh:stop(). %%-------------------------------------------------------------------- init_per_group(aes_gcm, Config) -> diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl index 698af259c8..c2b04d7a05 100644 --- a/lib/ssh/test/ssh_sftp_SUITE.erl +++ b/lib/ssh/test/ssh_sftp_SUITE.erl @@ -35,7 +35,9 @@ %%-------------------------------------------------------------------- suite() -> - [{ct_hooks,[ts_install_cth]}]. + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,2}}]. + all() -> [{group, not_unicode}, @@ -44,22 +46,14 @@ all() -> init_per_suite(Config) -> - catch crypto:stop(), - case (catch crypto:start()) of - ok -> - ct:log("file:native_name_encoding() = ~p,~nio:getopts() = ~p", - [file:native_name_encoding(),io:getopts()]), - ssh:start(), - Config; - _ -> - {skip,"Could not start crypto!"} - end. - -end_per_suite(Config) -> - ssh:stop(), - crypto:stop(), + ct:log("file:native_name_encoding() = ~p,~nio:getopts() = ~p", + [file:native_name_encoding(),io:getopts()]), + ssh:start(), Config. +end_per_suite(_onfig) -> + ssh:stop(). + %%-------------------------------------------------------------------- groups() -> [{not_unicode, [], [{group,erlang_server}, diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index 6b03a2b763..45439ce0fa 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -44,6 +44,9 @@ %% Common Test interface functions ----------------------------------- %%-------------------------------------------------------------------- +suite() -> + [{timetrap,{minutes,3}}]. + all() -> [open_close_file, open_close_dir, @@ -69,28 +72,21 @@ groups() -> %%-------------------------------------------------------------------- init_per_suite(Config) -> - catch crypto:stop(), - case (catch crypto:start()) of - ok -> - DataDir = ?config(data_dir, Config), - PrivDir = ?config(priv_dir, Config), - ssh_test_lib:setup_dsa(DataDir, PrivDir), - %% to make sure we don't use public-key-auth - %% this should be tested by other test suites - UserDir = filename:join(?config(priv_dir, Config), nopubkey), - file:make_dir(UserDir), - Config; - _ -> - {skip,"Could not start crypto!"} - end. + DataDir = ?config(data_dir, Config), + PrivDir = ?config(priv_dir, Config), + ssh_test_lib:setup_dsa(DataDir, PrivDir), + %% to make sure we don't use public-key-auth + %% this should be tested by other test suites + UserDir = filename:join(?config(priv_dir, Config), nopubkey), + file:make_dir(UserDir), + Config. end_per_suite(Config) -> SysDir = ?config(priv_dir, Config), ssh_test_lib:clean_dsa(SysDir), UserDir = filename:join(?config(priv_dir, Config), nopubkey), file:del_dir(UserDir), - ssh:stop(), - crypto:stop(). + ssh:stop(). %%-------------------------------------------------------------------- diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl index 7a025a6518..02a2ac4cf9 100644 --- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl @@ -36,7 +36,9 @@ %%-------------------------------------------------------------------- suite() -> - [{ct_hooks,[ts_install_cth]}]. + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,2}}]. + all() -> [close_file, @@ -53,29 +55,22 @@ groups() -> init_per_suite(Config) -> catch ssh:stop(), - catch crypto:stop(), - case catch crypto:start() of - ok -> - DataDir = ?config(data_dir, Config), - PrivDir = ?config(priv_dir, Config), - FileAlt = filename:join(DataDir, "ssh_sftpd_file_alt.erl"), - c:c(FileAlt), - FileName = filename:join(DataDir, "test.txt"), - {ok, FileInfo} = file:read_file_info(FileName), - ok = file:write_file_info(FileName, - FileInfo#file_info{mode = 8#400}), - ssh_test_lib:setup_dsa(DataDir, PrivDir), - Config; - _Else -> - {skip,"Could not start ssh!"} - end. + DataDir = ?config(data_dir, Config), + PrivDir = ?config(priv_dir, Config), + FileAlt = filename:join(DataDir, "ssh_sftpd_file_alt.erl"), + c:c(FileAlt), + FileName = filename:join(DataDir, "test.txt"), + {ok, FileInfo} = file:read_file_info(FileName), + ok = file:write_file_info(FileName, + FileInfo#file_info{mode = 8#400}), + ssh_test_lib:setup_dsa(DataDir, PrivDir), + Config. end_per_suite(Config) -> UserDir = filename:join(?config(priv_dir, Config), nopubkey), file:del_dir(UserDir), SysDir = ?config(priv_dir, Config), ssh_test_lib:clean_dsa(SysDir), - crypto:stop(), ok. %%-------------------------------------------------------------------- diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl index 5c77fcf1ef..18e91a9af3 100644 --- a/lib/ssh/test/ssh_sup_SUITE.erl +++ b/lib/ssh/test/ssh_sup_SUITE.erl @@ -34,6 +34,10 @@ %% Common Test interface functions ----------------------------------- %%-------------------------------------------------------------------- +suite() -> + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,1}}]. + all() -> [default_tree, sshc_subtree, sshd_subtree, sshd_subtree_profile]. diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl index 2db55b97b4..5f91fb627a 100644 --- a/lib/ssh/test/ssh_test_lib.erl +++ b/lib/ssh/test/ssh_test_lib.erl @@ -120,7 +120,8 @@ std_simple_exec(Host, Port, Config, Opts) -> Other -> ct:fail(Other) end, - ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId). + ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId), + ssh:close(ConnectionRef). start_shell(Port, IOServer, UserDir) -> @@ -154,14 +155,12 @@ loop_io_server(TestCase, Buff0) -> {input, TestCase, Line} -> loop_io_server(TestCase, Buff0 ++ [Line]); {io_request, From, ReplyAs, Request} -> -%%ct:log("~p",[{io_request, From, ReplyAs, Request}]), {ok, Reply, Buff} = io_request(Request, TestCase, From, ReplyAs, Buff0), -%%ct:log("io_request(~p)-->~p",[Request,{ok, Reply, Buff}]), io_reply(From, ReplyAs, Reply), loop_io_server(TestCase, Buff); - {'EXIT',_, _} -> - erlang:display('ssh_test_lib:loop_io_server/2 EXIT'), + {'EXIT',_, _} = _Exit -> +%% ct:log("ssh_test_lib:loop_io_server/2 got ~p",[_Exit]), ok after 30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE]) diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl index 67a61d3c11..2788bc6b58 100644 --- a/lib/ssh/test/ssh_to_openssh_SUITE.erl +++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl @@ -33,6 +33,9 @@ %% Common Test interface functions ----------------------------------- %%-------------------------------------------------------------------- +suite() -> + [{timetrap,{minutes,1}}]. + all() -> case os:find_executable("ssh") of false -> @@ -57,21 +60,14 @@ groups() -> ]. init_per_suite(Config) -> - catch crypto:stop(), - case catch crypto:start() of - ok -> - case gen_tcp:connect("localhost", 22, []) of - {error,econnrefused} -> - {skip,"No openssh deamon"}; - _ -> - ssh_test_lib:openssh_sanity_check(Config) - end; - _Else -> - {skip,"Could not start crypto!"} + case gen_tcp:connect("localhost", 22, []) of + {error,econnrefused} -> + {skip,"No openssh deamon"}; + _ -> + ssh_test_lib:openssh_sanity_check(Config) end. end_per_suite(_Config) -> - crypto:stop(), ok. init_per_group(erlang_server, Config) -> diff --git a/lib/ssh/test/ssh_upgrade_SUITE.erl b/lib/ssh/test/ssh_upgrade_SUITE.erl index 85f4d36258..bf8874b118 100644 --- a/lib/ssh/test/ssh_upgrade_SUITE.erl +++ b/lib/ssh/test/ssh_upgrade_SUITE.erl @@ -38,6 +38,9 @@ %%% %%% CommonTest callbacks %%% +suite() -> + [{timetrap,{minutes,2}}]. + all() -> [ minor_upgrade, @@ -45,27 +48,17 @@ all() -> ]. init_per_suite(Config0) -> - catch crypto:stop(), - try {crypto:start(), erlang:system_info({wordsize, internal}) == - erlang:system_info({wordsize, external})} of - {ok, true} -> - case ct_release_test:init(Config0) of - {skip, Reason} -> - {skip, Reason}; - Config -> - ssh:start(), - Config - end; - {ok, false} -> - {skip, "Test server will not handle halfwordemulator correctly. Skip as halfwordemulator is deprecated"} - catch _:_ -> - {skip, "Crypto did not start"} + case ct_release_test:init(Config0) of + {skip, Reason} -> + {skip, Reason}; + Config -> + ssh:start(), + Config end. end_per_suite(Config) -> ct_release_test:cleanup(Config), ssh:stop(), - crypto:stop(), UserDir = ?config(priv_dir, Config), ssh_test_lib:clean_rsa(UserDir). diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 55d12abffe..41b42d454b 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,5 +1,5 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 4.2.1 +SSH_VSN = 4.2.2 APP_VSN = "ssh-$(SSH_VSN)" diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index bf87644116..a76d46ee9b 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -144,7 +144,9 @@ <p>According to old API.</p></item> <tag><c>ciphersuite() =</c></tag> - <item><p><c>{key_exchange(), cipher(), hash()}</c></p></item> + + <item><p><c>{key_exchange(), cipher(), MAC::hash()} | + {key_exchange(), cipher(), MAC::hash(), PRF::hash()}</c></p></item> <tag><c>key_exchange()=</c></tag> <item><p><c>rsa | dhe_dss | dhe_rsa | dh_anon | psk | dhe_psk @@ -156,7 +158,7 @@ | aes_128_cbc | aes_256_cbc | aes_128_gcm | aes_256_gcm</c></p></item> <tag><c>hash() =</c></tag> - <item><p><c>md5 | sha</c></p></item> + <item><p><c>md5 | sha | sha224 | sha256 | sha348 | sha512</c></p></item> <tag><c>prf_random() =</c></tag> <item><p><c>client_random | server_random</c></p></item> @@ -221,7 +223,7 @@ <url href="http://www.ietf.org/rfc/rfc5746.txt">RFC 5746</url>. By default <c>secure_renegotiate</c> is set to <c>false</c>, that is, secure renegotiation is used if possible, - but it fallback to unsecure renegotiation if the peer + but it falls back to insecure renegotiation if the peer does not support <url href="http://www.ietf.org/rfc/rfc5746.txt">RFC 5746</url>.</p> </item> @@ -269,7 +271,11 @@ atom()}} | terminate regarding verification failures and the connection is established.</p></item> <item><p>If called with an extension unknown to the user application, - return value <c>{unknown, UserState}</c> is to be used.</p></item> + return value <c>{unknown, UserState}</c> is to be used.</p> + + <p>Note that if the fun returns <c>unknown</c> for an extension marked + as critical, validation will fail.</p> + </item> </list> <p>Default option <c>verify_fun</c> in <c>verify_peer mode</c>:</p> @@ -291,6 +297,8 @@ atom()}} | <code> {fun(_,{bad_cert, _}, UserState) -> {valid, UserState}; + (_,{extension, #'Extension'{critical = true}}, UserState) -> + {valid, UserState}; (_,{extension, _}, UserState) -> {unknown, UserState}; (_, valid, UserState) -> @@ -307,7 +315,7 @@ atom()}} | <tag><c>unknown_ca</c></tag> <item><p>No trusted CA was found in the trusted store. The trusted CA is normally a so called ROOT CA, which is a self-signed certificate. Trust can - be claimed for an intermediat CA (trusted anchor does not have to be + be claimed for an intermediate CA (trusted anchor does not have to be self-signed according to X-509) by using option <c>partial_chain</c>.</p> </item> @@ -352,7 +360,7 @@ marker="public_key:public_key#pkix_path_validation-3">public_key:pkix_path_valid <tag><c>{http, timeout()}</c></tag> <item><p> Enables fetching of CRLs specified as http URIs in<seealso - marker="public_key:public_key_records"> X509 cerificate extensions.</seealso> + marker="public_key:public_key_records"> X509 certificate extensions.</seealso> Requires the OTP inets application.</p> </item> </taglist> @@ -611,14 +619,14 @@ fun(srp, Username :: string(), UserState :: term()) -> <tag><c>{sni_hosts, [{hostname(), ssloptions()}]}</c></tag> <item><p>If the server receives a SNI (Server Name Indication) from the client - matching a host listed in the <c>sni_hosts</c> option, the speicific options for + matching a host listed in the <c>sni_hosts</c> option, the specific options for that host will override previously specified options. The option <c>sni_fun</c>, and <c>sni_hosts</c> are mutually exclusive.</p></item> <tag><c>{sni_fun, SNIfun::fun()}</c></tag> <item><p>If the server receives a SNI (Server Name Indication) from the client, - the given function will be called to retrive <c>ssloptions()</c> for indicated server. + the given function will be called to retrieve <c>ssloptions()</c> for the indicated server. These options will be merged into predefined <c>ssloptions()</c>. The function should be defined as: @@ -632,7 +640,7 @@ fun(srp, Username :: string(), UserState :: term()) -> of resources of such an operation is higher for the server than the client. This can act as a vector for denial of service attacks. The SSL application already takes measures to counter-act such attempts, - but client-initiated renegotiation can be stricly disabled by setting + but client-initiated renegotiation can be strictly disabled by setting this option to <c>false</c>. The default value is <c>true</c>. Note that disabling renegotiation can result in long-lived connections becoming unusable due to limits on the number of messages the underlying @@ -748,26 +756,13 @@ fun(srp, Username :: string(), UserState :: term()) -> <v>How = timeout() | {NewController::pid(), timeout()} </v> <v>Reason = term()</v> </type> - <desc><p>Closes or downgrades an SSL connection, in the later case the transport - connection will be handed over to the <c>NewController</c> process after reciving - the TLS close alert from the peer. The retuned transport socket will have - the following options set [{active, false}, {packet, 0}, {mode, binary}].</p> - </desc> - </func> - - <func> - <name>connection_info(SslSocket) -> - {ok, {ProtocolVersion, CipherSuite}} | {error, Reason}</name> - <fsummary>Returns the Negotiated Protocol version and cipher suite. - </fsummary> - <type> - <v>CipherSuite = ciphersuite()</v> - <v>ProtocolVersion = protocol()</v> - </type> - <desc><p>Returns the Negotiated Protocol version and cipher suite.</p> + <desc><p>Closes or downgrades an SSL connection. In the latter case the transport + connection will be handed over to the <c>NewController</c> process after receiving + the TLS close alert from the peer. The returned transport socket will have + the following options set: <c>[{active, false}, {packet, 0}, {mode, binary}]</c></p> </desc> </func> - + <func> <name>controlling_process(SslSocket, NewOwner) -> ok | {error, Reason}</name> @@ -786,40 +781,36 @@ fun(srp, Username :: string(), UserState :: term()) -> <func> <name>connection_information(SslSocket) -> - {ok, Info} | {error, Reason} </name> + {ok, Result} | {error, Reason} </name> <fsummary>Returns all the connection information. </fsummary> <type> - <v>Info = [InfoTuple]</v> - <v>InfoTuple = {protocol, Protocol} | {cipher_suite, CipherSuite} | {sni_hostname, SNIHostname}</v> - <v>CipherSuite = ciphersuite()</v> - <v>ProtocolVersion = protocol()</v> - <v>SNIHostname = string()</v> + <v>Item = protocol | cipher_suite | sni_hostname | atom()</v> + <d>Meaningful atoms, not specified above, are the ssl option names.</d> + <v>Result = [{Item::atom(), Value::term()}]</v> <v>Reason = term()</v> </type> - <desc><p>Return all the connection information containing negotiated protocol version, cipher suite, and the hostname of SNI extension. - Info will be a proplists containing all the connection information on success, otherwise <c>{error, Reason}</c> will be returned.</p> + <desc><p>Returns all relevant information about the connection, ssl options that + are undefined will be filtered out.</p> </desc> </func> <func> <name>connection_information(SslSocket, Items) -> - {ok, Info} | {error, Reason} </name> + {ok, Result} | {error, Reason} </name> <fsummary>Returns the requested connection information. </fsummary> <type> - <v>Items = [Item]</v> - <v>Item = protocol | cipher_suite | sni_hostname</v> - <v>Info = [InfoTuple]</v> - <v>InfoTuple = {protocol, Protocol} | {cipher_suite, CipherSuite} | {sni_hostname, SNIHostname}</v> - <v>CipherSuite = ciphersuite()</v> - <v>ProtocolVersion = protocol()</v> - <v>SNIHostname = string()</v> + <v>Items = [Item]</v> + <v>Item = protocol | cipher_suite | sni_hostname | atom()</v> + <d>Meaningful atoms, not specified above, are the ssl option names.</d> + <v>Result = [{Item::atom(), Value::term()}]</v> <v>Reason = term()</v> </type> - <desc><p>Returns the connection information you requested. The connection information you can request contains protocol, cipher_suite, and sni_hostname. - <c>{ok, Info}</c> will be returned if it executes sucessfully. The Info is a proplists containing the information you requested. - Otherwise, <c>{error, Reason}</c> will be returned.</p> + <desc><p>Returns the requested information items about the connection, + if they are defined.</p> + <note><p>If only undefined options are requested the + resulting list can be empty.</p></note> </desc> </func> @@ -1146,7 +1137,7 @@ fun(srp, Username :: string(), UserState :: term()) -> <seealso marker="#listen-2"> listen/2</seealso>, and <seealso marker="#ssl_accept-2">ssl_accept/[1,2,3]</seealso>. For the negotiated TLS/SSL version, see <seealso - marker="#connection_info-1">ssl:connection_info/1 + marker="#connection_information-1">ssl:connection_information/1 </seealso>.</item> <tag><c>available</c></tag> diff --git a/lib/ssl/doc/src/ssl_distribution.xml b/lib/ssl/doc/src/ssl_distribution.xml index a347ce5ae6..dc04d446b0 100644 --- a/lib/ssl/doc/src/ssl_distribution.xml +++ b/lib/ssl/doc/src/ssl_distribution.xml @@ -271,4 +271,27 @@ Eshell V5.0 (abort with ^G) <p>The <c>init:get_arguments()</c> call verifies that the correct arguments are supplied to the emulator.</p> </section> + + <section> + <title>Using SSL distribution over IPv6</title> + <p>It is possible to use SSL distribution over IPv6 instead of + IPv4. To do this, pass the option <c>-proto_dist inet6_tls</c> + instead of <c>-proto_dist inet_tls</c> when starting Erlang, + either on the command line or in the <c>ERL_FLAGS</c> environment + variable.</p> + + <p>An example command line with this option would look like this:</p> + <code type="none"> +$ erl -boot /home/me/ssl/start_ssl -proto_dist inet6_tls + -ssl_dist_opt server_certfile "/home/me/ssl/erlserver.pem" + -ssl_dist_opt server_secure_renegotiate true client_secure_renegotiate true + -sname ssl_test +Erlang (BEAM) emulator version 5.0 [source] + +Eshell V5.0 (abort with ^G) +(ssl_test@myhost)1> </code> + + <p>A node started in this way will only be able to communicate with + other nodes using SSL distribution over IPv6.</p> + </section> </chapter> diff --git a/lib/ssl/examples/src/client_server.erl b/lib/ssl/examples/src/client_server.erl index 799027123f..019b5130d2 100644 --- a/lib/ssl/examples/src/client_server.erl +++ b/lib/ssl/examples/src/client_server.erl @@ -26,9 +26,7 @@ start() -> %% Start ssl application - application:start(crypto), - application:start(public_key), - application:start(ssl), + {ok, StartedApps} = application:ensure_all_started(ssl), %% Let the current process be the server that listens and accepts %% Listen @@ -52,7 +50,8 @@ start() -> ssl:close(ASock), io:fwrite("Listen: closing and terminating.~n"), ssl:close(LSock), - application:stop(ssl). + + lists:foreach(fun application:stop/1, lists:reverse(StartedApps)). %% Client connect diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile index 790328dc45..7a7a373487 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -51,6 +51,7 @@ MODULES= \ ssl_dist_sup\ ssl_sup \ inet_tls_dist \ + inet6_tls_dist \ ssl_certificate\ ssl_pkix_db\ ssl_cipher \ diff --git a/lib/ssl/src/inet6_tls_dist.erl b/lib/ssl/src/inet6_tls_dist.erl new file mode 100644 index 0000000000..ffd7296f93 --- /dev/null +++ b/lib/ssl/src/inet6_tls_dist.erl @@ -0,0 +1,46 @@ +%% +%% %CopyrightBegin% +%% +%% Copyright Ericsson AB 2015. All Rights Reserved. +%% +%% Licensed under the Apache License, Version 2.0 (the "License"); +%% you may not use this file except in compliance with the License. +%% You may obtain a copy of the License at +%% +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, software +%% distributed under the License is distributed on an "AS IS" BASIS, +%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +%% See the License for the specific language governing permissions and +%% limitations under the License. +%% +%% %CopyrightEnd% +%% + +%% +-module(inet6_tls_dist). + +-export([childspecs/0, listen/1, accept/1, accept_connection/5, + setup/5, close/1, select/1]). + +childspecs() -> + inet_tls_dist:childspecs(). + +select(Node) -> + inet_tls_dist:gen_select(inet6_tcp, Node). + +listen(Name) -> + inet_tls_dist:gen_listen(inet6_tcp, Name). + +accept(Listen) -> + inet_tls_dist:gen_accept(inet6_tcp, Listen). + +accept_connection(AcceptPid, Socket, MyNode, Allowed, SetupTime) -> + inet_tls_dist:gen_accept_connection(inet6_tcp, AcceptPid, Socket, MyNode, Allowed, SetupTime). + +setup(Node, Type, MyNode, LongOrShortNames,SetupTime) -> + inet_tls_dist:gen_setup(inet6_tcp, Node, Type, MyNode, LongOrShortNames,SetupTime). + +close(Socket) -> + inet_tls_dist:close(Socket). diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl index 6fe99a81c5..ec26142a75 100644 --- a/lib/ssl/src/inet_tls_dist.erl +++ b/lib/ssl/src/inet_tls_dist.erl @@ -24,6 +24,10 @@ -export([childspecs/0, listen/1, accept/1, accept_connection/5, setup/5, close/1, select/1, is_node_name/1]). +%% Generalized dist API +-export([gen_listen/2, gen_accept/2, gen_accept_connection/6, + gen_setup/6, gen_select/2]). + -include_lib("kernel/include/net_address.hrl"). -include_lib("kernel/include/dist.hrl"). -include_lib("kernel/include/dist_util.hrl"). @@ -33,9 +37,15 @@ childspecs() -> permanent, infinity, supervisor, [ssl_dist_sup]}]}. select(Node) -> + gen_select(inet_tcp, Node). + +gen_select(Driver, Node) -> case split_node(atom_to_list(Node), $@, []) of - [_,_Host] -> - true; + [_, Host] -> + case inet:getaddr(Host, Driver:family()) of + {ok, _} -> true; + _ -> false + end; _ -> false end. @@ -46,23 +56,35 @@ is_node_name(_) -> false. listen(Name) -> - ssl_tls_dist_proxy:listen(Name). + gen_listen(inet_tcp, Name). + +gen_listen(Driver, Name) -> + ssl_tls_dist_proxy:listen(Driver, Name). accept(Listen) -> - ssl_tls_dist_proxy:accept(Listen). + gen_accept(inet_tcp, Listen). + +gen_accept(Driver, Listen) -> + ssl_tls_dist_proxy:accept(Driver, Listen). accept_connection(AcceptPid, Socket, MyNode, Allowed, SetupTime) -> + gen_accept_connection(inet_tcp, AcceptPid, Socket, MyNode, Allowed, SetupTime). + +gen_accept_connection(Driver, AcceptPid, Socket, MyNode, Allowed, SetupTime) -> Kernel = self(), - spawn_link(fun() -> do_accept(Kernel, AcceptPid, Socket, + spawn_link(fun() -> do_accept(Driver, Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) end). setup(Node, Type, MyNode, LongOrShortNames,SetupTime) -> + gen_setup(inet_tcp, Node, Type, MyNode, LongOrShortNames,SetupTime). + +gen_setup(Driver, Node, Type, MyNode, LongOrShortNames,SetupTime) -> Kernel = self(), - spawn_opt(fun() -> do_setup(Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) end, [link, {priority, max}]). + spawn_opt(fun() -> do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) end, [link, {priority, max}]). -do_setup(Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) -> - [Name, Address] = splitnode(Node, LongOrShortNames), - case inet:getaddr(Address, inet) of +do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) -> + [Name, Address] = splitnode(Driver, Node, LongOrShortNames), + case inet:getaddr(Address, Driver:family()) of {ok, Ip} -> Timer = dist_util:start_timer(SetupTime), case erl_epmd:port_please(Name, Ip) of @@ -70,7 +92,7 @@ do_setup(Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) -> ?trace("port_please(~p) -> version ~p~n", [Node,Version]), dist_util:reset_timer(Timer), - case ssl_tls_dist_proxy:connect(Ip, TcpPort) of + case ssl_tls_dist_proxy:connect(Driver, Ip, TcpPort) of {ok, Socket} -> HSData = connect_hs_data(Kernel, Node, MyNode, Socket, Timer, Version, Ip, TcpPort, Address, @@ -99,12 +121,12 @@ close(Socket) -> gen_tcp:close(Socket), ok. -do_accept(Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) -> +do_accept(Driver, Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) -> process_flag(priority, max), receive {AcceptPid, controller} -> Timer = dist_util:start_timer(SetupTime), - case check_ip(Socket) of + case check_ip(Driver, Socket) of true -> HSData = accept_hs_data(Kernel, MyNode, Socket, Timer, Allowed), dist_util:handshake_other_started(HSData); @@ -118,12 +140,12 @@ do_accept(Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) -> %% Do only accept new connection attempts from nodes at our %% own LAN, if the check_ip environment parameter is true. %% ------------------------------------------------------------ -check_ip(Socket) -> +check_ip(Driver, Socket) -> case application:get_env(check_ip) of {ok, true} -> case get_ifs(Socket) of {ok, IFs, IP} -> - check_ip(IFs, IP); + check_ip(Driver, IFs, IP); _ -> ?shutdown(no_node) end; @@ -142,37 +164,21 @@ get_ifs(Socket) -> Error end. -check_ip([{OwnIP, _, Netmask}|IFs], PeerIP) -> - case {mask(Netmask, PeerIP), mask(Netmask, OwnIP)} of +check_ip(Driver, [{OwnIP, _, Netmask}|IFs], PeerIP) -> + case {Driver:mask(Netmask, PeerIP), Driver:mask(Netmask, OwnIP)} of {M, M} -> true; _ -> check_ip(IFs, PeerIP) end; -check_ip([], PeerIP) -> +check_ip(_Driver, [], 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) -> +splitnode(Driver, Node, LongOrShortNames) -> case split_node(atom_to_list(Node), $@, []) of [Name|Tail] when Tail =/= [] -> Host = lists:append(Tail), - check_node(Name, Node, Host, LongOrShortNames); + check_node(Driver, Name, Node, Host, LongOrShortNames); [_] -> error_logger:error_msg("** Nodename ~p illegal, no '@' character **~n", [Node]), @@ -182,15 +188,20 @@ splitnode(Node, LongOrShortNames) -> ?shutdown(Node) end. -check_node(Name, Node, Host, LongOrShortNames) -> +check_node(Driver, 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); + case Driver:parse_address(Host) of + {ok, _} -> + [Name, Host]; + _ -> + error_logger:error_msg("** System running to use " + "fully qualified " + "hostnames **~n" + "** Hostname ~s is illegal **~n", + [Host]), + ?shutdown(Node) + end; [_, _ | _] when LongOrShortNames == shortnames -> error_logger:error_msg("** System NOT running to use fully qualified " "hostnames **~n" diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src index 619ab7b610..1a2bf90ccf 100644 --- a/lib/ssl/src/ssl.app.src +++ b/lib/ssl/src/ssl.app.src @@ -31,6 +31,7 @@ ssl_listen_tracker_sup, %% Erlang Distribution over SSL/TLS inet_tls_dist, + inet6_tls_dist, ssl_tls_dist_proxy, ssl_dist_sup, %% SSL/TLS session handling diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 6551308935..780bef5877 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -37,7 +37,7 @@ close/1, close/2, shutdown/2, recv/2, recv/3, send/2, getopts/2, setopts/2 ]). %% SSL/TLS protocol handling --export([cipher_suites/0, cipher_suites/1, suite_definition/1, +-export([cipher_suites/0, cipher_suites/1, connection_info/1, versions/0, session_info/1, format_error/1, renegotiate/1, prf/5, negotiated_protocol/1, negotiated_next_protocol/1, connection_information/1, connection_information/2]). @@ -60,22 +60,19 @@ -spec start() -> ok | {error, reason()}. -spec start(permanent | transient | temporary) -> ok | {error, reason()}. %% -%% Description: Utility function that starts the ssl, -%% crypto and public_key applications. Default type -%% is temporary. see application(3) +%% Description: Utility function that starts the ssl and applications +%% that it depends on. +%% see application(3) %%-------------------------------------------------------------------- start() -> - application:start(crypto), - application:start(asn1), - application:start(public_key), - application:start(ssl). - + start(temporary). start(Type) -> - application:start(crypto, Type), - application:start(asn1), - application:start(public_key, Type), - application:start(ssl, Type). - + case application:ensure_all_started(ssl, Type) of + {ok, _} -> + ok; + Other -> + Other + end. %%-------------------------------------------------------------------- -spec stop() -> ok. %% @@ -105,7 +102,7 @@ connect(Socket, SslOptions0, Timeout) when is_port(Socket), {gen_tcp, tcp, tcp_closed, tcp_error}), EmulatedOptions = ssl_socket:emulated_options(), {ok, SocketValues} = ssl_socket:getopts(Transport, Socket, EmulatedOptions), - try handle_options(SslOptions0 ++ SocketValues) of + try handle_options(SslOptions0 ++ SocketValues, client) of {ok, #config{transport_info = CbInfo, ssl = SslOptions, emulated = EmOpts, connection_cb = ConnectionCb}} -> @@ -127,7 +124,7 @@ connect(Host, Port, Options) -> connect(Host, Port, Options, infinity). connect(Host, Port, Options, Timeout) when (is_integer(Timeout) andalso Timeout > 0) or (Timeout == infinity) -> - try handle_options(Options) of + try handle_options(Options, client) of {ok, Config} -> do_connect(Host,Port,Config,Timeout) catch @@ -145,7 +142,7 @@ listen(_Port, []) -> {error, nooptions}; listen(Port, Options0) -> try - {ok, Config} = handle_options(Options0), + {ok, Config} = handle_options(Options0, server), ConnectionCb = connection_cb(Options0), #config{transport_info = {Transport, _, _, _}, inet_user = Options, connection_cb = ConnectionCb, ssl = SslOpts, emulated = EmOpts} = Config, @@ -233,7 +230,7 @@ ssl_accept(Socket, SslOptions, Timeout) when is_port(Socket), EmulatedOptions = ssl_socket:emulated_options(), {ok, SocketValues} = ssl_socket:getopts(Transport, Socket, EmulatedOptions), ConnetionCb = connection_cb(SslOptions), - try handle_options(SslOptions ++ SocketValues) of + try handle_options(SslOptions ++ SocketValues, server) of {ok, #config{transport_info = CbInfo, ssl = SslOpts, emulated = EmOpts}} -> ok = ssl_socket:setopts(Transport, Socket, ssl_socket:internal_inet_values()), {ok, Port} = ssl_socket:port(Transport, Socket), @@ -315,24 +312,32 @@ controlling_process(#sslsocket{pid = {Listen, %% %% Description: Return SSL information for the connection %%-------------------------------------------------------------------- -connection_information(#sslsocket{pid = Pid}) when is_pid(Pid) -> ssl_connection:connection_information(Pid); -connection_information(#sslsocket{pid = {Listen, _}}) when is_port(Listen) -> {error, enotconn}. - +connection_information(#sslsocket{pid = Pid}) when is_pid(Pid) -> + case ssl_connection:connection_information(Pid) of + {ok, Info} -> + {ok, [Item || Item = {_Key, Value} <- Info, Value =/= undefined]}; + Error -> + Error + end; +connection_information(#sslsocket{pid = {Listen, _}}) when is_port(Listen) -> + {error, enotconn}. %%-------------------------------------------------------------------- --spec connection_information(#sslsocket{}, [atom]) -> {ok, list()} | {error, reason()}. +-spec connection_information(#sslsocket{}, [atom()]) -> {ok, list()} | {error, reason()}. %% %% Description: Return SSL information for the connection %%-------------------------------------------------------------------- connection_information(#sslsocket{} = SSLSocket, Items) -> case connection_information(SSLSocket) of - {ok, I} -> - {ok, lists:filter(fun({K, _}) -> lists:foldl(fun(K1, Acc) when K1 =:= K -> Acc + 1; (_, Acc) -> Acc end, 0, Items) > 0 end, I)}; - E -> - E + {ok, Info} -> + {ok, [Item || Item = {Key, Value} <- Info, lists:member(Key, Items), + Value =/= undefined]}; + Error -> + Error end. %%-------------------------------------------------------------------- +%% Deprecated -spec connection_info(#sslsocket{}) -> {ok, {tls_record:tls_atom_version(), ssl_cipher:erl_cipher_suite()}} | {error, reason()}. %% @@ -372,15 +377,6 @@ peercert(#sslsocket{pid = {Listen, _}}) when is_port(Listen) -> {error, enotconn}. %%-------------------------------------------------------------------- --spec suite_definition(ssl_cipher:cipher_suite()) -> ssl_cipher:erl_cipher_suite(). -%% -%% Description: Return erlang cipher suite definition. -%%-------------------------------------------------------------------- -suite_definition(S) -> - {KeyExchange, Cipher, Hash, _} = ssl_cipher:suite_definition(S), - {KeyExchange, Cipher, Hash}. - -%%-------------------------------------------------------------------- -spec negotiated_protocol(#sslsocket{}) -> {ok, binary()} | {error, reason()}. %% %% Description: Returns the protocol that has been negotiated. If no @@ -410,7 +406,7 @@ negotiated_next_protocol(Socket) -> %%-------------------------------------------------------------------- cipher_suites(erlang) -> Version = tls_record:highest_protocol_version([]), - ssl_cipher:filter_suites([suite_definition(S) + ssl_cipher:filter_suites([ssl_cipher:erl_suite_definition(S) || S <- ssl_cipher:suites(Version)]); cipher_suites(openssl) -> Version = tls_record:highest_protocol_version([]), @@ -418,7 +414,7 @@ cipher_suites(openssl) -> || S <- ssl_cipher:filter_suites(ssl_cipher:suites(Version))]; cipher_suites(all) -> Version = tls_record:highest_protocol_version([]), - ssl_cipher:filter_suites([suite_definition(S) + ssl_cipher:filter_suites([ssl_cipher:erl_suite_definition(S) || S <-ssl_cipher:all_suites(Version)]). cipher_suites() -> cipher_suites(erlang). @@ -630,7 +626,8 @@ handle_options(Opts0, #ssl_options{protocol = Protocol, cacerts = CaCerts0, cacertfile = CaCertFile0} = InheritedSslOpts) -> RecordCB = record_cb(Protocol), CaCerts = handle_option(cacerts, Opts0, CaCerts0), - {Verify, FailIfNoPeerCert, CaCertDefault, VerifyFun, PartialChainHanlder} = handle_verify_options(Opts0, CaCerts), + {Verify, FailIfNoPeerCert, CaCertDefault, VerifyFun, PartialChainHanlder, + VerifyClientOnce} = handle_verify_options(Opts0, CaCerts), CaCertFile = case proplists:get_value(cacertfile, Opts0, CaCertFile0) of undefined -> CaCertDefault; @@ -643,11 +640,12 @@ handle_options(Opts0, #ssl_options{protocol = Protocol, cacerts = CaCerts0, verify = Verify, verify_fun = VerifyFun, partial_chain = PartialChainHanlder, - fail_if_no_peer_cert = FailIfNoPeerCert}, + fail_if_no_peer_cert = FailIfNoPeerCert, + verify_client_once = VerifyClientOnce}, SslOpts1 = lists:foldl(fun(Key, PropList) -> proplists:delete(Key, PropList) end, Opts0, [cacerts, cacertfile, verify, verify_fun, partial_chain, - fail_if_no_peer_cert]), + fail_if_no_peer_cert, verify_client_once]), case handle_option(versions, SslOpts1, []) of [] -> new_ssl_options(SslOpts1, NewVerifyOpts, RecordCB); @@ -655,10 +653,10 @@ handle_options(Opts0, #ssl_options{protocol = Protocol, cacerts = CaCerts0, Versions = [RecordCB:protocol_version(Vsn) || Vsn <- Value], new_ssl_options(proplists:delete(versions, SslOpts1), NewVerifyOpts#ssl_options{versions = Versions}, record_cb(Protocol)) - end. + end; %% Handle all options in listen and connect -handle_options(Opts0) -> +handle_options(Opts0, Role) -> Opts = proplists:expand([{binary, [{mode, binary}]}, {list, [{mode, list}]}], Opts0), assert_proplist(Opts), @@ -667,7 +665,7 @@ handle_options(Opts0) -> ReuseSessionFun = fun(_, _, _, _) -> true end, CaCerts = handle_option(cacerts, Opts, undefined), - {Verify, FailIfNoPeerCert, CaCertDefault, VerifyFun, PartialChainHanlder} = + {Verify, FailIfNoPeerCert, CaCertDefault, VerifyFun, PartialChainHanlder, VerifyClientOnce} = handle_verify_options(Opts, CaCerts), CertFile = handle_option(certfile, Opts, <<>>), @@ -686,7 +684,7 @@ handle_options(Opts0) -> verify_fun = VerifyFun, partial_chain = PartialChainHanlder, fail_if_no_peer_cert = FailIfNoPeerCert, - verify_client_once = handle_option(verify_client_once, Opts, false), + verify_client_once = VerifyClientOnce, depth = handle_option(depth, Opts, 1), cert = handle_option(cert, Opts, undefined), certfile = CertFile, @@ -706,7 +704,9 @@ handle_options(Opts0) -> reuse_session = handle_option(reuse_session, Opts, ReuseSessionFun), reuse_sessions = handle_option(reuse_sessions, Opts, true), secure_renegotiate = handle_option(secure_renegotiate, Opts, false), - client_renegotiation = handle_option(client_renegotiation, Opts, true), + client_renegotiation = handle_option(client_renegotiation, Opts, + default_option_role(server, true, Role), + server, Role), renegotiate_at = handle_option(renegotiate_at, Opts, ?DEFAULT_RENEGOTIATE_AT), hibernate_after = handle_option(hibernate_after, Opts, undefined), erl_dist = handle_option(erl_dist, Opts, false), @@ -723,10 +723,16 @@ handle_options(Opts0) -> server_name_indication = handle_option(server_name_indication, Opts, undefined), sni_hosts = handle_option(sni_hosts, Opts, []), sni_fun = handle_option(sni_fun, Opts, undefined), - honor_cipher_order = handle_option(honor_cipher_order, Opts, false), + honor_cipher_order = handle_option(honor_cipher_order, Opts, + default_option_role(server, false, Role), + server, Role), protocol = proplists:get_value(protocol, Opts, tls), padding_check = proplists:get_value(padding_check, Opts, true), - fallback = proplists:get_value(fallback, Opts, false), + fallback = handle_option(fallback, Opts, + proplists:get_value(fallback, Opts, + default_option_role(client, + false, Role)), + client, Role), crl_check = handle_option(crl_check, Opts, false), crl_cache = handle_option(crl_cache, Opts, {ssl_crl_cache, {internal, []}}) }, @@ -756,6 +762,13 @@ handle_options(Opts0) -> inet_user = SockOpts, transport_info = CbInfo, connection_cb = ConnetionCb }}. + + +handle_option(OptionName, Opts, Default, Role, Role) -> + handle_option(OptionName, Opts, Default); +handle_option(_, _, undefined = Value, _, _) -> + Value. + handle_option(sni_fun, Opts, Default) -> OptFun = validate_option(sni_fun, proplists:get_value(sni_fun, Opts, Default)), @@ -772,7 +785,6 @@ handle_option(OptionName, Opts, Default) -> validate_option(OptionName, proplists:get_value(OptionName, Opts, Default)). - validate_option(versions, Versions) -> validate_versions(Versions, Versions); validate_option(verify, Value) @@ -1216,7 +1228,8 @@ emulated_socket_options(InetValues, #socket_options{ new_ssl_options([], #ssl_options{} = Opts, _) -> Opts; new_ssl_options([{verify_client_once, Value} | Rest], #ssl_options{} = Opts, RecordCB) -> - new_ssl_options(Rest, Opts#ssl_options{verify_client_once = validate_option(verify_client_once, Value)}, RecordCB); + new_ssl_options(Rest, Opts#ssl_options{verify_client_once = + validate_option(verify_client_once, Value)}, RecordCB); new_ssl_options([{depth, Value} | Rest], #ssl_options{} = Opts, RecordCB) -> new_ssl_options(Rest, Opts#ssl_options{depth = validate_option(depth, Value)}, RecordCB); new_ssl_options([{cert, Value} | Rest], #ssl_options{} = Opts, RecordCB) -> @@ -1280,6 +1293,12 @@ handle_verify_options(Opts, CaCerts) -> DefaultVerifyNoneFun = {fun(_,{bad_cert, _}, UserState) -> {valid, UserState}; + (_,{extension, #'Extension'{critical = true}}, UserState) -> + %% This extension is marked as critical, so + %% certificate verification should fail if we don't + %% understand the extension. However, this is + %% `verify_none', so let's accept it anyway. + {valid, UserState}; (_,{extension, _}, UserState) -> {unknown, UserState}; (_, valid, UserState) -> @@ -1295,29 +1314,35 @@ handle_verify_options(Opts, CaCerts) -> PartialChainHanlder = handle_option(partial_chain, Opts, fun(_) -> unknown_ca end), + VerifyClientOnce = handle_option(verify_client_once, Opts, false), + %% Handle 0, 1, 2 for backwards compatibility case proplists:get_value(verify, Opts, verify_none) of 0 -> {verify_none, false, ca_cert_default(verify_none, VerifyNoneFun, CaCerts), - VerifyNoneFun, PartialChainHanlder}; + VerifyNoneFun, PartialChainHanlder, VerifyClientOnce}; 1 -> {verify_peer, false, ca_cert_default(verify_peer, UserVerifyFun, CaCerts), - UserVerifyFun, PartialChainHanlder}; + UserVerifyFun, PartialChainHanlder, VerifyClientOnce}; 2 -> {verify_peer, true, ca_cert_default(verify_peer, UserVerifyFun, CaCerts), - UserVerifyFun, PartialChainHanlder}; + UserVerifyFun, PartialChainHanlder, VerifyClientOnce}; verify_none -> {verify_none, false, ca_cert_default(verify_none, VerifyNoneFun, CaCerts), - VerifyNoneFun, PartialChainHanlder}; + VerifyNoneFun, PartialChainHanlder, VerifyClientOnce}; verify_peer -> {verify_peer, UserFailIfNoPeerCert, ca_cert_default(verify_peer, UserVerifyFun, CaCerts), - UserVerifyFun, PartialChainHanlder}; + UserVerifyFun, PartialChainHanlder, VerifyClientOnce}; Value -> throw({error, {options, {verify, Value}}}) end. +default_option_role(Role, Value, Role) -> + Value; +default_option_role(_,_,_) -> + undefined. diff --git a/lib/ssl/src/ssl_certificate.erl b/lib/ssl/src/ssl_certificate.erl index 4658e76ab1..e9dc5764a3 100644 --- a/lib/ssl/src/ssl_certificate.erl +++ b/lib/ssl/src/ssl_certificate.erl @@ -56,15 +56,15 @@ %% errors. Returns {RootCert, Path, VerifyErrors} %%-------------------------------------------------------------------- trusted_cert_and_path(CertChain, CertDbHandle, CertDbRef, PartialChainHandler) -> - Path = [Cert | _] = lists:reverse(CertChain), - OtpCert = public_key:pkix_decode_cert(Cert, otp), + Path = [BinCert | _] = lists:reverse(CertChain), + OtpCert = public_key:pkix_decode_cert(BinCert, otp), SignedAndIssuerID = case public_key:pkix_is_self_signed(OtpCert) of true -> {ok, IssuerId} = public_key:pkix_issuer_id(OtpCert, self), {self, IssuerId}; false -> - other_issuer(OtpCert, CertDbHandle) + other_issuer(OtpCert, BinCert, CertDbHandle) end, case SignedAndIssuerID of @@ -187,7 +187,7 @@ public_key_type(?'id-ecPublicKey') -> %%-------------------------------------------------------------------- %%% Internal functions %%-------------------------------------------------------------------- -certificate_chain(OtpCert, _Cert, CertDbHandle, CertsDbRef, Chain) -> +certificate_chain(OtpCert, BinCert, CertDbHandle, CertsDbRef, Chain) -> IssuerAndSelfSigned = case public_key:pkix_is_self_signed(OtpCert) of true -> @@ -200,7 +200,7 @@ certificate_chain(OtpCert, _Cert, CertDbHandle, CertsDbRef, Chain) -> {_, true = SelfSigned} -> certificate_chain(CertDbHandle, CertsDbRef, Chain, ignore, ignore, SelfSigned); {{error, issuer_not_found}, SelfSigned} -> - case find_issuer(OtpCert, CertDbHandle) of + case find_issuer(OtpCert, BinCert, CertDbHandle) of {ok, {SerialNr, Issuer}} -> certificate_chain(CertDbHandle, CertsDbRef, Chain, SerialNr, Issuer, SelfSigned); @@ -232,12 +232,12 @@ certificate_chain(CertDbHandle, CertsDbRef, Chain, SerialNr, Issuer, _SelfSigned {ok, undefined, lists:reverse(Chain)} end. -find_issuer(OtpCert, CertDbHandle) -> +find_issuer(OtpCert, BinCert, CertDbHandle) -> IsIssuerFun = fun({_Key, {_Der, #'OTPCertificate'{} = ErlCertCandidate}}, Acc) -> case public_key:pkix_is_issuer(OtpCert, ErlCertCandidate) of true -> - case verify_cert_signer(OtpCert, ErlCertCandidate#'OTPCertificate'.tbsCertificate) of + case verify_cert_signer(BinCert, ErlCertCandidate#'OTPCertificate'.tbsCertificate) of true -> throw(public_key:pkix_issuer_id(ErlCertCandidate, self)); false -> @@ -265,9 +265,9 @@ is_valid_extkey_usage(KeyUse, server) -> %% Server wants to verify client is_valid_key_usage(KeyUse, ?'id-kp-clientAuth'). -verify_cert_signer(OtpCert, SignerTBSCert) -> +verify_cert_signer(BinCert, SignerTBSCert) -> PublicKey = public_key(SignerTBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo), - public_key:pkix_verify(public_key:pkix_encode('OTPCertificate', OtpCert, otp), PublicKey). + public_key:pkix_verify(BinCert, PublicKey). public_key(#'OTPSubjectPublicKeyInfo'{algorithm = #'PublicKeyAlgorithm'{algorithm = ?'id-ecPublicKey', parameters = Params}, @@ -281,12 +281,12 @@ public_key(#'OTPSubjectPublicKeyInfo'{algorithm = #'PublicKeyAlgorithm'{algorith subjectPublicKey = Key}) -> {Key, Params}. -other_issuer(OtpCert, CertDbHandle) -> +other_issuer(OtpCert, BinCert, CertDbHandle) -> case public_key:pkix_issuer_id(OtpCert, other) of {ok, IssuerId} -> {other, IssuerId}; {error, issuer_not_found} -> - case find_issuer(OtpCert, CertDbHandle) of + case find_issuer(OtpCert, BinCert, CertDbHandle) of {ok, IssuerId} -> {other, IssuerId}; Other -> diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index 8c2a16ba96..974a6ec6b5 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -34,6 +34,7 @@ -include_lib("public_key/include/public_key.hrl"). -export([security_parameters/2, security_parameters/3, suite_definition/1, + erl_suite_definition/1, cipher_init/3, decipher/6, cipher/5, decipher_aead/6, cipher_aead/6, suite/1, suites/1, all_suites/1, ec_keyed_suites/0, anonymous_suites/1, psk_suites/1, srp_suites/0, @@ -48,8 +49,11 @@ | aes_128_cbc | aes_256_cbc | aes_128_gcm | aes_256_gcm | chacha20_poly1305. -type hash() :: null | sha | md5 | sha224 | sha256 | sha384 | sha512. -type key_algo() :: null | rsa | dhe_rsa | dhe_dss | ecdhe_ecdsa| ecdh_ecdsa | ecdh_rsa| srp_rsa| srp_dss | psk | dhe_psk | rsa_psk | dh_anon | ecdh_anon | srp_anon. --type erl_cipher_suite() :: {key_algo(), cipher(), hash()}. --type int_cipher_suite() :: {key_algo(), cipher(), hash(), hash() | default_prf}. +-type erl_cipher_suite() :: {key_algo(), cipher(), hash()} % Pre TLS 1.2 + %% TLS 1.2, internally PRE TLS 1.2 will use default_prf + | {key_algo(), cipher(), hash(), hash() | default_prf}. + + -type cipher_suite() :: binary(). -type cipher_enum() :: integer(). -type openssl_cipher_suite() :: string(). @@ -417,7 +421,7 @@ rc4_suites({3, N}) when N =< 3 -> ?TLS_ECDH_RSA_WITH_RC4_128_SHA]. %%-------------------------------------------------------------------- --spec suite_definition(cipher_suite()) -> int_cipher_suite(). +-spec suite_definition(cipher_suite()) -> erl_cipher_suite(). %% %% Description: Return erlang cipher suite definition. %% Note: Currently not supported suites are commented away. @@ -722,6 +726,20 @@ suite_definition(?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256) -> {dhe_rsa, chacha20_poly1305, null, sha256}. %%-------------------------------------------------------------------- +-spec erl_suite_definition(cipher_suite()) -> erl_cipher_suite(). +%% +%% Description: Return erlang cipher suite definition. Filters last value +%% for now (compatibility reasons). +%%-------------------------------------------------------------------- +erl_suite_definition(S) -> + case suite_definition(S) of + {KeyExchange, Cipher, Hash, default_prf} -> + {KeyExchange, Cipher, Hash}; + Suite -> + Suite + end. + +%%-------------------------------------------------------------------- -spec suite(erl_cipher_suite()) -> cipher_suite(). %% %% Description: Return TLS cipher suite definition. @@ -1384,18 +1402,14 @@ filter(DerCert, Ciphers) -> %% %% Description: Filter suites for algorithms supported by crypto. %%------------------------------------------------------------------- -filter_suites(Suites = [{_,_,_}|_]) -> +filter_suites(Suites = [Value|_]) when is_tuple(Value) -> Algos = crypto:supports(), + Hashs = proplists:get_value(hashs, Algos), lists:filter(fun({KeyExchange, Cipher, Hash}) -> is_acceptable_keyexchange(KeyExchange, proplists:get_value(public_keys, Algos)) andalso is_acceptable_cipher(Cipher, proplists:get_value(ciphers, Algos)) andalso - is_acceptable_hash(Hash, proplists:get_value(hashs, Algos)) - end, Suites); - -filter_suites(Suites = [{_,_,_,_}|_]) -> - Algos = crypto:supports(), - Hashs = proplists:get_value(hashs, Algos), - lists:filter(fun({KeyExchange, Cipher, Hash, Prf}) -> + is_acceptable_hash(Hash, proplists:get_value(hashs, Algos)); + ({KeyExchange, Cipher, Hash, Prf}) -> is_acceptable_keyexchange(KeyExchange, proplists:get_value(public_keys, Algos)) andalso is_acceptable_cipher(Cipher, proplists:get_value(ciphers, Algos)) andalso is_acceptable_hash(Hash, Hashs) andalso diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 241871dc38..ec7d086934 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -836,15 +836,22 @@ handle_sync_event(session_info, _, StateName, #state{session = #session{session_id = Id, cipher_suite = Suite}} = State) -> {reply, [{session_id, Id}, - {cipher_suite, ssl:suite_definition(Suite)}], + {cipher_suite, ssl_cipher:erl_suite_definition(Suite)}], StateName, State, get_timeout(State)}; handle_sync_event(peer_certificate, _, StateName, #state{session = #session{peer_certificate = Cert}} = State) -> {reply, {ok, Cert}, StateName, State, get_timeout(State)}; -handle_sync_event(connection_information, _, StateName, #state{sni_hostname = SNIHostname, session = #session{cipher_suite = CipherSuite}, negotiated_version = Version} = State) -> - {reply, {ok, [{protocol, tls_record:protocol_version(Version)}, {cipher_suite, ssl:suite_definition(CipherSuite)}, {sni_hostname, SNIHostname}]}, StateName, State, get_timeout(State)}. +handle_sync_event(connection_information, _, StateName, State) -> + Info = connection_info(State), + {reply, {ok, Info}, StateName, State, get_timeout(State)}. +connection_info(#state{sni_hostname = SNIHostname, + session = #session{cipher_suite = CipherSuite}, + negotiated_version = Version, ssl_options = Opts}) -> + [{protocol, tls_record:protocol_version(Version)}, + {cipher_suite, ssl_cipher:erl_suite_definition(CipherSuite)}, + {sni_hostname, SNIHostname}] ++ ssl_options_list(Opts). handle_info({ErrorTag, Socket, econnaborted}, StateName, #state{socket = Socket, transport_cb = Transport, @@ -1885,3 +1892,28 @@ negotiated_hashsign(undefined, Alg, Version) -> negotiated_hashsign(HashSign = {_, _}, _, _) -> HashSign. +ssl_options_list(SslOptions) -> + Fileds = record_info(fields, ssl_options), + Values = tl(tuple_to_list(SslOptions)), + ssl_options_list(Fileds, Values, []). + +ssl_options_list([],[], Acc) -> + lists:reverse(Acc); +%% Skip internal options, only return user options +ssl_options_list([protocol | Keys], [_ | Values], Acc) -> + ssl_options_list(Keys, Values, Acc); +ssl_options_list([erl_dist | Keys], [_ | Values], Acc) -> + ssl_options_list(Keys, Values, Acc); +ssl_options_list([renegotiate_at | Keys], [_ | Values], Acc) -> + ssl_options_list(Keys, Values, Acc); +ssl_options_list([ciphers = Key | Keys], [Value | Values], Acc) -> + ssl_options_list(Keys, Values, + [{Key, lists:map( + fun(Suite) -> + ssl_cipher:erl_suite_definition(Suite) + end, Value)} + | Acc]); +ssl_options_list([Key | Keys], [Value | Values], Acc) -> + ssl_options_list(Keys, Values, [{Key, Value} | Acc]). + + diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index e9e140836b..e98073080a 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -2072,12 +2072,9 @@ crl_check(OtpCert, Check, CertDbHandle, CertDbRef, {Callback, CRLDbHandle}, _) - ], case dps_and_crls(OtpCert, Callback, CRLDbHandle, ext) of no_dps -> - case dps_and_crls(OtpCert, Callback, CRLDbHandle, same_issuer) of - [] -> - valid; %% No relevant CRL existed - DpsAndCRls -> - crl_check_same_issuer(OtpCert, Check, DpsAndCRls, Options) - end; + crl_check_same_issuer(OtpCert, Check, + dps_and_crls(OtpCert, Callback, CRLDbHandle, same_issuer), + Options); DpsAndCRLs -> %% This DP list may be empty if relevant CRLs existed %% but could not be retrived, will result in {bad_cert, revocation_status_undetermined} case public_key:pkix_crls_validate(OtpCert, DpsAndCRLs, Options) of diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl index 211badef56..4c789793ec 100644 --- a/lib/ssl/src/ssl_tls_dist_proxy.erl +++ b/lib/ssl/src/ssl_tls_dist_proxy.erl @@ -20,7 +20,7 @@ -module(ssl_tls_dist_proxy). --export([listen/1, accept/1, connect/2, get_tcp_address/1]). +-export([listen/2, accept/2, connect/3, get_tcp_address/1]). -export([init/1, start_link/0, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3, ssl_options/2]). @@ -39,14 +39,14 @@ %% Internal application API %%==================================================================== -listen(Name) -> - gen_server:call(?MODULE, {listen, Name}, infinity). +listen(Driver, Name) -> + gen_server:call(?MODULE, {listen, Driver, Name}, infinity). -accept(Listen) -> - gen_server:call(?MODULE, {accept, Listen}, infinity). +accept(Driver, Listen) -> + gen_server:call(?MODULE, {accept, Driver, Listen}, infinity). -connect(Ip, Port) -> - gen_server:call(?MODULE, {connect, Ip, Port}, infinity). +connect(Driver, Ip, Port) -> + gen_server:call(?MODULE, {connect, Driver, Ip, Port}, infinity). do_listen(Options) -> @@ -108,10 +108,11 @@ init([]) -> process_flag(priority, max), {ok, #state{}}. -handle_call({listen, Name}, _From, State) -> +handle_call({listen, Driver, Name}, _From, State) -> case gen_tcp:listen(0, [{active, false}, {packet,?PPRE}, {ip, loopback}]) of {ok, Socket} -> - {ok, World} = do_listen([{active, false}, binary, {packet,?PPRE}, {reuseaddr, true}]), + {ok, World} = do_listen([{active, false}, binary, {packet,?PPRE}, {reuseaddr, true}, + Driver:family()]), {ok, TcpAddress} = get_tcp_address(Socket), {ok, WorldTcpAddress} = get_tcp_address(World), {_,Port} = WorldTcpAddress#net_address.address, @@ -126,15 +127,15 @@ handle_call({listen, Name}, _From, State) -> {reply, Error, State} end; -handle_call({accept, Listen}, {From, _}, State = #state{listen={_, World}}) -> +handle_call({accept, _Driver, 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) -> +handle_call({connect, Driver, Ip, Port}, {From, _}, State) -> Me = self(), - Pid = spawn_link(fun() -> setup_proxy(Ip, Port, Me) end), + Pid = spawn_link(fun() -> setup_proxy(Driver, Ip, Port, Me) end), receive {Pid, go_ahead, LPort} -> Res = {ok, Socket} = try_connect(LPort), @@ -263,10 +264,11 @@ try_connect(Port) -> try_connect(Port) end. -setup_proxy(Ip, Port, Parent) -> +setup_proxy(Driver, Ip, Port, Parent) -> process_flag(trap_exit, true), Opts = connect_options(get_ssl_options(client)), - case ssl:connect(Ip, Port, [{active, true}, binary, {packet,?PPRE}, nodelay()] ++ Opts) of + case ssl:connect(Ip, Port, [{active, true}, binary, {packet,?PPRE}, nodelay(), + Driver:family()] ++ Opts) of {ok, World} -> {ok, ErtsL} = gen_tcp:listen(0, [{active, true}, {ip, loopback}, binary, {packet,?PPRE}]), {ok, #net_address{address={_,LPort}}} = get_tcp_address(ErtsL), diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 05b040a2ab..1a864edb8b 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -121,6 +121,7 @@ options_tests() -> api_tests() -> [connection_info, + connection_information, peername, peercert, peercert_with_client_cert, @@ -461,6 +462,37 @@ connection_info(Config) when is_list(Config) -> ssl_test_lib:close(Client). %%-------------------------------------------------------------------- + +connection_information() -> + [{doc,"Test the API function ssl:connection_information/1"}]. +connection_information(Config) when is_list(Config) -> + ClientOpts = ?config(client_opts, Config), + ServerOpts = ?config(server_opts, Config), + {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), + Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, + {from, self()}, + {mfa, {?MODULE, connection_information_result, []}}, + {options, ServerOpts}]), + + Port = ssl_test_lib:inet_port(Server), + Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, + {host, Hostname}, + {from, self()}, + {mfa, {?MODULE, connection_information_result, []}}, + {options, ClientOpts}]), + + ct:log("Testcase ~p, Client ~p Server ~p ~n", + [self(), Client, Server]), + + ServerMsg = ClientMsg = ok, + + ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg), + + ssl_test_lib:close(Server), + ssl_test_lib:close(Client). + + +%%-------------------------------------------------------------------- protocol_versions() -> [{doc,"Test to set a list of protocol versions in app environment."}]. @@ -3989,7 +4021,7 @@ run_suites(Ciphers, Version, Config, Type) -> end. erlang_cipher_suite(Suite) when is_list(Suite)-> - ssl:suite_definition(ssl_cipher:openssl_suite(Suite)); + ssl_cipher:erl_suite_definition(ssl_cipher:openssl_suite(Suite)); erlang_cipher_suite(Suite) -> Suite. @@ -4010,11 +4042,11 @@ cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) -> Port = ssl_test_lib:inet_port(Server), Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, {host, Hostname}, - {from, self()}, - {mfa, {ssl_test_lib, cipher_result, [ConnectionInfo]}}, - {options, - [{ciphers,[CipherSuite]} | - ClientOpts]}]), + {from, self()}, + {mfa, {ssl_test_lib, cipher_result, [ConnectionInfo]}}, + {options, + [{ciphers,[CipherSuite]} | + ClientOpts]}]), Result = ssl_test_lib:wait_for_result(Server, ok, Client, ok), @@ -4028,6 +4060,17 @@ cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) -> [{ErlangCipherSuite, Error}] end. +connection_information_result(Socket) -> + {ok, Info = [_ | _]} = ssl:connection_information(Socket), + case length(Info) > 3 of + true -> + %% Atleast one ssloption() is set + ct:log("Info ~p", [Info]), + ok; + false -> + ct:fail(no_ssl_options_returned) + end. + connection_info_result(Socket) -> {ok, Info} = ssl:connection_information(Socket, [protocol, cipher_suite]), {ok, {proplists:get_value(protocol, Info), proplists:get_value(cipher_suite, Info)}}. @@ -4154,6 +4197,12 @@ first_rsa_suite([{dhe_rsa, _, _} = Suite| _]) -> Suite; first_rsa_suite([{rsa, _, _} = Suite| _]) -> Suite; +first_rsa_suite([{ecdhe_rsa, _, _, _} = Suite | _]) -> + Suite; +first_rsa_suite([{dhe_rsa, _, _, _} = Suite| _]) -> + Suite; +first_rsa_suite([{rsa, _, _, _} = Suite| _]) -> + Suite; first_rsa_suite([_ | Rest]) -> first_rsa_suite(Rest). diff --git a/lib/ssl/test/ssl_certificate_verify_SUITE.erl b/lib/ssl/test/ssl_certificate_verify_SUITE.erl index 5940a86a7f..d10506cb69 100644 --- a/lib/ssl/test/ssl_certificate_verify_SUITE.erl +++ b/lib/ssl/test/ssl_certificate_verify_SUITE.erl @@ -66,7 +66,9 @@ tests() -> invalid_signature_client, invalid_signature_server, extended_key_usage_verify_peer, - extended_key_usage_verify_none]. + extended_key_usage_verify_none, + critical_extension_verify_peer, + critical_extension_verify_none]. error_handling_tests()-> [client_with_cert_cipher_suites_handshake, @@ -75,7 +77,8 @@ error_handling_tests()-> unknown_server_ca_accept_verify_none, unknown_server_ca_accept_verify_peer, unknown_server_ca_accept_backwardscompatibility, - no_authority_key_identifier]. + no_authority_key_identifier, + no_authority_key_identifier_and_nonstandard_encoding]. init_per_suite(Config0) -> catch crypto:stop(), @@ -794,6 +797,121 @@ extended_key_usage_verify_none(Config) when is_list(Config) -> ssl_test_lib:close(Client). %%-------------------------------------------------------------------- +critical_extension_verify_peer() -> + [{doc,"Test cert that has a critical unknown extension in verify_peer mode"}]. + +critical_extension_verify_peer(Config) when is_list(Config) -> + ClientOpts = ?config(client_verification_opts, Config), + ServerOpts = ?config(server_verification_opts, Config), + PrivDir = ?config(priv_dir, Config), + Active = ?config(active, Config), + ReceiveFunction = ?config(receive_function, Config), + + KeyFile = filename:join(PrivDir, "otpCA/private/key.pem"), + NewCertName = integer_to_list(erlang:unique_integer()) ++ ".pem", + + ServerCertFile = proplists:get_value(certfile, ServerOpts), + NewServerCertFile = filename:join([PrivDir, "server", NewCertName]), + add_critical_netscape_cert_type(ServerCertFile, NewServerCertFile, KeyFile), + NewServerOpts = [{certfile, NewServerCertFile} | proplists:delete(certfile, ServerOpts)], + + ClientCertFile = proplists:get_value(certfile, ClientOpts), + NewClientCertFile = filename:join([PrivDir, "client", NewCertName]), + add_critical_netscape_cert_type(ClientCertFile, NewClientCertFile, KeyFile), + NewClientOpts = [{certfile, NewClientCertFile} | proplists:delete(certfile, ClientOpts)], + + {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), + + Server = ssl_test_lib:start_server_error( + [{node, ServerNode}, {port, 0}, + {from, self()}, + {mfa, {ssl_test_lib, ReceiveFunction, []}}, + {options, [{verify, verify_peer}, {active, Active} | NewServerOpts]}]), + Port = ssl_test_lib:inet_port(Server), + Client = ssl_test_lib:start_client_error( + [{node, ClientNode}, {port, Port}, + {host, Hostname}, + {from, self()}, + {mfa, {ssl_test_lib, ReceiveFunction, []}}, + {options, [{verify, verify_peer}, {active, Active} | NewClientOpts]}]), + + %% This certificate has a critical extension that we don't + %% understand. Therefore, verification should fail. + tcp_delivery_workaround(Server, {error, {tls_alert, "unsupported certificate"}}, + Client, {error, {tls_alert, "unsupported certificate"}}), + + ssl_test_lib:close(Server), + ok. + +%%-------------------------------------------------------------------- +critical_extension_verify_none() -> + [{doc,"Test cert that has a critical unknown extension in verify_none mode"}]. + +critical_extension_verify_none(Config) when is_list(Config) -> + ClientOpts = ?config(client_verification_opts, Config), + ServerOpts = ?config(server_verification_opts, Config), + PrivDir = ?config(priv_dir, Config), + Active = ?config(active, Config), + ReceiveFunction = ?config(receive_function, Config), + + KeyFile = filename:join(PrivDir, "otpCA/private/key.pem"), + NewCertName = integer_to_list(erlang:unique_integer()) ++ ".pem", + + ServerCertFile = proplists:get_value(certfile, ServerOpts), + NewServerCertFile = filename:join([PrivDir, "server", NewCertName]), + add_critical_netscape_cert_type(ServerCertFile, NewServerCertFile, KeyFile), + NewServerOpts = [{certfile, NewServerCertFile} | proplists:delete(certfile, ServerOpts)], + + ClientCertFile = proplists:get_value(certfile, ClientOpts), + NewClientCertFile = filename:join([PrivDir, "client", NewCertName]), + add_critical_netscape_cert_type(ClientCertFile, NewClientCertFile, KeyFile), + NewClientOpts = [{certfile, NewClientCertFile} | proplists:delete(certfile, ClientOpts)], + + {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), + + Server = ssl_test_lib:start_server( + [{node, ServerNode}, {port, 0}, + {from, self()}, + {mfa, {ssl_test_lib, ReceiveFunction, []}}, + {options, [{verify, verify_none}, {active, Active} | NewServerOpts]}]), + Port = ssl_test_lib:inet_port(Server), + Client = ssl_test_lib:start_client( + [{node, ClientNode}, {port, Port}, + {host, Hostname}, + {from, self()}, + {mfa, {ssl_test_lib, ReceiveFunction, []}}, + {options, [{verify, verify_none}, {active, Active} | NewClientOpts]}]), + + %% This certificate has a critical extension that we don't + %% understand. But we're using `verify_none', so verification + %% shouldn't fail. + ssl_test_lib:check_result(Server, ok, Client, ok), + + ssl_test_lib:close(Server), + ssl_test_lib:close(Client), + ok. + +add_critical_netscape_cert_type(CertFile, NewCertFile, KeyFile) -> + [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile), + Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)), + + [{'Certificate', DerCert, _}] = ssl_test_lib:pem_to_der(CertFile), + OTPCert = public_key:pkix_decode_cert(DerCert, otp), + %% This is the "Netscape Cert Type" extension, telling us that the + %% certificate can be used for SSL clients and SSL servers. + NetscapeCertTypeExt = #'Extension'{ + extnID = {2,16,840,1,113730,1,1}, + critical = true, + extnValue = <<3,2,6,192>>}, + OTPTbsCert = OTPCert#'OTPCertificate'.tbsCertificate, + Extensions = OTPTbsCert#'OTPTBSCertificate'.extensions, + NewOTPTbsCert = OTPTbsCert#'OTPTBSCertificate'{ + extensions = [NetscapeCertTypeExt] ++ Extensions}, + NewDerCert = public_key:pkix_sign(NewOTPTbsCert, Key), + ssl_test_lib:der_to_pem(NewCertFile, [{'Certificate', NewDerCert, not_encrypted}]), + ok. + +%%-------------------------------------------------------------------- no_authority_key_identifier() -> [{doc, "Test cert that does not have authorityKeyIdentifier extension" " but are present in trusted certs db."}]. @@ -850,6 +968,68 @@ delete_authority_key_extension([Head | Rest], Acc) -> %%-------------------------------------------------------------------- +no_authority_key_identifier_and_nonstandard_encoding() -> + [{doc, "Test cert with nonstandard encoding that does not have" + " authorityKeyIdentifier extension but are present in trusted certs db."}]. + +no_authority_key_identifier_and_nonstandard_encoding(Config) when is_list(Config) -> + ClientOpts = ?config(client_verification_opts, Config), + ServerOpts = ?config(server_verification_opts, Config), + PrivDir = ?config(priv_dir, Config), + + KeyFile = filename:join(PrivDir, "otpCA/private/key.pem"), + [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile), + Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)), + + CertFile = proplists:get_value(certfile, ServerOpts), + NewCertFile = filename:join(PrivDir, "server/new_cert.pem"), + [{'Certificate', DerCert, _}] = ssl_test_lib:pem_to_der(CertFile), + ServerCert = public_key:pkix_decode_cert(DerCert, plain), + ServerTbsCert = ServerCert#'Certificate'.tbsCertificate, + Extensions0 = ServerTbsCert#'TBSCertificate'.extensions, + %% need to remove authorityKeyIdentifier extension to cause DB lookup by signature + Extensions = delete_authority_key_extension(Extensions0, []), + NewExtensions = replace_key_usage_extension(Extensions, []), + NewServerTbsCert = ServerTbsCert#'TBSCertificate'{extensions = NewExtensions}, + + ct:log("Extensions ~p~n, NewExtensions: ~p~n", [Extensions, NewExtensions]), + + TbsDer = public_key:pkix_encode('TBSCertificate', NewServerTbsCert, plain), + Sig = public_key:sign(TbsDer, md5, Key), + NewServerCert = ServerCert#'Certificate'{tbsCertificate = NewServerTbsCert, signature = Sig}, + NewDerCert = public_key:pkix_encode('Certificate', NewServerCert, plain), + ssl_test_lib:der_to_pem(NewCertFile, [{'Certificate', NewDerCert, not_encrypted}]), + NewServerOpts = [{certfile, NewCertFile} | proplists:delete(certfile, ServerOpts)], + + {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), + + Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, + {from, self()}, + {mfa, {ssl_test_lib, + send_recv_result_active, []}}, + {options, [{active, true} | NewServerOpts]}]), + Port = ssl_test_lib:inet_port(Server), + Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, + {host, Hostname}, + {from, self()}, + {mfa, {ssl_test_lib, + send_recv_result_active, []}}, + {options, [{verify, verify_peer} | ClientOpts]}]), + ssl_test_lib:check_result(Server, ok, Client, ok), + ssl_test_lib:close(Server), + ssl_test_lib:close(Client). + +replace_key_usage_extension([], Acc) -> + lists:reverse(Acc); +replace_key_usage_extension([#'Extension'{extnID = ?'id-ce-keyUsage'} = E | Rest], Acc) -> + %% A nonstandard DER encoding of [digitalSignature, keyEncipherment] + Val = <<3, 2, 0, 16#A0>>, + replace_key_usage_extension(Rest, [E#'Extension'{extnValue = Val} | Acc]); +replace_key_usage_extension([Head | Rest], Acc) -> + replace_key_usage_extension(Rest, [Head | Acc]). + +%%-------------------------------------------------------------------- + invalid_signature_server() -> [{doc,"Test client with invalid signature"}]. diff --git a/lib/ssl/test/ssl_crl_SUITE.erl b/lib/ssl/test/ssl_crl_SUITE.erl index 44580be1ff..5b86027210 100644 --- a/lib/ssl/test/ssl_crl_SUITE.erl +++ b/lib/ssl/test/ssl_crl_SUITE.erl @@ -53,7 +53,7 @@ groups() -> {idp_crl, [], basic_tests()}]. basic_tests() -> - [crl_verify_valid, crl_verify_revoked]. + [crl_verify_valid, crl_verify_revoked, crl_verify_no_crl]. init_per_suite(Config) -> @@ -186,11 +186,6 @@ crl_verify_revoked(Config) when is_list(Config) -> {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), - Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, - {from, self()}, - {options, ServerOpts}]), - Port = ssl_test_lib:inet_port(Server), - ssl_crl_cache:insert({file, filename:join([PrivDir, "erlangCA", "crl.pem"])}), ssl_crl_cache:insert({file, filename:join([PrivDir, "otpCA", "crl.pem"])}), @@ -206,16 +201,55 @@ crl_verify_revoked(Config) when is_list(Config) -> {verify, verify_peer}] end, - Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port}, - {host, Hostname}, - {from, self()}, - {options, ClientOpts}]), - receive - {Server, AlertOrColse} -> - ct:pal("Server Alert or Close ~p", [AlertOrColse]) - end, - ssl_test_lib:check_result(Client, {error, {tls_alert, "certificate revoked"}}). + crl_verify_error(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts, + "certificate revoked"). +crl_verify_no_crl() -> + [{doc,"Verify a simple CRL chain when the CRL is missing"}]. +crl_verify_no_crl(Config) when is_list(Config) -> + PrivDir = ?config(cert_dir, Config), + Check = ?config(crl_check, Config), + ServerOpts = [{keyfile, filename:join([PrivDir, "server", "key.pem"])}, + {certfile, filename:join([PrivDir, "server", "cert.pem"])}, + {cacertfile, filename:join([PrivDir, "server", "cacerts.pem"])}], + ClientOpts = case ?config(idp_crl, Config) of + true -> + [{cacertfile, filename:join([PrivDir, "server", "cacerts.pem"])}, + {crl_check, Check}, + {crl_cache, {ssl_crl_cache, {internal, [{http, 5000}]}}}, + {verify, verify_peer}]; + false -> + [{cacertfile, filename:join([PrivDir, "server", "cacerts.pem"])}, + {crl_check, Check}, + {verify, verify_peer}] + end, + {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), + + %% In case we're running an HTTP server that serves CRLs, let's + %% rename those files, so the CRL is absent when we try to verify + %% it. + %% + %% If we're not using an HTTP server, we just need to refrain from + %% adding the CRLs to the cache manually. + rename_crl(filename:join([PrivDir, "erlangCA", "crl.pem"])), + rename_crl(filename:join([PrivDir, "otpCA", "crl.pem"])), + + %% The expected outcome when the CRL is missing depends on the + %% crl_check setting. + case Check of + true -> + %% The error "revocation status undetermined" gets turned + %% into "bad certificate". + crl_verify_error(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts, + "bad certificate"); + peer -> + crl_verify_error(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts, + "bad certificate"); + best_effort -> + %% In "best effort" mode, we consider the certificate not + %% to be revoked if we can't find the appropriate CRL. + crl_verify_valid(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts) + end. crl_verify_valid(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts) -> Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, @@ -236,6 +270,22 @@ crl_verify_valid(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts) -> ssl_test_lib:close(Server), ssl_test_lib:close(Client). +crl_verify_error(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts, ExpectedAlert) -> + Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, + {from, self()}, + {options, ServerOpts}]), + Port = ssl_test_lib:inet_port(Server), + + Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port}, + {host, Hostname}, + {from, self()}, + {options, ClientOpts}]), + receive + {Server, AlertOrClose} -> + ct:pal("Server Alert or Close ~p", [AlertOrClose]) + end, + ssl_test_lib:check_result(Client, {error, {tls_alert, ExpectedAlert}}). + %%-------------------------------------------------------------------- %% Internal functions ------------------------------------------------ %%-------------------------------------------------------------------- @@ -259,3 +309,5 @@ make_dir_path(PathComponents) -> "", PathComponents). +rename_crl(Filename) -> + file:rename(Filename, Filename ++ ".notfound"). diff --git a/lib/ssl/test/ssl_sni_SUITE.erl b/lib/ssl/test/ssl_sni_SUITE.erl index f6ffe91027..90c2a49e61 100644 --- a/lib/ssl/test/ssl_sni_SUITE.erl +++ b/lib/ssl/test/ssl_sni_SUITE.erl @@ -108,8 +108,12 @@ ssl_recv(SSLSocket, CurrentData, ExpectedData) -> send_and_hostname(SSLSocket) -> ssl:send(SSLSocket, "OK"), - {ok, [{sni_hostname, Hostname}]} = ssl:connection_information(SSLSocket, [sni_hostname]), - Hostname. + case ssl:connection_information(SSLSocket, [sni_hostname]) of + {ok, [{sni_hostname, Hostname}]} -> + Hostname; + {ok, []} -> + undefined + end. rdnPart([[#'AttributeTypeAndValue'{type=Type, value=Value} | _] | _], Type) -> Value; diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index afd21f0d2f..90fcd193cc 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -825,7 +825,7 @@ common_ciphers(crypto) -> common_ciphers(openssl) -> OpenSslSuites = string:tokens(string:strip(os:cmd("openssl ciphers"), right, $\n), ":"), - [ssl:suite_definition(S) + [ssl_cipher:erl_suite_definition(S) || S <- ssl_cipher:suites(tls_record:highest_protocol_version([])), lists:member(ssl_cipher:openssl_suite_name(S), OpenSslSuites) ]. @@ -1224,7 +1224,7 @@ filter_suites(Ciphers0) -> ++ ssl_cipher:srp_suites() ++ ssl_cipher:rc4_suites(Version), Supported1 = ssl_cipher:filter_suites(Supported0), - Supported2 = [ssl:suite_definition(S) || S <- Supported1], + Supported2 = [ssl_cipher:erl_suite_definition(S) || S <- Supported1], [Cipher || Cipher <- Ciphers0, lists:member(Cipher, Supported2)]. -define(OPENSSL_QUIT, "Q\n"). diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index ecf6c4d6b8..6934d7f851 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -1268,8 +1268,12 @@ client_check_result(Port, DataExpected) -> send_and_hostname(SSLSocket) -> ssl:send(SSLSocket, "OK"), - {ok, [{sni_hostname, Hostname}]} = ssl:connection_information(SSLSocket, [sni_hostname]), - Hostname. + case ssl:connection_information(SSLSocket, [sni_hostname]) of + {ok, []} -> + undefined; + {ok, [{sni_hostname, Hostname}]} -> + Hostname + end. erlang_server_openssl_client_sni_test(Config, SNIHostname, ExpectedSNIHostname, ExpectedCN) -> ct:log("Start running handshake, Config: ~p, SNIHostname: ~p, ExpectedSNIHostname: ~p, ExpectedCN: ~p", [Config, SNIHostname, ExpectedSNIHostname, ExpectedCN]), diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml index 77e262dbe6..1d4ffc10f9 100644 --- a/lib/stdlib/doc/src/filename.xml +++ b/lib/stdlib/doc/src/filename.xml @@ -214,7 +214,7 @@ <desc> <p>Converts <c><anno>Path</anno></c> to a form accepted by the command shell and native applications on the current platform. On Windows, - forward slashes is converted to backward slashes. On all + forward slashes are converted to backward slashes. On all platforms, the name is normalized as done by <c>join/1</c>.</p> <pre> 19> <input>filename:nativename("/usr/local/bin/").</input> % Unix diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index 24ff251ce3..815bf4a489 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -543,7 +543,10 @@ </item> <item> <p><c>active</c> - the count of all actively running child processes - managed by this supervisor.</p> + managed by this supervisor. In the case of <c>simple_one_for_one</c> + supervisors, no check is carried out to ensure that each child process + is still alive, though the result provided here is likely to be very + accurate unless the supervisor is heavily overloaded.</p> </item> <item> <p><c>supervisors</c> - the count of all children marked as diff --git a/lib/stdlib/src/dets_utils.erl b/lib/stdlib/src/dets_utils.erl index 196158cd48..34a8ddddaa 100644 --- a/lib/stdlib/src/dets_utils.erl +++ b/lib/stdlib/src/dets_utils.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2013. All Rights Reserved. +%% Copyright Ericsson AB 2001-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -747,6 +747,8 @@ all_allocated([{X,Y} | L], _X0, Y0, A) when Y0 < X -> all_allocated_as_list(Head) -> all_allocated_as_list(all(get_freelists(Head)), 0, Head#head.base, []). +-dialyzer({no_improper_lists, all_allocated_as_list/4}). + all_allocated_as_list([], _X0, _Y0, []) -> []; all_allocated_as_list([], _X0, _Y0, A) -> diff --git a/lib/stdlib/src/dets_v8.erl b/lib/stdlib/src/dets_v8.erl index 49126193b8..1bf53d91b1 100644 --- a/lib/stdlib/src/dets_v8.erl +++ b/lib/stdlib/src/dets_v8.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2013. All Rights Reserved. +%% Copyright Ericsson AB 2001-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -36,6 +36,8 @@ %% For backward compatibility. -export([sz2pos/1]). +-dialyzer(no_improper_lists). + -compile({inline, [{sz2pos,1},{scan_skip,7}]}). -compile({inline, [{skip_bytes,5}, {get_segp,1}]}). -compile({inline, [{wl_lookup,5}]}). diff --git a/lib/stdlib/src/dets_v9.erl b/lib/stdlib/src/dets_v9.erl index 361780c776..6c406fc03a 100644 --- a/lib/stdlib/src/dets_v9.erl +++ b/lib/stdlib/src/dets_v9.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2013. All Rights Reserved. +%% Copyright Ericsson AB 2001-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,6 +34,8 @@ -export([cache_segps/3]). +-dialyzer(no_improper_lists). + -compile({inline, [{max_objsize,1},{maxobjsize,1}]}). -compile({inline, [{write_segment_file,6}]}). -compile({inline, [{sz2pos,1},{adjsz,1}]}). diff --git a/lib/stdlib/src/dict.erl b/lib/stdlib/src/dict.erl index 6ce3710f87..f921e28ef6 100644 --- a/lib/stdlib/src/dict.erl +++ b/lib/stdlib/src/dict.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2014. All Rights Reserved. +%% Copyright Ericsson AB 2000-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -333,6 +333,8 @@ update_counter(Key, Incr, D0) when is_number(Incr) -> D0, Slot), maybe_expand(D1, Ic). +-dialyzer({no_improper_lists, counter_bkt/3}). + counter_bkt(Key, I, [?kv(Key,Val)|Bkt]) -> {[?kv(Key,Val+I)|Bkt],0}; counter_bkt(Key, I, [Other|Bkt0]) -> diff --git a/lib/stdlib/src/digraph.erl b/lib/stdlib/src/digraph.erl index e51e560542..8a4df95027 100644 --- a/lib/stdlib/src/digraph.erl +++ b/lib/stdlib/src/digraph.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2014. All Rights Reserved. +%% Copyright Ericsson AB 1996-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -338,6 +338,8 @@ edge(G, E) -> %% -spec new_edge_id(graph()) -> edge(). +-dialyzer({no_improper_lists, new_edge_id/1}). + new_edge_id(G) -> NT = G#digraph.ntab, [{'$eid', K}] = ets:lookup(NT, '$eid'), @@ -350,6 +352,8 @@ new_edge_id(G) -> %% -spec new_vertex_id(graph()) -> vertex(). +-dialyzer({no_improper_lists, new_vertex_id/1}). + new_vertex_id(G) -> NT = G#digraph.ntab, [{'$vid', K}] = ets:lookup(NT, '$vid'), diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl index e940ad6956..62b3169a6c 100644 --- a/lib/stdlib/src/erl_lint.erl +++ b/lib/stdlib/src/erl_lint.erl @@ -3532,6 +3532,8 @@ check_qlc_hrl(Line, M, F, As, St) -> %% deprecated_function(Line, ModName, FuncName, [Arg], State) -> State. %% Add warning for calls to deprecated functions. +-dialyzer({no_match, deprecated_function/5}). + deprecated_function(Line, M, F, As, St) -> Arity = length(As), MFA = {M, F, Arity}, @@ -3560,6 +3562,8 @@ deprecated_function(Line, M, F, As, St) -> St end. +-dialyzer({no_match, deprecated_type/5}). + deprecated_type(L, M, N, As, St) -> NAs = length(As), case otp_internal:obsolete_type(M, N, NAs) of diff --git a/lib/stdlib/src/file_sorter.erl b/lib/stdlib/src/file_sorter.erl index 47adb133b0..0d50392b96 100644 --- a/lib/stdlib/src/file_sorter.erl +++ b/lib/stdlib/src/file_sorter.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2013. All Rights Reserved. +%% Copyright Ericsson AB 2001-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -28,6 +28,8 @@ check/1, check/2, keycheck/2, keycheck/3]). +-dialyzer(no_improper_lists). + -include_lib("kernel/include/file.hrl"). -define(CHUNKSIZE, 16384). diff --git a/lib/stdlib/src/lists.erl b/lib/stdlib/src/lists.erl index 62b6ca8a21..2b4472cdf7 100644 --- a/lib/stdlib/src/lists.erl +++ b/lib/stdlib/src/lists.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2013. All Rights Reserved. +%% Copyright Ericsson AB 1996-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -2267,6 +2267,8 @@ ukeysplit_2(I, Y, EY, [Z | L], R) -> ukeysplit_2(_I, Y, _EY, [], R) -> [Y | R]. +-dialyzer({no_improper_lists, ukeymergel/3}). + ukeymergel(I, [T1, [H2 | T2], [H3 | T3] | L], Acc) -> %% The fourth argument, [H2 | H3] (=HdM), may confuse type %% checkers. Its purpose is to ensure that the tests H2 == HdM diff --git a/lib/stdlib/src/maps.erl b/lib/stdlib/src/maps.erl index 3c798b7a04..43d10f4800 100644 --- a/lib/stdlib/src/maps.erl +++ b/lib/stdlib/src/maps.erl @@ -205,7 +205,7 @@ size(Val) -> K :: term(). without(Ks,M) when is_list(Ks), is_map(M) -> - maps:from_list([{K,V}||{K,V} <- maps:to_list(M), not lists:member(K, Ks)]); + lists:foldl(fun(K, M1) -> ?MODULE:remove(K, M1) end, M, Ks); without(Ks,M) -> erlang:error(error_type(M),[Ks,M]). @@ -216,8 +216,16 @@ without(Ks,M) -> Map2 :: map(), K :: term(). -with(Ks,M) when is_list(Ks), is_map(M) -> - maps:from_list([{K,V}||{K,V} <- maps:to_list(M), lists:member(K, Ks)]); +with(Ks,Map1) when is_list(Ks), is_map(Map1) -> + Fun = fun(K, List) -> + case ?MODULE:find(K, Map1) of + {ok, V} -> + [{K, V} | List]; + error -> + List + end + end, + ?MODULE:from_list(lists:foldl(Fun, [], Ks)); with(Ks,M) -> erlang:error(error_type(M),[Ks,M]). diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl index c254ab1e46..9d394e19d7 100644 --- a/lib/stdlib/src/otp_internal.erl +++ b/lib/stdlib/src/otp_internal.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2015. All Rights Reserved. +%% Copyright Ericsson AB 1999-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -23,6 +23,8 @@ %%---------------------------------------------------------------------- +-dialyzer({no_match, obsolete/3}). + -type tag() :: 'deprecated' | 'removed'. %% | 'experimental'. -type mfas() :: mfa() | {atom(), atom(), [byte()]}. -type release() :: string(). @@ -698,17 +700,19 @@ is_snmp_agent_function(del_agent_caps, 1) -> true; is_snmp_agent_function(get_agent_caps, 0) -> true; is_snmp_agent_function(_, _) -> false. +-dialyzer({no_match, obsolete_type/3}). + -spec obsolete_type(module(), atom(), arity()) -> 'no' | {tag(), string()} | {tag(), mfas(), release()}. obsolete_type(Module, Name, NumberOfVariables) -> case obsolete_type_1(Module, Name, NumberOfVariables) of -%% {deprecated=Tag,{_,_,_}=Replacement} -> -%% {Tag,Replacement,"in a future release"}; + {deprecated=Tag,{_,_,_}=Replacement} -> + {Tag,Replacement,"in a future release"}; {_,String}=Ret when is_list(String) -> Ret; -%% {_,_,_}=Ret -> -%% Ret; + {_,_,_}=Ret -> + Ret; no -> no end. diff --git a/lib/stdlib/src/qlc.erl b/lib/stdlib/src/qlc.erl index 3ba3a88038..1ae7c6cc25 100644 --- a/lib/stdlib/src/qlc.erl +++ b/lib/stdlib/src/qlc.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2015. All Rights Reserved. +%% Copyright Ericsson AB 2004-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -51,6 +51,8 @@ -export([template_state/0, aux_name/3, name_suffix/2, vars/1, var_ufold/2, var_fold/3, all_selections/1]). +-dialyzer(no_improper_lists). + %% When cache=list lists bigger than ?MAX_LIST_SIZE bytes are put on %% file. Also used when merge join finds big equivalence classes. -define(MAX_LIST_SIZE, 512*1024). diff --git a/lib/stdlib/src/rand.erl b/lib/stdlib/src/rand.erl index dc060e82d9..d455abf7b0 100644 --- a/lib/stdlib/src/rand.erl +++ b/lib/stdlib/src/rand.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2015. All Rights Reserved. +%% Copyright Ericsson AB 2015-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -256,6 +256,8 @@ exs64_uniform(Max, {Alg, R}) -> %% ===================================================================== -type exsplus_state() :: nonempty_improper_list(uint58(), uint58()). +-dialyzer({no_improper_lists, exsplus_seed/1}). + exsplus_seed({A1, A2, A3}) -> {_, R1} = exsplus_next([(((A1 * 4294967197) + 1) band ?UINT58MASK)| (((A2 * 4294967231) + 1) band ?UINT58MASK)]), @@ -263,6 +265,8 @@ exsplus_seed({A1, A2, A3}) -> tl(R1)]), R2. +-dialyzer({no_improper_lists, exsplus_next/1}). + %% Advance xorshift116+ state for one step and generate 58bit unsigned integer -spec exsplus_next(exsplus_state()) -> {uint58(), exsplus_state()}. exsplus_next([S1|S0]) -> diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src index 04cdf31ada..8a313591a7 100644 --- a/lib/stdlib/src/stdlib.appup.src +++ b/lib/stdlib/src/stdlib.appup.src @@ -18,9 +18,9 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"2\\.[5-7](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.* + [{<<"2\\.[5-8](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.* {<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}], % 17.0-17.5 %% Down to - max one major revision back - [{<<"2\\.[5-7](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.* + [{<<"2\\.[5-8](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.* {<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}] % 17.0-17.5 }. diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl index 92a0c29011..cecdebd0c8 100644 --- a/lib/stdlib/src/supervisor.erl +++ b/lib/stdlib/src/supervisor.erl @@ -33,6 +33,9 @@ terminate/2, code_change/3]). -export([try_again_restart/2]). +%% For release_handler only +-export([get_callback_module/1]). + %%-------------------------------------------------------------------------- -export_type([sup_flags/0, child_spec/0, startchild_ret/0, strategy/0]). @@ -113,6 +116,7 @@ intensity :: non_neg_integer(), period :: pos_integer(), restarts = [], + dynamic_restarts = 0 :: non_neg_integer(), module, args}). -type state() :: #state{}. @@ -250,6 +254,17 @@ try_again_restart(Supervisor, Child) -> cast(Supervisor, Req) -> gen_server:cast(Supervisor, Req). +%%%----------------------------------------------------------------- +%%% Called by release_handler during upgrade +-spec get_callback_module(Pid) -> Module when + Pid :: pid(), + Module :: atom(). +get_callback_module(Pid) -> + {status, _Pid, {module, _Mod}, + [_PDict, _SysState, _Parent, _Dbg, Misc]} = sys:get_status(Pid), + [_Header, _Data, {data, [{"State", State}]}] = Misc, + State#state.module. + %%% --------------------------------------------------- %%% %%% Initialize the supervisor. @@ -504,39 +519,26 @@ handle_call(which_children, _From, State) -> handle_call(count_children, _From, #state{children = [#child{restart_type = temporary, child_type = CT}]} = State) when ?is_simple(State) -> - {Active, Count} = - ?SETS:fold(fun(Pid, {Alive, Tot}) -> - case is_pid(Pid) andalso is_process_alive(Pid) of - true ->{Alive+1, Tot +1}; - false -> - {Alive, Tot + 1} - end - end, {0, 0}, dynamics_db(temporary, State#state.dynamics)), + Sz = ?SETS:size(dynamics_db(temporary, State#state.dynamics)), Reply = case CT of - supervisor -> [{specs, 1}, {active, Active}, - {supervisors, Count}, {workers, 0}]; - worker -> [{specs, 1}, {active, Active}, - {supervisors, 0}, {workers, Count}] + supervisor -> [{specs, 1}, {active, Sz}, + {supervisors, Sz}, {workers, 0}]; + worker -> [{specs, 1}, {active, Sz}, + {supervisors, 0}, {workers, Sz}] end, {reply, Reply, State}; -handle_call(count_children, _From, #state{children = [#child{restart_type = RType, +handle_call(count_children, _From, #state{dynamic_restarts = Restarts, + children = [#child{restart_type = RType, child_type = CT}]} = State) when ?is_simple(State) -> - {Active, Count} = - ?DICTS:fold(fun(Pid, _Val, {Alive, Tot}) -> - case is_pid(Pid) andalso is_process_alive(Pid) of - true -> - {Alive+1, Tot +1}; - false -> - {Alive, Tot + 1} - end - end, {0, 0}, dynamics_db(RType, State#state.dynamics)), + Sz = ?DICTS:size(dynamics_db(RType, State#state.dynamics)), + Active = Sz - Restarts, Reply = case CT of supervisor -> [{specs, 1}, {active, Active}, - {supervisors, Count}, {workers, 0}]; + {supervisors, Sz}, {workers, 0}]; worker -> [{specs, 1}, {active, Active}, - {supervisors, 0}, {workers, Count}] + {supervisors, 0}, {workers, Sz}] end, {reply, Reply, State}; @@ -806,8 +808,15 @@ restart(Child, State) -> {shutdown, remove_child(Child, NState)} end. -restart(simple_one_for_one, Child, State) -> +restart(simple_one_for_one, Child, State0) -> #child{pid = OldPid, mfargs = {M, F, A}} = Child, + State = case OldPid of + ?restarting(_) -> + NRes = State0#state.dynamic_restarts - 1, + State0#state{dynamic_restarts = NRes}; + _ -> + State0 + end, Dynamics = ?DICTS:erase(OldPid, dynamics_db(Child#child.restart_type, State#state.dynamics)), case do_start_child_i(M, F, A) of @@ -818,7 +827,9 @@ restart(simple_one_for_one, Child, State) -> NState = State#state{dynamics = ?DICTS:store(Pid, A, Dynamics)}, {ok, NState}; {error, Error} -> - NState = State#state{dynamics = ?DICTS:store(restarting(OldPid), A, + NRestarts = State#state.dynamic_restarts + 1, + NState = State#state{dynamic_restarts = NRestarts, + dynamics = ?DICTS:store(restarting(OldPid), A, Dynamics)}, report_error(start_error, Error, Child, State#state.name), {try_again, NState} diff --git a/lib/stdlib/src/unicode.erl b/lib/stdlib/src/unicode.erl index 3e8e6f5101..617da11ba8 100644 --- a/lib/stdlib/src/unicode.erl +++ b/lib/stdlib/src/unicode.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -561,6 +561,8 @@ do_o_binary(F,L) -> erlang:iolist_to_binary(List) end. +-dialyzer({no_improper_lists, do_o_binary2/2}). + do_o_binary2(_F,[]) -> <<>>; do_o_binary2(F,[H|T]) -> diff --git a/lib/stdlib/src/zip.erl b/lib/stdlib/src/zip.erl index bec0bd3f6d..f8ba6f18e9 100644 --- a/lib/stdlib/src/zip.erl +++ b/lib/stdlib/src/zip.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2006-2013. All Rights Reserved. +%% Copyright Ericsson AB 2006-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -1566,6 +1566,8 @@ append_bins([_|_]=List, B) -> append_bins([], B) -> B. +-dialyzer({no_improper_lists, pwrite_iolist/3}). + pwrite_iolist(B, Pos, Bin) -> {Left, Right} = split_binary(B, Pos), Sz = erlang:iolist_size(Bin), diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl index 0e897631ff..bb1ed2a4fc 100644 --- a/lib/stdlib/test/io_SUITE.erl +++ b/lib/stdlib/test/io_SUITE.erl @@ -2125,12 +2125,24 @@ rpc_call_max(Node, M, F, Args) -> %% Make sure that a bad specification for a printable range is rejected. bad_printable_range(Config) when is_list(Config) -> Cmd = lists:concat([lib:progname()," +pcunnnnnicode -run erlang halt"]), - case os:cmd(Cmd) of - "bad range of printable characters" ++ _ -> - ok; - String -> - io:format("~s\n", [String]), - ?t:fail() + P = open_port({spawn, Cmd}, [stderr_to_stdout, {line, 200}]), + ok = receive + {P, {data, {eol , "bad range of printable characters" ++ _}}} -> + ok; + Other -> + Other + after 1000 -> + timeout + end, + catch port_close(P), + flush_from_port(P), + ok. + +flush_from_port(P) -> + receive {P, _} -> + flush_from_port(P) + after 0 -> + ok end. io_lib_print_binary_depth_one(doc) -> diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl index 8cb2a5194a..903ca76575 100644 --- a/lib/stdlib/test/supervisor_SUITE.erl +++ b/lib/stdlib/test/supervisor_SUITE.erl @@ -67,6 +67,7 @@ %% Misc tests -export([child_unlink/1, tree/1, count_children/1, + count_restarting_children/1, do_not_save_start_parameters_for_temporary_children/1, do_not_save_child_specs_for_temporary_children/1, simple_one_for_one_scale_many_temporary_children/1, @@ -90,7 +91,8 @@ all() -> {group, normal_termination}, {group, shutdown_termination}, {group, abnormal_termination}, child_unlink, tree, - count_children, do_not_save_start_parameters_for_temporary_children, + count_children, count_restarting_children, + do_not_save_start_parameters_for_temporary_children, do_not_save_child_specs_for_temporary_children, simple_one_for_one_scale_many_temporary_children, temporary_bystander, simple_global_supervisor, hanging_restart_loop, hanging_restart_loop_simple, @@ -1459,6 +1461,54 @@ count_children(Config) when is_list(Config) -> [1,0,0,0] = get_child_counts(sup_test). %%------------------------------------------------------------------------- +%% Test count_children when some children are restarting +count_restarting_children(Config) when is_list(Config) -> + process_flag(trap_exit, true), + Child = {child, {supervisor_deadlock, start_child_noreg, []}, + permanent, brutal_kill, worker, []}, + %% 2 sek delay on failing restart (see supervisor_deadlock.erl) -> + %% MaxR=20, MaxT=10 should ensure a restart loop when starting and + %% restarting 3 instances of the child (as below) + {ok, SupPid} = start_link({ok, {{simple_one_for_one, 20, 10}, [Child]}}), + + %% Ets table with state read by supervisor_deadlock.erl + ets:new(supervisor_deadlock,[set,named_table,public]), + ets:insert(supervisor_deadlock,{fail_start,false}), + + [1,0,0,0] = get_child_counts(SupPid), + {ok, Ch1_1} = supervisor:start_child(SupPid, []), + [1,1,0,1] = get_child_counts(SupPid), + {ok, Ch1_2} = supervisor:start_child(SupPid, []), + [1,2,0,2] = get_child_counts(SupPid), + {ok, Ch1_3} = supervisor:start_child(SupPid, []), + [1,3,0,3] = get_child_counts(SupPid), + + supervisor_deadlock:restart_child(Ch1_1), + supervisor_deadlock:restart_child(Ch1_2), + supervisor_deadlock:restart_child(Ch1_3), + test_server:sleep(400), + [1,3,0,3] = get_child_counts(SupPid), + [Ch2_1, Ch2_2, Ch2_3] = [C || {_,C,_,_} <- supervisor:which_children(SupPid)], + + ets:insert(supervisor_deadlock,{fail_start,true}), + supervisor_deadlock:restart_child(Ch2_1), + supervisor_deadlock:restart_child(Ch2_2), + test_server:sleep(4000), % allow restart to happen before proceeding + [1,1,0,3] = get_child_counts(SupPid), + + ets:insert(supervisor_deadlock,{fail_start,false}), + test_server:sleep(4000), % allow restart to happen before proceeding + [1,3,0,3] = get_child_counts(SupPid), + + ok = supervisor:terminate_child(SupPid, Ch2_3), + [1,2,0,2] = get_child_counts(SupPid), + [Ch3_1, Ch3_2] = [C || {_,C,_,_} <- supervisor:which_children(SupPid)], + ok = supervisor:terminate_child(SupPid, Ch3_1), + [1,1,0,1] = get_child_counts(SupPid), + ok = supervisor:terminate_child(SupPid, Ch3_2), + [1,0,0,0] = get_child_counts(SupPid). + +%%------------------------------------------------------------------------- %% Temporary children shall not be restarted so they should not save %% start parameters, as it potentially can take up a huge amount of %% memory for no purpose. diff --git a/lib/stdlib/test/supervisor_deadlock.erl b/lib/stdlib/test/supervisor_deadlock.erl index 288547a972..8d3d1c6f30 100644 --- a/lib/stdlib/test/supervisor_deadlock.erl +++ b/lib/stdlib/test/supervisor_deadlock.erl @@ -11,9 +11,11 @@ init([child]) -> %% terminates immediately {ok, []}; [{fail_start, true}] -> - %% Restart frequency is MaxR=8, MaxT=10, so this will - %% ensure that restart intensity is not reached -> restart - %% loop + %% A restart frequency of MaxR=8, MaxT=10 should ensure + %% that restart intensity is not reached -> restart loop. + %% (Note that if we use simple_one_for_one, and start + %% 'many' child instances, the restart frequency must be + %% ajusted accordingly.) timer:sleep(2000), % NOTE: this could be a gen_server call timeout {stop, error} @@ -41,5 +43,11 @@ code_change(_OldVsn, State, _Extra) -> start_child() -> gen_server:start_link({local, ?MODULE}, ?MODULE, [child], []). +start_child_noreg() -> + gen_server:start_link(?MODULE, [child], []). + restart_child() -> gen_server:cast(supervisor_deadlock, restart). + +restart_child(Pid) -> + gen_server:cast(Pid, restart). diff --git a/lib/stdlib/test/win32reg_SUITE.erl b/lib/stdlib/test/win32reg_SUITE.erl index 82baa43318..6d27ac6387 100644 --- a/lib/stdlib/test/win32reg_SUITE.erl +++ b/lib/stdlib/test/win32reg_SUITE.erl @@ -49,48 +49,53 @@ init_per_suite(Config) when is_list(Config) -> end_per_suite(Config) when is_list(Config) -> Config. + long(doc) -> "Test long keys and entries (OTP-3446)."; long(Config) when is_list(Config) -> - ?line Dog = test_server:timetrap(test_server:seconds(10)), + Dog = test_server:timetrap(test_server:seconds(10)), - ?line LongKey = "software\\" ++ + LongKey = "software\\" ++ lists:flatten(lists:duplicate(10, "..\\software\\")) ++ "Ericsson\\Erlang", - ?line {ok,Reg} = win32reg:open([read,write]), - ?line ok = win32reg:change_key(Reg, "\\hklm"), - ?line ok = win32reg:change_key(Reg, LongKey), - ?line {ok,ErlangKey} = win32reg:current_key(Reg), - io:format("Erlang key: ~s", [ErlangKey]), + {ok,Read} = win32reg:open([read]), + ok = win32reg:change_key(Read, "\\hklm"), + + ok = win32reg:change_key(Read, LongKey), + {ok,ErlangKey} = win32reg:current_key(Read), + io:format("Erlang key: ~s~n", [ErlangKey]), + ok = win32reg:close(Read), + {ok,Reg} = win32reg:open([read, write]), %% Write a long value and read it back. - ?line TestKey = "test_key", - ?line LongValue = lists:concat(["This is a long value generated by the test case ",?MODULE,":long/1. "|lists:duplicate(128, "a")]), - ?line ok = win32reg:set_value(Reg, TestKey, LongValue), - ?line {ok,LongValue} = win32reg:value(Reg, TestKey), + TestKey = "test_key", + LongValue = lists:concat(["This is a long value generated by the test case ",?MODULE,":long/1. "|lists:duplicate(128, "a")]), + ok = win32reg:set_value(Reg, TestKey, LongValue), + {ok,LongValue} = win32reg:value(Reg, TestKey), + io:format("Where ~p Key ~s Value ~s ~n", [win32reg:current_key(Reg), TestKey, LongValue]), %% Done. - ?line ok = win32reg:close(Reg), - ?line test_server:timetrap_cancel(Dog), + ok = win32reg:close(Reg), + test_server:timetrap_cancel(Dog), ok. evil_write(Config) when is_list(Config) -> - ?line Dog = test_server:timetrap(test_server:seconds(10)), + Dog = test_server:timetrap(test_server:seconds(10)), - ?line Key = "Software\\Ericsson\\Erlang", - ?line {ok,Reg} = win32reg:open([read,write]), - ?line ok = win32reg:change_key(Reg, "\\hklm"), - ?line ok = win32reg:change_key(Reg, Key), - ?line {ok,ErlangKey} = win32reg:current_key(Reg), + Key = "Software\\Ericsson\\Erlang", + {ok,Reg} = win32reg:open([read,write]), + ok = win32reg:change_key(Reg, "\\hkcu"), + ok = win32reg:change_key_create(Reg, Key), + {ok,ErlangKey} = win32reg:current_key(Reg), io:format("Erlang key: ~s", [ErlangKey]), %% Write keys with different length and read it back. - ?line TestKey = "test_key " ++ lists:duplicate(128, $a), + TestKey = "test_key " ++ lists:duplicate(128, $a), evil_write_1(Reg, TestKey), %% Done. - ?line ok = win32reg:close(Reg), - ?line test_server:timetrap_cancel(Dog), + ok = win32reg:close(Reg), + test_server:timetrap_cancel(Dog), ok. evil_write_1(Reg, [_|[_|_]=Key]=Key0) -> diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl index da6bf491ac..671674c617 100644 --- a/lib/test_server/src/test_server.erl +++ b/lib/test_server/src/test_server.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2015. All Rights Reserved. +%% Copyright Ericsson AB 1996-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -63,13 +63,11 @@ init_target_info() -> [$.|Emu] = code:objfile_extension(), {_, OTPRel} = init:script_id(), - TestServerDir = filename:absname(filename:dirname(code:which(?MODULE))), #target_info{os_family=test_server_sup:get_os_family(), os_type=os:type(), version=erlang:system_info(version), system_version=erlang:system_info(system_version), root_dir=code:root_dir(), - test_server_dir=TestServerDir, emulator=Emu, otp_release=OTPRel, username=test_server_sup:get_username(), @@ -411,11 +409,9 @@ run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) -> Ref = make_ref(), Pid = spawn_link( - fun() -> - run_test_case_eval(Mod, Func, Args, Name, Ref, - RunInit, TimetrapData, - LogOpts, TCCallback) - end), + run_test_case_eval_fun(Mod, Func, Args, Name, Ref, + RunInit, TimetrapData, + LogOpts, TCCallback)), put(test_server_detected_fail, []), St = #st{ref=Ref,pid=Pid,mf={Mod,Func},last_known_loc=unknown, status=starting,ret_val=[],comment="",timeout=infinity, @@ -907,6 +903,16 @@ job_proxy_msgloop() -> end, job_proxy_msgloop(). +-spec run_test_case_eval_fun(_, _, _, _, _, _, _, _, _) -> + fun(() -> no_return()). +run_test_case_eval_fun(Mod, Func, Args, Name, Ref, RunInit, + TimetrapData, LogOpts, TCCallback) -> + fun () -> + run_test_case_eval(Mod, Func, Args, Name, Ref, + RunInit, TimetrapData, + LogOpts, TCCallback) + end. + %% A test case is known to have failed if it returns {'EXIT', _} tuple, %% or sends a message {failed, File, Line} to it's group_leader @@ -2408,15 +2414,7 @@ run_on_shielded_node(Fun, CArgs) when is_function(Fun), is_list(CArgs) -> end, Master = self(), Ref = make_ref(), - Slave = spawn(Node, - fun () -> - start_job_proxy(), - receive - Ref -> - Master ! {Ref, Fun()} - end, - receive after infinity -> infinity end - end), + Slave = spawn(Node, start_job_proxy_fun(Master, Fun)), MRef = erlang:monitor(process, Slave), Slave ! Ref, receive @@ -2431,6 +2429,17 @@ run_on_shielded_node(Fun, CArgs) when is_function(Fun), is_list(CArgs) -> end end. +-spec start_job_proxy_fun(_, _) -> fun(() -> no_return()). +start_job_proxy_fun(Master, Fun) -> + fun () -> + start_job_proxy(), + receive + Ref -> + Master ! {Ref, Fun()} + end, + receive after infinity -> infinity end + end. + %% Return true if Name or node() is a shielded node is_shielded(Name) -> case {cast_to_list(Name),atom_to_list(node())} of diff --git a/lib/test_server/src/test_server_internal.hrl b/lib/test_server/src/test_server_internal.hrl index 578f359010..1ec2d83417 100644 --- a/lib/test_server/src/test_server_internal.hrl +++ b/lib/test_server/src/test_server_internal.hrl @@ -30,7 +30,6 @@ version, % string() system_version, % string() root_dir, % string() - test_server_dir, % string() emulator, % string() otp_release, % string() username, % string() diff --git a/lib/test_server/src/test_server_node.erl b/lib/test_server/src/test_server_node.erl index 4e6839fc6b..37f8941d24 100644 --- a/lib/test_server/src/test_server_node.erl +++ b/lib/test_server/src/test_server_node.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2014. All Rights Reserved. +%% Copyright Ericsson AB 2002-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -121,7 +121,7 @@ start_tracer_node(TraceFile,TI) -> %%% trace_nodes(Sock,Nodes) -> Bin = term_to_binary({add_nodes,Nodes}), - ok = gen_tcp:send(Sock, [1|Bin]), + ok = gen_tcp:send(Sock, tag_trace_message(Bin)), receive_ack(Sock). @@ -142,7 +142,7 @@ receive_ack(Sock) -> %%% stop_tracer_node(Sock) -> Bin = term_to_binary(id(stop)), - ok = gen_tcp:send(Sock, [1|Bin]), + ok = gen_tcp:send(Sock, tag_trace_message(Bin)), receive {tcp_closed,Sock} -> gen_tcp:close(Sock) end, ok. @@ -171,7 +171,7 @@ trc([TraceFile, PortAtom, Type]) -> {packet,2}]) of {ok,Sock} -> BinResult = term_to_binary(Result), - ok = gen_tcp:send(Sock,[1|BinResult]), + ok = gen_tcp:send(Sock,tag_trace_message(BinResult)), trc_loop(Sock,Patterns,Type); _else -> ok @@ -187,7 +187,7 @@ trc_loop(Sock,Patterns,Type) -> {ok,{add_nodes,Nodes}} -> add_nodes(Nodes,Patterns,Type), Bin = term_to_binary(id(ok)), - ok = gen_tcp:send(Sock, [1|Bin]), + ok = gen_tcp:send(Sock, tag_trace_message(Bin)), trc_loop(Sock,Patterns,Type); {ok,stop} -> ttb:stop(), @@ -307,11 +307,11 @@ start_node_peer(SlaveName, OptList, From, TI) -> HostStr, " ", WaitPort]), % Support for erl_crash_dump files.. - CrashFile = filename:join([TI#target_info.test_server_dir, + CrashDir = test_server_sup:crash_dump_dir(), + CrashFile = filename:join([CrashDir, "erl_crash_dump."++cast_to_list(SlaveName)]), CrashArgs = lists:concat([" -env ERL_CRASH_DUMP \"",CrashFile,"\" "]), FailOnError = start_node_get_option_value(fail_on_error, OptList, true), - Pa = TI#target_info.test_server_dir, Prog0 = start_node_get_option_value(erl, OptList, default), Prog = quote_progname(pick_erl_program(Prog0)), Args = @@ -322,7 +322,6 @@ start_node_peer(SlaveName, OptList, From, TI) -> Cmd = lists:concat([Prog, " -detached ", TI#target_info.naming, " ", SlaveName, - " -pa \"", Pa,"\"", NodeStarted, CrashArgs, " ", Args]), @@ -354,28 +353,31 @@ start_node_peer(SlaveName, OptList, From, TI) -> I = "=== Not waiting for node", gen_server:reply(From,{{ok, Nodename}, HostStr, Cmd, I, []}), Self = self(), - spawn_link( - fun() -> - wait_for_node_started(LSock,Tmo,undefined, - Cleanup,TI,Self), - receive after infinity -> ok end - end), + spawn_link(wait_for_node_started_fun(LSock,Tmo,Cleanup,TI,Self)), ok end. +-spec wait_for_node_started_fun(_, _, _, _, _) -> fun(() -> no_return()). +wait_for_node_started_fun(LSock, Tmo, Cleanup, TI, Self) -> + fun() -> + wait_for_node_started(LSock,Tmo,undefined, + Cleanup,TI,Self), + receive after infinity -> ok end + end. + %% %% Slave nodes are started on a remote host if %% - the option remote is given when calling test_server:start_node/3 %% -start_node_slave(SlaveName, OptList, From, TI) -> +start_node_slave(SlaveName, OptList, From, _TI) -> SuppliedArgs = start_node_get_option_value(args, OptList, []), Cleanup = start_node_get_option_value(cleanup, OptList, true), - CrashFile = filename:join([TI#target_info.test_server_dir, + CrashDir = test_server_sup:crash_dump_dir(), + CrashFile = filename:join([CrashDir, "erl_crash_dump."++cast_to_list(SlaveName)]), CrashArgs = lists:concat([" -env ERL_CRASH_DUMP \"",CrashFile,"\" "]), - Pa = TI#target_info.test_server_dir, - Args = lists:concat([" -pa \"", Pa, "\" ", SuppliedArgs, CrashArgs]), + Args = lists:concat([" ", SuppliedArgs, CrashArgs]), Prog0 = start_node_get_option_value(erl, OptList, default), Prog = pick_erl_program(Prog0), @@ -468,7 +470,11 @@ handle_start_node_return(Version,VsnStr,{started, Node, OVersion, OVsnStr}) -> node_started([Host,PortAtom]) -> %% Must spawn a new process because the boot process should not %% hang forever!! - spawn(fun() -> node_started(Host,PortAtom) end). + spawn(node_started_fun(Host,PortAtom)). + +-spec node_started_fun(_, _) -> fun(() -> no_return()). +node_started_fun(Host,PortAtom) -> + fun() -> node_started(Host,PortAtom) end. %% This process hangs forever, just waiting for the socket to be %% closed and terminating the node @@ -482,7 +488,7 @@ node_started(Host,PortAtom) -> {ok,Sock} -> Started = term_to_binary({started, node(), Version, VsnStr}), - ok = gen_tcp:send(Sock, [1|Started]), + ok = gen_tcp:send(Sock, tag_trace_message(Started)), receive _Anyting -> gen_tcp:close(Sock), erlang:halt() @@ -492,8 +498,10 @@ node_started(Host,PortAtom) -> end. - - +-compile({inline, [tag_trace_message/1]}). +-dialyzer({no_improper_lists, tag_trace_message/1}). +tag_trace_message(M) -> + [1|M]. % start_which_node(Optlist) -> hostname start_which_node(Optlist) -> diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl index fc2cfd57bd..1c0eb18d70 100644 --- a/lib/test_server/src/test_server_sup.erl +++ b/lib/test_server/src/test_server_sup.erl @@ -594,7 +594,8 @@ cleanup_crash_dumps() -> delete_files(Dumps). crash_dump_dir() -> - filename:dirname(code:which(?MODULE)). + {ok,Dir} = test_server_sup:framework_call(get_log_dir,[]), + Dir. tar_crash_dumps() -> Dir = crash_dump_dir(), diff --git a/lib/tools/src/cprof.erl b/lib/tools/src/cprof.erl index 0240f876bc..f6d68f0bf8 100644 --- a/lib/tools/src/cprof.erl +++ b/lib/tools/src/cprof.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2009. All Rights Reserved. +%% Copyright Ericsson AB 2002-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -114,6 +114,7 @@ analyse(Limit) when is_integer(Limit) -> analyse(M) when is_atom(M) -> analyse(M, 1). +-dialyzer({no_improper_lists, analyse/2}). analyse(M, Limit) when is_atom(M), is_integer(Limit) -> L0 = [begin MFA = {M,F,A}, diff --git a/lib/tools/src/fprof.erl b/lib/tools/src/fprof.erl index 7c6fab0b75..c5c24c8eb3 100644 --- a/lib/tools/src/fprof.erl +++ b/lib/tools/src/fprof.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2013. All Rights Reserved. +%% Copyright Ericsson AB 2001-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -2251,6 +2251,8 @@ do_analyse(Table, Analyse) -> ?dbg(5, "do_analyse_1(_, _) ->~p~n", [Result]), Result. +-dialyzer({no_improper_lists, do_analyse_1/2}). + do_analyse_1(Table, #analyse{group_leader = GroupLeader, dest = Io, @@ -2624,6 +2626,8 @@ funcstat_pd(Pid, Func1, Func0, Clocks) -> funcstat_sort_r(FuncstatList, Element) -> funcstat_sort_r_1(FuncstatList, Element, []). +-dialyzer({no_improper_lists, funcstat_sort_r_1/3}). + funcstat_sort_r_1([], _, R) -> postsort_r(lists:sort(R)); funcstat_sort_r_1([#funcstat{callers_sum = #clocks{} = Clocks, @@ -2646,6 +2650,8 @@ funcstat_sort_r_1([#funcstat{callers_sum = #clocks{} = Clocks, clocks_sort_r(L, E) -> clocks_sort_r_1(L, E, []). +-dialyzer({no_improper_lists, clocks_sort_r_1/3}). + clocks_sort_r_1([], _, R) -> postsort_r(lists:sort(R)); clocks_sort_r_1([#clocks{} = C | L], E, R) -> diff --git a/lib/tools/src/lcnt.erl b/lib/tools/src/lcnt.erl index e8b3d242e4..3a3cebf3ed 100644 --- a/lib/tools/src/lcnt.erl +++ b/lib/tools/src/lcnt.erl @@ -933,7 +933,6 @@ strings(Strings) -> strings(Strings, []). strings([], Out) -> Out; strings([{space, N, S} | Ss], Out) -> strings(Ss, Out ++ term2string(term2string("~~~ws", [N]), [S])); strings([{left, N, S} | Ss], Out) -> strings(Ss, Out ++ term2string(term2string(" ~~s~~~ws", [N]), [S,""])); -strings([{format, Format, S} | Ss], Out) -> strings(Ss, Out ++ term2string(Format, [S])); strings([S|Ss], Out) -> strings(Ss, Out ++ term2string("~ts", [S])). diff --git a/lib/tools/src/xref_utils.erl b/lib/tools/src/xref_utils.erl index 438ec93962..f69aa70244 100644 --- a/lib/tools/src/xref_utils.erl +++ b/lib/tools/src/xref_utils.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2014. All Rights Reserved. +%% Copyright Ericsson AB 2000-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -245,6 +245,8 @@ select_last_application_version(AppVs) -> TL = to_external(partition(1, relation(AppVs))), [last(keysort(2, L)) || L <- TL]. +-record(scan, {collected = [], errors = [], seen = [], unreadable = []}). + %% scan_directory(Directory, Recurse, Collect, Watch) -> %% {Collected, Errors, Seen, Unreadable} %% @@ -261,8 +263,9 @@ select_last_application_version(AppVs) -> %% Unreadable. %% scan_directory(File, Recurse, Collect, Watch) -> - Init = [[] | {[],[],[]}], - [L | {E,J,U}] = find_files_dir(File, Recurse, Collect, Watch, Init), + Init = #scan{}, + S = find_files_dir(File, Recurse, Collect, Watch, Init), + #scan{collected = L, errors = E, seen = J, unreadable = U} = S, {reverse(L), reverse(E), reverse(J), reverse(U)}. %% {Dir, Basename} | false @@ -576,8 +579,7 @@ find_files_dir(Dir, Recurse, Collect, Watch, L) -> {ok, Files} -> find_files(sort(Files), Dir, Recurse, Collect, Watch, L); {error, Error} -> - [B | {E,J,U}] = L, - [B | {[file_error(Dir, Error)|E],J,U}] + L#scan{errors = [file_error(Dir, Error)|L#scan.errors]} end. find_files([F | Fs], Dir, Recurse, Collect, Watch, L) -> @@ -588,22 +590,23 @@ find_files([F | Fs], Dir, Recurse, Collect, Watch, L) -> {ok, {_, directory, _, _}} -> L; Info -> - [B | EJU = {E,J,U}] = L, + #scan{collected = B, errors = E, + seen = J, unreadable = U} = L, Ext = filename:extension(File), C = member(Ext, Collect), case C of true -> case Info of {ok, {_, file, readable, _}} -> - [[{Dir,F} | B] | EJU]; + L#scan{collected = [{Dir,F} | B]}; {ok, {_, file, unreadable, _}} -> - [B | {E,J,[File|U]}]; + L#scan{unreadable = [File|U]}; Error -> - [B | {[Error|E],J,U}] + L#scan{errors = [Error|E]} end; false -> case member(Ext, Watch) of - true -> [B | {E,[File|J],U}]; + true -> L#scan{seen = [File|J]}; false -> L end end diff --git a/lib/wx/api_gen/gl_gen.erl b/lib/wx/api_gen/gl_gen.erl index 8b24e38cc0..ab8f842d31 100644 --- a/lib/wx/api_gen/gl_gen.erl +++ b/lib/wx/api_gen/gl_gen.erl @@ -191,7 +191,7 @@ parse_define([#xmlElement{name=initializer,content=Contents}|_R],Def,_Os) -> try case Val0 of "0x" ++ Val1 -> - _ = http_util:hexlist_to_integer(Val1), + _ = list_to_integer(Val1, 16), Def#def{val=Val1, type=hex}; _ -> Val = list_to_integer(Val0), diff --git a/lib/wx/api_gen/wx_extra/added_func.h b/lib/wx/api_gen/wx_extra/added_func.h index 0698621c5f..417188cc8a 100644 --- a/lib/wx/api_gen/wx_extra/added_func.h +++ b/lib/wx/api_gen/wx_extra/added_func.h @@ -32,3 +32,10 @@ class wxToolBar { wxToolBarToolBase * AddStretchableSpace(); wxToolBarToolBase * InsertStretchableSpace(size_t pos); }; + + +class wxWindow { + public: + bool IsDoubleBuffered(); + void SetDoubleBuffered(bool on); +}; diff --git a/lib/wx/api_gen/wx_gen.erl b/lib/wx/api_gen/wx_gen.erl index 5cf09e5eee..ec2c35cc0e 100644 --- a/lib/wx/api_gen/wx_gen.erl +++ b/lib/wx/api_gen/wx_gen.erl @@ -705,6 +705,8 @@ parse_type2(["unsigned"|R],Info,Opts,T=#type{mod=Mod}) -> parse_type2(R,Info,Opts,T#type{mod=[unsigned|Mod]}); parse_type2(["int"|R],Info,Opts, T) -> parse_type2(R,Info,Opts,T#type{name=int,base=int}); +parse_type2(["wxByte"|R],Info,Opts, T) -> + parse_type2(R,Info,Opts,T#type{name=int,base=int}); parse_type2(["char"|R],Info,Opts, T) -> parse_type2(R,Info,Opts,T#type{name="char",base=int}); parse_type2([N="size_t"|R], Info, Opts, T) -> @@ -1373,7 +1375,7 @@ extract_enum3([#xmlElement{name=initializer,content=Cs}|_],_Id,[{Name,_}|Acc]) - try case Val0 of ["0x" ++ Val1] -> - Val = http_util:hexlist_to_integer(Val1), + Val = list_to_integer(Val1, 16), {[{Name, Val}|Acc], Val+1}; ["1", "<<", Shift] -> Val = 1 bsl list_to_integer(Shift), @@ -1429,7 +1431,7 @@ extract_def([#xmlElement{name=param}|_],Name,_) -> extract_def([#xmlElement{name=initializer,content=Cs}|_R],N,Skip) -> Val0 = extract_def2(Cs), case Val0 of - "0x" ++ Val1 -> {N, http_util:hexlist_to_integer(Val1)}; + "0x" ++ Val1 -> {N, list_to_integer(Val1, 16)}; _ -> try Val = list_to_integer(Val0), @@ -1451,7 +1453,7 @@ extract_def(_,N,_) -> throw(N). extract_def2([#xmlText{value=Val}|R]) -> - strip_comment(string:strip(Val)) ++ extract_def2(R); + string:strip(strip_comment(Val)) ++ extract_def2(R); extract_def2([#xmlElement{content=Cs}|R]) -> extract_def2(Cs) ++ extract_def2(R); extract_def2([]) -> []. diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl index ed7b27f3bf..71b2038c56 100644 --- a/lib/wx/api_gen/wx_gen_cpp.erl +++ b/lib/wx/api_gen/wx_gen_cpp.erl @@ -116,8 +116,13 @@ taylormade_class(#class{name=CName, methods=Ms}) -> 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, Const) || Const <- Cs], + case need_copy_constr(Class) of + true -> + w(" E~s(~s copy) : ~s(copy) {};~n", [Class, Class, Class]); + false -> + ignore + end. gen_constructor(_Class, #method{where=merged_c}) -> ok; gen_constructor(_Class, #method{where=erl_no_opt}) -> ok; gen_constructor(Class, _M=#method{params=Ps, opts=FOpts}) -> @@ -145,6 +150,14 @@ gen_constructor(Class, _M=#method{params=Ps, opts=FOpts}) -> Endif andalso w("#endif~n", []), ok. + +need_copy_constr("wxFont") -> true; +need_copy_constr("wxIcon") -> true; +need_copy_constr("wxImage") -> true; +need_copy_constr("wxBitmap") -> true; +%%need_copy_constr("wxGraphics" ++ _) -> true; +need_copy_constr(_) -> false. + gen_type(#type{name=Type, ref={pointer,1}, mod=Mod},_) -> mods(Mod) ++ to_string(Type) ++ " * "; gen_type(#type{name=Type, ref={pointer,2}, mod=Mod},_) -> @@ -805,18 +818,21 @@ 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, _}}) -> %% Temporary memory leak !!!!!! - case Type of - "wxImage" -> ok; - "wxFont" -> ok; - "wxBitmap" -> ok; - "wxIcon" -> ok; - "wxGraphics" ++ _ -> ok; + case {need_copy_constr(Type),Type} of + {true, _} -> ok; + {_, "wxGraphics" ++ _} -> ok; _ -> io:format("~s::~s Building return value of temp ~s~n", [get(current_class),get(current_func),Type]) end, - {Type ++ " * Result = new " ++ Type ++ "(", "); newPtr((void *) Result," - ++ "3, memenv);"}; + case need_copy_constr(Type) of + true -> + {Type ++ " * Result = new E" ++ Type ++ "(", "); newPtr((void *) Result," + ++ "3, memenv);"}; + false -> + {Type ++ " * Result = new " ++ Type ++ "(", "); newPtr((void *) Result," + ++ "3, memenv);"} + end; return_res1(#type{base={enum,_Type},single=true,by_val=true}) -> {"int Result = " , ""}; return_res1(#type{name="wxCharBuffer", base={binary,_},single=true,by_val=true}) -> diff --git a/lib/wx/api_gen/wx_gen_erl.erl b/lib/wx/api_gen/wx_gen_erl.erl index 9df5cb853e..c28b9238dc 100644 --- a/lib/wx/api_gen/wx_gen_erl.erl +++ b/lib/wx/api_gen/wx_gen_erl.erl @@ -1169,7 +1169,7 @@ build_enum_ints(#enum{from=From, vals=Vals},Done) -> const_value(V,_,_) when is_integer(V) -> integer_to_list(V); const_value(V = "16#" ++ IntList,_,_) -> - _ = http_util:hexlist_to_integer(IntList), %% ASSERT + _ = list_to_integer(IntList, 16), %% ASSERT V; const_value(V0, EnumClass, Ignore) -> try diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf index f5a6751696..b8458e901b 100644 --- a/lib/wx/api_gen/wxapi.conf +++ b/lib/wx/api_gen/wxapi.conf @@ -150,7 +150,12 @@ 'ShouldInheritColours','Show','Thaw','TransferDataFromWindow', 'TransferDataToWindow',%'UnregisterHotKey', 'Update','UpdateWindowUI','Validate', - 'WarpPointer']}. + 'WarpPointer', + {'SetTransparent', [{test_if, "wxCHECK_VERSION(2,8,12)"}]}, + {'CanSetTransparent', [{test_if, "wxCHECK_VERSION(2,8,12)"}]}, + {'IsDoubleBuffered', [{test_if, "wxCHECK_VERSION(3,0,0)"}]}, + {'SetDoubleBuffered', [{test_if, "wxCHECK_VERSION(3,0,0) && !defined(__WXMAC__)"}]} +]}. {class, wxTopLevelWindowGTK, wxWindow, [{alias, [{wxTopLevelWindowGTK, wxTopLevelWindow}]}], diff --git a/lib/wx/c_src/gen/wxe_derived_dest.h b/lib/wx/c_src/gen/wxe_derived_dest.h index 1dcf029244..fc0ae0d9fc 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-2015. All Rights Reserved. + * Copyright Ericsson AB 2008-2016. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -180,6 +180,7 @@ class EwxBitmap : public wxBitmap { EwxBitmap(const wxString& filename,wxBitmapType type) : wxBitmap(filename,type) {}; EwxBitmap(const wxImage& image,int depth) : wxBitmap(image,depth) {}; EwxBitmap() : wxBitmap() {}; + EwxBitmap(wxBitmap copy) : wxBitmap(copy) {}; }; class EwxIcon : public wxIcon { @@ -187,6 +188,7 @@ class EwxIcon : public wxIcon { EwxIcon(const wxString& filename,wxBitmapType type,int desiredWidth,int desiredHeight) : wxIcon(filename,type,desiredWidth,desiredHeight) {}; EwxIcon(const wxIconLocation& loc) : wxIcon(loc) {}; EwxIcon() : wxIcon() {}; + EwxIcon(wxIcon copy) : wxIcon(copy) {}; }; class EwxCursor : public wxCursor { @@ -215,6 +217,7 @@ class EwxImage : public wxImage { EwxImage(const wxString& name,const wxString& mimetype,int index) : wxImage(name,mimetype,index) {}; EwxImage(const wxString& name,long type,int index) : wxImage(name,type,index) {}; EwxImage() : wxImage() {}; + EwxImage(wxImage copy) : wxImage(copy) {}; }; class EwxBrush : public wxBrush { @@ -300,6 +303,7 @@ class EwxFont : public wxFont { EwxFont(int size,wxFontFamily family,wxFontStyle style,int weight,bool underlined,const wxString& face,wxFontEncoding encoding) : wxFont(size,family,style,weight,underlined,face,encoding) {}; EwxFont(const wxString& fontname) : wxFont(fontname) {}; EwxFont() : wxFont() {}; + EwxFont(wxFont copy) : wxFont(copy) {}; }; class EwxToolTip : public wxToolTip { diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp index b2830dbc63..03b0baf875 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-2015. All Rights Reserved. + * Copyright Ericsson AB 2008-2016. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -519,7 +519,7 @@ case wxWindow_GetExtraStyle: { // wxWindow::GetExtraStyle case wxWindow_GetFont: { // wxWindow::GetFont wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - wxFont * Result = new wxFont(This->GetFont()); newPtr((void *) Result,3, memenv);; + wxFont * Result = new EwxFont(This->GetFont()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxFont"); break; } @@ -1668,10 +1668,47 @@ case wxWindow_WarpPointer: { // wxWindow::WarpPointer This->WarpPointer(*x,*y); break; } +#if wxCHECK_VERSION(2,8,12) +case wxWindow_SetTransparent: { // wxWindow::SetTransparent + wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4; + int * alpha = (int *) bp; bp += 4; + if(!This) throw wxe_badarg(0); + bool Result = This->SetTransparent(*alpha); + rt.addBool(Result); + break; +} +#endif +#if wxCHECK_VERSION(2,8,12) +case wxWindow_CanSetTransparent: { // wxWindow::CanSetTransparent + wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4; + if(!This) throw wxe_badarg(0); + bool Result = This->CanSetTransparent(); + rt.addBool(Result); + break; +} +#endif +#if wxCHECK_VERSION(3,0,0) +case wxWindow_IsDoubleBuffered: { // wxWindow::IsDoubleBuffered + wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4; + if(!This) throw wxe_badarg(0); + bool Result = This->IsDoubleBuffered(); + rt.addBool(Result); + break; +} +#endif +#if wxCHECK_VERSION(3,0,0) && !defined(__WXMAC__) +case wxWindow_SetDoubleBuffered: { // wxWindow::SetDoubleBuffered + wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4; + bool * on = (bool *) bp; bp += 4; + if(!This) throw wxe_badarg(0); + This->SetDoubleBuffered(*on); + break; +} +#endif case wxTopLevelWindow_GetIcon: { // wxTopLevelWindow::GetIcon wxTopLevelWindow *This = (wxTopLevelWindow *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - const wxIcon * Result = new wxIcon(This->GetIcon()); newPtr((void *) Result,3, memenv);; + const wxIcon * Result = new EwxIcon(This->GetIcon()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxIcon"); break; } @@ -3065,7 +3102,7 @@ case wxGrid_GetCellFont: { // wxGrid::GetCellFont int * row = (int *) bp; bp += 4; int * col = (int *) bp; bp += 4; if(!This) throw wxe_badarg(0); - wxFont * Result = new wxFont(This->GetCellFont(*row,*col)); newPtr((void *) Result,3, memenv);; + wxFont * Result = new EwxFont(This->GetCellFont(*row,*col)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxFont"); break; } @@ -3160,7 +3197,7 @@ case wxGrid_GetDefaultCellBackgroundColour: { // wxGrid::GetDefaultCellBackgroun case wxGrid_GetDefaultCellFont: { // wxGrid::GetDefaultCellFont wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - wxFont * Result = new wxFont(This->GetDefaultCellFont()); newPtr((void *) Result,3, memenv);; + wxFont * Result = new EwxFont(This->GetDefaultCellFont()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxFont"); break; } @@ -3299,7 +3336,7 @@ case wxGrid_GetLabelBackgroundColour: { // wxGrid::GetLabelBackgroundColour case wxGrid_GetLabelFont: { // wxGrid::GetLabelFont wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - wxFont * Result = new wxFont(This->GetLabelFont()); newPtr((void *) Result,3, memenv);; + wxFont * Result = new EwxFont(This->GetLabelFont()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxFont"); break; } @@ -9061,7 +9098,7 @@ case wxBitmap_new_2_1: { // wxBitmap::wxBitmap case wxBitmap_ConvertToImage: { // wxBitmap::ConvertToImage wxBitmap *This = (wxBitmap *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - wxImage * Result = new wxImage(This->ConvertToImage()); newPtr((void *) Result,3, memenv);; + wxImage * Result = new EwxImage(This->ConvertToImage()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxImage"); break; } @@ -9132,7 +9169,7 @@ case wxBitmap_GetSubBitmap: { // wxBitmap::GetSubBitmap int * rectH = (int *) bp; bp += 4; wxRect rect = wxRect(*rectX,*rectY,*rectW,*rectH); if(!This) throw wxe_badarg(0); - wxBitmap * Result = new wxBitmap(This->GetSubBitmap(rect)); newPtr((void *) Result,3, memenv);; + wxBitmap * Result = new EwxBitmap(This->GetSubBitmap(rect)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxBitmap"); break; } @@ -9314,7 +9351,7 @@ case wxIconBundle_GetIcon_1_1: { // wxIconBundle::GetIcon int * sizeH = (int *) bp; bp += 4; wxSize size = wxSize(*sizeW,*sizeH); if(!This) throw wxe_badarg(0); - const wxIcon * Result = new wxIcon(This->GetIcon(size)); newPtr((void *) Result,3, memenv);; + const wxIcon * Result = new EwxIcon(This->GetIcon(size)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxIcon"); break; } @@ -9328,7 +9365,7 @@ case wxIconBundle_GetIcon_1_0: { // wxIconBundle::GetIcon } break; }}; if(!This) throw wxe_badarg(0); - const wxIcon * Result = new wxIcon(This->GetIcon(size)); newPtr((void *) Result,3, memenv);; + const wxIcon * Result = new EwxIcon(This->GetIcon(size)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxIcon"); break; } @@ -9537,7 +9574,7 @@ case wxImage_Blur: { // wxImage::Blur wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4; int * radius = (int *) bp; bp += 4; if(!This) throw wxe_badarg(0); - wxImage * Result = new wxImage(This->Blur(*radius)); newPtr((void *) Result,3, memenv);; + wxImage * Result = new EwxImage(This->Blur(*radius)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxImage"); break; } @@ -9545,7 +9582,7 @@ case wxImage_BlurHorizontal: { // wxImage::BlurHorizontal wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4; int * radius = (int *) bp; bp += 4; if(!This) throw wxe_badarg(0); - wxImage * Result = new wxImage(This->BlurHorizontal(*radius)); newPtr((void *) Result,3, memenv);; + wxImage * Result = new EwxImage(This->BlurHorizontal(*radius)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxImage"); break; } @@ -9553,7 +9590,7 @@ case wxImage_BlurVertical: { // wxImage::BlurVertical wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4; int * radius = (int *) bp; bp += 4; if(!This) throw wxe_badarg(0); - wxImage * Result = new wxImage(This->BlurVertical(*radius)); newPtr((void *) Result,3, memenv);; + wxImage * Result = new EwxImage(This->BlurVertical(*radius)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxImage"); break; } @@ -9592,7 +9629,7 @@ case wxImage_ConvertToGreyscale: { // wxImage::ConvertToGreyscale } break; }}; if(!This) throw wxe_badarg(0); - wxImage * Result = new wxImage(This->ConvertToGreyscale(lr,lg,lb)); newPtr((void *) Result,3, memenv);; + wxImage * Result = new EwxImage(This->ConvertToGreyscale(lr,lg,lb)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxImage"); break; } @@ -9602,14 +9639,14 @@ case wxImage_ConvertToMono: { // wxImage::ConvertToMono unsigned int * g = (unsigned int *) bp; bp += 4; unsigned int * b = (unsigned int *) bp; bp += 4; if(!This) throw wxe_badarg(0); - wxImage * Result = new wxImage(This->ConvertToMono(*r,*g,*b)); newPtr((void *) Result,3, memenv);; + wxImage * Result = new EwxImage(This->ConvertToMono(*r,*g,*b)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxImage"); break; } case wxImage_Copy: { // wxImage::Copy wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - wxImage * Result = new wxImage(This->Copy()); newPtr((void *) Result,3, memenv);; + wxImage * Result = new EwxImage(This->Copy()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxImage"); break; } @@ -9831,7 +9868,7 @@ case wxImage_GetSubImage: { // wxImage::GetSubImage int * rectH = (int *) bp; bp += 4; wxRect rect = wxRect(*rectX,*rectY,*rectW,*rectH); if(!This) throw wxe_badarg(0); - wxImage * Result = new wxImage(This->GetSubImage(rect)); newPtr((void *) Result,3, memenv);; + wxImage * Result = new EwxImage(This->GetSubImage(rect)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxImage"); break; } @@ -9976,7 +10013,7 @@ case wxImage_Mirror: { // wxImage::Mirror } break; }}; if(!This) throw wxe_badarg(0); - wxImage * Result = new wxImage(This->Mirror(horizontally)); newPtr((void *) Result,3, memenv);; + wxImage * Result = new EwxImage(This->Mirror(horizontally)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxImage"); break; } @@ -10057,7 +10094,7 @@ case wxImage_Rotate: { // wxImage::Rotate } break; }}; if(!This) throw wxe_badarg(0); - wxImage * Result = new wxImage(This->Rotate(*angle,centre_of_rotation,interpolating,offset_after_rotation)); newPtr((void *) Result,3, memenv);; + wxImage * Result = new EwxImage(This->Rotate(*angle,centre_of_rotation,interpolating,offset_after_rotation)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxImage"); break; } @@ -10079,7 +10116,7 @@ case wxImage_Rotate90: { // wxImage::Rotate90 } break; }}; if(!This) throw wxe_badarg(0); - wxImage * Result = new wxImage(This->Rotate90(clockwise)); newPtr((void *) Result,3, memenv);; + wxImage * Result = new EwxImage(This->Rotate90(clockwise)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxImage"); break; } @@ -10129,7 +10166,7 @@ quality = *(wxImageResizeQuality *) bp; bp += 4;; } break; }}; if(!This) throw wxe_badarg(0); - wxImage * Result = new wxImage(This->Scale(*width,*height,quality)); newPtr((void *) Result,3, memenv);; + wxImage * Result = new EwxImage(This->Scale(*width,*height,quality)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxImage"); break; } @@ -10157,7 +10194,7 @@ case wxImage_Size: { // wxImage::Size } break; }}; if(!This) throw wxe_badarg(0); - wxImage * Result = new wxImage(This->Size(size,pos,r,g,b)); newPtr((void *) Result,3, memenv);; + wxImage * Result = new EwxImage(This->Size(size,pos,r,g,b)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxImage"); break; } @@ -10617,7 +10654,7 @@ case wxRegion_Contains_1_1: { // wxRegion::Contains case wxRegion_ConvertToBitmap: { // wxRegion::ConvertToBitmap wxRegion *This = (wxRegion *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - wxBitmap * Result = new wxBitmap(This->ConvertToBitmap()); newPtr((void *) Result,3, memenv);; + wxBitmap * Result = new EwxBitmap(This->ConvertToBitmap()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxBitmap"); break; } @@ -13344,28 +13381,28 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4; case wxBitmapButton_GetBitmapDisabled: { // wxBitmapButton::GetBitmapDisabled wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - const wxBitmap * Result = new wxBitmap(This->GetBitmapDisabled()); newPtr((void *) Result,3, memenv);; + const wxBitmap * Result = new EwxBitmap(This->GetBitmapDisabled()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxBitmap"); break; } case wxBitmapButton_GetBitmapFocus: { // wxBitmapButton::GetBitmapFocus wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - const wxBitmap * Result = new wxBitmap(This->GetBitmapFocus()); newPtr((void *) Result,3, memenv);; + const wxBitmap * Result = new EwxBitmap(This->GetBitmapFocus()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxBitmap"); break; } case wxBitmapButton_GetBitmapLabel: { // wxBitmapButton::GetBitmapLabel wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - const wxBitmap * Result = new wxBitmap(This->GetBitmapLabel()); newPtr((void *) Result,3, memenv);; + const wxBitmap * Result = new EwxBitmap(This->GetBitmapLabel()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxBitmap"); break; } case wxBitmapButton_GetBitmapSelected: { // wxBitmapButton::GetBitmapSelected wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - const wxBitmap * Result = new wxBitmap(This->GetBitmapSelected()); newPtr((void *) Result,3, memenv);; + const wxBitmap * Result = new EwxBitmap(This->GetBitmapSelected()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxBitmap"); break; } @@ -15483,7 +15520,7 @@ case wxListCtrl_GetItemFont: { // wxListCtrl::GetItemFont wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4; int * item = (int *) bp; bp += 4; if(!This) throw wxe_badarg(0); - wxFont * Result = new wxFont(This->GetItemFont(*item)); newPtr((void *) Result,3, memenv);; + wxFont * Result = new EwxFont(This->GetItemFont(*item)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxFont"); break; } @@ -16029,7 +16066,7 @@ case wxListItem_GetColumn: { // wxListItem::GetColumn case wxListItem_GetFont: { // wxListItem::GetFont wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - wxFont * Result = new wxFont(This->GetFont()); newPtr((void *) Result,3, memenv);; + wxFont * Result = new EwxFont(This->GetFont()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxFont"); break; } @@ -16376,7 +16413,7 @@ case wxImageList_GetBitmap: { // wxImageList::GetBitmap wxImageList *This = (wxImageList *) getPtr(bp,memenv); bp += 4; int * index = (int *) bp; bp += 4; if(!This) throw wxe_badarg(0); - wxBitmap * Result = new wxBitmap(This->GetBitmap(*index)); newPtr((void *) Result,3, memenv);; + wxBitmap * Result = new EwxBitmap(This->GetBitmap(*index)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxBitmap"); break; } @@ -16384,7 +16421,7 @@ case wxImageList_GetIcon: { // wxImageList::GetIcon wxImageList *This = (wxImageList *) getPtr(bp,memenv); bp += 4; int * index = (int *) bp; bp += 4; if(!This) throw wxe_badarg(0); - wxIcon * Result = new wxIcon(This->GetIcon(*index)); newPtr((void *) Result,3, memenv);; + wxIcon * Result = new EwxIcon(This->GetIcon(*index)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxIcon"); break; } @@ -16495,7 +16532,7 @@ case wxTextAttr_GetBackgroundColour: { // wxTextAttr::GetBackgroundColour case wxTextAttr_GetFont: { // wxTextAttr::GetFont wxTextAttr *This = (wxTextAttr *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - const wxFont * Result = new wxFont(This->GetFont()); newPtr((void *) Result,3, memenv);; + const wxFont * Result = new EwxFont(This->GetFont()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxFont"); break; } @@ -18841,7 +18878,7 @@ case wxTreeCtrl_GetItemFont: { // wxTreeCtrl::GetItemFont bp += 4; /* Align */ wxTreeItemId item = wxTreeItemId((void *) *(wxUint64 *) bp); bp += 8; if(!This) throw wxe_badarg(0); - wxFont * Result = new wxFont(This->GetItemFont(item)); newPtr((void *) Result,3, memenv);; + wxFont * Result = new EwxFont(This->GetItemFont(item)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxFont"); break; } @@ -19868,7 +19905,7 @@ case wxStaticBitmap_Create: { // wxStaticBitmap::Create case wxStaticBitmap_GetBitmap: { // wxStaticBitmap::GetBitmap wxStaticBitmap *This = (wxStaticBitmap *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - wxBitmap * Result = new wxBitmap(This->GetBitmap()); newPtr((void *) Result,3, memenv);; + wxBitmap * Result = new EwxBitmap(This->GetBitmap()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxBitmap"); break; } @@ -21558,7 +21595,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4; case wxFontPickerCtrl_GetSelectedFont: { // wxFontPickerCtrl::GetSelectedFont wxFontPickerCtrl *This = (wxFontPickerCtrl *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - wxFont * Result = new wxFont(This->GetSelectedFont()); newPtr((void *) Result,3, memenv);; + wxFont * Result = new EwxFont(This->GetSelectedFont()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxFont"); break; } @@ -21936,7 +21973,7 @@ case wxFontData_GetColour: { // wxFontData::GetColour case wxFontData_GetChosenFont: { // wxFontData::GetChosenFont wxFontData *This = (wxFontData *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - wxFont * Result = new wxFont(This->GetChosenFont()); newPtr((void *) Result,3, memenv);; + wxFont * Result = new EwxFont(This->GetChosenFont()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxFont"); break; } @@ -21950,7 +21987,7 @@ case wxFontData_GetEnableEffects: { // wxFontData::GetEnableEffects case wxFontData_GetInitialFont: { // wxFontData::GetInitialFont wxFontData *This = (wxFontData *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - wxFont * Result = new wxFont(This->GetInitialFont()); newPtr((void *) Result,3, memenv);; + wxFont * Result = new EwxFont(This->GetInitialFont()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxFont"); break; } @@ -23233,7 +23270,7 @@ case wxXmlResource_LoadBitmap: { // wxXmlResource::LoadBitmap wxString name = wxString(bp, wxConvUTF8); bp += *nameLen+((8-((0+ *nameLen) & 7)) & 7); if(!This) throw wxe_badarg(0); - wxBitmap * Result = new wxBitmap(This->LoadBitmap(name)); newPtr((void *) Result,3, memenv);; + wxBitmap * Result = new EwxBitmap(This->LoadBitmap(name)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxBitmap"); break; } @@ -23289,7 +23326,7 @@ case wxXmlResource_LoadIcon: { // wxXmlResource::LoadIcon wxString name = wxString(bp, wxConvUTF8); bp += *nameLen+((8-((0+ *nameLen) & 7)) & 7); if(!This) throw wxe_badarg(0); - wxIcon * Result = new wxIcon(This->LoadIcon(name)); newPtr((void *) Result,3, memenv);; + wxIcon * Result = new EwxIcon(This->LoadIcon(name)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxIcon"); break; } @@ -24839,7 +24876,7 @@ case wxAuiNotebook_GetPageBitmap: { // wxAuiNotebook::GetPageBitmap wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4; int * page_idx = (int *) bp; bp += 4; if(!This) throw wxe_badarg(0); - wxBitmap * Result = new wxBitmap(This->GetPageBitmap(*page_idx)); newPtr((void *) Result,3, memenv);; + wxBitmap * Result = new EwxBitmap(This->GetPageBitmap(*page_idx)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxBitmap"); break; } @@ -25032,7 +25069,7 @@ case wxAuiDockArt_GetFont: { // wxAuiDockArt::GetFont wxAuiDockArt *This = (wxAuiDockArt *) getPtr(bp,memenv); bp += 4; int * id = (int *) bp; bp += 4; if(!This) throw wxe_badarg(0); - wxFont * Result = new wxFont(This->GetFont(*id)); newPtr((void *) Result,3, memenv);; + wxFont * Result = new EwxFont(This->GetFont(*id)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxFont"); break; } @@ -26671,7 +26708,7 @@ case wxColourPickerEvent_GetColour: { // wxColourPickerEvent::GetColour case wxFontPickerEvent_GetFont: { // wxFontPickerEvent::GetFont wxFontPickerEvent *This = (wxFontPickerEvent *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - wxFont * Result = new wxFont(This->GetFont()); newPtr((void *) Result,3, memenv);; + wxFont * Result = new EwxFont(This->GetFont()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxFont"); break; } @@ -30602,7 +30639,7 @@ case wxArtProvider_GetBitmap: { // wxArtProvider::GetBitmap bp += 4; /* Align */ } break; }}; - wxBitmap * Result = new wxBitmap(wxArtProvider::GetBitmap(id,client,size)); newPtr((void *) Result,3, memenv);; + wxBitmap * Result = new EwxBitmap(wxArtProvider::GetBitmap(id,client,size)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxBitmap"); break; } @@ -30625,7 +30662,7 @@ case wxArtProvider_GetIcon: { // wxArtProvider::GetIcon bp += 4; /* Align */ } break; }}; - wxIcon * Result = new wxIcon(wxArtProvider::GetIcon(id,client,size)); newPtr((void *) Result,3, memenv);; + wxIcon * Result = new EwxIcon(wxArtProvider::GetIcon(id,client,size)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxIcon"); break; } @@ -30808,7 +30845,7 @@ bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4; case wxBitmapDataObject_GetBitmap: { // wxBitmapDataObject::GetBitmap wxBitmapDataObject *This = (wxBitmapDataObject *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); - wxBitmap * Result = new wxBitmap(This->GetBitmap()); newPtr((void *) Result,3, memenv);; + wxBitmap * Result = new EwxBitmap(This->GetBitmap()); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxBitmap"); break; } @@ -31428,7 +31465,7 @@ case wxSystemSettings_GetColour: { // wxSystemSettings::GetColour } case wxSystemSettings_GetFont: { // wxSystemSettings::GetFont wxSystemFont index = *(wxSystemFont *) bp; bp += 4;; - wxFont * Result = new wxFont(wxSystemSettings::GetFont(index)); newPtr((void *) Result,3, memenv);; + wxFont * Result = new EwxFont(wxSystemSettings::GetFont(index)); newPtr((void *) Result,3, memenv);; rt.addRef(getRef((void *)Result,memenv), "wxFont"); break; } diff --git a/lib/wx/c_src/gen/wxe_macros.h b/lib/wx/c_src/gen/wxe_macros.h index 1d50278360..0d3b79b7f9 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-2015. All Rights Reserved. + * Copyright Ericsson AB 2008-2016. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -241,3185 +241,3189 @@ #define wxWindow_UpdateWindowUI 281 #define wxWindow_Validate 282 #define wxWindow_WarpPointer 283 -#define wxTopLevelWindow_GetIcon 284 -#define wxTopLevelWindow_GetIcons 285 -#define wxTopLevelWindow_GetTitle 286 -#define wxTopLevelWindow_IsActive 287 -#define wxTopLevelWindow_Iconize 288 -#define wxTopLevelWindow_IsFullScreen 289 -#define wxTopLevelWindow_IsIconized 290 -#define wxTopLevelWindow_IsMaximized 291 -#define wxTopLevelWindow_Maximize 292 -#define wxTopLevelWindow_RequestUserAttention 293 -#define wxTopLevelWindow_SetIcon 294 -#define wxTopLevelWindow_SetIcons 295 -#define wxTopLevelWindow_CenterOnScreen 296 -#define wxTopLevelWindow_CentreOnScreen 297 -#define wxTopLevelWindow_SetShape 299 -#define wxTopLevelWindow_SetTitle 300 -#define wxTopLevelWindow_ShowFullScreen 301 -#define wxFrame_new_4 303 -#define wxFrame_new_0 304 -#define wxFrame_destruct 306 -#define wxFrame_Create 307 -#define wxFrame_CreateStatusBar 308 -#define wxFrame_CreateToolBar 309 -#define wxFrame_GetClientAreaOrigin 310 -#define wxFrame_GetMenuBar 311 -#define wxFrame_GetStatusBar 312 -#define wxFrame_GetStatusBarPane 313 -#define wxFrame_GetToolBar 314 -#define wxFrame_ProcessCommand 315 -#define wxFrame_SendSizeEvent 316 -#define wxFrame_SetMenuBar 317 -#define wxFrame_SetStatusBar 318 -#define wxFrame_SetStatusBarPane 319 -#define wxFrame_SetStatusText 320 -#define wxFrame_SetStatusWidths 321 -#define wxFrame_SetToolBar 322 -#define wxMiniFrame_new_0 323 -#define wxMiniFrame_new_4 324 -#define wxMiniFrame_Create 325 -#define wxMiniFrame_destroy 326 -#define wxSplashScreen_new_0 327 -#define wxSplashScreen_new_6 328 -#define wxSplashScreen_destruct 329 -#define wxSplashScreen_GetSplashStyle 330 -#define wxSplashScreen_GetTimeout 331 -#define wxPanel_new_0 332 -#define wxPanel_new_6 333 -#define wxPanel_new_2 334 -#define wxPanel_destruct 335 -#define wxPanel_InitDialog 336 -#define wxPanel_SetFocusIgnoringChildren 337 -#define wxScrolledWindow_new_0 338 -#define wxScrolledWindow_new_2 339 -#define wxScrolledWindow_destruct 340 -#define wxScrolledWindow_CalcScrolledPosition_4 341 -#define wxScrolledWindow_CalcScrolledPosition_1 342 -#define wxScrolledWindow_CalcUnscrolledPosition_4 343 -#define wxScrolledWindow_CalcUnscrolledPosition_1 344 -#define wxScrolledWindow_EnableScrolling 345 -#define wxScrolledWindow_GetScrollPixelsPerUnit 346 -#define wxScrolledWindow_GetViewStart 347 -#define wxScrolledWindow_DoPrepareDC 348 -#define wxScrolledWindow_PrepareDC 349 -#define wxScrolledWindow_Scroll 350 -#define wxScrolledWindow_SetScrollbars 351 -#define wxScrolledWindow_SetScrollRate 352 -#define wxScrolledWindow_SetTargetWindow 353 -#define wxSashWindow_new_0 354 -#define wxSashWindow_new_2 355 -#define wxSashWindow_destruct 356 -#define wxSashWindow_GetSashVisible 357 -#define wxSashWindow_GetMaximumSizeX 358 -#define wxSashWindow_GetMaximumSizeY 359 -#define wxSashWindow_GetMinimumSizeX 360 -#define wxSashWindow_GetMinimumSizeY 361 -#define wxSashWindow_SetMaximumSizeX 362 -#define wxSashWindow_SetMaximumSizeY 363 -#define wxSashWindow_SetMinimumSizeX 364 -#define wxSashWindow_SetMinimumSizeY 365 -#define wxSashWindow_SetSashVisible 366 -#define wxSashLayoutWindow_new_0 367 -#define wxSashLayoutWindow_new_2 368 -#define wxSashLayoutWindow_Create 369 -#define wxSashLayoutWindow_GetAlignment 370 -#define wxSashLayoutWindow_GetOrientation 371 -#define wxSashLayoutWindow_SetAlignment 372 -#define wxSashLayoutWindow_SetDefaultSize 373 -#define wxSashLayoutWindow_SetOrientation 374 -#define wxSashLayoutWindow_destroy 375 -#define wxGrid_new_0 376 -#define wxGrid_new_3 377 -#define wxGrid_new_4 378 -#define wxGrid_destruct 379 -#define wxGrid_AppendCols 380 -#define wxGrid_AppendRows 381 -#define wxGrid_AutoSize 382 -#define wxGrid_AutoSizeColumn 383 -#define wxGrid_AutoSizeColumns 384 -#define wxGrid_AutoSizeRow 385 -#define wxGrid_AutoSizeRows 386 -#define wxGrid_BeginBatch 387 -#define wxGrid_BlockToDeviceRect 388 -#define wxGrid_CanDragColSize 389 -#define wxGrid_CanDragRowSize 390 -#define wxGrid_CanDragGridSize 391 -#define wxGrid_CanEnableCellControl 392 -#define wxGrid_CellToRect_2 393 -#define wxGrid_CellToRect_1 394 -#define wxGrid_ClearGrid 395 -#define wxGrid_ClearSelection 396 -#define wxGrid_CreateGrid 397 -#define wxGrid_DeleteCols 398 -#define wxGrid_DeleteRows 399 -#define wxGrid_DisableCellEditControl 400 -#define wxGrid_DisableDragColSize 401 -#define wxGrid_DisableDragGridSize 402 -#define wxGrid_DisableDragRowSize 403 -#define wxGrid_EnableCellEditControl 404 -#define wxGrid_EnableDragColSize 405 -#define wxGrid_EnableDragGridSize 406 -#define wxGrid_EnableDragRowSize 407 -#define wxGrid_EnableEditing 408 -#define wxGrid_EnableGridLines 409 -#define wxGrid_EndBatch 410 -#define wxGrid_Fit 411 -#define wxGrid_ForceRefresh 412 -#define wxGrid_GetBatchCount 413 -#define wxGrid_GetCellAlignment 414 -#define wxGrid_GetCellBackgroundColour 415 -#define wxGrid_GetCellEditor 416 -#define wxGrid_GetCellFont 417 -#define wxGrid_GetCellRenderer 418 -#define wxGrid_GetCellTextColour 419 -#define wxGrid_GetCellValue_2 420 -#define wxGrid_GetCellValue_1 421 -#define wxGrid_GetColLabelAlignment 422 -#define wxGrid_GetColLabelSize 423 -#define wxGrid_GetColLabelValue 424 -#define wxGrid_GetColMinimalAcceptableWidth 425 -#define wxGrid_GetDefaultCellAlignment 426 -#define wxGrid_GetDefaultCellBackgroundColour 427 -#define wxGrid_GetDefaultCellFont 428 -#define wxGrid_GetDefaultCellTextColour 429 -#define wxGrid_GetDefaultColLabelSize 430 -#define wxGrid_GetDefaultColSize 431 -#define wxGrid_GetDefaultEditor 432 -#define wxGrid_GetDefaultEditorForCell_2 433 -#define wxGrid_GetDefaultEditorForCell_1 434 -#define wxGrid_GetDefaultEditorForType 435 -#define wxGrid_GetDefaultRenderer 436 -#define wxGrid_GetDefaultRendererForCell 437 -#define wxGrid_GetDefaultRendererForType 438 -#define wxGrid_GetDefaultRowLabelSize 439 -#define wxGrid_GetDefaultRowSize 440 -#define wxGrid_GetGridCursorCol 441 -#define wxGrid_GetGridCursorRow 442 -#define wxGrid_GetGridLineColour 443 -#define wxGrid_GridLinesEnabled 444 -#define wxGrid_GetLabelBackgroundColour 445 -#define wxGrid_GetLabelFont 446 -#define wxGrid_GetLabelTextColour 447 -#define wxGrid_GetNumberCols 448 -#define wxGrid_GetNumberRows 449 -#define wxGrid_GetOrCreateCellAttr 450 -#define wxGrid_GetRowMinimalAcceptableHeight 451 -#define wxGrid_GetRowLabelAlignment 452 -#define wxGrid_GetRowLabelSize 453 -#define wxGrid_GetRowLabelValue 454 -#define wxGrid_GetRowSize 455 -#define wxGrid_GetScrollLineX 456 -#define wxGrid_GetScrollLineY 457 -#define wxGrid_GetSelectedCells 458 -#define wxGrid_GetSelectedCols 459 -#define wxGrid_GetSelectedRows 460 -#define wxGrid_GetSelectionBackground 461 -#define wxGrid_GetSelectionBlockTopLeft 462 -#define wxGrid_GetSelectionBlockBottomRight 463 -#define wxGrid_GetSelectionForeground 464 -#define wxGrid_GetViewWidth 465 -#define wxGrid_GetGridWindow 466 -#define wxGrid_GetGridRowLabelWindow 467 -#define wxGrid_GetGridColLabelWindow 468 -#define wxGrid_GetGridCornerLabelWindow 469 -#define wxGrid_HideCellEditControl 470 -#define wxGrid_InsertCols 471 -#define wxGrid_InsertRows 472 -#define wxGrid_IsCellEditControlEnabled 473 -#define wxGrid_IsCurrentCellReadOnly 474 -#define wxGrid_IsEditable 475 -#define wxGrid_IsInSelection_2 476 -#define wxGrid_IsInSelection_1 477 -#define wxGrid_IsReadOnly 478 -#define wxGrid_IsSelection 479 -#define wxGrid_IsVisible_3 480 -#define wxGrid_IsVisible_2 481 -#define wxGrid_MakeCellVisible_2 482 -#define wxGrid_MakeCellVisible_1 483 -#define wxGrid_MoveCursorDown 484 -#define wxGrid_MoveCursorLeft 485 -#define wxGrid_MoveCursorRight 486 -#define wxGrid_MoveCursorUp 487 -#define wxGrid_MoveCursorDownBlock 488 -#define wxGrid_MoveCursorLeftBlock 489 -#define wxGrid_MoveCursorRightBlock 490 -#define wxGrid_MoveCursorUpBlock 491 -#define wxGrid_MovePageDown 492 -#define wxGrid_MovePageUp 493 -#define wxGrid_RegisterDataType 494 -#define wxGrid_SaveEditControlValue 495 -#define wxGrid_SelectAll 496 -#define wxGrid_SelectBlock_5 497 -#define wxGrid_SelectBlock_3 498 -#define wxGrid_SelectCol 499 -#define wxGrid_SelectRow 500 -#define wxGrid_SetCellAlignment_4 501 -#define wxGrid_SetCellAlignment_3 502 -#define wxGrid_SetCellAlignment_1 503 -#define wxGrid_SetCellBackgroundColour_3_0 504 -#define wxGrid_SetCellBackgroundColour_1 505 -#define wxGrid_SetCellBackgroundColour_3_1 506 -#define wxGrid_SetCellEditor 507 -#define wxGrid_SetCellFont 508 -#define wxGrid_SetCellRenderer 509 -#define wxGrid_SetCellTextColour_3_0 510 -#define wxGrid_SetCellTextColour_3_1 511 -#define wxGrid_SetCellTextColour_1 512 -#define wxGrid_SetCellValue_3_0 513 -#define wxGrid_SetCellValue_2 514 -#define wxGrid_SetCellValue_3_1 515 -#define wxGrid_SetColAttr 516 -#define wxGrid_SetColFormatBool 517 -#define wxGrid_SetColFormatNumber 518 -#define wxGrid_SetColFormatFloat 519 -#define wxGrid_SetColFormatCustom 520 -#define wxGrid_SetColLabelAlignment 521 -#define wxGrid_SetColLabelSize 522 -#define wxGrid_SetColLabelValue 523 -#define wxGrid_SetColMinimalWidth 524 -#define wxGrid_SetColMinimalAcceptableWidth 525 -#define wxGrid_SetColSize 526 -#define wxGrid_SetDefaultCellAlignment 527 -#define wxGrid_SetDefaultCellBackgroundColour 528 -#define wxGrid_SetDefaultCellFont 529 -#define wxGrid_SetDefaultCellTextColour 530 -#define wxGrid_SetDefaultEditor 531 -#define wxGrid_SetDefaultRenderer 532 -#define wxGrid_SetDefaultColSize 533 -#define wxGrid_SetDefaultRowSize 534 -#define wxGrid_SetGridCursor 535 -#define wxGrid_SetGridLineColour 536 -#define wxGrid_SetLabelBackgroundColour 537 -#define wxGrid_SetLabelFont 538 -#define wxGrid_SetLabelTextColour 539 -#define wxGrid_SetMargins 540 -#define wxGrid_SetReadOnly 541 -#define wxGrid_SetRowAttr 542 -#define wxGrid_SetRowLabelAlignment 543 -#define wxGrid_SetRowLabelSize 544 -#define wxGrid_SetRowLabelValue 545 -#define wxGrid_SetRowMinimalHeight 546 -#define wxGrid_SetRowMinimalAcceptableHeight 547 -#define wxGrid_SetRowSize 548 -#define wxGrid_SetScrollLineX 549 -#define wxGrid_SetScrollLineY 550 -#define wxGrid_SetSelectionBackground 551 -#define wxGrid_SetSelectionForeground 552 -#define wxGrid_SetSelectionMode 553 -#define wxGrid_ShowCellEditControl 554 -#define wxGrid_XToCol 555 -#define wxGrid_XToEdgeOfCol 556 -#define wxGrid_YToEdgeOfRow 557 -#define wxGrid_YToRow 558 -#define wxGridCellRenderer_Draw 559 -#define wxGridCellRenderer_GetBestSize 560 -#define wxGridCellEditor_Create 561 -#define wxGridCellEditor_IsCreated 562 -#define wxGridCellEditor_SetSize 563 -#define wxGridCellEditor_Show 564 -#define wxGridCellEditor_PaintBackground 565 -#define wxGridCellEditor_BeginEdit 566 -#define wxGridCellEditor_EndEdit 567 -#define wxGridCellEditor_Reset 568 -#define wxGridCellEditor_StartingKey 569 -#define wxGridCellEditor_StartingClick 570 -#define wxGridCellEditor_HandleReturn 571 -#define wxGridCellBoolRenderer_new 572 -#define wxGridCellBoolRenderer_destroy 573 -#define wxGridCellBoolEditor_new 574 -#define wxGridCellBoolEditor_IsTrueValue 575 -#define wxGridCellBoolEditor_UseStringValues 576 -#define wxGridCellBoolEditor_destroy 577 -#define wxGridCellFloatRenderer_new 578 -#define wxGridCellFloatRenderer_GetPrecision 579 -#define wxGridCellFloatRenderer_GetWidth 580 -#define wxGridCellFloatRenderer_SetParameters 581 -#define wxGridCellFloatRenderer_SetPrecision 582 -#define wxGridCellFloatRenderer_SetWidth 583 -#define wxGridCellFloatRenderer_destroy 584 -#define wxGridCellFloatEditor_new 585 -#define wxGridCellFloatEditor_SetParameters 586 -#define wxGridCellFloatEditor_destroy 587 -#define wxGridCellStringRenderer_new 588 -#define wxGridCellStringRenderer_destroy 589 -#define wxGridCellTextEditor_new 590 -#define wxGridCellTextEditor_SetParameters 591 -#define wxGridCellTextEditor_destroy 592 -#define wxGridCellChoiceEditor_new 594 -#define wxGridCellChoiceEditor_SetParameters 595 -#define wxGridCellChoiceEditor_destroy 596 -#define wxGridCellNumberRenderer_new 597 -#define wxGridCellNumberRenderer_destroy 598 -#define wxGridCellNumberEditor_new 599 -#define wxGridCellNumberEditor_GetValue 600 -#define wxGridCellNumberEditor_SetParameters 601 -#define wxGridCellNumberEditor_destroy 602 -#define wxGridCellAttr_SetTextColour 603 -#define wxGridCellAttr_SetBackgroundColour 604 -#define wxGridCellAttr_SetFont 605 -#define wxGridCellAttr_SetAlignment 606 -#define wxGridCellAttr_SetReadOnly 607 -#define wxGridCellAttr_SetRenderer 608 -#define wxGridCellAttr_SetEditor 609 -#define wxGridCellAttr_HasTextColour 610 -#define wxGridCellAttr_HasBackgroundColour 611 -#define wxGridCellAttr_HasFont 612 -#define wxGridCellAttr_HasAlignment 613 -#define wxGridCellAttr_HasRenderer 614 -#define wxGridCellAttr_HasEditor 615 -#define wxGridCellAttr_GetTextColour 616 -#define wxGridCellAttr_GetBackgroundColour 617 -#define wxGridCellAttr_GetFont 618 -#define wxGridCellAttr_GetAlignment 619 -#define wxGridCellAttr_GetRenderer 620 -#define wxGridCellAttr_GetEditor 621 -#define wxGridCellAttr_IsReadOnly 622 -#define wxGridCellAttr_SetDefAttr 623 -#define wxDC_Blit 624 -#define wxDC_CalcBoundingBox 625 -#define wxDC_Clear 626 -#define wxDC_ComputeScaleAndOrigin 627 -#define wxDC_CrossHair 628 -#define wxDC_DestroyClippingRegion 629 -#define wxDC_DeviceToLogicalX 630 -#define wxDC_DeviceToLogicalXRel 631 -#define wxDC_DeviceToLogicalY 632 -#define wxDC_DeviceToLogicalYRel 633 -#define wxDC_DrawArc 634 -#define wxDC_DrawBitmap 635 -#define wxDC_DrawCheckMark 636 -#define wxDC_DrawCircle 637 -#define wxDC_DrawEllipse_2 639 -#define wxDC_DrawEllipse_1 640 -#define wxDC_DrawEllipticArc 641 -#define wxDC_DrawIcon 642 -#define wxDC_DrawLabel 643 -#define wxDC_DrawLine 644 -#define wxDC_DrawLines 645 -#define wxDC_DrawPolygon 647 -#define wxDC_DrawPoint 649 -#define wxDC_DrawRectangle_2 651 -#define wxDC_DrawRectangle_1 652 -#define wxDC_DrawRotatedText 653 -#define wxDC_DrawRoundedRectangle_3 655 -#define wxDC_DrawRoundedRectangle_2 656 -#define wxDC_DrawText 657 -#define wxDC_EndDoc 658 -#define wxDC_EndPage 659 -#define wxDC_FloodFill 660 -#define wxDC_GetBackground 661 -#define wxDC_GetBackgroundMode 662 -#define wxDC_GetBrush 663 -#define wxDC_GetCharHeight 664 -#define wxDC_GetCharWidth 665 -#define wxDC_GetClippingBox 666 -#define wxDC_GetFont 668 -#define wxDC_GetLayoutDirection 669 -#define wxDC_GetLogicalFunction 670 -#define wxDC_GetMapMode 671 -#define wxDC_GetMultiLineTextExtent_4 672 -#define wxDC_GetMultiLineTextExtent_1 673 -#define wxDC_GetPartialTextExtents 674 -#define wxDC_GetPen 675 -#define wxDC_GetPixel 676 -#define wxDC_GetPPI 677 -#define wxDC_GetSize 679 -#define wxDC_GetSizeMM 681 -#define wxDC_GetTextBackground 682 -#define wxDC_GetTextExtent_4 683 -#define wxDC_GetTextExtent_1 684 -#define wxDC_GetTextForeground 686 -#define wxDC_GetUserScale 687 -#define wxDC_GradientFillConcentric_3 688 -#define wxDC_GradientFillConcentric_4 689 -#define wxDC_GradientFillLinear 690 -#define wxDC_LogicalToDeviceX 691 -#define wxDC_LogicalToDeviceXRel 692 -#define wxDC_LogicalToDeviceY 693 -#define wxDC_LogicalToDeviceYRel 694 -#define wxDC_MaxX 695 -#define wxDC_MaxY 696 -#define wxDC_MinX 697 -#define wxDC_MinY 698 -#define wxDC_IsOk 699 -#define wxDC_ResetBoundingBox 700 -#define wxDC_SetAxisOrientation 701 -#define wxDC_SetBackground 702 -#define wxDC_SetBackgroundMode 703 -#define wxDC_SetBrush 704 -#define wxDC_SetClippingRegion_2 706 -#define wxDC_SetClippingRegion_1_1 707 -#define wxDC_SetClippingRegion_1_0 708 -#define wxDC_SetDeviceOrigin 709 -#define wxDC_SetFont 710 -#define wxDC_SetLayoutDirection 711 -#define wxDC_SetLogicalFunction 712 -#define wxDC_SetMapMode 713 -#define wxDC_SetPalette 714 -#define wxDC_SetPen 715 -#define wxDC_SetTextBackground 716 -#define wxDC_SetTextForeground 717 -#define wxDC_SetUserScale 718 -#define wxDC_StartDoc 719 -#define wxDC_StartPage 720 -#define wxMirrorDC_new 721 -#define wxMirrorDC_destroy 722 -#define wxScreenDC_new 723 -#define wxScreenDC_destruct 724 -#define wxPostScriptDC_new_0 725 -#define wxPostScriptDC_new_1 726 -#define wxPostScriptDC_destruct 727 -#define wxPostScriptDC_SetResolution 728 -#define wxPostScriptDC_GetResolution 729 -#define wxWindowDC_new_0 730 -#define wxWindowDC_new_1 731 -#define wxWindowDC_destruct 732 -#define wxClientDC_new_0 733 -#define wxClientDC_new_1 734 -#define wxClientDC_destroy 735 -#define wxPaintDC_new_0 736 -#define wxPaintDC_new_1 737 -#define wxPaintDC_destroy 738 -#define wxMemoryDC_new_1_0 740 -#define wxMemoryDC_new_1_1 741 -#define wxMemoryDC_new_0 742 -#define wxMemoryDC_destruct 744 -#define wxMemoryDC_SelectObject 745 -#define wxMemoryDC_SelectObjectAsSource 746 -#define wxBufferedDC_new_0 747 -#define wxBufferedDC_new_2 748 -#define wxBufferedDC_new_3 749 -#define wxBufferedDC_destruct 750 -#define wxBufferedDC_Init_2 751 -#define wxBufferedDC_Init_3 752 -#define wxBufferedPaintDC_new_3 753 -#define wxBufferedPaintDC_new_2 754 -#define wxBufferedPaintDC_destruct 755 -#define wxGraphicsObject_destruct 756 -#define wxGraphicsObject_GetRenderer 757 -#define wxGraphicsObject_IsNull 758 -#define wxGraphicsContext_destruct 759 -#define wxGraphicsContext_Create_1_1 760 -#define wxGraphicsContext_Create_1_0 761 -#define wxGraphicsContext_Create_0 762 -#define wxGraphicsContext_CreatePen 763 -#define wxGraphicsContext_CreateBrush 764 -#define wxGraphicsContext_CreateRadialGradientBrush 765 -#define wxGraphicsContext_CreateLinearGradientBrush 766 -#define wxGraphicsContext_CreateFont 767 -#define wxGraphicsContext_CreateMatrix 768 -#define wxGraphicsContext_CreatePath 769 -#define wxGraphicsContext_Clip_1 770 -#define wxGraphicsContext_Clip_4 771 -#define wxGraphicsContext_ResetClip 772 -#define wxGraphicsContext_DrawBitmap 773 -#define wxGraphicsContext_DrawEllipse 774 -#define wxGraphicsContext_DrawIcon 775 -#define wxGraphicsContext_DrawLines 776 -#define wxGraphicsContext_DrawPath 777 -#define wxGraphicsContext_DrawRectangle 778 -#define wxGraphicsContext_DrawRoundedRectangle 779 -#define wxGraphicsContext_DrawText_3 780 -#define wxGraphicsContext_DrawText_4_0 781 -#define wxGraphicsContext_DrawText_4_1 782 -#define wxGraphicsContext_DrawText_5 783 -#define wxGraphicsContext_FillPath 784 -#define wxGraphicsContext_StrokePath 785 -#define wxGraphicsContext_GetPartialTextExtents 786 -#define wxGraphicsContext_GetTextExtent 787 -#define wxGraphicsContext_Rotate 788 -#define wxGraphicsContext_Scale 789 -#define wxGraphicsContext_Translate 790 -#define wxGraphicsContext_GetTransform 791 -#define wxGraphicsContext_SetTransform 792 -#define wxGraphicsContext_ConcatTransform 793 -#define wxGraphicsContext_SetBrush_1_1 794 -#define wxGraphicsContext_SetBrush_1_0 795 -#define wxGraphicsContext_SetFont_1 796 -#define wxGraphicsContext_SetFont_2 797 -#define wxGraphicsContext_SetPen_1_0 798 -#define wxGraphicsContext_SetPen_1_1 799 -#define wxGraphicsContext_StrokeLine 800 -#define wxGraphicsContext_StrokeLines 801 -#define wxGraphicsMatrix_Concat 803 -#define wxGraphicsMatrix_Get 805 -#define wxGraphicsMatrix_Invert 806 -#define wxGraphicsMatrix_IsEqual 807 -#define wxGraphicsMatrix_IsIdentity 809 -#define wxGraphicsMatrix_Rotate 810 -#define wxGraphicsMatrix_Scale 811 -#define wxGraphicsMatrix_Translate 812 -#define wxGraphicsMatrix_Set 813 -#define wxGraphicsMatrix_TransformPoint 814 -#define wxGraphicsMatrix_TransformDistance 815 -#define wxGraphicsPath_MoveToPoint_2 816 -#define wxGraphicsPath_MoveToPoint_1 817 -#define wxGraphicsPath_AddArc_6 818 -#define wxGraphicsPath_AddArc_5 819 -#define wxGraphicsPath_AddArcToPoint 820 -#define wxGraphicsPath_AddCircle 821 -#define wxGraphicsPath_AddCurveToPoint_6 822 -#define wxGraphicsPath_AddCurveToPoint_3 823 -#define wxGraphicsPath_AddEllipse 824 -#define wxGraphicsPath_AddLineToPoint_2 825 -#define wxGraphicsPath_AddLineToPoint_1 826 -#define wxGraphicsPath_AddPath 827 -#define wxGraphicsPath_AddQuadCurveToPoint 828 -#define wxGraphicsPath_AddRectangle 829 -#define wxGraphicsPath_AddRoundedRectangle 830 -#define wxGraphicsPath_CloseSubpath 831 -#define wxGraphicsPath_Contains_3 832 -#define wxGraphicsPath_Contains_2 833 -#define wxGraphicsPath_GetBox 835 -#define wxGraphicsPath_GetCurrentPoint 837 -#define wxGraphicsPath_Transform 838 -#define wxGraphicsRenderer_GetDefaultRenderer 839 -#define wxGraphicsRenderer_CreateContext_1_1 840 -#define wxGraphicsRenderer_CreateContext_1_0 841 -#define wxGraphicsRenderer_CreatePen 842 -#define wxGraphicsRenderer_CreateBrush 843 -#define wxGraphicsRenderer_CreateLinearGradientBrush 844 -#define wxGraphicsRenderer_CreateRadialGradientBrush 845 -#define wxGraphicsRenderer_CreateFont 846 -#define wxGraphicsRenderer_CreateMatrix 847 -#define wxGraphicsRenderer_CreatePath 848 -#define wxMenuBar_new_1 850 -#define wxMenuBar_new_0 852 -#define wxMenuBar_destruct 854 -#define wxMenuBar_Append 855 -#define wxMenuBar_Check 856 -#define wxMenuBar_Enable_2 857 -#define wxMenuBar_Enable_1 858 -#define wxMenuBar_EnableTop 859 -#define wxMenuBar_FindMenu 860 -#define wxMenuBar_FindMenuItem 861 -#define wxMenuBar_FindItem 862 -#define wxMenuBar_GetHelpString 863 -#define wxMenuBar_GetLabel_1 864 -#define wxMenuBar_GetLabel_0 865 -#define wxMenuBar_GetLabelTop 866 -#define wxMenuBar_GetMenu 867 -#define wxMenuBar_GetMenuCount 868 -#define wxMenuBar_Insert 869 -#define wxMenuBar_IsChecked 870 -#define wxMenuBar_IsEnabled_1 871 -#define wxMenuBar_IsEnabled_0 872 -#define wxMenuBar_Remove 873 -#define wxMenuBar_Replace 874 -#define wxMenuBar_SetHelpString 875 -#define wxMenuBar_SetLabel_2 876 -#define wxMenuBar_SetLabel_1 877 -#define wxMenuBar_SetLabelTop 878 -#define wxControl_GetLabel 879 -#define wxControl_SetLabel 880 -#define wxControlWithItems_Append_1 881 -#define wxControlWithItems_Append_2 882 -#define wxControlWithItems_appendStrings_1 883 -#define wxControlWithItems_Clear 884 -#define wxControlWithItems_Delete 885 -#define wxControlWithItems_FindString 886 -#define wxControlWithItems_getClientData 887 -#define wxControlWithItems_setClientData 888 -#define wxControlWithItems_GetCount 889 -#define wxControlWithItems_GetSelection 890 -#define wxControlWithItems_GetString 891 -#define wxControlWithItems_GetStringSelection 892 -#define wxControlWithItems_Insert_2 893 -#define wxControlWithItems_Insert_3 894 -#define wxControlWithItems_IsEmpty 895 -#define wxControlWithItems_Select 896 -#define wxControlWithItems_SetSelection 897 -#define wxControlWithItems_SetString 898 -#define wxControlWithItems_SetStringSelection 899 -#define wxMenu_new_2 902 -#define wxMenu_new_1 903 -#define wxMenu_destruct 905 -#define wxMenu_Append_3 906 -#define wxMenu_Append_1 907 -#define wxMenu_Append_4_0 908 -#define wxMenu_Append_4_1 909 -#define wxMenu_AppendCheckItem 910 -#define wxMenu_AppendRadioItem 911 -#define wxMenu_AppendSeparator 912 -#define wxMenu_Break 913 -#define wxMenu_Check 914 -#define wxMenu_Delete_1_0 915 -#define wxMenu_Delete_1_1 916 -#define wxMenu_Destroy_1_0 917 -#define wxMenu_Destroy_1_1 918 -#define wxMenu_Enable 919 -#define wxMenu_FindItem_1 920 -#define wxMenu_FindItem_2 921 -#define wxMenu_FindItemByPosition 922 -#define wxMenu_GetHelpString 923 -#define wxMenu_GetLabel 924 -#define wxMenu_GetMenuItemCount 925 -#define wxMenu_GetMenuItems 926 -#define wxMenu_GetTitle 928 -#define wxMenu_Insert_2 929 -#define wxMenu_Insert_3 930 -#define wxMenu_Insert_5_1 931 -#define wxMenu_Insert_5_0 932 -#define wxMenu_InsertCheckItem 933 -#define wxMenu_InsertRadioItem 934 -#define wxMenu_InsertSeparator 935 -#define wxMenu_IsChecked 936 -#define wxMenu_IsEnabled 937 -#define wxMenu_Prepend_1 938 -#define wxMenu_Prepend_2 939 -#define wxMenu_Prepend_4_1 940 -#define wxMenu_Prepend_4_0 941 -#define wxMenu_PrependCheckItem 942 -#define wxMenu_PrependRadioItem 943 -#define wxMenu_PrependSeparator 944 -#define wxMenu_Remove_1_0 945 -#define wxMenu_Remove_1_1 946 -#define wxMenu_SetHelpString 947 -#define wxMenu_SetLabel 948 -#define wxMenu_SetTitle 949 -#define wxMenuItem_new 950 -#define wxMenuItem_destruct 952 -#define wxMenuItem_Check 953 -#define wxMenuItem_Enable 954 -#define wxMenuItem_GetBitmap 955 -#define wxMenuItem_GetHelp 956 -#define wxMenuItem_GetId 957 -#define wxMenuItem_GetKind 958 -#define wxMenuItem_GetLabel 959 -#define wxMenuItem_GetLabelFromText 960 -#define wxMenuItem_GetMenu 961 -#define wxMenuItem_GetText 962 -#define wxMenuItem_GetSubMenu 963 -#define wxMenuItem_IsCheckable 964 -#define wxMenuItem_IsChecked 965 -#define wxMenuItem_IsEnabled 966 -#define wxMenuItem_IsSeparator 967 -#define wxMenuItem_IsSubMenu 968 -#define wxMenuItem_SetBitmap 969 -#define wxMenuItem_SetHelp 970 -#define wxMenuItem_SetMenu 971 -#define wxMenuItem_SetSubMenu 972 -#define wxMenuItem_SetText 973 -#define wxToolBar_AddControl 974 -#define wxToolBar_AddSeparator 975 -#define wxToolBar_AddTool_5 976 -#define wxToolBar_AddTool_4_0 977 -#define wxToolBar_AddTool_1 978 -#define wxToolBar_AddTool_4_1 979 -#define wxToolBar_AddTool_3 980 -#define wxToolBar_AddTool_6 981 -#define wxToolBar_AddCheckTool 982 -#define wxToolBar_AddRadioTool 983 -#define wxToolBar_AddStretchableSpace 984 -#define wxToolBar_InsertStretchableSpace 985 -#define wxToolBar_DeleteTool 986 -#define wxToolBar_DeleteToolByPos 987 -#define wxToolBar_EnableTool 988 -#define wxToolBar_FindById 989 -#define wxToolBar_FindControl 990 -#define wxToolBar_FindToolForPosition 991 -#define wxToolBar_GetToolSize 992 -#define wxToolBar_GetToolBitmapSize 993 -#define wxToolBar_GetMargins 994 -#define wxToolBar_GetToolEnabled 995 -#define wxToolBar_GetToolLongHelp 996 -#define wxToolBar_GetToolPacking 997 -#define wxToolBar_GetToolPos 998 -#define wxToolBar_GetToolSeparation 999 -#define wxToolBar_GetToolShortHelp 1000 -#define wxToolBar_GetToolState 1001 -#define wxToolBar_InsertControl 1002 -#define wxToolBar_InsertSeparator 1003 -#define wxToolBar_InsertTool_5 1004 -#define wxToolBar_InsertTool_2 1005 -#define wxToolBar_InsertTool_4 1006 -#define wxToolBar_Realize 1007 -#define wxToolBar_RemoveTool 1008 -#define wxToolBar_SetMargins 1009 -#define wxToolBar_SetToolBitmapSize 1010 -#define wxToolBar_SetToolLongHelp 1011 -#define wxToolBar_SetToolPacking 1012 -#define wxToolBar_SetToolShortHelp 1013 -#define wxToolBar_SetToolSeparation 1014 -#define wxToolBar_ToggleTool 1015 -#define wxStatusBar_new_0 1017 -#define wxStatusBar_new_2 1018 -#define wxStatusBar_destruct 1020 -#define wxStatusBar_Create 1021 -#define wxStatusBar_GetFieldRect 1022 -#define wxStatusBar_GetFieldsCount 1023 -#define wxStatusBar_GetStatusText 1024 -#define wxStatusBar_PopStatusText 1025 -#define wxStatusBar_PushStatusText 1026 -#define wxStatusBar_SetFieldsCount 1027 -#define wxStatusBar_SetMinHeight 1028 -#define wxStatusBar_SetStatusText 1029 -#define wxStatusBar_SetStatusWidths 1030 -#define wxStatusBar_SetStatusStyles 1031 -#define wxBitmap_new_0 1032 -#define wxBitmap_new_3 1033 -#define wxBitmap_new_4 1034 -#define wxBitmap_new_2_0 1035 -#define wxBitmap_new_2_1 1036 -#define wxBitmap_destruct 1037 -#define wxBitmap_ConvertToImage 1038 -#define wxBitmap_CopyFromIcon 1039 -#define wxBitmap_Create 1040 -#define wxBitmap_GetDepth 1041 -#define wxBitmap_GetHeight 1042 -#define wxBitmap_GetPalette 1043 -#define wxBitmap_GetMask 1044 -#define wxBitmap_GetWidth 1045 -#define wxBitmap_GetSubBitmap 1046 -#define wxBitmap_LoadFile 1047 -#define wxBitmap_Ok 1048 -#define wxBitmap_SaveFile 1049 -#define wxBitmap_SetDepth 1050 -#define wxBitmap_SetHeight 1051 -#define wxBitmap_SetMask 1052 -#define wxBitmap_SetPalette 1053 -#define wxBitmap_SetWidth 1054 -#define wxIcon_new_0 1055 -#define wxIcon_new_2 1056 -#define wxIcon_new_1 1057 -#define wxIcon_CopyFromBitmap 1058 -#define wxIcon_destroy 1059 -#define wxIconBundle_new_0 1060 -#define wxIconBundle_new_2 1061 -#define wxIconBundle_new_1_0 1062 -#define wxIconBundle_new_1_1 1063 -#define wxIconBundle_destruct 1064 -#define wxIconBundle_AddIcon_2 1065 -#define wxIconBundle_AddIcon_1 1066 -#define wxIconBundle_GetIcon_1_1 1067 -#define wxIconBundle_GetIcon_1_0 1068 -#define wxCursor_new_0 1069 -#define wxCursor_new_1_0 1070 -#define wxCursor_new_1_1 1071 -#define wxCursor_new_4 1072 -#define wxCursor_destruct 1073 -#define wxCursor_Ok 1074 -#define wxMask_new_0 1075 -#define wxMask_new_2_1 1076 -#define wxMask_new_2_0 1077 -#define wxMask_new_1 1078 -#define wxMask_destruct 1079 -#define wxMask_Create_2_1 1080 -#define wxMask_Create_2_0 1081 -#define wxMask_Create_1 1082 -#define wxImage_new_0 1083 -#define wxImage_new_3_0 1084 -#define wxImage_new_4 1085 -#define wxImage_new_5 1086 -#define wxImage_new_2 1087 -#define wxImage_new_3_1 1088 -#define wxImage_Blur 1089 -#define wxImage_BlurHorizontal 1090 -#define wxImage_BlurVertical 1091 -#define wxImage_ConvertAlphaToMask 1092 -#define wxImage_ConvertToGreyscale 1093 -#define wxImage_ConvertToMono 1094 -#define wxImage_Copy 1095 -#define wxImage_Create_3 1096 -#define wxImage_Create_4 1097 -#define wxImage_Create_5 1098 -#define wxImage_Destroy 1099 -#define wxImage_FindFirstUnusedColour 1100 -#define wxImage_GetImageExtWildcard 1101 -#define wxImage_GetAlpha_2 1102 -#define wxImage_GetAlpha_0 1103 -#define wxImage_GetBlue 1104 -#define wxImage_GetData 1105 -#define wxImage_GetGreen 1106 -#define wxImage_GetImageCount 1107 -#define wxImage_GetHeight 1108 -#define wxImage_GetMaskBlue 1109 -#define wxImage_GetMaskGreen 1110 -#define wxImage_GetMaskRed 1111 -#define wxImage_GetOrFindMaskColour 1112 -#define wxImage_GetPalette 1113 -#define wxImage_GetRed 1114 -#define wxImage_GetSubImage 1115 -#define wxImage_GetWidth 1116 -#define wxImage_HasAlpha 1117 -#define wxImage_HasMask 1118 -#define wxImage_GetOption 1119 -#define wxImage_GetOptionInt 1120 -#define wxImage_HasOption 1121 -#define wxImage_InitAlpha 1122 -#define wxImage_InitStandardHandlers 1123 -#define wxImage_IsTransparent 1124 -#define wxImage_LoadFile_2 1125 -#define wxImage_LoadFile_3 1126 -#define wxImage_Ok 1127 -#define wxImage_RemoveHandler 1128 -#define wxImage_Mirror 1129 -#define wxImage_Replace 1130 -#define wxImage_Rescale 1131 -#define wxImage_Resize 1132 -#define wxImage_Rotate 1133 -#define wxImage_RotateHue 1134 -#define wxImage_Rotate90 1135 -#define wxImage_SaveFile_1 1136 -#define wxImage_SaveFile_2_0 1137 -#define wxImage_SaveFile_2_1 1138 -#define wxImage_Scale 1139 -#define wxImage_Size 1140 -#define wxImage_SetAlpha_3 1141 -#define wxImage_SetAlpha_2 1142 -#define wxImage_SetData_2 1143 -#define wxImage_SetData_4 1144 -#define wxImage_SetMask 1145 -#define wxImage_SetMaskColour 1146 -#define wxImage_SetMaskFromImage 1147 -#define wxImage_SetOption_2_1 1148 -#define wxImage_SetOption_2_0 1149 -#define wxImage_SetPalette 1150 -#define wxImage_SetRGB_5 1151 -#define wxImage_SetRGB_4 1152 -#define wxImage_destroy 1153 -#define wxBrush_new_0 1154 -#define wxBrush_new_2 1155 -#define wxBrush_new_1 1156 -#define wxBrush_destruct 1158 -#define wxBrush_GetColour 1159 -#define wxBrush_GetStipple 1160 -#define wxBrush_GetStyle 1161 -#define wxBrush_IsHatch 1162 -#define wxBrush_IsOk 1163 -#define wxBrush_SetColour_1 1164 -#define wxBrush_SetColour_3 1165 -#define wxBrush_SetStipple 1166 -#define wxBrush_SetStyle 1167 -#define wxPen_new_0 1168 -#define wxPen_new_2 1169 -#define wxPen_destruct 1170 -#define wxPen_GetCap 1171 -#define wxPen_GetColour 1172 -#define wxPen_GetJoin 1173 -#define wxPen_GetStyle 1174 -#define wxPen_GetWidth 1175 -#define wxPen_IsOk 1176 -#define wxPen_SetCap 1177 -#define wxPen_SetColour_1 1178 -#define wxPen_SetColour_3 1179 -#define wxPen_SetJoin 1180 -#define wxPen_SetStyle 1181 -#define wxPen_SetWidth 1182 -#define wxRegion_new_0 1183 -#define wxRegion_new_4 1184 -#define wxRegion_new_2 1185 -#define wxRegion_new_1_1 1186 -#define wxRegion_new_1_0 1188 -#define wxRegion_destruct 1190 -#define wxRegion_Clear 1191 -#define wxRegion_Contains_2 1192 -#define wxRegion_Contains_1_0 1193 -#define wxRegion_Contains_4 1194 -#define wxRegion_Contains_1_1 1195 -#define wxRegion_ConvertToBitmap 1196 -#define wxRegion_GetBox 1197 -#define wxRegion_Intersect_4 1198 -#define wxRegion_Intersect_1_1 1199 -#define wxRegion_Intersect_1_0 1200 -#define wxRegion_IsEmpty 1201 -#define wxRegion_Subtract_4 1202 -#define wxRegion_Subtract_1_1 1203 -#define wxRegion_Subtract_1_0 1204 -#define wxRegion_Offset_2 1205 -#define wxRegion_Offset_1 1206 -#define wxRegion_Union_4 1207 -#define wxRegion_Union_1_2 1208 -#define wxRegion_Union_1_1 1209 -#define wxRegion_Union_1_0 1210 -#define wxRegion_Union_3 1211 -#define wxRegion_Xor_4 1212 -#define wxRegion_Xor_1_1 1213 -#define wxRegion_Xor_1_0 1214 -#define wxAcceleratorTable_new_0 1215 -#define wxAcceleratorTable_new_2 1216 -#define wxAcceleratorTable_destruct 1217 -#define wxAcceleratorTable_Ok 1218 -#define wxAcceleratorEntry_new_1_0 1219 -#define wxAcceleratorEntry_new_1_1 1220 -#define wxAcceleratorEntry_GetCommand 1221 -#define wxAcceleratorEntry_GetFlags 1222 -#define wxAcceleratorEntry_GetKeyCode 1223 -#define wxAcceleratorEntry_Set 1224 -#define wxAcceleratorEntry_destroy 1225 -#define wxCaret_new_3 1230 -#define wxCaret_new_2 1231 -#define wxCaret_destruct 1233 -#define wxCaret_Create_3 1234 -#define wxCaret_Create_2 1235 -#define wxCaret_GetBlinkTime 1236 -#define wxCaret_GetPosition 1238 -#define wxCaret_GetSize 1240 -#define wxCaret_GetWindow 1241 -#define wxCaret_Hide 1242 -#define wxCaret_IsOk 1243 -#define wxCaret_IsVisible 1244 -#define wxCaret_Move_2 1245 -#define wxCaret_Move_1 1246 -#define wxCaret_SetBlinkTime 1247 -#define wxCaret_SetSize_2 1248 -#define wxCaret_SetSize_1 1249 -#define wxCaret_Show 1250 -#define wxSizer_Add_2_1 1251 -#define wxSizer_Add_2_0 1252 -#define wxSizer_Add_3 1253 -#define wxSizer_Add_2_3 1254 -#define wxSizer_Add_2_2 1255 -#define wxSizer_AddSpacer 1256 -#define wxSizer_AddStretchSpacer 1257 -#define wxSizer_CalcMin 1258 -#define wxSizer_Clear 1259 -#define wxSizer_Detach_1_2 1260 -#define wxSizer_Detach_1_1 1261 -#define wxSizer_Detach_1_0 1262 -#define wxSizer_Fit 1263 -#define wxSizer_FitInside 1264 -#define wxSizer_GetChildren 1265 -#define wxSizer_GetItem_2_1 1266 -#define wxSizer_GetItem_2_0 1267 -#define wxSizer_GetItem_1 1268 -#define wxSizer_GetSize 1269 -#define wxSizer_GetPosition 1270 -#define wxSizer_GetMinSize 1271 -#define wxSizer_Hide_2_0 1272 -#define wxSizer_Hide_2_1 1273 -#define wxSizer_Hide_1 1274 -#define wxSizer_Insert_3_1 1275 -#define wxSizer_Insert_3_0 1276 -#define wxSizer_Insert_4 1277 -#define wxSizer_Insert_3_3 1278 -#define wxSizer_Insert_3_2 1279 -#define wxSizer_Insert_2 1280 -#define wxSizer_InsertSpacer 1281 -#define wxSizer_InsertStretchSpacer 1282 -#define wxSizer_IsShown_1_2 1283 -#define wxSizer_IsShown_1_1 1284 -#define wxSizer_IsShown_1_0 1285 -#define wxSizer_Layout 1286 -#define wxSizer_Prepend_2_1 1287 -#define wxSizer_Prepend_2_0 1288 -#define wxSizer_Prepend_3 1289 -#define wxSizer_Prepend_2_3 1290 -#define wxSizer_Prepend_2_2 1291 -#define wxSizer_Prepend_1 1292 -#define wxSizer_PrependSpacer 1293 -#define wxSizer_PrependStretchSpacer 1294 -#define wxSizer_RecalcSizes 1295 -#define wxSizer_Remove_1_1 1296 -#define wxSizer_Remove_1_0 1297 -#define wxSizer_Replace_3_1 1298 -#define wxSizer_Replace_3_0 1299 -#define wxSizer_Replace_2 1300 -#define wxSizer_SetDimension 1301 -#define wxSizer_SetMinSize_2 1302 -#define wxSizer_SetMinSize_1 1303 -#define wxSizer_SetItemMinSize_3_2 1304 -#define wxSizer_SetItemMinSize_2_2 1305 -#define wxSizer_SetItemMinSize_3_1 1306 -#define wxSizer_SetItemMinSize_2_1 1307 -#define wxSizer_SetItemMinSize_3_0 1308 -#define wxSizer_SetItemMinSize_2_0 1309 -#define wxSizer_SetSizeHints 1310 -#define wxSizer_SetVirtualSizeHints 1311 -#define wxSizer_Show_2_2 1312 -#define wxSizer_Show_2_1 1313 -#define wxSizer_Show_2_0 1314 -#define wxSizer_Show_1 1315 -#define wxSizerFlags_new 1316 -#define wxSizerFlags_Align 1317 -#define wxSizerFlags_Border_2 1318 -#define wxSizerFlags_Border_1 1319 -#define wxSizerFlags_Center 1320 -#define wxSizerFlags_Centre 1321 -#define wxSizerFlags_Expand 1322 -#define wxSizerFlags_Left 1323 -#define wxSizerFlags_Proportion 1324 -#define wxSizerFlags_Right 1325 -#define wxSizerFlags_destroy 1326 -#define wxSizerItem_new_5_1 1327 -#define wxSizerItem_new_2_1 1328 -#define wxSizerItem_new_5_0 1329 -#define wxSizerItem_new_2_0 1330 -#define wxSizerItem_new_6 1331 -#define wxSizerItem_new_3 1332 -#define wxSizerItem_new_0 1333 -#define wxSizerItem_destruct 1334 -#define wxSizerItem_CalcMin 1335 -#define wxSizerItem_DeleteWindows 1336 -#define wxSizerItem_DetachSizer 1337 -#define wxSizerItem_GetBorder 1338 -#define wxSizerItem_GetFlag 1339 -#define wxSizerItem_GetMinSize 1340 -#define wxSizerItem_GetPosition 1341 -#define wxSizerItem_GetProportion 1342 -#define wxSizerItem_GetRatio 1343 -#define wxSizerItem_GetRect 1344 -#define wxSizerItem_GetSize 1345 -#define wxSizerItem_GetSizer 1346 -#define wxSizerItem_GetSpacer 1347 -#define wxSizerItem_GetUserData 1348 -#define wxSizerItem_GetWindow 1349 -#define wxSizerItem_IsSizer 1350 -#define wxSizerItem_IsShown 1351 -#define wxSizerItem_IsSpacer 1352 -#define wxSizerItem_IsWindow 1353 -#define wxSizerItem_SetBorder 1354 -#define wxSizerItem_SetDimension 1355 -#define wxSizerItem_SetFlag 1356 -#define wxSizerItem_SetInitSize 1357 -#define wxSizerItem_SetMinSize_1 1358 -#define wxSizerItem_SetMinSize_2 1359 -#define wxSizerItem_SetProportion 1360 -#define wxSizerItem_SetRatio_2 1361 -#define wxSizerItem_SetRatio_1_1 1362 -#define wxSizerItem_SetRatio_1_0 1363 -#define wxSizerItem_SetSizer 1364 -#define wxSizerItem_SetSpacer_1 1365 -#define wxSizerItem_SetSpacer_2 1366 -#define wxSizerItem_SetWindow 1367 -#define wxSizerItem_Show 1368 -#define wxBoxSizer_new 1369 -#define wxBoxSizer_GetOrientation 1370 -#define wxBoxSizer_destroy 1371 -#define wxStaticBoxSizer_new_2 1372 -#define wxStaticBoxSizer_new_3 1373 -#define wxStaticBoxSizer_GetStaticBox 1374 -#define wxStaticBoxSizer_destroy 1375 -#define wxGridSizer_new_4 1376 -#define wxGridSizer_new_2 1377 -#define wxGridSizer_GetCols 1378 -#define wxGridSizer_GetHGap 1379 -#define wxGridSizer_GetRows 1380 -#define wxGridSizer_GetVGap 1381 -#define wxGridSizer_SetCols 1382 -#define wxGridSizer_SetHGap 1383 -#define wxGridSizer_SetRows 1384 -#define wxGridSizer_SetVGap 1385 -#define wxGridSizer_destroy 1386 -#define wxFlexGridSizer_new_4 1387 -#define wxFlexGridSizer_new_2 1388 -#define wxFlexGridSizer_AddGrowableCol 1389 -#define wxFlexGridSizer_AddGrowableRow 1390 -#define wxFlexGridSizer_GetFlexibleDirection 1391 -#define wxFlexGridSizer_GetNonFlexibleGrowMode 1392 -#define wxFlexGridSizer_RemoveGrowableCol 1393 -#define wxFlexGridSizer_RemoveGrowableRow 1394 -#define wxFlexGridSizer_SetFlexibleDirection 1395 -#define wxFlexGridSizer_SetNonFlexibleGrowMode 1396 -#define wxFlexGridSizer_destroy 1397 -#define wxGridBagSizer_new 1398 -#define wxGridBagSizer_Add_3_2 1399 -#define wxGridBagSizer_Add_3_1 1400 -#define wxGridBagSizer_Add_4 1401 -#define wxGridBagSizer_Add_1_0 1402 -#define wxGridBagSizer_Add_2_1 1403 -#define wxGridBagSizer_Add_2_0 1404 -#define wxGridBagSizer_Add_3_0 1405 -#define wxGridBagSizer_Add_1_1 1406 -#define wxGridBagSizer_CalcMin 1407 -#define wxGridBagSizer_CheckForIntersection_2 1408 -#define wxGridBagSizer_CheckForIntersection_3 1409 -#define wxGridBagSizer_FindItem_1_1 1410 -#define wxGridBagSizer_FindItem_1_0 1411 -#define wxGridBagSizer_FindItemAtPoint 1412 -#define wxGridBagSizer_FindItemAtPosition 1413 -#define wxGridBagSizer_FindItemWithData 1414 -#define wxGridBagSizer_GetCellSize 1415 -#define wxGridBagSizer_GetEmptyCellSize 1416 -#define wxGridBagSizer_GetItemPosition_1_2 1417 -#define wxGridBagSizer_GetItemPosition_1_1 1418 -#define wxGridBagSizer_GetItemPosition_1_0 1419 -#define wxGridBagSizer_GetItemSpan_1_2 1420 -#define wxGridBagSizer_GetItemSpan_1_1 1421 -#define wxGridBagSizer_GetItemSpan_1_0 1422 -#define wxGridBagSizer_SetEmptyCellSize 1423 -#define wxGridBagSizer_SetItemPosition_2_2 1424 -#define wxGridBagSizer_SetItemPosition_2_1 1425 -#define wxGridBagSizer_SetItemPosition_2_0 1426 -#define wxGridBagSizer_SetItemSpan_2_2 1427 -#define wxGridBagSizer_SetItemSpan_2_1 1428 -#define wxGridBagSizer_SetItemSpan_2_0 1429 -#define wxGridBagSizer_destroy 1430 -#define wxStdDialogButtonSizer_new 1431 -#define wxStdDialogButtonSizer_AddButton 1432 -#define wxStdDialogButtonSizer_Realize 1433 -#define wxStdDialogButtonSizer_SetAffirmativeButton 1434 -#define wxStdDialogButtonSizer_SetCancelButton 1435 -#define wxStdDialogButtonSizer_SetNegativeButton 1436 -#define wxStdDialogButtonSizer_destroy 1437 -#define wxFont_new_0 1438 -#define wxFont_new_1 1439 -#define wxFont_new_5 1440 -#define wxFont_destruct 1442 -#define wxFont_IsFixedWidth 1443 -#define wxFont_GetDefaultEncoding 1444 -#define wxFont_GetFaceName 1445 -#define wxFont_GetFamily 1446 -#define wxFont_GetNativeFontInfoDesc 1447 -#define wxFont_GetNativeFontInfoUserDesc 1448 -#define wxFont_GetPointSize 1449 -#define wxFont_GetStyle 1450 -#define wxFont_GetUnderlined 1451 -#define wxFont_GetWeight 1452 -#define wxFont_Ok 1453 -#define wxFont_SetDefaultEncoding 1454 -#define wxFont_SetFaceName 1455 -#define wxFont_SetFamily 1456 -#define wxFont_SetPointSize 1457 -#define wxFont_SetStyle 1458 -#define wxFont_SetUnderlined 1459 -#define wxFont_SetWeight 1460 -#define wxToolTip_Enable 1461 -#define wxToolTip_SetDelay 1462 -#define wxToolTip_new 1463 -#define wxToolTip_SetTip 1464 -#define wxToolTip_GetTip 1465 -#define wxToolTip_GetWindow 1466 -#define wxToolTip_destroy 1467 -#define wxButton_new_3 1469 -#define wxButton_new_0 1470 -#define wxButton_destruct 1471 -#define wxButton_Create 1472 -#define wxButton_GetDefaultSize 1473 -#define wxButton_SetDefault 1474 -#define wxButton_SetLabel 1475 -#define wxBitmapButton_new_4 1477 -#define wxBitmapButton_new_0 1478 -#define wxBitmapButton_Create 1479 -#define wxBitmapButton_GetBitmapDisabled 1480 -#define wxBitmapButton_GetBitmapFocus 1482 -#define wxBitmapButton_GetBitmapLabel 1484 -#define wxBitmapButton_GetBitmapSelected 1486 -#define wxBitmapButton_SetBitmapDisabled 1488 -#define wxBitmapButton_SetBitmapFocus 1489 -#define wxBitmapButton_SetBitmapLabel 1490 -#define wxBitmapButton_SetBitmapSelected 1491 -#define wxBitmapButton_destroy 1492 -#define wxToggleButton_new_0 1493 -#define wxToggleButton_new_4 1494 -#define wxToggleButton_Create 1495 -#define wxToggleButton_GetValue 1496 -#define wxToggleButton_SetValue 1497 -#define wxToggleButton_destroy 1498 -#define wxCalendarCtrl_new_0 1499 -#define wxCalendarCtrl_new_3 1500 -#define wxCalendarCtrl_Create 1501 -#define wxCalendarCtrl_destruct 1502 -#define wxCalendarCtrl_SetDate 1503 -#define wxCalendarCtrl_GetDate 1504 -#define wxCalendarCtrl_EnableYearChange 1505 -#define wxCalendarCtrl_EnableMonthChange 1506 -#define wxCalendarCtrl_EnableHolidayDisplay 1507 -#define wxCalendarCtrl_SetHeaderColours 1508 -#define wxCalendarCtrl_GetHeaderColourFg 1509 -#define wxCalendarCtrl_GetHeaderColourBg 1510 -#define wxCalendarCtrl_SetHighlightColours 1511 -#define wxCalendarCtrl_GetHighlightColourFg 1512 -#define wxCalendarCtrl_GetHighlightColourBg 1513 -#define wxCalendarCtrl_SetHolidayColours 1514 -#define wxCalendarCtrl_GetHolidayColourFg 1515 -#define wxCalendarCtrl_GetHolidayColourBg 1516 -#define wxCalendarCtrl_GetAttr 1517 -#define wxCalendarCtrl_SetAttr 1518 -#define wxCalendarCtrl_SetHoliday 1519 -#define wxCalendarCtrl_ResetAttr 1520 -#define wxCalendarCtrl_HitTest 1521 -#define wxCalendarDateAttr_new_0 1522 -#define wxCalendarDateAttr_new_2_1 1523 -#define wxCalendarDateAttr_new_2_0 1524 -#define wxCalendarDateAttr_SetTextColour 1525 -#define wxCalendarDateAttr_SetBackgroundColour 1526 -#define wxCalendarDateAttr_SetBorderColour 1527 -#define wxCalendarDateAttr_SetFont 1528 -#define wxCalendarDateAttr_SetBorder 1529 -#define wxCalendarDateAttr_SetHoliday 1530 -#define wxCalendarDateAttr_HasTextColour 1531 -#define wxCalendarDateAttr_HasBackgroundColour 1532 -#define wxCalendarDateAttr_HasBorderColour 1533 -#define wxCalendarDateAttr_HasFont 1534 -#define wxCalendarDateAttr_HasBorder 1535 -#define wxCalendarDateAttr_IsHoliday 1536 -#define wxCalendarDateAttr_GetTextColour 1537 -#define wxCalendarDateAttr_GetBackgroundColour 1538 -#define wxCalendarDateAttr_GetBorderColour 1539 -#define wxCalendarDateAttr_GetFont 1540 -#define wxCalendarDateAttr_GetBorder 1541 -#define wxCalendarDateAttr_destroy 1542 -#define wxCheckBox_new_4 1544 -#define wxCheckBox_new_0 1545 -#define wxCheckBox_Create 1546 -#define wxCheckBox_GetValue 1547 -#define wxCheckBox_Get3StateValue 1548 -#define wxCheckBox_Is3rdStateAllowedForUser 1549 -#define wxCheckBox_Is3State 1550 -#define wxCheckBox_IsChecked 1551 -#define wxCheckBox_SetValue 1552 -#define wxCheckBox_Set3StateValue 1553 -#define wxCheckBox_destroy 1554 -#define wxCheckListBox_new_0 1555 -#define wxCheckListBox_new_3 1557 -#define wxCheckListBox_Check 1558 -#define wxCheckListBox_IsChecked 1559 -#define wxCheckListBox_destroy 1560 -#define wxChoice_new_3 1563 -#define wxChoice_new_0 1564 -#define wxChoice_destruct 1566 -#define wxChoice_Create 1568 -#define wxChoice_Delete 1569 -#define wxChoice_GetColumns 1570 -#define wxChoice_SetColumns 1571 -#define wxComboBox_new_0 1572 -#define wxComboBox_new_3 1574 -#define wxComboBox_destruct 1575 -#define wxComboBox_Create 1577 -#define wxComboBox_CanCopy 1578 -#define wxComboBox_CanCut 1579 -#define wxComboBox_CanPaste 1580 -#define wxComboBox_CanRedo 1581 -#define wxComboBox_CanUndo 1582 -#define wxComboBox_Copy 1583 -#define wxComboBox_Cut 1584 -#define wxComboBox_GetInsertionPoint 1585 -#define wxComboBox_GetLastPosition 1586 -#define wxComboBox_GetValue 1587 -#define wxComboBox_Paste 1588 -#define wxComboBox_Redo 1589 -#define wxComboBox_Replace 1590 -#define wxComboBox_Remove 1591 -#define wxComboBox_SetInsertionPoint 1592 -#define wxComboBox_SetInsertionPointEnd 1593 -#define wxComboBox_SetSelection_1 1594 -#define wxComboBox_SetSelection_2 1595 -#define wxComboBox_SetValue 1596 -#define wxComboBox_Undo 1597 -#define wxGauge_new_0 1598 -#define wxGauge_new_4 1599 -#define wxGauge_Create 1600 -#define wxGauge_GetBezelFace 1601 -#define wxGauge_GetRange 1602 -#define wxGauge_GetShadowWidth 1603 -#define wxGauge_GetValue 1604 -#define wxGauge_IsVertical 1605 -#define wxGauge_SetBezelFace 1606 -#define wxGauge_SetRange 1607 -#define wxGauge_SetShadowWidth 1608 -#define wxGauge_SetValue 1609 -#define wxGauge_Pulse 1610 -#define wxGauge_destroy 1611 -#define wxGenericDirCtrl_new_0 1612 -#define wxGenericDirCtrl_new_2 1613 -#define wxGenericDirCtrl_destruct 1614 -#define wxGenericDirCtrl_Create 1615 -#define wxGenericDirCtrl_Init 1616 -#define wxGenericDirCtrl_CollapseTree 1617 -#define wxGenericDirCtrl_ExpandPath 1618 -#define wxGenericDirCtrl_GetDefaultPath 1619 -#define wxGenericDirCtrl_GetPath 1620 -#define wxGenericDirCtrl_GetFilePath 1621 -#define wxGenericDirCtrl_GetFilter 1622 -#define wxGenericDirCtrl_GetFilterIndex 1623 -#define wxGenericDirCtrl_GetRootId 1624 -#define wxGenericDirCtrl_GetTreeCtrl 1625 -#define wxGenericDirCtrl_ReCreateTree 1626 -#define wxGenericDirCtrl_SetDefaultPath 1627 -#define wxGenericDirCtrl_SetFilter 1628 -#define wxGenericDirCtrl_SetFilterIndex 1629 -#define wxGenericDirCtrl_SetPath 1630 -#define wxStaticBox_new_4 1632 -#define wxStaticBox_new_0 1633 -#define wxStaticBox_Create 1634 -#define wxStaticBox_destroy 1635 -#define wxStaticLine_new_2 1637 -#define wxStaticLine_new_0 1638 -#define wxStaticLine_Create 1639 -#define wxStaticLine_IsVertical 1640 -#define wxStaticLine_GetDefaultSize 1641 -#define wxStaticLine_destroy 1642 -#define wxListBox_new_3 1645 -#define wxListBox_new_0 1646 -#define wxListBox_destruct 1648 -#define wxListBox_Create 1650 -#define wxListBox_Deselect 1651 -#define wxListBox_GetSelections 1652 -#define wxListBox_InsertItems 1653 -#define wxListBox_IsSelected 1654 -#define wxListBox_Set 1655 -#define wxListBox_HitTest 1656 -#define wxListBox_SetFirstItem_1_0 1657 -#define wxListBox_SetFirstItem_1_1 1658 -#define wxListCtrl_new_0 1659 -#define wxListCtrl_new_2 1660 -#define wxListCtrl_Arrange 1661 -#define wxListCtrl_AssignImageList 1662 -#define wxListCtrl_ClearAll 1663 -#define wxListCtrl_Create 1664 -#define wxListCtrl_DeleteAllItems 1665 -#define wxListCtrl_DeleteColumn 1666 -#define wxListCtrl_DeleteItem 1667 -#define wxListCtrl_EditLabel 1668 -#define wxListCtrl_EnsureVisible 1669 -#define wxListCtrl_FindItem_3_0 1670 -#define wxListCtrl_FindItem_3_1 1671 -#define wxListCtrl_GetColumn 1672 -#define wxListCtrl_GetColumnCount 1673 -#define wxListCtrl_GetColumnWidth 1674 -#define wxListCtrl_GetCountPerPage 1675 -#define wxListCtrl_GetEditControl 1676 -#define wxListCtrl_GetImageList 1677 -#define wxListCtrl_GetItem 1678 -#define wxListCtrl_GetItemBackgroundColour 1679 -#define wxListCtrl_GetItemCount 1680 -#define wxListCtrl_GetItemData 1681 -#define wxListCtrl_GetItemFont 1682 -#define wxListCtrl_GetItemPosition 1683 -#define wxListCtrl_GetItemRect 1684 -#define wxListCtrl_GetItemSpacing 1685 -#define wxListCtrl_GetItemState 1686 -#define wxListCtrl_GetItemText 1687 -#define wxListCtrl_GetItemTextColour 1688 -#define wxListCtrl_GetNextItem 1689 -#define wxListCtrl_GetSelectedItemCount 1690 -#define wxListCtrl_GetTextColour 1691 -#define wxListCtrl_GetTopItem 1692 -#define wxListCtrl_GetViewRect 1693 -#define wxListCtrl_HitTest 1694 -#define wxListCtrl_InsertColumn_2 1695 -#define wxListCtrl_InsertColumn_3 1696 -#define wxListCtrl_InsertItem_1 1697 -#define wxListCtrl_InsertItem_2_1 1698 -#define wxListCtrl_InsertItem_2_0 1699 -#define wxListCtrl_InsertItem_3 1700 -#define wxListCtrl_RefreshItem 1701 -#define wxListCtrl_RefreshItems 1702 -#define wxListCtrl_ScrollList 1703 -#define wxListCtrl_SetBackgroundColour 1704 -#define wxListCtrl_SetColumn 1705 -#define wxListCtrl_SetColumnWidth 1706 -#define wxListCtrl_SetImageList 1707 -#define wxListCtrl_SetItem_1 1708 -#define wxListCtrl_SetItem_4 1709 -#define wxListCtrl_SetItemBackgroundColour 1710 -#define wxListCtrl_SetItemCount 1711 -#define wxListCtrl_SetItemData 1712 -#define wxListCtrl_SetItemFont 1713 -#define wxListCtrl_SetItemImage 1714 -#define wxListCtrl_SetItemColumnImage 1715 -#define wxListCtrl_SetItemPosition 1716 -#define wxListCtrl_SetItemState 1717 -#define wxListCtrl_SetItemText 1718 -#define wxListCtrl_SetItemTextColour 1719 -#define wxListCtrl_SetSingleStyle 1720 -#define wxListCtrl_SetTextColour 1721 -#define wxListCtrl_SetWindowStyleFlag 1722 -#define wxListCtrl_SortItems 1723 -#define wxListCtrl_destroy 1724 -#define wxListView_ClearColumnImage 1725 -#define wxListView_Focus 1726 -#define wxListView_GetFirstSelected 1727 -#define wxListView_GetFocusedItem 1728 -#define wxListView_GetNextSelected 1729 -#define wxListView_IsSelected 1730 -#define wxListView_Select 1731 -#define wxListView_SetColumnImage 1732 -#define wxListItem_new_0 1733 -#define wxListItem_new_1 1734 -#define wxListItem_destruct 1735 -#define wxListItem_Clear 1736 -#define wxListItem_GetAlign 1737 -#define wxListItem_GetBackgroundColour 1738 -#define wxListItem_GetColumn 1739 -#define wxListItem_GetFont 1740 -#define wxListItem_GetId 1741 -#define wxListItem_GetImage 1742 -#define wxListItem_GetMask 1743 -#define wxListItem_GetState 1744 -#define wxListItem_GetText 1745 -#define wxListItem_GetTextColour 1746 -#define wxListItem_GetWidth 1747 -#define wxListItem_SetAlign 1748 -#define wxListItem_SetBackgroundColour 1749 -#define wxListItem_SetColumn 1750 -#define wxListItem_SetFont 1751 -#define wxListItem_SetId 1752 -#define wxListItem_SetImage 1753 -#define wxListItem_SetMask 1754 -#define wxListItem_SetState 1755 -#define wxListItem_SetStateMask 1756 -#define wxListItem_SetText 1757 -#define wxListItem_SetTextColour 1758 -#define wxListItem_SetWidth 1759 -#define wxListItemAttr_new_0 1760 -#define wxListItemAttr_new_3 1761 -#define wxListItemAttr_GetBackgroundColour 1762 -#define wxListItemAttr_GetFont 1763 -#define wxListItemAttr_GetTextColour 1764 -#define wxListItemAttr_HasBackgroundColour 1765 -#define wxListItemAttr_HasFont 1766 -#define wxListItemAttr_HasTextColour 1767 -#define wxListItemAttr_SetBackgroundColour 1768 -#define wxListItemAttr_SetFont 1769 -#define wxListItemAttr_SetTextColour 1770 -#define wxListItemAttr_destroy 1771 -#define wxImageList_new_0 1772 -#define wxImageList_new_3 1773 -#define wxImageList_Add_1 1774 -#define wxImageList_Add_2_0 1775 -#define wxImageList_Add_2_1 1776 -#define wxImageList_Create 1777 -#define wxImageList_Draw 1779 -#define wxImageList_GetBitmap 1780 -#define wxImageList_GetIcon 1781 -#define wxImageList_GetImageCount 1782 -#define wxImageList_GetSize 1783 -#define wxImageList_Remove 1784 -#define wxImageList_RemoveAll 1785 -#define wxImageList_Replace_2 1786 -#define wxImageList_Replace_3 1787 -#define wxImageList_destroy 1788 -#define wxTextAttr_new_0 1789 -#define wxTextAttr_new_2 1790 -#define wxTextAttr_GetAlignment 1791 -#define wxTextAttr_GetBackgroundColour 1792 -#define wxTextAttr_GetFont 1793 -#define wxTextAttr_GetLeftIndent 1794 -#define wxTextAttr_GetLeftSubIndent 1795 -#define wxTextAttr_GetRightIndent 1796 -#define wxTextAttr_GetTabs 1797 -#define wxTextAttr_GetTextColour 1798 -#define wxTextAttr_HasBackgroundColour 1799 -#define wxTextAttr_HasFont 1800 -#define wxTextAttr_HasTextColour 1801 -#define wxTextAttr_GetFlags 1802 -#define wxTextAttr_IsDefault 1803 -#define wxTextAttr_SetAlignment 1804 -#define wxTextAttr_SetBackgroundColour 1805 -#define wxTextAttr_SetFlags 1806 -#define wxTextAttr_SetFont 1807 -#define wxTextAttr_SetLeftIndent 1808 -#define wxTextAttr_SetRightIndent 1809 -#define wxTextAttr_SetTabs 1810 -#define wxTextAttr_SetTextColour 1811 -#define wxTextAttr_destroy 1812 -#define wxTextCtrl_new_3 1814 -#define wxTextCtrl_new_0 1815 -#define wxTextCtrl_destruct 1817 -#define wxTextCtrl_AppendText 1818 -#define wxTextCtrl_CanCopy 1819 -#define wxTextCtrl_CanCut 1820 -#define wxTextCtrl_CanPaste 1821 -#define wxTextCtrl_CanRedo 1822 -#define wxTextCtrl_CanUndo 1823 -#define wxTextCtrl_Clear 1824 -#define wxTextCtrl_Copy 1825 -#define wxTextCtrl_Create 1826 -#define wxTextCtrl_Cut 1827 -#define wxTextCtrl_DiscardEdits 1828 -#define wxTextCtrl_ChangeValue 1829 -#define wxTextCtrl_EmulateKeyPress 1830 -#define wxTextCtrl_GetDefaultStyle 1831 -#define wxTextCtrl_GetInsertionPoint 1832 -#define wxTextCtrl_GetLastPosition 1833 -#define wxTextCtrl_GetLineLength 1834 -#define wxTextCtrl_GetLineText 1835 -#define wxTextCtrl_GetNumberOfLines 1836 -#define wxTextCtrl_GetRange 1837 -#define wxTextCtrl_GetSelection 1838 -#define wxTextCtrl_GetStringSelection 1839 -#define wxTextCtrl_GetStyle 1840 -#define wxTextCtrl_GetValue 1841 -#define wxTextCtrl_IsEditable 1842 -#define wxTextCtrl_IsModified 1843 -#define wxTextCtrl_IsMultiLine 1844 -#define wxTextCtrl_IsSingleLine 1845 -#define wxTextCtrl_LoadFile 1846 -#define wxTextCtrl_MarkDirty 1847 -#define wxTextCtrl_Paste 1848 -#define wxTextCtrl_PositionToXY 1849 -#define wxTextCtrl_Redo 1850 -#define wxTextCtrl_Remove 1851 -#define wxTextCtrl_Replace 1852 -#define wxTextCtrl_SaveFile 1853 -#define wxTextCtrl_SetDefaultStyle 1854 -#define wxTextCtrl_SetEditable 1855 -#define wxTextCtrl_SetInsertionPoint 1856 -#define wxTextCtrl_SetInsertionPointEnd 1857 -#define wxTextCtrl_SetMaxLength 1859 -#define wxTextCtrl_SetSelection 1860 -#define wxTextCtrl_SetStyle 1861 -#define wxTextCtrl_SetValue 1862 -#define wxTextCtrl_ShowPosition 1863 -#define wxTextCtrl_Undo 1864 -#define wxTextCtrl_WriteText 1865 -#define wxTextCtrl_XYToPosition 1866 -#define wxNotebook_new_0 1869 -#define wxNotebook_new_3 1870 -#define wxNotebook_destruct 1871 -#define wxNotebook_AddPage 1872 -#define wxNotebook_AdvanceSelection 1873 -#define wxNotebook_AssignImageList 1874 -#define wxNotebook_Create 1875 -#define wxNotebook_DeleteAllPages 1876 -#define wxNotebook_DeletePage 1877 -#define wxNotebook_RemovePage 1878 -#define wxNotebook_GetCurrentPage 1879 -#define wxNotebook_GetImageList 1880 -#define wxNotebook_GetPage 1882 -#define wxNotebook_GetPageCount 1883 -#define wxNotebook_GetPageImage 1884 -#define wxNotebook_GetPageText 1885 -#define wxNotebook_GetRowCount 1886 -#define wxNotebook_GetSelection 1887 -#define wxNotebook_GetThemeBackgroundColour 1888 -#define wxNotebook_HitTest 1890 -#define wxNotebook_InsertPage 1892 -#define wxNotebook_SetImageList 1893 -#define wxNotebook_SetPadding 1894 -#define wxNotebook_SetPageSize 1895 -#define wxNotebook_SetPageImage 1896 -#define wxNotebook_SetPageText 1897 -#define wxNotebook_SetSelection 1898 -#define wxNotebook_ChangeSelection 1899 -#define wxChoicebook_new_0 1900 -#define wxChoicebook_new_3 1901 -#define wxChoicebook_AddPage 1902 -#define wxChoicebook_AdvanceSelection 1903 -#define wxChoicebook_AssignImageList 1904 -#define wxChoicebook_Create 1905 -#define wxChoicebook_DeleteAllPages 1906 -#define wxChoicebook_DeletePage 1907 -#define wxChoicebook_RemovePage 1908 -#define wxChoicebook_GetCurrentPage 1909 -#define wxChoicebook_GetImageList 1910 -#define wxChoicebook_GetPage 1912 -#define wxChoicebook_GetPageCount 1913 -#define wxChoicebook_GetPageImage 1914 -#define wxChoicebook_GetPageText 1915 -#define wxChoicebook_GetSelection 1916 -#define wxChoicebook_HitTest 1917 -#define wxChoicebook_InsertPage 1918 -#define wxChoicebook_SetImageList 1919 -#define wxChoicebook_SetPageSize 1920 -#define wxChoicebook_SetPageImage 1921 -#define wxChoicebook_SetPageText 1922 -#define wxChoicebook_SetSelection 1923 -#define wxChoicebook_ChangeSelection 1924 -#define wxChoicebook_destroy 1925 -#define wxToolbook_new_0 1926 -#define wxToolbook_new_3 1927 -#define wxToolbook_AddPage 1928 -#define wxToolbook_AdvanceSelection 1929 -#define wxToolbook_AssignImageList 1930 -#define wxToolbook_Create 1931 -#define wxToolbook_DeleteAllPages 1932 -#define wxToolbook_DeletePage 1933 -#define wxToolbook_RemovePage 1934 -#define wxToolbook_GetCurrentPage 1935 -#define wxToolbook_GetImageList 1936 -#define wxToolbook_GetPage 1938 -#define wxToolbook_GetPageCount 1939 -#define wxToolbook_GetPageImage 1940 -#define wxToolbook_GetPageText 1941 -#define wxToolbook_GetSelection 1942 -#define wxToolbook_HitTest 1944 -#define wxToolbook_InsertPage 1945 -#define wxToolbook_SetImageList 1946 -#define wxToolbook_SetPageSize 1947 -#define wxToolbook_SetPageImage 1948 -#define wxToolbook_SetPageText 1949 -#define wxToolbook_SetSelection 1950 -#define wxToolbook_ChangeSelection 1951 -#define wxToolbook_destroy 1952 -#define wxListbook_new_0 1953 -#define wxListbook_new_3 1954 -#define wxListbook_AddPage 1955 -#define wxListbook_AdvanceSelection 1956 -#define wxListbook_AssignImageList 1957 -#define wxListbook_Create 1958 -#define wxListbook_DeleteAllPages 1959 -#define wxListbook_DeletePage 1960 -#define wxListbook_RemovePage 1961 -#define wxListbook_GetCurrentPage 1962 -#define wxListbook_GetImageList 1963 -#define wxListbook_GetPage 1965 -#define wxListbook_GetPageCount 1966 -#define wxListbook_GetPageImage 1967 -#define wxListbook_GetPageText 1968 -#define wxListbook_GetSelection 1969 -#define wxListbook_HitTest 1971 -#define wxListbook_InsertPage 1972 -#define wxListbook_SetImageList 1973 -#define wxListbook_SetPageSize 1974 -#define wxListbook_SetPageImage 1975 -#define wxListbook_SetPageText 1976 -#define wxListbook_SetSelection 1977 -#define wxListbook_ChangeSelection 1978 -#define wxListbook_destroy 1979 -#define wxTreebook_new_0 1980 -#define wxTreebook_new_3 1981 -#define wxTreebook_AddPage 1982 -#define wxTreebook_AdvanceSelection 1983 -#define wxTreebook_AssignImageList 1984 -#define wxTreebook_Create 1985 -#define wxTreebook_DeleteAllPages 1986 -#define wxTreebook_DeletePage 1987 -#define wxTreebook_RemovePage 1988 -#define wxTreebook_GetCurrentPage 1989 -#define wxTreebook_GetImageList 1990 -#define wxTreebook_GetPage 1992 -#define wxTreebook_GetPageCount 1993 -#define wxTreebook_GetPageImage 1994 -#define wxTreebook_GetPageText 1995 -#define wxTreebook_GetSelection 1996 -#define wxTreebook_ExpandNode 1997 -#define wxTreebook_IsNodeExpanded 1998 -#define wxTreebook_HitTest 2000 -#define wxTreebook_InsertPage 2001 -#define wxTreebook_InsertSubPage 2002 -#define wxTreebook_SetImageList 2003 -#define wxTreebook_SetPageSize 2004 -#define wxTreebook_SetPageImage 2005 -#define wxTreebook_SetPageText 2006 -#define wxTreebook_SetSelection 2007 -#define wxTreebook_ChangeSelection 2008 -#define wxTreebook_destroy 2009 -#define wxTreeCtrl_new_2 2012 -#define wxTreeCtrl_new_0 2013 -#define wxTreeCtrl_destruct 2015 -#define wxTreeCtrl_AddRoot 2016 -#define wxTreeCtrl_AppendItem 2017 -#define wxTreeCtrl_AssignImageList 2018 -#define wxTreeCtrl_AssignStateImageList 2019 -#define wxTreeCtrl_Collapse 2020 -#define wxTreeCtrl_CollapseAndReset 2021 -#define wxTreeCtrl_Create 2022 -#define wxTreeCtrl_Delete 2023 -#define wxTreeCtrl_DeleteAllItems 2024 -#define wxTreeCtrl_DeleteChildren 2025 -#define wxTreeCtrl_EditLabel 2026 -#define wxTreeCtrl_EnsureVisible 2027 -#define wxTreeCtrl_Expand 2028 -#define wxTreeCtrl_GetBoundingRect 2029 -#define wxTreeCtrl_GetChildrenCount 2031 -#define wxTreeCtrl_GetCount 2032 -#define wxTreeCtrl_GetEditControl 2033 -#define wxTreeCtrl_GetFirstChild 2034 -#define wxTreeCtrl_GetNextChild 2035 -#define wxTreeCtrl_GetFirstVisibleItem 2036 -#define wxTreeCtrl_GetImageList 2037 -#define wxTreeCtrl_GetIndent 2038 -#define wxTreeCtrl_GetItemBackgroundColour 2039 -#define wxTreeCtrl_GetItemData 2040 -#define wxTreeCtrl_GetItemFont 2041 -#define wxTreeCtrl_GetItemImage_1 2042 -#define wxTreeCtrl_GetItemImage_2 2043 -#define wxTreeCtrl_GetItemText 2044 -#define wxTreeCtrl_GetItemTextColour 2045 -#define wxTreeCtrl_GetLastChild 2046 -#define wxTreeCtrl_GetNextSibling 2047 -#define wxTreeCtrl_GetNextVisible 2048 -#define wxTreeCtrl_GetItemParent 2049 -#define wxTreeCtrl_GetPrevSibling 2050 -#define wxTreeCtrl_GetPrevVisible 2051 -#define wxTreeCtrl_GetRootItem 2052 -#define wxTreeCtrl_GetSelection 2053 -#define wxTreeCtrl_GetSelections 2054 -#define wxTreeCtrl_GetStateImageList 2055 -#define wxTreeCtrl_HitTest 2056 -#define wxTreeCtrl_InsertItem 2058 -#define wxTreeCtrl_IsBold 2059 -#define wxTreeCtrl_IsExpanded 2060 -#define wxTreeCtrl_IsSelected 2061 -#define wxTreeCtrl_IsVisible 2062 -#define wxTreeCtrl_ItemHasChildren 2063 -#define wxTreeCtrl_IsTreeItemIdOk 2064 -#define wxTreeCtrl_PrependItem 2065 -#define wxTreeCtrl_ScrollTo 2066 -#define wxTreeCtrl_SelectItem_1 2067 -#define wxTreeCtrl_SelectItem_2 2068 -#define wxTreeCtrl_SetIndent 2069 -#define wxTreeCtrl_SetImageList 2070 -#define wxTreeCtrl_SetItemBackgroundColour 2071 -#define wxTreeCtrl_SetItemBold 2072 -#define wxTreeCtrl_SetItemData 2073 -#define wxTreeCtrl_SetItemDropHighlight 2074 -#define wxTreeCtrl_SetItemFont 2075 -#define wxTreeCtrl_SetItemHasChildren 2076 -#define wxTreeCtrl_SetItemImage_2 2077 -#define wxTreeCtrl_SetItemImage_3 2078 -#define wxTreeCtrl_SetItemText 2079 -#define wxTreeCtrl_SetItemTextColour 2080 -#define wxTreeCtrl_SetStateImageList 2081 -#define wxTreeCtrl_SetWindowStyle 2082 -#define wxTreeCtrl_SortChildren 2083 -#define wxTreeCtrl_Toggle 2084 -#define wxTreeCtrl_ToggleItemSelection 2085 -#define wxTreeCtrl_Unselect 2086 -#define wxTreeCtrl_UnselectAll 2087 -#define wxTreeCtrl_UnselectItem 2088 -#define wxScrollBar_new_0 2089 -#define wxScrollBar_new_3 2090 -#define wxScrollBar_destruct 2091 -#define wxScrollBar_Create 2092 -#define wxScrollBar_GetRange 2093 -#define wxScrollBar_GetPageSize 2094 -#define wxScrollBar_GetThumbPosition 2095 -#define wxScrollBar_GetThumbSize 2096 -#define wxScrollBar_SetThumbPosition 2097 -#define wxScrollBar_SetScrollbar 2098 -#define wxSpinButton_new_2 2100 -#define wxSpinButton_new_0 2101 -#define wxSpinButton_Create 2102 -#define wxSpinButton_GetMax 2103 -#define wxSpinButton_GetMin 2104 -#define wxSpinButton_GetValue 2105 -#define wxSpinButton_SetRange 2106 -#define wxSpinButton_SetValue 2107 -#define wxSpinButton_destroy 2108 -#define wxSpinCtrl_new_0 2109 -#define wxSpinCtrl_new_2 2110 -#define wxSpinCtrl_Create 2112 -#define wxSpinCtrl_SetValue_1_1 2115 -#define wxSpinCtrl_SetValue_1_0 2116 -#define wxSpinCtrl_GetValue 2118 -#define wxSpinCtrl_SetRange 2120 -#define wxSpinCtrl_SetSelection 2121 -#define wxSpinCtrl_GetMin 2123 -#define wxSpinCtrl_GetMax 2125 -#define wxSpinCtrl_destroy 2126 -#define wxStaticText_new_0 2127 -#define wxStaticText_new_4 2128 -#define wxStaticText_Create 2129 -#define wxStaticText_GetLabel 2130 -#define wxStaticText_SetLabel 2131 -#define wxStaticText_Wrap 2132 -#define wxStaticText_destroy 2133 -#define wxStaticBitmap_new_0 2134 -#define wxStaticBitmap_new_4 2135 -#define wxStaticBitmap_Create 2136 -#define wxStaticBitmap_GetBitmap 2137 -#define wxStaticBitmap_SetBitmap 2138 -#define wxStaticBitmap_destroy 2139 -#define wxRadioBox_new 2140 -#define wxRadioBox_destruct 2142 -#define wxRadioBox_Create 2143 -#define wxRadioBox_Enable_2 2144 -#define wxRadioBox_Enable_1 2145 -#define wxRadioBox_GetSelection 2146 -#define wxRadioBox_GetString 2147 -#define wxRadioBox_SetSelection 2148 -#define wxRadioBox_Show_2 2149 -#define wxRadioBox_Show_1 2150 -#define wxRadioBox_GetColumnCount 2151 -#define wxRadioBox_GetItemHelpText 2152 -#define wxRadioBox_GetItemToolTip 2153 -#define wxRadioBox_GetItemFromPoint 2155 -#define wxRadioBox_GetRowCount 2156 -#define wxRadioBox_IsItemEnabled 2157 -#define wxRadioBox_IsItemShown 2158 -#define wxRadioBox_SetItemHelpText 2159 -#define wxRadioBox_SetItemToolTip 2160 -#define wxRadioButton_new_0 2161 -#define wxRadioButton_new_4 2162 -#define wxRadioButton_Create 2163 -#define wxRadioButton_GetValue 2164 -#define wxRadioButton_SetValue 2165 -#define wxRadioButton_destroy 2166 -#define wxSlider_new_6 2168 -#define wxSlider_new_0 2169 -#define wxSlider_Create 2170 -#define wxSlider_GetLineSize 2171 -#define wxSlider_GetMax 2172 -#define wxSlider_GetMin 2173 -#define wxSlider_GetPageSize 2174 -#define wxSlider_GetThumbLength 2175 -#define wxSlider_GetValue 2176 -#define wxSlider_SetLineSize 2177 -#define wxSlider_SetPageSize 2178 -#define wxSlider_SetRange 2179 -#define wxSlider_SetThumbLength 2180 -#define wxSlider_SetValue 2181 -#define wxSlider_destroy 2182 -#define wxDialog_new_4 2184 -#define wxDialog_new_0 2185 -#define wxDialog_destruct 2187 -#define wxDialog_Create 2188 -#define wxDialog_CreateButtonSizer 2189 -#define wxDialog_CreateStdDialogButtonSizer 2190 -#define wxDialog_EndModal 2191 -#define wxDialog_GetAffirmativeId 2192 -#define wxDialog_GetReturnCode 2193 -#define wxDialog_IsModal 2194 -#define wxDialog_SetAffirmativeId 2195 -#define wxDialog_SetReturnCode 2196 -#define wxDialog_Show 2197 -#define wxDialog_ShowModal 2198 -#define wxColourDialog_new_0 2199 -#define wxColourDialog_new_2 2200 -#define wxColourDialog_destruct 2201 -#define wxColourDialog_Create 2202 -#define wxColourDialog_GetColourData 2203 -#define wxColourData_new_0 2204 -#define wxColourData_new_1 2205 -#define wxColourData_destruct 2206 -#define wxColourData_GetChooseFull 2207 -#define wxColourData_GetColour 2208 -#define wxColourData_GetCustomColour 2210 -#define wxColourData_SetChooseFull 2211 -#define wxColourData_SetColour 2212 -#define wxColourData_SetCustomColour 2213 -#define wxPalette_new_0 2214 -#define wxPalette_new_4 2215 -#define wxPalette_destruct 2217 -#define wxPalette_Create 2218 -#define wxPalette_GetColoursCount 2219 -#define wxPalette_GetPixel 2220 -#define wxPalette_GetRGB 2221 -#define wxPalette_IsOk 2222 -#define wxDirDialog_new 2226 -#define wxDirDialog_destruct 2227 -#define wxDirDialog_GetPath 2228 -#define wxDirDialog_GetMessage 2229 -#define wxDirDialog_SetMessage 2230 -#define wxDirDialog_SetPath 2231 -#define wxFileDialog_new 2235 -#define wxFileDialog_destruct 2236 -#define wxFileDialog_GetDirectory 2237 -#define wxFileDialog_GetFilename 2238 -#define wxFileDialog_GetFilenames 2239 -#define wxFileDialog_GetFilterIndex 2240 -#define wxFileDialog_GetMessage 2241 -#define wxFileDialog_GetPath 2242 -#define wxFileDialog_GetPaths 2243 -#define wxFileDialog_GetWildcard 2244 -#define wxFileDialog_SetDirectory 2245 -#define wxFileDialog_SetFilename 2246 -#define wxFileDialog_SetFilterIndex 2247 -#define wxFileDialog_SetMessage 2248 -#define wxFileDialog_SetPath 2249 -#define wxFileDialog_SetWildcard 2250 -#define wxPickerBase_SetInternalMargin 2251 -#define wxPickerBase_GetInternalMargin 2252 -#define wxPickerBase_SetTextCtrlProportion 2253 -#define wxPickerBase_SetPickerCtrlProportion 2254 -#define wxPickerBase_GetTextCtrlProportion 2255 -#define wxPickerBase_GetPickerCtrlProportion 2256 -#define wxPickerBase_HasTextCtrl 2257 -#define wxPickerBase_GetTextCtrl 2258 -#define wxPickerBase_IsTextCtrlGrowable 2259 -#define wxPickerBase_SetPickerCtrlGrowable 2260 -#define wxPickerBase_SetTextCtrlGrowable 2261 -#define wxPickerBase_IsPickerCtrlGrowable 2262 -#define wxFilePickerCtrl_new_0 2263 -#define wxFilePickerCtrl_new_3 2264 -#define wxFilePickerCtrl_Create 2265 -#define wxFilePickerCtrl_GetPath 2266 -#define wxFilePickerCtrl_SetPath 2267 -#define wxFilePickerCtrl_destroy 2268 -#define wxDirPickerCtrl_new_0 2269 -#define wxDirPickerCtrl_new_3 2270 -#define wxDirPickerCtrl_Create 2271 -#define wxDirPickerCtrl_GetPath 2272 -#define wxDirPickerCtrl_SetPath 2273 -#define wxDirPickerCtrl_destroy 2274 -#define wxColourPickerCtrl_new_0 2275 -#define wxColourPickerCtrl_new_3 2276 -#define wxColourPickerCtrl_Create 2277 -#define wxColourPickerCtrl_GetColour 2278 -#define wxColourPickerCtrl_SetColour_1_1 2279 -#define wxColourPickerCtrl_SetColour_1_0 2280 -#define wxColourPickerCtrl_destroy 2281 -#define wxDatePickerCtrl_new_0 2282 -#define wxDatePickerCtrl_new_3 2283 -#define wxDatePickerCtrl_GetRange 2284 -#define wxDatePickerCtrl_GetValue 2285 -#define wxDatePickerCtrl_SetRange 2286 -#define wxDatePickerCtrl_SetValue 2287 -#define wxDatePickerCtrl_destroy 2288 -#define wxFontPickerCtrl_new_0 2289 -#define wxFontPickerCtrl_new_3 2290 -#define wxFontPickerCtrl_Create 2291 -#define wxFontPickerCtrl_GetSelectedFont 2292 -#define wxFontPickerCtrl_SetSelectedFont 2293 -#define wxFontPickerCtrl_GetMaxPointSize 2294 -#define wxFontPickerCtrl_SetMaxPointSize 2295 -#define wxFontPickerCtrl_destroy 2296 -#define wxFindReplaceDialog_new_0 2299 -#define wxFindReplaceDialog_new_4 2300 -#define wxFindReplaceDialog_destruct 2301 -#define wxFindReplaceDialog_Create 2302 -#define wxFindReplaceDialog_GetData 2303 -#define wxFindReplaceData_new_0 2304 -#define wxFindReplaceData_new_1 2305 -#define wxFindReplaceData_GetFindString 2306 -#define wxFindReplaceData_GetReplaceString 2307 -#define wxFindReplaceData_GetFlags 2308 -#define wxFindReplaceData_SetFlags 2309 -#define wxFindReplaceData_SetFindString 2310 -#define wxFindReplaceData_SetReplaceString 2311 -#define wxFindReplaceData_destroy 2312 -#define wxMultiChoiceDialog_new_0 2313 -#define wxMultiChoiceDialog_new_5 2315 -#define wxMultiChoiceDialog_GetSelections 2316 -#define wxMultiChoiceDialog_SetSelections 2317 -#define wxMultiChoiceDialog_destroy 2318 -#define wxSingleChoiceDialog_new_0 2319 -#define wxSingleChoiceDialog_new_5 2321 -#define wxSingleChoiceDialog_GetSelection 2322 -#define wxSingleChoiceDialog_GetStringSelection 2323 -#define wxSingleChoiceDialog_SetSelection 2324 -#define wxSingleChoiceDialog_destroy 2325 -#define wxTextEntryDialog_new 2326 -#define wxTextEntryDialog_GetValue 2327 -#define wxTextEntryDialog_SetValue 2328 -#define wxTextEntryDialog_destroy 2329 -#define wxPasswordEntryDialog_new 2330 -#define wxPasswordEntryDialog_destroy 2331 -#define wxFontData_new_0 2332 -#define wxFontData_new_1 2333 -#define wxFontData_destruct 2334 -#define wxFontData_EnableEffects 2335 -#define wxFontData_GetAllowSymbols 2336 -#define wxFontData_GetColour 2337 -#define wxFontData_GetChosenFont 2338 -#define wxFontData_GetEnableEffects 2339 -#define wxFontData_GetInitialFont 2340 -#define wxFontData_GetShowHelp 2341 -#define wxFontData_SetAllowSymbols 2342 -#define wxFontData_SetChosenFont 2343 -#define wxFontData_SetColour 2344 -#define wxFontData_SetInitialFont 2345 -#define wxFontData_SetRange 2346 -#define wxFontData_SetShowHelp 2347 -#define wxFontDialog_new_0 2351 -#define wxFontDialog_new_2 2353 -#define wxFontDialog_Create 2355 -#define wxFontDialog_GetFontData 2356 -#define wxFontDialog_destroy 2358 -#define wxProgressDialog_new 2359 -#define wxProgressDialog_destruct 2360 -#define wxProgressDialog_Resume 2361 -#define wxProgressDialog_Update_2 2362 -#define wxProgressDialog_Update_0 2363 -#define wxMessageDialog_new 2364 -#define wxMessageDialog_destruct 2365 -#define wxPageSetupDialog_new 2366 -#define wxPageSetupDialog_destruct 2367 -#define wxPageSetupDialog_GetPageSetupData 2368 -#define wxPageSetupDialog_ShowModal 2369 -#define wxPageSetupDialogData_new_0 2370 -#define wxPageSetupDialogData_new_1_0 2371 -#define wxPageSetupDialogData_new_1_1 2372 -#define wxPageSetupDialogData_destruct 2373 -#define wxPageSetupDialogData_EnableHelp 2374 -#define wxPageSetupDialogData_EnableMargins 2375 -#define wxPageSetupDialogData_EnableOrientation 2376 -#define wxPageSetupDialogData_EnablePaper 2377 -#define wxPageSetupDialogData_EnablePrinter 2378 -#define wxPageSetupDialogData_GetDefaultMinMargins 2379 -#define wxPageSetupDialogData_GetEnableMargins 2380 -#define wxPageSetupDialogData_GetEnableOrientation 2381 -#define wxPageSetupDialogData_GetEnablePaper 2382 -#define wxPageSetupDialogData_GetEnablePrinter 2383 -#define wxPageSetupDialogData_GetEnableHelp 2384 -#define wxPageSetupDialogData_GetDefaultInfo 2385 -#define wxPageSetupDialogData_GetMarginTopLeft 2386 -#define wxPageSetupDialogData_GetMarginBottomRight 2387 -#define wxPageSetupDialogData_GetMinMarginTopLeft 2388 -#define wxPageSetupDialogData_GetMinMarginBottomRight 2389 -#define wxPageSetupDialogData_GetPaperId 2390 -#define wxPageSetupDialogData_GetPaperSize 2391 -#define wxPageSetupDialogData_GetPrintData 2393 -#define wxPageSetupDialogData_IsOk 2394 -#define wxPageSetupDialogData_SetDefaultInfo 2395 -#define wxPageSetupDialogData_SetDefaultMinMargins 2396 -#define wxPageSetupDialogData_SetMarginTopLeft 2397 -#define wxPageSetupDialogData_SetMarginBottomRight 2398 -#define wxPageSetupDialogData_SetMinMarginTopLeft 2399 -#define wxPageSetupDialogData_SetMinMarginBottomRight 2400 -#define wxPageSetupDialogData_SetPaperId 2401 -#define wxPageSetupDialogData_SetPaperSize_1_1 2402 -#define wxPageSetupDialogData_SetPaperSize_1_0 2403 -#define wxPageSetupDialogData_SetPrintData 2404 -#define wxPrintDialog_new_2_0 2405 -#define wxPrintDialog_new_2_1 2406 -#define wxPrintDialog_destruct 2407 -#define wxPrintDialog_GetPrintDialogData 2408 -#define wxPrintDialog_GetPrintDC 2409 -#define wxPrintDialogData_new_0 2410 -#define wxPrintDialogData_new_1_1 2411 -#define wxPrintDialogData_new_1_0 2412 -#define wxPrintDialogData_destruct 2413 -#define wxPrintDialogData_EnableHelp 2414 -#define wxPrintDialogData_EnablePageNumbers 2415 -#define wxPrintDialogData_EnablePrintToFile 2416 -#define wxPrintDialogData_EnableSelection 2417 -#define wxPrintDialogData_GetAllPages 2418 -#define wxPrintDialogData_GetCollate 2419 -#define wxPrintDialogData_GetFromPage 2420 -#define wxPrintDialogData_GetMaxPage 2421 -#define wxPrintDialogData_GetMinPage 2422 -#define wxPrintDialogData_GetNoCopies 2423 -#define wxPrintDialogData_GetPrintData 2424 -#define wxPrintDialogData_GetPrintToFile 2425 -#define wxPrintDialogData_GetSelection 2426 -#define wxPrintDialogData_GetToPage 2427 -#define wxPrintDialogData_IsOk 2428 -#define wxPrintDialogData_SetCollate 2429 -#define wxPrintDialogData_SetFromPage 2430 -#define wxPrintDialogData_SetMaxPage 2431 -#define wxPrintDialogData_SetMinPage 2432 -#define wxPrintDialogData_SetNoCopies 2433 -#define wxPrintDialogData_SetPrintData 2434 -#define wxPrintDialogData_SetPrintToFile 2435 -#define wxPrintDialogData_SetSelection 2436 -#define wxPrintDialogData_SetToPage 2437 -#define wxPrintData_new_0 2438 -#define wxPrintData_new_1 2439 -#define wxPrintData_destruct 2440 -#define wxPrintData_GetCollate 2441 -#define wxPrintData_GetBin 2442 -#define wxPrintData_GetColour 2443 -#define wxPrintData_GetDuplex 2444 -#define wxPrintData_GetNoCopies 2445 -#define wxPrintData_GetOrientation 2446 -#define wxPrintData_GetPaperId 2447 -#define wxPrintData_GetPrinterName 2448 -#define wxPrintData_GetQuality 2449 -#define wxPrintData_IsOk 2450 -#define wxPrintData_SetBin 2451 -#define wxPrintData_SetCollate 2452 -#define wxPrintData_SetColour 2453 -#define wxPrintData_SetDuplex 2454 -#define wxPrintData_SetNoCopies 2455 -#define wxPrintData_SetOrientation 2456 -#define wxPrintData_SetPaperId 2457 -#define wxPrintData_SetPrinterName 2458 -#define wxPrintData_SetQuality 2459 -#define wxPrintPreview_new_2 2462 -#define wxPrintPreview_new_3 2463 -#define wxPrintPreview_destruct 2465 -#define wxPrintPreview_GetCanvas 2466 -#define wxPrintPreview_GetCurrentPage 2467 -#define wxPrintPreview_GetFrame 2468 -#define wxPrintPreview_GetMaxPage 2469 -#define wxPrintPreview_GetMinPage 2470 -#define wxPrintPreview_GetPrintout 2471 -#define wxPrintPreview_GetPrintoutForPrinting 2472 -#define wxPrintPreview_IsOk 2473 -#define wxPrintPreview_PaintPage 2474 -#define wxPrintPreview_Print 2475 -#define wxPrintPreview_RenderPage 2476 -#define wxPrintPreview_SetCanvas 2477 -#define wxPrintPreview_SetCurrentPage 2478 -#define wxPrintPreview_SetFrame 2479 -#define wxPrintPreview_SetPrintout 2480 -#define wxPrintPreview_SetZoom 2481 -#define wxPreviewFrame_new 2482 -#define wxPreviewFrame_destruct 2483 -#define wxPreviewFrame_CreateControlBar 2484 -#define wxPreviewFrame_CreateCanvas 2485 -#define wxPreviewFrame_Initialize 2486 -#define wxPreviewFrame_OnCloseWindow 2487 -#define wxPreviewControlBar_new 2488 -#define wxPreviewControlBar_destruct 2489 -#define wxPreviewControlBar_CreateButtons 2490 -#define wxPreviewControlBar_GetPrintPreview 2491 -#define wxPreviewControlBar_GetZoomControl 2492 -#define wxPreviewControlBar_SetZoomControl 2493 -#define wxPrinter_new 2495 -#define wxPrinter_CreateAbortWindow 2496 -#define wxPrinter_GetAbort 2497 -#define wxPrinter_GetLastError 2498 -#define wxPrinter_GetPrintDialogData 2499 -#define wxPrinter_Print 2500 -#define wxPrinter_PrintDialog 2501 -#define wxPrinter_ReportError 2502 -#define wxPrinter_Setup 2503 -#define wxPrinter_destroy 2504 -#define wxXmlResource_new_1 2505 -#define wxXmlResource_new_2 2506 -#define wxXmlResource_destruct 2507 -#define wxXmlResource_AttachUnknownControl 2508 -#define wxXmlResource_ClearHandlers 2509 -#define wxXmlResource_CompareVersion 2510 -#define wxXmlResource_Get 2511 -#define wxXmlResource_GetFlags 2512 -#define wxXmlResource_GetVersion 2513 -#define wxXmlResource_GetXRCID 2514 -#define wxXmlResource_InitAllHandlers 2515 -#define wxXmlResource_Load 2516 -#define wxXmlResource_LoadBitmap 2517 -#define wxXmlResource_LoadDialog_2 2518 -#define wxXmlResource_LoadDialog_3 2519 -#define wxXmlResource_LoadFrame_2 2520 -#define wxXmlResource_LoadFrame_3 2521 -#define wxXmlResource_LoadIcon 2522 -#define wxXmlResource_LoadMenu 2523 -#define wxXmlResource_LoadMenuBar_2 2524 -#define wxXmlResource_LoadMenuBar_1 2525 -#define wxXmlResource_LoadPanel_2 2526 -#define wxXmlResource_LoadPanel_3 2527 -#define wxXmlResource_LoadToolBar 2528 -#define wxXmlResource_Set 2529 -#define wxXmlResource_SetFlags 2530 -#define wxXmlResource_Unload 2531 -#define wxXmlResource_xrcctrl 2532 -#define wxHtmlEasyPrinting_new 2533 -#define wxHtmlEasyPrinting_destruct 2534 -#define wxHtmlEasyPrinting_GetPrintData 2535 -#define wxHtmlEasyPrinting_GetPageSetupData 2536 -#define wxHtmlEasyPrinting_PreviewFile 2537 -#define wxHtmlEasyPrinting_PreviewText 2538 -#define wxHtmlEasyPrinting_PrintFile 2539 -#define wxHtmlEasyPrinting_PrintText 2540 -#define wxHtmlEasyPrinting_PageSetup 2541 -#define wxHtmlEasyPrinting_SetFonts 2542 -#define wxHtmlEasyPrinting_SetHeader 2543 -#define wxHtmlEasyPrinting_SetFooter 2544 -#define wxGLCanvas_new_2 2546 -#define wxGLCanvas_new_3_1 2547 -#define wxGLCanvas_new_3_0 2548 -#define wxGLCanvas_GetContext 2549 -#define wxGLCanvas_SetCurrent 2551 -#define wxGLCanvas_SwapBuffers 2552 -#define wxGLCanvas_destroy 2553 -#define wxAuiManager_new 2554 -#define wxAuiManager_destruct 2555 -#define wxAuiManager_AddPane_2_1 2556 -#define wxAuiManager_AddPane_3 2557 -#define wxAuiManager_AddPane_2_0 2558 -#define wxAuiManager_DetachPane 2559 -#define wxAuiManager_GetAllPanes 2560 -#define wxAuiManager_GetArtProvider 2561 -#define wxAuiManager_GetDockSizeConstraint 2562 -#define wxAuiManager_GetFlags 2563 -#define wxAuiManager_GetManagedWindow 2564 -#define wxAuiManager_GetManager 2565 -#define wxAuiManager_GetPane_1_1 2566 -#define wxAuiManager_GetPane_1_0 2567 -#define wxAuiManager_HideHint 2568 -#define wxAuiManager_InsertPane 2569 -#define wxAuiManager_LoadPaneInfo 2570 -#define wxAuiManager_LoadPerspective 2571 -#define wxAuiManager_SavePaneInfo 2572 -#define wxAuiManager_SavePerspective 2573 -#define wxAuiManager_SetArtProvider 2574 -#define wxAuiManager_SetDockSizeConstraint 2575 -#define wxAuiManager_SetFlags 2576 -#define wxAuiManager_SetManagedWindow 2577 -#define wxAuiManager_ShowHint 2578 -#define wxAuiManager_UnInit 2579 -#define wxAuiManager_Update 2580 -#define wxAuiPaneInfo_new_0 2581 -#define wxAuiPaneInfo_new_1 2582 -#define wxAuiPaneInfo_destruct 2583 -#define wxAuiPaneInfo_BestSize_1 2584 -#define wxAuiPaneInfo_BestSize_2 2585 -#define wxAuiPaneInfo_Bottom 2586 -#define wxAuiPaneInfo_BottomDockable 2587 -#define wxAuiPaneInfo_Caption 2588 -#define wxAuiPaneInfo_CaptionVisible 2589 -#define wxAuiPaneInfo_Centre 2590 -#define wxAuiPaneInfo_CentrePane 2591 -#define wxAuiPaneInfo_CloseButton 2592 -#define wxAuiPaneInfo_DefaultPane 2593 -#define wxAuiPaneInfo_DestroyOnClose 2594 -#define wxAuiPaneInfo_Direction 2595 -#define wxAuiPaneInfo_Dock 2596 -#define wxAuiPaneInfo_Dockable 2597 -#define wxAuiPaneInfo_Fixed 2598 -#define wxAuiPaneInfo_Float 2599 -#define wxAuiPaneInfo_Floatable 2600 -#define wxAuiPaneInfo_FloatingPosition_1 2601 -#define wxAuiPaneInfo_FloatingPosition_2 2602 -#define wxAuiPaneInfo_FloatingSize_1 2603 -#define wxAuiPaneInfo_FloatingSize_2 2604 -#define wxAuiPaneInfo_Gripper 2605 -#define wxAuiPaneInfo_GripperTop 2606 -#define wxAuiPaneInfo_HasBorder 2607 -#define wxAuiPaneInfo_HasCaption 2608 -#define wxAuiPaneInfo_HasCloseButton 2609 -#define wxAuiPaneInfo_HasFlag 2610 -#define wxAuiPaneInfo_HasGripper 2611 -#define wxAuiPaneInfo_HasGripperTop 2612 -#define wxAuiPaneInfo_HasMaximizeButton 2613 -#define wxAuiPaneInfo_HasMinimizeButton 2614 -#define wxAuiPaneInfo_HasPinButton 2615 -#define wxAuiPaneInfo_Hide 2616 -#define wxAuiPaneInfo_IsBottomDockable 2617 -#define wxAuiPaneInfo_IsDocked 2618 -#define wxAuiPaneInfo_IsFixed 2619 -#define wxAuiPaneInfo_IsFloatable 2620 -#define wxAuiPaneInfo_IsFloating 2621 -#define wxAuiPaneInfo_IsLeftDockable 2622 -#define wxAuiPaneInfo_IsMovable 2623 -#define wxAuiPaneInfo_IsOk 2624 -#define wxAuiPaneInfo_IsResizable 2625 -#define wxAuiPaneInfo_IsRightDockable 2626 -#define wxAuiPaneInfo_IsShown 2627 -#define wxAuiPaneInfo_IsToolbar 2628 -#define wxAuiPaneInfo_IsTopDockable 2629 -#define wxAuiPaneInfo_Layer 2630 -#define wxAuiPaneInfo_Left 2631 -#define wxAuiPaneInfo_LeftDockable 2632 -#define wxAuiPaneInfo_MaxSize_1 2633 -#define wxAuiPaneInfo_MaxSize_2 2634 -#define wxAuiPaneInfo_MaximizeButton 2635 -#define wxAuiPaneInfo_MinSize_1 2636 -#define wxAuiPaneInfo_MinSize_2 2637 -#define wxAuiPaneInfo_MinimizeButton 2638 -#define wxAuiPaneInfo_Movable 2639 -#define wxAuiPaneInfo_Name 2640 -#define wxAuiPaneInfo_PaneBorder 2641 -#define wxAuiPaneInfo_PinButton 2642 -#define wxAuiPaneInfo_Position 2643 -#define wxAuiPaneInfo_Resizable 2644 -#define wxAuiPaneInfo_Right 2645 -#define wxAuiPaneInfo_RightDockable 2646 -#define wxAuiPaneInfo_Row 2647 -#define wxAuiPaneInfo_SafeSet 2648 -#define wxAuiPaneInfo_SetFlag 2649 -#define wxAuiPaneInfo_Show 2650 -#define wxAuiPaneInfo_ToolbarPane 2651 -#define wxAuiPaneInfo_Top 2652 -#define wxAuiPaneInfo_TopDockable 2653 -#define wxAuiPaneInfo_Window 2654 -#define wxAuiPaneInfo_GetWindow 2655 -#define wxAuiPaneInfo_GetFrame 2656 -#define wxAuiPaneInfo_GetDirection 2657 -#define wxAuiPaneInfo_GetLayer 2658 -#define wxAuiPaneInfo_GetRow 2659 -#define wxAuiPaneInfo_GetPosition 2660 -#define wxAuiPaneInfo_GetFloatingPosition 2661 -#define wxAuiPaneInfo_GetFloatingSize 2662 -#define wxAuiNotebook_new_0 2663 -#define wxAuiNotebook_new_2 2664 -#define wxAuiNotebook_AddPage 2665 -#define wxAuiNotebook_Create 2666 -#define wxAuiNotebook_DeletePage 2667 -#define wxAuiNotebook_GetArtProvider 2668 -#define wxAuiNotebook_GetPage 2669 -#define wxAuiNotebook_GetPageBitmap 2670 -#define wxAuiNotebook_GetPageCount 2671 -#define wxAuiNotebook_GetPageIndex 2672 -#define wxAuiNotebook_GetPageText 2673 -#define wxAuiNotebook_GetSelection 2674 -#define wxAuiNotebook_InsertPage 2675 -#define wxAuiNotebook_RemovePage 2676 -#define wxAuiNotebook_SetArtProvider 2677 -#define wxAuiNotebook_SetFont 2678 -#define wxAuiNotebook_SetPageBitmap 2679 -#define wxAuiNotebook_SetPageText 2680 -#define wxAuiNotebook_SetSelection 2681 -#define wxAuiNotebook_SetTabCtrlHeight 2682 -#define wxAuiNotebook_SetUniformBitmapSize 2683 -#define wxAuiNotebook_destroy 2684 -#define wxAuiTabArt_SetFlags 2685 -#define wxAuiTabArt_SetMeasuringFont 2686 -#define wxAuiTabArt_SetNormalFont 2687 -#define wxAuiTabArt_SetSelectedFont 2688 -#define wxAuiTabArt_SetColour 2689 -#define wxAuiTabArt_SetActiveColour 2690 -#define wxAuiDockArt_GetColour 2691 -#define wxAuiDockArt_GetFont 2692 -#define wxAuiDockArt_GetMetric 2693 -#define wxAuiDockArt_SetColour 2694 -#define wxAuiDockArt_SetFont 2695 -#define wxAuiDockArt_SetMetric 2696 -#define wxAuiSimpleTabArt_new 2697 -#define wxAuiSimpleTabArt_destroy 2698 -#define wxMDIParentFrame_new_0 2699 -#define wxMDIParentFrame_new_4 2700 -#define wxMDIParentFrame_destruct 2701 -#define wxMDIParentFrame_ActivateNext 2702 -#define wxMDIParentFrame_ActivatePrevious 2703 -#define wxMDIParentFrame_ArrangeIcons 2704 -#define wxMDIParentFrame_Cascade 2705 -#define wxMDIParentFrame_Create 2706 -#define wxMDIParentFrame_GetActiveChild 2707 -#define wxMDIParentFrame_GetClientWindow 2708 -#define wxMDIParentFrame_Tile 2709 -#define wxMDIChildFrame_new_0 2710 -#define wxMDIChildFrame_new_4 2711 -#define wxMDIChildFrame_destruct 2712 -#define wxMDIChildFrame_Activate 2713 -#define wxMDIChildFrame_Create 2714 -#define wxMDIChildFrame_Maximize 2715 -#define wxMDIChildFrame_Restore 2716 -#define wxMDIClientWindow_new_0 2717 -#define wxMDIClientWindow_new_2 2718 -#define wxMDIClientWindow_destruct 2719 -#define wxMDIClientWindow_CreateClient 2720 -#define wxLayoutAlgorithm_new 2721 -#define wxLayoutAlgorithm_LayoutFrame 2722 -#define wxLayoutAlgorithm_LayoutMDIFrame 2723 -#define wxLayoutAlgorithm_LayoutWindow 2724 -#define wxLayoutAlgorithm_destroy 2725 -#define wxEvent_GetId 2726 -#define wxEvent_GetSkipped 2727 -#define wxEvent_GetTimestamp 2728 -#define wxEvent_IsCommandEvent 2729 -#define wxEvent_ResumePropagation 2730 -#define wxEvent_ShouldPropagate 2731 -#define wxEvent_Skip 2732 -#define wxEvent_StopPropagation 2733 -#define wxCommandEvent_getClientData 2734 -#define wxCommandEvent_GetExtraLong 2735 -#define wxCommandEvent_GetInt 2736 -#define wxCommandEvent_GetSelection 2737 -#define wxCommandEvent_GetString 2738 -#define wxCommandEvent_IsChecked 2739 -#define wxCommandEvent_IsSelection 2740 -#define wxCommandEvent_SetInt 2741 -#define wxCommandEvent_SetString 2742 -#define wxScrollEvent_GetOrientation 2743 -#define wxScrollEvent_GetPosition 2744 -#define wxScrollWinEvent_GetOrientation 2745 -#define wxScrollWinEvent_GetPosition 2746 -#define wxMouseEvent_AltDown 2747 -#define wxMouseEvent_Button 2748 -#define wxMouseEvent_ButtonDClick 2749 -#define wxMouseEvent_ButtonDown 2750 -#define wxMouseEvent_ButtonUp 2751 -#define wxMouseEvent_CmdDown 2752 -#define wxMouseEvent_ControlDown 2753 -#define wxMouseEvent_Dragging 2754 -#define wxMouseEvent_Entering 2755 -#define wxMouseEvent_GetButton 2756 -#define wxMouseEvent_GetPosition 2759 -#define wxMouseEvent_GetLogicalPosition 2760 -#define wxMouseEvent_GetLinesPerAction 2761 -#define wxMouseEvent_GetWheelRotation 2762 -#define wxMouseEvent_GetWheelDelta 2763 -#define wxMouseEvent_GetX 2764 -#define wxMouseEvent_GetY 2765 -#define wxMouseEvent_IsButton 2766 -#define wxMouseEvent_IsPageScroll 2767 -#define wxMouseEvent_Leaving 2768 -#define wxMouseEvent_LeftDClick 2769 -#define wxMouseEvent_LeftDown 2770 -#define wxMouseEvent_LeftIsDown 2771 -#define wxMouseEvent_LeftUp 2772 -#define wxMouseEvent_MetaDown 2773 -#define wxMouseEvent_MiddleDClick 2774 -#define wxMouseEvent_MiddleDown 2775 -#define wxMouseEvent_MiddleIsDown 2776 -#define wxMouseEvent_MiddleUp 2777 -#define wxMouseEvent_Moving 2778 -#define wxMouseEvent_RightDClick 2779 -#define wxMouseEvent_RightDown 2780 -#define wxMouseEvent_RightIsDown 2781 -#define wxMouseEvent_RightUp 2782 -#define wxMouseEvent_ShiftDown 2783 -#define wxSetCursorEvent_GetCursor 2784 -#define wxSetCursorEvent_GetX 2785 -#define wxSetCursorEvent_GetY 2786 -#define wxSetCursorEvent_HasCursor 2787 -#define wxSetCursorEvent_SetCursor 2788 -#define wxKeyEvent_AltDown 2789 -#define wxKeyEvent_CmdDown 2790 -#define wxKeyEvent_ControlDown 2791 -#define wxKeyEvent_GetKeyCode 2792 -#define wxKeyEvent_GetModifiers 2793 -#define wxKeyEvent_GetPosition 2796 -#define wxKeyEvent_GetRawKeyCode 2797 -#define wxKeyEvent_GetRawKeyFlags 2798 -#define wxKeyEvent_GetUnicodeKey 2799 -#define wxKeyEvent_GetX 2800 -#define wxKeyEvent_GetY 2801 -#define wxKeyEvent_HasModifiers 2802 -#define wxKeyEvent_MetaDown 2803 -#define wxKeyEvent_ShiftDown 2804 -#define wxSizeEvent_GetSize 2805 -#define wxMoveEvent_GetPosition 2806 -#define wxEraseEvent_GetDC 2807 -#define wxFocusEvent_GetWindow 2808 -#define wxChildFocusEvent_GetWindow 2809 -#define wxMenuEvent_GetMenu 2810 -#define wxMenuEvent_GetMenuId 2811 -#define wxMenuEvent_IsPopup 2812 -#define wxCloseEvent_CanVeto 2813 -#define wxCloseEvent_GetLoggingOff 2814 -#define wxCloseEvent_SetCanVeto 2815 -#define wxCloseEvent_SetLoggingOff 2816 -#define wxCloseEvent_Veto 2817 -#define wxShowEvent_SetShow 2818 -#define wxShowEvent_GetShow 2819 -#define wxIconizeEvent_Iconized 2820 -#define wxJoystickEvent_ButtonDown 2821 -#define wxJoystickEvent_ButtonIsDown 2822 -#define wxJoystickEvent_ButtonUp 2823 -#define wxJoystickEvent_GetButtonChange 2824 -#define wxJoystickEvent_GetButtonState 2825 -#define wxJoystickEvent_GetJoystick 2826 -#define wxJoystickEvent_GetPosition 2827 -#define wxJoystickEvent_GetZPosition 2828 -#define wxJoystickEvent_IsButton 2829 -#define wxJoystickEvent_IsMove 2830 -#define wxJoystickEvent_IsZMove 2831 -#define wxUpdateUIEvent_CanUpdate 2832 -#define wxUpdateUIEvent_Check 2833 -#define wxUpdateUIEvent_Enable 2834 -#define wxUpdateUIEvent_Show 2835 -#define wxUpdateUIEvent_GetChecked 2836 -#define wxUpdateUIEvent_GetEnabled 2837 -#define wxUpdateUIEvent_GetShown 2838 -#define wxUpdateUIEvent_GetSetChecked 2839 -#define wxUpdateUIEvent_GetSetEnabled 2840 -#define wxUpdateUIEvent_GetSetShown 2841 -#define wxUpdateUIEvent_GetSetText 2842 -#define wxUpdateUIEvent_GetText 2843 -#define wxUpdateUIEvent_GetMode 2844 -#define wxUpdateUIEvent_GetUpdateInterval 2845 -#define wxUpdateUIEvent_ResetUpdateTime 2846 -#define wxUpdateUIEvent_SetMode 2847 -#define wxUpdateUIEvent_SetText 2848 -#define wxUpdateUIEvent_SetUpdateInterval 2849 -#define wxMouseCaptureChangedEvent_GetCapturedWindow 2850 -#define wxPaletteChangedEvent_SetChangedWindow 2851 -#define wxPaletteChangedEvent_GetChangedWindow 2852 -#define wxQueryNewPaletteEvent_SetPaletteRealized 2853 -#define wxQueryNewPaletteEvent_GetPaletteRealized 2854 -#define wxNavigationKeyEvent_GetDirection 2855 -#define wxNavigationKeyEvent_SetDirection 2856 -#define wxNavigationKeyEvent_IsWindowChange 2857 -#define wxNavigationKeyEvent_SetWindowChange 2858 -#define wxNavigationKeyEvent_IsFromTab 2859 -#define wxNavigationKeyEvent_SetFromTab 2860 -#define wxNavigationKeyEvent_GetCurrentFocus 2861 -#define wxNavigationKeyEvent_SetCurrentFocus 2862 -#define wxHelpEvent_GetOrigin 2863 -#define wxHelpEvent_GetPosition 2864 -#define wxHelpEvent_SetOrigin 2865 -#define wxHelpEvent_SetPosition 2866 -#define wxContextMenuEvent_GetPosition 2867 -#define wxContextMenuEvent_SetPosition 2868 -#define wxIdleEvent_CanSend 2869 -#define wxIdleEvent_GetMode 2870 -#define wxIdleEvent_RequestMore 2871 -#define wxIdleEvent_MoreRequested 2872 -#define wxIdleEvent_SetMode 2873 -#define wxGridEvent_AltDown 2874 -#define wxGridEvent_ControlDown 2875 -#define wxGridEvent_GetCol 2876 -#define wxGridEvent_GetPosition 2877 -#define wxGridEvent_GetRow 2878 -#define wxGridEvent_MetaDown 2879 -#define wxGridEvent_Selecting 2880 -#define wxGridEvent_ShiftDown 2881 -#define wxNotifyEvent_Allow 2882 -#define wxNotifyEvent_IsAllowed 2883 -#define wxNotifyEvent_Veto 2884 -#define wxSashEvent_GetEdge 2885 -#define wxSashEvent_GetDragRect 2886 -#define wxSashEvent_GetDragStatus 2887 -#define wxListEvent_GetCacheFrom 2888 -#define wxListEvent_GetCacheTo 2889 -#define wxListEvent_GetKeyCode 2890 -#define wxListEvent_GetIndex 2891 -#define wxListEvent_GetColumn 2892 -#define wxListEvent_GetPoint 2893 -#define wxListEvent_GetLabel 2894 -#define wxListEvent_GetText 2895 -#define wxListEvent_GetImage 2896 -#define wxListEvent_GetData 2897 -#define wxListEvent_GetMask 2898 -#define wxListEvent_GetItem 2899 -#define wxListEvent_IsEditCancelled 2900 -#define wxDateEvent_GetDate 2901 -#define wxCalendarEvent_GetWeekDay 2902 -#define wxFileDirPickerEvent_GetPath 2903 -#define wxColourPickerEvent_GetColour 2904 -#define wxFontPickerEvent_GetFont 2905 -#define wxStyledTextEvent_GetPosition 2906 -#define wxStyledTextEvent_GetKey 2907 -#define wxStyledTextEvent_GetModifiers 2908 -#define wxStyledTextEvent_GetModificationType 2909 -#define wxStyledTextEvent_GetText 2910 -#define wxStyledTextEvent_GetLength 2911 -#define wxStyledTextEvent_GetLinesAdded 2912 -#define wxStyledTextEvent_GetLine 2913 -#define wxStyledTextEvent_GetFoldLevelNow 2914 -#define wxStyledTextEvent_GetFoldLevelPrev 2915 -#define wxStyledTextEvent_GetMargin 2916 -#define wxStyledTextEvent_GetMessage 2917 -#define wxStyledTextEvent_GetWParam 2918 -#define wxStyledTextEvent_GetLParam 2919 -#define wxStyledTextEvent_GetListType 2920 -#define wxStyledTextEvent_GetX 2921 -#define wxStyledTextEvent_GetY 2922 -#define wxStyledTextEvent_GetDragText 2923 -#define wxStyledTextEvent_GetDragAllowMove 2924 -#define wxStyledTextEvent_GetDragResult 2925 -#define wxStyledTextEvent_GetShift 2926 -#define wxStyledTextEvent_GetControl 2927 -#define wxStyledTextEvent_GetAlt 2928 -#define utils_wxGetKeyState 2929 -#define utils_wxGetMousePosition 2930 -#define utils_wxGetMouseState 2931 -#define utils_wxSetDetectableAutoRepeat 2932 -#define utils_wxBell 2933 -#define utils_wxFindMenuItemId 2934 -#define utils_wxGenericFindWindowAtPoint 2935 -#define utils_wxFindWindowAtPoint 2936 -#define utils_wxBeginBusyCursor 2937 -#define utils_wxEndBusyCursor 2938 -#define utils_wxIsBusy 2939 -#define utils_wxShutdown 2940 -#define utils_wxShell 2941 -#define utils_wxLaunchDefaultBrowser 2942 -#define utils_wxGetEmailAddress 2943 -#define utils_wxGetUserId 2944 -#define utils_wxGetHomeDir 2945 -#define utils_wxNewId 2946 -#define utils_wxRegisterId 2947 -#define utils_wxGetCurrentId 2948 -#define utils_wxGetOsDescription 2949 -#define utils_wxIsPlatformLittleEndian 2950 -#define utils_wxIsPlatform64Bit 2951 -#define gdicmn_wxDisplaySize 2952 -#define gdicmn_wxSetCursor 2953 -#define wxPrintout_new 2954 -#define wxPrintout_destruct 2955 -#define wxPrintout_GetDC 2956 -#define wxPrintout_GetPageSizeMM 2957 -#define wxPrintout_GetPageSizePixels 2958 -#define wxPrintout_GetPaperRectPixels 2959 -#define wxPrintout_GetPPIPrinter 2960 -#define wxPrintout_GetPPIScreen 2961 -#define wxPrintout_GetTitle 2962 -#define wxPrintout_IsPreview 2963 -#define wxPrintout_FitThisSizeToPaper 2964 -#define wxPrintout_FitThisSizeToPage 2965 -#define wxPrintout_FitThisSizeToPageMargins 2966 -#define wxPrintout_MapScreenSizeToPaper 2967 -#define wxPrintout_MapScreenSizeToPage 2968 -#define wxPrintout_MapScreenSizeToPageMargins 2969 -#define wxPrintout_MapScreenSizeToDevice 2970 -#define wxPrintout_GetLogicalPaperRect 2971 -#define wxPrintout_GetLogicalPageRect 2972 -#define wxPrintout_GetLogicalPageMarginsRect 2973 -#define wxPrintout_SetLogicalOrigin 2974 -#define wxPrintout_OffsetLogicalOrigin 2975 -#define wxStyledTextCtrl_new_2 2976 -#define wxStyledTextCtrl_new_0 2977 -#define wxStyledTextCtrl_destruct 2978 -#define wxStyledTextCtrl_Create 2979 -#define wxStyledTextCtrl_AddText 2980 -#define wxStyledTextCtrl_AddStyledText 2981 -#define wxStyledTextCtrl_InsertText 2982 -#define wxStyledTextCtrl_ClearAll 2983 -#define wxStyledTextCtrl_ClearDocumentStyle 2984 -#define wxStyledTextCtrl_GetLength 2985 -#define wxStyledTextCtrl_GetCharAt 2986 -#define wxStyledTextCtrl_GetCurrentPos 2987 -#define wxStyledTextCtrl_GetAnchor 2988 -#define wxStyledTextCtrl_GetStyleAt 2989 -#define wxStyledTextCtrl_Redo 2990 -#define wxStyledTextCtrl_SetUndoCollection 2991 -#define wxStyledTextCtrl_SelectAll 2992 -#define wxStyledTextCtrl_SetSavePoint 2993 -#define wxStyledTextCtrl_GetStyledText 2994 -#define wxStyledTextCtrl_CanRedo 2995 -#define wxStyledTextCtrl_MarkerLineFromHandle 2996 -#define wxStyledTextCtrl_MarkerDeleteHandle 2997 -#define wxStyledTextCtrl_GetUndoCollection 2998 -#define wxStyledTextCtrl_GetViewWhiteSpace 2999 -#define wxStyledTextCtrl_SetViewWhiteSpace 3000 -#define wxStyledTextCtrl_PositionFromPoint 3001 -#define wxStyledTextCtrl_PositionFromPointClose 3002 -#define wxStyledTextCtrl_GotoLine 3003 -#define wxStyledTextCtrl_GotoPos 3004 -#define wxStyledTextCtrl_SetAnchor 3005 -#define wxStyledTextCtrl_GetCurLine 3006 -#define wxStyledTextCtrl_GetEndStyled 3007 -#define wxStyledTextCtrl_ConvertEOLs 3008 -#define wxStyledTextCtrl_GetEOLMode 3009 -#define wxStyledTextCtrl_SetEOLMode 3010 -#define wxStyledTextCtrl_StartStyling 3011 -#define wxStyledTextCtrl_SetStyling 3012 -#define wxStyledTextCtrl_GetBufferedDraw 3013 -#define wxStyledTextCtrl_SetBufferedDraw 3014 -#define wxStyledTextCtrl_SetTabWidth 3015 -#define wxStyledTextCtrl_GetTabWidth 3016 -#define wxStyledTextCtrl_SetCodePage 3017 -#define wxStyledTextCtrl_MarkerDefine 3018 -#define wxStyledTextCtrl_MarkerSetForeground 3019 -#define wxStyledTextCtrl_MarkerSetBackground 3020 -#define wxStyledTextCtrl_MarkerAdd 3021 -#define wxStyledTextCtrl_MarkerDelete 3022 -#define wxStyledTextCtrl_MarkerDeleteAll 3023 -#define wxStyledTextCtrl_MarkerGet 3024 -#define wxStyledTextCtrl_MarkerNext 3025 -#define wxStyledTextCtrl_MarkerPrevious 3026 -#define wxStyledTextCtrl_MarkerDefineBitmap 3027 -#define wxStyledTextCtrl_MarkerAddSet 3028 -#define wxStyledTextCtrl_MarkerSetAlpha 3029 -#define wxStyledTextCtrl_SetMarginType 3030 -#define wxStyledTextCtrl_GetMarginType 3031 -#define wxStyledTextCtrl_SetMarginWidth 3032 -#define wxStyledTextCtrl_GetMarginWidth 3033 -#define wxStyledTextCtrl_SetMarginMask 3034 -#define wxStyledTextCtrl_GetMarginMask 3035 -#define wxStyledTextCtrl_SetMarginSensitive 3036 -#define wxStyledTextCtrl_GetMarginSensitive 3037 -#define wxStyledTextCtrl_StyleClearAll 3038 -#define wxStyledTextCtrl_StyleSetForeground 3039 -#define wxStyledTextCtrl_StyleSetBackground 3040 -#define wxStyledTextCtrl_StyleSetBold 3041 -#define wxStyledTextCtrl_StyleSetItalic 3042 -#define wxStyledTextCtrl_StyleSetSize 3043 -#define wxStyledTextCtrl_StyleSetFaceName 3044 -#define wxStyledTextCtrl_StyleSetEOLFilled 3045 -#define wxStyledTextCtrl_StyleResetDefault 3046 -#define wxStyledTextCtrl_StyleSetUnderline 3047 -#define wxStyledTextCtrl_StyleSetCase 3048 -#define wxStyledTextCtrl_StyleSetHotSpot 3049 -#define wxStyledTextCtrl_SetSelForeground 3050 -#define wxStyledTextCtrl_SetSelBackground 3051 -#define wxStyledTextCtrl_GetSelAlpha 3052 -#define wxStyledTextCtrl_SetSelAlpha 3053 -#define wxStyledTextCtrl_SetCaretForeground 3054 -#define wxStyledTextCtrl_CmdKeyAssign 3055 -#define wxStyledTextCtrl_CmdKeyClear 3056 -#define wxStyledTextCtrl_CmdKeyClearAll 3057 -#define wxStyledTextCtrl_SetStyleBytes 3058 -#define wxStyledTextCtrl_StyleSetVisible 3059 -#define wxStyledTextCtrl_GetCaretPeriod 3060 -#define wxStyledTextCtrl_SetCaretPeriod 3061 -#define wxStyledTextCtrl_SetWordChars 3062 -#define wxStyledTextCtrl_BeginUndoAction 3063 -#define wxStyledTextCtrl_EndUndoAction 3064 -#define wxStyledTextCtrl_IndicatorSetStyle 3065 -#define wxStyledTextCtrl_IndicatorGetStyle 3066 -#define wxStyledTextCtrl_IndicatorSetForeground 3067 -#define wxStyledTextCtrl_IndicatorGetForeground 3068 -#define wxStyledTextCtrl_SetWhitespaceForeground 3069 -#define wxStyledTextCtrl_SetWhitespaceBackground 3070 -#define wxStyledTextCtrl_GetStyleBits 3071 -#define wxStyledTextCtrl_SetLineState 3072 -#define wxStyledTextCtrl_GetLineState 3073 -#define wxStyledTextCtrl_GetMaxLineState 3074 -#define wxStyledTextCtrl_GetCaretLineVisible 3075 -#define wxStyledTextCtrl_SetCaretLineVisible 3076 -#define wxStyledTextCtrl_GetCaretLineBackground 3077 -#define wxStyledTextCtrl_SetCaretLineBackground 3078 -#define wxStyledTextCtrl_AutoCompShow 3079 -#define wxStyledTextCtrl_AutoCompCancel 3080 -#define wxStyledTextCtrl_AutoCompActive 3081 -#define wxStyledTextCtrl_AutoCompPosStart 3082 -#define wxStyledTextCtrl_AutoCompComplete 3083 -#define wxStyledTextCtrl_AutoCompStops 3084 -#define wxStyledTextCtrl_AutoCompSetSeparator 3085 -#define wxStyledTextCtrl_AutoCompGetSeparator 3086 -#define wxStyledTextCtrl_AutoCompSelect 3087 -#define wxStyledTextCtrl_AutoCompSetCancelAtStart 3088 -#define wxStyledTextCtrl_AutoCompGetCancelAtStart 3089 -#define wxStyledTextCtrl_AutoCompSetFillUps 3090 -#define wxStyledTextCtrl_AutoCompSetChooseSingle 3091 -#define wxStyledTextCtrl_AutoCompGetChooseSingle 3092 -#define wxStyledTextCtrl_AutoCompSetIgnoreCase 3093 -#define wxStyledTextCtrl_AutoCompGetIgnoreCase 3094 -#define wxStyledTextCtrl_UserListShow 3095 -#define wxStyledTextCtrl_AutoCompSetAutoHide 3096 -#define wxStyledTextCtrl_AutoCompGetAutoHide 3097 -#define wxStyledTextCtrl_AutoCompSetDropRestOfWord 3098 -#define wxStyledTextCtrl_AutoCompGetDropRestOfWord 3099 -#define wxStyledTextCtrl_RegisterImage 3100 -#define wxStyledTextCtrl_ClearRegisteredImages 3101 -#define wxStyledTextCtrl_AutoCompGetTypeSeparator 3102 -#define wxStyledTextCtrl_AutoCompSetTypeSeparator 3103 -#define wxStyledTextCtrl_AutoCompSetMaxWidth 3104 -#define wxStyledTextCtrl_AutoCompGetMaxWidth 3105 -#define wxStyledTextCtrl_AutoCompSetMaxHeight 3106 -#define wxStyledTextCtrl_AutoCompGetMaxHeight 3107 -#define wxStyledTextCtrl_SetIndent 3108 -#define wxStyledTextCtrl_GetIndent 3109 -#define wxStyledTextCtrl_SetUseTabs 3110 -#define wxStyledTextCtrl_GetUseTabs 3111 -#define wxStyledTextCtrl_SetLineIndentation 3112 -#define wxStyledTextCtrl_GetLineIndentation 3113 -#define wxStyledTextCtrl_GetLineIndentPosition 3114 -#define wxStyledTextCtrl_GetColumn 3115 -#define wxStyledTextCtrl_SetUseHorizontalScrollBar 3116 -#define wxStyledTextCtrl_GetUseHorizontalScrollBar 3117 -#define wxStyledTextCtrl_SetIndentationGuides 3118 -#define wxStyledTextCtrl_GetIndentationGuides 3119 -#define wxStyledTextCtrl_SetHighlightGuide 3120 -#define wxStyledTextCtrl_GetHighlightGuide 3121 -#define wxStyledTextCtrl_GetLineEndPosition 3122 -#define wxStyledTextCtrl_GetCodePage 3123 -#define wxStyledTextCtrl_GetCaretForeground 3124 -#define wxStyledTextCtrl_GetReadOnly 3125 -#define wxStyledTextCtrl_SetCurrentPos 3126 -#define wxStyledTextCtrl_SetSelectionStart 3127 -#define wxStyledTextCtrl_GetSelectionStart 3128 -#define wxStyledTextCtrl_SetSelectionEnd 3129 -#define wxStyledTextCtrl_GetSelectionEnd 3130 -#define wxStyledTextCtrl_SetPrintMagnification 3131 -#define wxStyledTextCtrl_GetPrintMagnification 3132 -#define wxStyledTextCtrl_SetPrintColourMode 3133 -#define wxStyledTextCtrl_GetPrintColourMode 3134 -#define wxStyledTextCtrl_FindText 3135 -#define wxStyledTextCtrl_FormatRange 3136 -#define wxStyledTextCtrl_GetFirstVisibleLine 3137 -#define wxStyledTextCtrl_GetLine 3138 -#define wxStyledTextCtrl_GetLineCount 3139 -#define wxStyledTextCtrl_SetMarginLeft 3140 -#define wxStyledTextCtrl_GetMarginLeft 3141 -#define wxStyledTextCtrl_SetMarginRight 3142 -#define wxStyledTextCtrl_GetMarginRight 3143 -#define wxStyledTextCtrl_GetModify 3144 -#define wxStyledTextCtrl_SetSelection 3145 -#define wxStyledTextCtrl_GetSelectedText 3146 -#define wxStyledTextCtrl_GetTextRange 3147 -#define wxStyledTextCtrl_HideSelection 3148 -#define wxStyledTextCtrl_LineFromPosition 3149 -#define wxStyledTextCtrl_PositionFromLine 3150 -#define wxStyledTextCtrl_LineScroll 3151 -#define wxStyledTextCtrl_EnsureCaretVisible 3152 -#define wxStyledTextCtrl_ReplaceSelection 3153 -#define wxStyledTextCtrl_SetReadOnly 3154 -#define wxStyledTextCtrl_CanPaste 3155 -#define wxStyledTextCtrl_CanUndo 3156 -#define wxStyledTextCtrl_EmptyUndoBuffer 3157 -#define wxStyledTextCtrl_Undo 3158 -#define wxStyledTextCtrl_Cut 3159 -#define wxStyledTextCtrl_Copy 3160 -#define wxStyledTextCtrl_Paste 3161 -#define wxStyledTextCtrl_Clear 3162 -#define wxStyledTextCtrl_SetText 3163 -#define wxStyledTextCtrl_GetText 3164 -#define wxStyledTextCtrl_GetTextLength 3165 -#define wxStyledTextCtrl_GetOvertype 3166 -#define wxStyledTextCtrl_SetCaretWidth 3167 -#define wxStyledTextCtrl_GetCaretWidth 3168 -#define wxStyledTextCtrl_SetTargetStart 3169 -#define wxStyledTextCtrl_GetTargetStart 3170 -#define wxStyledTextCtrl_SetTargetEnd 3171 -#define wxStyledTextCtrl_GetTargetEnd 3172 -#define wxStyledTextCtrl_ReplaceTarget 3173 -#define wxStyledTextCtrl_SearchInTarget 3174 -#define wxStyledTextCtrl_SetSearchFlags 3175 -#define wxStyledTextCtrl_GetSearchFlags 3176 -#define wxStyledTextCtrl_CallTipShow 3177 -#define wxStyledTextCtrl_CallTipCancel 3178 -#define wxStyledTextCtrl_CallTipActive 3179 -#define wxStyledTextCtrl_CallTipPosAtStart 3180 -#define wxStyledTextCtrl_CallTipSetHighlight 3181 -#define wxStyledTextCtrl_CallTipSetBackground 3182 -#define wxStyledTextCtrl_CallTipSetForeground 3183 -#define wxStyledTextCtrl_CallTipSetForegroundHighlight 3184 -#define wxStyledTextCtrl_CallTipUseStyle 3185 -#define wxStyledTextCtrl_VisibleFromDocLine 3186 -#define wxStyledTextCtrl_DocLineFromVisible 3187 -#define wxStyledTextCtrl_WrapCount 3188 -#define wxStyledTextCtrl_SetFoldLevel 3189 -#define wxStyledTextCtrl_GetFoldLevel 3190 -#define wxStyledTextCtrl_GetLastChild 3191 -#define wxStyledTextCtrl_GetFoldParent 3192 -#define wxStyledTextCtrl_ShowLines 3193 -#define wxStyledTextCtrl_HideLines 3194 -#define wxStyledTextCtrl_GetLineVisible 3195 -#define wxStyledTextCtrl_SetFoldExpanded 3196 -#define wxStyledTextCtrl_GetFoldExpanded 3197 -#define wxStyledTextCtrl_ToggleFold 3198 -#define wxStyledTextCtrl_EnsureVisible 3199 -#define wxStyledTextCtrl_SetFoldFlags 3200 -#define wxStyledTextCtrl_EnsureVisibleEnforcePolicy 3201 -#define wxStyledTextCtrl_SetTabIndents 3202 -#define wxStyledTextCtrl_GetTabIndents 3203 -#define wxStyledTextCtrl_SetBackSpaceUnIndents 3204 -#define wxStyledTextCtrl_GetBackSpaceUnIndents 3205 -#define wxStyledTextCtrl_SetMouseDwellTime 3206 -#define wxStyledTextCtrl_GetMouseDwellTime 3207 -#define wxStyledTextCtrl_WordStartPosition 3208 -#define wxStyledTextCtrl_WordEndPosition 3209 -#define wxStyledTextCtrl_SetWrapMode 3210 -#define wxStyledTextCtrl_GetWrapMode 3211 -#define wxStyledTextCtrl_SetWrapVisualFlags 3212 -#define wxStyledTextCtrl_GetWrapVisualFlags 3213 -#define wxStyledTextCtrl_SetWrapVisualFlagsLocation 3214 -#define wxStyledTextCtrl_GetWrapVisualFlagsLocation 3215 -#define wxStyledTextCtrl_SetWrapStartIndent 3216 -#define wxStyledTextCtrl_GetWrapStartIndent 3217 -#define wxStyledTextCtrl_SetLayoutCache 3218 -#define wxStyledTextCtrl_GetLayoutCache 3219 -#define wxStyledTextCtrl_SetScrollWidth 3220 -#define wxStyledTextCtrl_GetScrollWidth 3221 -#define wxStyledTextCtrl_TextWidth 3222 -#define wxStyledTextCtrl_GetEndAtLastLine 3223 -#define wxStyledTextCtrl_TextHeight 3224 -#define wxStyledTextCtrl_SetUseVerticalScrollBar 3225 -#define wxStyledTextCtrl_GetUseVerticalScrollBar 3226 -#define wxStyledTextCtrl_AppendText 3227 -#define wxStyledTextCtrl_GetTwoPhaseDraw 3228 -#define wxStyledTextCtrl_SetTwoPhaseDraw 3229 -#define wxStyledTextCtrl_TargetFromSelection 3230 -#define wxStyledTextCtrl_LinesJoin 3231 -#define wxStyledTextCtrl_LinesSplit 3232 -#define wxStyledTextCtrl_SetFoldMarginColour 3233 -#define wxStyledTextCtrl_SetFoldMarginHiColour 3234 -#define wxStyledTextCtrl_LineDown 3235 -#define wxStyledTextCtrl_LineDownExtend 3236 -#define wxStyledTextCtrl_LineUp 3237 -#define wxStyledTextCtrl_LineUpExtend 3238 -#define wxStyledTextCtrl_CharLeft 3239 -#define wxStyledTextCtrl_CharLeftExtend 3240 -#define wxStyledTextCtrl_CharRight 3241 -#define wxStyledTextCtrl_CharRightExtend 3242 -#define wxStyledTextCtrl_WordLeft 3243 -#define wxStyledTextCtrl_WordLeftExtend 3244 -#define wxStyledTextCtrl_WordRight 3245 -#define wxStyledTextCtrl_WordRightExtend 3246 -#define wxStyledTextCtrl_Home 3247 -#define wxStyledTextCtrl_HomeExtend 3248 -#define wxStyledTextCtrl_LineEnd 3249 -#define wxStyledTextCtrl_LineEndExtend 3250 -#define wxStyledTextCtrl_DocumentStart 3251 -#define wxStyledTextCtrl_DocumentStartExtend 3252 -#define wxStyledTextCtrl_DocumentEnd 3253 -#define wxStyledTextCtrl_DocumentEndExtend 3254 -#define wxStyledTextCtrl_PageUp 3255 -#define wxStyledTextCtrl_PageUpExtend 3256 -#define wxStyledTextCtrl_PageDown 3257 -#define wxStyledTextCtrl_PageDownExtend 3258 -#define wxStyledTextCtrl_EditToggleOvertype 3259 -#define wxStyledTextCtrl_Cancel 3260 -#define wxStyledTextCtrl_DeleteBack 3261 -#define wxStyledTextCtrl_Tab 3262 -#define wxStyledTextCtrl_BackTab 3263 -#define wxStyledTextCtrl_NewLine 3264 -#define wxStyledTextCtrl_FormFeed 3265 -#define wxStyledTextCtrl_VCHome 3266 -#define wxStyledTextCtrl_VCHomeExtend 3267 -#define wxStyledTextCtrl_ZoomIn 3268 -#define wxStyledTextCtrl_ZoomOut 3269 -#define wxStyledTextCtrl_DelWordLeft 3270 -#define wxStyledTextCtrl_DelWordRight 3271 -#define wxStyledTextCtrl_LineCut 3272 -#define wxStyledTextCtrl_LineDelete 3273 -#define wxStyledTextCtrl_LineTranspose 3274 -#define wxStyledTextCtrl_LineDuplicate 3275 -#define wxStyledTextCtrl_LowerCase 3276 -#define wxStyledTextCtrl_UpperCase 3277 -#define wxStyledTextCtrl_LineScrollDown 3278 -#define wxStyledTextCtrl_LineScrollUp 3279 -#define wxStyledTextCtrl_DeleteBackNotLine 3280 -#define wxStyledTextCtrl_HomeDisplay 3281 -#define wxStyledTextCtrl_HomeDisplayExtend 3282 -#define wxStyledTextCtrl_LineEndDisplay 3283 -#define wxStyledTextCtrl_LineEndDisplayExtend 3284 -#define wxStyledTextCtrl_HomeWrapExtend 3285 -#define wxStyledTextCtrl_LineEndWrap 3286 -#define wxStyledTextCtrl_LineEndWrapExtend 3287 -#define wxStyledTextCtrl_VCHomeWrap 3288 -#define wxStyledTextCtrl_VCHomeWrapExtend 3289 -#define wxStyledTextCtrl_LineCopy 3290 -#define wxStyledTextCtrl_MoveCaretInsideView 3291 -#define wxStyledTextCtrl_LineLength 3292 -#define wxStyledTextCtrl_BraceHighlight 3293 -#define wxStyledTextCtrl_BraceBadLight 3294 -#define wxStyledTextCtrl_BraceMatch 3295 -#define wxStyledTextCtrl_GetViewEOL 3296 -#define wxStyledTextCtrl_SetViewEOL 3297 -#define wxStyledTextCtrl_SetModEventMask 3298 -#define wxStyledTextCtrl_GetEdgeColumn 3299 -#define wxStyledTextCtrl_SetEdgeColumn 3300 -#define wxStyledTextCtrl_SetEdgeMode 3301 -#define wxStyledTextCtrl_GetEdgeMode 3302 -#define wxStyledTextCtrl_GetEdgeColour 3303 -#define wxStyledTextCtrl_SetEdgeColour 3304 -#define wxStyledTextCtrl_SearchAnchor 3305 -#define wxStyledTextCtrl_SearchNext 3306 -#define wxStyledTextCtrl_SearchPrev 3307 -#define wxStyledTextCtrl_LinesOnScreen 3308 -#define wxStyledTextCtrl_UsePopUp 3309 -#define wxStyledTextCtrl_SelectionIsRectangle 3310 -#define wxStyledTextCtrl_SetZoom 3311 -#define wxStyledTextCtrl_GetZoom 3312 -#define wxStyledTextCtrl_GetModEventMask 3313 -#define wxStyledTextCtrl_SetSTCFocus 3314 -#define wxStyledTextCtrl_GetSTCFocus 3315 -#define wxStyledTextCtrl_SetStatus 3316 -#define wxStyledTextCtrl_GetStatus 3317 -#define wxStyledTextCtrl_SetMouseDownCaptures 3318 -#define wxStyledTextCtrl_GetMouseDownCaptures 3319 -#define wxStyledTextCtrl_SetSTCCursor 3320 -#define wxStyledTextCtrl_GetSTCCursor 3321 -#define wxStyledTextCtrl_SetControlCharSymbol 3322 -#define wxStyledTextCtrl_GetControlCharSymbol 3323 -#define wxStyledTextCtrl_WordPartLeft 3324 -#define wxStyledTextCtrl_WordPartLeftExtend 3325 -#define wxStyledTextCtrl_WordPartRight 3326 -#define wxStyledTextCtrl_WordPartRightExtend 3327 -#define wxStyledTextCtrl_SetVisiblePolicy 3328 -#define wxStyledTextCtrl_DelLineLeft 3329 -#define wxStyledTextCtrl_DelLineRight 3330 -#define wxStyledTextCtrl_GetXOffset 3331 -#define wxStyledTextCtrl_ChooseCaretX 3332 -#define wxStyledTextCtrl_SetXCaretPolicy 3333 -#define wxStyledTextCtrl_SetYCaretPolicy 3334 -#define wxStyledTextCtrl_GetPrintWrapMode 3335 -#define wxStyledTextCtrl_SetHotspotActiveForeground 3336 -#define wxStyledTextCtrl_SetHotspotActiveBackground 3337 -#define wxStyledTextCtrl_SetHotspotActiveUnderline 3338 -#define wxStyledTextCtrl_SetHotspotSingleLine 3339 -#define wxStyledTextCtrl_ParaDownExtend 3340 -#define wxStyledTextCtrl_ParaUp 3341 -#define wxStyledTextCtrl_ParaUpExtend 3342 -#define wxStyledTextCtrl_PositionBefore 3343 -#define wxStyledTextCtrl_PositionAfter 3344 -#define wxStyledTextCtrl_CopyRange 3345 -#define wxStyledTextCtrl_CopyText 3346 -#define wxStyledTextCtrl_SetSelectionMode 3347 -#define wxStyledTextCtrl_GetSelectionMode 3348 -#define wxStyledTextCtrl_LineDownRectExtend 3349 -#define wxStyledTextCtrl_LineUpRectExtend 3350 -#define wxStyledTextCtrl_CharLeftRectExtend 3351 -#define wxStyledTextCtrl_CharRightRectExtend 3352 -#define wxStyledTextCtrl_HomeRectExtend 3353 -#define wxStyledTextCtrl_VCHomeRectExtend 3354 -#define wxStyledTextCtrl_LineEndRectExtend 3355 -#define wxStyledTextCtrl_PageUpRectExtend 3356 -#define wxStyledTextCtrl_PageDownRectExtend 3357 -#define wxStyledTextCtrl_StutteredPageUp 3358 -#define wxStyledTextCtrl_StutteredPageUpExtend 3359 -#define wxStyledTextCtrl_StutteredPageDown 3360 -#define wxStyledTextCtrl_StutteredPageDownExtend 3361 -#define wxStyledTextCtrl_WordLeftEnd 3362 -#define wxStyledTextCtrl_WordLeftEndExtend 3363 -#define wxStyledTextCtrl_WordRightEnd 3364 -#define wxStyledTextCtrl_WordRightEndExtend 3365 -#define wxStyledTextCtrl_SetWhitespaceChars 3366 -#define wxStyledTextCtrl_SetCharsDefault 3367 -#define wxStyledTextCtrl_AutoCompGetCurrent 3368 -#define wxStyledTextCtrl_Allocate 3369 -#define wxStyledTextCtrl_FindColumn 3370 -#define wxStyledTextCtrl_GetCaretSticky 3371 -#define wxStyledTextCtrl_SetCaretSticky 3372 -#define wxStyledTextCtrl_ToggleCaretSticky 3373 -#define wxStyledTextCtrl_SetPasteConvertEndings 3374 -#define wxStyledTextCtrl_GetPasteConvertEndings 3375 -#define wxStyledTextCtrl_SelectionDuplicate 3376 -#define wxStyledTextCtrl_SetCaretLineBackAlpha 3377 -#define wxStyledTextCtrl_GetCaretLineBackAlpha 3378 -#define wxStyledTextCtrl_StartRecord 3379 -#define wxStyledTextCtrl_StopRecord 3380 -#define wxStyledTextCtrl_SetLexer 3381 -#define wxStyledTextCtrl_GetLexer 3382 -#define wxStyledTextCtrl_Colourise 3383 -#define wxStyledTextCtrl_SetProperty 3384 -#define wxStyledTextCtrl_SetKeyWords 3385 -#define wxStyledTextCtrl_SetLexerLanguage 3386 -#define wxStyledTextCtrl_GetProperty 3387 -#define wxStyledTextCtrl_GetStyleBitsNeeded 3388 -#define wxStyledTextCtrl_GetCurrentLine 3389 -#define wxStyledTextCtrl_StyleSetSpec 3390 -#define wxStyledTextCtrl_StyleSetFont 3391 -#define wxStyledTextCtrl_StyleSetFontAttr 3392 -#define wxStyledTextCtrl_StyleSetCharacterSet 3393 -#define wxStyledTextCtrl_StyleSetFontEncoding 3394 -#define wxStyledTextCtrl_CmdKeyExecute 3395 -#define wxStyledTextCtrl_SetMargins 3396 -#define wxStyledTextCtrl_GetSelection 3397 -#define wxStyledTextCtrl_PointFromPosition 3398 -#define wxStyledTextCtrl_ScrollToLine 3399 -#define wxStyledTextCtrl_ScrollToColumn 3400 -#define wxStyledTextCtrl_SetVScrollBar 3401 -#define wxStyledTextCtrl_SetHScrollBar 3402 -#define wxStyledTextCtrl_GetLastKeydownProcessed 3403 -#define wxStyledTextCtrl_SetLastKeydownProcessed 3404 -#define wxStyledTextCtrl_SaveFile 3405 -#define wxStyledTextCtrl_LoadFile 3406 -#define wxStyledTextCtrl_DoDragOver 3407 -#define wxStyledTextCtrl_DoDropText 3408 -#define wxStyledTextCtrl_GetUseAntiAliasing 3409 -#define wxStyledTextCtrl_AddTextRaw 3410 -#define wxStyledTextCtrl_InsertTextRaw 3411 -#define wxStyledTextCtrl_GetCurLineRaw 3412 -#define wxStyledTextCtrl_GetLineRaw 3413 -#define wxStyledTextCtrl_GetSelectedTextRaw 3414 -#define wxStyledTextCtrl_GetTextRangeRaw 3415 -#define wxStyledTextCtrl_SetTextRaw 3416 -#define wxStyledTextCtrl_GetTextRaw 3417 -#define wxStyledTextCtrl_AppendTextRaw 3418 -#define wxArtProvider_GetBitmap 3419 -#define wxArtProvider_GetIcon 3420 -#define wxTreeEvent_GetKeyCode 3421 -#define wxTreeEvent_GetItem 3422 -#define wxTreeEvent_GetKeyEvent 3423 -#define wxTreeEvent_GetLabel 3424 -#define wxTreeEvent_GetOldItem 3425 -#define wxTreeEvent_GetPoint 3426 -#define wxTreeEvent_IsEditCancelled 3427 -#define wxTreeEvent_SetToolTip 3428 -#define wxNotebookEvent_GetOldSelection 3429 -#define wxNotebookEvent_GetSelection 3430 -#define wxNotebookEvent_SetOldSelection 3431 -#define wxNotebookEvent_SetSelection 3432 -#define wxFileDataObject_new 3433 -#define wxFileDataObject_AddFile 3434 -#define wxFileDataObject_GetFilenames 3435 -#define wxFileDataObject_destroy 3436 -#define wxTextDataObject_new 3437 -#define wxTextDataObject_GetTextLength 3438 -#define wxTextDataObject_GetText 3439 -#define wxTextDataObject_SetText 3440 -#define wxTextDataObject_destroy 3441 -#define wxBitmapDataObject_new_1_1 3442 -#define wxBitmapDataObject_new_1_0 3443 -#define wxBitmapDataObject_GetBitmap 3444 -#define wxBitmapDataObject_SetBitmap 3445 -#define wxBitmapDataObject_destroy 3446 -#define wxClipboard_new 3448 -#define wxClipboard_destruct 3449 -#define wxClipboard_AddData 3450 -#define wxClipboard_Clear 3451 -#define wxClipboard_Close 3452 -#define wxClipboard_Flush 3453 -#define wxClipboard_GetData 3454 -#define wxClipboard_IsOpened 3455 -#define wxClipboard_Open 3456 -#define wxClipboard_SetData 3457 -#define wxClipboard_UsePrimarySelection 3459 -#define wxClipboard_IsSupported 3460 -#define wxClipboard_Get 3461 -#define wxSpinEvent_GetPosition 3462 -#define wxSpinEvent_SetPosition 3463 -#define wxSplitterWindow_new_0 3464 -#define wxSplitterWindow_new_2 3465 -#define wxSplitterWindow_destruct 3466 -#define wxSplitterWindow_Create 3467 -#define wxSplitterWindow_GetMinimumPaneSize 3468 -#define wxSplitterWindow_GetSashGravity 3469 -#define wxSplitterWindow_GetSashPosition 3470 -#define wxSplitterWindow_GetSplitMode 3471 -#define wxSplitterWindow_GetWindow1 3472 -#define wxSplitterWindow_GetWindow2 3473 -#define wxSplitterWindow_Initialize 3474 -#define wxSplitterWindow_IsSplit 3475 -#define wxSplitterWindow_ReplaceWindow 3476 -#define wxSplitterWindow_SetSashGravity 3477 -#define wxSplitterWindow_SetSashPosition 3478 -#define wxSplitterWindow_SetSashSize 3479 -#define wxSplitterWindow_SetMinimumPaneSize 3480 -#define wxSplitterWindow_SetSplitMode 3481 -#define wxSplitterWindow_SplitHorizontally 3482 -#define wxSplitterWindow_SplitVertically 3483 -#define wxSplitterWindow_Unsplit 3484 -#define wxSplitterWindow_UpdateSize 3485 -#define wxSplitterEvent_GetSashPosition 3486 -#define wxSplitterEvent_GetX 3487 -#define wxSplitterEvent_GetY 3488 -#define wxSplitterEvent_GetWindowBeingRemoved 3489 -#define wxSplitterEvent_SetSashPosition 3490 -#define wxHtmlWindow_new_0 3491 -#define wxHtmlWindow_new_2 3492 -#define wxHtmlWindow_AppendToPage 3493 -#define wxHtmlWindow_GetOpenedAnchor 3494 -#define wxHtmlWindow_GetOpenedPage 3495 -#define wxHtmlWindow_GetOpenedPageTitle 3496 -#define wxHtmlWindow_GetRelatedFrame 3497 -#define wxHtmlWindow_HistoryBack 3498 -#define wxHtmlWindow_HistoryCanBack 3499 -#define wxHtmlWindow_HistoryCanForward 3500 -#define wxHtmlWindow_HistoryClear 3501 -#define wxHtmlWindow_HistoryForward 3502 -#define wxHtmlWindow_LoadFile 3503 -#define wxHtmlWindow_LoadPage 3504 -#define wxHtmlWindow_SelectAll 3505 -#define wxHtmlWindow_SelectionToText 3506 -#define wxHtmlWindow_SelectLine 3507 -#define wxHtmlWindow_SelectWord 3508 -#define wxHtmlWindow_SetBorders 3509 -#define wxHtmlWindow_SetFonts 3510 -#define wxHtmlWindow_SetPage 3511 -#define wxHtmlWindow_SetRelatedFrame 3512 -#define wxHtmlWindow_SetRelatedStatusBar 3513 -#define wxHtmlWindow_ToText 3514 -#define wxHtmlWindow_destroy 3515 -#define wxHtmlLinkEvent_GetLinkInfo 3516 -#define wxSystemSettings_GetColour 3517 -#define wxSystemSettings_GetFont 3518 -#define wxSystemSettings_GetMetric 3519 -#define wxSystemSettings_GetScreenType 3520 -#define wxSystemOptions_GetOption 3521 -#define wxSystemOptions_GetOptionInt 3522 -#define wxSystemOptions_HasOption 3523 -#define wxSystemOptions_IsFalse 3524 -#define wxSystemOptions_SetOption_2_1 3525 -#define wxSystemOptions_SetOption_2_0 3526 -#define wxAuiNotebookEvent_SetSelection 3527 -#define wxAuiNotebookEvent_GetSelection 3528 -#define wxAuiNotebookEvent_SetOldSelection 3529 -#define wxAuiNotebookEvent_GetOldSelection 3530 -#define wxAuiNotebookEvent_SetDragSource 3531 -#define wxAuiNotebookEvent_GetDragSource 3532 -#define wxAuiManagerEvent_SetManager 3533 -#define wxAuiManagerEvent_GetManager 3534 -#define wxAuiManagerEvent_SetPane 3535 -#define wxAuiManagerEvent_GetPane 3536 -#define wxAuiManagerEvent_SetButton 3537 -#define wxAuiManagerEvent_GetButton 3538 -#define wxAuiManagerEvent_SetDC 3539 -#define wxAuiManagerEvent_GetDC 3540 -#define wxAuiManagerEvent_Veto 3541 -#define wxAuiManagerEvent_GetVeto 3542 -#define wxAuiManagerEvent_SetCanVeto 3543 -#define wxAuiManagerEvent_CanVeto 3544 -#define wxLogNull_new 3545 -#define wxLogNull_destroy 3546 -#define wxTaskBarIcon_new 3547 -#define wxTaskBarIcon_destruct 3548 -#define wxTaskBarIcon_PopupMenu 3549 -#define wxTaskBarIcon_RemoveIcon 3550 -#define wxTaskBarIcon_SetIcon 3551 -#define wxLocale_new_0 3552 -#define wxLocale_new_2 3554 -#define wxLocale_destruct 3555 -#define wxLocale_Init 3557 -#define wxLocale_AddCatalog_1 3558 -#define wxLocale_AddCatalog_3 3559 -#define wxLocale_AddCatalogLookupPathPrefix 3560 -#define wxLocale_GetCanonicalName 3561 -#define wxLocale_GetLanguage 3562 -#define wxLocale_GetLanguageName 3563 -#define wxLocale_GetLocale 3564 -#define wxLocale_GetName 3565 -#define wxLocale_GetString_2 3566 -#define wxLocale_GetString_4 3567 -#define wxLocale_GetHeaderValue 3568 -#define wxLocale_GetSysName 3569 -#define wxLocale_GetSystemEncoding 3570 -#define wxLocale_GetSystemEncodingName 3571 -#define wxLocale_GetSystemLanguage 3572 -#define wxLocale_IsLoaded 3573 -#define wxLocale_IsOk 3574 -#define wxActivateEvent_GetActive 3575 -#define wxPopupWindow_new_2 3577 -#define wxPopupWindow_new_0 3578 -#define wxPopupWindow_destruct 3580 -#define wxPopupWindow_Create 3581 -#define wxPopupWindow_Position 3582 -#define wxPopupTransientWindow_new_0 3583 -#define wxPopupTransientWindow_new_2 3584 -#define wxPopupTransientWindow_destruct 3585 -#define wxPopupTransientWindow_Popup 3586 -#define wxPopupTransientWindow_Dismiss 3587 -#define wxOverlay_new 3588 -#define wxOverlay_destruct 3589 -#define wxOverlay_Reset 3590 -#define wxDCOverlay_new_6 3591 -#define wxDCOverlay_new_2 3592 -#define wxDCOverlay_destruct 3593 -#define wxDCOverlay_Clear 3594 +#define wxWindow_SetTransparent 284 +#define wxWindow_CanSetTransparent 285 +#define wxWindow_IsDoubleBuffered 286 +#define wxWindow_SetDoubleBuffered 287 +#define wxTopLevelWindow_GetIcon 288 +#define wxTopLevelWindow_GetIcons 289 +#define wxTopLevelWindow_GetTitle 290 +#define wxTopLevelWindow_IsActive 291 +#define wxTopLevelWindow_Iconize 292 +#define wxTopLevelWindow_IsFullScreen 293 +#define wxTopLevelWindow_IsIconized 294 +#define wxTopLevelWindow_IsMaximized 295 +#define wxTopLevelWindow_Maximize 296 +#define wxTopLevelWindow_RequestUserAttention 297 +#define wxTopLevelWindow_SetIcon 298 +#define wxTopLevelWindow_SetIcons 299 +#define wxTopLevelWindow_CenterOnScreen 300 +#define wxTopLevelWindow_CentreOnScreen 301 +#define wxTopLevelWindow_SetShape 303 +#define wxTopLevelWindow_SetTitle 304 +#define wxTopLevelWindow_ShowFullScreen 305 +#define wxFrame_new_4 307 +#define wxFrame_new_0 308 +#define wxFrame_destruct 310 +#define wxFrame_Create 311 +#define wxFrame_CreateStatusBar 312 +#define wxFrame_CreateToolBar 313 +#define wxFrame_GetClientAreaOrigin 314 +#define wxFrame_GetMenuBar 315 +#define wxFrame_GetStatusBar 316 +#define wxFrame_GetStatusBarPane 317 +#define wxFrame_GetToolBar 318 +#define wxFrame_ProcessCommand 319 +#define wxFrame_SendSizeEvent 320 +#define wxFrame_SetMenuBar 321 +#define wxFrame_SetStatusBar 322 +#define wxFrame_SetStatusBarPane 323 +#define wxFrame_SetStatusText 324 +#define wxFrame_SetStatusWidths 325 +#define wxFrame_SetToolBar 326 +#define wxMiniFrame_new_0 327 +#define wxMiniFrame_new_4 328 +#define wxMiniFrame_Create 329 +#define wxMiniFrame_destroy 330 +#define wxSplashScreen_new_0 331 +#define wxSplashScreen_new_6 332 +#define wxSplashScreen_destruct 333 +#define wxSplashScreen_GetSplashStyle 334 +#define wxSplashScreen_GetTimeout 335 +#define wxPanel_new_0 336 +#define wxPanel_new_6 337 +#define wxPanel_new_2 338 +#define wxPanel_destruct 339 +#define wxPanel_InitDialog 340 +#define wxPanel_SetFocusIgnoringChildren 341 +#define wxScrolledWindow_new_0 342 +#define wxScrolledWindow_new_2 343 +#define wxScrolledWindow_destruct 344 +#define wxScrolledWindow_CalcScrolledPosition_4 345 +#define wxScrolledWindow_CalcScrolledPosition_1 346 +#define wxScrolledWindow_CalcUnscrolledPosition_4 347 +#define wxScrolledWindow_CalcUnscrolledPosition_1 348 +#define wxScrolledWindow_EnableScrolling 349 +#define wxScrolledWindow_GetScrollPixelsPerUnit 350 +#define wxScrolledWindow_GetViewStart 351 +#define wxScrolledWindow_DoPrepareDC 352 +#define wxScrolledWindow_PrepareDC 353 +#define wxScrolledWindow_Scroll 354 +#define wxScrolledWindow_SetScrollbars 355 +#define wxScrolledWindow_SetScrollRate 356 +#define wxScrolledWindow_SetTargetWindow 357 +#define wxSashWindow_new_0 358 +#define wxSashWindow_new_2 359 +#define wxSashWindow_destruct 360 +#define wxSashWindow_GetSashVisible 361 +#define wxSashWindow_GetMaximumSizeX 362 +#define wxSashWindow_GetMaximumSizeY 363 +#define wxSashWindow_GetMinimumSizeX 364 +#define wxSashWindow_GetMinimumSizeY 365 +#define wxSashWindow_SetMaximumSizeX 366 +#define wxSashWindow_SetMaximumSizeY 367 +#define wxSashWindow_SetMinimumSizeX 368 +#define wxSashWindow_SetMinimumSizeY 369 +#define wxSashWindow_SetSashVisible 370 +#define wxSashLayoutWindow_new_0 371 +#define wxSashLayoutWindow_new_2 372 +#define wxSashLayoutWindow_Create 373 +#define wxSashLayoutWindow_GetAlignment 374 +#define wxSashLayoutWindow_GetOrientation 375 +#define wxSashLayoutWindow_SetAlignment 376 +#define wxSashLayoutWindow_SetDefaultSize 377 +#define wxSashLayoutWindow_SetOrientation 378 +#define wxSashLayoutWindow_destroy 379 +#define wxGrid_new_0 380 +#define wxGrid_new_3 381 +#define wxGrid_new_4 382 +#define wxGrid_destruct 383 +#define wxGrid_AppendCols 384 +#define wxGrid_AppendRows 385 +#define wxGrid_AutoSize 386 +#define wxGrid_AutoSizeColumn 387 +#define wxGrid_AutoSizeColumns 388 +#define wxGrid_AutoSizeRow 389 +#define wxGrid_AutoSizeRows 390 +#define wxGrid_BeginBatch 391 +#define wxGrid_BlockToDeviceRect 392 +#define wxGrid_CanDragColSize 393 +#define wxGrid_CanDragRowSize 394 +#define wxGrid_CanDragGridSize 395 +#define wxGrid_CanEnableCellControl 396 +#define wxGrid_CellToRect_2 397 +#define wxGrid_CellToRect_1 398 +#define wxGrid_ClearGrid 399 +#define wxGrid_ClearSelection 400 +#define wxGrid_CreateGrid 401 +#define wxGrid_DeleteCols 402 +#define wxGrid_DeleteRows 403 +#define wxGrid_DisableCellEditControl 404 +#define wxGrid_DisableDragColSize 405 +#define wxGrid_DisableDragGridSize 406 +#define wxGrid_DisableDragRowSize 407 +#define wxGrid_EnableCellEditControl 408 +#define wxGrid_EnableDragColSize 409 +#define wxGrid_EnableDragGridSize 410 +#define wxGrid_EnableDragRowSize 411 +#define wxGrid_EnableEditing 412 +#define wxGrid_EnableGridLines 413 +#define wxGrid_EndBatch 414 +#define wxGrid_Fit 415 +#define wxGrid_ForceRefresh 416 +#define wxGrid_GetBatchCount 417 +#define wxGrid_GetCellAlignment 418 +#define wxGrid_GetCellBackgroundColour 419 +#define wxGrid_GetCellEditor 420 +#define wxGrid_GetCellFont 421 +#define wxGrid_GetCellRenderer 422 +#define wxGrid_GetCellTextColour 423 +#define wxGrid_GetCellValue_2 424 +#define wxGrid_GetCellValue_1 425 +#define wxGrid_GetColLabelAlignment 426 +#define wxGrid_GetColLabelSize 427 +#define wxGrid_GetColLabelValue 428 +#define wxGrid_GetColMinimalAcceptableWidth 429 +#define wxGrid_GetDefaultCellAlignment 430 +#define wxGrid_GetDefaultCellBackgroundColour 431 +#define wxGrid_GetDefaultCellFont 432 +#define wxGrid_GetDefaultCellTextColour 433 +#define wxGrid_GetDefaultColLabelSize 434 +#define wxGrid_GetDefaultColSize 435 +#define wxGrid_GetDefaultEditor 436 +#define wxGrid_GetDefaultEditorForCell_2 437 +#define wxGrid_GetDefaultEditorForCell_1 438 +#define wxGrid_GetDefaultEditorForType 439 +#define wxGrid_GetDefaultRenderer 440 +#define wxGrid_GetDefaultRendererForCell 441 +#define wxGrid_GetDefaultRendererForType 442 +#define wxGrid_GetDefaultRowLabelSize 443 +#define wxGrid_GetDefaultRowSize 444 +#define wxGrid_GetGridCursorCol 445 +#define wxGrid_GetGridCursorRow 446 +#define wxGrid_GetGridLineColour 447 +#define wxGrid_GridLinesEnabled 448 +#define wxGrid_GetLabelBackgroundColour 449 +#define wxGrid_GetLabelFont 450 +#define wxGrid_GetLabelTextColour 451 +#define wxGrid_GetNumberCols 452 +#define wxGrid_GetNumberRows 453 +#define wxGrid_GetOrCreateCellAttr 454 +#define wxGrid_GetRowMinimalAcceptableHeight 455 +#define wxGrid_GetRowLabelAlignment 456 +#define wxGrid_GetRowLabelSize 457 +#define wxGrid_GetRowLabelValue 458 +#define wxGrid_GetRowSize 459 +#define wxGrid_GetScrollLineX 460 +#define wxGrid_GetScrollLineY 461 +#define wxGrid_GetSelectedCells 462 +#define wxGrid_GetSelectedCols 463 +#define wxGrid_GetSelectedRows 464 +#define wxGrid_GetSelectionBackground 465 +#define wxGrid_GetSelectionBlockTopLeft 466 +#define wxGrid_GetSelectionBlockBottomRight 467 +#define wxGrid_GetSelectionForeground 468 +#define wxGrid_GetViewWidth 469 +#define wxGrid_GetGridWindow 470 +#define wxGrid_GetGridRowLabelWindow 471 +#define wxGrid_GetGridColLabelWindow 472 +#define wxGrid_GetGridCornerLabelWindow 473 +#define wxGrid_HideCellEditControl 474 +#define wxGrid_InsertCols 475 +#define wxGrid_InsertRows 476 +#define wxGrid_IsCellEditControlEnabled 477 +#define wxGrid_IsCurrentCellReadOnly 478 +#define wxGrid_IsEditable 479 +#define wxGrid_IsInSelection_2 480 +#define wxGrid_IsInSelection_1 481 +#define wxGrid_IsReadOnly 482 +#define wxGrid_IsSelection 483 +#define wxGrid_IsVisible_3 484 +#define wxGrid_IsVisible_2 485 +#define wxGrid_MakeCellVisible_2 486 +#define wxGrid_MakeCellVisible_1 487 +#define wxGrid_MoveCursorDown 488 +#define wxGrid_MoveCursorLeft 489 +#define wxGrid_MoveCursorRight 490 +#define wxGrid_MoveCursorUp 491 +#define wxGrid_MoveCursorDownBlock 492 +#define wxGrid_MoveCursorLeftBlock 493 +#define wxGrid_MoveCursorRightBlock 494 +#define wxGrid_MoveCursorUpBlock 495 +#define wxGrid_MovePageDown 496 +#define wxGrid_MovePageUp 497 +#define wxGrid_RegisterDataType 498 +#define wxGrid_SaveEditControlValue 499 +#define wxGrid_SelectAll 500 +#define wxGrid_SelectBlock_5 501 +#define wxGrid_SelectBlock_3 502 +#define wxGrid_SelectCol 503 +#define wxGrid_SelectRow 504 +#define wxGrid_SetCellAlignment_4 505 +#define wxGrid_SetCellAlignment_3 506 +#define wxGrid_SetCellAlignment_1 507 +#define wxGrid_SetCellBackgroundColour_3_0 508 +#define wxGrid_SetCellBackgroundColour_1 509 +#define wxGrid_SetCellBackgroundColour_3_1 510 +#define wxGrid_SetCellEditor 511 +#define wxGrid_SetCellFont 512 +#define wxGrid_SetCellRenderer 513 +#define wxGrid_SetCellTextColour_3_0 514 +#define wxGrid_SetCellTextColour_3_1 515 +#define wxGrid_SetCellTextColour_1 516 +#define wxGrid_SetCellValue_3_0 517 +#define wxGrid_SetCellValue_2 518 +#define wxGrid_SetCellValue_3_1 519 +#define wxGrid_SetColAttr 520 +#define wxGrid_SetColFormatBool 521 +#define wxGrid_SetColFormatNumber 522 +#define wxGrid_SetColFormatFloat 523 +#define wxGrid_SetColFormatCustom 524 +#define wxGrid_SetColLabelAlignment 525 +#define wxGrid_SetColLabelSize 526 +#define wxGrid_SetColLabelValue 527 +#define wxGrid_SetColMinimalWidth 528 +#define wxGrid_SetColMinimalAcceptableWidth 529 +#define wxGrid_SetColSize 530 +#define wxGrid_SetDefaultCellAlignment 531 +#define wxGrid_SetDefaultCellBackgroundColour 532 +#define wxGrid_SetDefaultCellFont 533 +#define wxGrid_SetDefaultCellTextColour 534 +#define wxGrid_SetDefaultEditor 535 +#define wxGrid_SetDefaultRenderer 536 +#define wxGrid_SetDefaultColSize 537 +#define wxGrid_SetDefaultRowSize 538 +#define wxGrid_SetGridCursor 539 +#define wxGrid_SetGridLineColour 540 +#define wxGrid_SetLabelBackgroundColour 541 +#define wxGrid_SetLabelFont 542 +#define wxGrid_SetLabelTextColour 543 +#define wxGrid_SetMargins 544 +#define wxGrid_SetReadOnly 545 +#define wxGrid_SetRowAttr 546 +#define wxGrid_SetRowLabelAlignment 547 +#define wxGrid_SetRowLabelSize 548 +#define wxGrid_SetRowLabelValue 549 +#define wxGrid_SetRowMinimalHeight 550 +#define wxGrid_SetRowMinimalAcceptableHeight 551 +#define wxGrid_SetRowSize 552 +#define wxGrid_SetScrollLineX 553 +#define wxGrid_SetScrollLineY 554 +#define wxGrid_SetSelectionBackground 555 +#define wxGrid_SetSelectionForeground 556 +#define wxGrid_SetSelectionMode 557 +#define wxGrid_ShowCellEditControl 558 +#define wxGrid_XToCol 559 +#define wxGrid_XToEdgeOfCol 560 +#define wxGrid_YToEdgeOfRow 561 +#define wxGrid_YToRow 562 +#define wxGridCellRenderer_Draw 563 +#define wxGridCellRenderer_GetBestSize 564 +#define wxGridCellEditor_Create 565 +#define wxGridCellEditor_IsCreated 566 +#define wxGridCellEditor_SetSize 567 +#define wxGridCellEditor_Show 568 +#define wxGridCellEditor_PaintBackground 569 +#define wxGridCellEditor_BeginEdit 570 +#define wxGridCellEditor_EndEdit 571 +#define wxGridCellEditor_Reset 572 +#define wxGridCellEditor_StartingKey 573 +#define wxGridCellEditor_StartingClick 574 +#define wxGridCellEditor_HandleReturn 575 +#define wxGridCellBoolRenderer_new 576 +#define wxGridCellBoolRenderer_destroy 577 +#define wxGridCellBoolEditor_new 578 +#define wxGridCellBoolEditor_IsTrueValue 579 +#define wxGridCellBoolEditor_UseStringValues 580 +#define wxGridCellBoolEditor_destroy 581 +#define wxGridCellFloatRenderer_new 582 +#define wxGridCellFloatRenderer_GetPrecision 583 +#define wxGridCellFloatRenderer_GetWidth 584 +#define wxGridCellFloatRenderer_SetParameters 585 +#define wxGridCellFloatRenderer_SetPrecision 586 +#define wxGridCellFloatRenderer_SetWidth 587 +#define wxGridCellFloatRenderer_destroy 588 +#define wxGridCellFloatEditor_new 589 +#define wxGridCellFloatEditor_SetParameters 590 +#define wxGridCellFloatEditor_destroy 591 +#define wxGridCellStringRenderer_new 592 +#define wxGridCellStringRenderer_destroy 593 +#define wxGridCellTextEditor_new 594 +#define wxGridCellTextEditor_SetParameters 595 +#define wxGridCellTextEditor_destroy 596 +#define wxGridCellChoiceEditor_new 598 +#define wxGridCellChoiceEditor_SetParameters 599 +#define wxGridCellChoiceEditor_destroy 600 +#define wxGridCellNumberRenderer_new 601 +#define wxGridCellNumberRenderer_destroy 602 +#define wxGridCellNumberEditor_new 603 +#define wxGridCellNumberEditor_GetValue 604 +#define wxGridCellNumberEditor_SetParameters 605 +#define wxGridCellNumberEditor_destroy 606 +#define wxGridCellAttr_SetTextColour 607 +#define wxGridCellAttr_SetBackgroundColour 608 +#define wxGridCellAttr_SetFont 609 +#define wxGridCellAttr_SetAlignment 610 +#define wxGridCellAttr_SetReadOnly 611 +#define wxGridCellAttr_SetRenderer 612 +#define wxGridCellAttr_SetEditor 613 +#define wxGridCellAttr_HasTextColour 614 +#define wxGridCellAttr_HasBackgroundColour 615 +#define wxGridCellAttr_HasFont 616 +#define wxGridCellAttr_HasAlignment 617 +#define wxGridCellAttr_HasRenderer 618 +#define wxGridCellAttr_HasEditor 619 +#define wxGridCellAttr_GetTextColour 620 +#define wxGridCellAttr_GetBackgroundColour 621 +#define wxGridCellAttr_GetFont 622 +#define wxGridCellAttr_GetAlignment 623 +#define wxGridCellAttr_GetRenderer 624 +#define wxGridCellAttr_GetEditor 625 +#define wxGridCellAttr_IsReadOnly 626 +#define wxGridCellAttr_SetDefAttr 627 +#define wxDC_Blit 628 +#define wxDC_CalcBoundingBox 629 +#define wxDC_Clear 630 +#define wxDC_ComputeScaleAndOrigin 631 +#define wxDC_CrossHair 632 +#define wxDC_DestroyClippingRegion 633 +#define wxDC_DeviceToLogicalX 634 +#define wxDC_DeviceToLogicalXRel 635 +#define wxDC_DeviceToLogicalY 636 +#define wxDC_DeviceToLogicalYRel 637 +#define wxDC_DrawArc 638 +#define wxDC_DrawBitmap 639 +#define wxDC_DrawCheckMark 640 +#define wxDC_DrawCircle 641 +#define wxDC_DrawEllipse_2 643 +#define wxDC_DrawEllipse_1 644 +#define wxDC_DrawEllipticArc 645 +#define wxDC_DrawIcon 646 +#define wxDC_DrawLabel 647 +#define wxDC_DrawLine 648 +#define wxDC_DrawLines 649 +#define wxDC_DrawPolygon 651 +#define wxDC_DrawPoint 653 +#define wxDC_DrawRectangle_2 655 +#define wxDC_DrawRectangle_1 656 +#define wxDC_DrawRotatedText 657 +#define wxDC_DrawRoundedRectangle_3 659 +#define wxDC_DrawRoundedRectangle_2 660 +#define wxDC_DrawText 661 +#define wxDC_EndDoc 662 +#define wxDC_EndPage 663 +#define wxDC_FloodFill 664 +#define wxDC_GetBackground 665 +#define wxDC_GetBackgroundMode 666 +#define wxDC_GetBrush 667 +#define wxDC_GetCharHeight 668 +#define wxDC_GetCharWidth 669 +#define wxDC_GetClippingBox 670 +#define wxDC_GetFont 672 +#define wxDC_GetLayoutDirection 673 +#define wxDC_GetLogicalFunction 674 +#define wxDC_GetMapMode 675 +#define wxDC_GetMultiLineTextExtent_4 676 +#define wxDC_GetMultiLineTextExtent_1 677 +#define wxDC_GetPartialTextExtents 678 +#define wxDC_GetPen 679 +#define wxDC_GetPixel 680 +#define wxDC_GetPPI 681 +#define wxDC_GetSize 683 +#define wxDC_GetSizeMM 685 +#define wxDC_GetTextBackground 686 +#define wxDC_GetTextExtent_4 687 +#define wxDC_GetTextExtent_1 688 +#define wxDC_GetTextForeground 690 +#define wxDC_GetUserScale 691 +#define wxDC_GradientFillConcentric_3 692 +#define wxDC_GradientFillConcentric_4 693 +#define wxDC_GradientFillLinear 694 +#define wxDC_LogicalToDeviceX 695 +#define wxDC_LogicalToDeviceXRel 696 +#define wxDC_LogicalToDeviceY 697 +#define wxDC_LogicalToDeviceYRel 698 +#define wxDC_MaxX 699 +#define wxDC_MaxY 700 +#define wxDC_MinX 701 +#define wxDC_MinY 702 +#define wxDC_IsOk 703 +#define wxDC_ResetBoundingBox 704 +#define wxDC_SetAxisOrientation 705 +#define wxDC_SetBackground 706 +#define wxDC_SetBackgroundMode 707 +#define wxDC_SetBrush 708 +#define wxDC_SetClippingRegion_2 710 +#define wxDC_SetClippingRegion_1_1 711 +#define wxDC_SetClippingRegion_1_0 712 +#define wxDC_SetDeviceOrigin 713 +#define wxDC_SetFont 714 +#define wxDC_SetLayoutDirection 715 +#define wxDC_SetLogicalFunction 716 +#define wxDC_SetMapMode 717 +#define wxDC_SetPalette 718 +#define wxDC_SetPen 719 +#define wxDC_SetTextBackground 720 +#define wxDC_SetTextForeground 721 +#define wxDC_SetUserScale 722 +#define wxDC_StartDoc 723 +#define wxDC_StartPage 724 +#define wxMirrorDC_new 725 +#define wxMirrorDC_destroy 726 +#define wxScreenDC_new 727 +#define wxScreenDC_destruct 728 +#define wxPostScriptDC_new_0 729 +#define wxPostScriptDC_new_1 730 +#define wxPostScriptDC_destruct 731 +#define wxPostScriptDC_SetResolution 732 +#define wxPostScriptDC_GetResolution 733 +#define wxWindowDC_new_0 734 +#define wxWindowDC_new_1 735 +#define wxWindowDC_destruct 736 +#define wxClientDC_new_0 737 +#define wxClientDC_new_1 738 +#define wxClientDC_destroy 739 +#define wxPaintDC_new_0 740 +#define wxPaintDC_new_1 741 +#define wxPaintDC_destroy 742 +#define wxMemoryDC_new_1_0 744 +#define wxMemoryDC_new_1_1 745 +#define wxMemoryDC_new_0 746 +#define wxMemoryDC_destruct 748 +#define wxMemoryDC_SelectObject 749 +#define wxMemoryDC_SelectObjectAsSource 750 +#define wxBufferedDC_new_0 751 +#define wxBufferedDC_new_2 752 +#define wxBufferedDC_new_3 753 +#define wxBufferedDC_destruct 754 +#define wxBufferedDC_Init_2 755 +#define wxBufferedDC_Init_3 756 +#define wxBufferedPaintDC_new_3 757 +#define wxBufferedPaintDC_new_2 758 +#define wxBufferedPaintDC_destruct 759 +#define wxGraphicsObject_destruct 760 +#define wxGraphicsObject_GetRenderer 761 +#define wxGraphicsObject_IsNull 762 +#define wxGraphicsContext_destruct 763 +#define wxGraphicsContext_Create_1_1 764 +#define wxGraphicsContext_Create_1_0 765 +#define wxGraphicsContext_Create_0 766 +#define wxGraphicsContext_CreatePen 767 +#define wxGraphicsContext_CreateBrush 768 +#define wxGraphicsContext_CreateRadialGradientBrush 769 +#define wxGraphicsContext_CreateLinearGradientBrush 770 +#define wxGraphicsContext_CreateFont 771 +#define wxGraphicsContext_CreateMatrix 772 +#define wxGraphicsContext_CreatePath 773 +#define wxGraphicsContext_Clip_1 774 +#define wxGraphicsContext_Clip_4 775 +#define wxGraphicsContext_ResetClip 776 +#define wxGraphicsContext_DrawBitmap 777 +#define wxGraphicsContext_DrawEllipse 778 +#define wxGraphicsContext_DrawIcon 779 +#define wxGraphicsContext_DrawLines 780 +#define wxGraphicsContext_DrawPath 781 +#define wxGraphicsContext_DrawRectangle 782 +#define wxGraphicsContext_DrawRoundedRectangle 783 +#define wxGraphicsContext_DrawText_3 784 +#define wxGraphicsContext_DrawText_4_0 785 +#define wxGraphicsContext_DrawText_4_1 786 +#define wxGraphicsContext_DrawText_5 787 +#define wxGraphicsContext_FillPath 788 +#define wxGraphicsContext_StrokePath 789 +#define wxGraphicsContext_GetPartialTextExtents 790 +#define wxGraphicsContext_GetTextExtent 791 +#define wxGraphicsContext_Rotate 792 +#define wxGraphicsContext_Scale 793 +#define wxGraphicsContext_Translate 794 +#define wxGraphicsContext_GetTransform 795 +#define wxGraphicsContext_SetTransform 796 +#define wxGraphicsContext_ConcatTransform 797 +#define wxGraphicsContext_SetBrush_1_1 798 +#define wxGraphicsContext_SetBrush_1_0 799 +#define wxGraphicsContext_SetFont_1 800 +#define wxGraphicsContext_SetFont_2 801 +#define wxGraphicsContext_SetPen_1_0 802 +#define wxGraphicsContext_SetPen_1_1 803 +#define wxGraphicsContext_StrokeLine 804 +#define wxGraphicsContext_StrokeLines 805 +#define wxGraphicsMatrix_Concat 807 +#define wxGraphicsMatrix_Get 809 +#define wxGraphicsMatrix_Invert 810 +#define wxGraphicsMatrix_IsEqual 811 +#define wxGraphicsMatrix_IsIdentity 813 +#define wxGraphicsMatrix_Rotate 814 +#define wxGraphicsMatrix_Scale 815 +#define wxGraphicsMatrix_Translate 816 +#define wxGraphicsMatrix_Set 817 +#define wxGraphicsMatrix_TransformPoint 818 +#define wxGraphicsMatrix_TransformDistance 819 +#define wxGraphicsPath_MoveToPoint_2 820 +#define wxGraphicsPath_MoveToPoint_1 821 +#define wxGraphicsPath_AddArc_6 822 +#define wxGraphicsPath_AddArc_5 823 +#define wxGraphicsPath_AddArcToPoint 824 +#define wxGraphicsPath_AddCircle 825 +#define wxGraphicsPath_AddCurveToPoint_6 826 +#define wxGraphicsPath_AddCurveToPoint_3 827 +#define wxGraphicsPath_AddEllipse 828 +#define wxGraphicsPath_AddLineToPoint_2 829 +#define wxGraphicsPath_AddLineToPoint_1 830 +#define wxGraphicsPath_AddPath 831 +#define wxGraphicsPath_AddQuadCurveToPoint 832 +#define wxGraphicsPath_AddRectangle 833 +#define wxGraphicsPath_AddRoundedRectangle 834 +#define wxGraphicsPath_CloseSubpath 835 +#define wxGraphicsPath_Contains_3 836 +#define wxGraphicsPath_Contains_2 837 +#define wxGraphicsPath_GetBox 839 +#define wxGraphicsPath_GetCurrentPoint 841 +#define wxGraphicsPath_Transform 842 +#define wxGraphicsRenderer_GetDefaultRenderer 843 +#define wxGraphicsRenderer_CreateContext_1_1 844 +#define wxGraphicsRenderer_CreateContext_1_0 845 +#define wxGraphicsRenderer_CreatePen 846 +#define wxGraphicsRenderer_CreateBrush 847 +#define wxGraphicsRenderer_CreateLinearGradientBrush 848 +#define wxGraphicsRenderer_CreateRadialGradientBrush 849 +#define wxGraphicsRenderer_CreateFont 850 +#define wxGraphicsRenderer_CreateMatrix 851 +#define wxGraphicsRenderer_CreatePath 852 +#define wxMenuBar_new_1 854 +#define wxMenuBar_new_0 856 +#define wxMenuBar_destruct 858 +#define wxMenuBar_Append 859 +#define wxMenuBar_Check 860 +#define wxMenuBar_Enable_2 861 +#define wxMenuBar_Enable_1 862 +#define wxMenuBar_EnableTop 863 +#define wxMenuBar_FindMenu 864 +#define wxMenuBar_FindMenuItem 865 +#define wxMenuBar_FindItem 866 +#define wxMenuBar_GetHelpString 867 +#define wxMenuBar_GetLabel_1 868 +#define wxMenuBar_GetLabel_0 869 +#define wxMenuBar_GetLabelTop 870 +#define wxMenuBar_GetMenu 871 +#define wxMenuBar_GetMenuCount 872 +#define wxMenuBar_Insert 873 +#define wxMenuBar_IsChecked 874 +#define wxMenuBar_IsEnabled_1 875 +#define wxMenuBar_IsEnabled_0 876 +#define wxMenuBar_Remove 877 +#define wxMenuBar_Replace 878 +#define wxMenuBar_SetHelpString 879 +#define wxMenuBar_SetLabel_2 880 +#define wxMenuBar_SetLabel_1 881 +#define wxMenuBar_SetLabelTop 882 +#define wxControl_GetLabel 883 +#define wxControl_SetLabel 884 +#define wxControlWithItems_Append_1 885 +#define wxControlWithItems_Append_2 886 +#define wxControlWithItems_appendStrings_1 887 +#define wxControlWithItems_Clear 888 +#define wxControlWithItems_Delete 889 +#define wxControlWithItems_FindString 890 +#define wxControlWithItems_getClientData 891 +#define wxControlWithItems_setClientData 892 +#define wxControlWithItems_GetCount 893 +#define wxControlWithItems_GetSelection 894 +#define wxControlWithItems_GetString 895 +#define wxControlWithItems_GetStringSelection 896 +#define wxControlWithItems_Insert_2 897 +#define wxControlWithItems_Insert_3 898 +#define wxControlWithItems_IsEmpty 899 +#define wxControlWithItems_Select 900 +#define wxControlWithItems_SetSelection 901 +#define wxControlWithItems_SetString 902 +#define wxControlWithItems_SetStringSelection 903 +#define wxMenu_new_2 906 +#define wxMenu_new_1 907 +#define wxMenu_destruct 909 +#define wxMenu_Append_3 910 +#define wxMenu_Append_1 911 +#define wxMenu_Append_4_0 912 +#define wxMenu_Append_4_1 913 +#define wxMenu_AppendCheckItem 914 +#define wxMenu_AppendRadioItem 915 +#define wxMenu_AppendSeparator 916 +#define wxMenu_Break 917 +#define wxMenu_Check 918 +#define wxMenu_Delete_1_0 919 +#define wxMenu_Delete_1_1 920 +#define wxMenu_Destroy_1_0 921 +#define wxMenu_Destroy_1_1 922 +#define wxMenu_Enable 923 +#define wxMenu_FindItem_1 924 +#define wxMenu_FindItem_2 925 +#define wxMenu_FindItemByPosition 926 +#define wxMenu_GetHelpString 927 +#define wxMenu_GetLabel 928 +#define wxMenu_GetMenuItemCount 929 +#define wxMenu_GetMenuItems 930 +#define wxMenu_GetTitle 932 +#define wxMenu_Insert_2 933 +#define wxMenu_Insert_3 934 +#define wxMenu_Insert_5_1 935 +#define wxMenu_Insert_5_0 936 +#define wxMenu_InsertCheckItem 937 +#define wxMenu_InsertRadioItem 938 +#define wxMenu_InsertSeparator 939 +#define wxMenu_IsChecked 940 +#define wxMenu_IsEnabled 941 +#define wxMenu_Prepend_1 942 +#define wxMenu_Prepend_2 943 +#define wxMenu_Prepend_4_1 944 +#define wxMenu_Prepend_4_0 945 +#define wxMenu_PrependCheckItem 946 +#define wxMenu_PrependRadioItem 947 +#define wxMenu_PrependSeparator 948 +#define wxMenu_Remove_1_0 949 +#define wxMenu_Remove_1_1 950 +#define wxMenu_SetHelpString 951 +#define wxMenu_SetLabel 952 +#define wxMenu_SetTitle 953 +#define wxMenuItem_new 954 +#define wxMenuItem_destruct 956 +#define wxMenuItem_Check 957 +#define wxMenuItem_Enable 958 +#define wxMenuItem_GetBitmap 959 +#define wxMenuItem_GetHelp 960 +#define wxMenuItem_GetId 961 +#define wxMenuItem_GetKind 962 +#define wxMenuItem_GetLabel 963 +#define wxMenuItem_GetLabelFromText 964 +#define wxMenuItem_GetMenu 965 +#define wxMenuItem_GetText 966 +#define wxMenuItem_GetSubMenu 967 +#define wxMenuItem_IsCheckable 968 +#define wxMenuItem_IsChecked 969 +#define wxMenuItem_IsEnabled 970 +#define wxMenuItem_IsSeparator 971 +#define wxMenuItem_IsSubMenu 972 +#define wxMenuItem_SetBitmap 973 +#define wxMenuItem_SetHelp 974 +#define wxMenuItem_SetMenu 975 +#define wxMenuItem_SetSubMenu 976 +#define wxMenuItem_SetText 977 +#define wxToolBar_AddControl 978 +#define wxToolBar_AddSeparator 979 +#define wxToolBar_AddTool_5 980 +#define wxToolBar_AddTool_4_0 981 +#define wxToolBar_AddTool_1 982 +#define wxToolBar_AddTool_4_1 983 +#define wxToolBar_AddTool_3 984 +#define wxToolBar_AddTool_6 985 +#define wxToolBar_AddCheckTool 986 +#define wxToolBar_AddRadioTool 987 +#define wxToolBar_AddStretchableSpace 988 +#define wxToolBar_InsertStretchableSpace 989 +#define wxToolBar_DeleteTool 990 +#define wxToolBar_DeleteToolByPos 991 +#define wxToolBar_EnableTool 992 +#define wxToolBar_FindById 993 +#define wxToolBar_FindControl 994 +#define wxToolBar_FindToolForPosition 995 +#define wxToolBar_GetToolSize 996 +#define wxToolBar_GetToolBitmapSize 997 +#define wxToolBar_GetMargins 998 +#define wxToolBar_GetToolEnabled 999 +#define wxToolBar_GetToolLongHelp 1000 +#define wxToolBar_GetToolPacking 1001 +#define wxToolBar_GetToolPos 1002 +#define wxToolBar_GetToolSeparation 1003 +#define wxToolBar_GetToolShortHelp 1004 +#define wxToolBar_GetToolState 1005 +#define wxToolBar_InsertControl 1006 +#define wxToolBar_InsertSeparator 1007 +#define wxToolBar_InsertTool_5 1008 +#define wxToolBar_InsertTool_2 1009 +#define wxToolBar_InsertTool_4 1010 +#define wxToolBar_Realize 1011 +#define wxToolBar_RemoveTool 1012 +#define wxToolBar_SetMargins 1013 +#define wxToolBar_SetToolBitmapSize 1014 +#define wxToolBar_SetToolLongHelp 1015 +#define wxToolBar_SetToolPacking 1016 +#define wxToolBar_SetToolShortHelp 1017 +#define wxToolBar_SetToolSeparation 1018 +#define wxToolBar_ToggleTool 1019 +#define wxStatusBar_new_0 1021 +#define wxStatusBar_new_2 1022 +#define wxStatusBar_destruct 1024 +#define wxStatusBar_Create 1025 +#define wxStatusBar_GetFieldRect 1026 +#define wxStatusBar_GetFieldsCount 1027 +#define wxStatusBar_GetStatusText 1028 +#define wxStatusBar_PopStatusText 1029 +#define wxStatusBar_PushStatusText 1030 +#define wxStatusBar_SetFieldsCount 1031 +#define wxStatusBar_SetMinHeight 1032 +#define wxStatusBar_SetStatusText 1033 +#define wxStatusBar_SetStatusWidths 1034 +#define wxStatusBar_SetStatusStyles 1035 +#define wxBitmap_new_0 1036 +#define wxBitmap_new_3 1037 +#define wxBitmap_new_4 1038 +#define wxBitmap_new_2_0 1039 +#define wxBitmap_new_2_1 1040 +#define wxBitmap_destruct 1041 +#define wxBitmap_ConvertToImage 1042 +#define wxBitmap_CopyFromIcon 1043 +#define wxBitmap_Create 1044 +#define wxBitmap_GetDepth 1045 +#define wxBitmap_GetHeight 1046 +#define wxBitmap_GetPalette 1047 +#define wxBitmap_GetMask 1048 +#define wxBitmap_GetWidth 1049 +#define wxBitmap_GetSubBitmap 1050 +#define wxBitmap_LoadFile 1051 +#define wxBitmap_Ok 1052 +#define wxBitmap_SaveFile 1053 +#define wxBitmap_SetDepth 1054 +#define wxBitmap_SetHeight 1055 +#define wxBitmap_SetMask 1056 +#define wxBitmap_SetPalette 1057 +#define wxBitmap_SetWidth 1058 +#define wxIcon_new_0 1059 +#define wxIcon_new_2 1060 +#define wxIcon_new_1 1061 +#define wxIcon_CopyFromBitmap 1062 +#define wxIcon_destroy 1063 +#define wxIconBundle_new_0 1064 +#define wxIconBundle_new_2 1065 +#define wxIconBundle_new_1_0 1066 +#define wxIconBundle_new_1_1 1067 +#define wxIconBundle_destruct 1068 +#define wxIconBundle_AddIcon_2 1069 +#define wxIconBundle_AddIcon_1 1070 +#define wxIconBundle_GetIcon_1_1 1071 +#define wxIconBundle_GetIcon_1_0 1072 +#define wxCursor_new_0 1073 +#define wxCursor_new_1_0 1074 +#define wxCursor_new_1_1 1075 +#define wxCursor_new_4 1076 +#define wxCursor_destruct 1077 +#define wxCursor_Ok 1078 +#define wxMask_new_0 1079 +#define wxMask_new_2_1 1080 +#define wxMask_new_2_0 1081 +#define wxMask_new_1 1082 +#define wxMask_destruct 1083 +#define wxMask_Create_2_1 1084 +#define wxMask_Create_2_0 1085 +#define wxMask_Create_1 1086 +#define wxImage_new_0 1087 +#define wxImage_new_3_0 1088 +#define wxImage_new_4 1089 +#define wxImage_new_5 1090 +#define wxImage_new_2 1091 +#define wxImage_new_3_1 1092 +#define wxImage_Blur 1093 +#define wxImage_BlurHorizontal 1094 +#define wxImage_BlurVertical 1095 +#define wxImage_ConvertAlphaToMask 1096 +#define wxImage_ConvertToGreyscale 1097 +#define wxImage_ConvertToMono 1098 +#define wxImage_Copy 1099 +#define wxImage_Create_3 1100 +#define wxImage_Create_4 1101 +#define wxImage_Create_5 1102 +#define wxImage_Destroy 1103 +#define wxImage_FindFirstUnusedColour 1104 +#define wxImage_GetImageExtWildcard 1105 +#define wxImage_GetAlpha_2 1106 +#define wxImage_GetAlpha_0 1107 +#define wxImage_GetBlue 1108 +#define wxImage_GetData 1109 +#define wxImage_GetGreen 1110 +#define wxImage_GetImageCount 1111 +#define wxImage_GetHeight 1112 +#define wxImage_GetMaskBlue 1113 +#define wxImage_GetMaskGreen 1114 +#define wxImage_GetMaskRed 1115 +#define wxImage_GetOrFindMaskColour 1116 +#define wxImage_GetPalette 1117 +#define wxImage_GetRed 1118 +#define wxImage_GetSubImage 1119 +#define wxImage_GetWidth 1120 +#define wxImage_HasAlpha 1121 +#define wxImage_HasMask 1122 +#define wxImage_GetOption 1123 +#define wxImage_GetOptionInt 1124 +#define wxImage_HasOption 1125 +#define wxImage_InitAlpha 1126 +#define wxImage_InitStandardHandlers 1127 +#define wxImage_IsTransparent 1128 +#define wxImage_LoadFile_2 1129 +#define wxImage_LoadFile_3 1130 +#define wxImage_Ok 1131 +#define wxImage_RemoveHandler 1132 +#define wxImage_Mirror 1133 +#define wxImage_Replace 1134 +#define wxImage_Rescale 1135 +#define wxImage_Resize 1136 +#define wxImage_Rotate 1137 +#define wxImage_RotateHue 1138 +#define wxImage_Rotate90 1139 +#define wxImage_SaveFile_1 1140 +#define wxImage_SaveFile_2_0 1141 +#define wxImage_SaveFile_2_1 1142 +#define wxImage_Scale 1143 +#define wxImage_Size 1144 +#define wxImage_SetAlpha_3 1145 +#define wxImage_SetAlpha_2 1146 +#define wxImage_SetData_2 1147 +#define wxImage_SetData_4 1148 +#define wxImage_SetMask 1149 +#define wxImage_SetMaskColour 1150 +#define wxImage_SetMaskFromImage 1151 +#define wxImage_SetOption_2_1 1152 +#define wxImage_SetOption_2_0 1153 +#define wxImage_SetPalette 1154 +#define wxImage_SetRGB_5 1155 +#define wxImage_SetRGB_4 1156 +#define wxImage_destroy 1157 +#define wxBrush_new_0 1158 +#define wxBrush_new_2 1159 +#define wxBrush_new_1 1160 +#define wxBrush_destruct 1162 +#define wxBrush_GetColour 1163 +#define wxBrush_GetStipple 1164 +#define wxBrush_GetStyle 1165 +#define wxBrush_IsHatch 1166 +#define wxBrush_IsOk 1167 +#define wxBrush_SetColour_1 1168 +#define wxBrush_SetColour_3 1169 +#define wxBrush_SetStipple 1170 +#define wxBrush_SetStyle 1171 +#define wxPen_new_0 1172 +#define wxPen_new_2 1173 +#define wxPen_destruct 1174 +#define wxPen_GetCap 1175 +#define wxPen_GetColour 1176 +#define wxPen_GetJoin 1177 +#define wxPen_GetStyle 1178 +#define wxPen_GetWidth 1179 +#define wxPen_IsOk 1180 +#define wxPen_SetCap 1181 +#define wxPen_SetColour_1 1182 +#define wxPen_SetColour_3 1183 +#define wxPen_SetJoin 1184 +#define wxPen_SetStyle 1185 +#define wxPen_SetWidth 1186 +#define wxRegion_new_0 1187 +#define wxRegion_new_4 1188 +#define wxRegion_new_2 1189 +#define wxRegion_new_1_1 1190 +#define wxRegion_new_1_0 1192 +#define wxRegion_destruct 1194 +#define wxRegion_Clear 1195 +#define wxRegion_Contains_2 1196 +#define wxRegion_Contains_1_0 1197 +#define wxRegion_Contains_4 1198 +#define wxRegion_Contains_1_1 1199 +#define wxRegion_ConvertToBitmap 1200 +#define wxRegion_GetBox 1201 +#define wxRegion_Intersect_4 1202 +#define wxRegion_Intersect_1_1 1203 +#define wxRegion_Intersect_1_0 1204 +#define wxRegion_IsEmpty 1205 +#define wxRegion_Subtract_4 1206 +#define wxRegion_Subtract_1_1 1207 +#define wxRegion_Subtract_1_0 1208 +#define wxRegion_Offset_2 1209 +#define wxRegion_Offset_1 1210 +#define wxRegion_Union_4 1211 +#define wxRegion_Union_1_2 1212 +#define wxRegion_Union_1_1 1213 +#define wxRegion_Union_1_0 1214 +#define wxRegion_Union_3 1215 +#define wxRegion_Xor_4 1216 +#define wxRegion_Xor_1_1 1217 +#define wxRegion_Xor_1_0 1218 +#define wxAcceleratorTable_new_0 1219 +#define wxAcceleratorTable_new_2 1220 +#define wxAcceleratorTable_destruct 1221 +#define wxAcceleratorTable_Ok 1222 +#define wxAcceleratorEntry_new_1_0 1223 +#define wxAcceleratorEntry_new_1_1 1224 +#define wxAcceleratorEntry_GetCommand 1225 +#define wxAcceleratorEntry_GetFlags 1226 +#define wxAcceleratorEntry_GetKeyCode 1227 +#define wxAcceleratorEntry_Set 1228 +#define wxAcceleratorEntry_destroy 1229 +#define wxCaret_new_3 1234 +#define wxCaret_new_2 1235 +#define wxCaret_destruct 1237 +#define wxCaret_Create_3 1238 +#define wxCaret_Create_2 1239 +#define wxCaret_GetBlinkTime 1240 +#define wxCaret_GetPosition 1242 +#define wxCaret_GetSize 1244 +#define wxCaret_GetWindow 1245 +#define wxCaret_Hide 1246 +#define wxCaret_IsOk 1247 +#define wxCaret_IsVisible 1248 +#define wxCaret_Move_2 1249 +#define wxCaret_Move_1 1250 +#define wxCaret_SetBlinkTime 1251 +#define wxCaret_SetSize_2 1252 +#define wxCaret_SetSize_1 1253 +#define wxCaret_Show 1254 +#define wxSizer_Add_2_1 1255 +#define wxSizer_Add_2_0 1256 +#define wxSizer_Add_3 1257 +#define wxSizer_Add_2_3 1258 +#define wxSizer_Add_2_2 1259 +#define wxSizer_AddSpacer 1260 +#define wxSizer_AddStretchSpacer 1261 +#define wxSizer_CalcMin 1262 +#define wxSizer_Clear 1263 +#define wxSizer_Detach_1_2 1264 +#define wxSizer_Detach_1_1 1265 +#define wxSizer_Detach_1_0 1266 +#define wxSizer_Fit 1267 +#define wxSizer_FitInside 1268 +#define wxSizer_GetChildren 1269 +#define wxSizer_GetItem_2_1 1270 +#define wxSizer_GetItem_2_0 1271 +#define wxSizer_GetItem_1 1272 +#define wxSizer_GetSize 1273 +#define wxSizer_GetPosition 1274 +#define wxSizer_GetMinSize 1275 +#define wxSizer_Hide_2_0 1276 +#define wxSizer_Hide_2_1 1277 +#define wxSizer_Hide_1 1278 +#define wxSizer_Insert_3_1 1279 +#define wxSizer_Insert_3_0 1280 +#define wxSizer_Insert_4 1281 +#define wxSizer_Insert_3_3 1282 +#define wxSizer_Insert_3_2 1283 +#define wxSizer_Insert_2 1284 +#define wxSizer_InsertSpacer 1285 +#define wxSizer_InsertStretchSpacer 1286 +#define wxSizer_IsShown_1_2 1287 +#define wxSizer_IsShown_1_1 1288 +#define wxSizer_IsShown_1_0 1289 +#define wxSizer_Layout 1290 +#define wxSizer_Prepend_2_1 1291 +#define wxSizer_Prepend_2_0 1292 +#define wxSizer_Prepend_3 1293 +#define wxSizer_Prepend_2_3 1294 +#define wxSizer_Prepend_2_2 1295 +#define wxSizer_Prepend_1 1296 +#define wxSizer_PrependSpacer 1297 +#define wxSizer_PrependStretchSpacer 1298 +#define wxSizer_RecalcSizes 1299 +#define wxSizer_Remove_1_1 1300 +#define wxSizer_Remove_1_0 1301 +#define wxSizer_Replace_3_1 1302 +#define wxSizer_Replace_3_0 1303 +#define wxSizer_Replace_2 1304 +#define wxSizer_SetDimension 1305 +#define wxSizer_SetMinSize_2 1306 +#define wxSizer_SetMinSize_1 1307 +#define wxSizer_SetItemMinSize_3_2 1308 +#define wxSizer_SetItemMinSize_2_2 1309 +#define wxSizer_SetItemMinSize_3_1 1310 +#define wxSizer_SetItemMinSize_2_1 1311 +#define wxSizer_SetItemMinSize_3_0 1312 +#define wxSizer_SetItemMinSize_2_0 1313 +#define wxSizer_SetSizeHints 1314 +#define wxSizer_SetVirtualSizeHints 1315 +#define wxSizer_Show_2_2 1316 +#define wxSizer_Show_2_1 1317 +#define wxSizer_Show_2_0 1318 +#define wxSizer_Show_1 1319 +#define wxSizerFlags_new 1320 +#define wxSizerFlags_Align 1321 +#define wxSizerFlags_Border_2 1322 +#define wxSizerFlags_Border_1 1323 +#define wxSizerFlags_Center 1324 +#define wxSizerFlags_Centre 1325 +#define wxSizerFlags_Expand 1326 +#define wxSizerFlags_Left 1327 +#define wxSizerFlags_Proportion 1328 +#define wxSizerFlags_Right 1329 +#define wxSizerFlags_destroy 1330 +#define wxSizerItem_new_5_1 1331 +#define wxSizerItem_new_2_1 1332 +#define wxSizerItem_new_5_0 1333 +#define wxSizerItem_new_2_0 1334 +#define wxSizerItem_new_6 1335 +#define wxSizerItem_new_3 1336 +#define wxSizerItem_new_0 1337 +#define wxSizerItem_destruct 1338 +#define wxSizerItem_CalcMin 1339 +#define wxSizerItem_DeleteWindows 1340 +#define wxSizerItem_DetachSizer 1341 +#define wxSizerItem_GetBorder 1342 +#define wxSizerItem_GetFlag 1343 +#define wxSizerItem_GetMinSize 1344 +#define wxSizerItem_GetPosition 1345 +#define wxSizerItem_GetProportion 1346 +#define wxSizerItem_GetRatio 1347 +#define wxSizerItem_GetRect 1348 +#define wxSizerItem_GetSize 1349 +#define wxSizerItem_GetSizer 1350 +#define wxSizerItem_GetSpacer 1351 +#define wxSizerItem_GetUserData 1352 +#define wxSizerItem_GetWindow 1353 +#define wxSizerItem_IsSizer 1354 +#define wxSizerItem_IsShown 1355 +#define wxSizerItem_IsSpacer 1356 +#define wxSizerItem_IsWindow 1357 +#define wxSizerItem_SetBorder 1358 +#define wxSizerItem_SetDimension 1359 +#define wxSizerItem_SetFlag 1360 +#define wxSizerItem_SetInitSize 1361 +#define wxSizerItem_SetMinSize_1 1362 +#define wxSizerItem_SetMinSize_2 1363 +#define wxSizerItem_SetProportion 1364 +#define wxSizerItem_SetRatio_2 1365 +#define wxSizerItem_SetRatio_1_1 1366 +#define wxSizerItem_SetRatio_1_0 1367 +#define wxSizerItem_SetSizer 1368 +#define wxSizerItem_SetSpacer_1 1369 +#define wxSizerItem_SetSpacer_2 1370 +#define wxSizerItem_SetWindow 1371 +#define wxSizerItem_Show 1372 +#define wxBoxSizer_new 1373 +#define wxBoxSizer_GetOrientation 1374 +#define wxBoxSizer_destroy 1375 +#define wxStaticBoxSizer_new_2 1376 +#define wxStaticBoxSizer_new_3 1377 +#define wxStaticBoxSizer_GetStaticBox 1378 +#define wxStaticBoxSizer_destroy 1379 +#define wxGridSizer_new_4 1380 +#define wxGridSizer_new_2 1381 +#define wxGridSizer_GetCols 1382 +#define wxGridSizer_GetHGap 1383 +#define wxGridSizer_GetRows 1384 +#define wxGridSizer_GetVGap 1385 +#define wxGridSizer_SetCols 1386 +#define wxGridSizer_SetHGap 1387 +#define wxGridSizer_SetRows 1388 +#define wxGridSizer_SetVGap 1389 +#define wxGridSizer_destroy 1390 +#define wxFlexGridSizer_new_4 1391 +#define wxFlexGridSizer_new_2 1392 +#define wxFlexGridSizer_AddGrowableCol 1393 +#define wxFlexGridSizer_AddGrowableRow 1394 +#define wxFlexGridSizer_GetFlexibleDirection 1395 +#define wxFlexGridSizer_GetNonFlexibleGrowMode 1396 +#define wxFlexGridSizer_RemoveGrowableCol 1397 +#define wxFlexGridSizer_RemoveGrowableRow 1398 +#define wxFlexGridSizer_SetFlexibleDirection 1399 +#define wxFlexGridSizer_SetNonFlexibleGrowMode 1400 +#define wxFlexGridSizer_destroy 1401 +#define wxGridBagSizer_new 1402 +#define wxGridBagSizer_Add_3_2 1403 +#define wxGridBagSizer_Add_3_1 1404 +#define wxGridBagSizer_Add_4 1405 +#define wxGridBagSizer_Add_1_0 1406 +#define wxGridBagSizer_Add_2_1 1407 +#define wxGridBagSizer_Add_2_0 1408 +#define wxGridBagSizer_Add_3_0 1409 +#define wxGridBagSizer_Add_1_1 1410 +#define wxGridBagSizer_CalcMin 1411 +#define wxGridBagSizer_CheckForIntersection_2 1412 +#define wxGridBagSizer_CheckForIntersection_3 1413 +#define wxGridBagSizer_FindItem_1_1 1414 +#define wxGridBagSizer_FindItem_1_0 1415 +#define wxGridBagSizer_FindItemAtPoint 1416 +#define wxGridBagSizer_FindItemAtPosition 1417 +#define wxGridBagSizer_FindItemWithData 1418 +#define wxGridBagSizer_GetCellSize 1419 +#define wxGridBagSizer_GetEmptyCellSize 1420 +#define wxGridBagSizer_GetItemPosition_1_2 1421 +#define wxGridBagSizer_GetItemPosition_1_1 1422 +#define wxGridBagSizer_GetItemPosition_1_0 1423 +#define wxGridBagSizer_GetItemSpan_1_2 1424 +#define wxGridBagSizer_GetItemSpan_1_1 1425 +#define wxGridBagSizer_GetItemSpan_1_0 1426 +#define wxGridBagSizer_SetEmptyCellSize 1427 +#define wxGridBagSizer_SetItemPosition_2_2 1428 +#define wxGridBagSizer_SetItemPosition_2_1 1429 +#define wxGridBagSizer_SetItemPosition_2_0 1430 +#define wxGridBagSizer_SetItemSpan_2_2 1431 +#define wxGridBagSizer_SetItemSpan_2_1 1432 +#define wxGridBagSizer_SetItemSpan_2_0 1433 +#define wxGridBagSizer_destroy 1434 +#define wxStdDialogButtonSizer_new 1435 +#define wxStdDialogButtonSizer_AddButton 1436 +#define wxStdDialogButtonSizer_Realize 1437 +#define wxStdDialogButtonSizer_SetAffirmativeButton 1438 +#define wxStdDialogButtonSizer_SetCancelButton 1439 +#define wxStdDialogButtonSizer_SetNegativeButton 1440 +#define wxStdDialogButtonSizer_destroy 1441 +#define wxFont_new_0 1442 +#define wxFont_new_1 1443 +#define wxFont_new_5 1444 +#define wxFont_destruct 1446 +#define wxFont_IsFixedWidth 1447 +#define wxFont_GetDefaultEncoding 1448 +#define wxFont_GetFaceName 1449 +#define wxFont_GetFamily 1450 +#define wxFont_GetNativeFontInfoDesc 1451 +#define wxFont_GetNativeFontInfoUserDesc 1452 +#define wxFont_GetPointSize 1453 +#define wxFont_GetStyle 1454 +#define wxFont_GetUnderlined 1455 +#define wxFont_GetWeight 1456 +#define wxFont_Ok 1457 +#define wxFont_SetDefaultEncoding 1458 +#define wxFont_SetFaceName 1459 +#define wxFont_SetFamily 1460 +#define wxFont_SetPointSize 1461 +#define wxFont_SetStyle 1462 +#define wxFont_SetUnderlined 1463 +#define wxFont_SetWeight 1464 +#define wxToolTip_Enable 1465 +#define wxToolTip_SetDelay 1466 +#define wxToolTip_new 1467 +#define wxToolTip_SetTip 1468 +#define wxToolTip_GetTip 1469 +#define wxToolTip_GetWindow 1470 +#define wxToolTip_destroy 1471 +#define wxButton_new_3 1473 +#define wxButton_new_0 1474 +#define wxButton_destruct 1475 +#define wxButton_Create 1476 +#define wxButton_GetDefaultSize 1477 +#define wxButton_SetDefault 1478 +#define wxButton_SetLabel 1479 +#define wxBitmapButton_new_4 1481 +#define wxBitmapButton_new_0 1482 +#define wxBitmapButton_Create 1483 +#define wxBitmapButton_GetBitmapDisabled 1484 +#define wxBitmapButton_GetBitmapFocus 1486 +#define wxBitmapButton_GetBitmapLabel 1488 +#define wxBitmapButton_GetBitmapSelected 1490 +#define wxBitmapButton_SetBitmapDisabled 1492 +#define wxBitmapButton_SetBitmapFocus 1493 +#define wxBitmapButton_SetBitmapLabel 1494 +#define wxBitmapButton_SetBitmapSelected 1495 +#define wxBitmapButton_destroy 1496 +#define wxToggleButton_new_0 1497 +#define wxToggleButton_new_4 1498 +#define wxToggleButton_Create 1499 +#define wxToggleButton_GetValue 1500 +#define wxToggleButton_SetValue 1501 +#define wxToggleButton_destroy 1502 +#define wxCalendarCtrl_new_0 1503 +#define wxCalendarCtrl_new_3 1504 +#define wxCalendarCtrl_Create 1505 +#define wxCalendarCtrl_destruct 1506 +#define wxCalendarCtrl_SetDate 1507 +#define wxCalendarCtrl_GetDate 1508 +#define wxCalendarCtrl_EnableYearChange 1509 +#define wxCalendarCtrl_EnableMonthChange 1510 +#define wxCalendarCtrl_EnableHolidayDisplay 1511 +#define wxCalendarCtrl_SetHeaderColours 1512 +#define wxCalendarCtrl_GetHeaderColourFg 1513 +#define wxCalendarCtrl_GetHeaderColourBg 1514 +#define wxCalendarCtrl_SetHighlightColours 1515 +#define wxCalendarCtrl_GetHighlightColourFg 1516 +#define wxCalendarCtrl_GetHighlightColourBg 1517 +#define wxCalendarCtrl_SetHolidayColours 1518 +#define wxCalendarCtrl_GetHolidayColourFg 1519 +#define wxCalendarCtrl_GetHolidayColourBg 1520 +#define wxCalendarCtrl_GetAttr 1521 +#define wxCalendarCtrl_SetAttr 1522 +#define wxCalendarCtrl_SetHoliday 1523 +#define wxCalendarCtrl_ResetAttr 1524 +#define wxCalendarCtrl_HitTest 1525 +#define wxCalendarDateAttr_new_0 1526 +#define wxCalendarDateAttr_new_2_1 1527 +#define wxCalendarDateAttr_new_2_0 1528 +#define wxCalendarDateAttr_SetTextColour 1529 +#define wxCalendarDateAttr_SetBackgroundColour 1530 +#define wxCalendarDateAttr_SetBorderColour 1531 +#define wxCalendarDateAttr_SetFont 1532 +#define wxCalendarDateAttr_SetBorder 1533 +#define wxCalendarDateAttr_SetHoliday 1534 +#define wxCalendarDateAttr_HasTextColour 1535 +#define wxCalendarDateAttr_HasBackgroundColour 1536 +#define wxCalendarDateAttr_HasBorderColour 1537 +#define wxCalendarDateAttr_HasFont 1538 +#define wxCalendarDateAttr_HasBorder 1539 +#define wxCalendarDateAttr_IsHoliday 1540 +#define wxCalendarDateAttr_GetTextColour 1541 +#define wxCalendarDateAttr_GetBackgroundColour 1542 +#define wxCalendarDateAttr_GetBorderColour 1543 +#define wxCalendarDateAttr_GetFont 1544 +#define wxCalendarDateAttr_GetBorder 1545 +#define wxCalendarDateAttr_destroy 1546 +#define wxCheckBox_new_4 1548 +#define wxCheckBox_new_0 1549 +#define wxCheckBox_Create 1550 +#define wxCheckBox_GetValue 1551 +#define wxCheckBox_Get3StateValue 1552 +#define wxCheckBox_Is3rdStateAllowedForUser 1553 +#define wxCheckBox_Is3State 1554 +#define wxCheckBox_IsChecked 1555 +#define wxCheckBox_SetValue 1556 +#define wxCheckBox_Set3StateValue 1557 +#define wxCheckBox_destroy 1558 +#define wxCheckListBox_new_0 1559 +#define wxCheckListBox_new_3 1561 +#define wxCheckListBox_Check 1562 +#define wxCheckListBox_IsChecked 1563 +#define wxCheckListBox_destroy 1564 +#define wxChoice_new_3 1567 +#define wxChoice_new_0 1568 +#define wxChoice_destruct 1570 +#define wxChoice_Create 1572 +#define wxChoice_Delete 1573 +#define wxChoice_GetColumns 1574 +#define wxChoice_SetColumns 1575 +#define wxComboBox_new_0 1576 +#define wxComboBox_new_3 1578 +#define wxComboBox_destruct 1579 +#define wxComboBox_Create 1581 +#define wxComboBox_CanCopy 1582 +#define wxComboBox_CanCut 1583 +#define wxComboBox_CanPaste 1584 +#define wxComboBox_CanRedo 1585 +#define wxComboBox_CanUndo 1586 +#define wxComboBox_Copy 1587 +#define wxComboBox_Cut 1588 +#define wxComboBox_GetInsertionPoint 1589 +#define wxComboBox_GetLastPosition 1590 +#define wxComboBox_GetValue 1591 +#define wxComboBox_Paste 1592 +#define wxComboBox_Redo 1593 +#define wxComboBox_Replace 1594 +#define wxComboBox_Remove 1595 +#define wxComboBox_SetInsertionPoint 1596 +#define wxComboBox_SetInsertionPointEnd 1597 +#define wxComboBox_SetSelection_1 1598 +#define wxComboBox_SetSelection_2 1599 +#define wxComboBox_SetValue 1600 +#define wxComboBox_Undo 1601 +#define wxGauge_new_0 1602 +#define wxGauge_new_4 1603 +#define wxGauge_Create 1604 +#define wxGauge_GetBezelFace 1605 +#define wxGauge_GetRange 1606 +#define wxGauge_GetShadowWidth 1607 +#define wxGauge_GetValue 1608 +#define wxGauge_IsVertical 1609 +#define wxGauge_SetBezelFace 1610 +#define wxGauge_SetRange 1611 +#define wxGauge_SetShadowWidth 1612 +#define wxGauge_SetValue 1613 +#define wxGauge_Pulse 1614 +#define wxGauge_destroy 1615 +#define wxGenericDirCtrl_new_0 1616 +#define wxGenericDirCtrl_new_2 1617 +#define wxGenericDirCtrl_destruct 1618 +#define wxGenericDirCtrl_Create 1619 +#define wxGenericDirCtrl_Init 1620 +#define wxGenericDirCtrl_CollapseTree 1621 +#define wxGenericDirCtrl_ExpandPath 1622 +#define wxGenericDirCtrl_GetDefaultPath 1623 +#define wxGenericDirCtrl_GetPath 1624 +#define wxGenericDirCtrl_GetFilePath 1625 +#define wxGenericDirCtrl_GetFilter 1626 +#define wxGenericDirCtrl_GetFilterIndex 1627 +#define wxGenericDirCtrl_GetRootId 1628 +#define wxGenericDirCtrl_GetTreeCtrl 1629 +#define wxGenericDirCtrl_ReCreateTree 1630 +#define wxGenericDirCtrl_SetDefaultPath 1631 +#define wxGenericDirCtrl_SetFilter 1632 +#define wxGenericDirCtrl_SetFilterIndex 1633 +#define wxGenericDirCtrl_SetPath 1634 +#define wxStaticBox_new_4 1636 +#define wxStaticBox_new_0 1637 +#define wxStaticBox_Create 1638 +#define wxStaticBox_destroy 1639 +#define wxStaticLine_new_2 1641 +#define wxStaticLine_new_0 1642 +#define wxStaticLine_Create 1643 +#define wxStaticLine_IsVertical 1644 +#define wxStaticLine_GetDefaultSize 1645 +#define wxStaticLine_destroy 1646 +#define wxListBox_new_3 1649 +#define wxListBox_new_0 1650 +#define wxListBox_destruct 1652 +#define wxListBox_Create 1654 +#define wxListBox_Deselect 1655 +#define wxListBox_GetSelections 1656 +#define wxListBox_InsertItems 1657 +#define wxListBox_IsSelected 1658 +#define wxListBox_Set 1659 +#define wxListBox_HitTest 1660 +#define wxListBox_SetFirstItem_1_0 1661 +#define wxListBox_SetFirstItem_1_1 1662 +#define wxListCtrl_new_0 1663 +#define wxListCtrl_new_2 1664 +#define wxListCtrl_Arrange 1665 +#define wxListCtrl_AssignImageList 1666 +#define wxListCtrl_ClearAll 1667 +#define wxListCtrl_Create 1668 +#define wxListCtrl_DeleteAllItems 1669 +#define wxListCtrl_DeleteColumn 1670 +#define wxListCtrl_DeleteItem 1671 +#define wxListCtrl_EditLabel 1672 +#define wxListCtrl_EnsureVisible 1673 +#define wxListCtrl_FindItem_3_0 1674 +#define wxListCtrl_FindItem_3_1 1675 +#define wxListCtrl_GetColumn 1676 +#define wxListCtrl_GetColumnCount 1677 +#define wxListCtrl_GetColumnWidth 1678 +#define wxListCtrl_GetCountPerPage 1679 +#define wxListCtrl_GetEditControl 1680 +#define wxListCtrl_GetImageList 1681 +#define wxListCtrl_GetItem 1682 +#define wxListCtrl_GetItemBackgroundColour 1683 +#define wxListCtrl_GetItemCount 1684 +#define wxListCtrl_GetItemData 1685 +#define wxListCtrl_GetItemFont 1686 +#define wxListCtrl_GetItemPosition 1687 +#define wxListCtrl_GetItemRect 1688 +#define wxListCtrl_GetItemSpacing 1689 +#define wxListCtrl_GetItemState 1690 +#define wxListCtrl_GetItemText 1691 +#define wxListCtrl_GetItemTextColour 1692 +#define wxListCtrl_GetNextItem 1693 +#define wxListCtrl_GetSelectedItemCount 1694 +#define wxListCtrl_GetTextColour 1695 +#define wxListCtrl_GetTopItem 1696 +#define wxListCtrl_GetViewRect 1697 +#define wxListCtrl_HitTest 1698 +#define wxListCtrl_InsertColumn_2 1699 +#define wxListCtrl_InsertColumn_3 1700 +#define wxListCtrl_InsertItem_1 1701 +#define wxListCtrl_InsertItem_2_1 1702 +#define wxListCtrl_InsertItem_2_0 1703 +#define wxListCtrl_InsertItem_3 1704 +#define wxListCtrl_RefreshItem 1705 +#define wxListCtrl_RefreshItems 1706 +#define wxListCtrl_ScrollList 1707 +#define wxListCtrl_SetBackgroundColour 1708 +#define wxListCtrl_SetColumn 1709 +#define wxListCtrl_SetColumnWidth 1710 +#define wxListCtrl_SetImageList 1711 +#define wxListCtrl_SetItem_1 1712 +#define wxListCtrl_SetItem_4 1713 +#define wxListCtrl_SetItemBackgroundColour 1714 +#define wxListCtrl_SetItemCount 1715 +#define wxListCtrl_SetItemData 1716 +#define wxListCtrl_SetItemFont 1717 +#define wxListCtrl_SetItemImage 1718 +#define wxListCtrl_SetItemColumnImage 1719 +#define wxListCtrl_SetItemPosition 1720 +#define wxListCtrl_SetItemState 1721 +#define wxListCtrl_SetItemText 1722 +#define wxListCtrl_SetItemTextColour 1723 +#define wxListCtrl_SetSingleStyle 1724 +#define wxListCtrl_SetTextColour 1725 +#define wxListCtrl_SetWindowStyleFlag 1726 +#define wxListCtrl_SortItems 1727 +#define wxListCtrl_destroy 1728 +#define wxListView_ClearColumnImage 1729 +#define wxListView_Focus 1730 +#define wxListView_GetFirstSelected 1731 +#define wxListView_GetFocusedItem 1732 +#define wxListView_GetNextSelected 1733 +#define wxListView_IsSelected 1734 +#define wxListView_Select 1735 +#define wxListView_SetColumnImage 1736 +#define wxListItem_new_0 1737 +#define wxListItem_new_1 1738 +#define wxListItem_destruct 1739 +#define wxListItem_Clear 1740 +#define wxListItem_GetAlign 1741 +#define wxListItem_GetBackgroundColour 1742 +#define wxListItem_GetColumn 1743 +#define wxListItem_GetFont 1744 +#define wxListItem_GetId 1745 +#define wxListItem_GetImage 1746 +#define wxListItem_GetMask 1747 +#define wxListItem_GetState 1748 +#define wxListItem_GetText 1749 +#define wxListItem_GetTextColour 1750 +#define wxListItem_GetWidth 1751 +#define wxListItem_SetAlign 1752 +#define wxListItem_SetBackgroundColour 1753 +#define wxListItem_SetColumn 1754 +#define wxListItem_SetFont 1755 +#define wxListItem_SetId 1756 +#define wxListItem_SetImage 1757 +#define wxListItem_SetMask 1758 +#define wxListItem_SetState 1759 +#define wxListItem_SetStateMask 1760 +#define wxListItem_SetText 1761 +#define wxListItem_SetTextColour 1762 +#define wxListItem_SetWidth 1763 +#define wxListItemAttr_new_0 1764 +#define wxListItemAttr_new_3 1765 +#define wxListItemAttr_GetBackgroundColour 1766 +#define wxListItemAttr_GetFont 1767 +#define wxListItemAttr_GetTextColour 1768 +#define wxListItemAttr_HasBackgroundColour 1769 +#define wxListItemAttr_HasFont 1770 +#define wxListItemAttr_HasTextColour 1771 +#define wxListItemAttr_SetBackgroundColour 1772 +#define wxListItemAttr_SetFont 1773 +#define wxListItemAttr_SetTextColour 1774 +#define wxListItemAttr_destroy 1775 +#define wxImageList_new_0 1776 +#define wxImageList_new_3 1777 +#define wxImageList_Add_1 1778 +#define wxImageList_Add_2_0 1779 +#define wxImageList_Add_2_1 1780 +#define wxImageList_Create 1781 +#define wxImageList_Draw 1783 +#define wxImageList_GetBitmap 1784 +#define wxImageList_GetIcon 1785 +#define wxImageList_GetImageCount 1786 +#define wxImageList_GetSize 1787 +#define wxImageList_Remove 1788 +#define wxImageList_RemoveAll 1789 +#define wxImageList_Replace_2 1790 +#define wxImageList_Replace_3 1791 +#define wxImageList_destroy 1792 +#define wxTextAttr_new_0 1793 +#define wxTextAttr_new_2 1794 +#define wxTextAttr_GetAlignment 1795 +#define wxTextAttr_GetBackgroundColour 1796 +#define wxTextAttr_GetFont 1797 +#define wxTextAttr_GetLeftIndent 1798 +#define wxTextAttr_GetLeftSubIndent 1799 +#define wxTextAttr_GetRightIndent 1800 +#define wxTextAttr_GetTabs 1801 +#define wxTextAttr_GetTextColour 1802 +#define wxTextAttr_HasBackgroundColour 1803 +#define wxTextAttr_HasFont 1804 +#define wxTextAttr_HasTextColour 1805 +#define wxTextAttr_GetFlags 1806 +#define wxTextAttr_IsDefault 1807 +#define wxTextAttr_SetAlignment 1808 +#define wxTextAttr_SetBackgroundColour 1809 +#define wxTextAttr_SetFlags 1810 +#define wxTextAttr_SetFont 1811 +#define wxTextAttr_SetLeftIndent 1812 +#define wxTextAttr_SetRightIndent 1813 +#define wxTextAttr_SetTabs 1814 +#define wxTextAttr_SetTextColour 1815 +#define wxTextAttr_destroy 1816 +#define wxTextCtrl_new_3 1818 +#define wxTextCtrl_new_0 1819 +#define wxTextCtrl_destruct 1821 +#define wxTextCtrl_AppendText 1822 +#define wxTextCtrl_CanCopy 1823 +#define wxTextCtrl_CanCut 1824 +#define wxTextCtrl_CanPaste 1825 +#define wxTextCtrl_CanRedo 1826 +#define wxTextCtrl_CanUndo 1827 +#define wxTextCtrl_Clear 1828 +#define wxTextCtrl_Copy 1829 +#define wxTextCtrl_Create 1830 +#define wxTextCtrl_Cut 1831 +#define wxTextCtrl_DiscardEdits 1832 +#define wxTextCtrl_ChangeValue 1833 +#define wxTextCtrl_EmulateKeyPress 1834 +#define wxTextCtrl_GetDefaultStyle 1835 +#define wxTextCtrl_GetInsertionPoint 1836 +#define wxTextCtrl_GetLastPosition 1837 +#define wxTextCtrl_GetLineLength 1838 +#define wxTextCtrl_GetLineText 1839 +#define wxTextCtrl_GetNumberOfLines 1840 +#define wxTextCtrl_GetRange 1841 +#define wxTextCtrl_GetSelection 1842 +#define wxTextCtrl_GetStringSelection 1843 +#define wxTextCtrl_GetStyle 1844 +#define wxTextCtrl_GetValue 1845 +#define wxTextCtrl_IsEditable 1846 +#define wxTextCtrl_IsModified 1847 +#define wxTextCtrl_IsMultiLine 1848 +#define wxTextCtrl_IsSingleLine 1849 +#define wxTextCtrl_LoadFile 1850 +#define wxTextCtrl_MarkDirty 1851 +#define wxTextCtrl_Paste 1852 +#define wxTextCtrl_PositionToXY 1853 +#define wxTextCtrl_Redo 1854 +#define wxTextCtrl_Remove 1855 +#define wxTextCtrl_Replace 1856 +#define wxTextCtrl_SaveFile 1857 +#define wxTextCtrl_SetDefaultStyle 1858 +#define wxTextCtrl_SetEditable 1859 +#define wxTextCtrl_SetInsertionPoint 1860 +#define wxTextCtrl_SetInsertionPointEnd 1861 +#define wxTextCtrl_SetMaxLength 1863 +#define wxTextCtrl_SetSelection 1864 +#define wxTextCtrl_SetStyle 1865 +#define wxTextCtrl_SetValue 1866 +#define wxTextCtrl_ShowPosition 1867 +#define wxTextCtrl_Undo 1868 +#define wxTextCtrl_WriteText 1869 +#define wxTextCtrl_XYToPosition 1870 +#define wxNotebook_new_0 1873 +#define wxNotebook_new_3 1874 +#define wxNotebook_destruct 1875 +#define wxNotebook_AddPage 1876 +#define wxNotebook_AdvanceSelection 1877 +#define wxNotebook_AssignImageList 1878 +#define wxNotebook_Create 1879 +#define wxNotebook_DeleteAllPages 1880 +#define wxNotebook_DeletePage 1881 +#define wxNotebook_RemovePage 1882 +#define wxNotebook_GetCurrentPage 1883 +#define wxNotebook_GetImageList 1884 +#define wxNotebook_GetPage 1886 +#define wxNotebook_GetPageCount 1887 +#define wxNotebook_GetPageImage 1888 +#define wxNotebook_GetPageText 1889 +#define wxNotebook_GetRowCount 1890 +#define wxNotebook_GetSelection 1891 +#define wxNotebook_GetThemeBackgroundColour 1892 +#define wxNotebook_HitTest 1894 +#define wxNotebook_InsertPage 1896 +#define wxNotebook_SetImageList 1897 +#define wxNotebook_SetPadding 1898 +#define wxNotebook_SetPageSize 1899 +#define wxNotebook_SetPageImage 1900 +#define wxNotebook_SetPageText 1901 +#define wxNotebook_SetSelection 1902 +#define wxNotebook_ChangeSelection 1903 +#define wxChoicebook_new_0 1904 +#define wxChoicebook_new_3 1905 +#define wxChoicebook_AddPage 1906 +#define wxChoicebook_AdvanceSelection 1907 +#define wxChoicebook_AssignImageList 1908 +#define wxChoicebook_Create 1909 +#define wxChoicebook_DeleteAllPages 1910 +#define wxChoicebook_DeletePage 1911 +#define wxChoicebook_RemovePage 1912 +#define wxChoicebook_GetCurrentPage 1913 +#define wxChoicebook_GetImageList 1914 +#define wxChoicebook_GetPage 1916 +#define wxChoicebook_GetPageCount 1917 +#define wxChoicebook_GetPageImage 1918 +#define wxChoicebook_GetPageText 1919 +#define wxChoicebook_GetSelection 1920 +#define wxChoicebook_HitTest 1921 +#define wxChoicebook_InsertPage 1922 +#define wxChoicebook_SetImageList 1923 +#define wxChoicebook_SetPageSize 1924 +#define wxChoicebook_SetPageImage 1925 +#define wxChoicebook_SetPageText 1926 +#define wxChoicebook_SetSelection 1927 +#define wxChoicebook_ChangeSelection 1928 +#define wxChoicebook_destroy 1929 +#define wxToolbook_new_0 1930 +#define wxToolbook_new_3 1931 +#define wxToolbook_AddPage 1932 +#define wxToolbook_AdvanceSelection 1933 +#define wxToolbook_AssignImageList 1934 +#define wxToolbook_Create 1935 +#define wxToolbook_DeleteAllPages 1936 +#define wxToolbook_DeletePage 1937 +#define wxToolbook_RemovePage 1938 +#define wxToolbook_GetCurrentPage 1939 +#define wxToolbook_GetImageList 1940 +#define wxToolbook_GetPage 1942 +#define wxToolbook_GetPageCount 1943 +#define wxToolbook_GetPageImage 1944 +#define wxToolbook_GetPageText 1945 +#define wxToolbook_GetSelection 1946 +#define wxToolbook_HitTest 1948 +#define wxToolbook_InsertPage 1949 +#define wxToolbook_SetImageList 1950 +#define wxToolbook_SetPageSize 1951 +#define wxToolbook_SetPageImage 1952 +#define wxToolbook_SetPageText 1953 +#define wxToolbook_SetSelection 1954 +#define wxToolbook_ChangeSelection 1955 +#define wxToolbook_destroy 1956 +#define wxListbook_new_0 1957 +#define wxListbook_new_3 1958 +#define wxListbook_AddPage 1959 +#define wxListbook_AdvanceSelection 1960 +#define wxListbook_AssignImageList 1961 +#define wxListbook_Create 1962 +#define wxListbook_DeleteAllPages 1963 +#define wxListbook_DeletePage 1964 +#define wxListbook_RemovePage 1965 +#define wxListbook_GetCurrentPage 1966 +#define wxListbook_GetImageList 1967 +#define wxListbook_GetPage 1969 +#define wxListbook_GetPageCount 1970 +#define wxListbook_GetPageImage 1971 +#define wxListbook_GetPageText 1972 +#define wxListbook_GetSelection 1973 +#define wxListbook_HitTest 1975 +#define wxListbook_InsertPage 1976 +#define wxListbook_SetImageList 1977 +#define wxListbook_SetPageSize 1978 +#define wxListbook_SetPageImage 1979 +#define wxListbook_SetPageText 1980 +#define wxListbook_SetSelection 1981 +#define wxListbook_ChangeSelection 1982 +#define wxListbook_destroy 1983 +#define wxTreebook_new_0 1984 +#define wxTreebook_new_3 1985 +#define wxTreebook_AddPage 1986 +#define wxTreebook_AdvanceSelection 1987 +#define wxTreebook_AssignImageList 1988 +#define wxTreebook_Create 1989 +#define wxTreebook_DeleteAllPages 1990 +#define wxTreebook_DeletePage 1991 +#define wxTreebook_RemovePage 1992 +#define wxTreebook_GetCurrentPage 1993 +#define wxTreebook_GetImageList 1994 +#define wxTreebook_GetPage 1996 +#define wxTreebook_GetPageCount 1997 +#define wxTreebook_GetPageImage 1998 +#define wxTreebook_GetPageText 1999 +#define wxTreebook_GetSelection 2000 +#define wxTreebook_ExpandNode 2001 +#define wxTreebook_IsNodeExpanded 2002 +#define wxTreebook_HitTest 2004 +#define wxTreebook_InsertPage 2005 +#define wxTreebook_InsertSubPage 2006 +#define wxTreebook_SetImageList 2007 +#define wxTreebook_SetPageSize 2008 +#define wxTreebook_SetPageImage 2009 +#define wxTreebook_SetPageText 2010 +#define wxTreebook_SetSelection 2011 +#define wxTreebook_ChangeSelection 2012 +#define wxTreebook_destroy 2013 +#define wxTreeCtrl_new_2 2016 +#define wxTreeCtrl_new_0 2017 +#define wxTreeCtrl_destruct 2019 +#define wxTreeCtrl_AddRoot 2020 +#define wxTreeCtrl_AppendItem 2021 +#define wxTreeCtrl_AssignImageList 2022 +#define wxTreeCtrl_AssignStateImageList 2023 +#define wxTreeCtrl_Collapse 2024 +#define wxTreeCtrl_CollapseAndReset 2025 +#define wxTreeCtrl_Create 2026 +#define wxTreeCtrl_Delete 2027 +#define wxTreeCtrl_DeleteAllItems 2028 +#define wxTreeCtrl_DeleteChildren 2029 +#define wxTreeCtrl_EditLabel 2030 +#define wxTreeCtrl_EnsureVisible 2031 +#define wxTreeCtrl_Expand 2032 +#define wxTreeCtrl_GetBoundingRect 2033 +#define wxTreeCtrl_GetChildrenCount 2035 +#define wxTreeCtrl_GetCount 2036 +#define wxTreeCtrl_GetEditControl 2037 +#define wxTreeCtrl_GetFirstChild 2038 +#define wxTreeCtrl_GetNextChild 2039 +#define wxTreeCtrl_GetFirstVisibleItem 2040 +#define wxTreeCtrl_GetImageList 2041 +#define wxTreeCtrl_GetIndent 2042 +#define wxTreeCtrl_GetItemBackgroundColour 2043 +#define wxTreeCtrl_GetItemData 2044 +#define wxTreeCtrl_GetItemFont 2045 +#define wxTreeCtrl_GetItemImage_1 2046 +#define wxTreeCtrl_GetItemImage_2 2047 +#define wxTreeCtrl_GetItemText 2048 +#define wxTreeCtrl_GetItemTextColour 2049 +#define wxTreeCtrl_GetLastChild 2050 +#define wxTreeCtrl_GetNextSibling 2051 +#define wxTreeCtrl_GetNextVisible 2052 +#define wxTreeCtrl_GetItemParent 2053 +#define wxTreeCtrl_GetPrevSibling 2054 +#define wxTreeCtrl_GetPrevVisible 2055 +#define wxTreeCtrl_GetRootItem 2056 +#define wxTreeCtrl_GetSelection 2057 +#define wxTreeCtrl_GetSelections 2058 +#define wxTreeCtrl_GetStateImageList 2059 +#define wxTreeCtrl_HitTest 2060 +#define wxTreeCtrl_InsertItem 2062 +#define wxTreeCtrl_IsBold 2063 +#define wxTreeCtrl_IsExpanded 2064 +#define wxTreeCtrl_IsSelected 2065 +#define wxTreeCtrl_IsVisible 2066 +#define wxTreeCtrl_ItemHasChildren 2067 +#define wxTreeCtrl_IsTreeItemIdOk 2068 +#define wxTreeCtrl_PrependItem 2069 +#define wxTreeCtrl_ScrollTo 2070 +#define wxTreeCtrl_SelectItem_1 2071 +#define wxTreeCtrl_SelectItem_2 2072 +#define wxTreeCtrl_SetIndent 2073 +#define wxTreeCtrl_SetImageList 2074 +#define wxTreeCtrl_SetItemBackgroundColour 2075 +#define wxTreeCtrl_SetItemBold 2076 +#define wxTreeCtrl_SetItemData 2077 +#define wxTreeCtrl_SetItemDropHighlight 2078 +#define wxTreeCtrl_SetItemFont 2079 +#define wxTreeCtrl_SetItemHasChildren 2080 +#define wxTreeCtrl_SetItemImage_2 2081 +#define wxTreeCtrl_SetItemImage_3 2082 +#define wxTreeCtrl_SetItemText 2083 +#define wxTreeCtrl_SetItemTextColour 2084 +#define wxTreeCtrl_SetStateImageList 2085 +#define wxTreeCtrl_SetWindowStyle 2086 +#define wxTreeCtrl_SortChildren 2087 +#define wxTreeCtrl_Toggle 2088 +#define wxTreeCtrl_ToggleItemSelection 2089 +#define wxTreeCtrl_Unselect 2090 +#define wxTreeCtrl_UnselectAll 2091 +#define wxTreeCtrl_UnselectItem 2092 +#define wxScrollBar_new_0 2093 +#define wxScrollBar_new_3 2094 +#define wxScrollBar_destruct 2095 +#define wxScrollBar_Create 2096 +#define wxScrollBar_GetRange 2097 +#define wxScrollBar_GetPageSize 2098 +#define wxScrollBar_GetThumbPosition 2099 +#define wxScrollBar_GetThumbSize 2100 +#define wxScrollBar_SetThumbPosition 2101 +#define wxScrollBar_SetScrollbar 2102 +#define wxSpinButton_new_2 2104 +#define wxSpinButton_new_0 2105 +#define wxSpinButton_Create 2106 +#define wxSpinButton_GetMax 2107 +#define wxSpinButton_GetMin 2108 +#define wxSpinButton_GetValue 2109 +#define wxSpinButton_SetRange 2110 +#define wxSpinButton_SetValue 2111 +#define wxSpinButton_destroy 2112 +#define wxSpinCtrl_new_0 2113 +#define wxSpinCtrl_new_2 2114 +#define wxSpinCtrl_Create 2116 +#define wxSpinCtrl_SetValue_1_1 2119 +#define wxSpinCtrl_SetValue_1_0 2120 +#define wxSpinCtrl_GetValue 2122 +#define wxSpinCtrl_SetRange 2124 +#define wxSpinCtrl_SetSelection 2125 +#define wxSpinCtrl_GetMin 2127 +#define wxSpinCtrl_GetMax 2129 +#define wxSpinCtrl_destroy 2130 +#define wxStaticText_new_0 2131 +#define wxStaticText_new_4 2132 +#define wxStaticText_Create 2133 +#define wxStaticText_GetLabel 2134 +#define wxStaticText_SetLabel 2135 +#define wxStaticText_Wrap 2136 +#define wxStaticText_destroy 2137 +#define wxStaticBitmap_new_0 2138 +#define wxStaticBitmap_new_4 2139 +#define wxStaticBitmap_Create 2140 +#define wxStaticBitmap_GetBitmap 2141 +#define wxStaticBitmap_SetBitmap 2142 +#define wxStaticBitmap_destroy 2143 +#define wxRadioBox_new 2144 +#define wxRadioBox_destruct 2146 +#define wxRadioBox_Create 2147 +#define wxRadioBox_Enable_2 2148 +#define wxRadioBox_Enable_1 2149 +#define wxRadioBox_GetSelection 2150 +#define wxRadioBox_GetString 2151 +#define wxRadioBox_SetSelection 2152 +#define wxRadioBox_Show_2 2153 +#define wxRadioBox_Show_1 2154 +#define wxRadioBox_GetColumnCount 2155 +#define wxRadioBox_GetItemHelpText 2156 +#define wxRadioBox_GetItemToolTip 2157 +#define wxRadioBox_GetItemFromPoint 2159 +#define wxRadioBox_GetRowCount 2160 +#define wxRadioBox_IsItemEnabled 2161 +#define wxRadioBox_IsItemShown 2162 +#define wxRadioBox_SetItemHelpText 2163 +#define wxRadioBox_SetItemToolTip 2164 +#define wxRadioButton_new_0 2165 +#define wxRadioButton_new_4 2166 +#define wxRadioButton_Create 2167 +#define wxRadioButton_GetValue 2168 +#define wxRadioButton_SetValue 2169 +#define wxRadioButton_destroy 2170 +#define wxSlider_new_6 2172 +#define wxSlider_new_0 2173 +#define wxSlider_Create 2174 +#define wxSlider_GetLineSize 2175 +#define wxSlider_GetMax 2176 +#define wxSlider_GetMin 2177 +#define wxSlider_GetPageSize 2178 +#define wxSlider_GetThumbLength 2179 +#define wxSlider_GetValue 2180 +#define wxSlider_SetLineSize 2181 +#define wxSlider_SetPageSize 2182 +#define wxSlider_SetRange 2183 +#define wxSlider_SetThumbLength 2184 +#define wxSlider_SetValue 2185 +#define wxSlider_destroy 2186 +#define wxDialog_new_4 2188 +#define wxDialog_new_0 2189 +#define wxDialog_destruct 2191 +#define wxDialog_Create 2192 +#define wxDialog_CreateButtonSizer 2193 +#define wxDialog_CreateStdDialogButtonSizer 2194 +#define wxDialog_EndModal 2195 +#define wxDialog_GetAffirmativeId 2196 +#define wxDialog_GetReturnCode 2197 +#define wxDialog_IsModal 2198 +#define wxDialog_SetAffirmativeId 2199 +#define wxDialog_SetReturnCode 2200 +#define wxDialog_Show 2201 +#define wxDialog_ShowModal 2202 +#define wxColourDialog_new_0 2203 +#define wxColourDialog_new_2 2204 +#define wxColourDialog_destruct 2205 +#define wxColourDialog_Create 2206 +#define wxColourDialog_GetColourData 2207 +#define wxColourData_new_0 2208 +#define wxColourData_new_1 2209 +#define wxColourData_destruct 2210 +#define wxColourData_GetChooseFull 2211 +#define wxColourData_GetColour 2212 +#define wxColourData_GetCustomColour 2214 +#define wxColourData_SetChooseFull 2215 +#define wxColourData_SetColour 2216 +#define wxColourData_SetCustomColour 2217 +#define wxPalette_new_0 2218 +#define wxPalette_new_4 2219 +#define wxPalette_destruct 2221 +#define wxPalette_Create 2222 +#define wxPalette_GetColoursCount 2223 +#define wxPalette_GetPixel 2224 +#define wxPalette_GetRGB 2225 +#define wxPalette_IsOk 2226 +#define wxDirDialog_new 2230 +#define wxDirDialog_destruct 2231 +#define wxDirDialog_GetPath 2232 +#define wxDirDialog_GetMessage 2233 +#define wxDirDialog_SetMessage 2234 +#define wxDirDialog_SetPath 2235 +#define wxFileDialog_new 2239 +#define wxFileDialog_destruct 2240 +#define wxFileDialog_GetDirectory 2241 +#define wxFileDialog_GetFilename 2242 +#define wxFileDialog_GetFilenames 2243 +#define wxFileDialog_GetFilterIndex 2244 +#define wxFileDialog_GetMessage 2245 +#define wxFileDialog_GetPath 2246 +#define wxFileDialog_GetPaths 2247 +#define wxFileDialog_GetWildcard 2248 +#define wxFileDialog_SetDirectory 2249 +#define wxFileDialog_SetFilename 2250 +#define wxFileDialog_SetFilterIndex 2251 +#define wxFileDialog_SetMessage 2252 +#define wxFileDialog_SetPath 2253 +#define wxFileDialog_SetWildcard 2254 +#define wxPickerBase_SetInternalMargin 2255 +#define wxPickerBase_GetInternalMargin 2256 +#define wxPickerBase_SetTextCtrlProportion 2257 +#define wxPickerBase_SetPickerCtrlProportion 2258 +#define wxPickerBase_GetTextCtrlProportion 2259 +#define wxPickerBase_GetPickerCtrlProportion 2260 +#define wxPickerBase_HasTextCtrl 2261 +#define wxPickerBase_GetTextCtrl 2262 +#define wxPickerBase_IsTextCtrlGrowable 2263 +#define wxPickerBase_SetPickerCtrlGrowable 2264 +#define wxPickerBase_SetTextCtrlGrowable 2265 +#define wxPickerBase_IsPickerCtrlGrowable 2266 +#define wxFilePickerCtrl_new_0 2267 +#define wxFilePickerCtrl_new_3 2268 +#define wxFilePickerCtrl_Create 2269 +#define wxFilePickerCtrl_GetPath 2270 +#define wxFilePickerCtrl_SetPath 2271 +#define wxFilePickerCtrl_destroy 2272 +#define wxDirPickerCtrl_new_0 2273 +#define wxDirPickerCtrl_new_3 2274 +#define wxDirPickerCtrl_Create 2275 +#define wxDirPickerCtrl_GetPath 2276 +#define wxDirPickerCtrl_SetPath 2277 +#define wxDirPickerCtrl_destroy 2278 +#define wxColourPickerCtrl_new_0 2279 +#define wxColourPickerCtrl_new_3 2280 +#define wxColourPickerCtrl_Create 2281 +#define wxColourPickerCtrl_GetColour 2282 +#define wxColourPickerCtrl_SetColour_1_1 2283 +#define wxColourPickerCtrl_SetColour_1_0 2284 +#define wxColourPickerCtrl_destroy 2285 +#define wxDatePickerCtrl_new_0 2286 +#define wxDatePickerCtrl_new_3 2287 +#define wxDatePickerCtrl_GetRange 2288 +#define wxDatePickerCtrl_GetValue 2289 +#define wxDatePickerCtrl_SetRange 2290 +#define wxDatePickerCtrl_SetValue 2291 +#define wxDatePickerCtrl_destroy 2292 +#define wxFontPickerCtrl_new_0 2293 +#define wxFontPickerCtrl_new_3 2294 +#define wxFontPickerCtrl_Create 2295 +#define wxFontPickerCtrl_GetSelectedFont 2296 +#define wxFontPickerCtrl_SetSelectedFont 2297 +#define wxFontPickerCtrl_GetMaxPointSize 2298 +#define wxFontPickerCtrl_SetMaxPointSize 2299 +#define wxFontPickerCtrl_destroy 2300 +#define wxFindReplaceDialog_new_0 2303 +#define wxFindReplaceDialog_new_4 2304 +#define wxFindReplaceDialog_destruct 2305 +#define wxFindReplaceDialog_Create 2306 +#define wxFindReplaceDialog_GetData 2307 +#define wxFindReplaceData_new_0 2308 +#define wxFindReplaceData_new_1 2309 +#define wxFindReplaceData_GetFindString 2310 +#define wxFindReplaceData_GetReplaceString 2311 +#define wxFindReplaceData_GetFlags 2312 +#define wxFindReplaceData_SetFlags 2313 +#define wxFindReplaceData_SetFindString 2314 +#define wxFindReplaceData_SetReplaceString 2315 +#define wxFindReplaceData_destroy 2316 +#define wxMultiChoiceDialog_new_0 2317 +#define wxMultiChoiceDialog_new_5 2319 +#define wxMultiChoiceDialog_GetSelections 2320 +#define wxMultiChoiceDialog_SetSelections 2321 +#define wxMultiChoiceDialog_destroy 2322 +#define wxSingleChoiceDialog_new_0 2323 +#define wxSingleChoiceDialog_new_5 2325 +#define wxSingleChoiceDialog_GetSelection 2326 +#define wxSingleChoiceDialog_GetStringSelection 2327 +#define wxSingleChoiceDialog_SetSelection 2328 +#define wxSingleChoiceDialog_destroy 2329 +#define wxTextEntryDialog_new 2330 +#define wxTextEntryDialog_GetValue 2331 +#define wxTextEntryDialog_SetValue 2332 +#define wxTextEntryDialog_destroy 2333 +#define wxPasswordEntryDialog_new 2334 +#define wxPasswordEntryDialog_destroy 2335 +#define wxFontData_new_0 2336 +#define wxFontData_new_1 2337 +#define wxFontData_destruct 2338 +#define wxFontData_EnableEffects 2339 +#define wxFontData_GetAllowSymbols 2340 +#define wxFontData_GetColour 2341 +#define wxFontData_GetChosenFont 2342 +#define wxFontData_GetEnableEffects 2343 +#define wxFontData_GetInitialFont 2344 +#define wxFontData_GetShowHelp 2345 +#define wxFontData_SetAllowSymbols 2346 +#define wxFontData_SetChosenFont 2347 +#define wxFontData_SetColour 2348 +#define wxFontData_SetInitialFont 2349 +#define wxFontData_SetRange 2350 +#define wxFontData_SetShowHelp 2351 +#define wxFontDialog_new_0 2355 +#define wxFontDialog_new_2 2357 +#define wxFontDialog_Create 2359 +#define wxFontDialog_GetFontData 2360 +#define wxFontDialog_destroy 2362 +#define wxProgressDialog_new 2363 +#define wxProgressDialog_destruct 2364 +#define wxProgressDialog_Resume 2365 +#define wxProgressDialog_Update_2 2366 +#define wxProgressDialog_Update_0 2367 +#define wxMessageDialog_new 2368 +#define wxMessageDialog_destruct 2369 +#define wxPageSetupDialog_new 2370 +#define wxPageSetupDialog_destruct 2371 +#define wxPageSetupDialog_GetPageSetupData 2372 +#define wxPageSetupDialog_ShowModal 2373 +#define wxPageSetupDialogData_new_0 2374 +#define wxPageSetupDialogData_new_1_0 2375 +#define wxPageSetupDialogData_new_1_1 2376 +#define wxPageSetupDialogData_destruct 2377 +#define wxPageSetupDialogData_EnableHelp 2378 +#define wxPageSetupDialogData_EnableMargins 2379 +#define wxPageSetupDialogData_EnableOrientation 2380 +#define wxPageSetupDialogData_EnablePaper 2381 +#define wxPageSetupDialogData_EnablePrinter 2382 +#define wxPageSetupDialogData_GetDefaultMinMargins 2383 +#define wxPageSetupDialogData_GetEnableMargins 2384 +#define wxPageSetupDialogData_GetEnableOrientation 2385 +#define wxPageSetupDialogData_GetEnablePaper 2386 +#define wxPageSetupDialogData_GetEnablePrinter 2387 +#define wxPageSetupDialogData_GetEnableHelp 2388 +#define wxPageSetupDialogData_GetDefaultInfo 2389 +#define wxPageSetupDialogData_GetMarginTopLeft 2390 +#define wxPageSetupDialogData_GetMarginBottomRight 2391 +#define wxPageSetupDialogData_GetMinMarginTopLeft 2392 +#define wxPageSetupDialogData_GetMinMarginBottomRight 2393 +#define wxPageSetupDialogData_GetPaperId 2394 +#define wxPageSetupDialogData_GetPaperSize 2395 +#define wxPageSetupDialogData_GetPrintData 2397 +#define wxPageSetupDialogData_IsOk 2398 +#define wxPageSetupDialogData_SetDefaultInfo 2399 +#define wxPageSetupDialogData_SetDefaultMinMargins 2400 +#define wxPageSetupDialogData_SetMarginTopLeft 2401 +#define wxPageSetupDialogData_SetMarginBottomRight 2402 +#define wxPageSetupDialogData_SetMinMarginTopLeft 2403 +#define wxPageSetupDialogData_SetMinMarginBottomRight 2404 +#define wxPageSetupDialogData_SetPaperId 2405 +#define wxPageSetupDialogData_SetPaperSize_1_1 2406 +#define wxPageSetupDialogData_SetPaperSize_1_0 2407 +#define wxPageSetupDialogData_SetPrintData 2408 +#define wxPrintDialog_new_2_0 2409 +#define wxPrintDialog_new_2_1 2410 +#define wxPrintDialog_destruct 2411 +#define wxPrintDialog_GetPrintDialogData 2412 +#define wxPrintDialog_GetPrintDC 2413 +#define wxPrintDialogData_new_0 2414 +#define wxPrintDialogData_new_1_1 2415 +#define wxPrintDialogData_new_1_0 2416 +#define wxPrintDialogData_destruct 2417 +#define wxPrintDialogData_EnableHelp 2418 +#define wxPrintDialogData_EnablePageNumbers 2419 +#define wxPrintDialogData_EnablePrintToFile 2420 +#define wxPrintDialogData_EnableSelection 2421 +#define wxPrintDialogData_GetAllPages 2422 +#define wxPrintDialogData_GetCollate 2423 +#define wxPrintDialogData_GetFromPage 2424 +#define wxPrintDialogData_GetMaxPage 2425 +#define wxPrintDialogData_GetMinPage 2426 +#define wxPrintDialogData_GetNoCopies 2427 +#define wxPrintDialogData_GetPrintData 2428 +#define wxPrintDialogData_GetPrintToFile 2429 +#define wxPrintDialogData_GetSelection 2430 +#define wxPrintDialogData_GetToPage 2431 +#define wxPrintDialogData_IsOk 2432 +#define wxPrintDialogData_SetCollate 2433 +#define wxPrintDialogData_SetFromPage 2434 +#define wxPrintDialogData_SetMaxPage 2435 +#define wxPrintDialogData_SetMinPage 2436 +#define wxPrintDialogData_SetNoCopies 2437 +#define wxPrintDialogData_SetPrintData 2438 +#define wxPrintDialogData_SetPrintToFile 2439 +#define wxPrintDialogData_SetSelection 2440 +#define wxPrintDialogData_SetToPage 2441 +#define wxPrintData_new_0 2442 +#define wxPrintData_new_1 2443 +#define wxPrintData_destruct 2444 +#define wxPrintData_GetCollate 2445 +#define wxPrintData_GetBin 2446 +#define wxPrintData_GetColour 2447 +#define wxPrintData_GetDuplex 2448 +#define wxPrintData_GetNoCopies 2449 +#define wxPrintData_GetOrientation 2450 +#define wxPrintData_GetPaperId 2451 +#define wxPrintData_GetPrinterName 2452 +#define wxPrintData_GetQuality 2453 +#define wxPrintData_IsOk 2454 +#define wxPrintData_SetBin 2455 +#define wxPrintData_SetCollate 2456 +#define wxPrintData_SetColour 2457 +#define wxPrintData_SetDuplex 2458 +#define wxPrintData_SetNoCopies 2459 +#define wxPrintData_SetOrientation 2460 +#define wxPrintData_SetPaperId 2461 +#define wxPrintData_SetPrinterName 2462 +#define wxPrintData_SetQuality 2463 +#define wxPrintPreview_new_2 2466 +#define wxPrintPreview_new_3 2467 +#define wxPrintPreview_destruct 2469 +#define wxPrintPreview_GetCanvas 2470 +#define wxPrintPreview_GetCurrentPage 2471 +#define wxPrintPreview_GetFrame 2472 +#define wxPrintPreview_GetMaxPage 2473 +#define wxPrintPreview_GetMinPage 2474 +#define wxPrintPreview_GetPrintout 2475 +#define wxPrintPreview_GetPrintoutForPrinting 2476 +#define wxPrintPreview_IsOk 2477 +#define wxPrintPreview_PaintPage 2478 +#define wxPrintPreview_Print 2479 +#define wxPrintPreview_RenderPage 2480 +#define wxPrintPreview_SetCanvas 2481 +#define wxPrintPreview_SetCurrentPage 2482 +#define wxPrintPreview_SetFrame 2483 +#define wxPrintPreview_SetPrintout 2484 +#define wxPrintPreview_SetZoom 2485 +#define wxPreviewFrame_new 2486 +#define wxPreviewFrame_destruct 2487 +#define wxPreviewFrame_CreateControlBar 2488 +#define wxPreviewFrame_CreateCanvas 2489 +#define wxPreviewFrame_Initialize 2490 +#define wxPreviewFrame_OnCloseWindow 2491 +#define wxPreviewControlBar_new 2492 +#define wxPreviewControlBar_destruct 2493 +#define wxPreviewControlBar_CreateButtons 2494 +#define wxPreviewControlBar_GetPrintPreview 2495 +#define wxPreviewControlBar_GetZoomControl 2496 +#define wxPreviewControlBar_SetZoomControl 2497 +#define wxPrinter_new 2499 +#define wxPrinter_CreateAbortWindow 2500 +#define wxPrinter_GetAbort 2501 +#define wxPrinter_GetLastError 2502 +#define wxPrinter_GetPrintDialogData 2503 +#define wxPrinter_Print 2504 +#define wxPrinter_PrintDialog 2505 +#define wxPrinter_ReportError 2506 +#define wxPrinter_Setup 2507 +#define wxPrinter_destroy 2508 +#define wxXmlResource_new_1 2509 +#define wxXmlResource_new_2 2510 +#define wxXmlResource_destruct 2511 +#define wxXmlResource_AttachUnknownControl 2512 +#define wxXmlResource_ClearHandlers 2513 +#define wxXmlResource_CompareVersion 2514 +#define wxXmlResource_Get 2515 +#define wxXmlResource_GetFlags 2516 +#define wxXmlResource_GetVersion 2517 +#define wxXmlResource_GetXRCID 2518 +#define wxXmlResource_InitAllHandlers 2519 +#define wxXmlResource_Load 2520 +#define wxXmlResource_LoadBitmap 2521 +#define wxXmlResource_LoadDialog_2 2522 +#define wxXmlResource_LoadDialog_3 2523 +#define wxXmlResource_LoadFrame_2 2524 +#define wxXmlResource_LoadFrame_3 2525 +#define wxXmlResource_LoadIcon 2526 +#define wxXmlResource_LoadMenu 2527 +#define wxXmlResource_LoadMenuBar_2 2528 +#define wxXmlResource_LoadMenuBar_1 2529 +#define wxXmlResource_LoadPanel_2 2530 +#define wxXmlResource_LoadPanel_3 2531 +#define wxXmlResource_LoadToolBar 2532 +#define wxXmlResource_Set 2533 +#define wxXmlResource_SetFlags 2534 +#define wxXmlResource_Unload 2535 +#define wxXmlResource_xrcctrl 2536 +#define wxHtmlEasyPrinting_new 2537 +#define wxHtmlEasyPrinting_destruct 2538 +#define wxHtmlEasyPrinting_GetPrintData 2539 +#define wxHtmlEasyPrinting_GetPageSetupData 2540 +#define wxHtmlEasyPrinting_PreviewFile 2541 +#define wxHtmlEasyPrinting_PreviewText 2542 +#define wxHtmlEasyPrinting_PrintFile 2543 +#define wxHtmlEasyPrinting_PrintText 2544 +#define wxHtmlEasyPrinting_PageSetup 2545 +#define wxHtmlEasyPrinting_SetFonts 2546 +#define wxHtmlEasyPrinting_SetHeader 2547 +#define wxHtmlEasyPrinting_SetFooter 2548 +#define wxGLCanvas_new_2 2550 +#define wxGLCanvas_new_3_1 2551 +#define wxGLCanvas_new_3_0 2552 +#define wxGLCanvas_GetContext 2553 +#define wxGLCanvas_SetCurrent 2555 +#define wxGLCanvas_SwapBuffers 2556 +#define wxGLCanvas_destroy 2557 +#define wxAuiManager_new 2558 +#define wxAuiManager_destruct 2559 +#define wxAuiManager_AddPane_2_1 2560 +#define wxAuiManager_AddPane_3 2561 +#define wxAuiManager_AddPane_2_0 2562 +#define wxAuiManager_DetachPane 2563 +#define wxAuiManager_GetAllPanes 2564 +#define wxAuiManager_GetArtProvider 2565 +#define wxAuiManager_GetDockSizeConstraint 2566 +#define wxAuiManager_GetFlags 2567 +#define wxAuiManager_GetManagedWindow 2568 +#define wxAuiManager_GetManager 2569 +#define wxAuiManager_GetPane_1_1 2570 +#define wxAuiManager_GetPane_1_0 2571 +#define wxAuiManager_HideHint 2572 +#define wxAuiManager_InsertPane 2573 +#define wxAuiManager_LoadPaneInfo 2574 +#define wxAuiManager_LoadPerspective 2575 +#define wxAuiManager_SavePaneInfo 2576 +#define wxAuiManager_SavePerspective 2577 +#define wxAuiManager_SetArtProvider 2578 +#define wxAuiManager_SetDockSizeConstraint 2579 +#define wxAuiManager_SetFlags 2580 +#define wxAuiManager_SetManagedWindow 2581 +#define wxAuiManager_ShowHint 2582 +#define wxAuiManager_UnInit 2583 +#define wxAuiManager_Update 2584 +#define wxAuiPaneInfo_new_0 2585 +#define wxAuiPaneInfo_new_1 2586 +#define wxAuiPaneInfo_destruct 2587 +#define wxAuiPaneInfo_BestSize_1 2588 +#define wxAuiPaneInfo_BestSize_2 2589 +#define wxAuiPaneInfo_Bottom 2590 +#define wxAuiPaneInfo_BottomDockable 2591 +#define wxAuiPaneInfo_Caption 2592 +#define wxAuiPaneInfo_CaptionVisible 2593 +#define wxAuiPaneInfo_Centre 2594 +#define wxAuiPaneInfo_CentrePane 2595 +#define wxAuiPaneInfo_CloseButton 2596 +#define wxAuiPaneInfo_DefaultPane 2597 +#define wxAuiPaneInfo_DestroyOnClose 2598 +#define wxAuiPaneInfo_Direction 2599 +#define wxAuiPaneInfo_Dock 2600 +#define wxAuiPaneInfo_Dockable 2601 +#define wxAuiPaneInfo_Fixed 2602 +#define wxAuiPaneInfo_Float 2603 +#define wxAuiPaneInfo_Floatable 2604 +#define wxAuiPaneInfo_FloatingPosition_1 2605 +#define wxAuiPaneInfo_FloatingPosition_2 2606 +#define wxAuiPaneInfo_FloatingSize_1 2607 +#define wxAuiPaneInfo_FloatingSize_2 2608 +#define wxAuiPaneInfo_Gripper 2609 +#define wxAuiPaneInfo_GripperTop 2610 +#define wxAuiPaneInfo_HasBorder 2611 +#define wxAuiPaneInfo_HasCaption 2612 +#define wxAuiPaneInfo_HasCloseButton 2613 +#define wxAuiPaneInfo_HasFlag 2614 +#define wxAuiPaneInfo_HasGripper 2615 +#define wxAuiPaneInfo_HasGripperTop 2616 +#define wxAuiPaneInfo_HasMaximizeButton 2617 +#define wxAuiPaneInfo_HasMinimizeButton 2618 +#define wxAuiPaneInfo_HasPinButton 2619 +#define wxAuiPaneInfo_Hide 2620 +#define wxAuiPaneInfo_IsBottomDockable 2621 +#define wxAuiPaneInfo_IsDocked 2622 +#define wxAuiPaneInfo_IsFixed 2623 +#define wxAuiPaneInfo_IsFloatable 2624 +#define wxAuiPaneInfo_IsFloating 2625 +#define wxAuiPaneInfo_IsLeftDockable 2626 +#define wxAuiPaneInfo_IsMovable 2627 +#define wxAuiPaneInfo_IsOk 2628 +#define wxAuiPaneInfo_IsResizable 2629 +#define wxAuiPaneInfo_IsRightDockable 2630 +#define wxAuiPaneInfo_IsShown 2631 +#define wxAuiPaneInfo_IsToolbar 2632 +#define wxAuiPaneInfo_IsTopDockable 2633 +#define wxAuiPaneInfo_Layer 2634 +#define wxAuiPaneInfo_Left 2635 +#define wxAuiPaneInfo_LeftDockable 2636 +#define wxAuiPaneInfo_MaxSize_1 2637 +#define wxAuiPaneInfo_MaxSize_2 2638 +#define wxAuiPaneInfo_MaximizeButton 2639 +#define wxAuiPaneInfo_MinSize_1 2640 +#define wxAuiPaneInfo_MinSize_2 2641 +#define wxAuiPaneInfo_MinimizeButton 2642 +#define wxAuiPaneInfo_Movable 2643 +#define wxAuiPaneInfo_Name 2644 +#define wxAuiPaneInfo_PaneBorder 2645 +#define wxAuiPaneInfo_PinButton 2646 +#define wxAuiPaneInfo_Position 2647 +#define wxAuiPaneInfo_Resizable 2648 +#define wxAuiPaneInfo_Right 2649 +#define wxAuiPaneInfo_RightDockable 2650 +#define wxAuiPaneInfo_Row 2651 +#define wxAuiPaneInfo_SafeSet 2652 +#define wxAuiPaneInfo_SetFlag 2653 +#define wxAuiPaneInfo_Show 2654 +#define wxAuiPaneInfo_ToolbarPane 2655 +#define wxAuiPaneInfo_Top 2656 +#define wxAuiPaneInfo_TopDockable 2657 +#define wxAuiPaneInfo_Window 2658 +#define wxAuiPaneInfo_GetWindow 2659 +#define wxAuiPaneInfo_GetFrame 2660 +#define wxAuiPaneInfo_GetDirection 2661 +#define wxAuiPaneInfo_GetLayer 2662 +#define wxAuiPaneInfo_GetRow 2663 +#define wxAuiPaneInfo_GetPosition 2664 +#define wxAuiPaneInfo_GetFloatingPosition 2665 +#define wxAuiPaneInfo_GetFloatingSize 2666 +#define wxAuiNotebook_new_0 2667 +#define wxAuiNotebook_new_2 2668 +#define wxAuiNotebook_AddPage 2669 +#define wxAuiNotebook_Create 2670 +#define wxAuiNotebook_DeletePage 2671 +#define wxAuiNotebook_GetArtProvider 2672 +#define wxAuiNotebook_GetPage 2673 +#define wxAuiNotebook_GetPageBitmap 2674 +#define wxAuiNotebook_GetPageCount 2675 +#define wxAuiNotebook_GetPageIndex 2676 +#define wxAuiNotebook_GetPageText 2677 +#define wxAuiNotebook_GetSelection 2678 +#define wxAuiNotebook_InsertPage 2679 +#define wxAuiNotebook_RemovePage 2680 +#define wxAuiNotebook_SetArtProvider 2681 +#define wxAuiNotebook_SetFont 2682 +#define wxAuiNotebook_SetPageBitmap 2683 +#define wxAuiNotebook_SetPageText 2684 +#define wxAuiNotebook_SetSelection 2685 +#define wxAuiNotebook_SetTabCtrlHeight 2686 +#define wxAuiNotebook_SetUniformBitmapSize 2687 +#define wxAuiNotebook_destroy 2688 +#define wxAuiTabArt_SetFlags 2689 +#define wxAuiTabArt_SetMeasuringFont 2690 +#define wxAuiTabArt_SetNormalFont 2691 +#define wxAuiTabArt_SetSelectedFont 2692 +#define wxAuiTabArt_SetColour 2693 +#define wxAuiTabArt_SetActiveColour 2694 +#define wxAuiDockArt_GetColour 2695 +#define wxAuiDockArt_GetFont 2696 +#define wxAuiDockArt_GetMetric 2697 +#define wxAuiDockArt_SetColour 2698 +#define wxAuiDockArt_SetFont 2699 +#define wxAuiDockArt_SetMetric 2700 +#define wxAuiSimpleTabArt_new 2701 +#define wxAuiSimpleTabArt_destroy 2702 +#define wxMDIParentFrame_new_0 2703 +#define wxMDIParentFrame_new_4 2704 +#define wxMDIParentFrame_destruct 2705 +#define wxMDIParentFrame_ActivateNext 2706 +#define wxMDIParentFrame_ActivatePrevious 2707 +#define wxMDIParentFrame_ArrangeIcons 2708 +#define wxMDIParentFrame_Cascade 2709 +#define wxMDIParentFrame_Create 2710 +#define wxMDIParentFrame_GetActiveChild 2711 +#define wxMDIParentFrame_GetClientWindow 2712 +#define wxMDIParentFrame_Tile 2713 +#define wxMDIChildFrame_new_0 2714 +#define wxMDIChildFrame_new_4 2715 +#define wxMDIChildFrame_destruct 2716 +#define wxMDIChildFrame_Activate 2717 +#define wxMDIChildFrame_Create 2718 +#define wxMDIChildFrame_Maximize 2719 +#define wxMDIChildFrame_Restore 2720 +#define wxMDIClientWindow_new_0 2721 +#define wxMDIClientWindow_new_2 2722 +#define wxMDIClientWindow_destruct 2723 +#define wxMDIClientWindow_CreateClient 2724 +#define wxLayoutAlgorithm_new 2725 +#define wxLayoutAlgorithm_LayoutFrame 2726 +#define wxLayoutAlgorithm_LayoutMDIFrame 2727 +#define wxLayoutAlgorithm_LayoutWindow 2728 +#define wxLayoutAlgorithm_destroy 2729 +#define wxEvent_GetId 2730 +#define wxEvent_GetSkipped 2731 +#define wxEvent_GetTimestamp 2732 +#define wxEvent_IsCommandEvent 2733 +#define wxEvent_ResumePropagation 2734 +#define wxEvent_ShouldPropagate 2735 +#define wxEvent_Skip 2736 +#define wxEvent_StopPropagation 2737 +#define wxCommandEvent_getClientData 2738 +#define wxCommandEvent_GetExtraLong 2739 +#define wxCommandEvent_GetInt 2740 +#define wxCommandEvent_GetSelection 2741 +#define wxCommandEvent_GetString 2742 +#define wxCommandEvent_IsChecked 2743 +#define wxCommandEvent_IsSelection 2744 +#define wxCommandEvent_SetInt 2745 +#define wxCommandEvent_SetString 2746 +#define wxScrollEvent_GetOrientation 2747 +#define wxScrollEvent_GetPosition 2748 +#define wxScrollWinEvent_GetOrientation 2749 +#define wxScrollWinEvent_GetPosition 2750 +#define wxMouseEvent_AltDown 2751 +#define wxMouseEvent_Button 2752 +#define wxMouseEvent_ButtonDClick 2753 +#define wxMouseEvent_ButtonDown 2754 +#define wxMouseEvent_ButtonUp 2755 +#define wxMouseEvent_CmdDown 2756 +#define wxMouseEvent_ControlDown 2757 +#define wxMouseEvent_Dragging 2758 +#define wxMouseEvent_Entering 2759 +#define wxMouseEvent_GetButton 2760 +#define wxMouseEvent_GetPosition 2763 +#define wxMouseEvent_GetLogicalPosition 2764 +#define wxMouseEvent_GetLinesPerAction 2765 +#define wxMouseEvent_GetWheelRotation 2766 +#define wxMouseEvent_GetWheelDelta 2767 +#define wxMouseEvent_GetX 2768 +#define wxMouseEvent_GetY 2769 +#define wxMouseEvent_IsButton 2770 +#define wxMouseEvent_IsPageScroll 2771 +#define wxMouseEvent_Leaving 2772 +#define wxMouseEvent_LeftDClick 2773 +#define wxMouseEvent_LeftDown 2774 +#define wxMouseEvent_LeftIsDown 2775 +#define wxMouseEvent_LeftUp 2776 +#define wxMouseEvent_MetaDown 2777 +#define wxMouseEvent_MiddleDClick 2778 +#define wxMouseEvent_MiddleDown 2779 +#define wxMouseEvent_MiddleIsDown 2780 +#define wxMouseEvent_MiddleUp 2781 +#define wxMouseEvent_Moving 2782 +#define wxMouseEvent_RightDClick 2783 +#define wxMouseEvent_RightDown 2784 +#define wxMouseEvent_RightIsDown 2785 +#define wxMouseEvent_RightUp 2786 +#define wxMouseEvent_ShiftDown 2787 +#define wxSetCursorEvent_GetCursor 2788 +#define wxSetCursorEvent_GetX 2789 +#define wxSetCursorEvent_GetY 2790 +#define wxSetCursorEvent_HasCursor 2791 +#define wxSetCursorEvent_SetCursor 2792 +#define wxKeyEvent_AltDown 2793 +#define wxKeyEvent_CmdDown 2794 +#define wxKeyEvent_ControlDown 2795 +#define wxKeyEvent_GetKeyCode 2796 +#define wxKeyEvent_GetModifiers 2797 +#define wxKeyEvent_GetPosition 2800 +#define wxKeyEvent_GetRawKeyCode 2801 +#define wxKeyEvent_GetRawKeyFlags 2802 +#define wxKeyEvent_GetUnicodeKey 2803 +#define wxKeyEvent_GetX 2804 +#define wxKeyEvent_GetY 2805 +#define wxKeyEvent_HasModifiers 2806 +#define wxKeyEvent_MetaDown 2807 +#define wxKeyEvent_ShiftDown 2808 +#define wxSizeEvent_GetSize 2809 +#define wxMoveEvent_GetPosition 2810 +#define wxEraseEvent_GetDC 2811 +#define wxFocusEvent_GetWindow 2812 +#define wxChildFocusEvent_GetWindow 2813 +#define wxMenuEvent_GetMenu 2814 +#define wxMenuEvent_GetMenuId 2815 +#define wxMenuEvent_IsPopup 2816 +#define wxCloseEvent_CanVeto 2817 +#define wxCloseEvent_GetLoggingOff 2818 +#define wxCloseEvent_SetCanVeto 2819 +#define wxCloseEvent_SetLoggingOff 2820 +#define wxCloseEvent_Veto 2821 +#define wxShowEvent_SetShow 2822 +#define wxShowEvent_GetShow 2823 +#define wxIconizeEvent_Iconized 2824 +#define wxJoystickEvent_ButtonDown 2825 +#define wxJoystickEvent_ButtonIsDown 2826 +#define wxJoystickEvent_ButtonUp 2827 +#define wxJoystickEvent_GetButtonChange 2828 +#define wxJoystickEvent_GetButtonState 2829 +#define wxJoystickEvent_GetJoystick 2830 +#define wxJoystickEvent_GetPosition 2831 +#define wxJoystickEvent_GetZPosition 2832 +#define wxJoystickEvent_IsButton 2833 +#define wxJoystickEvent_IsMove 2834 +#define wxJoystickEvent_IsZMove 2835 +#define wxUpdateUIEvent_CanUpdate 2836 +#define wxUpdateUIEvent_Check 2837 +#define wxUpdateUIEvent_Enable 2838 +#define wxUpdateUIEvent_Show 2839 +#define wxUpdateUIEvent_GetChecked 2840 +#define wxUpdateUIEvent_GetEnabled 2841 +#define wxUpdateUIEvent_GetShown 2842 +#define wxUpdateUIEvent_GetSetChecked 2843 +#define wxUpdateUIEvent_GetSetEnabled 2844 +#define wxUpdateUIEvent_GetSetShown 2845 +#define wxUpdateUIEvent_GetSetText 2846 +#define wxUpdateUIEvent_GetText 2847 +#define wxUpdateUIEvent_GetMode 2848 +#define wxUpdateUIEvent_GetUpdateInterval 2849 +#define wxUpdateUIEvent_ResetUpdateTime 2850 +#define wxUpdateUIEvent_SetMode 2851 +#define wxUpdateUIEvent_SetText 2852 +#define wxUpdateUIEvent_SetUpdateInterval 2853 +#define wxMouseCaptureChangedEvent_GetCapturedWindow 2854 +#define wxPaletteChangedEvent_SetChangedWindow 2855 +#define wxPaletteChangedEvent_GetChangedWindow 2856 +#define wxQueryNewPaletteEvent_SetPaletteRealized 2857 +#define wxQueryNewPaletteEvent_GetPaletteRealized 2858 +#define wxNavigationKeyEvent_GetDirection 2859 +#define wxNavigationKeyEvent_SetDirection 2860 +#define wxNavigationKeyEvent_IsWindowChange 2861 +#define wxNavigationKeyEvent_SetWindowChange 2862 +#define wxNavigationKeyEvent_IsFromTab 2863 +#define wxNavigationKeyEvent_SetFromTab 2864 +#define wxNavigationKeyEvent_GetCurrentFocus 2865 +#define wxNavigationKeyEvent_SetCurrentFocus 2866 +#define wxHelpEvent_GetOrigin 2867 +#define wxHelpEvent_GetPosition 2868 +#define wxHelpEvent_SetOrigin 2869 +#define wxHelpEvent_SetPosition 2870 +#define wxContextMenuEvent_GetPosition 2871 +#define wxContextMenuEvent_SetPosition 2872 +#define wxIdleEvent_CanSend 2873 +#define wxIdleEvent_GetMode 2874 +#define wxIdleEvent_RequestMore 2875 +#define wxIdleEvent_MoreRequested 2876 +#define wxIdleEvent_SetMode 2877 +#define wxGridEvent_AltDown 2878 +#define wxGridEvent_ControlDown 2879 +#define wxGridEvent_GetCol 2880 +#define wxGridEvent_GetPosition 2881 +#define wxGridEvent_GetRow 2882 +#define wxGridEvent_MetaDown 2883 +#define wxGridEvent_Selecting 2884 +#define wxGridEvent_ShiftDown 2885 +#define wxNotifyEvent_Allow 2886 +#define wxNotifyEvent_IsAllowed 2887 +#define wxNotifyEvent_Veto 2888 +#define wxSashEvent_GetEdge 2889 +#define wxSashEvent_GetDragRect 2890 +#define wxSashEvent_GetDragStatus 2891 +#define wxListEvent_GetCacheFrom 2892 +#define wxListEvent_GetCacheTo 2893 +#define wxListEvent_GetKeyCode 2894 +#define wxListEvent_GetIndex 2895 +#define wxListEvent_GetColumn 2896 +#define wxListEvent_GetPoint 2897 +#define wxListEvent_GetLabel 2898 +#define wxListEvent_GetText 2899 +#define wxListEvent_GetImage 2900 +#define wxListEvent_GetData 2901 +#define wxListEvent_GetMask 2902 +#define wxListEvent_GetItem 2903 +#define wxListEvent_IsEditCancelled 2904 +#define wxDateEvent_GetDate 2905 +#define wxCalendarEvent_GetWeekDay 2906 +#define wxFileDirPickerEvent_GetPath 2907 +#define wxColourPickerEvent_GetColour 2908 +#define wxFontPickerEvent_GetFont 2909 +#define wxStyledTextEvent_GetPosition 2910 +#define wxStyledTextEvent_GetKey 2911 +#define wxStyledTextEvent_GetModifiers 2912 +#define wxStyledTextEvent_GetModificationType 2913 +#define wxStyledTextEvent_GetText 2914 +#define wxStyledTextEvent_GetLength 2915 +#define wxStyledTextEvent_GetLinesAdded 2916 +#define wxStyledTextEvent_GetLine 2917 +#define wxStyledTextEvent_GetFoldLevelNow 2918 +#define wxStyledTextEvent_GetFoldLevelPrev 2919 +#define wxStyledTextEvent_GetMargin 2920 +#define wxStyledTextEvent_GetMessage 2921 +#define wxStyledTextEvent_GetWParam 2922 +#define wxStyledTextEvent_GetLParam 2923 +#define wxStyledTextEvent_GetListType 2924 +#define wxStyledTextEvent_GetX 2925 +#define wxStyledTextEvent_GetY 2926 +#define wxStyledTextEvent_GetDragText 2927 +#define wxStyledTextEvent_GetDragAllowMove 2928 +#define wxStyledTextEvent_GetDragResult 2929 +#define wxStyledTextEvent_GetShift 2930 +#define wxStyledTextEvent_GetControl 2931 +#define wxStyledTextEvent_GetAlt 2932 +#define utils_wxGetKeyState 2933 +#define utils_wxGetMousePosition 2934 +#define utils_wxGetMouseState 2935 +#define utils_wxSetDetectableAutoRepeat 2936 +#define utils_wxBell 2937 +#define utils_wxFindMenuItemId 2938 +#define utils_wxGenericFindWindowAtPoint 2939 +#define utils_wxFindWindowAtPoint 2940 +#define utils_wxBeginBusyCursor 2941 +#define utils_wxEndBusyCursor 2942 +#define utils_wxIsBusy 2943 +#define utils_wxShutdown 2944 +#define utils_wxShell 2945 +#define utils_wxLaunchDefaultBrowser 2946 +#define utils_wxGetEmailAddress 2947 +#define utils_wxGetUserId 2948 +#define utils_wxGetHomeDir 2949 +#define utils_wxNewId 2950 +#define utils_wxRegisterId 2951 +#define utils_wxGetCurrentId 2952 +#define utils_wxGetOsDescription 2953 +#define utils_wxIsPlatformLittleEndian 2954 +#define utils_wxIsPlatform64Bit 2955 +#define gdicmn_wxDisplaySize 2956 +#define gdicmn_wxSetCursor 2957 +#define wxPrintout_new 2958 +#define wxPrintout_destruct 2959 +#define wxPrintout_GetDC 2960 +#define wxPrintout_GetPageSizeMM 2961 +#define wxPrintout_GetPageSizePixels 2962 +#define wxPrintout_GetPaperRectPixels 2963 +#define wxPrintout_GetPPIPrinter 2964 +#define wxPrintout_GetPPIScreen 2965 +#define wxPrintout_GetTitle 2966 +#define wxPrintout_IsPreview 2967 +#define wxPrintout_FitThisSizeToPaper 2968 +#define wxPrintout_FitThisSizeToPage 2969 +#define wxPrintout_FitThisSizeToPageMargins 2970 +#define wxPrintout_MapScreenSizeToPaper 2971 +#define wxPrintout_MapScreenSizeToPage 2972 +#define wxPrintout_MapScreenSizeToPageMargins 2973 +#define wxPrintout_MapScreenSizeToDevice 2974 +#define wxPrintout_GetLogicalPaperRect 2975 +#define wxPrintout_GetLogicalPageRect 2976 +#define wxPrintout_GetLogicalPageMarginsRect 2977 +#define wxPrintout_SetLogicalOrigin 2978 +#define wxPrintout_OffsetLogicalOrigin 2979 +#define wxStyledTextCtrl_new_2 2980 +#define wxStyledTextCtrl_new_0 2981 +#define wxStyledTextCtrl_destruct 2982 +#define wxStyledTextCtrl_Create 2983 +#define wxStyledTextCtrl_AddText 2984 +#define wxStyledTextCtrl_AddStyledText 2985 +#define wxStyledTextCtrl_InsertText 2986 +#define wxStyledTextCtrl_ClearAll 2987 +#define wxStyledTextCtrl_ClearDocumentStyle 2988 +#define wxStyledTextCtrl_GetLength 2989 +#define wxStyledTextCtrl_GetCharAt 2990 +#define wxStyledTextCtrl_GetCurrentPos 2991 +#define wxStyledTextCtrl_GetAnchor 2992 +#define wxStyledTextCtrl_GetStyleAt 2993 +#define wxStyledTextCtrl_Redo 2994 +#define wxStyledTextCtrl_SetUndoCollection 2995 +#define wxStyledTextCtrl_SelectAll 2996 +#define wxStyledTextCtrl_SetSavePoint 2997 +#define wxStyledTextCtrl_GetStyledText 2998 +#define wxStyledTextCtrl_CanRedo 2999 +#define wxStyledTextCtrl_MarkerLineFromHandle 3000 +#define wxStyledTextCtrl_MarkerDeleteHandle 3001 +#define wxStyledTextCtrl_GetUndoCollection 3002 +#define wxStyledTextCtrl_GetViewWhiteSpace 3003 +#define wxStyledTextCtrl_SetViewWhiteSpace 3004 +#define wxStyledTextCtrl_PositionFromPoint 3005 +#define wxStyledTextCtrl_PositionFromPointClose 3006 +#define wxStyledTextCtrl_GotoLine 3007 +#define wxStyledTextCtrl_GotoPos 3008 +#define wxStyledTextCtrl_SetAnchor 3009 +#define wxStyledTextCtrl_GetCurLine 3010 +#define wxStyledTextCtrl_GetEndStyled 3011 +#define wxStyledTextCtrl_ConvertEOLs 3012 +#define wxStyledTextCtrl_GetEOLMode 3013 +#define wxStyledTextCtrl_SetEOLMode 3014 +#define wxStyledTextCtrl_StartStyling 3015 +#define wxStyledTextCtrl_SetStyling 3016 +#define wxStyledTextCtrl_GetBufferedDraw 3017 +#define wxStyledTextCtrl_SetBufferedDraw 3018 +#define wxStyledTextCtrl_SetTabWidth 3019 +#define wxStyledTextCtrl_GetTabWidth 3020 +#define wxStyledTextCtrl_SetCodePage 3021 +#define wxStyledTextCtrl_MarkerDefine 3022 +#define wxStyledTextCtrl_MarkerSetForeground 3023 +#define wxStyledTextCtrl_MarkerSetBackground 3024 +#define wxStyledTextCtrl_MarkerAdd 3025 +#define wxStyledTextCtrl_MarkerDelete 3026 +#define wxStyledTextCtrl_MarkerDeleteAll 3027 +#define wxStyledTextCtrl_MarkerGet 3028 +#define wxStyledTextCtrl_MarkerNext 3029 +#define wxStyledTextCtrl_MarkerPrevious 3030 +#define wxStyledTextCtrl_MarkerDefineBitmap 3031 +#define wxStyledTextCtrl_MarkerAddSet 3032 +#define wxStyledTextCtrl_MarkerSetAlpha 3033 +#define wxStyledTextCtrl_SetMarginType 3034 +#define wxStyledTextCtrl_GetMarginType 3035 +#define wxStyledTextCtrl_SetMarginWidth 3036 +#define wxStyledTextCtrl_GetMarginWidth 3037 +#define wxStyledTextCtrl_SetMarginMask 3038 +#define wxStyledTextCtrl_GetMarginMask 3039 +#define wxStyledTextCtrl_SetMarginSensitive 3040 +#define wxStyledTextCtrl_GetMarginSensitive 3041 +#define wxStyledTextCtrl_StyleClearAll 3042 +#define wxStyledTextCtrl_StyleSetForeground 3043 +#define wxStyledTextCtrl_StyleSetBackground 3044 +#define wxStyledTextCtrl_StyleSetBold 3045 +#define wxStyledTextCtrl_StyleSetItalic 3046 +#define wxStyledTextCtrl_StyleSetSize 3047 +#define wxStyledTextCtrl_StyleSetFaceName 3048 +#define wxStyledTextCtrl_StyleSetEOLFilled 3049 +#define wxStyledTextCtrl_StyleResetDefault 3050 +#define wxStyledTextCtrl_StyleSetUnderline 3051 +#define wxStyledTextCtrl_StyleSetCase 3052 +#define wxStyledTextCtrl_StyleSetHotSpot 3053 +#define wxStyledTextCtrl_SetSelForeground 3054 +#define wxStyledTextCtrl_SetSelBackground 3055 +#define wxStyledTextCtrl_GetSelAlpha 3056 +#define wxStyledTextCtrl_SetSelAlpha 3057 +#define wxStyledTextCtrl_SetCaretForeground 3058 +#define wxStyledTextCtrl_CmdKeyAssign 3059 +#define wxStyledTextCtrl_CmdKeyClear 3060 +#define wxStyledTextCtrl_CmdKeyClearAll 3061 +#define wxStyledTextCtrl_SetStyleBytes 3062 +#define wxStyledTextCtrl_StyleSetVisible 3063 +#define wxStyledTextCtrl_GetCaretPeriod 3064 +#define wxStyledTextCtrl_SetCaretPeriod 3065 +#define wxStyledTextCtrl_SetWordChars 3066 +#define wxStyledTextCtrl_BeginUndoAction 3067 +#define wxStyledTextCtrl_EndUndoAction 3068 +#define wxStyledTextCtrl_IndicatorSetStyle 3069 +#define wxStyledTextCtrl_IndicatorGetStyle 3070 +#define wxStyledTextCtrl_IndicatorSetForeground 3071 +#define wxStyledTextCtrl_IndicatorGetForeground 3072 +#define wxStyledTextCtrl_SetWhitespaceForeground 3073 +#define wxStyledTextCtrl_SetWhitespaceBackground 3074 +#define wxStyledTextCtrl_GetStyleBits 3075 +#define wxStyledTextCtrl_SetLineState 3076 +#define wxStyledTextCtrl_GetLineState 3077 +#define wxStyledTextCtrl_GetMaxLineState 3078 +#define wxStyledTextCtrl_GetCaretLineVisible 3079 +#define wxStyledTextCtrl_SetCaretLineVisible 3080 +#define wxStyledTextCtrl_GetCaretLineBackground 3081 +#define wxStyledTextCtrl_SetCaretLineBackground 3082 +#define wxStyledTextCtrl_AutoCompShow 3083 +#define wxStyledTextCtrl_AutoCompCancel 3084 +#define wxStyledTextCtrl_AutoCompActive 3085 +#define wxStyledTextCtrl_AutoCompPosStart 3086 +#define wxStyledTextCtrl_AutoCompComplete 3087 +#define wxStyledTextCtrl_AutoCompStops 3088 +#define wxStyledTextCtrl_AutoCompSetSeparator 3089 +#define wxStyledTextCtrl_AutoCompGetSeparator 3090 +#define wxStyledTextCtrl_AutoCompSelect 3091 +#define wxStyledTextCtrl_AutoCompSetCancelAtStart 3092 +#define wxStyledTextCtrl_AutoCompGetCancelAtStart 3093 +#define wxStyledTextCtrl_AutoCompSetFillUps 3094 +#define wxStyledTextCtrl_AutoCompSetChooseSingle 3095 +#define wxStyledTextCtrl_AutoCompGetChooseSingle 3096 +#define wxStyledTextCtrl_AutoCompSetIgnoreCase 3097 +#define wxStyledTextCtrl_AutoCompGetIgnoreCase 3098 +#define wxStyledTextCtrl_UserListShow 3099 +#define wxStyledTextCtrl_AutoCompSetAutoHide 3100 +#define wxStyledTextCtrl_AutoCompGetAutoHide 3101 +#define wxStyledTextCtrl_AutoCompSetDropRestOfWord 3102 +#define wxStyledTextCtrl_AutoCompGetDropRestOfWord 3103 +#define wxStyledTextCtrl_RegisterImage 3104 +#define wxStyledTextCtrl_ClearRegisteredImages 3105 +#define wxStyledTextCtrl_AutoCompGetTypeSeparator 3106 +#define wxStyledTextCtrl_AutoCompSetTypeSeparator 3107 +#define wxStyledTextCtrl_AutoCompSetMaxWidth 3108 +#define wxStyledTextCtrl_AutoCompGetMaxWidth 3109 +#define wxStyledTextCtrl_AutoCompSetMaxHeight 3110 +#define wxStyledTextCtrl_AutoCompGetMaxHeight 3111 +#define wxStyledTextCtrl_SetIndent 3112 +#define wxStyledTextCtrl_GetIndent 3113 +#define wxStyledTextCtrl_SetUseTabs 3114 +#define wxStyledTextCtrl_GetUseTabs 3115 +#define wxStyledTextCtrl_SetLineIndentation 3116 +#define wxStyledTextCtrl_GetLineIndentation 3117 +#define wxStyledTextCtrl_GetLineIndentPosition 3118 +#define wxStyledTextCtrl_GetColumn 3119 +#define wxStyledTextCtrl_SetUseHorizontalScrollBar 3120 +#define wxStyledTextCtrl_GetUseHorizontalScrollBar 3121 +#define wxStyledTextCtrl_SetIndentationGuides 3122 +#define wxStyledTextCtrl_GetIndentationGuides 3123 +#define wxStyledTextCtrl_SetHighlightGuide 3124 +#define wxStyledTextCtrl_GetHighlightGuide 3125 +#define wxStyledTextCtrl_GetLineEndPosition 3126 +#define wxStyledTextCtrl_GetCodePage 3127 +#define wxStyledTextCtrl_GetCaretForeground 3128 +#define wxStyledTextCtrl_GetReadOnly 3129 +#define wxStyledTextCtrl_SetCurrentPos 3130 +#define wxStyledTextCtrl_SetSelectionStart 3131 +#define wxStyledTextCtrl_GetSelectionStart 3132 +#define wxStyledTextCtrl_SetSelectionEnd 3133 +#define wxStyledTextCtrl_GetSelectionEnd 3134 +#define wxStyledTextCtrl_SetPrintMagnification 3135 +#define wxStyledTextCtrl_GetPrintMagnification 3136 +#define wxStyledTextCtrl_SetPrintColourMode 3137 +#define wxStyledTextCtrl_GetPrintColourMode 3138 +#define wxStyledTextCtrl_FindText 3139 +#define wxStyledTextCtrl_FormatRange 3140 +#define wxStyledTextCtrl_GetFirstVisibleLine 3141 +#define wxStyledTextCtrl_GetLine 3142 +#define wxStyledTextCtrl_GetLineCount 3143 +#define wxStyledTextCtrl_SetMarginLeft 3144 +#define wxStyledTextCtrl_GetMarginLeft 3145 +#define wxStyledTextCtrl_SetMarginRight 3146 +#define wxStyledTextCtrl_GetMarginRight 3147 +#define wxStyledTextCtrl_GetModify 3148 +#define wxStyledTextCtrl_SetSelection 3149 +#define wxStyledTextCtrl_GetSelectedText 3150 +#define wxStyledTextCtrl_GetTextRange 3151 +#define wxStyledTextCtrl_HideSelection 3152 +#define wxStyledTextCtrl_LineFromPosition 3153 +#define wxStyledTextCtrl_PositionFromLine 3154 +#define wxStyledTextCtrl_LineScroll 3155 +#define wxStyledTextCtrl_EnsureCaretVisible 3156 +#define wxStyledTextCtrl_ReplaceSelection 3157 +#define wxStyledTextCtrl_SetReadOnly 3158 +#define wxStyledTextCtrl_CanPaste 3159 +#define wxStyledTextCtrl_CanUndo 3160 +#define wxStyledTextCtrl_EmptyUndoBuffer 3161 +#define wxStyledTextCtrl_Undo 3162 +#define wxStyledTextCtrl_Cut 3163 +#define wxStyledTextCtrl_Copy 3164 +#define wxStyledTextCtrl_Paste 3165 +#define wxStyledTextCtrl_Clear 3166 +#define wxStyledTextCtrl_SetText 3167 +#define wxStyledTextCtrl_GetText 3168 +#define wxStyledTextCtrl_GetTextLength 3169 +#define wxStyledTextCtrl_GetOvertype 3170 +#define wxStyledTextCtrl_SetCaretWidth 3171 +#define wxStyledTextCtrl_GetCaretWidth 3172 +#define wxStyledTextCtrl_SetTargetStart 3173 +#define wxStyledTextCtrl_GetTargetStart 3174 +#define wxStyledTextCtrl_SetTargetEnd 3175 +#define wxStyledTextCtrl_GetTargetEnd 3176 +#define wxStyledTextCtrl_ReplaceTarget 3177 +#define wxStyledTextCtrl_SearchInTarget 3178 +#define wxStyledTextCtrl_SetSearchFlags 3179 +#define wxStyledTextCtrl_GetSearchFlags 3180 +#define wxStyledTextCtrl_CallTipShow 3181 +#define wxStyledTextCtrl_CallTipCancel 3182 +#define wxStyledTextCtrl_CallTipActive 3183 +#define wxStyledTextCtrl_CallTipPosAtStart 3184 +#define wxStyledTextCtrl_CallTipSetHighlight 3185 +#define wxStyledTextCtrl_CallTipSetBackground 3186 +#define wxStyledTextCtrl_CallTipSetForeground 3187 +#define wxStyledTextCtrl_CallTipSetForegroundHighlight 3188 +#define wxStyledTextCtrl_CallTipUseStyle 3189 +#define wxStyledTextCtrl_VisibleFromDocLine 3190 +#define wxStyledTextCtrl_DocLineFromVisible 3191 +#define wxStyledTextCtrl_WrapCount 3192 +#define wxStyledTextCtrl_SetFoldLevel 3193 +#define wxStyledTextCtrl_GetFoldLevel 3194 +#define wxStyledTextCtrl_GetLastChild 3195 +#define wxStyledTextCtrl_GetFoldParent 3196 +#define wxStyledTextCtrl_ShowLines 3197 +#define wxStyledTextCtrl_HideLines 3198 +#define wxStyledTextCtrl_GetLineVisible 3199 +#define wxStyledTextCtrl_SetFoldExpanded 3200 +#define wxStyledTextCtrl_GetFoldExpanded 3201 +#define wxStyledTextCtrl_ToggleFold 3202 +#define wxStyledTextCtrl_EnsureVisible 3203 +#define wxStyledTextCtrl_SetFoldFlags 3204 +#define wxStyledTextCtrl_EnsureVisibleEnforcePolicy 3205 +#define wxStyledTextCtrl_SetTabIndents 3206 +#define wxStyledTextCtrl_GetTabIndents 3207 +#define wxStyledTextCtrl_SetBackSpaceUnIndents 3208 +#define wxStyledTextCtrl_GetBackSpaceUnIndents 3209 +#define wxStyledTextCtrl_SetMouseDwellTime 3210 +#define wxStyledTextCtrl_GetMouseDwellTime 3211 +#define wxStyledTextCtrl_WordStartPosition 3212 +#define wxStyledTextCtrl_WordEndPosition 3213 +#define wxStyledTextCtrl_SetWrapMode 3214 +#define wxStyledTextCtrl_GetWrapMode 3215 +#define wxStyledTextCtrl_SetWrapVisualFlags 3216 +#define wxStyledTextCtrl_GetWrapVisualFlags 3217 +#define wxStyledTextCtrl_SetWrapVisualFlagsLocation 3218 +#define wxStyledTextCtrl_GetWrapVisualFlagsLocation 3219 +#define wxStyledTextCtrl_SetWrapStartIndent 3220 +#define wxStyledTextCtrl_GetWrapStartIndent 3221 +#define wxStyledTextCtrl_SetLayoutCache 3222 +#define wxStyledTextCtrl_GetLayoutCache 3223 +#define wxStyledTextCtrl_SetScrollWidth 3224 +#define wxStyledTextCtrl_GetScrollWidth 3225 +#define wxStyledTextCtrl_TextWidth 3226 +#define wxStyledTextCtrl_GetEndAtLastLine 3227 +#define wxStyledTextCtrl_TextHeight 3228 +#define wxStyledTextCtrl_SetUseVerticalScrollBar 3229 +#define wxStyledTextCtrl_GetUseVerticalScrollBar 3230 +#define wxStyledTextCtrl_AppendText 3231 +#define wxStyledTextCtrl_GetTwoPhaseDraw 3232 +#define wxStyledTextCtrl_SetTwoPhaseDraw 3233 +#define wxStyledTextCtrl_TargetFromSelection 3234 +#define wxStyledTextCtrl_LinesJoin 3235 +#define wxStyledTextCtrl_LinesSplit 3236 +#define wxStyledTextCtrl_SetFoldMarginColour 3237 +#define wxStyledTextCtrl_SetFoldMarginHiColour 3238 +#define wxStyledTextCtrl_LineDown 3239 +#define wxStyledTextCtrl_LineDownExtend 3240 +#define wxStyledTextCtrl_LineUp 3241 +#define wxStyledTextCtrl_LineUpExtend 3242 +#define wxStyledTextCtrl_CharLeft 3243 +#define wxStyledTextCtrl_CharLeftExtend 3244 +#define wxStyledTextCtrl_CharRight 3245 +#define wxStyledTextCtrl_CharRightExtend 3246 +#define wxStyledTextCtrl_WordLeft 3247 +#define wxStyledTextCtrl_WordLeftExtend 3248 +#define wxStyledTextCtrl_WordRight 3249 +#define wxStyledTextCtrl_WordRightExtend 3250 +#define wxStyledTextCtrl_Home 3251 +#define wxStyledTextCtrl_HomeExtend 3252 +#define wxStyledTextCtrl_LineEnd 3253 +#define wxStyledTextCtrl_LineEndExtend 3254 +#define wxStyledTextCtrl_DocumentStart 3255 +#define wxStyledTextCtrl_DocumentStartExtend 3256 +#define wxStyledTextCtrl_DocumentEnd 3257 +#define wxStyledTextCtrl_DocumentEndExtend 3258 +#define wxStyledTextCtrl_PageUp 3259 +#define wxStyledTextCtrl_PageUpExtend 3260 +#define wxStyledTextCtrl_PageDown 3261 +#define wxStyledTextCtrl_PageDownExtend 3262 +#define wxStyledTextCtrl_EditToggleOvertype 3263 +#define wxStyledTextCtrl_Cancel 3264 +#define wxStyledTextCtrl_DeleteBack 3265 +#define wxStyledTextCtrl_Tab 3266 +#define wxStyledTextCtrl_BackTab 3267 +#define wxStyledTextCtrl_NewLine 3268 +#define wxStyledTextCtrl_FormFeed 3269 +#define wxStyledTextCtrl_VCHome 3270 +#define wxStyledTextCtrl_VCHomeExtend 3271 +#define wxStyledTextCtrl_ZoomIn 3272 +#define wxStyledTextCtrl_ZoomOut 3273 +#define wxStyledTextCtrl_DelWordLeft 3274 +#define wxStyledTextCtrl_DelWordRight 3275 +#define wxStyledTextCtrl_LineCut 3276 +#define wxStyledTextCtrl_LineDelete 3277 +#define wxStyledTextCtrl_LineTranspose 3278 +#define wxStyledTextCtrl_LineDuplicate 3279 +#define wxStyledTextCtrl_LowerCase 3280 +#define wxStyledTextCtrl_UpperCase 3281 +#define wxStyledTextCtrl_LineScrollDown 3282 +#define wxStyledTextCtrl_LineScrollUp 3283 +#define wxStyledTextCtrl_DeleteBackNotLine 3284 +#define wxStyledTextCtrl_HomeDisplay 3285 +#define wxStyledTextCtrl_HomeDisplayExtend 3286 +#define wxStyledTextCtrl_LineEndDisplay 3287 +#define wxStyledTextCtrl_LineEndDisplayExtend 3288 +#define wxStyledTextCtrl_HomeWrapExtend 3289 +#define wxStyledTextCtrl_LineEndWrap 3290 +#define wxStyledTextCtrl_LineEndWrapExtend 3291 +#define wxStyledTextCtrl_VCHomeWrap 3292 +#define wxStyledTextCtrl_VCHomeWrapExtend 3293 +#define wxStyledTextCtrl_LineCopy 3294 +#define wxStyledTextCtrl_MoveCaretInsideView 3295 +#define wxStyledTextCtrl_LineLength 3296 +#define wxStyledTextCtrl_BraceHighlight 3297 +#define wxStyledTextCtrl_BraceBadLight 3298 +#define wxStyledTextCtrl_BraceMatch 3299 +#define wxStyledTextCtrl_GetViewEOL 3300 +#define wxStyledTextCtrl_SetViewEOL 3301 +#define wxStyledTextCtrl_SetModEventMask 3302 +#define wxStyledTextCtrl_GetEdgeColumn 3303 +#define wxStyledTextCtrl_SetEdgeColumn 3304 +#define wxStyledTextCtrl_SetEdgeMode 3305 +#define wxStyledTextCtrl_GetEdgeMode 3306 +#define wxStyledTextCtrl_GetEdgeColour 3307 +#define wxStyledTextCtrl_SetEdgeColour 3308 +#define wxStyledTextCtrl_SearchAnchor 3309 +#define wxStyledTextCtrl_SearchNext 3310 +#define wxStyledTextCtrl_SearchPrev 3311 +#define wxStyledTextCtrl_LinesOnScreen 3312 +#define wxStyledTextCtrl_UsePopUp 3313 +#define wxStyledTextCtrl_SelectionIsRectangle 3314 +#define wxStyledTextCtrl_SetZoom 3315 +#define wxStyledTextCtrl_GetZoom 3316 +#define wxStyledTextCtrl_GetModEventMask 3317 +#define wxStyledTextCtrl_SetSTCFocus 3318 +#define wxStyledTextCtrl_GetSTCFocus 3319 +#define wxStyledTextCtrl_SetStatus 3320 +#define wxStyledTextCtrl_GetStatus 3321 +#define wxStyledTextCtrl_SetMouseDownCaptures 3322 +#define wxStyledTextCtrl_GetMouseDownCaptures 3323 +#define wxStyledTextCtrl_SetSTCCursor 3324 +#define wxStyledTextCtrl_GetSTCCursor 3325 +#define wxStyledTextCtrl_SetControlCharSymbol 3326 +#define wxStyledTextCtrl_GetControlCharSymbol 3327 +#define wxStyledTextCtrl_WordPartLeft 3328 +#define wxStyledTextCtrl_WordPartLeftExtend 3329 +#define wxStyledTextCtrl_WordPartRight 3330 +#define wxStyledTextCtrl_WordPartRightExtend 3331 +#define wxStyledTextCtrl_SetVisiblePolicy 3332 +#define wxStyledTextCtrl_DelLineLeft 3333 +#define wxStyledTextCtrl_DelLineRight 3334 +#define wxStyledTextCtrl_GetXOffset 3335 +#define wxStyledTextCtrl_ChooseCaretX 3336 +#define wxStyledTextCtrl_SetXCaretPolicy 3337 +#define wxStyledTextCtrl_SetYCaretPolicy 3338 +#define wxStyledTextCtrl_GetPrintWrapMode 3339 +#define wxStyledTextCtrl_SetHotspotActiveForeground 3340 +#define wxStyledTextCtrl_SetHotspotActiveBackground 3341 +#define wxStyledTextCtrl_SetHotspotActiveUnderline 3342 +#define wxStyledTextCtrl_SetHotspotSingleLine 3343 +#define wxStyledTextCtrl_ParaDownExtend 3344 +#define wxStyledTextCtrl_ParaUp 3345 +#define wxStyledTextCtrl_ParaUpExtend 3346 +#define wxStyledTextCtrl_PositionBefore 3347 +#define wxStyledTextCtrl_PositionAfter 3348 +#define wxStyledTextCtrl_CopyRange 3349 +#define wxStyledTextCtrl_CopyText 3350 +#define wxStyledTextCtrl_SetSelectionMode 3351 +#define wxStyledTextCtrl_GetSelectionMode 3352 +#define wxStyledTextCtrl_LineDownRectExtend 3353 +#define wxStyledTextCtrl_LineUpRectExtend 3354 +#define wxStyledTextCtrl_CharLeftRectExtend 3355 +#define wxStyledTextCtrl_CharRightRectExtend 3356 +#define wxStyledTextCtrl_HomeRectExtend 3357 +#define wxStyledTextCtrl_VCHomeRectExtend 3358 +#define wxStyledTextCtrl_LineEndRectExtend 3359 +#define wxStyledTextCtrl_PageUpRectExtend 3360 +#define wxStyledTextCtrl_PageDownRectExtend 3361 +#define wxStyledTextCtrl_StutteredPageUp 3362 +#define wxStyledTextCtrl_StutteredPageUpExtend 3363 +#define wxStyledTextCtrl_StutteredPageDown 3364 +#define wxStyledTextCtrl_StutteredPageDownExtend 3365 +#define wxStyledTextCtrl_WordLeftEnd 3366 +#define wxStyledTextCtrl_WordLeftEndExtend 3367 +#define wxStyledTextCtrl_WordRightEnd 3368 +#define wxStyledTextCtrl_WordRightEndExtend 3369 +#define wxStyledTextCtrl_SetWhitespaceChars 3370 +#define wxStyledTextCtrl_SetCharsDefault 3371 +#define wxStyledTextCtrl_AutoCompGetCurrent 3372 +#define wxStyledTextCtrl_Allocate 3373 +#define wxStyledTextCtrl_FindColumn 3374 +#define wxStyledTextCtrl_GetCaretSticky 3375 +#define wxStyledTextCtrl_SetCaretSticky 3376 +#define wxStyledTextCtrl_ToggleCaretSticky 3377 +#define wxStyledTextCtrl_SetPasteConvertEndings 3378 +#define wxStyledTextCtrl_GetPasteConvertEndings 3379 +#define wxStyledTextCtrl_SelectionDuplicate 3380 +#define wxStyledTextCtrl_SetCaretLineBackAlpha 3381 +#define wxStyledTextCtrl_GetCaretLineBackAlpha 3382 +#define wxStyledTextCtrl_StartRecord 3383 +#define wxStyledTextCtrl_StopRecord 3384 +#define wxStyledTextCtrl_SetLexer 3385 +#define wxStyledTextCtrl_GetLexer 3386 +#define wxStyledTextCtrl_Colourise 3387 +#define wxStyledTextCtrl_SetProperty 3388 +#define wxStyledTextCtrl_SetKeyWords 3389 +#define wxStyledTextCtrl_SetLexerLanguage 3390 +#define wxStyledTextCtrl_GetProperty 3391 +#define wxStyledTextCtrl_GetStyleBitsNeeded 3392 +#define wxStyledTextCtrl_GetCurrentLine 3393 +#define wxStyledTextCtrl_StyleSetSpec 3394 +#define wxStyledTextCtrl_StyleSetFont 3395 +#define wxStyledTextCtrl_StyleSetFontAttr 3396 +#define wxStyledTextCtrl_StyleSetCharacterSet 3397 +#define wxStyledTextCtrl_StyleSetFontEncoding 3398 +#define wxStyledTextCtrl_CmdKeyExecute 3399 +#define wxStyledTextCtrl_SetMargins 3400 +#define wxStyledTextCtrl_GetSelection 3401 +#define wxStyledTextCtrl_PointFromPosition 3402 +#define wxStyledTextCtrl_ScrollToLine 3403 +#define wxStyledTextCtrl_ScrollToColumn 3404 +#define wxStyledTextCtrl_SetVScrollBar 3405 +#define wxStyledTextCtrl_SetHScrollBar 3406 +#define wxStyledTextCtrl_GetLastKeydownProcessed 3407 +#define wxStyledTextCtrl_SetLastKeydownProcessed 3408 +#define wxStyledTextCtrl_SaveFile 3409 +#define wxStyledTextCtrl_LoadFile 3410 +#define wxStyledTextCtrl_DoDragOver 3411 +#define wxStyledTextCtrl_DoDropText 3412 +#define wxStyledTextCtrl_GetUseAntiAliasing 3413 +#define wxStyledTextCtrl_AddTextRaw 3414 +#define wxStyledTextCtrl_InsertTextRaw 3415 +#define wxStyledTextCtrl_GetCurLineRaw 3416 +#define wxStyledTextCtrl_GetLineRaw 3417 +#define wxStyledTextCtrl_GetSelectedTextRaw 3418 +#define wxStyledTextCtrl_GetTextRangeRaw 3419 +#define wxStyledTextCtrl_SetTextRaw 3420 +#define wxStyledTextCtrl_GetTextRaw 3421 +#define wxStyledTextCtrl_AppendTextRaw 3422 +#define wxArtProvider_GetBitmap 3423 +#define wxArtProvider_GetIcon 3424 +#define wxTreeEvent_GetKeyCode 3425 +#define wxTreeEvent_GetItem 3426 +#define wxTreeEvent_GetKeyEvent 3427 +#define wxTreeEvent_GetLabel 3428 +#define wxTreeEvent_GetOldItem 3429 +#define wxTreeEvent_GetPoint 3430 +#define wxTreeEvent_IsEditCancelled 3431 +#define wxTreeEvent_SetToolTip 3432 +#define wxNotebookEvent_GetOldSelection 3433 +#define wxNotebookEvent_GetSelection 3434 +#define wxNotebookEvent_SetOldSelection 3435 +#define wxNotebookEvent_SetSelection 3436 +#define wxFileDataObject_new 3437 +#define wxFileDataObject_AddFile 3438 +#define wxFileDataObject_GetFilenames 3439 +#define wxFileDataObject_destroy 3440 +#define wxTextDataObject_new 3441 +#define wxTextDataObject_GetTextLength 3442 +#define wxTextDataObject_GetText 3443 +#define wxTextDataObject_SetText 3444 +#define wxTextDataObject_destroy 3445 +#define wxBitmapDataObject_new_1_1 3446 +#define wxBitmapDataObject_new_1_0 3447 +#define wxBitmapDataObject_GetBitmap 3448 +#define wxBitmapDataObject_SetBitmap 3449 +#define wxBitmapDataObject_destroy 3450 +#define wxClipboard_new 3452 +#define wxClipboard_destruct 3453 +#define wxClipboard_AddData 3454 +#define wxClipboard_Clear 3455 +#define wxClipboard_Close 3456 +#define wxClipboard_Flush 3457 +#define wxClipboard_GetData 3458 +#define wxClipboard_IsOpened 3459 +#define wxClipboard_Open 3460 +#define wxClipboard_SetData 3461 +#define wxClipboard_UsePrimarySelection 3463 +#define wxClipboard_IsSupported 3464 +#define wxClipboard_Get 3465 +#define wxSpinEvent_GetPosition 3466 +#define wxSpinEvent_SetPosition 3467 +#define wxSplitterWindow_new_0 3468 +#define wxSplitterWindow_new_2 3469 +#define wxSplitterWindow_destruct 3470 +#define wxSplitterWindow_Create 3471 +#define wxSplitterWindow_GetMinimumPaneSize 3472 +#define wxSplitterWindow_GetSashGravity 3473 +#define wxSplitterWindow_GetSashPosition 3474 +#define wxSplitterWindow_GetSplitMode 3475 +#define wxSplitterWindow_GetWindow1 3476 +#define wxSplitterWindow_GetWindow2 3477 +#define wxSplitterWindow_Initialize 3478 +#define wxSplitterWindow_IsSplit 3479 +#define wxSplitterWindow_ReplaceWindow 3480 +#define wxSplitterWindow_SetSashGravity 3481 +#define wxSplitterWindow_SetSashPosition 3482 +#define wxSplitterWindow_SetSashSize 3483 +#define wxSplitterWindow_SetMinimumPaneSize 3484 +#define wxSplitterWindow_SetSplitMode 3485 +#define wxSplitterWindow_SplitHorizontally 3486 +#define wxSplitterWindow_SplitVertically 3487 +#define wxSplitterWindow_Unsplit 3488 +#define wxSplitterWindow_UpdateSize 3489 +#define wxSplitterEvent_GetSashPosition 3490 +#define wxSplitterEvent_GetX 3491 +#define wxSplitterEvent_GetY 3492 +#define wxSplitterEvent_GetWindowBeingRemoved 3493 +#define wxSplitterEvent_SetSashPosition 3494 +#define wxHtmlWindow_new_0 3495 +#define wxHtmlWindow_new_2 3496 +#define wxHtmlWindow_AppendToPage 3497 +#define wxHtmlWindow_GetOpenedAnchor 3498 +#define wxHtmlWindow_GetOpenedPage 3499 +#define wxHtmlWindow_GetOpenedPageTitle 3500 +#define wxHtmlWindow_GetRelatedFrame 3501 +#define wxHtmlWindow_HistoryBack 3502 +#define wxHtmlWindow_HistoryCanBack 3503 +#define wxHtmlWindow_HistoryCanForward 3504 +#define wxHtmlWindow_HistoryClear 3505 +#define wxHtmlWindow_HistoryForward 3506 +#define wxHtmlWindow_LoadFile 3507 +#define wxHtmlWindow_LoadPage 3508 +#define wxHtmlWindow_SelectAll 3509 +#define wxHtmlWindow_SelectionToText 3510 +#define wxHtmlWindow_SelectLine 3511 +#define wxHtmlWindow_SelectWord 3512 +#define wxHtmlWindow_SetBorders 3513 +#define wxHtmlWindow_SetFonts 3514 +#define wxHtmlWindow_SetPage 3515 +#define wxHtmlWindow_SetRelatedFrame 3516 +#define wxHtmlWindow_SetRelatedStatusBar 3517 +#define wxHtmlWindow_ToText 3518 +#define wxHtmlWindow_destroy 3519 +#define wxHtmlLinkEvent_GetLinkInfo 3520 +#define wxSystemSettings_GetColour 3521 +#define wxSystemSettings_GetFont 3522 +#define wxSystemSettings_GetMetric 3523 +#define wxSystemSettings_GetScreenType 3524 +#define wxSystemOptions_GetOption 3525 +#define wxSystemOptions_GetOptionInt 3526 +#define wxSystemOptions_HasOption 3527 +#define wxSystemOptions_IsFalse 3528 +#define wxSystemOptions_SetOption_2_1 3529 +#define wxSystemOptions_SetOption_2_0 3530 +#define wxAuiNotebookEvent_SetSelection 3531 +#define wxAuiNotebookEvent_GetSelection 3532 +#define wxAuiNotebookEvent_SetOldSelection 3533 +#define wxAuiNotebookEvent_GetOldSelection 3534 +#define wxAuiNotebookEvent_SetDragSource 3535 +#define wxAuiNotebookEvent_GetDragSource 3536 +#define wxAuiManagerEvent_SetManager 3537 +#define wxAuiManagerEvent_GetManager 3538 +#define wxAuiManagerEvent_SetPane 3539 +#define wxAuiManagerEvent_GetPane 3540 +#define wxAuiManagerEvent_SetButton 3541 +#define wxAuiManagerEvent_GetButton 3542 +#define wxAuiManagerEvent_SetDC 3543 +#define wxAuiManagerEvent_GetDC 3544 +#define wxAuiManagerEvent_Veto 3545 +#define wxAuiManagerEvent_GetVeto 3546 +#define wxAuiManagerEvent_SetCanVeto 3547 +#define wxAuiManagerEvent_CanVeto 3548 +#define wxLogNull_new 3549 +#define wxLogNull_destroy 3550 +#define wxTaskBarIcon_new 3551 +#define wxTaskBarIcon_destruct 3552 +#define wxTaskBarIcon_PopupMenu 3553 +#define wxTaskBarIcon_RemoveIcon 3554 +#define wxTaskBarIcon_SetIcon 3555 +#define wxLocale_new_0 3556 +#define wxLocale_new_2 3558 +#define wxLocale_destruct 3559 +#define wxLocale_Init 3561 +#define wxLocale_AddCatalog_1 3562 +#define wxLocale_AddCatalog_3 3563 +#define wxLocale_AddCatalogLookupPathPrefix 3564 +#define wxLocale_GetCanonicalName 3565 +#define wxLocale_GetLanguage 3566 +#define wxLocale_GetLanguageName 3567 +#define wxLocale_GetLocale 3568 +#define wxLocale_GetName 3569 +#define wxLocale_GetString_2 3570 +#define wxLocale_GetString_4 3571 +#define wxLocale_GetHeaderValue 3572 +#define wxLocale_GetSysName 3573 +#define wxLocale_GetSystemEncoding 3574 +#define wxLocale_GetSystemEncodingName 3575 +#define wxLocale_GetSystemLanguage 3576 +#define wxLocale_IsLoaded 3577 +#define wxLocale_IsOk 3578 +#define wxActivateEvent_GetActive 3579 +#define wxPopupWindow_new_2 3581 +#define wxPopupWindow_new_0 3582 +#define wxPopupWindow_destruct 3584 +#define wxPopupWindow_Create 3585 +#define wxPopupWindow_Position 3586 +#define wxPopupTransientWindow_new_0 3587 +#define wxPopupTransientWindow_new_2 3588 +#define wxPopupTransientWindow_destruct 3589 +#define wxPopupTransientWindow_Popup 3590 +#define wxPopupTransientWindow_Dismiss 3591 +#define wxOverlay_new 3592 +#define wxOverlay_destruct 3593 +#define wxOverlay_Reset 3594 +#define wxDCOverlay_new_6 3595 +#define wxDCOverlay_new_2 3596 +#define wxDCOverlay_destruct 3597 +#define wxDCOverlay_Clear 3598 diff --git a/lib/wx/c_src/wxe_driver.c b/lib/wx/c_src/wxe_driver.c index eb7d7dcaeb..6f027ea25b 100644 --- a/lib/wx/c_src/wxe_driver.c +++ b/lib/wx/c_src/wxe_driver.c @@ -241,12 +241,10 @@ standard_outputv(ErlDrvData drv_data, ErlIOVec* ev) bin = ev->binv[1]; driver_binary_inc_refc(bin); /* Otherwise it could get deallocated */ binref->bin = bin; - sd->bin = binref; } else { /* Empty binary (becomes NULL) */ binref->base = NULL; binref->size = 0; binref->from = driver_caller(sd->port_handle); binref->bin = NULL; - sd->bin = binref; } } diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp index 5126804b9f..7f2e767a6b 100644 --- a/lib/wx/c_src/wxe_gl.cpp +++ b/lib/wx/c_src/wxe_gl.cpp @@ -138,9 +138,9 @@ void gl_dispatch(int op, char *bp,ErlDrvTermData caller,WXEBinRef *bins){ wxGLCanvas * current = glc[caller]; if(current) { if(current != glc[gl_active]) { - gl_active = caller; current->SetCurrent(); } + gl_active = caller; } else { ErlDrvTermData rt[] = // Error msg {ERL_DRV_ATOM, driver_mk_atom((char *) "_egl_error_"), diff --git a/lib/wx/configure.in b/lib/wx/configure.in index 48fcca640c..bf27b72aa7 100644 --- a/lib/wx/configure.in +++ b/lib/wx/configure.in @@ -164,14 +164,14 @@ case $host_os in CPPFLAGS="$CPPFLAGS -D_MACOSX $PTHR_CFLAGS" ;; mingw32) - CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0500 -D_WINDOWS -D_UNICODE -DUNICODE" - CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0500" + CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0600 -D_WINDOWS -D_UNICODE -DUNICODE" + CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600" AC_MSG_WARN([Reverting to 32-bit time_t]) CPPFLAGS="$CPPFLAGS -D_USE_32BIT_TIME_T" ;; win32) - CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0500 -D_WINDOWS -D_UNICODE -DUNICODE" - CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0500" + CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0600 -D_WINDOWS -D_UNICODE -DUNICODE" + CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600" ;; *) CFLAGS="$CFLAGS -Wno-deprecated-declarations" diff --git a/lib/wx/include/wx.hrl b/lib/wx/include/wx.hrl index 1bc00ca235..333ceca50c 100644 --- a/lib/wx/include/wx.hrl +++ b/lib/wx/include/wx.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2015. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -4085,7 +4085,3 @@ -define(wxWINDOW_VARIANT_MINI, 2). -define(wxWINDOW_VARIANT_LARGE, 3). -define(wxWINDOW_VARIANT_MAX, 4). -% From "xmlres.h": wxXmlResourceFlags --define(wxXRC_USE_LOCALE, 1). --define(wxXRC_NO_SUBCLASSING, 2). --define(wxXRC_NO_RELOADING, 4). diff --git a/lib/wx/src/gen/wxAuiNotebook.erl b/lib/wx/src/gen/wxAuiNotebook.erl index f66048f0d3..7ec1acb26d 100644 --- a/lib/wx/src/gen/wxAuiNotebook.erl +++ b/lib/wx/src/gen/wxAuiNotebook.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -37,10 +37,10 @@ setTabCtrlHeight/2,setUniformBitmapSize/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -52,23 +52,24 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setForegroundColour/2, setHelpText/2,setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2, setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,setPalette/2, setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2, setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, - setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, + setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, @@ -349,6 +350,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxBitmapButton.erl b/lib/wx/src/gen/wxBitmapButton.erl index e0fb4bc78a..642828b0b0 100644 --- a/lib/wx/src/gen/wxBitmapButton.erl +++ b/lib/wx/src/gen/wxBitmapButton.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ setBitmapLabel/2,setBitmapSelected/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -51,24 +51,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, - setDefault/1,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, - setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDefault/1,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -229,6 +230,14 @@ setDefault(This) -> wxButton:setDefault(This). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxButton.erl b/lib/wx/src/gen/wxButton.erl index 06e6e53976..c94303bbea 100644 --- a/lib/wx/src/gen/wxButton.erl +++ b/lib/wx/src/gen/wxButton.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ setLabel/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -49,24 +49,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setMaxSize/2,setMinSize/2, setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -179,6 +180,14 @@ destroy(Obj=#wx_ref{type=Type}) -> getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxCalendarCtrl.erl b/lib/wx/src/gen/wxCalendarCtrl.erl index 2c24063372..1d4baeed08 100644 --- a/lib/wx/src/gen/wxCalendarCtrl.erl +++ b/lib/wx/src/gen/wxCalendarCtrl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -38,10 +38,10 @@ setHighlightColours/3,setHoliday/2,setHolidayColours/3]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -53,24 +53,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -363,6 +364,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxCheckBox.erl b/lib/wx/src/gen/wxCheckBox.erl index c190ebcf27..2cea4d04b4 100644 --- a/lib/wx/src/gen/wxCheckBox.erl +++ b/lib/wx/src/gen/wxCheckBox.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ setValue/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -50,24 +50,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -216,6 +217,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxCheckListBox.erl b/lib/wx/src/gen/wxCheckListBox.erl index 94656daac8..f6013e4863 100644 --- a/lib/wx/src/gen/wxCheckListBox.erl +++ b/lib/wx/src/gen/wxCheckListBox.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -35,46 +35,48 @@ -export([check/2,check/3,destroy/1,isChecked/2,new/0,new/2,new/3]). %% inherited exports --export([append/2,append/3,appendStrings/2,cacheBestSize/2,captureMouse/1,center/1, - center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, - centreOnParent/2,clear/1,clearBackground/1,clientToScreen/2,clientToScreen/3, - close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, - delete/2,deselect/2,destroyChildren/1,disable/1,disconnect/1,disconnect/2, - disconnect/3,enable/1,enable/2,findString/2,findString/3,findWindow/2, - fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,getBackgroundColour/1, - getBackgroundStyle/1,getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1, - getChildren/1,getClientData/2,getClientSize/1,getContainingSizer/1, - getCount/1,getCursor/1,getDropTarget/1,getEventHandler/1,getExtraStyle/1, - getFont/1,getForegroundColour/1,getGrandParent/1,getHandle/1,getHelpText/1, - getId/1,getLabel/1,getMaxSize/1,getMinSize/1,getName/1,getParent/1, - getPosition/1,getRect/1,getScreenPosition/1,getScreenRect/1,getScrollPos/2, - getScrollRange/2,getScrollThumb/2,getSelection/1,getSelections/1, - getSize/1,getSizer/1,getString/2,getStringSelection/1,getTextExtent/2, - getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, - getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,hitTest/2,inheritAttributes/1,initDialog/1,insert/3,insert/4, - insertItems/3,invalidateBestSize/1,isEmpty/1,isEnabled/1,isExposed/2, - isExposed/3,isExposed/5,isRetained/1,isSelected/2,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - select/2,set/2,setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientData/3,setClientSize/2,setClientSize/3, - setContainingSizer/2,setCursor/2,setDropTarget/2,setExtraStyle/2, - setFirstItem/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2, - setHelpText/2,setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2, - setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,setPalette/2, - setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setSelection/2, - setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, - setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setString/3,setStringSelection/2,setThemeEnabled/2,setToolTip/2,setVirtualSize/2, - setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, - show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, - update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). +-export([append/2,append/3,appendStrings/2,cacheBestSize/2,canSetTransparent/1, + captureMouse/1,center/1,center/2,centerOnParent/1,centerOnParent/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,clear/1,clearBackground/1, + clientToScreen/2,clientToScreen/3,close/1,close/2,connect/2,connect/3, + convertDialogToPixels/2,convertPixelsToDialog/2,delete/2,deselect/2, + destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, + enable/1,enable/2,findString/2,findString/3,findWindow/2,fit/1,fitInside/1, + freeze/1,getAcceleratorTable/1,getBackgroundColour/1,getBackgroundStyle/1, + getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,getChildren/1, + getClientData/2,getClientSize/1,getContainingSizer/1,getCount/1,getCursor/1, + getDropTarget/1,getEventHandler/1,getExtraStyle/1,getFont/1,getForegroundColour/1, + getGrandParent/1,getHandle/1,getHelpText/1,getId/1,getLabel/1,getMaxSize/1, + getMinSize/1,getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1, + getScreenRect/1,getScrollPos/2,getScrollRange/2,getScrollThumb/2, + getSelection/1,getSelections/1,getSize/1,getSizer/1,getString/2,getStringSelection/1, + getTextExtent/2,getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1, + getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1,hasScrollbar/2, + hasTransparentBackground/1,hide/1,hitTest/2,inheritAttributes/1,initDialog/1, + insert/3,insert/4,insertItems/3,invalidateBestSize/1,isDoubleBuffered/1, + isEmpty/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1, + isSelected/2,isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1, + makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2, + scrollPages/2,scrollWindow/3,scrollWindow/4,select/2,set/2,setAcceleratorTable/2, + setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, + setClientData/3,setClientSize/2,setClientSize/3,setContainingSizer/2, + setCursor/2,setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFirstItem/2, + setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,setHelpText/2, + setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setSelection/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setString/3, + setStringSelection/2,setThemeEnabled/2,setToolTip/2,setTransparent/2, + setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3, + setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2, + shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, + transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, + validate/1,warpPointer/3]). -export_type([wxCheckListBox/0]). %% @hidden @@ -220,6 +222,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxChoice.erl b/lib/wx/src/gen/wxChoice.erl index ddeb00beca..73867d6597 100644 --- a/lib/wx/src/gen/wxChoice.erl +++ b/lib/wx/src/gen/wxChoice.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -35,45 +35,47 @@ setColumns/2]). %% inherited exports --export([append/2,append/3,appendStrings/2,cacheBestSize/2,captureMouse/1,center/1, - center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, - centreOnParent/2,clear/1,clearBackground/1,clientToScreen/2,clientToScreen/3, - close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, - destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, - enable/1,enable/2,findString/2,findString/3,findWindow/2,fit/1,fitInside/1, - freeze/1,getAcceleratorTable/1,getBackgroundColour/1,getBackgroundStyle/1, - getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,getChildren/1, - getClientData/2,getClientSize/1,getContainingSizer/1,getCount/1,getCursor/1, - getDropTarget/1,getEventHandler/1,getExtraStyle/1,getFont/1,getForegroundColour/1, - getGrandParent/1,getHandle/1,getHelpText/1,getId/1,getLabel/1,getMaxSize/1, - getMinSize/1,getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1, +-export([append/2,append/3,appendStrings/2,cacheBestSize/2,canSetTransparent/1, + captureMouse/1,center/1,center/2,centerOnParent/1,centerOnParent/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,clear/1,clearBackground/1, + clientToScreen/2,clientToScreen/3,close/1,close/2,connect/2,connect/3, + convertDialogToPixels/2,convertPixelsToDialog/2,destroyChildren/1, + disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, + findString/2,findString/3,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, + getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, + getCharHeight/1,getCharWidth/1,getChildren/1,getClientData/2,getClientSize/1, + getContainingSizer/1,getCount/1,getCursor/1,getDropTarget/1,getEventHandler/1, + getExtraStyle/1,getFont/1,getForegroundColour/1,getGrandParent/1, + getHandle/1,getHelpText/1,getId/1,getLabel/1,getMaxSize/1,getMinSize/1, + getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1, getScreenRect/1,getScrollPos/2,getScrollRange/2,getScrollThumb/2, getSelection/1,getSize/1,getSizer/1,getString/2,getStringSelection/1, getTextExtent/2,getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1, getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1,hasScrollbar/2, hasTransparentBackground/1,hide/1,inheritAttributes/1,initDialog/1, - insert/3,insert/4,invalidateBestSize/1,isEmpty/1,isEnabled/1,isExposed/2, - isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1, - lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4, - moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2, - pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - select/2,setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientData/3,setClientSize/2,setClientSize/3, - setContainingSizer/2,setCursor/2,setDropTarget/2,setExtraStyle/2, - setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,setHelpText/2, - setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, - setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, - setScrollPos/4,setScrollbar/5,setScrollbar/6,setSelection/2,setSize/2, - setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, - setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setString/3, - setStringSelection/2,setThemeEnabled/2,setToolTip/2,setVirtualSize/2, - setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, - show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, - update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). + insert/3,insert/4,invalidateBestSize/1,isDoubleBuffered/1,isEmpty/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,select/2,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientData/3, + setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, + setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, + setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, + setSelection/2,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2, + setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2, + setSizerAndFit/3,setString/3,setStringSelection/2,setThemeEnabled/2, + setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, + setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, + setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, + transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, + validate/1,warpPointer/3]). -export_type([wxChoice/0]). %% @hidden @@ -235,6 +237,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxChoicebook.erl b/lib/wx/src/gen/wxChoicebook.erl index 7627662437..37a44a813a 100644 --- a/lib/wx/src/gen/wxChoicebook.erl +++ b/lib/wx/src/gen/wxChoicebook.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2013. All Rights Reserved. +%% Copyright Ericsson AB 2009-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -38,10 +38,10 @@ setPageSize/2,setPageText/3,setSelection/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -53,24 +53,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -383,6 +384,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxColourDialog.erl b/lib/wx/src/gen/wxColourDialog.erl index 66cde944c5..15eee30727 100644 --- a/lib/wx/src/gen/wxColourDialog.erl +++ b/lib/wx/src/gen/wxColourDialog.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,11 +34,11 @@ -export([create/2,create/3,destroy/1,getColourData/1,new/0,new/1,new/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1, disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -53,25 +53,26 @@ getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1, - maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, - refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, - reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2, - setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, - setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, - setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, - setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2, - setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2, - setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, - setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, + scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, + setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, + setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3, setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1, @@ -222,6 +223,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxColourPickerCtrl.erl b/lib/wx/src/gen/wxColourPickerCtrl.erl index a6ca31c06d..486441c005 100644 --- a/lib/wx/src/gen/wxColourPickerCtrl.erl +++ b/lib/wx/src/gen/wxColourPickerCtrl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ -export([create/3,create/4,destroy/1,getColour/1,new/0,new/2,new/3,setColour/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -50,30 +50,31 @@ getSize/1,getSizer/1,getTextCtrl/1,getTextCtrlProportion/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTextCtrl/1,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,isRetained/1, - isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1, - lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2, - moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, - popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, - raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, - removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2, - scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, - setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, - setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, - setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, - setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,setLabel/2, - setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, - setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,setPickerCtrlGrowable/2, - setPickerCtrlProportion/2,setScrollPos/3,setScrollPos/4,setScrollbar/5, - setScrollbar/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2, - setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2, - setSizerAndFit/3,setTextCtrlGrowable/1,setTextCtrlGrowable/2,setTextCtrlProportion/2, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, - show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, - update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1, + isRetained/1,isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1, + lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4, + moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2, + pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, + popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, + refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, + screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, + setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, + setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2, + setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1, + setPickerCtrlGrowable/2,setPickerCtrlProportion/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5, + setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, + setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTextCtrlGrowable/1, + setTextCtrlGrowable/2,setTextCtrlProportion/2,setThemeEnabled/2, + setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, + setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, + setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, + transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, + validate/1,warpPointer/3]). -export_type([wxColourPickerCtrl/0]). %% @hidden @@ -220,6 +221,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxComboBox.erl b/lib/wx/src/gen/wxComboBox.erl index 0e34c72934..37d6e71605 100644 --- a/lib/wx/src/gen/wxComboBox.erl +++ b/lib/wx/src/gen/wxComboBox.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -37,45 +37,47 @@ setSelection/2,setSelection/3,setValue/2,undo/1]). %% inherited exports --export([append/2,append/3,appendStrings/2,cacheBestSize/2,captureMouse/1,center/1, - center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, - centreOnParent/2,clear/1,clearBackground/1,clientToScreen/2,clientToScreen/3, - close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, - delete/2,destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, - enable/1,enable/2,findString/2,findString/3,findWindow/2,fit/1,fitInside/1, - freeze/1,getAcceleratorTable/1,getBackgroundColour/1,getBackgroundStyle/1, - getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,getChildren/1, - getClientData/2,getClientSize/1,getContainingSizer/1,getCount/1,getCursor/1, - getDropTarget/1,getEventHandler/1,getExtraStyle/1,getFont/1,getForegroundColour/1, - getGrandParent/1,getHandle/1,getHelpText/1,getId/1,getLabel/1,getMaxSize/1, - getMinSize/1,getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1, +-export([append/2,append/3,appendStrings/2,cacheBestSize/2,canSetTransparent/1, + captureMouse/1,center/1,center/2,centerOnParent/1,centerOnParent/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,clear/1,clearBackground/1, + clientToScreen/2,clientToScreen/3,close/1,close/2,connect/2,connect/3, + convertDialogToPixels/2,convertPixelsToDialog/2,delete/2,destroyChildren/1, + disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, + findString/2,findString/3,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, + getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, + getCharHeight/1,getCharWidth/1,getChildren/1,getClientData/2,getClientSize/1, + getContainingSizer/1,getCount/1,getCursor/1,getDropTarget/1,getEventHandler/1, + getExtraStyle/1,getFont/1,getForegroundColour/1,getGrandParent/1, + getHandle/1,getHelpText/1,getId/1,getLabel/1,getMaxSize/1,getMinSize/1, + getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1, getScreenRect/1,getScrollPos/2,getScrollRange/2,getScrollThumb/2, getSelection/1,getSize/1,getSizer/1,getString/2,getStringSelection/1, getTextExtent/2,getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1, getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1,hasScrollbar/2, hasTransparentBackground/1,hide/1,inheritAttributes/1,initDialog/1, - insert/3,insert/4,invalidateBestSize/1,isEmpty/1,isEnabled/1,isExposed/2, - isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1, - lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4, - moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2, - pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - select/2,setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientData/3,setClientSize/2,setClientSize/3, - setContainingSizer/2,setCursor/2,setDropTarget/2,setExtraStyle/2, - setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,setHelpText/2, - setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, - setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, - setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5, - setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, - setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setString/3,setStringSelection/2, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, - show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, - update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). + insert/3,insert/4,invalidateBestSize/1,isDoubleBuffered/1,isEmpty/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,select/2,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientData/3, + setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, + setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, + setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, + setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, + setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, + setString/3,setStringSelection/2,setThemeEnabled/2,setToolTip/2,setTransparent/2, + setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3, + setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2, + shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, + transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, + validate/1,warpPointer/3]). -export_type([wxComboBox/0]). %% @hidden @@ -370,6 +372,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxControl.erl b/lib/wx/src/gen/wxControl.erl index f0fb88e3eb..f84ec34b02 100644 --- a/lib/wx/src/gen/wxControl.erl +++ b/lib/wx/src/gen/wxControl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ -export([getLabel/1,setLabel/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -47,24 +47,25 @@ getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3, getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setMaxSize/2,setMinSize/2, setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -96,6 +97,14 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label) %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxControlWithItems.erl b/lib/wx/src/gen/wxControlWithItems.erl index 5f4ed9701b..d52c7917a2 100644 --- a/lib/wx/src/gen/wxControlWithItems.erl +++ b/lib/wx/src/gen/wxControlWithItems.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ setString/3,setStringSelection/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -51,24 +51,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -278,6 +279,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxDatePickerCtrl.erl b/lib/wx/src/gen/wxDatePickerCtrl.erl index 73df9c1395..057f91d4e8 100644 --- a/lib/wx/src/gen/wxDatePickerCtrl.erl +++ b/lib/wx/src/gen/wxDatePickerCtrl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ -export([destroy/1,getRange/3,getValue/1,new/0,new/2,new/3,setRange/3,setValue/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -50,30 +50,31 @@ getSize/1,getSizer/1,getTextCtrl/1,getTextCtrlProportion/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTextCtrl/1,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,isRetained/1, - isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1, - lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2, - moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, - popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, - raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, - removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2, - scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, - setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, - setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, - setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, - setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,setLabel/2, - setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, - setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,setPickerCtrlGrowable/2, - setPickerCtrlProportion/2,setScrollPos/3,setScrollPos/4,setScrollbar/5, - setScrollbar/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2, - setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2, - setSizerAndFit/3,setTextCtrlGrowable/1,setTextCtrlGrowable/2,setTextCtrlProportion/2, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, - show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, - update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1, + isRetained/1,isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1, + lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4, + moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2, + pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, + popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, + refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, + screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, + setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, + setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2, + setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1, + setPickerCtrlGrowable/2,setPickerCtrlProportion/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5, + setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, + setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTextCtrlGrowable/1, + setTextCtrlGrowable/2,setTextCtrlProportion/2,setThemeEnabled/2, + setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, + setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, + setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, + transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, + validate/1,warpPointer/3]). -export_type([wxDatePickerCtrl/0]). %% @hidden @@ -196,6 +197,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxDialog.erl b/lib/wx/src/gen/wxDialog.erl index aa4df5888c..c3f4828c68 100644 --- a/lib/wx/src/gen/wxDialog.erl +++ b/lib/wx/src/gen/wxDialog.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -35,11 +35,11 @@ new/0,new/3,new/4,setAffirmativeId/2,setReturnCode/2,show/1,show/2,showModal/1]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -53,29 +53,30 @@ getVirtualSize/1,getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1, hasScrollbar/2,hasTransparentBackground/1,hide/1,iconize/1,iconize/2, inheritAttributes/1,initDialog/1,invalidateBestSize/1,isActive/1, - isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,isIconized/1, - isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1, - lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,maximize/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,requestUserAttention/1, - requestUserAttention/2,screenToClient/1,screenToClient/2,scrollLines/2, - scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, - setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, - setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, - setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, - setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, - setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, - setOwnForegroundColour/2,setPalette/2,setScrollPos/3,setScrollPos/4, - setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,setSize/3,setSize/5, - setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, - setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,setTitle/2, - setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, - setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, - setWindowVariant/2,shouldInheritColours/1,showFullScreen/2,showFullScreen/3, - thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1, - updateWindowUI/2,validate/1,warpPointer/3]). + isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5, + isFullScreen/1,isIconized/1,isMaximized/1,isRetained/1,isShown/1,isTopLevel/1, + layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1, + maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1, + screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, + setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, + setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, + setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, + setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3, + setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, + showFullScreen/2,showFullScreen/3,thaw/1,transferDataFromWindow/1, + transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, + validate/1,warpPointer/3]). -export_type([wxDialog/0]). %% @hidden @@ -297,6 +298,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxDirDialog.erl b/lib/wx/src/gen/wxDirDialog.erl index cf1d558b00..aa7a419bcd 100644 --- a/lib/wx/src/gen/wxDirDialog.erl +++ b/lib/wx/src/gen/wxDirDialog.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,11 +34,11 @@ -export([destroy/1,getMessage/1,getPath/1,new/1,new/2,setMessage/2,setPath/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1, disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -53,25 +53,26 @@ getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1, - maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, - refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, - reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2, - setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, - setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, - setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, - setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2, - setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2, - setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, - setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, + scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, + setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, + setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3, setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1, @@ -230,6 +231,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxDirPickerCtrl.erl b/lib/wx/src/gen/wxDirPickerCtrl.erl index 1db48b467c..fea7ee71a1 100644 --- a/lib/wx/src/gen/wxDirPickerCtrl.erl +++ b/lib/wx/src/gen/wxDirPickerCtrl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ -export([create/3,create/4,destroy/1,getPath/1,new/0,new/2,new/3,setPath/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -50,30 +50,31 @@ getSize/1,getSizer/1,getTextCtrl/1,getTextCtrlProportion/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTextCtrl/1,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,isRetained/1, - isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1, - lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2, - moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, - popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, - raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, - removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2, - scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, - setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, - setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, - setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, - setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,setLabel/2, - setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, - setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,setPickerCtrlGrowable/2, - setPickerCtrlProportion/2,setScrollPos/3,setScrollPos/4,setScrollbar/5, - setScrollbar/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2, - setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2, - setSizerAndFit/3,setTextCtrlGrowable/1,setTextCtrlGrowable/2,setTextCtrlProportion/2, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, - show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, - update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1, + isRetained/1,isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1, + lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4, + moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2, + pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, + popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, + refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, + screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, + setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, + setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2, + setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1, + setPickerCtrlGrowable/2,setPickerCtrlProportion/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5, + setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, + setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTextCtrlGrowable/1, + setTextCtrlGrowable/2,setTextCtrlProportion/2,setThemeEnabled/2, + setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, + setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, + setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, + transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, + validate/1,warpPointer/3]). -export_type([wxDirPickerCtrl/0]). %% @hidden @@ -213,6 +214,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxFileDialog.erl b/lib/wx/src/gen/wxFileDialog.erl index d3dac3ba2d..36ee6463ae 100644 --- a/lib/wx/src/gen/wxFileDialog.erl +++ b/lib/wx/src/gen/wxFileDialog.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ setFilename/2,setFilterIndex/2,setMessage/2,setPath/2,setWildcard/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1, disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -55,25 +55,26 @@ getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1, - maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, - refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, - reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2, - setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, - setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, - setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, - setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2, - setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2, - setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, - setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, + scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, + setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, + setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3, setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1, @@ -323,6 +324,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxFilePickerCtrl.erl b/lib/wx/src/gen/wxFilePickerCtrl.erl index d781bdf000..2b57a5927b 100644 --- a/lib/wx/src/gen/wxFilePickerCtrl.erl +++ b/lib/wx/src/gen/wxFilePickerCtrl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ -export([create/3,create/4,destroy/1,getPath/1,new/0,new/2,new/3,setPath/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -50,30 +50,31 @@ getSize/1,getSizer/1,getTextCtrl/1,getTextCtrlProportion/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTextCtrl/1,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,isRetained/1, - isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1, - lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2, - moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, - popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, - raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, - removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2, - scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, - setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, - setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, - setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, - setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,setLabel/2, - setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, - setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,setPickerCtrlGrowable/2, - setPickerCtrlProportion/2,setScrollPos/3,setScrollPos/4,setScrollbar/5, - setScrollbar/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2, - setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2, - setSizerAndFit/3,setTextCtrlGrowable/1,setTextCtrlGrowable/2,setTextCtrlProportion/2, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, - show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, - update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1, + isRetained/1,isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1, + lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4, + moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2, + pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, + popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, + refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, + screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, + setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, + setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2, + setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1, + setPickerCtrlGrowable/2,setPickerCtrlProportion/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5, + setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, + setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTextCtrlGrowable/1, + setTextCtrlGrowable/2,setTextCtrlProportion/2,setThemeEnabled/2, + setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, + setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, + setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, + transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, + validate/1,warpPointer/3]). -export_type([wxFilePickerCtrl/0]). %% @hidden @@ -217,6 +218,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxFindReplaceDialog.erl b/lib/wx/src/gen/wxFindReplaceDialog.erl index a14a05fb8e..d265e232b3 100644 --- a/lib/wx/src/gen/wxFindReplaceDialog.erl +++ b/lib/wx/src/gen/wxFindReplaceDialog.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,11 +34,11 @@ -export([create/4,create/5,destroy/1,getData/1,new/0,new/3,new/4]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1, disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -53,25 +53,26 @@ getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1, - maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, - refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, - reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2, - setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, - setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, - setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, - setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2, - setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2, - setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, - setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, + scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, + setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, + setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3, setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1, @@ -226,6 +227,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxFontDialog.erl b/lib/wx/src/gen/wxFontDialog.erl index cf0938a57d..de199cfcce 100644 --- a/lib/wx/src/gen/wxFontDialog.erl +++ b/lib/wx/src/gen/wxFontDialog.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,11 +34,11 @@ -export([create/3,destroy/1,getFontData/1,new/0,new/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1, disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -53,25 +53,26 @@ getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1, - maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, - refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, - reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2, - setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, - setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, - setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, - setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2, - setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2, - setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, - setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, + scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, + setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, + setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3, setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1, @@ -198,6 +199,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxFontPickerCtrl.erl b/lib/wx/src/gen/wxFontPickerCtrl.erl index b5c3b641ee..c21061e0fe 100644 --- a/lib/wx/src/gen/wxFontPickerCtrl.erl +++ b/lib/wx/src/gen/wxFontPickerCtrl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ new/2,new/3,setMaxPointSize/2,setSelectedFont/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -51,30 +51,31 @@ getSize/1,getSizer/1,getTextCtrl/1,getTextCtrlProportion/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTextCtrl/1,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,isRetained/1, - isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1, - lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2, - moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, - popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, - raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, - removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2, - scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, - setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, - setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, - setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, - setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,setLabel/2, - setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, - setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,setPickerCtrlGrowable/2, - setPickerCtrlProportion/2,setScrollPos/3,setScrollPos/4,setScrollbar/5, - setScrollbar/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2, - setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2, - setSizerAndFit/3,setTextCtrlGrowable/1,setTextCtrlGrowable/2,setTextCtrlProportion/2, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, - show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, - update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1, + isRetained/1,isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1, + lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4, + moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2, + pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, + popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, + refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, + screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, + setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, + setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2, + setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1, + setPickerCtrlGrowable/2,setPickerCtrlProportion/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5, + setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, + setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTextCtrlGrowable/1, + setTextCtrlGrowable/2,setTextCtrlProportion/2,setThemeEnabled/2, + setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, + setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, + setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, + transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, + validate/1,warpPointer/3]). -export_type([wxFontPickerCtrl/0]). %% @hidden @@ -226,6 +227,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxFrame.erl b/lib/wx/src/gen/wxFrame.erl index 6fa1a2b958..75860cd9b7 100644 --- a/lib/wx/src/gen/wxFrame.erl +++ b/lib/wx/src/gen/wxFrame.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -37,11 +37,11 @@ setStatusText/3,setStatusWidths/2,setToolBar/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -55,29 +55,30 @@ getVirtualSize/1,getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1, hasScrollbar/2,hasTransparentBackground/1,hide/1,iconize/1,iconize/2, inheritAttributes/1,initDialog/1,invalidateBestSize/1,isActive/1, - isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,isIconized/1, - isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1, - lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,maximize/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,requestUserAttention/1, - requestUserAttention/2,screenToClient/1,screenToClient/2,scrollLines/2, - scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, - setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, - setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, - setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, - setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, - setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, - setOwnForegroundColour/2,setPalette/2,setScrollPos/3,setScrollPos/4, - setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,setSize/3,setSize/5, - setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, - setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,setTitle/2, - setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, - setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, - setWindowVariant/2,shouldInheritColours/1,show/1,show/2,showFullScreen/2, - showFullScreen/3,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, - update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). + isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5, + isFullScreen/1,isIconized/1,isMaximized/1,isRetained/1,isShown/1,isTopLevel/1, + layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1, + maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1, + screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, + setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, + setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, + setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, + setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3, + setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, + show/1,show/2,showFullScreen/2,showFullScreen/3,thaw/1,transferDataFromWindow/1, + transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, + validate/1,warpPointer/3]). -export_type([wxFrame/0]). %% @hidden @@ -374,6 +375,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxGLCanvas.erl b/lib/wx/src/gen/wxGLCanvas.erl index b00b45ad24..9d3d13740d 100644 --- a/lib/wx/src/gen/wxGLCanvas.erl +++ b/lib/wx/src/gen/wxGLCanvas.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ -export([destroy/1,getContext/1,new/1,new/2,new/3,setCurrent/1,swapBuffers/1]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -47,24 +47,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -193,6 +194,14 @@ destroy(Obj=#wx_ref{type=Type}) -> ok. %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxGauge.erl b/lib/wx/src/gen/wxGauge.erl index 0b64f097ad..51c35145c4 100644 --- a/lib/wx/src/gen/wxGauge.erl +++ b/lib/wx/src/gen/wxGauge.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ setShadowWidth/2,setValue/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -50,24 +50,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -238,6 +239,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxGenericDirCtrl.erl b/lib/wx/src/gen/wxGenericDirCtrl.erl index 014111144f..bc26a1645e 100644 --- a/lib/wx/src/gen/wxGenericDirCtrl.erl +++ b/lib/wx/src/gen/wxGenericDirCtrl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ setFilterIndex/2,setPath/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -51,24 +51,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -296,6 +297,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxGrid.erl b/lib/wx/src/gen/wxGrid.erl index 0d35804529..49bd89f188 100644 --- a/lib/wx/src/gen/wxGrid.erl +++ b/lib/wx/src/gen/wxGrid.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -86,10 +86,10 @@ %% inherited exports -export([cacheBestSize/2,calcScrolledPosition/2,calcScrolledPosition/3,calcUnscrolledPosition/2, - calcUnscrolledPosition/3,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, + calcUnscrolledPosition/3,canSetTransparent/1,captureMouse/1,center/1, + center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, doPrepareDC/2,enable/1,enable/2,enableScrolling/3,findWindow/2,fitInside/1, freeze/1,getAcceleratorTable/1,getBackgroundColour/1,getBackgroundStyle/1, @@ -102,25 +102,26 @@ getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3, getToolTip/1,getUpdateRegion/1,getViewStart/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,prepareDC/2,raise/1,refresh/1,refresh/2, - refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,reparent/2, - screenToClient/1,screenToClient/2,scroll/3,scrollLines/2,scrollPages/2, - scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, - setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, - setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2, - setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1, - setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, - setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, - setPalette/2,setScrollPos/3,setScrollPos/4,setScrollRate/3,setScrollbar/5, - setScrollbar/6,setScrollbars/5,setScrollbars/6,setSize/2,setSize/3, - setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, - setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2, - setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,prepareDC/2, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scroll/3, + scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, + setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, + setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFocusIgnoringChildren/1,setFont/2,setForegroundColour/2,setHelpText/2, + setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, + setScrollPos/4,setScrollRate/3,setScrollbar/5,setScrollbar/6,setScrollbars/5, + setScrollbars/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2, + setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2, + setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,setToolTip/2, + setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, @@ -2157,6 +2158,14 @@ setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This). initDialog(This) -> wxPanel:initDialog(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxHtmlWindow.erl b/lib/wx/src/gen/wxHtmlWindow.erl index 6b0b172b24..759b8ba0fd 100644 --- a/lib/wx/src/gen/wxHtmlWindow.erl +++ b/lib/wx/src/gen/wxHtmlWindow.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2013. All Rights Reserved. +%% Copyright Ericsson AB 2009-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -40,10 +40,10 @@ %% inherited exports -export([cacheBestSize/2,calcScrolledPosition/2,calcScrolledPosition/3,calcUnscrolledPosition/2, - calcUnscrolledPosition/3,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, + calcUnscrolledPosition/3,canSetTransparent/1,captureMouse/1,center/1, + center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, doPrepareDC/2,enable/1,enable/2,enableScrolling/3,findWindow/2,fit/1, fitInside/1,freeze/1,getAcceleratorTable/1,getBackgroundColour/1, @@ -56,25 +56,26 @@ getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3, getToolTip/1,getUpdateRegion/1,getViewStart/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,prepareDC/2,raise/1,refresh/1,refresh/2, - refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,reparent/2, - screenToClient/1,screenToClient/2,scroll/3,scrollLines/2,scrollPages/2, - scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, - setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, - setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2, - setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1, - setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, - setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, - setPalette/2,setScrollPos/3,setScrollPos/4,setScrollRate/3,setScrollbar/5, - setScrollbar/6,setScrollbars/5,setScrollbars/6,setSize/2,setSize/3, - setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, - setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2, - setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,prepareDC/2, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scroll/3, + scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, + setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, + setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFocusIgnoringChildren/1,setFont/2,setForegroundColour/2,setHelpText/2, + setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, + setScrollPos/4,setScrollRate/3,setScrollbar/5,setScrollbar/6,setScrollbars/5, + setScrollbars/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2, + setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2, + setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,setToolTip/2, + setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, @@ -370,6 +371,14 @@ setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This). initDialog(This) -> wxPanel:initDialog(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxListBox.erl b/lib/wx/src/gen/wxListBox.erl index 14cc553935..eaa026839e 100644 --- a/lib/wx/src/gen/wxListBox.erl +++ b/lib/wx/src/gen/wxListBox.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -35,45 +35,47 @@ isSelected/2,new/0,new/2,new/3,set/2,setFirstItem/2]). %% inherited exports --export([append/2,append/3,appendStrings/2,cacheBestSize/2,captureMouse/1,center/1, - center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, - centreOnParent/2,clear/1,clearBackground/1,clientToScreen/2,clientToScreen/3, - close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, - delete/2,destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, - enable/1,enable/2,findString/2,findString/3,findWindow/2,fit/1,fitInside/1, - freeze/1,getAcceleratorTable/1,getBackgroundColour/1,getBackgroundStyle/1, - getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,getChildren/1, - getClientData/2,getClientSize/1,getContainingSizer/1,getCount/1,getCursor/1, - getDropTarget/1,getEventHandler/1,getExtraStyle/1,getFont/1,getForegroundColour/1, - getGrandParent/1,getHandle/1,getHelpText/1,getId/1,getLabel/1,getMaxSize/1, - getMinSize/1,getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1, +-export([append/2,append/3,appendStrings/2,cacheBestSize/2,canSetTransparent/1, + captureMouse/1,center/1,center/2,centerOnParent/1,centerOnParent/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,clear/1,clearBackground/1, + clientToScreen/2,clientToScreen/3,close/1,close/2,connect/2,connect/3, + convertDialogToPixels/2,convertPixelsToDialog/2,delete/2,destroyChildren/1, + disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, + findString/2,findString/3,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, + getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, + getCharHeight/1,getCharWidth/1,getChildren/1,getClientData/2,getClientSize/1, + getContainingSizer/1,getCount/1,getCursor/1,getDropTarget/1,getEventHandler/1, + getExtraStyle/1,getFont/1,getForegroundColour/1,getGrandParent/1, + getHandle/1,getHelpText/1,getId/1,getLabel/1,getMaxSize/1,getMinSize/1, + getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1, getScreenRect/1,getScrollPos/2,getScrollRange/2,getScrollThumb/2, getSelection/1,getSize/1,getSizer/1,getString/2,getStringSelection/1, getTextExtent/2,getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1, getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1,hasScrollbar/2, hasTransparentBackground/1,hide/1,inheritAttributes/1,initDialog/1, - insert/3,insert/4,invalidateBestSize/1,isEmpty/1,isEnabled/1,isExposed/2, - isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1, - lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4, - moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2, - pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - select/2,setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientData/3,setClientSize/2,setClientSize/3, - setContainingSizer/2,setCursor/2,setDropTarget/2,setExtraStyle/2, - setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,setHelpText/2, - setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, - setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, - setScrollPos/4,setScrollbar/5,setScrollbar/6,setSelection/2,setSize/2, - setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, - setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setString/3, - setStringSelection/2,setThemeEnabled/2,setToolTip/2,setVirtualSize/2, - setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, - show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, - update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). + insert/3,insert/4,invalidateBestSize/1,isDoubleBuffered/1,isEmpty/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,select/2,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientData/3, + setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, + setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, + setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, + setSelection/2,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2, + setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2, + setSizerAndFit/3,setString/3,setStringSelection/2,setThemeEnabled/2, + setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, + setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, + setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, + transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, + validate/1,warpPointer/3]). -export_type([wxListBox/0]). %% @hidden @@ -278,6 +280,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxListCtrl.erl b/lib/wx/src/gen/wxListCtrl.erl index 491511b729..6750931fdb 100644 --- a/lib/wx/src/gen/wxListCtrl.erl +++ b/lib/wx/src/gen/wxListCtrl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -47,10 +47,10 @@ setSingleStyle/2,setSingleStyle/3,setTextColour/2,setWindowStyleFlag/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -62,27 +62,28 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundStyle/2,setCaret/2, - setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, - setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, - setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, - setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, - setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, - setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, - setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowVariant/2,shouldInheritColours/1,show/1, - show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1, - updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2, + setCursor/2,setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1, + setFocusFromKbd/1,setFont/2,setForegroundColour/2,setHelpText/2,setId/2, + setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5, + setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, + setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,setToolTip/2, + setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, + setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowVariant/2, + shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, + transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, + validate/1,warpPointer/3]). -export_type([wxListCtrl/0]). %% @hidden @@ -869,6 +870,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxListView.erl b/lib/wx/src/gen/wxListView.erl index 3720fe86c1..288afcee82 100644 --- a/lib/wx/src/gen/wxListView.erl +++ b/lib/wx/src/gen/wxListView.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ isSelected/2,select/2,select/3,setColumnImage/3]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -49,24 +49,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -168,6 +169,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxListbook.erl b/lib/wx/src/gen/wxListbook.erl index b5083c5746..6ea34e8eb1 100644 --- a/lib/wx/src/gen/wxListbook.erl +++ b/lib/wx/src/gen/wxListbook.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2013. All Rights Reserved. +%% Copyright Ericsson AB 2009-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -38,10 +38,10 @@ setPageSize/2,setPageText/3,setSelection/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -53,24 +53,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -383,6 +384,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxMDIChildFrame.erl b/lib/wx/src/gen/wxMDIChildFrame.erl index 05f07f1066..ed29e5431f 100644 --- a/lib/wx/src/gen/wxMDIChildFrame.erl +++ b/lib/wx/src/gen/wxMDIChildFrame.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -35,11 +35,11 @@ new/4,restore/1]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createStatusBar/1,createStatusBar/2,createToolBar/1,createToolBar/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -55,26 +55,27 @@ getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,layout/1, - lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4, - moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2, - pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,processCommand/2,raise/1,refresh/1, - refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, - reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - sendSizeEvent/1,setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2, - setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, - setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, - setId/2,setLabel/2,setMaxSize/2,setMenuBar/2,setMinSize/2,setName/2, - setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,setPalette/2, - setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2, - setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, - setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setStatusBar/2,setStatusBarPane/2,setStatusText/2,setStatusText/3, - setStatusWidths/2,setThemeEnabled/2,setTitle/2,setToolBar/2,setToolTip/2, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,processCommand/2, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, + scrollWindow/4,sendSizeEvent/1,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2, + setStatusBarPane/2,setStatusText/2,setStatusText/3,setStatusWidths/2, + setThemeEnabled/2,setTitle/2,setToolBar/2,setToolTip/2,setTransparent/2, setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3, setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2, shouldInheritColours/1,show/1,show/2,showFullScreen/2,showFullScreen/3, @@ -274,6 +275,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxMDIClientWindow.erl b/lib/wx/src/gen/wxMDIClientWindow.erl index 20569718f7..6f10627086 100644 --- a/lib/wx/src/gen/wxMDIClientWindow.erl +++ b/lib/wx/src/gen/wxMDIClientWindow.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ -export([createClient/2,createClient/3,destroy/1,new/0,new/1,new/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -47,24 +47,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -135,6 +136,14 @@ destroy(Obj=#wx_ref{type=Type}) -> ok. %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxMDIParentFrame.erl b/lib/wx/src/gen/wxMDIParentFrame.erl index 9aeba68ea3..47d9182d60 100644 --- a/lib/wx/src/gen/wxMDIParentFrame.erl +++ b/lib/wx/src/gen/wxMDIParentFrame.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ tile/1,tile/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createStatusBar/1,createStatusBar/2,createToolBar/1,createToolBar/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -56,32 +56,32 @@ getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,layout/1, - lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,maximize/2, - move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,processCommand/2, - raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, - removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + processCommand/2,raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3, + releaseMouse/1,removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, scrollWindow/4,sendSizeEvent/1,setAcceleratorTable/2,setAutoLayout/2, setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, - setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2, - setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2, - setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,setMaxSize/2, - setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, - setOwnForegroundColour/2,setPalette/2,setScrollPos/3,setScrollPos/4, - setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,setSize/3,setSize/5, - setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, - setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2,setStatusBarPane/2, - setStatusText/2,setStatusText/3,setStatusWidths/2,setThemeEnabled/2, - setTitle/2,setToolBar/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, - show/1,show/2,showFullScreen/2,showFullScreen/3,thaw/1,transferDataFromWindow/1, - transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, - validate/1,warpPointer/3]). + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2, + setStatusBarPane/2,setStatusText/2,setStatusText/3,setStatusWidths/2, + setThemeEnabled/2,setTitle/2,setToolBar/2,setToolTip/2,setTransparent/2, + setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3, + setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2, + shouldInheritColours/1,show/1,show/2,showFullScreen/2,showFullScreen/3, + thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1, + updateWindowUI/2,validate/1,warpPointer/3]). -export_type([wxMDIParentFrame/0]). %% @hidden @@ -313,6 +313,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxMenuBar.erl b/lib/wx/src/gen/wxMenuBar.erl index cb35015c08..5e879da5ed 100644 --- a/lib/wx/src/gen/wxMenuBar.erl +++ b/lib/wx/src/gen/wxMenuBar.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ setLabelTop/3]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,getBackgroundColour/1, getBackgroundStyle/1,getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1, @@ -51,24 +51,24 @@ getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3,getToolTip/1, getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,getWindowVariant/1, hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,hide/1,inheritAttributes/1, - initDialog/1,invalidateBestSize/1,isExposed/2,isExposed/3,isExposed/5, - isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1, - makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2, - moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, - popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, - raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, - removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2, - scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, - setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, - setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, - setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, - setForegroundColour/2,setHelpText/2,setId/2,setMaxSize/2,setMinSize/2, - setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, + initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,isExposed/2, + isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1, + lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4, + moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2, + pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, + popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, + refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, + screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, + setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, + setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setMaxSize/2, + setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -340,6 +340,14 @@ destroy(Obj=#wx_ref{type=Type}) -> ok. %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxMessageDialog.erl b/lib/wx/src/gen/wxMessageDialog.erl index f024145ed6..1fe99b2b88 100644 --- a/lib/wx/src/gen/wxMessageDialog.erl +++ b/lib/wx/src/gen/wxMessageDialog.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,11 +34,11 @@ -export([destroy/1,new/2,new/3]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1, disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -53,25 +53,26 @@ getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1, - maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, - refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, - reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2, - setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, - setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, - setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, - setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2, - setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2, - setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, - setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, + scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, + setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, + setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3, setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1, @@ -191,6 +192,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxMiniFrame.erl b/lib/wx/src/gen/wxMiniFrame.erl index 7622ddf0d2..f731cc5416 100644 --- a/lib/wx/src/gen/wxMiniFrame.erl +++ b/lib/wx/src/gen/wxMiniFrame.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,11 +34,11 @@ -export([create/4,create/5,destroy/1,new/0,new/3,new/4]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createStatusBar/1,createStatusBar/2,createToolBar/1,createToolBar/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -54,32 +54,32 @@ getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,layout/1, - lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,maximize/2, - move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,processCommand/2, - raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, - removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + processCommand/2,raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3, + releaseMouse/1,removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, scrollWindow/4,sendSizeEvent/1,setAcceleratorTable/2,setAutoLayout/2, setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, - setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2, - setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2, - setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,setMaxSize/2, - setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, - setOwnForegroundColour/2,setPalette/2,setScrollPos/3,setScrollPos/4, - setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,setSize/3,setSize/5, - setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, - setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2,setStatusBarPane/2, - setStatusText/2,setStatusText/3,setStatusWidths/2,setThemeEnabled/2, - setTitle/2,setToolBar/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, - show/1,show/2,showFullScreen/2,showFullScreen/3,thaw/1,transferDataFromWindow/1, - transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, - validate/1,warpPointer/3]). + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2, + setStatusBarPane/2,setStatusText/2,setStatusText/3,setStatusWidths/2, + setThemeEnabled/2,setTitle/2,setToolBar/2,setToolTip/2,setTransparent/2, + setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3, + setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2, + shouldInheritColours/1,show/1,show/2,showFullScreen/2,showFullScreen/3, + thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1, + updateWindowUI/2,validate/1,warpPointer/3]). -export_type([wxMiniFrame/0]). %% @hidden @@ -241,6 +241,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxMultiChoiceDialog.erl b/lib/wx/src/gen/wxMultiChoiceDialog.erl index e79f11ef7d..96e9c070a3 100644 --- a/lib/wx/src/gen/wxMultiChoiceDialog.erl +++ b/lib/wx/src/gen/wxMultiChoiceDialog.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,11 +34,11 @@ -export([destroy/1,getSelections/1,new/0,new/4,new/5,setSelections/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1, disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -53,25 +53,26 @@ getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1, - maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, - refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, - reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2, - setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, - setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, - setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, - setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2, - setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2, - setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, - setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, + scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, + setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, + setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3, setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1, @@ -216,6 +217,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxNotebook.erl b/lib/wx/src/gen/wxNotebook.erl index 16c2d4fc6f..5011375aad 100644 --- a/lib/wx/src/gen/wxNotebook.erl +++ b/lib/wx/src/gen/wxNotebook.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -38,10 +38,10 @@ setPadding/2,setPageImage/3,setPageSize/2,setPageText/3,setSelection/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -53,24 +53,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -408,6 +409,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxPanel.erl b/lib/wx/src/gen/wxPanel.erl index 5b6d4a2974..ceb894fe31 100644 --- a/lib/wx/src/gen/wxPanel.erl +++ b/lib/wx/src/gen/wxPanel.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ -export([destroy/1,initDialog/1,new/0,new/1,new/2,new/5,new/6,setFocusIgnoringChildren/1]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -47,24 +47,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,invalidateBestSize/1,isEnabled/1,isExposed/2, - isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1, - lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4, - moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2, - pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -154,6 +155,14 @@ destroy(Obj=#wx_ref{type=Type}) -> ok. %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxPasswordEntryDialog.erl b/lib/wx/src/gen/wxPasswordEntryDialog.erl index da9a711405..ac3f1c9d8c 100644 --- a/lib/wx/src/gen/wxPasswordEntryDialog.erl +++ b/lib/wx/src/gen/wxPasswordEntryDialog.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -35,11 +35,11 @@ -export([destroy/1,new/2,new/3]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1, disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -54,8 +54,8 @@ getTitle/1,getToolTip/1,getUpdateRegion/1,getValue/1,getVirtualSize/1, getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1,hasScrollbar/2, hasTransparentBackground/1,hide/1,iconize/1,iconize/2,inheritAttributes/1, - initDialog/1,invalidateBestSize/1,isActive/1,isEnabled/1,isExposed/2, - isExposed/3,isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1, + initDialog/1,invalidateBestSize/1,isActive/1,isDoubleBuffered/1,isEnabled/1, + isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1, isModal/1,isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1, lower/1,makeModal/1,makeModal/2,maximize/1,maximize/2,move/2,move/3, move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2, @@ -66,19 +66,19 @@ scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, - setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, - setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, - setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, - setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3, - setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, - setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, - setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, - setTitle/2,setToolTip/2,setValue/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, - show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1, - transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1, - updateWindowUI/2,validate/1,warpPointer/3]). + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, + setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2, + setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2, + setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, + setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, + setThemeEnabled/2,setTitle/2,setToolTip/2,setTransparent/2,setValue/2, + setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3, + setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2, + shouldInheritColours/1,show/1,show/2,showFullScreen/2,showFullScreen/3, + showModal/1,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, + update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). -export_type([wxPasswordEntryDialog/0]). %% @hidden @@ -201,6 +201,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxPickerBase.erl b/lib/wx/src/gen/wxPickerBase.erl index 74de8bf7f1..bbdeaf6af8 100644 --- a/lib/wx/src/gen/wxPickerBase.erl +++ b/lib/wx/src/gen/wxPickerBase.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ setTextCtrlGrowable/1,setTextCtrlGrowable/2,setTextCtrlProportion/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -51,24 +51,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -213,6 +214,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxPopupTransientWindow.erl b/lib/wx/src/gen/wxPopupTransientWindow.erl index 40a63b09ec..c07c6e239e 100644 --- a/lib/wx/src/gen/wxPopupTransientWindow.erl +++ b/lib/wx/src/gen/wxPopupTransientWindow.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2014. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -33,10 +33,10 @@ -export([destroy/1,dismiss/1,new/0,new/1,new/2,popup/1,popup/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -48,24 +48,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,position/3,raise/1,refresh/1,refresh/2, - refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,reparent/2, - screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, - scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2, - setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, - setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,position/3,raise/1, + refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -145,6 +146,14 @@ destroy(Obj=#wx_ref{type=Type}) -> position(This,PtOrigin,Size) -> wxPopupWindow:position(This,PtOrigin,Size). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxPopupWindow.erl b/lib/wx/src/gen/wxPopupWindow.erl index 41390e08e7..439f5fac54 100644 --- a/lib/wx/src/gen/wxPopupWindow.erl +++ b/lib/wx/src/gen/wxPopupWindow.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2014. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ -export([create/2,create/3,destroy/1,new/0,new/1,new/2,position/3]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -47,24 +47,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -142,6 +143,14 @@ destroy(Obj=#wx_ref{type=Type}) -> ok. %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxPreviewCanvas.erl b/lib/wx/src/gen/wxPreviewCanvas.erl index 91d0672def..67357dbd65 100644 --- a/lib/wx/src/gen/wxPreviewCanvas.erl +++ b/lib/wx/src/gen/wxPreviewCanvas.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ %% inherited exports -export([cacheBestSize/2,calcScrolledPosition/2,calcScrolledPosition/3,calcUnscrolledPosition/2, - calcUnscrolledPosition/3,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, + calcUnscrolledPosition/3,canSetTransparent/1,captureMouse/1,center/1, + center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, doPrepareDC/2,enable/1,enable/2,enableScrolling/3,findWindow/2,fit/1, fitInside/1,freeze/1,getAcceleratorTable/1,getBackgroundColour/1, @@ -51,25 +51,26 @@ getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3, getToolTip/1,getUpdateRegion/1,getViewStart/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,prepareDC/2,raise/1,refresh/1,refresh/2, - refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,reparent/2, - screenToClient/1,screenToClient/2,scroll/3,scrollLines/2,scrollPages/2, - scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, - setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, - setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2, - setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1, - setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, - setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, - setPalette/2,setScrollPos/3,setScrollPos/4,setScrollRate/3,setScrollbar/5, - setScrollbar/6,setScrollbars/5,setScrollbars/6,setSize/2,setSize/3, - setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, - setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2, - setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,prepareDC/2, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scroll/3, + scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, + setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, + setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFocusIgnoringChildren/1,setFont/2,setForegroundColour/2,setHelpText/2, + setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, + setScrollPos/4,setScrollRate/3,setScrollbar/5,setScrollbar/6,setScrollbars/5, + setScrollbars/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2, + setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2, + setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,setToolTip/2, + setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, @@ -120,6 +121,14 @@ setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This). initDialog(This) -> wxPanel:initDialog(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxPreviewControlBar.erl b/lib/wx/src/gen/wxPreviewControlBar.erl index 9bc290aef8..0e1828e87b 100644 --- a/lib/wx/src/gen/wxPreviewControlBar.erl +++ b/lib/wx/src/gen/wxPreviewControlBar.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ new/4,setZoomControl/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -49,24 +49,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1, setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -151,6 +152,14 @@ setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This). initDialog(This) -> wxPanel:initDialog(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxPreviewFrame.erl b/lib/wx/src/gen/wxPreviewFrame.erl index 9423fc2333..fe684478a5 100644 --- a/lib/wx/src/gen/wxPreviewFrame.erl +++ b/lib/wx/src/gen/wxPreviewFrame.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -35,11 +35,11 @@ onCloseWindow/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createStatusBar/1,createStatusBar/2,createToolBar/1,createToolBar/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -55,32 +55,32 @@ getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,layout/1, - lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,maximize/2, - move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,processCommand/2, - raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, - removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + processCommand/2,raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3, + releaseMouse/1,removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, scrollWindow/4,sendSizeEvent/1,setAcceleratorTable/2,setAutoLayout/2, setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, - setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2, - setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2, - setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,setMaxSize/2, - setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, - setOwnForegroundColour/2,setPalette/2,setScrollPos/3,setScrollPos/4, - setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,setSize/3,setSize/5, - setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, - setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2,setStatusBarPane/2, - setStatusText/2,setStatusText/3,setStatusWidths/2,setThemeEnabled/2, - setTitle/2,setToolBar/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, - show/1,show/2,showFullScreen/2,showFullScreen/3,thaw/1,transferDataFromWindow/1, - transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, - validate/1,warpPointer/3]). + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2, + setStatusBarPane/2,setStatusText/2,setStatusText/3,setStatusWidths/2, + setThemeEnabled/2,setTitle/2,setToolBar/2,setToolTip/2,setTransparent/2, + setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3, + setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2, + shouldInheritColours/1,show/1,show/2,showFullScreen/2,showFullScreen/3, + thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1, + updateWindowUI/2,validate/1,warpPointer/3]). -export_type([wxPreviewFrame/0]). %% @hidden @@ -244,6 +244,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxPrintDialog.erl b/lib/wx/src/gen/wxPrintDialog.erl index 4f253b4988..a337089d5a 100644 --- a/lib/wx/src/gen/wxPrintDialog.erl +++ b/lib/wx/src/gen/wxPrintDialog.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,11 +34,11 @@ -export([destroy/1,getPrintDC/1,getPrintDialogData/1,new/1,new/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1, disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -53,25 +53,26 @@ getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1, - maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, - refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, - reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2, - setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, - setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, - setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, - setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2, - setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2, - setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, - setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, + scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, + setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, + setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3, setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1, @@ -213,6 +214,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxProgressDialog.erl b/lib/wx/src/gen/wxProgressDialog.erl index 544d67a7d8..665b900729 100644 --- a/lib/wx/src/gen/wxProgressDialog.erl +++ b/lib/wx/src/gen/wxProgressDialog.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,11 +34,11 @@ -export([destroy/1,new/2,new/3,resume/1,update/1,update/2,update/3]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1, disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -53,25 +53,26 @@ getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1, - maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, - refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, - reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2, - setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, - setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, - setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, - setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2, - setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2, - setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, - setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, + scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, + setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, + setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3, setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1, @@ -228,6 +229,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxRadioBox.erl b/lib/wx/src/gen/wxRadioBox.erl index 331c83d695..5ef1deff66 100644 --- a/lib/wx/src/gen/wxRadioBox.erl +++ b/lib/wx/src/gen/wxRadioBox.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ setItemHelpText/3,setItemToolTip/3,setSelection/2,show/1,show/2,show/3]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,getBackgroundColour/1, getBackgroundStyle/1,getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1, @@ -51,24 +51,24 @@ getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3,getToolTip/1, getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,getWindowVariant/1, hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,hide/1,inheritAttributes/1, - initDialog/1,invalidateBestSize/1,isEnabled/1,isExposed/2,isExposed/3, - isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1, - lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2, - moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, - popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, - raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, - removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2, - scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, - setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, - setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, - setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, - setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, + initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,isEnabled/1, + isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, + layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, + move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, + navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, + popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, + refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, + screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, + setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, + setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1, updateWindowUI/2,validate/1,warpPointer/3]). @@ -348,6 +348,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxRadioButton.erl b/lib/wx/src/gen/wxRadioButton.erl index ab08c5807e..3b4689a27b 100644 --- a/lib/wx/src/gen/wxRadioButton.erl +++ b/lib/wx/src/gen/wxRadioButton.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -33,10 +33,10 @@ -export([create/4,create/5,destroy/1,getValue/1,new/0,new/3,new/4,setValue/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -48,24 +48,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -171,6 +172,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxSashLayoutWindow.erl b/lib/wx/src/gen/wxSashLayoutWindow.erl index c64ed77f31..223c07419d 100644 --- a/lib/wx/src/gen/wxSashLayoutWindow.erl +++ b/lib/wx/src/gen/wxSashLayoutWindow.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ new/2,setAlignment/2,setDefaultSize/2,setOrientation/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -51,9 +51,9 @@ getTextExtent/2,getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1, getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1,hasScrollbar/2, hasTransparentBackground/1,hide/1,inheritAttributes/1,initDialog/1, - invalidateBestSize/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5, - isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1, - makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + invalidateBestSize/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1, + lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2, moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, @@ -61,17 +61,17 @@ scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, - setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, - setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMaximumSizeX/2,setMaximumSizeY/2,setMinSize/2,setMinimumSizeX/2, setMinimumSizeY/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, setOwnForegroundColour/2,setPalette/2,setSashVisible/3,setScrollPos/3, setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5, setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,setToolTip/2, - setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3, - setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2, - shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, + setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, + setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, + setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, validate/1,warpPointer/3]). @@ -220,6 +220,14 @@ getMaximumSizeX(This) -> wxSashWindow:getMaximumSizeX(This). getSashVisible(This,Edge) -> wxSashWindow:getSashVisible(This,Edge). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxSashWindow.erl b/lib/wx/src/gen/wxSashWindow.erl index 7f9f15aa58..4a39726ffd 100644 --- a/lib/wx/src/gen/wxSashWindow.erl +++ b/lib/wx/src/gen/wxSashWindow.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ setMinimumSizeX/2,setMinimumSizeY/2,setSashVisible/3]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -49,24 +49,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -207,6 +208,14 @@ destroy(Obj=#wx_ref{type=Type}) -> ok. %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxScrollBar.erl b/lib/wx/src/gen/wxScrollBar.erl index 97c30f2972..ccddf84835 100644 --- a/lib/wx/src/gen/wxScrollBar.erl +++ b/lib/wx/src/gen/wxScrollBar.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ getThumbSize/1,new/0,new/2,new/3,setScrollbar/5,setScrollbar/6,setThumbPosition/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -49,25 +49,26 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setSize/2,setSize/3,setSize/5, setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,setToolTip/2, - setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3, - setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2, - shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, + setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, + setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, + setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, validate/1,warpPointer/3]). @@ -215,6 +216,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxScrolledWindow.erl b/lib/wx/src/gen/wxScrolledWindow.erl index 5513014c31..7c807980b4 100644 --- a/lib/wx/src/gen/wxScrolledWindow.erl +++ b/lib/wx/src/gen/wxScrolledWindow.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ scroll/3,setScrollRate/3,setScrollbars/5,setScrollbars/6,setTargetWindow/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -51,24 +51,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1, setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -258,6 +259,14 @@ setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This). initDialog(This) -> wxPanel:initDialog(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxSingleChoiceDialog.erl b/lib/wx/src/gen/wxSingleChoiceDialog.erl index c5743c4ea1..641cb2836f 100644 --- a/lib/wx/src/gen/wxSingleChoiceDialog.erl +++ b/lib/wx/src/gen/wxSingleChoiceDialog.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,11 +34,11 @@ -export([destroy/1,getSelection/1,getStringSelection/1,new/0,new/4,new/5,setSelection/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1, disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -53,25 +53,26 @@ getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1, - maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, - refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, - reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2, - setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, - setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, - setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, - setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2, - setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2, - setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, - setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, + scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, + setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, + setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3, setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1, @@ -223,6 +224,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxSlider.erl b/lib/wx/src/gen/wxSlider.erl index 93ec783e48..02103aed01 100644 --- a/lib/wx/src/gen/wxSlider.erl +++ b/lib/wx/src/gen/wxSlider.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ setRange/3,setThumbLength/2,setValue/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -50,24 +50,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -247,6 +248,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxSpinButton.erl b/lib/wx/src/gen/wxSpinButton.erl index 52d71dd9c2..82b48f87da 100644 --- a/lib/wx/src/gen/wxSpinButton.erl +++ b/lib/wx/src/gen/wxSpinButton.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ new/2,setRange/3,setValue/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -49,24 +49,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -195,6 +196,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxSpinCtrl.erl b/lib/wx/src/gen/wxSpinCtrl.erl index 6fe5197359..89fa971543 100644 --- a/lib/wx/src/gen/wxSpinCtrl.erl +++ b/lib/wx/src/gen/wxSpinCtrl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ new/2,setRange/3,setSelection/3,setValue/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -49,24 +49,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -232,6 +233,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxSplashScreen.erl b/lib/wx/src/gen/wxSplashScreen.erl index 6c12907d38..fad8cfcd8e 100644 --- a/lib/wx/src/gen/wxSplashScreen.erl +++ b/lib/wx/src/gen/wxSplashScreen.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,11 +34,11 @@ -export([destroy/1,getSplashStyle/1,getTimeout/1,new/0,new/5,new/6]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createStatusBar/1,createStatusBar/2,createToolBar/1,createToolBar/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -54,32 +54,32 @@ getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,layout/1, - lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,maximize/2, - move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,processCommand/2, - raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, - removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + processCommand/2,raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3, + releaseMouse/1,removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, scrollWindow/4,sendSizeEvent/1,setAcceleratorTable/2,setAutoLayout/2, setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, - setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2, - setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2, - setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,setMaxSize/2, - setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, - setOwnForegroundColour/2,setPalette/2,setScrollPos/3,setScrollPos/4, - setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,setSize/3,setSize/5, - setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2, - setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2,setStatusBarPane/2, - setStatusText/2,setStatusText/3,setStatusWidths/2,setThemeEnabled/2, - setTitle/2,setToolBar/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, - setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, - show/1,show/2,showFullScreen/2,showFullScreen/3,thaw/1,transferDataFromWindow/1, - transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, - validate/1,warpPointer/3]). + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, + setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2, + setStatusBarPane/2,setStatusText/2,setStatusText/3,setStatusWidths/2, + setThemeEnabled/2,setTitle/2,setToolBar/2,setToolTip/2,setTransparent/2, + setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3, + setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2, + shouldInheritColours/1,show/1,show/2,showFullScreen/2,showFullScreen/3, + thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1, + updateWindowUI/2,validate/1,warpPointer/3]). -export_type([wxSplashScreen/0]). %% @hidden @@ -230,6 +230,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxSplitterWindow.erl b/lib/wx/src/gen/wxSplitterWindow.erl index b6b7a328ad..7db8dc60c4 100644 --- a/lib/wx/src/gen/wxSplitterWindow.erl +++ b/lib/wx/src/gen/wxSplitterWindow.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2013. All Rights Reserved. +%% Copyright Ericsson AB 2009-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -37,10 +37,10 @@ unsplit/1,unsplit/2,updateSize/1]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -52,24 +52,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -358,6 +359,14 @@ destroy(Obj=#wx_ref{type=Type}) -> ok. %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxStaticBitmap.erl b/lib/wx/src/gen/wxStaticBitmap.erl index 1673e3b62d..4da50262b9 100644 --- a/lib/wx/src/gen/wxStaticBitmap.erl +++ b/lib/wx/src/gen/wxStaticBitmap.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -33,10 +33,10 @@ -export([create/4,create/5,destroy/1,getBitmap/1,new/0,new/3,new/4,setBitmap/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -48,24 +48,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -167,6 +168,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxStaticBox.erl b/lib/wx/src/gen/wxStaticBox.erl index f6a715f051..04584f23b2 100644 --- a/lib/wx/src/gen/wxStaticBox.erl +++ b/lib/wx/src/gen/wxStaticBox.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -33,10 +33,10 @@ -export([create/4,create/5,destroy/1,new/0,new/3,new/4]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -48,24 +48,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -150,6 +151,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxStaticLine.erl b/lib/wx/src/gen/wxStaticLine.erl index 6306a01c62..6d23c5ac3d 100644 --- a/lib/wx/src/gen/wxStaticLine.erl +++ b/lib/wx/src/gen/wxStaticLine.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ new/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -49,24 +49,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -167,6 +168,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxStaticText.erl b/lib/wx/src/gen/wxStaticText.erl index 4c5d72d5e7..635f29a1e8 100644 --- a/lib/wx/src/gen/wxStaticText.erl +++ b/lib/wx/src/gen/wxStaticText.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -33,10 +33,10 @@ -export([create/4,create/5,destroy/1,getLabel/1,new/0,new/3,new/4,setLabel/2,wrap/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -48,24 +48,25 @@ getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3, getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setMaxSize/2,setMinSize/2, setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -173,6 +174,14 @@ destroy(Obj=#wx_ref{type=Type}) -> %% From wxControl %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxStatusBar.erl b/lib/wx/src/gen/wxStatusBar.erl index 254b9b0236..2cd0d4a43e 100644 --- a/lib/wx/src/gen/wxStatusBar.erl +++ b/lib/wx/src/gen/wxStatusBar.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -35,10 +35,10 @@ setStatusStyles/2,setStatusText/2,setStatusText/3,setStatusWidths/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -50,24 +50,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -295,6 +296,14 @@ destroy(Obj=#wx_ref{type=Type}) -> ok. %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxStyledTextCtrl.erl b/lib/wx/src/gen/wxStyledTextCtrl.erl index 4598cc7609..8e629db9ff 100644 --- a/lib/wx/src/gen/wxStyledTextCtrl.erl +++ b/lib/wx/src/gen/wxStyledTextCtrl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -135,10 +135,10 @@ wordRightExtend/1,wordStartPosition/3,wrapCount/2,zoomIn/1,zoomOut/1]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -150,27 +150,27 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2, - moveBeforeInTabOrder/2,navigate/1,navigate/2,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, - refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, - reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, - scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, - setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, - setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2, - setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2, - setHelpText/2,setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2, - setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,setPalette/2, - setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2, - setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, - setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, - setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2, - setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2, - setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1, - transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2, - validate/1,warpPointer/3]). + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lower/1,makeModal/1,makeModal/2,move/2,move/3, + move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2, + parent_class/1,popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3, + popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3, + releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,screenToClient/2, + scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, + setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, + setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, + setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, + setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, + setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, + setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, + show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, + update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). -export_type([wxStyledTextCtrl/0]). %% @hidden @@ -4078,6 +4078,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxTextCtrl.erl b/lib/wx/src/gen/wxTextCtrl.erl index de9e1c307a..5840812579 100644 --- a/lib/wx/src/gen/wxTextCtrl.erl +++ b/lib/wx/src/gen/wxTextCtrl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2014. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -41,10 +41,10 @@ setStyle/4,setValue/2,showPosition/2,undo/1,writeText/2,xYToPosition/3]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -56,24 +56,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -597,6 +598,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxTextEntryDialog.erl b/lib/wx/src/gen/wxTextEntryDialog.erl index b18ba27607..a93c3857a8 100644 --- a/lib/wx/src/gen/wxTextEntryDialog.erl +++ b/lib/wx/src/gen/wxTextEntryDialog.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,11 +34,11 @@ -export([destroy/1,getValue/1,new/2,new/3,setValue/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2, - centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2, + centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1, + centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1, disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2, endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, @@ -53,25 +53,26 @@ getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1, - isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1, - isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1, - maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, - navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, - popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, - refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, - reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2, - setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2, - setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, - setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2, - setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2, - setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2, - setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2, - setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, - setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, + isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3, + isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1, + isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1, + makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2, + moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1, + popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4, + raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1, + removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2, + screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3, + scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, + setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, + setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2, + setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2, + setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3, + setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2, + setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4, + setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2, + setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3, setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1, @@ -211,6 +212,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This). getIcon(This) -> wxTopLevelWindow:getIcon(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxToggleButton.erl b/lib/wx/src/gen/wxToggleButton.erl index 45795318c6..dffb4b159d 100644 --- a/lib/wx/src/gen/wxToggleButton.erl +++ b/lib/wx/src/gen/wxToggleButton.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -33,10 +33,10 @@ -export([create/4,create/5,destroy/1,getValue/1,new/0,new/3,new/4,setValue/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -48,24 +48,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -171,6 +172,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxToolBar.erl b/lib/wx/src/gen/wxToolBar.erl index bee20b97f4..b3cce2b6e9 100644 --- a/lib/wx/src/gen/wxToolBar.erl +++ b/lib/wx/src/gen/wxToolBar.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2015. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -42,10 +42,10 @@ setToolShortHelp/3,toggleTool/3]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -57,24 +57,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -673,6 +674,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxToolbook.erl b/lib/wx/src/gen/wxToolbook.erl index f959a73004..cf77aefd8a 100644 --- a/lib/wx/src/gen/wxToolbook.erl +++ b/lib/wx/src/gen/wxToolbook.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2013. All Rights Reserved. +%% Copyright Ericsson AB 2009-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -38,10 +38,10 @@ setPageSize/2,setPageText/3,setSelection/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -53,24 +53,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -383,6 +384,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxTopLevelWindow.erl b/lib/wx/src/gen/wxTopLevelWindow.erl index e11a72fab9..72813b0073 100644 --- a/lib/wx/src/gen/wxTopLevelWindow.erl +++ b/lib/wx/src/gen/wxTopLevelWindow.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -36,10 +36,10 @@ showFullScreen/2,showFullScreen/3]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -51,24 +51,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -301,6 +302,14 @@ showFullScreen(#wx_ref{type=ThisT,ref=ThisRef},Show, Options) %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxTreeCtrl.erl b/lib/wx/src/gen/wxTreeCtrl.erl index ef6e2b6fea..43dee9107d 100644 --- a/lib/wx/src/gen/wxTreeCtrl.erl +++ b/lib/wx/src/gen/wxTreeCtrl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -54,10 +54,10 @@ unselectItem/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -69,24 +69,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,show/1, show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1, updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -945,6 +946,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxTreebook.erl b/lib/wx/src/gen/wxTreebook.erl index 19f1d7cfe4..1900f47289 100644 --- a/lib/wx/src/gen/wxTreebook.erl +++ b/lib/wx/src/gen/wxTreebook.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2013. All Rights Reserved. +%% Copyright Ericsson AB 2009-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -39,10 +39,10 @@ setPageSize/2,setPageText/3,setSelection/2]). %% inherited exports --export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, +-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2, + centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2, destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3, enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1, @@ -54,24 +54,25 @@ getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2, getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1, getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1, - hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1, - isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, - layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, - move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, - navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2, - popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, - refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, - screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, - setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, - setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1, + isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1, + isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2, + move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2, + navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1, + popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1, + refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2, + reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2, + scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2, + setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2, + setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2, setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -439,6 +440,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label). getLabel(This) -> wxControl:getLabel(This). %% From wxWindow %% @hidden +setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On). +%% @hidden +isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This). +%% @hidden +canSetTransparent(This) -> wxWindow:canSetTransparent(This). +%% @hidden +setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha). +%% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden validate(This) -> wxWindow:validate(This). diff --git a/lib/wx/src/gen/wxWindow.erl b/lib/wx/src/gen/wxWindow.erl index 09928de09a..a8a61d547b 100644 --- a/lib/wx/src/gen/wxWindow.erl +++ b/lib/wx/src/gen/wxWindow.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -28,13 +28,13 @@ -module(wxWindow). -include("wxe.hrl"). --export(['Destroy'/1,cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1, - centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2, - clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2, - convertDialogToPixels/2,convertPixelsToDialog/2,destroy/1,destroyChildren/1, - disable/1,enable/1,enable/2,findFocus/0,findWindow/2,findWindowById/1, - findWindowById/2,findWindowByLabel/1,findWindowByLabel/2,findWindowByName/1, - findWindowByName/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, +-export(['Destroy'/1,cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1, + center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1, + centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3, + close/1,close/2,convertDialogToPixels/2,convertPixelsToDialog/2,destroy/1, + destroyChildren/1,disable/1,enable/1,enable/2,findFocus/0,findWindow/2, + findWindowById/1,findWindowById/2,findWindowByLabel/1,findWindowByLabel/2, + findWindowByName/1,findWindowByName/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1, getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCapture/0, getCaret/1,getCharHeight/1,getCharWidth/1,getChildren/1,getClientSize/1, getContainingSizer/1,getCursor/1,getDropTarget/1,getEventHandler/1, @@ -45,24 +45,24 @@ getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3,getToolTip/1, getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,getWindowVariant/1, hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,hide/1,inheritAttributes/1, - initDialog/1,invalidateBestSize/1,isEnabled/1,isExposed/2,isExposed/3, - isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1, - lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2, - moveBeforeInTabOrder/2,navigate/1,navigate/2,new/0,new/2,new/3,pageDown/1, - pageUp/1,popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3, - popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3, - releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,screenToClient/2, - scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2, - setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2, - setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, - setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2, - setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, + initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,isEnabled/1, + isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1, + layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2, + move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1, + navigate/2,new/0,new/2,new/3,pageDown/1,pageUp/1,popEventHandler/1,popEventHandler/2, + popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2, + refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1, + screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4, + setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2, + setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2, + setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1, + setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2, setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2, setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6, setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3, setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3, - setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3, - setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, + setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2, + setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4, setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1, show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). @@ -1910,6 +1910,40 @@ warpPointer(#wx_ref{type=ThisT,ref=ThisRef},X,Y) wxe_util:cast(?wxWindow_WarpPointer, <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>). +%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsettransparent">external documentation</a>. +-spec setTransparent(This, Alpha) -> boolean() when + This::wxWindow(), Alpha::integer(). +setTransparent(#wx_ref{type=ThisT,ref=ThisRef},Alpha) + when is_integer(Alpha) -> + ?CLASS(ThisT,wxWindow), + wxe_util:call(?wxWindow_SetTransparent, + <<ThisRef:32/?UI,Alpha:32/?UI>>). + +%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowcansettransparent">external documentation</a>. +-spec canSetTransparent(This) -> boolean() when + This::wxWindow(). +canSetTransparent(#wx_ref{type=ThisT,ref=ThisRef}) -> + ?CLASS(ThisT,wxWindow), + wxe_util:call(?wxWindow_CanSetTransparent, + <<ThisRef:32/?UI>>). + +%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowisdoublebuffered">external documentation</a>. +-spec isDoubleBuffered(This) -> boolean() when + This::wxWindow(). +isDoubleBuffered(#wx_ref{type=ThisT,ref=ThisRef}) -> + ?CLASS(ThisT,wxWindow), + wxe_util:call(?wxWindow_IsDoubleBuffered, + <<ThisRef:32/?UI>>). + +%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetdoublebuffered">external documentation</a>. +-spec setDoubleBuffered(This, On) -> ok when + This::wxWindow(), On::boolean(). +setDoubleBuffered(#wx_ref{type=ThisT,ref=ThisRef},On) + when is_boolean(On) -> + ?CLASS(ThisT,wxWindow), + wxe_util:cast(?wxWindow_SetDoubleBuffered, + <<ThisRef:32/?UI,(wxe_util:from_bool(On)):32/?UI>>). + %% @doc Destroys this object, do not use object again -spec destroy(This::wxWindow()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> diff --git a/lib/wx/src/gen/wxe_debug.hrl b/lib/wx/src/gen/wxe_debug.hrl index 375adde47d..a2462a6fb2 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-2015. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -192,3186 +192,3190 @@ wxdebug_table() -> {281, {wxWindow, updateWindowUI, 1}}, {282, {wxWindow, validate, 0}}, {283, {wxWindow, warpPointer, 2}}, - {284, {wxTopLevelWindow, getIcon, 0}}, - {285, {wxTopLevelWindow, getIcons, 0}}, - {286, {wxTopLevelWindow, getTitle, 0}}, - {287, {wxTopLevelWindow, isActive, 0}}, - {288, {wxTopLevelWindow, iconize, 1}}, - {289, {wxTopLevelWindow, isFullScreen, 0}}, - {290, {wxTopLevelWindow, isIconized, 0}}, - {291, {wxTopLevelWindow, isMaximized, 0}}, - {292, {wxTopLevelWindow, maximize, 1}}, - {293, {wxTopLevelWindow, requestUserAttention, 1}}, - {294, {wxTopLevelWindow, setIcon, 1}}, - {295, {wxTopLevelWindow, setIcons, 1}}, - {296, {wxTopLevelWindow, centerOnScreen, 1}}, - {297, {wxTopLevelWindow, centreOnScreen, 1}}, - {299, {wxTopLevelWindow, setShape, 1}}, - {300, {wxTopLevelWindow, setTitle, 1}}, - {301, {wxTopLevelWindow, showFullScreen, 2}}, - {303, {wxFrame, new_4, 4}}, - {304, {wxFrame, new_0, 0}}, - {306, {wxFrame, destruct, 0}}, - {307, {wxFrame, create, 4}}, - {308, {wxFrame, createStatusBar, 1}}, - {309, {wxFrame, createToolBar, 1}}, - {310, {wxFrame, getClientAreaOrigin, 0}}, - {311, {wxFrame, getMenuBar, 0}}, - {312, {wxFrame, getStatusBar, 0}}, - {313, {wxFrame, getStatusBarPane, 0}}, - {314, {wxFrame, getToolBar, 0}}, - {315, {wxFrame, processCommand, 1}}, - {316, {wxFrame, sendSizeEvent, 0}}, - {317, {wxFrame, setMenuBar, 1}}, - {318, {wxFrame, setStatusBar, 1}}, - {319, {wxFrame, setStatusBarPane, 1}}, - {320, {wxFrame, setStatusText, 2}}, - {321, {wxFrame, setStatusWidths, 2}}, - {322, {wxFrame, setToolBar, 1}}, - {323, {wxMiniFrame, new_0, 0}}, - {324, {wxMiniFrame, new_4, 4}}, - {325, {wxMiniFrame, create, 4}}, - {326, {wxMiniFrame, 'Destroy', undefined}}, - {327, {wxSplashScreen, new_0, 0}}, - {328, {wxSplashScreen, new_6, 6}}, - {329, {wxSplashScreen, destruct, 0}}, - {330, {wxSplashScreen, getSplashStyle, 0}}, - {331, {wxSplashScreen, getTimeout, 0}}, - {332, {wxPanel, new_0, 0}}, - {333, {wxPanel, new_6, 6}}, - {334, {wxPanel, new_2, 2}}, - {335, {wxPanel, destruct, 0}}, - {336, {wxPanel, initDialog, 0}}, - {337, {wxPanel, setFocusIgnoringChildren, 0}}, - {338, {wxScrolledWindow, new_0, 0}}, - {339, {wxScrolledWindow, new_2, 2}}, - {340, {wxScrolledWindow, destruct, 0}}, - {341, {wxScrolledWindow, calcScrolledPosition_4, 4}}, - {342, {wxScrolledWindow, calcScrolledPosition_1, 1}}, - {343, {wxScrolledWindow, calcUnscrolledPosition_4, 4}}, - {344, {wxScrolledWindow, calcUnscrolledPosition_1, 1}}, - {345, {wxScrolledWindow, enableScrolling, 2}}, - {346, {wxScrolledWindow, getScrollPixelsPerUnit, 2}}, - {347, {wxScrolledWindow, getViewStart, 2}}, - {348, {wxScrolledWindow, doPrepareDC, 1}}, - {349, {wxScrolledWindow, prepareDC, 1}}, - {350, {wxScrolledWindow, scroll, 2}}, - {351, {wxScrolledWindow, setScrollbars, 5}}, - {352, {wxScrolledWindow, setScrollRate, 2}}, - {353, {wxScrolledWindow, setTargetWindow, 1}}, - {354, {wxSashWindow, new_0, 0}}, - {355, {wxSashWindow, new_2, 2}}, - {356, {wxSashWindow, destruct, 0}}, - {357, {wxSashWindow, getSashVisible, 1}}, - {358, {wxSashWindow, getMaximumSizeX, 0}}, - {359, {wxSashWindow, getMaximumSizeY, 0}}, - {360, {wxSashWindow, getMinimumSizeX, 0}}, - {361, {wxSashWindow, getMinimumSizeY, 0}}, - {362, {wxSashWindow, setMaximumSizeX, 1}}, - {363, {wxSashWindow, setMaximumSizeY, 1}}, - {364, {wxSashWindow, setMinimumSizeX, 1}}, - {365, {wxSashWindow, setMinimumSizeY, 1}}, - {366, {wxSashWindow, setSashVisible, 2}}, - {367, {wxSashLayoutWindow, new_0, 0}}, - {368, {wxSashLayoutWindow, new_2, 2}}, - {369, {wxSashLayoutWindow, create, 2}}, - {370, {wxSashLayoutWindow, getAlignment, 0}}, - {371, {wxSashLayoutWindow, getOrientation, 0}}, - {372, {wxSashLayoutWindow, setAlignment, 1}}, - {373, {wxSashLayoutWindow, setDefaultSize, 1}}, - {374, {wxSashLayoutWindow, setOrientation, 1}}, - {375, {wxSashLayoutWindow, 'Destroy', undefined}}, - {376, {wxGrid, new_0, 0}}, - {377, {wxGrid, new_3, 3}}, - {378, {wxGrid, new_4, 4}}, - {379, {wxGrid, destruct, 0}}, - {380, {wxGrid, appendCols, 1}}, - {381, {wxGrid, appendRows, 1}}, - {382, {wxGrid, autoSize, 0}}, - {383, {wxGrid, autoSizeColumn, 2}}, - {384, {wxGrid, autoSizeColumns, 1}}, - {385, {wxGrid, autoSizeRow, 2}}, - {386, {wxGrid, autoSizeRows, 1}}, - {387, {wxGrid, beginBatch, 0}}, - {388, {wxGrid, blockToDeviceRect, 2}}, - {389, {wxGrid, canDragColSize, 0}}, - {390, {wxGrid, canDragRowSize, 0}}, - {391, {wxGrid, canDragGridSize, 0}}, - {392, {wxGrid, canEnableCellControl, 0}}, - {393, {wxGrid, cellToRect_2, 2}}, - {394, {wxGrid, cellToRect_1, 1}}, - {395, {wxGrid, clearGrid, 0}}, - {396, {wxGrid, clearSelection, 0}}, - {397, {wxGrid, createGrid, 3}}, - {398, {wxGrid, deleteCols, 1}}, - {399, {wxGrid, deleteRows, 1}}, - {400, {wxGrid, disableCellEditControl, 0}}, - {401, {wxGrid, disableDragColSize, 0}}, - {402, {wxGrid, disableDragGridSize, 0}}, - {403, {wxGrid, disableDragRowSize, 0}}, - {404, {wxGrid, enableCellEditControl, 1}}, - {405, {wxGrid, enableDragColSize, 1}}, - {406, {wxGrid, enableDragGridSize, 1}}, - {407, {wxGrid, enableDragRowSize, 1}}, - {408, {wxGrid, enableEditing, 1}}, - {409, {wxGrid, enableGridLines, 1}}, - {410, {wxGrid, endBatch, 0}}, - {411, {wxGrid, fit, 0}}, - {412, {wxGrid, forceRefresh, 0}}, - {413, {wxGrid, getBatchCount, 0}}, - {414, {wxGrid, getCellAlignment, 4}}, - {415, {wxGrid, getCellBackgroundColour, 2}}, - {416, {wxGrid, getCellEditor, 2}}, - {417, {wxGrid, getCellFont, 2}}, - {418, {wxGrid, getCellRenderer, 2}}, - {419, {wxGrid, getCellTextColour, 2}}, - {420, {wxGrid, getCellValue_2, 2}}, - {421, {wxGrid, getCellValue_1, 1}}, - {422, {wxGrid, getColLabelAlignment, 2}}, - {423, {wxGrid, getColLabelSize, 0}}, - {424, {wxGrid, getColLabelValue, 1}}, - {425, {wxGrid, getColMinimalAcceptableWidth, 0}}, - {426, {wxGrid, getDefaultCellAlignment, 2}}, - {427, {wxGrid, getDefaultCellBackgroundColour, 0}}, - {428, {wxGrid, getDefaultCellFont, 0}}, - {429, {wxGrid, getDefaultCellTextColour, 0}}, - {430, {wxGrid, getDefaultColLabelSize, 0}}, - {431, {wxGrid, getDefaultColSize, 0}}, - {432, {wxGrid, getDefaultEditor, 0}}, - {433, {wxGrid, getDefaultEditorForCell_2, 2}}, - {434, {wxGrid, getDefaultEditorForCell_1, 1}}, - {435, {wxGrid, getDefaultEditorForType, 1}}, - {436, {wxGrid, getDefaultRenderer, 0}}, - {437, {wxGrid, getDefaultRendererForCell, 2}}, - {438, {wxGrid, getDefaultRendererForType, 1}}, - {439, {wxGrid, getDefaultRowLabelSize, 0}}, - {440, {wxGrid, getDefaultRowSize, 0}}, - {441, {wxGrid, getGridCursorCol, 0}}, - {442, {wxGrid, getGridCursorRow, 0}}, - {443, {wxGrid, getGridLineColour, 0}}, - {444, {wxGrid, gridLinesEnabled, 0}}, - {445, {wxGrid, getLabelBackgroundColour, 0}}, - {446, {wxGrid, getLabelFont, 0}}, - {447, {wxGrid, getLabelTextColour, 0}}, - {448, {wxGrid, getNumberCols, 0}}, - {449, {wxGrid, getNumberRows, 0}}, - {450, {wxGrid, getOrCreateCellAttr, 2}}, - {451, {wxGrid, getRowMinimalAcceptableHeight, 0}}, - {452, {wxGrid, getRowLabelAlignment, 2}}, - {453, {wxGrid, getRowLabelSize, 0}}, - {454, {wxGrid, getRowLabelValue, 1}}, - {455, {wxGrid, getRowSize, 1}}, - {456, {wxGrid, getScrollLineX, 0}}, - {457, {wxGrid, getScrollLineY, 0}}, - {458, {wxGrid, getSelectedCells, 0}}, - {459, {wxGrid, getSelectedCols, 0}}, - {460, {wxGrid, getSelectedRows, 0}}, - {461, {wxGrid, getSelectionBackground, 0}}, - {462, {wxGrid, getSelectionBlockTopLeft, 0}}, - {463, {wxGrid, getSelectionBlockBottomRight, 0}}, - {464, {wxGrid, getSelectionForeground, 0}}, - {465, {wxGrid, getViewWidth, 0}}, - {466, {wxGrid, getGridWindow, 0}}, - {467, {wxGrid, getGridRowLabelWindow, 0}}, - {468, {wxGrid, getGridColLabelWindow, 0}}, - {469, {wxGrid, getGridCornerLabelWindow, 0}}, - {470, {wxGrid, hideCellEditControl, 0}}, - {471, {wxGrid, insertCols, 1}}, - {472, {wxGrid, insertRows, 1}}, - {473, {wxGrid, isCellEditControlEnabled, 0}}, - {474, {wxGrid, isCurrentCellReadOnly, 0}}, - {475, {wxGrid, isEditable, 0}}, - {476, {wxGrid, isInSelection_2, 2}}, - {477, {wxGrid, isInSelection_1, 1}}, - {478, {wxGrid, isReadOnly, 2}}, - {479, {wxGrid, isSelection, 0}}, - {480, {wxGrid, isVisible_3, 3}}, - {481, {wxGrid, isVisible_2, 2}}, - {482, {wxGrid, makeCellVisible_2, 2}}, - {483, {wxGrid, makeCellVisible_1, 1}}, - {484, {wxGrid, moveCursorDown, 1}}, - {485, {wxGrid, moveCursorLeft, 1}}, - {486, {wxGrid, moveCursorRight, 1}}, - {487, {wxGrid, moveCursorUp, 1}}, - {488, {wxGrid, moveCursorDownBlock, 1}}, - {489, {wxGrid, moveCursorLeftBlock, 1}}, - {490, {wxGrid, moveCursorRightBlock, 1}}, - {491, {wxGrid, moveCursorUpBlock, 1}}, - {492, {wxGrid, movePageDown, 0}}, - {493, {wxGrid, movePageUp, 0}}, - {494, {wxGrid, registerDataType, 3}}, - {495, {wxGrid, saveEditControlValue, 0}}, - {496, {wxGrid, selectAll, 0}}, - {497, {wxGrid, selectBlock_5, 5}}, - {498, {wxGrid, selectBlock_3, 3}}, - {499, {wxGrid, selectCol, 2}}, - {500, {wxGrid, selectRow, 2}}, - {501, {wxGrid, setCellAlignment_4, 4}}, - {502, {wxGrid, setCellAlignment_3, 3}}, - {503, {wxGrid, setCellAlignment_1, 1}}, - {504, {wxGrid, setCellBackgroundColour_3_0, 3}}, - {505, {wxGrid, setCellBackgroundColour_1, 1}}, - {506, {wxGrid, setCellBackgroundColour_3_1, 3}}, - {507, {wxGrid, setCellEditor, 3}}, - {508, {wxGrid, setCellFont, 3}}, - {509, {wxGrid, setCellRenderer, 3}}, - {510, {wxGrid, setCellTextColour_3_0, 3}}, - {511, {wxGrid, setCellTextColour_3_1, 3}}, - {512, {wxGrid, setCellTextColour_1, 1}}, - {513, {wxGrid, setCellValue_3_0, 3}}, - {514, {wxGrid, setCellValue_2, 2}}, - {515, {wxGrid, setCellValue_3_1, 3}}, - {516, {wxGrid, setColAttr, 2}}, - {517, {wxGrid, setColFormatBool, 1}}, - {518, {wxGrid, setColFormatNumber, 1}}, - {519, {wxGrid, setColFormatFloat, 2}}, - {520, {wxGrid, setColFormatCustom, 2}}, - {521, {wxGrid, setColLabelAlignment, 2}}, - {522, {wxGrid, setColLabelSize, 1}}, - {523, {wxGrid, setColLabelValue, 2}}, - {524, {wxGrid, setColMinimalWidth, 2}}, - {525, {wxGrid, setColMinimalAcceptableWidth, 1}}, - {526, {wxGrid, setColSize, 2}}, - {527, {wxGrid, setDefaultCellAlignment, 2}}, - {528, {wxGrid, setDefaultCellBackgroundColour, 1}}, - {529, {wxGrid, setDefaultCellFont, 1}}, - {530, {wxGrid, setDefaultCellTextColour, 1}}, - {531, {wxGrid, setDefaultEditor, 1}}, - {532, {wxGrid, setDefaultRenderer, 1}}, - {533, {wxGrid, setDefaultColSize, 2}}, - {534, {wxGrid, setDefaultRowSize, 2}}, - {535, {wxGrid, setGridCursor, 2}}, - {536, {wxGrid, setGridLineColour, 1}}, - {537, {wxGrid, setLabelBackgroundColour, 1}}, - {538, {wxGrid, setLabelFont, 1}}, - {539, {wxGrid, setLabelTextColour, 1}}, - {540, {wxGrid, setMargins, 2}}, - {541, {wxGrid, setReadOnly, 3}}, - {542, {wxGrid, setRowAttr, 2}}, - {543, {wxGrid, setRowLabelAlignment, 2}}, - {544, {wxGrid, setRowLabelSize, 1}}, - {545, {wxGrid, setRowLabelValue, 2}}, - {546, {wxGrid, setRowMinimalHeight, 2}}, - {547, {wxGrid, setRowMinimalAcceptableHeight, 1}}, - {548, {wxGrid, setRowSize, 2}}, - {549, {wxGrid, setScrollLineX, 1}}, - {550, {wxGrid, setScrollLineY, 1}}, - {551, {wxGrid, setSelectionBackground, 1}}, - {552, {wxGrid, setSelectionForeground, 1}}, - {553, {wxGrid, setSelectionMode, 1}}, - {554, {wxGrid, showCellEditControl, 0}}, - {555, {wxGrid, xToCol, 2}}, - {556, {wxGrid, xToEdgeOfCol, 1}}, - {557, {wxGrid, yToEdgeOfRow, 1}}, - {558, {wxGrid, yToRow, 1}}, - {559, {wxGridCellRenderer, draw, 7}}, - {560, {wxGridCellRenderer, getBestSize, 5}}, - {561, {wxGridCellEditor, create, 3}}, - {562, {wxGridCellEditor, isCreated, 0}}, - {563, {wxGridCellEditor, setSize, 1}}, - {564, {wxGridCellEditor, show, 2}}, - {565, {wxGridCellEditor, paintBackground, 2}}, - {566, {wxGridCellEditor, beginEdit, 3}}, - {567, {wxGridCellEditor, endEdit, 3}}, - {568, {wxGridCellEditor, reset, 0}}, - {569, {wxGridCellEditor, startingKey, 1}}, - {570, {wxGridCellEditor, startingClick, 0}}, - {571, {wxGridCellEditor, handleReturn, 1}}, - {572, {wxGridCellBoolRenderer, new, 0}}, - {573, {wxGridCellBoolRenderer, 'Destroy', undefined}}, - {574, {wxGridCellBoolEditor, new, 0}}, - {575, {wxGridCellBoolEditor, isTrueValue, 1}}, - {576, {wxGridCellBoolEditor, useStringValues, 1}}, - {577, {wxGridCellBoolEditor, 'Destroy', undefined}}, - {578, {wxGridCellFloatRenderer, new, 1}}, - {579, {wxGridCellFloatRenderer, getPrecision, 0}}, - {580, {wxGridCellFloatRenderer, getWidth, 0}}, - {581, {wxGridCellFloatRenderer, setParameters, 1}}, - {582, {wxGridCellFloatRenderer, setPrecision, 1}}, - {583, {wxGridCellFloatRenderer, setWidth, 1}}, - {584, {wxGridCellFloatRenderer, 'Destroy', undefined}}, - {585, {wxGridCellFloatEditor, new, 1}}, - {586, {wxGridCellFloatEditor, setParameters, 1}}, - {587, {wxGridCellFloatEditor, 'Destroy', undefined}}, - {588, {wxGridCellStringRenderer, new, 0}}, - {589, {wxGridCellStringRenderer, 'Destroy', undefined}}, - {590, {wxGridCellTextEditor, new, 0}}, - {591, {wxGridCellTextEditor, setParameters, 1}}, - {592, {wxGridCellTextEditor, 'Destroy', undefined}}, - {594, {wxGridCellChoiceEditor, new, 2}}, - {595, {wxGridCellChoiceEditor, setParameters, 1}}, - {596, {wxGridCellChoiceEditor, 'Destroy', undefined}}, - {597, {wxGridCellNumberRenderer, new, 0}}, - {598, {wxGridCellNumberRenderer, 'Destroy', undefined}}, - {599, {wxGridCellNumberEditor, new, 1}}, - {600, {wxGridCellNumberEditor, getValue, 0}}, - {601, {wxGridCellNumberEditor, setParameters, 1}}, - {602, {wxGridCellNumberEditor, 'Destroy', undefined}}, - {603, {wxGridCellAttr, setTextColour, 1}}, - {604, {wxGridCellAttr, setBackgroundColour, 1}}, - {605, {wxGridCellAttr, setFont, 1}}, - {606, {wxGridCellAttr, setAlignment, 2}}, - {607, {wxGridCellAttr, setReadOnly, 1}}, - {608, {wxGridCellAttr, setRenderer, 1}}, - {609, {wxGridCellAttr, setEditor, 1}}, - {610, {wxGridCellAttr, hasTextColour, 0}}, - {611, {wxGridCellAttr, hasBackgroundColour, 0}}, - {612, {wxGridCellAttr, hasFont, 0}}, - {613, {wxGridCellAttr, hasAlignment, 0}}, - {614, {wxGridCellAttr, hasRenderer, 0}}, - {615, {wxGridCellAttr, hasEditor, 0}}, - {616, {wxGridCellAttr, getTextColour, 0}}, - {617, {wxGridCellAttr, getBackgroundColour, 0}}, - {618, {wxGridCellAttr, getFont, 0}}, - {619, {wxGridCellAttr, getAlignment, 2}}, - {620, {wxGridCellAttr, getRenderer, 3}}, - {621, {wxGridCellAttr, getEditor, 3}}, - {622, {wxGridCellAttr, isReadOnly, 0}}, - {623, {wxGridCellAttr, setDefAttr, 1}}, - {624, {wxDC, blit, 5}}, - {625, {wxDC, calcBoundingBox, 2}}, - {626, {wxDC, clear, 0}}, - {627, {wxDC, computeScaleAndOrigin, 0}}, - {628, {wxDC, crossHair, 1}}, - {629, {wxDC, destroyClippingRegion, 0}}, - {630, {wxDC, deviceToLogicalX, 1}}, - {631, {wxDC, deviceToLogicalXRel, 1}}, - {632, {wxDC, deviceToLogicalY, 1}}, - {633, {wxDC, deviceToLogicalYRel, 1}}, - {634, {wxDC, drawArc, 3}}, - {635, {wxDC, drawBitmap, 3}}, - {636, {wxDC, drawCheckMark, 1}}, - {637, {wxDC, drawCircle, 2}}, - {639, {wxDC, drawEllipse_2, 2}}, - {640, {wxDC, drawEllipse_1, 1}}, - {641, {wxDC, drawEllipticArc, 4}}, - {642, {wxDC, drawIcon, 2}}, - {643, {wxDC, drawLabel, 3}}, - {644, {wxDC, drawLine, 2}}, - {645, {wxDC, drawLines, 3}}, - {647, {wxDC, drawPolygon, 3}}, - {649, {wxDC, drawPoint, 1}}, - {651, {wxDC, drawRectangle_2, 2}}, - {652, {wxDC, drawRectangle_1, 1}}, - {653, {wxDC, drawRotatedText, 3}}, - {655, {wxDC, drawRoundedRectangle_3, 3}}, - {656, {wxDC, drawRoundedRectangle_2, 2}}, - {657, {wxDC, drawText, 2}}, - {658, {wxDC, endDoc, 0}}, - {659, {wxDC, endPage, 0}}, - {660, {wxDC, floodFill, 3}}, - {661, {wxDC, getBackground, 0}}, - {662, {wxDC, getBackgroundMode, 0}}, - {663, {wxDC, getBrush, 0}}, - {664, {wxDC, getCharHeight, 0}}, - {665, {wxDC, getCharWidth, 0}}, - {666, {wxDC, getClippingBox, 4}}, - {668, {wxDC, getFont, 0}}, - {669, {wxDC, getLayoutDirection, 0}}, - {670, {wxDC, getLogicalFunction, 0}}, - {671, {wxDC, getMapMode, 0}}, - {672, {wxDC, getMultiLineTextExtent_4, 4}}, - {673, {wxDC, getMultiLineTextExtent_1, 1}}, - {674, {wxDC, getPartialTextExtents, 2}}, - {675, {wxDC, getPen, 0}}, - {676, {wxDC, getPixel, 2}}, - {677, {wxDC, getPPI, 0}}, - {679, {wxDC, getSize, 0}}, - {681, {wxDC, getSizeMM, 0}}, - {682, {wxDC, getTextBackground, 0}}, - {683, {wxDC, getTextExtent_4, 4}}, - {684, {wxDC, getTextExtent_1, 1}}, - {686, {wxDC, getTextForeground, 0}}, - {687, {wxDC, getUserScale, 2}}, - {688, {wxDC, gradientFillConcentric_3, 3}}, - {689, {wxDC, gradientFillConcentric_4, 4}}, - {690, {wxDC, gradientFillLinear, 4}}, - {691, {wxDC, logicalToDeviceX, 1}}, - {692, {wxDC, logicalToDeviceXRel, 1}}, - {693, {wxDC, logicalToDeviceY, 1}}, - {694, {wxDC, logicalToDeviceYRel, 1}}, - {695, {wxDC, maxX, 0}}, - {696, {wxDC, maxY, 0}}, - {697, {wxDC, minX, 0}}, - {698, {wxDC, minY, 0}}, - {699, {wxDC, isOk, 0}}, - {700, {wxDC, resetBoundingBox, 0}}, - {701, {wxDC, setAxisOrientation, 2}}, - {702, {wxDC, setBackground, 1}}, - {703, {wxDC, setBackgroundMode, 1}}, - {704, {wxDC, setBrush, 1}}, - {706, {wxDC, setClippingRegion_2, 2}}, - {707, {wxDC, setClippingRegion_1_1, 1}}, - {708, {wxDC, setClippingRegion_1_0, 1}}, - {709, {wxDC, setDeviceOrigin, 2}}, - {710, {wxDC, setFont, 1}}, - {711, {wxDC, setLayoutDirection, 1}}, - {712, {wxDC, setLogicalFunction, 1}}, - {713, {wxDC, setMapMode, 1}}, - {714, {wxDC, setPalette, 1}}, - {715, {wxDC, setPen, 1}}, - {716, {wxDC, setTextBackground, 1}}, - {717, {wxDC, setTextForeground, 1}}, - {718, {wxDC, setUserScale, 2}}, - {719, {wxDC, startDoc, 1}}, - {720, {wxDC, startPage, 0}}, - {721, {wxMirrorDC, new, 2}}, - {722, {wxMirrorDC, 'Destroy', undefined}}, - {723, {wxScreenDC, new, 0}}, - {724, {wxScreenDC, destruct, 0}}, - {725, {wxPostScriptDC, new_0, 0}}, - {726, {wxPostScriptDC, new_1, 1}}, - {727, {wxPostScriptDC, destruct, 0}}, - {728, {wxPostScriptDC, setResolution, 1}}, - {729, {wxPostScriptDC, getResolution, 0}}, - {730, {wxWindowDC, new_0, 0}}, - {731, {wxWindowDC, new_1, 1}}, - {732, {wxWindowDC, destruct, 0}}, - {733, {wxClientDC, new_0, 0}}, - {734, {wxClientDC, new_1, 1}}, - {735, {wxClientDC, 'Destroy', undefined}}, - {736, {wxPaintDC, new_0, 0}}, - {737, {wxPaintDC, new_1, 1}}, - {738, {wxPaintDC, 'Destroy', undefined}}, - {740, {wxMemoryDC, new_1_0, 1}}, - {741, {wxMemoryDC, new_1_1, 1}}, - {742, {wxMemoryDC, new_0, 0}}, - {744, {wxMemoryDC, destruct, 0}}, - {745, {wxMemoryDC, selectObject, 1}}, - {746, {wxMemoryDC, selectObjectAsSource, 1}}, - {747, {wxBufferedDC, new_0, 0}}, - {748, {wxBufferedDC, new_2, 2}}, - {749, {wxBufferedDC, new_3, 3}}, - {750, {wxBufferedDC, destruct, 0}}, - {751, {wxBufferedDC, init_2, 2}}, - {752, {wxBufferedDC, init_3, 3}}, - {753, {wxBufferedPaintDC, new_3, 3}}, - {754, {wxBufferedPaintDC, new_2, 2}}, - {755, {wxBufferedPaintDC, destruct, 0}}, - {756, {wxGraphicsObject, destruct, 0}}, - {757, {wxGraphicsObject, getRenderer, 0}}, - {758, {wxGraphicsObject, isNull, 0}}, - {759, {wxGraphicsContext, destruct, 0}}, - {760, {wxGraphicsContext, create_1_1, 1}}, - {761, {wxGraphicsContext, create_1_0, 1}}, - {762, {wxGraphicsContext, create_0, 0}}, - {763, {wxGraphicsContext, createPen, 1}}, - {764, {wxGraphicsContext, createBrush, 1}}, - {765, {wxGraphicsContext, createRadialGradientBrush, 7}}, - {766, {wxGraphicsContext, createLinearGradientBrush, 6}}, - {767, {wxGraphicsContext, createFont, 2}}, - {768, {wxGraphicsContext, createMatrix, 1}}, - {769, {wxGraphicsContext, createPath, 0}}, - {770, {wxGraphicsContext, clip_1, 1}}, - {771, {wxGraphicsContext, clip_4, 4}}, - {772, {wxGraphicsContext, resetClip, 0}}, - {773, {wxGraphicsContext, drawBitmap, 5}}, - {774, {wxGraphicsContext, drawEllipse, 4}}, - {775, {wxGraphicsContext, drawIcon, 5}}, - {776, {wxGraphicsContext, drawLines, 3}}, - {777, {wxGraphicsContext, drawPath, 2}}, - {778, {wxGraphicsContext, drawRectangle, 4}}, - {779, {wxGraphicsContext, drawRoundedRectangle, 5}}, - {780, {wxGraphicsContext, drawText_3, 3}}, - {781, {wxGraphicsContext, drawText_4_0, 4}}, - {782, {wxGraphicsContext, drawText_4_1, 4}}, - {783, {wxGraphicsContext, drawText_5, 5}}, - {784, {wxGraphicsContext, fillPath, 2}}, - {785, {wxGraphicsContext, strokePath, 1}}, - {786, {wxGraphicsContext, getPartialTextExtents, 2}}, - {787, {wxGraphicsContext, getTextExtent, 5}}, - {788, {wxGraphicsContext, rotate, 1}}, - {789, {wxGraphicsContext, scale, 2}}, - {790, {wxGraphicsContext, translate, 2}}, - {791, {wxGraphicsContext, getTransform, 0}}, - {792, {wxGraphicsContext, setTransform, 1}}, - {793, {wxGraphicsContext, concatTransform, 1}}, - {794, {wxGraphicsContext, setBrush_1_1, 1}}, - {795, {wxGraphicsContext, setBrush_1_0, 1}}, - {796, {wxGraphicsContext, setFont_1, 1}}, - {797, {wxGraphicsContext, setFont_2, 2}}, - {798, {wxGraphicsContext, setPen_1_0, 1}}, - {799, {wxGraphicsContext, setPen_1_1, 1}}, - {800, {wxGraphicsContext, strokeLine, 4}}, - {801, {wxGraphicsContext, strokeLines, 2}}, - {803, {wxGraphicsMatrix, concat, 1}}, - {805, {wxGraphicsMatrix, get, 1}}, - {806, {wxGraphicsMatrix, invert, 0}}, - {807, {wxGraphicsMatrix, isEqual, 1}}, - {809, {wxGraphicsMatrix, isIdentity, 0}}, - {810, {wxGraphicsMatrix, rotate, 1}}, - {811, {wxGraphicsMatrix, scale, 2}}, - {812, {wxGraphicsMatrix, translate, 2}}, - {813, {wxGraphicsMatrix, set, 1}}, - {814, {wxGraphicsMatrix, transformPoint, 2}}, - {815, {wxGraphicsMatrix, transformDistance, 2}}, - {816, {wxGraphicsPath, moveToPoint_2, 2}}, - {817, {wxGraphicsPath, moveToPoint_1, 1}}, - {818, {wxGraphicsPath, addArc_6, 6}}, - {819, {wxGraphicsPath, addArc_5, 5}}, - {820, {wxGraphicsPath, addArcToPoint, 5}}, - {821, {wxGraphicsPath, addCircle, 3}}, - {822, {wxGraphicsPath, addCurveToPoint_6, 6}}, - {823, {wxGraphicsPath, addCurveToPoint_3, 3}}, - {824, {wxGraphicsPath, addEllipse, 4}}, - {825, {wxGraphicsPath, addLineToPoint_2, 2}}, - {826, {wxGraphicsPath, addLineToPoint_1, 1}}, - {827, {wxGraphicsPath, addPath, 1}}, - {828, {wxGraphicsPath, addQuadCurveToPoint, 4}}, - {829, {wxGraphicsPath, addRectangle, 4}}, - {830, {wxGraphicsPath, addRoundedRectangle, 5}}, - {831, {wxGraphicsPath, closeSubpath, 0}}, - {832, {wxGraphicsPath, contains_3, 3}}, - {833, {wxGraphicsPath, contains_2, 2}}, - {835, {wxGraphicsPath, getBox, 0}}, - {837, {wxGraphicsPath, getCurrentPoint, 0}}, - {838, {wxGraphicsPath, transform, 1}}, - {839, {wxGraphicsRenderer, getDefaultRenderer, 0}}, - {840, {wxGraphicsRenderer, createContext_1_1, 1}}, - {841, {wxGraphicsRenderer, createContext_1_0, 1}}, - {842, {wxGraphicsRenderer, createPen, 1}}, - {843, {wxGraphicsRenderer, createBrush, 1}}, - {844, {wxGraphicsRenderer, createLinearGradientBrush, 6}}, - {845, {wxGraphicsRenderer, createRadialGradientBrush, 7}}, - {846, {wxGraphicsRenderer, createFont, 2}}, - {847, {wxGraphicsRenderer, createMatrix, 1}}, - {848, {wxGraphicsRenderer, createPath, 0}}, - {850, {wxMenuBar, new_1, 1}}, - {852, {wxMenuBar, new_0, 0}}, - {854, {wxMenuBar, destruct, 0}}, - {855, {wxMenuBar, append, 2}}, - {856, {wxMenuBar, check, 2}}, - {857, {wxMenuBar, enable_2, 2}}, - {858, {wxMenuBar, enable_1, 1}}, - {859, {wxMenuBar, enableTop, 2}}, - {860, {wxMenuBar, findMenu, 1}}, - {861, {wxMenuBar, findMenuItem, 2}}, - {862, {wxMenuBar, findItem, 2}}, - {863, {wxMenuBar, getHelpString, 1}}, - {864, {wxMenuBar, getLabel_1, 1}}, - {865, {wxMenuBar, getLabel_0, 0}}, - {866, {wxMenuBar, getLabelTop, 1}}, - {867, {wxMenuBar, getMenu, 1}}, - {868, {wxMenuBar, getMenuCount, 0}}, - {869, {wxMenuBar, insert, 3}}, - {870, {wxMenuBar, isChecked, 1}}, - {871, {wxMenuBar, isEnabled_1, 1}}, - {872, {wxMenuBar, isEnabled_0, 0}}, - {873, {wxMenuBar, remove, 1}}, - {874, {wxMenuBar, replace, 3}}, - {875, {wxMenuBar, setHelpString, 2}}, - {876, {wxMenuBar, setLabel_2, 2}}, - {877, {wxMenuBar, setLabel_1, 1}}, - {878, {wxMenuBar, setLabelTop, 2}}, - {879, {wxControl, getLabel, 0}}, - {880, {wxControl, setLabel, 1}}, - {881, {wxControlWithItems, append_1, 1}}, - {882, {wxControlWithItems, append_2, 2}}, - {883, {wxControlWithItems, appendStrings_1, 1}}, - {884, {wxControlWithItems, clear, 0}}, - {885, {wxControlWithItems, delete, 1}}, - {886, {wxControlWithItems, findString, 2}}, - {887, {wxControlWithItems, getClientData, 1}}, - {888, {wxControlWithItems, setClientData, 2}}, - {889, {wxControlWithItems, getCount, 0}}, - {890, {wxControlWithItems, getSelection, 0}}, - {891, {wxControlWithItems, getString, 1}}, - {892, {wxControlWithItems, getStringSelection, 0}}, - {893, {wxControlWithItems, insert_2, 2}}, - {894, {wxControlWithItems, insert_3, 3}}, - {895, {wxControlWithItems, isEmpty, 0}}, - {896, {wxControlWithItems, select, 1}}, - {897, {wxControlWithItems, setSelection, 1}}, - {898, {wxControlWithItems, setString, 2}}, - {899, {wxControlWithItems, setStringSelection, 1}}, - {902, {wxMenu, new_2, 2}}, - {903, {wxMenu, new_1, 1}}, - {905, {wxMenu, destruct, 0}}, - {906, {wxMenu, append_3, 3}}, - {907, {wxMenu, append_1, 1}}, - {908, {wxMenu, append_4_0, 4}}, - {909, {wxMenu, append_4_1, 4}}, - {910, {wxMenu, appendCheckItem, 3}}, - {911, {wxMenu, appendRadioItem, 3}}, - {912, {wxMenu, appendSeparator, 0}}, - {913, {wxMenu, break, 0}}, - {914, {wxMenu, check, 2}}, - {915, {wxMenu, delete_1_0, 1}}, - {916, {wxMenu, delete_1_1, 1}}, - {917, {wxMenu, destroy_1_0, 1}}, - {918, {wxMenu, destroy_1_1, 1}}, - {919, {wxMenu, enable, 2}}, - {920, {wxMenu, findItem_1, 1}}, - {921, {wxMenu, findItem_2, 2}}, - {922, {wxMenu, findItemByPosition, 1}}, - {923, {wxMenu, getHelpString, 1}}, - {924, {wxMenu, getLabel, 1}}, - {925, {wxMenu, getMenuItemCount, 0}}, - {926, {wxMenu, getMenuItems, 0}}, - {928, {wxMenu, getTitle, 0}}, - {929, {wxMenu, insert_2, 2}}, - {930, {wxMenu, insert_3, 3}}, - {931, {wxMenu, insert_5_1, 5}}, - {932, {wxMenu, insert_5_0, 5}}, - {933, {wxMenu, insertCheckItem, 4}}, - {934, {wxMenu, insertRadioItem, 4}}, - {935, {wxMenu, insertSeparator, 1}}, - {936, {wxMenu, isChecked, 1}}, - {937, {wxMenu, isEnabled, 1}}, - {938, {wxMenu, prepend_1, 1}}, - {939, {wxMenu, prepend_2, 2}}, - {940, {wxMenu, prepend_4_1, 4}}, - {941, {wxMenu, prepend_4_0, 4}}, - {942, {wxMenu, prependCheckItem, 3}}, - {943, {wxMenu, prependRadioItem, 3}}, - {944, {wxMenu, prependSeparator, 0}}, - {945, {wxMenu, remove_1_0, 1}}, - {946, {wxMenu, remove_1_1, 1}}, - {947, {wxMenu, setHelpString, 2}}, - {948, {wxMenu, setLabel, 2}}, - {949, {wxMenu, setTitle, 1}}, - {950, {wxMenuItem, new, 1}}, - {952, {wxMenuItem, destruct, 0}}, - {953, {wxMenuItem, check, 1}}, - {954, {wxMenuItem, enable, 1}}, - {955, {wxMenuItem, getBitmap, 0}}, - {956, {wxMenuItem, getHelp, 0}}, - {957, {wxMenuItem, getId, 0}}, - {958, {wxMenuItem, getKind, 0}}, - {959, {wxMenuItem, getLabel, 0}}, - {960, {wxMenuItem, getLabelFromText, 1}}, - {961, {wxMenuItem, getMenu, 0}}, - {962, {wxMenuItem, getText, 0}}, - {963, {wxMenuItem, getSubMenu, 0}}, - {964, {wxMenuItem, isCheckable, 0}}, - {965, {wxMenuItem, isChecked, 0}}, - {966, {wxMenuItem, isEnabled, 0}}, - {967, {wxMenuItem, isSeparator, 0}}, - {968, {wxMenuItem, isSubMenu, 0}}, - {969, {wxMenuItem, setBitmap, 1}}, - {970, {wxMenuItem, setHelp, 1}}, - {971, {wxMenuItem, setMenu, 1}}, - {972, {wxMenuItem, setSubMenu, 1}}, - {973, {wxMenuItem, setText, 1}}, - {974, {wxToolBar, addControl, 1}}, - {975, {wxToolBar, addSeparator, 0}}, - {976, {wxToolBar, addTool_5, 5}}, - {977, {wxToolBar, addTool_4_0, 4}}, - {978, {wxToolBar, addTool_1, 1}}, - {979, {wxToolBar, addTool_4_1, 4}}, - {980, {wxToolBar, addTool_3, 3}}, - {981, {wxToolBar, addTool_6, 6}}, - {982, {wxToolBar, addCheckTool, 4}}, - {983, {wxToolBar, addRadioTool, 4}}, - {984, {wxToolBar, addStretchableSpace, 0}}, - {985, {wxToolBar, insertStretchableSpace, 1}}, - {986, {wxToolBar, deleteTool, 1}}, - {987, {wxToolBar, deleteToolByPos, 1}}, - {988, {wxToolBar, enableTool, 2}}, - {989, {wxToolBar, findById, 1}}, - {990, {wxToolBar, findControl, 1}}, - {991, {wxToolBar, findToolForPosition, 2}}, - {992, {wxToolBar, getToolSize, 0}}, - {993, {wxToolBar, getToolBitmapSize, 0}}, - {994, {wxToolBar, getMargins, 0}}, - {995, {wxToolBar, getToolEnabled, 1}}, - {996, {wxToolBar, getToolLongHelp, 1}}, - {997, {wxToolBar, getToolPacking, 0}}, - {998, {wxToolBar, getToolPos, 1}}, - {999, {wxToolBar, getToolSeparation, 0}}, - {1000, {wxToolBar, getToolShortHelp, 1}}, - {1001, {wxToolBar, getToolState, 1}}, - {1002, {wxToolBar, insertControl, 2}}, - {1003, {wxToolBar, insertSeparator, 1}}, - {1004, {wxToolBar, insertTool_5, 5}}, - {1005, {wxToolBar, insertTool_2, 2}}, - {1006, {wxToolBar, insertTool_4, 4}}, - {1007, {wxToolBar, realize, 0}}, - {1008, {wxToolBar, removeTool, 1}}, - {1009, {wxToolBar, setMargins, 2}}, - {1010, {wxToolBar, setToolBitmapSize, 1}}, - {1011, {wxToolBar, setToolLongHelp, 2}}, - {1012, {wxToolBar, setToolPacking, 1}}, - {1013, {wxToolBar, setToolShortHelp, 2}}, - {1014, {wxToolBar, setToolSeparation, 1}}, - {1015, {wxToolBar, toggleTool, 2}}, - {1017, {wxStatusBar, new_0, 0}}, - {1018, {wxStatusBar, new_2, 2}}, - {1020, {wxStatusBar, destruct, 0}}, - {1021, {wxStatusBar, create, 2}}, - {1022, {wxStatusBar, getFieldRect, 2}}, - {1023, {wxStatusBar, getFieldsCount, 0}}, - {1024, {wxStatusBar, getStatusText, 1}}, - {1025, {wxStatusBar, popStatusText, 1}}, - {1026, {wxStatusBar, pushStatusText, 2}}, - {1027, {wxStatusBar, setFieldsCount, 2}}, - {1028, {wxStatusBar, setMinHeight, 1}}, - {1029, {wxStatusBar, setStatusText, 2}}, - {1030, {wxStatusBar, setStatusWidths, 2}}, - {1031, {wxStatusBar, setStatusStyles, 2}}, - {1032, {wxBitmap, new_0, 0}}, - {1033, {wxBitmap, new_3, 3}}, - {1034, {wxBitmap, new_4, 4}}, - {1035, {wxBitmap, new_2_0, 2}}, - {1036, {wxBitmap, new_2_1, 2}}, - {1037, {wxBitmap, destruct, 0}}, - {1038, {wxBitmap, convertToImage, 0}}, - {1039, {wxBitmap, copyFromIcon, 1}}, - {1040, {wxBitmap, create, 3}}, - {1041, {wxBitmap, getDepth, 0}}, - {1042, {wxBitmap, getHeight, 0}}, - {1043, {wxBitmap, getPalette, 0}}, - {1044, {wxBitmap, getMask, 0}}, - {1045, {wxBitmap, getWidth, 0}}, - {1046, {wxBitmap, getSubBitmap, 1}}, - {1047, {wxBitmap, loadFile, 2}}, - {1048, {wxBitmap, ok, 0}}, - {1049, {wxBitmap, saveFile, 3}}, - {1050, {wxBitmap, setDepth, 1}}, - {1051, {wxBitmap, setHeight, 1}}, - {1052, {wxBitmap, setMask, 1}}, - {1053, {wxBitmap, setPalette, 1}}, - {1054, {wxBitmap, setWidth, 1}}, - {1055, {wxIcon, new_0, 0}}, - {1056, {wxIcon, new_2, 2}}, - {1057, {wxIcon, new_1, 1}}, - {1058, {wxIcon, copyFromBitmap, 1}}, - {1059, {wxIcon, 'Destroy', undefined}}, - {1060, {wxIconBundle, new_0, 0}}, - {1061, {wxIconBundle, new_2, 2}}, - {1062, {wxIconBundle, new_1_0, 1}}, - {1063, {wxIconBundle, new_1_1, 1}}, - {1064, {wxIconBundle, destruct, 0}}, - {1065, {wxIconBundle, addIcon_2, 2}}, - {1066, {wxIconBundle, addIcon_1, 1}}, - {1067, {wxIconBundle, getIcon_1_1, 1}}, - {1068, {wxIconBundle, getIcon_1_0, 1}}, - {1069, {wxCursor, new_0, 0}}, - {1070, {wxCursor, new_1_0, 1}}, - {1071, {wxCursor, new_1_1, 1}}, - {1072, {wxCursor, new_4, 4}}, - {1073, {wxCursor, destruct, 0}}, - {1074, {wxCursor, ok, 0}}, - {1075, {wxMask, new_0, 0}}, - {1076, {wxMask, new_2_1, 2}}, - {1077, {wxMask, new_2_0, 2}}, - {1078, {wxMask, new_1, 1}}, - {1079, {wxMask, destruct, 0}}, - {1080, {wxMask, create_2_1, 2}}, - {1081, {wxMask, create_2_0, 2}}, - {1082, {wxMask, create_1, 1}}, - {1083, {wxImage, new_0, 0}}, - {1084, {wxImage, new_3_0, 3}}, - {1085, {wxImage, new_4, 4}}, - {1086, {wxImage, new_5, 5}}, - {1087, {wxImage, new_2, 2}}, - {1088, {wxImage, new_3_1, 3}}, - {1089, {wxImage, blur, 1}}, - {1090, {wxImage, blurHorizontal, 1}}, - {1091, {wxImage, blurVertical, 1}}, - {1092, {wxImage, convertAlphaToMask, 1}}, - {1093, {wxImage, convertToGreyscale, 1}}, - {1094, {wxImage, convertToMono, 3}}, - {1095, {wxImage, copy, 0}}, - {1096, {wxImage, create_3, 3}}, - {1097, {wxImage, create_4, 4}}, - {1098, {wxImage, create_5, 5}}, - {1099, {wxImage, 'Destroy', 0}}, - {1100, {wxImage, findFirstUnusedColour, 4}}, - {1101, {wxImage, getImageExtWildcard, 0}}, - {1102, {wxImage, getAlpha_2, 2}}, - {1103, {wxImage, getAlpha_0, 0}}, - {1104, {wxImage, getBlue, 2}}, - {1105, {wxImage, getData, 0}}, - {1106, {wxImage, getGreen, 2}}, - {1107, {wxImage, getImageCount, 2}}, - {1108, {wxImage, getHeight, 0}}, - {1109, {wxImage, getMaskBlue, 0}}, - {1110, {wxImage, getMaskGreen, 0}}, - {1111, {wxImage, getMaskRed, 0}}, - {1112, {wxImage, getOrFindMaskColour, 3}}, - {1113, {wxImage, getPalette, 0}}, - {1114, {wxImage, getRed, 2}}, - {1115, {wxImage, getSubImage, 1}}, - {1116, {wxImage, getWidth, 0}}, - {1117, {wxImage, hasAlpha, 0}}, - {1118, {wxImage, hasMask, 0}}, - {1119, {wxImage, getOption, 1}}, - {1120, {wxImage, getOptionInt, 1}}, - {1121, {wxImage, hasOption, 1}}, - {1122, {wxImage, initAlpha, 0}}, - {1123, {wxImage, initStandardHandlers, 0}}, - {1124, {wxImage, isTransparent, 3}}, - {1125, {wxImage, loadFile_2, 2}}, - {1126, {wxImage, loadFile_3, 3}}, - {1127, {wxImage, ok, 0}}, - {1128, {wxImage, removeHandler, 1}}, - {1129, {wxImage, mirror, 1}}, - {1130, {wxImage, replace, 6}}, - {1131, {wxImage, rescale, 3}}, - {1132, {wxImage, resize, 3}}, - {1133, {wxImage, rotate, 3}}, - {1134, {wxImage, rotateHue, 1}}, - {1135, {wxImage, rotate90, 1}}, - {1136, {wxImage, saveFile_1, 1}}, - {1137, {wxImage, saveFile_2_0, 2}}, - {1138, {wxImage, saveFile_2_1, 2}}, - {1139, {wxImage, scale, 3}}, - {1140, {wxImage, size, 3}}, - {1141, {wxImage, setAlpha_3, 3}}, - {1142, {wxImage, setAlpha_2, 2}}, - {1143, {wxImage, setData_2, 2}}, - {1144, {wxImage, setData_4, 4}}, - {1145, {wxImage, setMask, 1}}, - {1146, {wxImage, setMaskColour, 3}}, - {1147, {wxImage, setMaskFromImage, 4}}, - {1148, {wxImage, setOption_2_1, 2}}, - {1149, {wxImage, setOption_2_0, 2}}, - {1150, {wxImage, setPalette, 1}}, - {1151, {wxImage, setRGB_5, 5}}, - {1152, {wxImage, setRGB_4, 4}}, - {1153, {wxImage, 'Destroy', undefined}}, - {1154, {wxBrush, new_0, 0}}, - {1155, {wxBrush, new_2, 2}}, - {1156, {wxBrush, new_1, 1}}, - {1158, {wxBrush, destruct, 0}}, - {1159, {wxBrush, getColour, 0}}, - {1160, {wxBrush, getStipple, 0}}, - {1161, {wxBrush, getStyle, 0}}, - {1162, {wxBrush, isHatch, 0}}, - {1163, {wxBrush, isOk, 0}}, - {1164, {wxBrush, setColour_1, 1}}, - {1165, {wxBrush, setColour_3, 3}}, - {1166, {wxBrush, setStipple, 1}}, - {1167, {wxBrush, setStyle, 1}}, - {1168, {wxPen, new_0, 0}}, - {1169, {wxPen, new_2, 2}}, - {1170, {wxPen, destruct, 0}}, - {1171, {wxPen, getCap, 0}}, - {1172, {wxPen, getColour, 0}}, - {1173, {wxPen, getJoin, 0}}, - {1174, {wxPen, getStyle, 0}}, - {1175, {wxPen, getWidth, 0}}, - {1176, {wxPen, isOk, 0}}, - {1177, {wxPen, setCap, 1}}, - {1178, {wxPen, setColour_1, 1}}, - {1179, {wxPen, setColour_3, 3}}, - {1180, {wxPen, setJoin, 1}}, - {1181, {wxPen, setStyle, 1}}, - {1182, {wxPen, setWidth, 1}}, - {1183, {wxRegion, new_0, 0}}, - {1184, {wxRegion, new_4, 4}}, - {1185, {wxRegion, new_2, 2}}, - {1186, {wxRegion, new_1_1, 1}}, - {1188, {wxRegion, new_1_0, 1}}, - {1190, {wxRegion, destruct, 0}}, - {1191, {wxRegion, clear, 0}}, - {1192, {wxRegion, contains_2, 2}}, - {1193, {wxRegion, contains_1_0, 1}}, - {1194, {wxRegion, contains_4, 4}}, - {1195, {wxRegion, contains_1_1, 1}}, - {1196, {wxRegion, convertToBitmap, 0}}, - {1197, {wxRegion, getBox, 0}}, - {1198, {wxRegion, intersect_4, 4}}, - {1199, {wxRegion, intersect_1_1, 1}}, - {1200, {wxRegion, intersect_1_0, 1}}, - {1201, {wxRegion, isEmpty, 0}}, - {1202, {wxRegion, subtract_4, 4}}, - {1203, {wxRegion, subtract_1_1, 1}}, - {1204, {wxRegion, subtract_1_0, 1}}, - {1205, {wxRegion, offset_2, 2}}, - {1206, {wxRegion, offset_1, 1}}, - {1207, {wxRegion, union_4, 4}}, - {1208, {wxRegion, union_1_2, 1}}, - {1209, {wxRegion, union_1_1, 1}}, - {1210, {wxRegion, union_1_0, 1}}, - {1211, {wxRegion, union_3, 3}}, - {1212, {wxRegion, xor_4, 4}}, - {1213, {wxRegion, xor_1_1, 1}}, - {1214, {wxRegion, xor_1_0, 1}}, - {1215, {wxAcceleratorTable, new_0, 0}}, - {1216, {wxAcceleratorTable, new_2, 2}}, - {1217, {wxAcceleratorTable, destruct, 0}}, - {1218, {wxAcceleratorTable, ok, 0}}, - {1219, {wxAcceleratorEntry, new_1_0, 1}}, - {1220, {wxAcceleratorEntry, new_1_1, 1}}, - {1221, {wxAcceleratorEntry, getCommand, 0}}, - {1222, {wxAcceleratorEntry, getFlags, 0}}, - {1223, {wxAcceleratorEntry, getKeyCode, 0}}, - {1224, {wxAcceleratorEntry, set, 4}}, - {1225, {wxAcceleratorEntry, 'Destroy', undefined}}, - {1230, {wxCaret, new_3, 3}}, - {1231, {wxCaret, new_2, 2}}, - {1233, {wxCaret, destruct, 0}}, - {1234, {wxCaret, create_3, 3}}, - {1235, {wxCaret, create_2, 2}}, - {1236, {wxCaret, getBlinkTime, 0}}, - {1238, {wxCaret, getPosition, 0}}, - {1240, {wxCaret, getSize, 0}}, - {1241, {wxCaret, getWindow, 0}}, - {1242, {wxCaret, hide, 0}}, - {1243, {wxCaret, isOk, 0}}, - {1244, {wxCaret, isVisible, 0}}, - {1245, {wxCaret, move_2, 2}}, - {1246, {wxCaret, move_1, 1}}, - {1247, {wxCaret, setBlinkTime, 1}}, - {1248, {wxCaret, setSize_2, 2}}, - {1249, {wxCaret, setSize_1, 1}}, - {1250, {wxCaret, show, 1}}, - {1251, {wxSizer, add_2_1, 2}}, - {1252, {wxSizer, add_2_0, 2}}, - {1253, {wxSizer, add_3, 3}}, - {1254, {wxSizer, add_2_3, 2}}, - {1255, {wxSizer, add_2_2, 2}}, - {1256, {wxSizer, addSpacer, 1}}, - {1257, {wxSizer, addStretchSpacer, 1}}, - {1258, {wxSizer, calcMin, 0}}, - {1259, {wxSizer, clear, 1}}, - {1260, {wxSizer, detach_1_2, 1}}, - {1261, {wxSizer, detach_1_1, 1}}, - {1262, {wxSizer, detach_1_0, 1}}, - {1263, {wxSizer, fit, 1}}, - {1264, {wxSizer, fitInside, 1}}, - {1265, {wxSizer, getChildren, 0}}, - {1266, {wxSizer, getItem_2_1, 2}}, - {1267, {wxSizer, getItem_2_0, 2}}, - {1268, {wxSizer, getItem_1, 1}}, - {1269, {wxSizer, getSize, 0}}, - {1270, {wxSizer, getPosition, 0}}, - {1271, {wxSizer, getMinSize, 0}}, - {1272, {wxSizer, hide_2_0, 2}}, - {1273, {wxSizer, hide_2_1, 2}}, - {1274, {wxSizer, hide_1, 1}}, - {1275, {wxSizer, insert_3_1, 3}}, - {1276, {wxSizer, insert_3_0, 3}}, - {1277, {wxSizer, insert_4, 4}}, - {1278, {wxSizer, insert_3_3, 3}}, - {1279, {wxSizer, insert_3_2, 3}}, - {1280, {wxSizer, insert_2, 2}}, - {1281, {wxSizer, insertSpacer, 2}}, - {1282, {wxSizer, insertStretchSpacer, 2}}, - {1283, {wxSizer, isShown_1_2, 1}}, - {1284, {wxSizer, isShown_1_1, 1}}, - {1285, {wxSizer, isShown_1_0, 1}}, - {1286, {wxSizer, layout, 0}}, - {1287, {wxSizer, prepend_2_1, 2}}, - {1288, {wxSizer, prepend_2_0, 2}}, - {1289, {wxSizer, prepend_3, 3}}, - {1290, {wxSizer, prepend_2_3, 2}}, - {1291, {wxSizer, prepend_2_2, 2}}, - {1292, {wxSizer, prepend_1, 1}}, - {1293, {wxSizer, prependSpacer, 1}}, - {1294, {wxSizer, prependStretchSpacer, 1}}, - {1295, {wxSizer, recalcSizes, 0}}, - {1296, {wxSizer, remove_1_1, 1}}, - {1297, {wxSizer, remove_1_0, 1}}, - {1298, {wxSizer, replace_3_1, 3}}, - {1299, {wxSizer, replace_3_0, 3}}, - {1300, {wxSizer, replace_2, 2}}, - {1301, {wxSizer, setDimension, 4}}, - {1302, {wxSizer, setMinSize_2, 2}}, - {1303, {wxSizer, setMinSize_1, 1}}, - {1304, {wxSizer, setItemMinSize_3_2, 3}}, - {1305, {wxSizer, setItemMinSize_2_2, 2}}, - {1306, {wxSizer, setItemMinSize_3_1, 3}}, - {1307, {wxSizer, setItemMinSize_2_1, 2}}, - {1308, {wxSizer, setItemMinSize_3_0, 3}}, - {1309, {wxSizer, setItemMinSize_2_0, 2}}, - {1310, {wxSizer, setSizeHints, 1}}, - {1311, {wxSizer, setVirtualSizeHints, 1}}, - {1312, {wxSizer, show_2_2, 2}}, - {1313, {wxSizer, show_2_1, 2}}, - {1314, {wxSizer, show_2_0, 2}}, - {1315, {wxSizer, show_1, 1}}, - {1316, {wxSizerFlags, new, 1}}, - {1317, {wxSizerFlags, align, 1}}, - {1318, {wxSizerFlags, border_2, 2}}, - {1319, {wxSizerFlags, border_1, 1}}, - {1320, {wxSizerFlags, center, 0}}, - {1321, {wxSizerFlags, centre, 0}}, - {1322, {wxSizerFlags, expand, 0}}, - {1323, {wxSizerFlags, left, 0}}, - {1324, {wxSizerFlags, proportion, 1}}, - {1325, {wxSizerFlags, right, 0}}, - {1326, {wxSizerFlags, 'Destroy', undefined}}, - {1327, {wxSizerItem, new_5_1, 5}}, - {1328, {wxSizerItem, new_2_1, 2}}, - {1329, {wxSizerItem, new_5_0, 5}}, - {1330, {wxSizerItem, new_2_0, 2}}, - {1331, {wxSizerItem, new_6, 6}}, - {1332, {wxSizerItem, new_3, 3}}, - {1333, {wxSizerItem, new_0, 0}}, - {1334, {wxSizerItem, destruct, 0}}, - {1335, {wxSizerItem, calcMin, 0}}, - {1336, {wxSizerItem, deleteWindows, 0}}, - {1337, {wxSizerItem, detachSizer, 0}}, - {1338, {wxSizerItem, getBorder, 0}}, - {1339, {wxSizerItem, getFlag, 0}}, - {1340, {wxSizerItem, getMinSize, 0}}, - {1341, {wxSizerItem, getPosition, 0}}, - {1342, {wxSizerItem, getProportion, 0}}, - {1343, {wxSizerItem, getRatio, 0}}, - {1344, {wxSizerItem, getRect, 0}}, - {1345, {wxSizerItem, getSize, 0}}, - {1346, {wxSizerItem, getSizer, 0}}, - {1347, {wxSizerItem, getSpacer, 0}}, - {1348, {wxSizerItem, getUserData, 0}}, - {1349, {wxSizerItem, getWindow, 0}}, - {1350, {wxSizerItem, isSizer, 0}}, - {1351, {wxSizerItem, isShown, 0}}, - {1352, {wxSizerItem, isSpacer, 0}}, - {1353, {wxSizerItem, isWindow, 0}}, - {1354, {wxSizerItem, setBorder, 1}}, - {1355, {wxSizerItem, setDimension, 2}}, - {1356, {wxSizerItem, setFlag, 1}}, - {1357, {wxSizerItem, setInitSize, 2}}, - {1358, {wxSizerItem, setMinSize_1, 1}}, - {1359, {wxSizerItem, setMinSize_2, 2}}, - {1360, {wxSizerItem, setProportion, 1}}, - {1361, {wxSizerItem, setRatio_2, 2}}, - {1362, {wxSizerItem, setRatio_1_1, 1}}, - {1363, {wxSizerItem, setRatio_1_0, 1}}, - {1364, {wxSizerItem, setSizer, 1}}, - {1365, {wxSizerItem, setSpacer_1, 1}}, - {1366, {wxSizerItem, setSpacer_2, 2}}, - {1367, {wxSizerItem, setWindow, 1}}, - {1368, {wxSizerItem, show, 1}}, - {1369, {wxBoxSizer, new, 1}}, - {1370, {wxBoxSizer, getOrientation, 0}}, - {1371, {wxBoxSizer, 'Destroy', undefined}}, - {1372, {wxStaticBoxSizer, new_2, 2}}, - {1373, {wxStaticBoxSizer, new_3, 3}}, - {1374, {wxStaticBoxSizer, getStaticBox, 0}}, - {1375, {wxStaticBoxSizer, 'Destroy', undefined}}, - {1376, {wxGridSizer, new_4, 4}}, - {1377, {wxGridSizer, new_2, 2}}, - {1378, {wxGridSizer, getCols, 0}}, - {1379, {wxGridSizer, getHGap, 0}}, - {1380, {wxGridSizer, getRows, 0}}, - {1381, {wxGridSizer, getVGap, 0}}, - {1382, {wxGridSizer, setCols, 1}}, - {1383, {wxGridSizer, setHGap, 1}}, - {1384, {wxGridSizer, setRows, 1}}, - {1385, {wxGridSizer, setVGap, 1}}, - {1386, {wxGridSizer, 'Destroy', undefined}}, - {1387, {wxFlexGridSizer, new_4, 4}}, - {1388, {wxFlexGridSizer, new_2, 2}}, - {1389, {wxFlexGridSizer, addGrowableCol, 2}}, - {1390, {wxFlexGridSizer, addGrowableRow, 2}}, - {1391, {wxFlexGridSizer, getFlexibleDirection, 0}}, - {1392, {wxFlexGridSizer, getNonFlexibleGrowMode, 0}}, - {1393, {wxFlexGridSizer, removeGrowableCol, 1}}, - {1394, {wxFlexGridSizer, removeGrowableRow, 1}}, - {1395, {wxFlexGridSizer, setFlexibleDirection, 1}}, - {1396, {wxFlexGridSizer, setNonFlexibleGrowMode, 1}}, - {1397, {wxFlexGridSizer, 'Destroy', undefined}}, - {1398, {wxGridBagSizer, new, 1}}, - {1399, {wxGridBagSizer, add_3_2, 3}}, - {1400, {wxGridBagSizer, add_3_1, 3}}, - {1401, {wxGridBagSizer, add_4, 4}}, - {1402, {wxGridBagSizer, add_1_0, 1}}, - {1403, {wxGridBagSizer, add_2_1, 2}}, - {1404, {wxGridBagSizer, add_2_0, 2}}, - {1405, {wxGridBagSizer, add_3_0, 3}}, - {1406, {wxGridBagSizer, add_1_1, 1}}, - {1407, {wxGridBagSizer, calcMin, 0}}, - {1408, {wxGridBagSizer, checkForIntersection_2, 2}}, - {1409, {wxGridBagSizer, checkForIntersection_3, 3}}, - {1410, {wxGridBagSizer, findItem_1_1, 1}}, - {1411, {wxGridBagSizer, findItem_1_0, 1}}, - {1412, {wxGridBagSizer, findItemAtPoint, 1}}, - {1413, {wxGridBagSizer, findItemAtPosition, 1}}, - {1414, {wxGridBagSizer, findItemWithData, 1}}, - {1415, {wxGridBagSizer, getCellSize, 2}}, - {1416, {wxGridBagSizer, getEmptyCellSize, 0}}, - {1417, {wxGridBagSizer, getItemPosition_1_2, 1}}, - {1418, {wxGridBagSizer, getItemPosition_1_1, 1}}, - {1419, {wxGridBagSizer, getItemPosition_1_0, 1}}, - {1420, {wxGridBagSizer, getItemSpan_1_2, 1}}, - {1421, {wxGridBagSizer, getItemSpan_1_1, 1}}, - {1422, {wxGridBagSizer, getItemSpan_1_0, 1}}, - {1423, {wxGridBagSizer, setEmptyCellSize, 1}}, - {1424, {wxGridBagSizer, setItemPosition_2_2, 2}}, - {1425, {wxGridBagSizer, setItemPosition_2_1, 2}}, - {1426, {wxGridBagSizer, setItemPosition_2_0, 2}}, - {1427, {wxGridBagSizer, setItemSpan_2_2, 2}}, - {1428, {wxGridBagSizer, setItemSpan_2_1, 2}}, - {1429, {wxGridBagSizer, setItemSpan_2_0, 2}}, - {1430, {wxGridBagSizer, 'Destroy', undefined}}, - {1431, {wxStdDialogButtonSizer, new, 0}}, - {1432, {wxStdDialogButtonSizer, addButton, 1}}, - {1433, {wxStdDialogButtonSizer, realize, 0}}, - {1434, {wxStdDialogButtonSizer, setAffirmativeButton, 1}}, - {1435, {wxStdDialogButtonSizer, setCancelButton, 1}}, - {1436, {wxStdDialogButtonSizer, setNegativeButton, 1}}, - {1437, {wxStdDialogButtonSizer, 'Destroy', undefined}}, - {1438, {wxFont, new_0, 0}}, - {1439, {wxFont, new_1, 1}}, - {1440, {wxFont, new_5, 5}}, - {1442, {wxFont, destruct, 0}}, - {1443, {wxFont, isFixedWidth, 0}}, - {1444, {wxFont, getDefaultEncoding, 0}}, - {1445, {wxFont, getFaceName, 0}}, - {1446, {wxFont, getFamily, 0}}, - {1447, {wxFont, getNativeFontInfoDesc, 0}}, - {1448, {wxFont, getNativeFontInfoUserDesc, 0}}, - {1449, {wxFont, getPointSize, 0}}, - {1450, {wxFont, getStyle, 0}}, - {1451, {wxFont, getUnderlined, 0}}, - {1452, {wxFont, getWeight, 0}}, - {1453, {wxFont, ok, 0}}, - {1454, {wxFont, setDefaultEncoding, 1}}, - {1455, {wxFont, setFaceName, 1}}, - {1456, {wxFont, setFamily, 1}}, - {1457, {wxFont, setPointSize, 1}}, - {1458, {wxFont, setStyle, 1}}, - {1459, {wxFont, setUnderlined, 1}}, - {1460, {wxFont, setWeight, 1}}, - {1461, {wxToolTip, enable, 1}}, - {1462, {wxToolTip, setDelay, 1}}, - {1463, {wxToolTip, new, 1}}, - {1464, {wxToolTip, setTip, 1}}, - {1465, {wxToolTip, getTip, 0}}, - {1466, {wxToolTip, getWindow, 0}}, - {1467, {wxToolTip, 'Destroy', undefined}}, - {1469, {wxButton, new_3, 3}}, - {1470, {wxButton, new_0, 0}}, - {1471, {wxButton, destruct, 0}}, - {1472, {wxButton, create, 3}}, - {1473, {wxButton, getDefaultSize, 0}}, - {1474, {wxButton, setDefault, 0}}, - {1475, {wxButton, setLabel, 1}}, - {1477, {wxBitmapButton, new_4, 4}}, - {1478, {wxBitmapButton, new_0, 0}}, - {1479, {wxBitmapButton, create, 4}}, - {1480, {wxBitmapButton, getBitmapDisabled, 0}}, - {1482, {wxBitmapButton, getBitmapFocus, 0}}, - {1484, {wxBitmapButton, getBitmapLabel, 0}}, - {1486, {wxBitmapButton, getBitmapSelected, 0}}, - {1488, {wxBitmapButton, setBitmapDisabled, 1}}, - {1489, {wxBitmapButton, setBitmapFocus, 1}}, - {1490, {wxBitmapButton, setBitmapLabel, 1}}, - {1491, {wxBitmapButton, setBitmapSelected, 1}}, - {1492, {wxBitmapButton, 'Destroy', undefined}}, - {1493, {wxToggleButton, new_0, 0}}, - {1494, {wxToggleButton, new_4, 4}}, - {1495, {wxToggleButton, create, 4}}, - {1496, {wxToggleButton, getValue, 0}}, - {1497, {wxToggleButton, setValue, 1}}, - {1498, {wxToggleButton, 'Destroy', undefined}}, - {1499, {wxCalendarCtrl, new_0, 0}}, - {1500, {wxCalendarCtrl, new_3, 3}}, - {1501, {wxCalendarCtrl, create, 3}}, - {1502, {wxCalendarCtrl, destruct, 0}}, - {1503, {wxCalendarCtrl, setDate, 1}}, - {1504, {wxCalendarCtrl, getDate, 0}}, - {1505, {wxCalendarCtrl, enableYearChange, 1}}, - {1506, {wxCalendarCtrl, enableMonthChange, 1}}, - {1507, {wxCalendarCtrl, enableHolidayDisplay, 1}}, - {1508, {wxCalendarCtrl, setHeaderColours, 2}}, - {1509, {wxCalendarCtrl, getHeaderColourFg, 0}}, - {1510, {wxCalendarCtrl, getHeaderColourBg, 0}}, - {1511, {wxCalendarCtrl, setHighlightColours, 2}}, - {1512, {wxCalendarCtrl, getHighlightColourFg, 0}}, - {1513, {wxCalendarCtrl, getHighlightColourBg, 0}}, - {1514, {wxCalendarCtrl, setHolidayColours, 2}}, - {1515, {wxCalendarCtrl, getHolidayColourFg, 0}}, - {1516, {wxCalendarCtrl, getHolidayColourBg, 0}}, - {1517, {wxCalendarCtrl, getAttr, 1}}, - {1518, {wxCalendarCtrl, setAttr, 2}}, - {1519, {wxCalendarCtrl, setHoliday, 1}}, - {1520, {wxCalendarCtrl, resetAttr, 1}}, - {1521, {wxCalendarCtrl, hitTest, 2}}, - {1522, {wxCalendarDateAttr, new_0, 0}}, - {1523, {wxCalendarDateAttr, new_2_1, 2}}, - {1524, {wxCalendarDateAttr, new_2_0, 2}}, - {1525, {wxCalendarDateAttr, setTextColour, 1}}, - {1526, {wxCalendarDateAttr, setBackgroundColour, 1}}, - {1527, {wxCalendarDateAttr, setBorderColour, 1}}, - {1528, {wxCalendarDateAttr, setFont, 1}}, - {1529, {wxCalendarDateAttr, setBorder, 1}}, - {1530, {wxCalendarDateAttr, setHoliday, 1}}, - {1531, {wxCalendarDateAttr, hasTextColour, 0}}, - {1532, {wxCalendarDateAttr, hasBackgroundColour, 0}}, - {1533, {wxCalendarDateAttr, hasBorderColour, 0}}, - {1534, {wxCalendarDateAttr, hasFont, 0}}, - {1535, {wxCalendarDateAttr, hasBorder, 0}}, - {1536, {wxCalendarDateAttr, isHoliday, 0}}, - {1537, {wxCalendarDateAttr, getTextColour, 0}}, - {1538, {wxCalendarDateAttr, getBackgroundColour, 0}}, - {1539, {wxCalendarDateAttr, getBorderColour, 0}}, - {1540, {wxCalendarDateAttr, getFont, 0}}, - {1541, {wxCalendarDateAttr, getBorder, 0}}, - {1542, {wxCalendarDateAttr, 'Destroy', undefined}}, - {1544, {wxCheckBox, new_4, 4}}, - {1545, {wxCheckBox, new_0, 0}}, - {1546, {wxCheckBox, create, 4}}, - {1547, {wxCheckBox, getValue, 0}}, - {1548, {wxCheckBox, get3StateValue, 0}}, - {1549, {wxCheckBox, is3rdStateAllowedForUser, 0}}, - {1550, {wxCheckBox, is3State, 0}}, - {1551, {wxCheckBox, isChecked, 0}}, - {1552, {wxCheckBox, setValue, 1}}, - {1553, {wxCheckBox, set3StateValue, 1}}, - {1554, {wxCheckBox, 'Destroy', undefined}}, - {1555, {wxCheckListBox, new_0, 0}}, - {1557, {wxCheckListBox, new_3, 3}}, - {1558, {wxCheckListBox, check, 2}}, - {1559, {wxCheckListBox, isChecked, 1}}, - {1560, {wxCheckListBox, 'Destroy', undefined}}, - {1563, {wxChoice, new_3, 3}}, - {1564, {wxChoice, new_0, 0}}, - {1566, {wxChoice, destruct, 0}}, - {1568, {wxChoice, create, 6}}, - {1569, {wxChoice, delete, 1}}, - {1570, {wxChoice, getColumns, 0}}, - {1571, {wxChoice, setColumns, 1}}, - {1572, {wxComboBox, new_0, 0}}, - {1574, {wxComboBox, new_3, 3}}, - {1575, {wxComboBox, destruct, 0}}, - {1577, {wxComboBox, create, 7}}, - {1578, {wxComboBox, canCopy, 0}}, - {1579, {wxComboBox, canCut, 0}}, - {1580, {wxComboBox, canPaste, 0}}, - {1581, {wxComboBox, canRedo, 0}}, - {1582, {wxComboBox, canUndo, 0}}, - {1583, {wxComboBox, copy, 0}}, - {1584, {wxComboBox, cut, 0}}, - {1585, {wxComboBox, getInsertionPoint, 0}}, - {1586, {wxComboBox, getLastPosition, 0}}, - {1587, {wxComboBox, getValue, 0}}, - {1588, {wxComboBox, paste, 0}}, - {1589, {wxComboBox, redo, 0}}, - {1590, {wxComboBox, replace, 3}}, - {1591, {wxComboBox, remove, 2}}, - {1592, {wxComboBox, setInsertionPoint, 1}}, - {1593, {wxComboBox, setInsertionPointEnd, 0}}, - {1594, {wxComboBox, setSelection_1, 1}}, - {1595, {wxComboBox, setSelection_2, 2}}, - {1596, {wxComboBox, setValue, 1}}, - {1597, {wxComboBox, undo, 0}}, - {1598, {wxGauge, new_0, 0}}, - {1599, {wxGauge, new_4, 4}}, - {1600, {wxGauge, create, 4}}, - {1601, {wxGauge, getBezelFace, 0}}, - {1602, {wxGauge, getRange, 0}}, - {1603, {wxGauge, getShadowWidth, 0}}, - {1604, {wxGauge, getValue, 0}}, - {1605, {wxGauge, isVertical, 0}}, - {1606, {wxGauge, setBezelFace, 1}}, - {1607, {wxGauge, setRange, 1}}, - {1608, {wxGauge, setShadowWidth, 1}}, - {1609, {wxGauge, setValue, 1}}, - {1610, {wxGauge, pulse, 0}}, - {1611, {wxGauge, 'Destroy', undefined}}, - {1612, {wxGenericDirCtrl, new_0, 0}}, - {1613, {wxGenericDirCtrl, new_2, 2}}, - {1614, {wxGenericDirCtrl, destruct, 0}}, - {1615, {wxGenericDirCtrl, create, 2}}, - {1616, {wxGenericDirCtrl, init, 0}}, - {1617, {wxGenericDirCtrl, collapseTree, 0}}, - {1618, {wxGenericDirCtrl, expandPath, 1}}, - {1619, {wxGenericDirCtrl, getDefaultPath, 0}}, - {1620, {wxGenericDirCtrl, getPath, 0}}, - {1621, {wxGenericDirCtrl, getFilePath, 0}}, - {1622, {wxGenericDirCtrl, getFilter, 0}}, - {1623, {wxGenericDirCtrl, getFilterIndex, 0}}, - {1624, {wxGenericDirCtrl, getRootId, 0}}, - {1625, {wxGenericDirCtrl, getTreeCtrl, 0}}, - {1626, {wxGenericDirCtrl, reCreateTree, 0}}, - {1627, {wxGenericDirCtrl, setDefaultPath, 1}}, - {1628, {wxGenericDirCtrl, setFilter, 1}}, - {1629, {wxGenericDirCtrl, setFilterIndex, 1}}, - {1630, {wxGenericDirCtrl, setPath, 1}}, - {1632, {wxStaticBox, new_4, 4}}, - {1633, {wxStaticBox, new_0, 0}}, - {1634, {wxStaticBox, create, 4}}, - {1635, {wxStaticBox, 'Destroy', undefined}}, - {1637, {wxStaticLine, new_2, 2}}, - {1638, {wxStaticLine, new_0, 0}}, - {1639, {wxStaticLine, create, 2}}, - {1640, {wxStaticLine, isVertical, 0}}, - {1641, {wxStaticLine, getDefaultSize, 0}}, - {1642, {wxStaticLine, 'Destroy', undefined}}, - {1645, {wxListBox, new_3, 3}}, - {1646, {wxListBox, new_0, 0}}, - {1648, {wxListBox, destruct, 0}}, - {1650, {wxListBox, create, 6}}, - {1651, {wxListBox, deselect, 1}}, - {1652, {wxListBox, getSelections, 1}}, - {1653, {wxListBox, insertItems, 2}}, - {1654, {wxListBox, isSelected, 1}}, - {1655, {wxListBox, set, 1}}, - {1656, {wxListBox, hitTest, 1}}, - {1657, {wxListBox, setFirstItem_1_0, 1}}, - {1658, {wxListBox, setFirstItem_1_1, 1}}, - {1659, {wxListCtrl, new_0, 0}}, - {1660, {wxListCtrl, new_2, 2}}, - {1661, {wxListCtrl, arrange, 1}}, - {1662, {wxListCtrl, assignImageList, 2}}, - {1663, {wxListCtrl, clearAll, 0}}, - {1664, {wxListCtrl, create, 2}}, - {1665, {wxListCtrl, deleteAllItems, 0}}, - {1666, {wxListCtrl, deleteColumn, 1}}, - {1667, {wxListCtrl, deleteItem, 1}}, - {1668, {wxListCtrl, editLabel, 1}}, - {1669, {wxListCtrl, ensureVisible, 1}}, - {1670, {wxListCtrl, findItem_3_0, 3}}, - {1671, {wxListCtrl, findItem_3_1, 3}}, - {1672, {wxListCtrl, getColumn, 2}}, - {1673, {wxListCtrl, getColumnCount, 0}}, - {1674, {wxListCtrl, getColumnWidth, 1}}, - {1675, {wxListCtrl, getCountPerPage, 0}}, - {1676, {wxListCtrl, getEditControl, 0}}, - {1677, {wxListCtrl, getImageList, 1}}, - {1678, {wxListCtrl, getItem, 1}}, - {1679, {wxListCtrl, getItemBackgroundColour, 1}}, - {1680, {wxListCtrl, getItemCount, 0}}, - {1681, {wxListCtrl, getItemData, 1}}, - {1682, {wxListCtrl, getItemFont, 1}}, - {1683, {wxListCtrl, getItemPosition, 2}}, - {1684, {wxListCtrl, getItemRect, 3}}, - {1685, {wxListCtrl, getItemSpacing, 0}}, - {1686, {wxListCtrl, getItemState, 2}}, - {1687, {wxListCtrl, getItemText, 1}}, - {1688, {wxListCtrl, getItemTextColour, 1}}, - {1689, {wxListCtrl, getNextItem, 2}}, - {1690, {wxListCtrl, getSelectedItemCount, 0}}, - {1691, {wxListCtrl, getTextColour, 0}}, - {1692, {wxListCtrl, getTopItem, 0}}, - {1693, {wxListCtrl, getViewRect, 0}}, - {1694, {wxListCtrl, hitTest, 2}}, - {1695, {wxListCtrl, insertColumn_2, 2}}, - {1696, {wxListCtrl, insertColumn_3, 3}}, - {1697, {wxListCtrl, insertItem_1, 1}}, - {1698, {wxListCtrl, insertItem_2_1, 2}}, - {1699, {wxListCtrl, insertItem_2_0, 2}}, - {1700, {wxListCtrl, insertItem_3, 3}}, - {1701, {wxListCtrl, refreshItem, 1}}, - {1702, {wxListCtrl, refreshItems, 2}}, - {1703, {wxListCtrl, scrollList, 2}}, - {1704, {wxListCtrl, setBackgroundColour, 1}}, - {1705, {wxListCtrl, setColumn, 2}}, - {1706, {wxListCtrl, setColumnWidth, 2}}, - {1707, {wxListCtrl, setImageList, 2}}, - {1708, {wxListCtrl, setItem_1, 1}}, - {1709, {wxListCtrl, setItem_4, 4}}, - {1710, {wxListCtrl, setItemBackgroundColour, 2}}, - {1711, {wxListCtrl, setItemCount, 1}}, - {1712, {wxListCtrl, setItemData, 2}}, - {1713, {wxListCtrl, setItemFont, 2}}, - {1714, {wxListCtrl, setItemImage, 3}}, - {1715, {wxListCtrl, setItemColumnImage, 3}}, - {1716, {wxListCtrl, setItemPosition, 2}}, - {1717, {wxListCtrl, setItemState, 3}}, - {1718, {wxListCtrl, setItemText, 2}}, - {1719, {wxListCtrl, setItemTextColour, 2}}, - {1720, {wxListCtrl, setSingleStyle, 2}}, - {1721, {wxListCtrl, setTextColour, 1}}, - {1722, {wxListCtrl, setWindowStyleFlag, 1}}, - {1723, {wxListCtrl, sortItems, 2}}, - {1724, {wxListCtrl, 'Destroy', undefined}}, - {1725, {wxListView, clearColumnImage, 1}}, - {1726, {wxListView, focus, 1}}, - {1727, {wxListView, getFirstSelected, 0}}, - {1728, {wxListView, getFocusedItem, 0}}, - {1729, {wxListView, getNextSelected, 1}}, - {1730, {wxListView, isSelected, 1}}, - {1731, {wxListView, select, 2}}, - {1732, {wxListView, setColumnImage, 2}}, - {1733, {wxListItem, new_0, 0}}, - {1734, {wxListItem, new_1, 1}}, - {1735, {wxListItem, destruct, 0}}, - {1736, {wxListItem, clear, 0}}, - {1737, {wxListItem, getAlign, 0}}, - {1738, {wxListItem, getBackgroundColour, 0}}, - {1739, {wxListItem, getColumn, 0}}, - {1740, {wxListItem, getFont, 0}}, - {1741, {wxListItem, getId, 0}}, - {1742, {wxListItem, getImage, 0}}, - {1743, {wxListItem, getMask, 0}}, - {1744, {wxListItem, getState, 0}}, - {1745, {wxListItem, getText, 0}}, - {1746, {wxListItem, getTextColour, 0}}, - {1747, {wxListItem, getWidth, 0}}, - {1748, {wxListItem, setAlign, 1}}, - {1749, {wxListItem, setBackgroundColour, 1}}, - {1750, {wxListItem, setColumn, 1}}, - {1751, {wxListItem, setFont, 1}}, - {1752, {wxListItem, setId, 1}}, - {1753, {wxListItem, setImage, 1}}, - {1754, {wxListItem, setMask, 1}}, - {1755, {wxListItem, setState, 1}}, - {1756, {wxListItem, setStateMask, 1}}, - {1757, {wxListItem, setText, 1}}, - {1758, {wxListItem, setTextColour, 1}}, - {1759, {wxListItem, setWidth, 1}}, - {1760, {wxListItemAttr, new_0, 0}}, - {1761, {wxListItemAttr, new_3, 3}}, - {1762, {wxListItemAttr, getBackgroundColour, 0}}, - {1763, {wxListItemAttr, getFont, 0}}, - {1764, {wxListItemAttr, getTextColour, 0}}, - {1765, {wxListItemAttr, hasBackgroundColour, 0}}, - {1766, {wxListItemAttr, hasFont, 0}}, - {1767, {wxListItemAttr, hasTextColour, 0}}, - {1768, {wxListItemAttr, setBackgroundColour, 1}}, - {1769, {wxListItemAttr, setFont, 1}}, - {1770, {wxListItemAttr, setTextColour, 1}}, - {1771, {wxListItemAttr, 'Destroy', undefined}}, - {1772, {wxImageList, new_0, 0}}, - {1773, {wxImageList, new_3, 3}}, - {1774, {wxImageList, add_1, 1}}, - {1775, {wxImageList, add_2_0, 2}}, - {1776, {wxImageList, add_2_1, 2}}, - {1777, {wxImageList, create, 3}}, - {1779, {wxImageList, draw, 5}}, - {1780, {wxImageList, getBitmap, 1}}, - {1781, {wxImageList, getIcon, 1}}, - {1782, {wxImageList, getImageCount, 0}}, - {1783, {wxImageList, getSize, 3}}, - {1784, {wxImageList, remove, 1}}, - {1785, {wxImageList, removeAll, 0}}, - {1786, {wxImageList, replace_2, 2}}, - {1787, {wxImageList, replace_3, 3}}, - {1788, {wxImageList, 'Destroy', undefined}}, - {1789, {wxTextAttr, new_0, 0}}, - {1790, {wxTextAttr, new_2, 2}}, - {1791, {wxTextAttr, getAlignment, 0}}, - {1792, {wxTextAttr, getBackgroundColour, 0}}, - {1793, {wxTextAttr, getFont, 0}}, - {1794, {wxTextAttr, getLeftIndent, 0}}, - {1795, {wxTextAttr, getLeftSubIndent, 0}}, - {1796, {wxTextAttr, getRightIndent, 0}}, - {1797, {wxTextAttr, getTabs, 0}}, - {1798, {wxTextAttr, getTextColour, 0}}, - {1799, {wxTextAttr, hasBackgroundColour, 0}}, - {1800, {wxTextAttr, hasFont, 0}}, - {1801, {wxTextAttr, hasTextColour, 0}}, - {1802, {wxTextAttr, getFlags, 0}}, - {1803, {wxTextAttr, isDefault, 0}}, - {1804, {wxTextAttr, setAlignment, 1}}, - {1805, {wxTextAttr, setBackgroundColour, 1}}, - {1806, {wxTextAttr, setFlags, 1}}, - {1807, {wxTextAttr, setFont, 2}}, - {1808, {wxTextAttr, setLeftIndent, 2}}, - {1809, {wxTextAttr, setRightIndent, 1}}, - {1810, {wxTextAttr, setTabs, 1}}, - {1811, {wxTextAttr, setTextColour, 1}}, - {1812, {wxTextAttr, 'Destroy', undefined}}, - {1814, {wxTextCtrl, new_3, 3}}, - {1815, {wxTextCtrl, new_0, 0}}, - {1817, {wxTextCtrl, destruct, 0}}, - {1818, {wxTextCtrl, appendText, 1}}, - {1819, {wxTextCtrl, canCopy, 0}}, - {1820, {wxTextCtrl, canCut, 0}}, - {1821, {wxTextCtrl, canPaste, 0}}, - {1822, {wxTextCtrl, canRedo, 0}}, - {1823, {wxTextCtrl, canUndo, 0}}, - {1824, {wxTextCtrl, clear, 0}}, - {1825, {wxTextCtrl, copy, 0}}, - {1826, {wxTextCtrl, create, 3}}, - {1827, {wxTextCtrl, cut, 0}}, - {1828, {wxTextCtrl, discardEdits, 0}}, - {1829, {wxTextCtrl, changeValue, 1}}, - {1830, {wxTextCtrl, emulateKeyPress, 1}}, - {1831, {wxTextCtrl, getDefaultStyle, 0}}, - {1832, {wxTextCtrl, getInsertionPoint, 0}}, - {1833, {wxTextCtrl, getLastPosition, 0}}, - {1834, {wxTextCtrl, getLineLength, 1}}, - {1835, {wxTextCtrl, getLineText, 1}}, - {1836, {wxTextCtrl, getNumberOfLines, 0}}, - {1837, {wxTextCtrl, getRange, 2}}, - {1838, {wxTextCtrl, getSelection, 2}}, - {1839, {wxTextCtrl, getStringSelection, 0}}, - {1840, {wxTextCtrl, getStyle, 2}}, - {1841, {wxTextCtrl, getValue, 0}}, - {1842, {wxTextCtrl, isEditable, 0}}, - {1843, {wxTextCtrl, isModified, 0}}, - {1844, {wxTextCtrl, isMultiLine, 0}}, - {1845, {wxTextCtrl, isSingleLine, 0}}, - {1846, {wxTextCtrl, loadFile, 2}}, - {1847, {wxTextCtrl, markDirty, 0}}, - {1848, {wxTextCtrl, paste, 0}}, - {1849, {wxTextCtrl, positionToXY, 3}}, - {1850, {wxTextCtrl, redo, 0}}, - {1851, {wxTextCtrl, remove, 2}}, - {1852, {wxTextCtrl, replace, 3}}, - {1853, {wxTextCtrl, saveFile, 1}}, - {1854, {wxTextCtrl, setDefaultStyle, 1}}, - {1855, {wxTextCtrl, setEditable, 1}}, - {1856, {wxTextCtrl, setInsertionPoint, 1}}, - {1857, {wxTextCtrl, setInsertionPointEnd, 0}}, - {1859, {wxTextCtrl, setMaxLength, 1}}, - {1860, {wxTextCtrl, setSelection, 2}}, - {1861, {wxTextCtrl, setStyle, 3}}, - {1862, {wxTextCtrl, setValue, 1}}, - {1863, {wxTextCtrl, showPosition, 1}}, - {1864, {wxTextCtrl, undo, 0}}, - {1865, {wxTextCtrl, writeText, 1}}, - {1866, {wxTextCtrl, xYToPosition, 2}}, - {1869, {wxNotebook, new_0, 0}}, - {1870, {wxNotebook, new_3, 3}}, - {1871, {wxNotebook, destruct, 0}}, - {1872, {wxNotebook, addPage, 3}}, - {1873, {wxNotebook, advanceSelection, 1}}, - {1874, {wxNotebook, assignImageList, 1}}, - {1875, {wxNotebook, create, 3}}, - {1876, {wxNotebook, deleteAllPages, 0}}, - {1877, {wxNotebook, deletePage, 1}}, - {1878, {wxNotebook, removePage, 1}}, - {1879, {wxNotebook, getCurrentPage, 0}}, - {1880, {wxNotebook, getImageList, 0}}, - {1882, {wxNotebook, getPage, 1}}, - {1883, {wxNotebook, getPageCount, 0}}, - {1884, {wxNotebook, getPageImage, 1}}, - {1885, {wxNotebook, getPageText, 1}}, - {1886, {wxNotebook, getRowCount, 0}}, - {1887, {wxNotebook, getSelection, 0}}, - {1888, {wxNotebook, getThemeBackgroundColour, 0}}, - {1890, {wxNotebook, hitTest, 2}}, - {1892, {wxNotebook, insertPage, 4}}, - {1893, {wxNotebook, setImageList, 1}}, - {1894, {wxNotebook, setPadding, 1}}, - {1895, {wxNotebook, setPageSize, 1}}, - {1896, {wxNotebook, setPageImage, 2}}, - {1897, {wxNotebook, setPageText, 2}}, - {1898, {wxNotebook, setSelection, 1}}, - {1899, {wxNotebook, changeSelection, 1}}, - {1900, {wxChoicebook, new_0, 0}}, - {1901, {wxChoicebook, new_3, 3}}, - {1902, {wxChoicebook, addPage, 3}}, - {1903, {wxChoicebook, advanceSelection, 1}}, - {1904, {wxChoicebook, assignImageList, 1}}, - {1905, {wxChoicebook, create, 3}}, - {1906, {wxChoicebook, deleteAllPages, 0}}, - {1907, {wxChoicebook, deletePage, 1}}, - {1908, {wxChoicebook, removePage, 1}}, - {1909, {wxChoicebook, getCurrentPage, 0}}, - {1910, {wxChoicebook, getImageList, 0}}, - {1912, {wxChoicebook, getPage, 1}}, - {1913, {wxChoicebook, getPageCount, 0}}, - {1914, {wxChoicebook, getPageImage, 1}}, - {1915, {wxChoicebook, getPageText, 1}}, - {1916, {wxChoicebook, getSelection, 0}}, - {1917, {wxChoicebook, hitTest, 2}}, - {1918, {wxChoicebook, insertPage, 4}}, - {1919, {wxChoicebook, setImageList, 1}}, - {1920, {wxChoicebook, setPageSize, 1}}, - {1921, {wxChoicebook, setPageImage, 2}}, - {1922, {wxChoicebook, setPageText, 2}}, - {1923, {wxChoicebook, setSelection, 1}}, - {1924, {wxChoicebook, changeSelection, 1}}, - {1925, {wxChoicebook, 'Destroy', undefined}}, - {1926, {wxToolbook, new_0, 0}}, - {1927, {wxToolbook, new_3, 3}}, - {1928, {wxToolbook, addPage, 3}}, - {1929, {wxToolbook, advanceSelection, 1}}, - {1930, {wxToolbook, assignImageList, 1}}, - {1931, {wxToolbook, create, 3}}, - {1932, {wxToolbook, deleteAllPages, 0}}, - {1933, {wxToolbook, deletePage, 1}}, - {1934, {wxToolbook, removePage, 1}}, - {1935, {wxToolbook, getCurrentPage, 0}}, - {1936, {wxToolbook, getImageList, 0}}, - {1938, {wxToolbook, getPage, 1}}, - {1939, {wxToolbook, getPageCount, 0}}, - {1940, {wxToolbook, getPageImage, 1}}, - {1941, {wxToolbook, getPageText, 1}}, - {1942, {wxToolbook, getSelection, 0}}, - {1944, {wxToolbook, hitTest, 2}}, - {1945, {wxToolbook, insertPage, 4}}, - {1946, {wxToolbook, setImageList, 1}}, - {1947, {wxToolbook, setPageSize, 1}}, - {1948, {wxToolbook, setPageImage, 2}}, - {1949, {wxToolbook, setPageText, 2}}, - {1950, {wxToolbook, setSelection, 1}}, - {1951, {wxToolbook, changeSelection, 1}}, - {1952, {wxToolbook, 'Destroy', undefined}}, - {1953, {wxListbook, new_0, 0}}, - {1954, {wxListbook, new_3, 3}}, - {1955, {wxListbook, addPage, 3}}, - {1956, {wxListbook, advanceSelection, 1}}, - {1957, {wxListbook, assignImageList, 1}}, - {1958, {wxListbook, create, 3}}, - {1959, {wxListbook, deleteAllPages, 0}}, - {1960, {wxListbook, deletePage, 1}}, - {1961, {wxListbook, removePage, 1}}, - {1962, {wxListbook, getCurrentPage, 0}}, - {1963, {wxListbook, getImageList, 0}}, - {1965, {wxListbook, getPage, 1}}, - {1966, {wxListbook, getPageCount, 0}}, - {1967, {wxListbook, getPageImage, 1}}, - {1968, {wxListbook, getPageText, 1}}, - {1969, {wxListbook, getSelection, 0}}, - {1971, {wxListbook, hitTest, 2}}, - {1972, {wxListbook, insertPage, 4}}, - {1973, {wxListbook, setImageList, 1}}, - {1974, {wxListbook, setPageSize, 1}}, - {1975, {wxListbook, setPageImage, 2}}, - {1976, {wxListbook, setPageText, 2}}, - {1977, {wxListbook, setSelection, 1}}, - {1978, {wxListbook, changeSelection, 1}}, - {1979, {wxListbook, 'Destroy', undefined}}, - {1980, {wxTreebook, new_0, 0}}, - {1981, {wxTreebook, new_3, 3}}, - {1982, {wxTreebook, addPage, 3}}, - {1983, {wxTreebook, advanceSelection, 1}}, - {1984, {wxTreebook, assignImageList, 1}}, - {1985, {wxTreebook, create, 3}}, - {1986, {wxTreebook, deleteAllPages, 0}}, - {1987, {wxTreebook, deletePage, 1}}, - {1988, {wxTreebook, removePage, 1}}, - {1989, {wxTreebook, getCurrentPage, 0}}, - {1990, {wxTreebook, getImageList, 0}}, - {1992, {wxTreebook, getPage, 1}}, - {1993, {wxTreebook, getPageCount, 0}}, - {1994, {wxTreebook, getPageImage, 1}}, - {1995, {wxTreebook, getPageText, 1}}, - {1996, {wxTreebook, getSelection, 0}}, - {1997, {wxTreebook, expandNode, 2}}, - {1998, {wxTreebook, isNodeExpanded, 1}}, - {2000, {wxTreebook, hitTest, 2}}, - {2001, {wxTreebook, insertPage, 4}}, - {2002, {wxTreebook, insertSubPage, 4}}, - {2003, {wxTreebook, setImageList, 1}}, - {2004, {wxTreebook, setPageSize, 1}}, - {2005, {wxTreebook, setPageImage, 2}}, - {2006, {wxTreebook, setPageText, 2}}, - {2007, {wxTreebook, setSelection, 1}}, - {2008, {wxTreebook, changeSelection, 1}}, - {2009, {wxTreebook, 'Destroy', undefined}}, - {2012, {wxTreeCtrl, new_2, 2}}, - {2013, {wxTreeCtrl, new_0, 0}}, - {2015, {wxTreeCtrl, destruct, 0}}, - {2016, {wxTreeCtrl, addRoot, 2}}, - {2017, {wxTreeCtrl, appendItem, 3}}, - {2018, {wxTreeCtrl, assignImageList, 1}}, - {2019, {wxTreeCtrl, assignStateImageList, 1}}, - {2020, {wxTreeCtrl, collapse, 1}}, - {2021, {wxTreeCtrl, collapseAndReset, 1}}, - {2022, {wxTreeCtrl, create, 2}}, - {2023, {wxTreeCtrl, delete, 1}}, - {2024, {wxTreeCtrl, deleteAllItems, 0}}, - {2025, {wxTreeCtrl, deleteChildren, 1}}, - {2026, {wxTreeCtrl, editLabel, 1}}, - {2027, {wxTreeCtrl, ensureVisible, 1}}, - {2028, {wxTreeCtrl, expand, 1}}, - {2029, {wxTreeCtrl, getBoundingRect, 3}}, - {2031, {wxTreeCtrl, getChildrenCount, 2}}, - {2032, {wxTreeCtrl, getCount, 0}}, - {2033, {wxTreeCtrl, getEditControl, 0}}, - {2034, {wxTreeCtrl, getFirstChild, 2}}, - {2035, {wxTreeCtrl, getNextChild, 2}}, - {2036, {wxTreeCtrl, getFirstVisibleItem, 0}}, - {2037, {wxTreeCtrl, getImageList, 0}}, - {2038, {wxTreeCtrl, getIndent, 0}}, - {2039, {wxTreeCtrl, getItemBackgroundColour, 1}}, - {2040, {wxTreeCtrl, getItemData, 1}}, - {2041, {wxTreeCtrl, getItemFont, 1}}, - {2042, {wxTreeCtrl, getItemImage_1, 1}}, - {2043, {wxTreeCtrl, getItemImage_2, 2}}, - {2044, {wxTreeCtrl, getItemText, 1}}, - {2045, {wxTreeCtrl, getItemTextColour, 1}}, - {2046, {wxTreeCtrl, getLastChild, 1}}, - {2047, {wxTreeCtrl, getNextSibling, 1}}, - {2048, {wxTreeCtrl, getNextVisible, 1}}, - {2049, {wxTreeCtrl, getItemParent, 1}}, - {2050, {wxTreeCtrl, getPrevSibling, 1}}, - {2051, {wxTreeCtrl, getPrevVisible, 1}}, - {2052, {wxTreeCtrl, getRootItem, 0}}, - {2053, {wxTreeCtrl, getSelection, 0}}, - {2054, {wxTreeCtrl, getSelections, 1}}, - {2055, {wxTreeCtrl, getStateImageList, 0}}, - {2056, {wxTreeCtrl, hitTest, 2}}, - {2058, {wxTreeCtrl, insertItem, 4}}, - {2059, {wxTreeCtrl, isBold, 1}}, - {2060, {wxTreeCtrl, isExpanded, 1}}, - {2061, {wxTreeCtrl, isSelected, 1}}, - {2062, {wxTreeCtrl, isVisible, 1}}, - {2063, {wxTreeCtrl, itemHasChildren, 1}}, - {2064, {wxTreeCtrl, isTreeItemIdOk, 1}}, - {2065, {wxTreeCtrl, prependItem, 3}}, - {2066, {wxTreeCtrl, scrollTo, 1}}, - {2067, {wxTreeCtrl, selectItem_1, 1}}, - {2068, {wxTreeCtrl, selectItem_2, 2}}, - {2069, {wxTreeCtrl, setIndent, 1}}, - {2070, {wxTreeCtrl, setImageList, 1}}, - {2071, {wxTreeCtrl, setItemBackgroundColour, 2}}, - {2072, {wxTreeCtrl, setItemBold, 2}}, - {2073, {wxTreeCtrl, setItemData, 2}}, - {2074, {wxTreeCtrl, setItemDropHighlight, 2}}, - {2075, {wxTreeCtrl, setItemFont, 2}}, - {2076, {wxTreeCtrl, setItemHasChildren, 2}}, - {2077, {wxTreeCtrl, setItemImage_2, 2}}, - {2078, {wxTreeCtrl, setItemImage_3, 3}}, - {2079, {wxTreeCtrl, setItemText, 2}}, - {2080, {wxTreeCtrl, setItemTextColour, 2}}, - {2081, {wxTreeCtrl, setStateImageList, 1}}, - {2082, {wxTreeCtrl, setWindowStyle, 1}}, - {2083, {wxTreeCtrl, sortChildren, 1}}, - {2084, {wxTreeCtrl, toggle, 1}}, - {2085, {wxTreeCtrl, toggleItemSelection, 1}}, - {2086, {wxTreeCtrl, unselect, 0}}, - {2087, {wxTreeCtrl, unselectAll, 0}}, - {2088, {wxTreeCtrl, unselectItem, 1}}, - {2089, {wxScrollBar, new_0, 0}}, - {2090, {wxScrollBar, new_3, 3}}, - {2091, {wxScrollBar, destruct, 0}}, - {2092, {wxScrollBar, create, 3}}, - {2093, {wxScrollBar, getRange, 0}}, - {2094, {wxScrollBar, getPageSize, 0}}, - {2095, {wxScrollBar, getThumbPosition, 0}}, - {2096, {wxScrollBar, getThumbSize, 0}}, - {2097, {wxScrollBar, setThumbPosition, 1}}, - {2098, {wxScrollBar, setScrollbar, 5}}, - {2100, {wxSpinButton, new_2, 2}}, - {2101, {wxSpinButton, new_0, 0}}, - {2102, {wxSpinButton, create, 2}}, - {2103, {wxSpinButton, getMax, 0}}, - {2104, {wxSpinButton, getMin, 0}}, - {2105, {wxSpinButton, getValue, 0}}, - {2106, {wxSpinButton, setRange, 2}}, - {2107, {wxSpinButton, setValue, 1}}, - {2108, {wxSpinButton, 'Destroy', undefined}}, - {2109, {wxSpinCtrl, new_0, 0}}, - {2110, {wxSpinCtrl, new_2, 2}}, - {2112, {wxSpinCtrl, create, 2}}, - {2115, {wxSpinCtrl, setValue_1_1, 1}}, - {2116, {wxSpinCtrl, setValue_1_0, 1}}, - {2118, {wxSpinCtrl, getValue, 0}}, - {2120, {wxSpinCtrl, setRange, 2}}, - {2121, {wxSpinCtrl, setSelection, 2}}, - {2123, {wxSpinCtrl, getMin, 0}}, - {2125, {wxSpinCtrl, getMax, 0}}, - {2126, {wxSpinCtrl, 'Destroy', undefined}}, - {2127, {wxStaticText, new_0, 0}}, - {2128, {wxStaticText, new_4, 4}}, - {2129, {wxStaticText, create, 4}}, - {2130, {wxStaticText, getLabel, 0}}, - {2131, {wxStaticText, setLabel, 1}}, - {2132, {wxStaticText, wrap, 1}}, - {2133, {wxStaticText, 'Destroy', undefined}}, - {2134, {wxStaticBitmap, new_0, 0}}, - {2135, {wxStaticBitmap, new_4, 4}}, - {2136, {wxStaticBitmap, create, 4}}, - {2137, {wxStaticBitmap, getBitmap, 0}}, - {2138, {wxStaticBitmap, setBitmap, 1}}, - {2139, {wxStaticBitmap, 'Destroy', undefined}}, - {2140, {wxRadioBox, new, 7}}, - {2142, {wxRadioBox, destruct, 0}}, - {2143, {wxRadioBox, create, 7}}, - {2144, {wxRadioBox, enable_2, 2}}, - {2145, {wxRadioBox, enable_1, 1}}, - {2146, {wxRadioBox, getSelection, 0}}, - {2147, {wxRadioBox, getString, 1}}, - {2148, {wxRadioBox, setSelection, 1}}, - {2149, {wxRadioBox, show_2, 2}}, - {2150, {wxRadioBox, show_1, 1}}, - {2151, {wxRadioBox, getColumnCount, 0}}, - {2152, {wxRadioBox, getItemHelpText, 1}}, - {2153, {wxRadioBox, getItemToolTip, 1}}, - {2155, {wxRadioBox, getItemFromPoint, 1}}, - {2156, {wxRadioBox, getRowCount, 0}}, - {2157, {wxRadioBox, isItemEnabled, 1}}, - {2158, {wxRadioBox, isItemShown, 1}}, - {2159, {wxRadioBox, setItemHelpText, 2}}, - {2160, {wxRadioBox, setItemToolTip, 2}}, - {2161, {wxRadioButton, new_0, 0}}, - {2162, {wxRadioButton, new_4, 4}}, - {2163, {wxRadioButton, create, 4}}, - {2164, {wxRadioButton, getValue, 0}}, - {2165, {wxRadioButton, setValue, 1}}, - {2166, {wxRadioButton, 'Destroy', undefined}}, - {2168, {wxSlider, new_6, 6}}, - {2169, {wxSlider, new_0, 0}}, - {2170, {wxSlider, create, 6}}, - {2171, {wxSlider, getLineSize, 0}}, - {2172, {wxSlider, getMax, 0}}, - {2173, {wxSlider, getMin, 0}}, - {2174, {wxSlider, getPageSize, 0}}, - {2175, {wxSlider, getThumbLength, 0}}, - {2176, {wxSlider, getValue, 0}}, - {2177, {wxSlider, setLineSize, 1}}, - {2178, {wxSlider, setPageSize, 1}}, - {2179, {wxSlider, setRange, 2}}, - {2180, {wxSlider, setThumbLength, 1}}, - {2181, {wxSlider, setValue, 1}}, - {2182, {wxSlider, 'Destroy', undefined}}, - {2184, {wxDialog, new_4, 4}}, - {2185, {wxDialog, new_0, 0}}, - {2187, {wxDialog, destruct, 0}}, - {2188, {wxDialog, create, 4}}, - {2189, {wxDialog, createButtonSizer, 1}}, - {2190, {wxDialog, createStdDialogButtonSizer, 1}}, - {2191, {wxDialog, endModal, 1}}, - {2192, {wxDialog, getAffirmativeId, 0}}, - {2193, {wxDialog, getReturnCode, 0}}, - {2194, {wxDialog, isModal, 0}}, - {2195, {wxDialog, setAffirmativeId, 1}}, - {2196, {wxDialog, setReturnCode, 1}}, - {2197, {wxDialog, show, 1}}, - {2198, {wxDialog, showModal, 0}}, - {2199, {wxColourDialog, new_0, 0}}, - {2200, {wxColourDialog, new_2, 2}}, - {2201, {wxColourDialog, destruct, 0}}, - {2202, {wxColourDialog, create, 2}}, - {2203, {wxColourDialog, getColourData, 0}}, - {2204, {wxColourData, new_0, 0}}, - {2205, {wxColourData, new_1, 1}}, - {2206, {wxColourData, destruct, 0}}, - {2207, {wxColourData, getChooseFull, 0}}, - {2208, {wxColourData, getColour, 0}}, - {2210, {wxColourData, getCustomColour, 1}}, - {2211, {wxColourData, setChooseFull, 1}}, - {2212, {wxColourData, setColour, 1}}, - {2213, {wxColourData, setCustomColour, 2}}, - {2214, {wxPalette, new_0, 0}}, - {2215, {wxPalette, new_4, 4}}, - {2217, {wxPalette, destruct, 0}}, - {2218, {wxPalette, create, 4}}, - {2219, {wxPalette, getColoursCount, 0}}, - {2220, {wxPalette, getPixel, 3}}, - {2221, {wxPalette, getRGB, 4}}, - {2222, {wxPalette, isOk, 0}}, - {2226, {wxDirDialog, new, 2}}, - {2227, {wxDirDialog, destruct, 0}}, - {2228, {wxDirDialog, getPath, 0}}, - {2229, {wxDirDialog, getMessage, 0}}, - {2230, {wxDirDialog, setMessage, 1}}, - {2231, {wxDirDialog, setPath, 1}}, - {2235, {wxFileDialog, new, 2}}, - {2236, {wxFileDialog, destruct, 0}}, - {2237, {wxFileDialog, getDirectory, 0}}, - {2238, {wxFileDialog, getFilename, 0}}, - {2239, {wxFileDialog, getFilenames, 1}}, - {2240, {wxFileDialog, getFilterIndex, 0}}, - {2241, {wxFileDialog, getMessage, 0}}, - {2242, {wxFileDialog, getPath, 0}}, - {2243, {wxFileDialog, getPaths, 1}}, - {2244, {wxFileDialog, getWildcard, 0}}, - {2245, {wxFileDialog, setDirectory, 1}}, - {2246, {wxFileDialog, setFilename, 1}}, - {2247, {wxFileDialog, setFilterIndex, 1}}, - {2248, {wxFileDialog, setMessage, 1}}, - {2249, {wxFileDialog, setPath, 1}}, - {2250, {wxFileDialog, setWildcard, 1}}, - {2251, {wxPickerBase, setInternalMargin, 1}}, - {2252, {wxPickerBase, getInternalMargin, 0}}, - {2253, {wxPickerBase, setTextCtrlProportion, 1}}, - {2254, {wxPickerBase, setPickerCtrlProportion, 1}}, - {2255, {wxPickerBase, getTextCtrlProportion, 0}}, - {2256, {wxPickerBase, getPickerCtrlProportion, 0}}, - {2257, {wxPickerBase, hasTextCtrl, 0}}, - {2258, {wxPickerBase, getTextCtrl, 0}}, - {2259, {wxPickerBase, isTextCtrlGrowable, 0}}, - {2260, {wxPickerBase, setPickerCtrlGrowable, 1}}, - {2261, {wxPickerBase, setTextCtrlGrowable, 1}}, - {2262, {wxPickerBase, isPickerCtrlGrowable, 0}}, - {2263, {wxFilePickerCtrl, new_0, 0}}, - {2264, {wxFilePickerCtrl, new_3, 3}}, - {2265, {wxFilePickerCtrl, create, 3}}, - {2266, {wxFilePickerCtrl, getPath, 0}}, - {2267, {wxFilePickerCtrl, setPath, 1}}, - {2268, {wxFilePickerCtrl, 'Destroy', undefined}}, - {2269, {wxDirPickerCtrl, new_0, 0}}, - {2270, {wxDirPickerCtrl, new_3, 3}}, - {2271, {wxDirPickerCtrl, create, 3}}, - {2272, {wxDirPickerCtrl, getPath, 0}}, - {2273, {wxDirPickerCtrl, setPath, 1}}, - {2274, {wxDirPickerCtrl, 'Destroy', undefined}}, - {2275, {wxColourPickerCtrl, new_0, 0}}, - {2276, {wxColourPickerCtrl, new_3, 3}}, - {2277, {wxColourPickerCtrl, create, 3}}, - {2278, {wxColourPickerCtrl, getColour, 0}}, - {2279, {wxColourPickerCtrl, setColour_1_1, 1}}, - {2280, {wxColourPickerCtrl, setColour_1_0, 1}}, - {2281, {wxColourPickerCtrl, 'Destroy', undefined}}, - {2282, {wxDatePickerCtrl, new_0, 0}}, - {2283, {wxDatePickerCtrl, new_3, 3}}, - {2284, {wxDatePickerCtrl, getRange, 2}}, - {2285, {wxDatePickerCtrl, getValue, 0}}, - {2286, {wxDatePickerCtrl, setRange, 2}}, - {2287, {wxDatePickerCtrl, setValue, 1}}, - {2288, {wxDatePickerCtrl, 'Destroy', undefined}}, - {2289, {wxFontPickerCtrl, new_0, 0}}, - {2290, {wxFontPickerCtrl, new_3, 3}}, - {2291, {wxFontPickerCtrl, create, 3}}, - {2292, {wxFontPickerCtrl, getSelectedFont, 0}}, - {2293, {wxFontPickerCtrl, setSelectedFont, 1}}, - {2294, {wxFontPickerCtrl, getMaxPointSize, 0}}, - {2295, {wxFontPickerCtrl, setMaxPointSize, 1}}, - {2296, {wxFontPickerCtrl, 'Destroy', undefined}}, - {2299, {wxFindReplaceDialog, new_0, 0}}, - {2300, {wxFindReplaceDialog, new_4, 4}}, - {2301, {wxFindReplaceDialog, destruct, 0}}, - {2302, {wxFindReplaceDialog, create, 4}}, - {2303, {wxFindReplaceDialog, getData, 0}}, - {2304, {wxFindReplaceData, new_0, 0}}, - {2305, {wxFindReplaceData, new_1, 1}}, - {2306, {wxFindReplaceData, getFindString, 0}}, - {2307, {wxFindReplaceData, getReplaceString, 0}}, - {2308, {wxFindReplaceData, getFlags, 0}}, - {2309, {wxFindReplaceData, setFlags, 1}}, - {2310, {wxFindReplaceData, setFindString, 1}}, - {2311, {wxFindReplaceData, setReplaceString, 1}}, - {2312, {wxFindReplaceData, 'Destroy', undefined}}, - {2313, {wxMultiChoiceDialog, new_0, 0}}, - {2315, {wxMultiChoiceDialog, new_5, 5}}, - {2316, {wxMultiChoiceDialog, getSelections, 0}}, - {2317, {wxMultiChoiceDialog, setSelections, 1}}, - {2318, {wxMultiChoiceDialog, 'Destroy', undefined}}, - {2319, {wxSingleChoiceDialog, new_0, 0}}, - {2321, {wxSingleChoiceDialog, new_5, 5}}, - {2322, {wxSingleChoiceDialog, getSelection, 0}}, - {2323, {wxSingleChoiceDialog, getStringSelection, 0}}, - {2324, {wxSingleChoiceDialog, setSelection, 1}}, - {2325, {wxSingleChoiceDialog, 'Destroy', undefined}}, - {2326, {wxTextEntryDialog, new, 3}}, - {2327, {wxTextEntryDialog, getValue, 0}}, - {2328, {wxTextEntryDialog, setValue, 1}}, - {2329, {wxTextEntryDialog, 'Destroy', undefined}}, - {2330, {wxPasswordEntryDialog, new, 3}}, - {2331, {wxPasswordEntryDialog, 'Destroy', undefined}}, - {2332, {wxFontData, new_0, 0}}, - {2333, {wxFontData, new_1, 1}}, - {2334, {wxFontData, destruct, 0}}, - {2335, {wxFontData, enableEffects, 1}}, - {2336, {wxFontData, getAllowSymbols, 0}}, - {2337, {wxFontData, getColour, 0}}, - {2338, {wxFontData, getChosenFont, 0}}, - {2339, {wxFontData, getEnableEffects, 0}}, - {2340, {wxFontData, getInitialFont, 0}}, - {2341, {wxFontData, getShowHelp, 0}}, - {2342, {wxFontData, setAllowSymbols, 1}}, - {2343, {wxFontData, setChosenFont, 1}}, - {2344, {wxFontData, setColour, 1}}, - {2345, {wxFontData, setInitialFont, 1}}, - {2346, {wxFontData, setRange, 2}}, - {2347, {wxFontData, setShowHelp, 1}}, - {2351, {wxFontDialog, new_0, 0}}, - {2353, {wxFontDialog, new_2, 2}}, - {2355, {wxFontDialog, create, 2}}, - {2356, {wxFontDialog, getFontData, 0}}, - {2358, {wxFontDialog, 'Destroy', undefined}}, - {2359, {wxProgressDialog, new, 3}}, - {2360, {wxProgressDialog, destruct, 0}}, - {2361, {wxProgressDialog, resume, 0}}, - {2362, {wxProgressDialog, update_2, 2}}, - {2363, {wxProgressDialog, update_0, 0}}, - {2364, {wxMessageDialog, new, 3}}, - {2365, {wxMessageDialog, destruct, 0}}, - {2366, {wxPageSetupDialog, new, 2}}, - {2367, {wxPageSetupDialog, destruct, 0}}, - {2368, {wxPageSetupDialog, getPageSetupData, 0}}, - {2369, {wxPageSetupDialog, showModal, 0}}, - {2370, {wxPageSetupDialogData, new_0, 0}}, - {2371, {wxPageSetupDialogData, new_1_0, 1}}, - {2372, {wxPageSetupDialogData, new_1_1, 1}}, - {2373, {wxPageSetupDialogData, destruct, 0}}, - {2374, {wxPageSetupDialogData, enableHelp, 1}}, - {2375, {wxPageSetupDialogData, enableMargins, 1}}, - {2376, {wxPageSetupDialogData, enableOrientation, 1}}, - {2377, {wxPageSetupDialogData, enablePaper, 1}}, - {2378, {wxPageSetupDialogData, enablePrinter, 1}}, - {2379, {wxPageSetupDialogData, getDefaultMinMargins, 0}}, - {2380, {wxPageSetupDialogData, getEnableMargins, 0}}, - {2381, {wxPageSetupDialogData, getEnableOrientation, 0}}, - {2382, {wxPageSetupDialogData, getEnablePaper, 0}}, - {2383, {wxPageSetupDialogData, getEnablePrinter, 0}}, - {2384, {wxPageSetupDialogData, getEnableHelp, 0}}, - {2385, {wxPageSetupDialogData, getDefaultInfo, 0}}, - {2386, {wxPageSetupDialogData, getMarginTopLeft, 0}}, - {2387, {wxPageSetupDialogData, getMarginBottomRight, 0}}, - {2388, {wxPageSetupDialogData, getMinMarginTopLeft, 0}}, - {2389, {wxPageSetupDialogData, getMinMarginBottomRight, 0}}, - {2390, {wxPageSetupDialogData, getPaperId, 0}}, - {2391, {wxPageSetupDialogData, getPaperSize, 0}}, - {2393, {wxPageSetupDialogData, getPrintData, 0}}, - {2394, {wxPageSetupDialogData, isOk, 0}}, - {2395, {wxPageSetupDialogData, setDefaultInfo, 1}}, - {2396, {wxPageSetupDialogData, setDefaultMinMargins, 1}}, - {2397, {wxPageSetupDialogData, setMarginTopLeft, 1}}, - {2398, {wxPageSetupDialogData, setMarginBottomRight, 1}}, - {2399, {wxPageSetupDialogData, setMinMarginTopLeft, 1}}, - {2400, {wxPageSetupDialogData, setMinMarginBottomRight, 1}}, - {2401, {wxPageSetupDialogData, setPaperId, 1}}, - {2402, {wxPageSetupDialogData, setPaperSize_1_1, 1}}, - {2403, {wxPageSetupDialogData, setPaperSize_1_0, 1}}, - {2404, {wxPageSetupDialogData, setPrintData, 1}}, - {2405, {wxPrintDialog, new_2_0, 2}}, - {2406, {wxPrintDialog, new_2_1, 2}}, - {2407, {wxPrintDialog, destruct, 0}}, - {2408, {wxPrintDialog, getPrintDialogData, 0}}, - {2409, {wxPrintDialog, getPrintDC, 0}}, - {2410, {wxPrintDialogData, new_0, 0}}, - {2411, {wxPrintDialogData, new_1_1, 1}}, - {2412, {wxPrintDialogData, new_1_0, 1}}, - {2413, {wxPrintDialogData, destruct, 0}}, - {2414, {wxPrintDialogData, enableHelp, 1}}, - {2415, {wxPrintDialogData, enablePageNumbers, 1}}, - {2416, {wxPrintDialogData, enablePrintToFile, 1}}, - {2417, {wxPrintDialogData, enableSelection, 1}}, - {2418, {wxPrintDialogData, getAllPages, 0}}, - {2419, {wxPrintDialogData, getCollate, 0}}, - {2420, {wxPrintDialogData, getFromPage, 0}}, - {2421, {wxPrintDialogData, getMaxPage, 0}}, - {2422, {wxPrintDialogData, getMinPage, 0}}, - {2423, {wxPrintDialogData, getNoCopies, 0}}, - {2424, {wxPrintDialogData, getPrintData, 0}}, - {2425, {wxPrintDialogData, getPrintToFile, 0}}, - {2426, {wxPrintDialogData, getSelection, 0}}, - {2427, {wxPrintDialogData, getToPage, 0}}, - {2428, {wxPrintDialogData, isOk, 0}}, - {2429, {wxPrintDialogData, setCollate, 1}}, - {2430, {wxPrintDialogData, setFromPage, 1}}, - {2431, {wxPrintDialogData, setMaxPage, 1}}, - {2432, {wxPrintDialogData, setMinPage, 1}}, - {2433, {wxPrintDialogData, setNoCopies, 1}}, - {2434, {wxPrintDialogData, setPrintData, 1}}, - {2435, {wxPrintDialogData, setPrintToFile, 1}}, - {2436, {wxPrintDialogData, setSelection, 1}}, - {2437, {wxPrintDialogData, setToPage, 1}}, - {2438, {wxPrintData, new_0, 0}}, - {2439, {wxPrintData, new_1, 1}}, - {2440, {wxPrintData, destruct, 0}}, - {2441, {wxPrintData, getCollate, 0}}, - {2442, {wxPrintData, getBin, 0}}, - {2443, {wxPrintData, getColour, 0}}, - {2444, {wxPrintData, getDuplex, 0}}, - {2445, {wxPrintData, getNoCopies, 0}}, - {2446, {wxPrintData, getOrientation, 0}}, - {2447, {wxPrintData, getPaperId, 0}}, - {2448, {wxPrintData, getPrinterName, 0}}, - {2449, {wxPrintData, getQuality, 0}}, - {2450, {wxPrintData, isOk, 0}}, - {2451, {wxPrintData, setBin, 1}}, - {2452, {wxPrintData, setCollate, 1}}, - {2453, {wxPrintData, setColour, 1}}, - {2454, {wxPrintData, setDuplex, 1}}, - {2455, {wxPrintData, setNoCopies, 1}}, - {2456, {wxPrintData, setOrientation, 1}}, - {2457, {wxPrintData, setPaperId, 1}}, - {2458, {wxPrintData, setPrinterName, 1}}, - {2459, {wxPrintData, setQuality, 1}}, - {2462, {wxPrintPreview, new_2, 2}}, - {2463, {wxPrintPreview, new_3, 3}}, - {2465, {wxPrintPreview, destruct, 0}}, - {2466, {wxPrintPreview, getCanvas, 0}}, - {2467, {wxPrintPreview, getCurrentPage, 0}}, - {2468, {wxPrintPreview, getFrame, 0}}, - {2469, {wxPrintPreview, getMaxPage, 0}}, - {2470, {wxPrintPreview, getMinPage, 0}}, - {2471, {wxPrintPreview, getPrintout, 0}}, - {2472, {wxPrintPreview, getPrintoutForPrinting, 0}}, - {2473, {wxPrintPreview, isOk, 0}}, - {2474, {wxPrintPreview, paintPage, 2}}, - {2475, {wxPrintPreview, print, 1}}, - {2476, {wxPrintPreview, renderPage, 1}}, - {2477, {wxPrintPreview, setCanvas, 1}}, - {2478, {wxPrintPreview, setCurrentPage, 1}}, - {2479, {wxPrintPreview, setFrame, 1}}, - {2480, {wxPrintPreview, setPrintout, 1}}, - {2481, {wxPrintPreview, setZoom, 1}}, - {2482, {wxPreviewFrame, new, 3}}, - {2483, {wxPreviewFrame, destruct, 0}}, - {2484, {wxPreviewFrame, createControlBar, 0}}, - {2485, {wxPreviewFrame, createCanvas, 0}}, - {2486, {wxPreviewFrame, initialize, 0}}, - {2487, {wxPreviewFrame, onCloseWindow, 1}}, - {2488, {wxPreviewControlBar, new, 4}}, - {2489, {wxPreviewControlBar, destruct, 0}}, - {2490, {wxPreviewControlBar, createButtons, 0}}, - {2491, {wxPreviewControlBar, getPrintPreview, 0}}, - {2492, {wxPreviewControlBar, getZoomControl, 0}}, - {2493, {wxPreviewControlBar, setZoomControl, 1}}, - {2495, {wxPrinter, new, 1}}, - {2496, {wxPrinter, createAbortWindow, 2}}, - {2497, {wxPrinter, getAbort, 0}}, - {2498, {wxPrinter, getLastError, 0}}, - {2499, {wxPrinter, getPrintDialogData, 0}}, - {2500, {wxPrinter, print, 3}}, - {2501, {wxPrinter, printDialog, 1}}, - {2502, {wxPrinter, reportError, 3}}, - {2503, {wxPrinter, setup, 1}}, - {2504, {wxPrinter, 'Destroy', undefined}}, - {2505, {wxXmlResource, new_1, 1}}, - {2506, {wxXmlResource, new_2, 2}}, - {2507, {wxXmlResource, destruct, 0}}, - {2508, {wxXmlResource, attachUnknownControl, 3}}, - {2509, {wxXmlResource, clearHandlers, 0}}, - {2510, {wxXmlResource, compareVersion, 4}}, - {2511, {wxXmlResource, get, 0}}, - {2512, {wxXmlResource, getFlags, 0}}, - {2513, {wxXmlResource, getVersion, 0}}, - {2514, {wxXmlResource, getXRCID, 2}}, - {2515, {wxXmlResource, initAllHandlers, 0}}, - {2516, {wxXmlResource, load, 1}}, - {2517, {wxXmlResource, loadBitmap, 1}}, - {2518, {wxXmlResource, loadDialog_2, 2}}, - {2519, {wxXmlResource, loadDialog_3, 3}}, - {2520, {wxXmlResource, loadFrame_2, 2}}, - {2521, {wxXmlResource, loadFrame_3, 3}}, - {2522, {wxXmlResource, loadIcon, 1}}, - {2523, {wxXmlResource, loadMenu, 1}}, - {2524, {wxXmlResource, loadMenuBar_2, 2}}, - {2525, {wxXmlResource, loadMenuBar_1, 1}}, - {2526, {wxXmlResource, loadPanel_2, 2}}, - {2527, {wxXmlResource, loadPanel_3, 3}}, - {2528, {wxXmlResource, loadToolBar, 2}}, - {2529, {wxXmlResource, set, 1}}, - {2530, {wxXmlResource, setFlags, 1}}, - {2531, {wxXmlResource, unload, 1}}, - {2532, {wxXmlResource, xrcctrl, 3}}, - {2533, {wxHtmlEasyPrinting, new, 1}}, - {2534, {wxHtmlEasyPrinting, destruct, 0}}, - {2535, {wxHtmlEasyPrinting, getPrintData, 0}}, - {2536, {wxHtmlEasyPrinting, getPageSetupData, 0}}, - {2537, {wxHtmlEasyPrinting, previewFile, 1}}, - {2538, {wxHtmlEasyPrinting, previewText, 2}}, - {2539, {wxHtmlEasyPrinting, printFile, 1}}, - {2540, {wxHtmlEasyPrinting, printText, 2}}, - {2541, {wxHtmlEasyPrinting, pageSetup, 0}}, - {2542, {wxHtmlEasyPrinting, setFonts, 3}}, - {2543, {wxHtmlEasyPrinting, setHeader, 2}}, - {2544, {wxHtmlEasyPrinting, setFooter, 2}}, - {2546, {wxGLCanvas, new_2, 2}}, - {2547, {wxGLCanvas, new_3_1, 3}}, - {2548, {wxGLCanvas, new_3_0, 3}}, - {2549, {wxGLCanvas, getContext, 0}}, - {2551, {wxGLCanvas, setCurrent, 0}}, - {2552, {wxGLCanvas, swapBuffers, 0}}, - {2553, {wxGLCanvas, 'Destroy', undefined}}, - {2554, {wxAuiManager, new, 1}}, - {2555, {wxAuiManager, destruct, 0}}, - {2556, {wxAuiManager, addPane_2_1, 2}}, - {2557, {wxAuiManager, addPane_3, 3}}, - {2558, {wxAuiManager, addPane_2_0, 2}}, - {2559, {wxAuiManager, detachPane, 1}}, - {2560, {wxAuiManager, getAllPanes, 0}}, - {2561, {wxAuiManager, getArtProvider, 0}}, - {2562, {wxAuiManager, getDockSizeConstraint, 2}}, - {2563, {wxAuiManager, getFlags, 0}}, - {2564, {wxAuiManager, getManagedWindow, 0}}, - {2565, {wxAuiManager, getManager, 1}}, - {2566, {wxAuiManager, getPane_1_1, 1}}, - {2567, {wxAuiManager, getPane_1_0, 1}}, - {2568, {wxAuiManager, hideHint, 0}}, - {2569, {wxAuiManager, insertPane, 3}}, - {2570, {wxAuiManager, loadPaneInfo, 2}}, - {2571, {wxAuiManager, loadPerspective, 2}}, - {2572, {wxAuiManager, savePaneInfo, 1}}, - {2573, {wxAuiManager, savePerspective, 0}}, - {2574, {wxAuiManager, setArtProvider, 1}}, - {2575, {wxAuiManager, setDockSizeConstraint, 2}}, - {2576, {wxAuiManager, setFlags, 1}}, - {2577, {wxAuiManager, setManagedWindow, 1}}, - {2578, {wxAuiManager, showHint, 1}}, - {2579, {wxAuiManager, unInit, 0}}, - {2580, {wxAuiManager, update, 0}}, - {2581, {wxAuiPaneInfo, new_0, 0}}, - {2582, {wxAuiPaneInfo, new_1, 1}}, - {2583, {wxAuiPaneInfo, destruct, 0}}, - {2584, {wxAuiPaneInfo, bestSize_1, 1}}, - {2585, {wxAuiPaneInfo, bestSize_2, 2}}, - {2586, {wxAuiPaneInfo, bottom, 0}}, - {2587, {wxAuiPaneInfo, bottomDockable, 1}}, - {2588, {wxAuiPaneInfo, caption, 1}}, - {2589, {wxAuiPaneInfo, captionVisible, 1}}, - {2590, {wxAuiPaneInfo, centre, 0}}, - {2591, {wxAuiPaneInfo, centrePane, 0}}, - {2592, {wxAuiPaneInfo, closeButton, 1}}, - {2593, {wxAuiPaneInfo, defaultPane, 0}}, - {2594, {wxAuiPaneInfo, destroyOnClose, 1}}, - {2595, {wxAuiPaneInfo, direction, 1}}, - {2596, {wxAuiPaneInfo, dock, 0}}, - {2597, {wxAuiPaneInfo, dockable, 1}}, - {2598, {wxAuiPaneInfo, fixed, 0}}, - {2599, {wxAuiPaneInfo, float, 0}}, - {2600, {wxAuiPaneInfo, floatable, 1}}, - {2601, {wxAuiPaneInfo, floatingPosition_1, 1}}, - {2602, {wxAuiPaneInfo, floatingPosition_2, 2}}, - {2603, {wxAuiPaneInfo, floatingSize_1, 1}}, - {2604, {wxAuiPaneInfo, floatingSize_2, 2}}, - {2605, {wxAuiPaneInfo, gripper, 1}}, - {2606, {wxAuiPaneInfo, gripperTop, 1}}, - {2607, {wxAuiPaneInfo, hasBorder, 0}}, - {2608, {wxAuiPaneInfo, hasCaption, 0}}, - {2609, {wxAuiPaneInfo, hasCloseButton, 0}}, - {2610, {wxAuiPaneInfo, hasFlag, 1}}, - {2611, {wxAuiPaneInfo, hasGripper, 0}}, - {2612, {wxAuiPaneInfo, hasGripperTop, 0}}, - {2613, {wxAuiPaneInfo, hasMaximizeButton, 0}}, - {2614, {wxAuiPaneInfo, hasMinimizeButton, 0}}, - {2615, {wxAuiPaneInfo, hasPinButton, 0}}, - {2616, {wxAuiPaneInfo, hide, 0}}, - {2617, {wxAuiPaneInfo, isBottomDockable, 0}}, - {2618, {wxAuiPaneInfo, isDocked, 0}}, - {2619, {wxAuiPaneInfo, isFixed, 0}}, - {2620, {wxAuiPaneInfo, isFloatable, 0}}, - {2621, {wxAuiPaneInfo, isFloating, 0}}, - {2622, {wxAuiPaneInfo, isLeftDockable, 0}}, - {2623, {wxAuiPaneInfo, isMovable, 0}}, - {2624, {wxAuiPaneInfo, isOk, 0}}, - {2625, {wxAuiPaneInfo, isResizable, 0}}, - {2626, {wxAuiPaneInfo, isRightDockable, 0}}, - {2627, {wxAuiPaneInfo, isShown, 0}}, - {2628, {wxAuiPaneInfo, isToolbar, 0}}, - {2629, {wxAuiPaneInfo, isTopDockable, 0}}, - {2630, {wxAuiPaneInfo, layer, 1}}, - {2631, {wxAuiPaneInfo, left, 0}}, - {2632, {wxAuiPaneInfo, leftDockable, 1}}, - {2633, {wxAuiPaneInfo, maxSize_1, 1}}, - {2634, {wxAuiPaneInfo, maxSize_2, 2}}, - {2635, {wxAuiPaneInfo, maximizeButton, 1}}, - {2636, {wxAuiPaneInfo, minSize_1, 1}}, - {2637, {wxAuiPaneInfo, minSize_2, 2}}, - {2638, {wxAuiPaneInfo, minimizeButton, 1}}, - {2639, {wxAuiPaneInfo, movable, 1}}, - {2640, {wxAuiPaneInfo, name, 1}}, - {2641, {wxAuiPaneInfo, paneBorder, 1}}, - {2642, {wxAuiPaneInfo, pinButton, 1}}, - {2643, {wxAuiPaneInfo, position, 1}}, - {2644, {wxAuiPaneInfo, resizable, 1}}, - {2645, {wxAuiPaneInfo, right, 0}}, - {2646, {wxAuiPaneInfo, rightDockable, 1}}, - {2647, {wxAuiPaneInfo, row, 1}}, - {2648, {wxAuiPaneInfo, safeSet, 1}}, - {2649, {wxAuiPaneInfo, setFlag, 2}}, - {2650, {wxAuiPaneInfo, show, 1}}, - {2651, {wxAuiPaneInfo, toolbarPane, 0}}, - {2652, {wxAuiPaneInfo, top, 0}}, - {2653, {wxAuiPaneInfo, topDockable, 1}}, - {2654, {wxAuiPaneInfo, window, 1}}, - {2655, {wxAuiPaneInfo, getWindow, 0}}, - {2656, {wxAuiPaneInfo, getFrame, 0}}, - {2657, {wxAuiPaneInfo, getDirection, 0}}, - {2658, {wxAuiPaneInfo, getLayer, 0}}, - {2659, {wxAuiPaneInfo, getRow, 0}}, - {2660, {wxAuiPaneInfo, getPosition, 0}}, - {2661, {wxAuiPaneInfo, getFloatingPosition, 0}}, - {2662, {wxAuiPaneInfo, getFloatingSize, 0}}, - {2663, {wxAuiNotebook, new_0, 0}}, - {2664, {wxAuiNotebook, new_2, 2}}, - {2665, {wxAuiNotebook, addPage, 3}}, - {2666, {wxAuiNotebook, create, 2}}, - {2667, {wxAuiNotebook, deletePage, 1}}, - {2668, {wxAuiNotebook, getArtProvider, 0}}, - {2669, {wxAuiNotebook, getPage, 1}}, - {2670, {wxAuiNotebook, getPageBitmap, 1}}, - {2671, {wxAuiNotebook, getPageCount, 0}}, - {2672, {wxAuiNotebook, getPageIndex, 1}}, - {2673, {wxAuiNotebook, getPageText, 1}}, - {2674, {wxAuiNotebook, getSelection, 0}}, - {2675, {wxAuiNotebook, insertPage, 4}}, - {2676, {wxAuiNotebook, removePage, 1}}, - {2677, {wxAuiNotebook, setArtProvider, 1}}, - {2678, {wxAuiNotebook, setFont, 1}}, - {2679, {wxAuiNotebook, setPageBitmap, 2}}, - {2680, {wxAuiNotebook, setPageText, 2}}, - {2681, {wxAuiNotebook, setSelection, 1}}, - {2682, {wxAuiNotebook, setTabCtrlHeight, 1}}, - {2683, {wxAuiNotebook, setUniformBitmapSize, 1}}, - {2684, {wxAuiNotebook, 'Destroy', undefined}}, - {2685, {wxAuiTabArt, setFlags, 1}}, - {2686, {wxAuiTabArt, setMeasuringFont, 1}}, - {2687, {wxAuiTabArt, setNormalFont, 1}}, - {2688, {wxAuiTabArt, setSelectedFont, 1}}, - {2689, {wxAuiTabArt, setColour, 1}}, - {2690, {wxAuiTabArt, setActiveColour, 1}}, - {2691, {wxAuiDockArt, getColour, 1}}, - {2692, {wxAuiDockArt, getFont, 1}}, - {2693, {wxAuiDockArt, getMetric, 1}}, - {2694, {wxAuiDockArt, setColour, 2}}, - {2695, {wxAuiDockArt, setFont, 2}}, - {2696, {wxAuiDockArt, setMetric, 2}}, - {2697, {wxAuiSimpleTabArt, new, 0}}, - {2698, {wxAuiSimpleTabArt, 'Destroy', undefined}}, - {2699, {wxMDIParentFrame, new_0, 0}}, - {2700, {wxMDIParentFrame, new_4, 4}}, - {2701, {wxMDIParentFrame, destruct, 0}}, - {2702, {wxMDIParentFrame, activateNext, 0}}, - {2703, {wxMDIParentFrame, activatePrevious, 0}}, - {2704, {wxMDIParentFrame, arrangeIcons, 0}}, - {2705, {wxMDIParentFrame, cascade, 0}}, - {2706, {wxMDIParentFrame, create, 4}}, - {2707, {wxMDIParentFrame, getActiveChild, 0}}, - {2708, {wxMDIParentFrame, getClientWindow, 0}}, - {2709, {wxMDIParentFrame, tile, 1}}, - {2710, {wxMDIChildFrame, new_0, 0}}, - {2711, {wxMDIChildFrame, new_4, 4}}, - {2712, {wxMDIChildFrame, destruct, 0}}, - {2713, {wxMDIChildFrame, activate, 0}}, - {2714, {wxMDIChildFrame, create, 4}}, - {2715, {wxMDIChildFrame, maximize, 1}}, - {2716, {wxMDIChildFrame, restore, 0}}, - {2717, {wxMDIClientWindow, new_0, 0}}, - {2718, {wxMDIClientWindow, new_2, 2}}, - {2719, {wxMDIClientWindow, destruct, 0}}, - {2720, {wxMDIClientWindow, createClient, 2}}, - {2721, {wxLayoutAlgorithm, new, 0}}, - {2722, {wxLayoutAlgorithm, layoutFrame, 2}}, - {2723, {wxLayoutAlgorithm, layoutMDIFrame, 2}}, - {2724, {wxLayoutAlgorithm, layoutWindow, 2}}, - {2725, {wxLayoutAlgorithm, 'Destroy', undefined}}, - {2726, {wxEvent, getId, 0}}, - {2727, {wxEvent, getSkipped, 0}}, - {2728, {wxEvent, getTimestamp, 0}}, - {2729, {wxEvent, isCommandEvent, 0}}, - {2730, {wxEvent, resumePropagation, 1}}, - {2731, {wxEvent, shouldPropagate, 0}}, - {2732, {wxEvent, skip, 1}}, - {2733, {wxEvent, stopPropagation, 0}}, - {2734, {wxCommandEvent, getClientData, 0}}, - {2735, {wxCommandEvent, getExtraLong, 0}}, - {2736, {wxCommandEvent, getInt, 0}}, - {2737, {wxCommandEvent, getSelection, 0}}, - {2738, {wxCommandEvent, getString, 0}}, - {2739, {wxCommandEvent, isChecked, 0}}, - {2740, {wxCommandEvent, isSelection, 0}}, - {2741, {wxCommandEvent, setInt, 1}}, - {2742, {wxCommandEvent, setString, 1}}, - {2743, {wxScrollEvent, getOrientation, 0}}, - {2744, {wxScrollEvent, getPosition, 0}}, - {2745, {wxScrollWinEvent, getOrientation, 0}}, - {2746, {wxScrollWinEvent, getPosition, 0}}, - {2747, {wxMouseEvent, altDown, 0}}, - {2748, {wxMouseEvent, button, 1}}, - {2749, {wxMouseEvent, buttonDClick, 1}}, - {2750, {wxMouseEvent, buttonDown, 1}}, - {2751, {wxMouseEvent, buttonUp, 1}}, - {2752, {wxMouseEvent, cmdDown, 0}}, - {2753, {wxMouseEvent, controlDown, 0}}, - {2754, {wxMouseEvent, dragging, 0}}, - {2755, {wxMouseEvent, entering, 0}}, - {2756, {wxMouseEvent, getButton, 0}}, - {2759, {wxMouseEvent, getPosition, 0}}, - {2760, {wxMouseEvent, getLogicalPosition, 1}}, - {2761, {wxMouseEvent, getLinesPerAction, 0}}, - {2762, {wxMouseEvent, getWheelRotation, 0}}, - {2763, {wxMouseEvent, getWheelDelta, 0}}, - {2764, {wxMouseEvent, getX, 0}}, - {2765, {wxMouseEvent, getY, 0}}, - {2766, {wxMouseEvent, isButton, 0}}, - {2767, {wxMouseEvent, isPageScroll, 0}}, - {2768, {wxMouseEvent, leaving, 0}}, - {2769, {wxMouseEvent, leftDClick, 0}}, - {2770, {wxMouseEvent, leftDown, 0}}, - {2771, {wxMouseEvent, leftIsDown, 0}}, - {2772, {wxMouseEvent, leftUp, 0}}, - {2773, {wxMouseEvent, metaDown, 0}}, - {2774, {wxMouseEvent, middleDClick, 0}}, - {2775, {wxMouseEvent, middleDown, 0}}, - {2776, {wxMouseEvent, middleIsDown, 0}}, - {2777, {wxMouseEvent, middleUp, 0}}, - {2778, {wxMouseEvent, moving, 0}}, - {2779, {wxMouseEvent, rightDClick, 0}}, - {2780, {wxMouseEvent, rightDown, 0}}, - {2781, {wxMouseEvent, rightIsDown, 0}}, - {2782, {wxMouseEvent, rightUp, 0}}, - {2783, {wxMouseEvent, shiftDown, 0}}, - {2784, {wxSetCursorEvent, getCursor, 0}}, - {2785, {wxSetCursorEvent, getX, 0}}, - {2786, {wxSetCursorEvent, getY, 0}}, - {2787, {wxSetCursorEvent, hasCursor, 0}}, - {2788, {wxSetCursorEvent, setCursor, 1}}, - {2789, {wxKeyEvent, altDown, 0}}, - {2790, {wxKeyEvent, cmdDown, 0}}, - {2791, {wxKeyEvent, controlDown, 0}}, - {2792, {wxKeyEvent, getKeyCode, 0}}, - {2793, {wxKeyEvent, getModifiers, 0}}, - {2796, {wxKeyEvent, getPosition, 0}}, - {2797, {wxKeyEvent, getRawKeyCode, 0}}, - {2798, {wxKeyEvent, getRawKeyFlags, 0}}, - {2799, {wxKeyEvent, getUnicodeKey, 0}}, - {2800, {wxKeyEvent, getX, 0}}, - {2801, {wxKeyEvent, getY, 0}}, - {2802, {wxKeyEvent, hasModifiers, 0}}, - {2803, {wxKeyEvent, metaDown, 0}}, - {2804, {wxKeyEvent, shiftDown, 0}}, - {2805, {wxSizeEvent, getSize, 0}}, - {2806, {wxMoveEvent, getPosition, 0}}, - {2807, {wxEraseEvent, getDC, 0}}, - {2808, {wxFocusEvent, getWindow, 0}}, - {2809, {wxChildFocusEvent, getWindow, 0}}, - {2810, {wxMenuEvent, getMenu, 0}}, - {2811, {wxMenuEvent, getMenuId, 0}}, - {2812, {wxMenuEvent, isPopup, 0}}, - {2813, {wxCloseEvent, canVeto, 0}}, - {2814, {wxCloseEvent, getLoggingOff, 0}}, - {2815, {wxCloseEvent, setCanVeto, 1}}, - {2816, {wxCloseEvent, setLoggingOff, 1}}, - {2817, {wxCloseEvent, veto, 1}}, - {2818, {wxShowEvent, setShow, 1}}, - {2819, {wxShowEvent, getShow, 0}}, - {2820, {wxIconizeEvent, iconized, 0}}, - {2821, {wxJoystickEvent, buttonDown, 1}}, - {2822, {wxJoystickEvent, buttonIsDown, 1}}, - {2823, {wxJoystickEvent, buttonUp, 1}}, - {2824, {wxJoystickEvent, getButtonChange, 0}}, - {2825, {wxJoystickEvent, getButtonState, 0}}, - {2826, {wxJoystickEvent, getJoystick, 0}}, - {2827, {wxJoystickEvent, getPosition, 0}}, - {2828, {wxJoystickEvent, getZPosition, 0}}, - {2829, {wxJoystickEvent, isButton, 0}}, - {2830, {wxJoystickEvent, isMove, 0}}, - {2831, {wxJoystickEvent, isZMove, 0}}, - {2832, {wxUpdateUIEvent, canUpdate, 1}}, - {2833, {wxUpdateUIEvent, check, 1}}, - {2834, {wxUpdateUIEvent, enable, 1}}, - {2835, {wxUpdateUIEvent, show, 1}}, - {2836, {wxUpdateUIEvent, getChecked, 0}}, - {2837, {wxUpdateUIEvent, getEnabled, 0}}, - {2838, {wxUpdateUIEvent, getShown, 0}}, - {2839, {wxUpdateUIEvent, getSetChecked, 0}}, - {2840, {wxUpdateUIEvent, getSetEnabled, 0}}, - {2841, {wxUpdateUIEvent, getSetShown, 0}}, - {2842, {wxUpdateUIEvent, getSetText, 0}}, - {2843, {wxUpdateUIEvent, getText, 0}}, - {2844, {wxUpdateUIEvent, getMode, 0}}, - {2845, {wxUpdateUIEvent, getUpdateInterval, 0}}, - {2846, {wxUpdateUIEvent, resetUpdateTime, 0}}, - {2847, {wxUpdateUIEvent, setMode, 1}}, - {2848, {wxUpdateUIEvent, setText, 1}}, - {2849, {wxUpdateUIEvent, setUpdateInterval, 1}}, - {2850, {wxMouseCaptureChangedEvent, getCapturedWindow, 0}}, - {2851, {wxPaletteChangedEvent, setChangedWindow, 1}}, - {2852, {wxPaletteChangedEvent, getChangedWindow, 0}}, - {2853, {wxQueryNewPaletteEvent, setPaletteRealized, 1}}, - {2854, {wxQueryNewPaletteEvent, getPaletteRealized, 0}}, - {2855, {wxNavigationKeyEvent, getDirection, 0}}, - {2856, {wxNavigationKeyEvent, setDirection, 1}}, - {2857, {wxNavigationKeyEvent, isWindowChange, 0}}, - {2858, {wxNavigationKeyEvent, setWindowChange, 1}}, - {2859, {wxNavigationKeyEvent, isFromTab, 0}}, - {2860, {wxNavigationKeyEvent, setFromTab, 1}}, - {2861, {wxNavigationKeyEvent, getCurrentFocus, 0}}, - {2862, {wxNavigationKeyEvent, setCurrentFocus, 1}}, - {2863, {wxHelpEvent, getOrigin, 0}}, - {2864, {wxHelpEvent, getPosition, 0}}, - {2865, {wxHelpEvent, setOrigin, 1}}, - {2866, {wxHelpEvent, setPosition, 1}}, - {2867, {wxContextMenuEvent, getPosition, 0}}, - {2868, {wxContextMenuEvent, setPosition, 1}}, - {2869, {wxIdleEvent, canSend, 1}}, - {2870, {wxIdleEvent, getMode, 0}}, - {2871, {wxIdleEvent, requestMore, 1}}, - {2872, {wxIdleEvent, moreRequested, 0}}, - {2873, {wxIdleEvent, setMode, 1}}, - {2874, {wxGridEvent, altDown, 0}}, - {2875, {wxGridEvent, controlDown, 0}}, - {2876, {wxGridEvent, getCol, 0}}, - {2877, {wxGridEvent, getPosition, 0}}, - {2878, {wxGridEvent, getRow, 0}}, - {2879, {wxGridEvent, metaDown, 0}}, - {2880, {wxGridEvent, selecting, 0}}, - {2881, {wxGridEvent, shiftDown, 0}}, - {2882, {wxNotifyEvent, allow, 0}}, - {2883, {wxNotifyEvent, isAllowed, 0}}, - {2884, {wxNotifyEvent, veto, 0}}, - {2885, {wxSashEvent, getEdge, 0}}, - {2886, {wxSashEvent, getDragRect, 0}}, - {2887, {wxSashEvent, getDragStatus, 0}}, - {2888, {wxListEvent, getCacheFrom, 0}}, - {2889, {wxListEvent, getCacheTo, 0}}, - {2890, {wxListEvent, getKeyCode, 0}}, - {2891, {wxListEvent, getIndex, 0}}, - {2892, {wxListEvent, getColumn, 0}}, - {2893, {wxListEvent, getPoint, 0}}, - {2894, {wxListEvent, getLabel, 0}}, - {2895, {wxListEvent, getText, 0}}, - {2896, {wxListEvent, getImage, 0}}, - {2897, {wxListEvent, getData, 0}}, - {2898, {wxListEvent, getMask, 0}}, - {2899, {wxListEvent, getItem, 0}}, - {2900, {wxListEvent, isEditCancelled, 0}}, - {2901, {wxDateEvent, getDate, 0}}, - {2902, {wxCalendarEvent, getWeekDay, 0}}, - {2903, {wxFileDirPickerEvent, getPath, 0}}, - {2904, {wxColourPickerEvent, getColour, 0}}, - {2905, {wxFontPickerEvent, getFont, 0}}, - {2906, {wxStyledTextEvent, getPosition, 0}}, - {2907, {wxStyledTextEvent, getKey, 0}}, - {2908, {wxStyledTextEvent, getModifiers, 0}}, - {2909, {wxStyledTextEvent, getModificationType, 0}}, - {2910, {wxStyledTextEvent, getText, 0}}, - {2911, {wxStyledTextEvent, getLength, 0}}, - {2912, {wxStyledTextEvent, getLinesAdded, 0}}, - {2913, {wxStyledTextEvent, getLine, 0}}, - {2914, {wxStyledTextEvent, getFoldLevelNow, 0}}, - {2915, {wxStyledTextEvent, getFoldLevelPrev, 0}}, - {2916, {wxStyledTextEvent, getMargin, 0}}, - {2917, {wxStyledTextEvent, getMessage, 0}}, - {2918, {wxStyledTextEvent, getWParam, 0}}, - {2919, {wxStyledTextEvent, getLParam, 0}}, - {2920, {wxStyledTextEvent, getListType, 0}}, - {2921, {wxStyledTextEvent, getX, 0}}, - {2922, {wxStyledTextEvent, getY, 0}}, - {2923, {wxStyledTextEvent, getDragText, 0}}, - {2924, {wxStyledTextEvent, getDragAllowMove, 0}}, - {2925, {wxStyledTextEvent, getDragResult, 0}}, - {2926, {wxStyledTextEvent, getShift, 0}}, - {2927, {wxStyledTextEvent, getControl, 0}}, - {2928, {wxStyledTextEvent, getAlt, 0}}, - {2929, {utils, getKeyState, 1}}, - {2930, {utils, getMousePosition, 2}}, - {2931, {utils, getMouseState, 0}}, - {2932, {utils, setDetectableAutoRepeat, 1}}, - {2933, {utils, bell, 0}}, - {2934, {utils, findMenuItemId, 3}}, - {2935, {utils, genericFindWindowAtPoint, 1}}, - {2936, {utils, findWindowAtPoint, 1}}, - {2937, {utils, beginBusyCursor, 1}}, - {2938, {utils, endBusyCursor, 0}}, - {2939, {utils, isBusy, 0}}, - {2940, {utils, shutdown, 1}}, - {2941, {utils, shell, 1}}, - {2942, {utils, launchDefaultBrowser, 2}}, - {2943, {utils, getEmailAddress, 0}}, - {2944, {utils, getUserId, 0}}, - {2945, {utils, getHomeDir, 0}}, - {2946, {utils, newId, 0}}, - {2947, {utils, registerId, 1}}, - {2948, {utils, getCurrentId, 0}}, - {2949, {utils, getOsDescription, 0}}, - {2950, {utils, isPlatformLittleEndian, 0}}, - {2951, {utils, isPlatform64Bit, 0}}, - {2952, {gdicmn, displaySize, 2}}, - {2953, {gdicmn, setCursor, 1}}, - {2954, {wxPrintout, new, 1}}, - {2955, {wxPrintout, destruct, 0}}, - {2956, {wxPrintout, getDC, 0}}, - {2957, {wxPrintout, getPageSizeMM, 2}}, - {2958, {wxPrintout, getPageSizePixels, 2}}, - {2959, {wxPrintout, getPaperRectPixels, 0}}, - {2960, {wxPrintout, getPPIPrinter, 2}}, - {2961, {wxPrintout, getPPIScreen, 2}}, - {2962, {wxPrintout, getTitle, 0}}, - {2963, {wxPrintout, isPreview, 0}}, - {2964, {wxPrintout, fitThisSizeToPaper, 1}}, - {2965, {wxPrintout, fitThisSizeToPage, 1}}, - {2966, {wxPrintout, fitThisSizeToPageMargins, 2}}, - {2967, {wxPrintout, mapScreenSizeToPaper, 0}}, - {2968, {wxPrintout, mapScreenSizeToPage, 0}}, - {2969, {wxPrintout, mapScreenSizeToPageMargins, 1}}, - {2970, {wxPrintout, mapScreenSizeToDevice, 0}}, - {2971, {wxPrintout, getLogicalPaperRect, 0}}, - {2972, {wxPrintout, getLogicalPageRect, 0}}, - {2973, {wxPrintout, getLogicalPageMarginsRect, 1}}, - {2974, {wxPrintout, setLogicalOrigin, 2}}, - {2975, {wxPrintout, offsetLogicalOrigin, 2}}, - {2976, {wxStyledTextCtrl, new_2, 2}}, - {2977, {wxStyledTextCtrl, new_0, 0}}, - {2978, {wxStyledTextCtrl, destruct, 0}}, - {2979, {wxStyledTextCtrl, create, 2}}, - {2980, {wxStyledTextCtrl, addText, 1}}, - {2981, {wxStyledTextCtrl, addStyledText, 1}}, - {2982, {wxStyledTextCtrl, insertText, 2}}, - {2983, {wxStyledTextCtrl, clearAll, 0}}, - {2984, {wxStyledTextCtrl, clearDocumentStyle, 0}}, - {2985, {wxStyledTextCtrl, getLength, 0}}, - {2986, {wxStyledTextCtrl, getCharAt, 1}}, - {2987, {wxStyledTextCtrl, getCurrentPos, 0}}, - {2988, {wxStyledTextCtrl, getAnchor, 0}}, - {2989, {wxStyledTextCtrl, getStyleAt, 1}}, - {2990, {wxStyledTextCtrl, redo, 0}}, - {2991, {wxStyledTextCtrl, setUndoCollection, 1}}, - {2992, {wxStyledTextCtrl, selectAll, 0}}, - {2993, {wxStyledTextCtrl, setSavePoint, 0}}, - {2994, {wxStyledTextCtrl, getStyledText, 2}}, - {2995, {wxStyledTextCtrl, canRedo, 0}}, - {2996, {wxStyledTextCtrl, markerLineFromHandle, 1}}, - {2997, {wxStyledTextCtrl, markerDeleteHandle, 1}}, - {2998, {wxStyledTextCtrl, getUndoCollection, 0}}, - {2999, {wxStyledTextCtrl, getViewWhiteSpace, 0}}, - {3000, {wxStyledTextCtrl, setViewWhiteSpace, 1}}, - {3001, {wxStyledTextCtrl, positionFromPoint, 1}}, - {3002, {wxStyledTextCtrl, positionFromPointClose, 2}}, - {3003, {wxStyledTextCtrl, gotoLine, 1}}, - {3004, {wxStyledTextCtrl, gotoPos, 1}}, - {3005, {wxStyledTextCtrl, setAnchor, 1}}, - {3006, {wxStyledTextCtrl, getCurLine, 1}}, - {3007, {wxStyledTextCtrl, getEndStyled, 0}}, - {3008, {wxStyledTextCtrl, convertEOLs, 1}}, - {3009, {wxStyledTextCtrl, getEOLMode, 0}}, - {3010, {wxStyledTextCtrl, setEOLMode, 1}}, - {3011, {wxStyledTextCtrl, startStyling, 2}}, - {3012, {wxStyledTextCtrl, setStyling, 2}}, - {3013, {wxStyledTextCtrl, getBufferedDraw, 0}}, - {3014, {wxStyledTextCtrl, setBufferedDraw, 1}}, - {3015, {wxStyledTextCtrl, setTabWidth, 1}}, - {3016, {wxStyledTextCtrl, getTabWidth, 0}}, - {3017, {wxStyledTextCtrl, setCodePage, 1}}, - {3018, {wxStyledTextCtrl, markerDefine, 3}}, - {3019, {wxStyledTextCtrl, markerSetForeground, 2}}, - {3020, {wxStyledTextCtrl, markerSetBackground, 2}}, - {3021, {wxStyledTextCtrl, markerAdd, 2}}, - {3022, {wxStyledTextCtrl, markerDelete, 2}}, - {3023, {wxStyledTextCtrl, markerDeleteAll, 1}}, - {3024, {wxStyledTextCtrl, markerGet, 1}}, - {3025, {wxStyledTextCtrl, markerNext, 2}}, - {3026, {wxStyledTextCtrl, markerPrevious, 2}}, - {3027, {wxStyledTextCtrl, markerDefineBitmap, 2}}, - {3028, {wxStyledTextCtrl, markerAddSet, 2}}, - {3029, {wxStyledTextCtrl, markerSetAlpha, 2}}, - {3030, {wxStyledTextCtrl, setMarginType, 2}}, - {3031, {wxStyledTextCtrl, getMarginType, 1}}, - {3032, {wxStyledTextCtrl, setMarginWidth, 2}}, - {3033, {wxStyledTextCtrl, getMarginWidth, 1}}, - {3034, {wxStyledTextCtrl, setMarginMask, 2}}, - {3035, {wxStyledTextCtrl, getMarginMask, 1}}, - {3036, {wxStyledTextCtrl, setMarginSensitive, 2}}, - {3037, {wxStyledTextCtrl, getMarginSensitive, 1}}, - {3038, {wxStyledTextCtrl, styleClearAll, 0}}, - {3039, {wxStyledTextCtrl, styleSetForeground, 2}}, - {3040, {wxStyledTextCtrl, styleSetBackground, 2}}, - {3041, {wxStyledTextCtrl, styleSetBold, 2}}, - {3042, {wxStyledTextCtrl, styleSetItalic, 2}}, - {3043, {wxStyledTextCtrl, styleSetSize, 2}}, - {3044, {wxStyledTextCtrl, styleSetFaceName, 2}}, - {3045, {wxStyledTextCtrl, styleSetEOLFilled, 2}}, - {3046, {wxStyledTextCtrl, styleResetDefault, 0}}, - {3047, {wxStyledTextCtrl, styleSetUnderline, 2}}, - {3048, {wxStyledTextCtrl, styleSetCase, 2}}, - {3049, {wxStyledTextCtrl, styleSetHotSpot, 2}}, - {3050, {wxStyledTextCtrl, setSelForeground, 2}}, - {3051, {wxStyledTextCtrl, setSelBackground, 2}}, - {3052, {wxStyledTextCtrl, getSelAlpha, 0}}, - {3053, {wxStyledTextCtrl, setSelAlpha, 1}}, - {3054, {wxStyledTextCtrl, setCaretForeground, 1}}, - {3055, {wxStyledTextCtrl, cmdKeyAssign, 3}}, - {3056, {wxStyledTextCtrl, cmdKeyClear, 2}}, - {3057, {wxStyledTextCtrl, cmdKeyClearAll, 0}}, - {3058, {wxStyledTextCtrl, setStyleBytes, 2}}, - {3059, {wxStyledTextCtrl, styleSetVisible, 2}}, - {3060, {wxStyledTextCtrl, getCaretPeriod, 0}}, - {3061, {wxStyledTextCtrl, setCaretPeriod, 1}}, - {3062, {wxStyledTextCtrl, setWordChars, 1}}, - {3063, {wxStyledTextCtrl, beginUndoAction, 0}}, - {3064, {wxStyledTextCtrl, endUndoAction, 0}}, - {3065, {wxStyledTextCtrl, indicatorSetStyle, 2}}, - {3066, {wxStyledTextCtrl, indicatorGetStyle, 1}}, - {3067, {wxStyledTextCtrl, indicatorSetForeground, 2}}, - {3068, {wxStyledTextCtrl, indicatorGetForeground, 1}}, - {3069, {wxStyledTextCtrl, setWhitespaceForeground, 2}}, - {3070, {wxStyledTextCtrl, setWhitespaceBackground, 2}}, - {3071, {wxStyledTextCtrl, getStyleBits, 0}}, - {3072, {wxStyledTextCtrl, setLineState, 2}}, - {3073, {wxStyledTextCtrl, getLineState, 1}}, - {3074, {wxStyledTextCtrl, getMaxLineState, 0}}, - {3075, {wxStyledTextCtrl, getCaretLineVisible, 0}}, - {3076, {wxStyledTextCtrl, setCaretLineVisible, 1}}, - {3077, {wxStyledTextCtrl, getCaretLineBackground, 0}}, - {3078, {wxStyledTextCtrl, setCaretLineBackground, 1}}, - {3079, {wxStyledTextCtrl, autoCompShow, 2}}, - {3080, {wxStyledTextCtrl, autoCompCancel, 0}}, - {3081, {wxStyledTextCtrl, autoCompActive, 0}}, - {3082, {wxStyledTextCtrl, autoCompPosStart, 0}}, - {3083, {wxStyledTextCtrl, autoCompComplete, 0}}, - {3084, {wxStyledTextCtrl, autoCompStops, 1}}, - {3085, {wxStyledTextCtrl, autoCompSetSeparator, 1}}, - {3086, {wxStyledTextCtrl, autoCompGetSeparator, 0}}, - {3087, {wxStyledTextCtrl, autoCompSelect, 1}}, - {3088, {wxStyledTextCtrl, autoCompSetCancelAtStart, 1}}, - {3089, {wxStyledTextCtrl, autoCompGetCancelAtStart, 0}}, - {3090, {wxStyledTextCtrl, autoCompSetFillUps, 1}}, - {3091, {wxStyledTextCtrl, autoCompSetChooseSingle, 1}}, - {3092, {wxStyledTextCtrl, autoCompGetChooseSingle, 0}}, - {3093, {wxStyledTextCtrl, autoCompSetIgnoreCase, 1}}, - {3094, {wxStyledTextCtrl, autoCompGetIgnoreCase, 0}}, - {3095, {wxStyledTextCtrl, userListShow, 2}}, - {3096, {wxStyledTextCtrl, autoCompSetAutoHide, 1}}, - {3097, {wxStyledTextCtrl, autoCompGetAutoHide, 0}}, - {3098, {wxStyledTextCtrl, autoCompSetDropRestOfWord, 1}}, - {3099, {wxStyledTextCtrl, autoCompGetDropRestOfWord, 0}}, - {3100, {wxStyledTextCtrl, registerImage, 2}}, - {3101, {wxStyledTextCtrl, clearRegisteredImages, 0}}, - {3102, {wxStyledTextCtrl, autoCompGetTypeSeparator, 0}}, - {3103, {wxStyledTextCtrl, autoCompSetTypeSeparator, 1}}, - {3104, {wxStyledTextCtrl, autoCompSetMaxWidth, 1}}, - {3105, {wxStyledTextCtrl, autoCompGetMaxWidth, 0}}, - {3106, {wxStyledTextCtrl, autoCompSetMaxHeight, 1}}, - {3107, {wxStyledTextCtrl, autoCompGetMaxHeight, 0}}, - {3108, {wxStyledTextCtrl, setIndent, 1}}, - {3109, {wxStyledTextCtrl, getIndent, 0}}, - {3110, {wxStyledTextCtrl, setUseTabs, 1}}, - {3111, {wxStyledTextCtrl, getUseTabs, 0}}, - {3112, {wxStyledTextCtrl, setLineIndentation, 2}}, - {3113, {wxStyledTextCtrl, getLineIndentation, 1}}, - {3114, {wxStyledTextCtrl, getLineIndentPosition, 1}}, - {3115, {wxStyledTextCtrl, getColumn, 1}}, - {3116, {wxStyledTextCtrl, setUseHorizontalScrollBar, 1}}, - {3117, {wxStyledTextCtrl, getUseHorizontalScrollBar, 0}}, - {3118, {wxStyledTextCtrl, setIndentationGuides, 1}}, - {3119, {wxStyledTextCtrl, getIndentationGuides, 0}}, - {3120, {wxStyledTextCtrl, setHighlightGuide, 1}}, - {3121, {wxStyledTextCtrl, getHighlightGuide, 0}}, - {3122, {wxStyledTextCtrl, getLineEndPosition, 1}}, - {3123, {wxStyledTextCtrl, getCodePage, 0}}, - {3124, {wxStyledTextCtrl, getCaretForeground, 0}}, - {3125, {wxStyledTextCtrl, getReadOnly, 0}}, - {3126, {wxStyledTextCtrl, setCurrentPos, 1}}, - {3127, {wxStyledTextCtrl, setSelectionStart, 1}}, - {3128, {wxStyledTextCtrl, getSelectionStart, 0}}, - {3129, {wxStyledTextCtrl, setSelectionEnd, 1}}, - {3130, {wxStyledTextCtrl, getSelectionEnd, 0}}, - {3131, {wxStyledTextCtrl, setPrintMagnification, 1}}, - {3132, {wxStyledTextCtrl, getPrintMagnification, 0}}, - {3133, {wxStyledTextCtrl, setPrintColourMode, 1}}, - {3134, {wxStyledTextCtrl, getPrintColourMode, 0}}, - {3135, {wxStyledTextCtrl, findText, 4}}, - {3136, {wxStyledTextCtrl, formatRange, 7}}, - {3137, {wxStyledTextCtrl, getFirstVisibleLine, 0}}, - {3138, {wxStyledTextCtrl, getLine, 1}}, - {3139, {wxStyledTextCtrl, getLineCount, 0}}, - {3140, {wxStyledTextCtrl, setMarginLeft, 1}}, - {3141, {wxStyledTextCtrl, getMarginLeft, 0}}, - {3142, {wxStyledTextCtrl, setMarginRight, 1}}, - {3143, {wxStyledTextCtrl, getMarginRight, 0}}, - {3144, {wxStyledTextCtrl, getModify, 0}}, - {3145, {wxStyledTextCtrl, setSelection, 2}}, - {3146, {wxStyledTextCtrl, getSelectedText, 0}}, - {3147, {wxStyledTextCtrl, getTextRange, 2}}, - {3148, {wxStyledTextCtrl, hideSelection, 1}}, - {3149, {wxStyledTextCtrl, lineFromPosition, 1}}, - {3150, {wxStyledTextCtrl, positionFromLine, 1}}, - {3151, {wxStyledTextCtrl, lineScroll, 2}}, - {3152, {wxStyledTextCtrl, ensureCaretVisible, 0}}, - {3153, {wxStyledTextCtrl, replaceSelection, 1}}, - {3154, {wxStyledTextCtrl, setReadOnly, 1}}, - {3155, {wxStyledTextCtrl, canPaste, 0}}, - {3156, {wxStyledTextCtrl, canUndo, 0}}, - {3157, {wxStyledTextCtrl, emptyUndoBuffer, 0}}, - {3158, {wxStyledTextCtrl, undo, 0}}, - {3159, {wxStyledTextCtrl, cut, 0}}, - {3160, {wxStyledTextCtrl, copy, 0}}, - {3161, {wxStyledTextCtrl, paste, 0}}, - {3162, {wxStyledTextCtrl, clear, 0}}, - {3163, {wxStyledTextCtrl, setText, 1}}, - {3164, {wxStyledTextCtrl, getText, 0}}, - {3165, {wxStyledTextCtrl, getTextLength, 0}}, - {3166, {wxStyledTextCtrl, getOvertype, 0}}, - {3167, {wxStyledTextCtrl, setCaretWidth, 1}}, - {3168, {wxStyledTextCtrl, getCaretWidth, 0}}, - {3169, {wxStyledTextCtrl, setTargetStart, 1}}, - {3170, {wxStyledTextCtrl, getTargetStart, 0}}, - {3171, {wxStyledTextCtrl, setTargetEnd, 1}}, - {3172, {wxStyledTextCtrl, getTargetEnd, 0}}, - {3173, {wxStyledTextCtrl, replaceTarget, 1}}, - {3174, {wxStyledTextCtrl, searchInTarget, 1}}, - {3175, {wxStyledTextCtrl, setSearchFlags, 1}}, - {3176, {wxStyledTextCtrl, getSearchFlags, 0}}, - {3177, {wxStyledTextCtrl, callTipShow, 2}}, - {3178, {wxStyledTextCtrl, callTipCancel, 0}}, - {3179, {wxStyledTextCtrl, callTipActive, 0}}, - {3180, {wxStyledTextCtrl, callTipPosAtStart, 0}}, - {3181, {wxStyledTextCtrl, callTipSetHighlight, 2}}, - {3182, {wxStyledTextCtrl, callTipSetBackground, 1}}, - {3183, {wxStyledTextCtrl, callTipSetForeground, 1}}, - {3184, {wxStyledTextCtrl, callTipSetForegroundHighlight, 1}}, - {3185, {wxStyledTextCtrl, callTipUseStyle, 1}}, - {3186, {wxStyledTextCtrl, visibleFromDocLine, 1}}, - {3187, {wxStyledTextCtrl, docLineFromVisible, 1}}, - {3188, {wxStyledTextCtrl, wrapCount, 1}}, - {3189, {wxStyledTextCtrl, setFoldLevel, 2}}, - {3190, {wxStyledTextCtrl, getFoldLevel, 1}}, - {3191, {wxStyledTextCtrl, getLastChild, 2}}, - {3192, {wxStyledTextCtrl, getFoldParent, 1}}, - {3193, {wxStyledTextCtrl, showLines, 2}}, - {3194, {wxStyledTextCtrl, hideLines, 2}}, - {3195, {wxStyledTextCtrl, getLineVisible, 1}}, - {3196, {wxStyledTextCtrl, setFoldExpanded, 2}}, - {3197, {wxStyledTextCtrl, getFoldExpanded, 1}}, - {3198, {wxStyledTextCtrl, toggleFold, 1}}, - {3199, {wxStyledTextCtrl, ensureVisible, 1}}, - {3200, {wxStyledTextCtrl, setFoldFlags, 1}}, - {3201, {wxStyledTextCtrl, ensureVisibleEnforcePolicy, 1}}, - {3202, {wxStyledTextCtrl, setTabIndents, 1}}, - {3203, {wxStyledTextCtrl, getTabIndents, 0}}, - {3204, {wxStyledTextCtrl, setBackSpaceUnIndents, 1}}, - {3205, {wxStyledTextCtrl, getBackSpaceUnIndents, 0}}, - {3206, {wxStyledTextCtrl, setMouseDwellTime, 1}}, - {3207, {wxStyledTextCtrl, getMouseDwellTime, 0}}, - {3208, {wxStyledTextCtrl, wordStartPosition, 2}}, - {3209, {wxStyledTextCtrl, wordEndPosition, 2}}, - {3210, {wxStyledTextCtrl, setWrapMode, 1}}, - {3211, {wxStyledTextCtrl, getWrapMode, 0}}, - {3212, {wxStyledTextCtrl, setWrapVisualFlags, 1}}, - {3213, {wxStyledTextCtrl, getWrapVisualFlags, 0}}, - {3214, {wxStyledTextCtrl, setWrapVisualFlagsLocation, 1}}, - {3215, {wxStyledTextCtrl, getWrapVisualFlagsLocation, 0}}, - {3216, {wxStyledTextCtrl, setWrapStartIndent, 1}}, - {3217, {wxStyledTextCtrl, getWrapStartIndent, 0}}, - {3218, {wxStyledTextCtrl, setLayoutCache, 1}}, - {3219, {wxStyledTextCtrl, getLayoutCache, 0}}, - {3220, {wxStyledTextCtrl, setScrollWidth, 1}}, - {3221, {wxStyledTextCtrl, getScrollWidth, 0}}, - {3222, {wxStyledTextCtrl, textWidth, 2}}, - {3223, {wxStyledTextCtrl, getEndAtLastLine, 0}}, - {3224, {wxStyledTextCtrl, textHeight, 1}}, - {3225, {wxStyledTextCtrl, setUseVerticalScrollBar, 1}}, - {3226, {wxStyledTextCtrl, getUseVerticalScrollBar, 0}}, - {3227, {wxStyledTextCtrl, appendText, 1}}, - {3228, {wxStyledTextCtrl, getTwoPhaseDraw, 0}}, - {3229, {wxStyledTextCtrl, setTwoPhaseDraw, 1}}, - {3230, {wxStyledTextCtrl, targetFromSelection, 0}}, - {3231, {wxStyledTextCtrl, linesJoin, 0}}, - {3232, {wxStyledTextCtrl, linesSplit, 1}}, - {3233, {wxStyledTextCtrl, setFoldMarginColour, 2}}, - {3234, {wxStyledTextCtrl, setFoldMarginHiColour, 2}}, - {3235, {wxStyledTextCtrl, lineDown, 0}}, - {3236, {wxStyledTextCtrl, lineDownExtend, 0}}, - {3237, {wxStyledTextCtrl, lineUp, 0}}, - {3238, {wxStyledTextCtrl, lineUpExtend, 0}}, - {3239, {wxStyledTextCtrl, charLeft, 0}}, - {3240, {wxStyledTextCtrl, charLeftExtend, 0}}, - {3241, {wxStyledTextCtrl, charRight, 0}}, - {3242, {wxStyledTextCtrl, charRightExtend, 0}}, - {3243, {wxStyledTextCtrl, wordLeft, 0}}, - {3244, {wxStyledTextCtrl, wordLeftExtend, 0}}, - {3245, {wxStyledTextCtrl, wordRight, 0}}, - {3246, {wxStyledTextCtrl, wordRightExtend, 0}}, - {3247, {wxStyledTextCtrl, home, 0}}, - {3248, {wxStyledTextCtrl, homeExtend, 0}}, - {3249, {wxStyledTextCtrl, lineEnd, 0}}, - {3250, {wxStyledTextCtrl, lineEndExtend, 0}}, - {3251, {wxStyledTextCtrl, documentStart, 0}}, - {3252, {wxStyledTextCtrl, documentStartExtend, 0}}, - {3253, {wxStyledTextCtrl, documentEnd, 0}}, - {3254, {wxStyledTextCtrl, documentEndExtend, 0}}, - {3255, {wxStyledTextCtrl, pageUp, 0}}, - {3256, {wxStyledTextCtrl, pageUpExtend, 0}}, - {3257, {wxStyledTextCtrl, pageDown, 0}}, - {3258, {wxStyledTextCtrl, pageDownExtend, 0}}, - {3259, {wxStyledTextCtrl, editToggleOvertype, 0}}, - {3260, {wxStyledTextCtrl, cancel, 0}}, - {3261, {wxStyledTextCtrl, deleteBack, 0}}, - {3262, {wxStyledTextCtrl, tab, 0}}, - {3263, {wxStyledTextCtrl, backTab, 0}}, - {3264, {wxStyledTextCtrl, newLine, 0}}, - {3265, {wxStyledTextCtrl, formFeed, 0}}, - {3266, {wxStyledTextCtrl, vCHome, 0}}, - {3267, {wxStyledTextCtrl, vCHomeExtend, 0}}, - {3268, {wxStyledTextCtrl, zoomIn, 0}}, - {3269, {wxStyledTextCtrl, zoomOut, 0}}, - {3270, {wxStyledTextCtrl, delWordLeft, 0}}, - {3271, {wxStyledTextCtrl, delWordRight, 0}}, - {3272, {wxStyledTextCtrl, lineCut, 0}}, - {3273, {wxStyledTextCtrl, lineDelete, 0}}, - {3274, {wxStyledTextCtrl, lineTranspose, 0}}, - {3275, {wxStyledTextCtrl, lineDuplicate, 0}}, - {3276, {wxStyledTextCtrl, lowerCase, 0}}, - {3277, {wxStyledTextCtrl, upperCase, 0}}, - {3278, {wxStyledTextCtrl, lineScrollDown, 0}}, - {3279, {wxStyledTextCtrl, lineScrollUp, 0}}, - {3280, {wxStyledTextCtrl, deleteBackNotLine, 0}}, - {3281, {wxStyledTextCtrl, homeDisplay, 0}}, - {3282, {wxStyledTextCtrl, homeDisplayExtend, 0}}, - {3283, {wxStyledTextCtrl, lineEndDisplay, 0}}, - {3284, {wxStyledTextCtrl, lineEndDisplayExtend, 0}}, - {3285, {wxStyledTextCtrl, homeWrapExtend, 0}}, - {3286, {wxStyledTextCtrl, lineEndWrap, 0}}, - {3287, {wxStyledTextCtrl, lineEndWrapExtend, 0}}, - {3288, {wxStyledTextCtrl, vCHomeWrap, 0}}, - {3289, {wxStyledTextCtrl, vCHomeWrapExtend, 0}}, - {3290, {wxStyledTextCtrl, lineCopy, 0}}, - {3291, {wxStyledTextCtrl, moveCaretInsideView, 0}}, - {3292, {wxStyledTextCtrl, lineLength, 1}}, - {3293, {wxStyledTextCtrl, braceHighlight, 2}}, - {3294, {wxStyledTextCtrl, braceBadLight, 1}}, - {3295, {wxStyledTextCtrl, braceMatch, 1}}, - {3296, {wxStyledTextCtrl, getViewEOL, 0}}, - {3297, {wxStyledTextCtrl, setViewEOL, 1}}, - {3298, {wxStyledTextCtrl, setModEventMask, 1}}, - {3299, {wxStyledTextCtrl, getEdgeColumn, 0}}, - {3300, {wxStyledTextCtrl, setEdgeColumn, 1}}, - {3301, {wxStyledTextCtrl, setEdgeMode, 1}}, - {3302, {wxStyledTextCtrl, getEdgeMode, 0}}, - {3303, {wxStyledTextCtrl, getEdgeColour, 0}}, - {3304, {wxStyledTextCtrl, setEdgeColour, 1}}, - {3305, {wxStyledTextCtrl, searchAnchor, 0}}, - {3306, {wxStyledTextCtrl, searchNext, 2}}, - {3307, {wxStyledTextCtrl, searchPrev, 2}}, - {3308, {wxStyledTextCtrl, linesOnScreen, 0}}, - {3309, {wxStyledTextCtrl, usePopUp, 1}}, - {3310, {wxStyledTextCtrl, selectionIsRectangle, 0}}, - {3311, {wxStyledTextCtrl, setZoom, 1}}, - {3312, {wxStyledTextCtrl, getZoom, 0}}, - {3313, {wxStyledTextCtrl, getModEventMask, 0}}, - {3314, {wxStyledTextCtrl, setSTCFocus, 1}}, - {3315, {wxStyledTextCtrl, getSTCFocus, 0}}, - {3316, {wxStyledTextCtrl, setStatus, 1}}, - {3317, {wxStyledTextCtrl, getStatus, 0}}, - {3318, {wxStyledTextCtrl, setMouseDownCaptures, 1}}, - {3319, {wxStyledTextCtrl, getMouseDownCaptures, 0}}, - {3320, {wxStyledTextCtrl, setSTCCursor, 1}}, - {3321, {wxStyledTextCtrl, getSTCCursor, 0}}, - {3322, {wxStyledTextCtrl, setControlCharSymbol, 1}}, - {3323, {wxStyledTextCtrl, getControlCharSymbol, 0}}, - {3324, {wxStyledTextCtrl, wordPartLeft, 0}}, - {3325, {wxStyledTextCtrl, wordPartLeftExtend, 0}}, - {3326, {wxStyledTextCtrl, wordPartRight, 0}}, - {3327, {wxStyledTextCtrl, wordPartRightExtend, 0}}, - {3328, {wxStyledTextCtrl, setVisiblePolicy, 2}}, - {3329, {wxStyledTextCtrl, delLineLeft, 0}}, - {3330, {wxStyledTextCtrl, delLineRight, 0}}, - {3331, {wxStyledTextCtrl, getXOffset, 0}}, - {3332, {wxStyledTextCtrl, chooseCaretX, 0}}, - {3333, {wxStyledTextCtrl, setXCaretPolicy, 2}}, - {3334, {wxStyledTextCtrl, setYCaretPolicy, 2}}, - {3335, {wxStyledTextCtrl, getPrintWrapMode, 0}}, - {3336, {wxStyledTextCtrl, setHotspotActiveForeground, 2}}, - {3337, {wxStyledTextCtrl, setHotspotActiveBackground, 2}}, - {3338, {wxStyledTextCtrl, setHotspotActiveUnderline, 1}}, - {3339, {wxStyledTextCtrl, setHotspotSingleLine, 1}}, - {3340, {wxStyledTextCtrl, paraDownExtend, 0}}, - {3341, {wxStyledTextCtrl, paraUp, 0}}, - {3342, {wxStyledTextCtrl, paraUpExtend, 0}}, - {3343, {wxStyledTextCtrl, positionBefore, 1}}, - {3344, {wxStyledTextCtrl, positionAfter, 1}}, - {3345, {wxStyledTextCtrl, copyRange, 2}}, - {3346, {wxStyledTextCtrl, copyText, 2}}, - {3347, {wxStyledTextCtrl, setSelectionMode, 1}}, - {3348, {wxStyledTextCtrl, getSelectionMode, 0}}, - {3349, {wxStyledTextCtrl, lineDownRectExtend, 0}}, - {3350, {wxStyledTextCtrl, lineUpRectExtend, 0}}, - {3351, {wxStyledTextCtrl, charLeftRectExtend, 0}}, - {3352, {wxStyledTextCtrl, charRightRectExtend, 0}}, - {3353, {wxStyledTextCtrl, homeRectExtend, 0}}, - {3354, {wxStyledTextCtrl, vCHomeRectExtend, 0}}, - {3355, {wxStyledTextCtrl, lineEndRectExtend, 0}}, - {3356, {wxStyledTextCtrl, pageUpRectExtend, 0}}, - {3357, {wxStyledTextCtrl, pageDownRectExtend, 0}}, - {3358, {wxStyledTextCtrl, stutteredPageUp, 0}}, - {3359, {wxStyledTextCtrl, stutteredPageUpExtend, 0}}, - {3360, {wxStyledTextCtrl, stutteredPageDown, 0}}, - {3361, {wxStyledTextCtrl, stutteredPageDownExtend, 0}}, - {3362, {wxStyledTextCtrl, wordLeftEnd, 0}}, - {3363, {wxStyledTextCtrl, wordLeftEndExtend, 0}}, - {3364, {wxStyledTextCtrl, wordRightEnd, 0}}, - {3365, {wxStyledTextCtrl, wordRightEndExtend, 0}}, - {3366, {wxStyledTextCtrl, setWhitespaceChars, 1}}, - {3367, {wxStyledTextCtrl, setCharsDefault, 0}}, - {3368, {wxStyledTextCtrl, autoCompGetCurrent, 0}}, - {3369, {wxStyledTextCtrl, allocate, 1}}, - {3370, {wxStyledTextCtrl, findColumn, 2}}, - {3371, {wxStyledTextCtrl, getCaretSticky, 0}}, - {3372, {wxStyledTextCtrl, setCaretSticky, 1}}, - {3373, {wxStyledTextCtrl, toggleCaretSticky, 0}}, - {3374, {wxStyledTextCtrl, setPasteConvertEndings, 1}}, - {3375, {wxStyledTextCtrl, getPasteConvertEndings, 0}}, - {3376, {wxStyledTextCtrl, selectionDuplicate, 0}}, - {3377, {wxStyledTextCtrl, setCaretLineBackAlpha, 1}}, - {3378, {wxStyledTextCtrl, getCaretLineBackAlpha, 0}}, - {3379, {wxStyledTextCtrl, startRecord, 0}}, - {3380, {wxStyledTextCtrl, stopRecord, 0}}, - {3381, {wxStyledTextCtrl, setLexer, 1}}, - {3382, {wxStyledTextCtrl, getLexer, 0}}, - {3383, {wxStyledTextCtrl, colourise, 2}}, - {3384, {wxStyledTextCtrl, setProperty, 2}}, - {3385, {wxStyledTextCtrl, setKeyWords, 2}}, - {3386, {wxStyledTextCtrl, setLexerLanguage, 1}}, - {3387, {wxStyledTextCtrl, getProperty, 1}}, - {3388, {wxStyledTextCtrl, getStyleBitsNeeded, 0}}, - {3389, {wxStyledTextCtrl, getCurrentLine, 0}}, - {3390, {wxStyledTextCtrl, styleSetSpec, 2}}, - {3391, {wxStyledTextCtrl, styleSetFont, 2}}, - {3392, {wxStyledTextCtrl, styleSetFontAttr, 7}}, - {3393, {wxStyledTextCtrl, styleSetCharacterSet, 2}}, - {3394, {wxStyledTextCtrl, styleSetFontEncoding, 2}}, - {3395, {wxStyledTextCtrl, cmdKeyExecute, 1}}, - {3396, {wxStyledTextCtrl, setMargins, 2}}, - {3397, {wxStyledTextCtrl, getSelection, 2}}, - {3398, {wxStyledTextCtrl, pointFromPosition, 1}}, - {3399, {wxStyledTextCtrl, scrollToLine, 1}}, - {3400, {wxStyledTextCtrl, scrollToColumn, 1}}, - {3401, {wxStyledTextCtrl, setVScrollBar, 1}}, - {3402, {wxStyledTextCtrl, setHScrollBar, 1}}, - {3403, {wxStyledTextCtrl, getLastKeydownProcessed, 0}}, - {3404, {wxStyledTextCtrl, setLastKeydownProcessed, 1}}, - {3405, {wxStyledTextCtrl, saveFile, 1}}, - {3406, {wxStyledTextCtrl, loadFile, 1}}, - {3407, {wxStyledTextCtrl, doDragOver, 3}}, - {3408, {wxStyledTextCtrl, doDropText, 3}}, - {3409, {wxStyledTextCtrl, getUseAntiAliasing, 0}}, - {3410, {wxStyledTextCtrl, addTextRaw, 1}}, - {3411, {wxStyledTextCtrl, insertTextRaw, 2}}, - {3412, {wxStyledTextCtrl, getCurLineRaw, 1}}, - {3413, {wxStyledTextCtrl, getLineRaw, 1}}, - {3414, {wxStyledTextCtrl, getSelectedTextRaw, 0}}, - {3415, {wxStyledTextCtrl, getTextRangeRaw, 2}}, - {3416, {wxStyledTextCtrl, setTextRaw, 1}}, - {3417, {wxStyledTextCtrl, getTextRaw, 0}}, - {3418, {wxStyledTextCtrl, appendTextRaw, 1}}, - {3419, {wxArtProvider, getBitmap, 2}}, - {3420, {wxArtProvider, getIcon, 2}}, - {3421, {wxTreeEvent, getKeyCode, 0}}, - {3422, {wxTreeEvent, getItem, 0}}, - {3423, {wxTreeEvent, getKeyEvent, 0}}, - {3424, {wxTreeEvent, getLabel, 0}}, - {3425, {wxTreeEvent, getOldItem, 0}}, - {3426, {wxTreeEvent, getPoint, 0}}, - {3427, {wxTreeEvent, isEditCancelled, 0}}, - {3428, {wxTreeEvent, setToolTip, 1}}, - {3429, {wxNotebookEvent, getOldSelection, 0}}, - {3430, {wxNotebookEvent, getSelection, 0}}, - {3431, {wxNotebookEvent, setOldSelection, 1}}, - {3432, {wxNotebookEvent, setSelection, 1}}, - {3433, {wxFileDataObject, new, 0}}, - {3434, {wxFileDataObject, addFile, 1}}, - {3435, {wxFileDataObject, getFilenames, 0}}, - {3436, {wxFileDataObject, 'Destroy', undefined}}, - {3437, {wxTextDataObject, new, 1}}, - {3438, {wxTextDataObject, getTextLength, 0}}, - {3439, {wxTextDataObject, getText, 0}}, - {3440, {wxTextDataObject, setText, 1}}, - {3441, {wxTextDataObject, 'Destroy', undefined}}, - {3442, {wxBitmapDataObject, new_1_1, 1}}, - {3443, {wxBitmapDataObject, new_1_0, 1}}, - {3444, {wxBitmapDataObject, getBitmap, 0}}, - {3445, {wxBitmapDataObject, setBitmap, 1}}, - {3446, {wxBitmapDataObject, 'Destroy', undefined}}, - {3448, {wxClipboard, new, 0}}, - {3449, {wxClipboard, destruct, 0}}, - {3450, {wxClipboard, addData, 1}}, - {3451, {wxClipboard, clear, 0}}, - {3452, {wxClipboard, close, 0}}, - {3453, {wxClipboard, flush, 0}}, - {3454, {wxClipboard, getData, 1}}, - {3455, {wxClipboard, isOpened, 0}}, - {3456, {wxClipboard, open, 0}}, - {3457, {wxClipboard, setData, 1}}, - {3459, {wxClipboard, usePrimarySelection, 1}}, - {3460, {wxClipboard, isSupported, 1}}, - {3461, {wxClipboard, get, 0}}, - {3462, {wxSpinEvent, getPosition, 0}}, - {3463, {wxSpinEvent, setPosition, 1}}, - {3464, {wxSplitterWindow, new_0, 0}}, - {3465, {wxSplitterWindow, new_2, 2}}, - {3466, {wxSplitterWindow, destruct, 0}}, - {3467, {wxSplitterWindow, create, 2}}, - {3468, {wxSplitterWindow, getMinimumPaneSize, 0}}, - {3469, {wxSplitterWindow, getSashGravity, 0}}, - {3470, {wxSplitterWindow, getSashPosition, 0}}, - {3471, {wxSplitterWindow, getSplitMode, 0}}, - {3472, {wxSplitterWindow, getWindow1, 0}}, - {3473, {wxSplitterWindow, getWindow2, 0}}, - {3474, {wxSplitterWindow, initialize, 1}}, - {3475, {wxSplitterWindow, isSplit, 0}}, - {3476, {wxSplitterWindow, replaceWindow, 2}}, - {3477, {wxSplitterWindow, setSashGravity, 1}}, - {3478, {wxSplitterWindow, setSashPosition, 2}}, - {3479, {wxSplitterWindow, setSashSize, 1}}, - {3480, {wxSplitterWindow, setMinimumPaneSize, 1}}, - {3481, {wxSplitterWindow, setSplitMode, 1}}, - {3482, {wxSplitterWindow, splitHorizontally, 3}}, - {3483, {wxSplitterWindow, splitVertically, 3}}, - {3484, {wxSplitterWindow, unsplit, 1}}, - {3485, {wxSplitterWindow, updateSize, 0}}, - {3486, {wxSplitterEvent, getSashPosition, 0}}, - {3487, {wxSplitterEvent, getX, 0}}, - {3488, {wxSplitterEvent, getY, 0}}, - {3489, {wxSplitterEvent, getWindowBeingRemoved, 0}}, - {3490, {wxSplitterEvent, setSashPosition, 1}}, - {3491, {wxHtmlWindow, new_0, 0}}, - {3492, {wxHtmlWindow, new_2, 2}}, - {3493, {wxHtmlWindow, appendToPage, 1}}, - {3494, {wxHtmlWindow, getOpenedAnchor, 0}}, - {3495, {wxHtmlWindow, getOpenedPage, 0}}, - {3496, {wxHtmlWindow, getOpenedPageTitle, 0}}, - {3497, {wxHtmlWindow, getRelatedFrame, 0}}, - {3498, {wxHtmlWindow, historyBack, 0}}, - {3499, {wxHtmlWindow, historyCanBack, 0}}, - {3500, {wxHtmlWindow, historyCanForward, 0}}, - {3501, {wxHtmlWindow, historyClear, 0}}, - {3502, {wxHtmlWindow, historyForward, 0}}, - {3503, {wxHtmlWindow, loadFile, 1}}, - {3504, {wxHtmlWindow, loadPage, 1}}, - {3505, {wxHtmlWindow, selectAll, 0}}, - {3506, {wxHtmlWindow, selectionToText, 0}}, - {3507, {wxHtmlWindow, selectLine, 1}}, - {3508, {wxHtmlWindow, selectWord, 1}}, - {3509, {wxHtmlWindow, setBorders, 1}}, - {3510, {wxHtmlWindow, setFonts, 3}}, - {3511, {wxHtmlWindow, setPage, 1}}, - {3512, {wxHtmlWindow, setRelatedFrame, 2}}, - {3513, {wxHtmlWindow, setRelatedStatusBar, 1}}, - {3514, {wxHtmlWindow, toText, 0}}, - {3515, {wxHtmlWindow, 'Destroy', undefined}}, - {3516, {wxHtmlLinkEvent, getLinkInfo, 0}}, - {3517, {wxSystemSettings, getColour, 1}}, - {3518, {wxSystemSettings, getFont, 1}}, - {3519, {wxSystemSettings, getMetric, 2}}, - {3520, {wxSystemSettings, getScreenType, 0}}, - {3521, {wxSystemOptions, getOption, 1}}, - {3522, {wxSystemOptions, getOptionInt, 1}}, - {3523, {wxSystemOptions, hasOption, 1}}, - {3524, {wxSystemOptions, isFalse, 1}}, - {3525, {wxSystemOptions, setOption_2_1, 2}}, - {3526, {wxSystemOptions, setOption_2_0, 2}}, - {3527, {wxAuiNotebookEvent, setSelection, 1}}, - {3528, {wxAuiNotebookEvent, getSelection, 0}}, - {3529, {wxAuiNotebookEvent, setOldSelection, 1}}, - {3530, {wxAuiNotebookEvent, getOldSelection, 0}}, - {3531, {wxAuiNotebookEvent, setDragSource, 1}}, - {3532, {wxAuiNotebookEvent, getDragSource, 0}}, - {3533, {wxAuiManagerEvent, setManager, 1}}, - {3534, {wxAuiManagerEvent, getManager, 0}}, - {3535, {wxAuiManagerEvent, setPane, 1}}, - {3536, {wxAuiManagerEvent, getPane, 0}}, - {3537, {wxAuiManagerEvent, setButton, 1}}, - {3538, {wxAuiManagerEvent, getButton, 0}}, - {3539, {wxAuiManagerEvent, setDC, 1}}, - {3540, {wxAuiManagerEvent, getDC, 0}}, - {3541, {wxAuiManagerEvent, veto, 1}}, - {3542, {wxAuiManagerEvent, getVeto, 0}}, - {3543, {wxAuiManagerEvent, setCanVeto, 1}}, - {3544, {wxAuiManagerEvent, canVeto, 0}}, - {3545, {wxLogNull, new, 0}}, - {3546, {wxLogNull, 'Destroy', undefined}}, - {3547, {wxTaskBarIcon, new, 0}}, - {3548, {wxTaskBarIcon, destruct, 0}}, - {3549, {wxTaskBarIcon, popupMenu, 1}}, - {3550, {wxTaskBarIcon, removeIcon, 0}}, - {3551, {wxTaskBarIcon, setIcon, 2}}, - {3552, {wxLocale, new_0, 0}}, - {3554, {wxLocale, new_2, 2}}, - {3555, {wxLocale, destruct, 0}}, - {3557, {wxLocale, init, 1}}, - {3558, {wxLocale, addCatalog_1, 1}}, - {3559, {wxLocale, addCatalog_3, 3}}, - {3560, {wxLocale, addCatalogLookupPathPrefix, 1}}, - {3561, {wxLocale, getCanonicalName, 0}}, - {3562, {wxLocale, getLanguage, 0}}, - {3563, {wxLocale, getLanguageName, 1}}, - {3564, {wxLocale, getLocale, 0}}, - {3565, {wxLocale, getName, 0}}, - {3566, {wxLocale, getString_2, 2}}, - {3567, {wxLocale, getString_4, 4}}, - {3568, {wxLocale, getHeaderValue, 2}}, - {3569, {wxLocale, getSysName, 0}}, - {3570, {wxLocale, getSystemEncoding, 0}}, - {3571, {wxLocale, getSystemEncodingName, 0}}, - {3572, {wxLocale, getSystemLanguage, 0}}, - {3573, {wxLocale, isLoaded, 1}}, - {3574, {wxLocale, isOk, 0}}, - {3575, {wxActivateEvent, getActive, 0}}, - {3577, {wxPopupWindow, new_2, 2}}, - {3578, {wxPopupWindow, new_0, 0}}, - {3580, {wxPopupWindow, destruct, 0}}, - {3581, {wxPopupWindow, create, 2}}, - {3582, {wxPopupWindow, position, 2}}, - {3583, {wxPopupTransientWindow, new_0, 0}}, - {3584, {wxPopupTransientWindow, new_2, 2}}, - {3585, {wxPopupTransientWindow, destruct, 0}}, - {3586, {wxPopupTransientWindow, popup, 1}}, - {3587, {wxPopupTransientWindow, dismiss, 0}}, - {3588, {wxOverlay, new, 0}}, - {3589, {wxOverlay, destruct, 0}}, - {3590, {wxOverlay, reset, 0}}, - {3591, {wxDCOverlay, new_6, 6}}, - {3592, {wxDCOverlay, new_2, 2}}, - {3593, {wxDCOverlay, destruct, 0}}, - {3594, {wxDCOverlay, clear, 0}}, + {284, {wxWindow, setTransparent, 1}}, + {285, {wxWindow, canSetTransparent, 0}}, + {286, {wxWindow, isDoubleBuffered, 0}}, + {287, {wxWindow, setDoubleBuffered, 1}}, + {288, {wxTopLevelWindow, getIcon, 0}}, + {289, {wxTopLevelWindow, getIcons, 0}}, + {290, {wxTopLevelWindow, getTitle, 0}}, + {291, {wxTopLevelWindow, isActive, 0}}, + {292, {wxTopLevelWindow, iconize, 1}}, + {293, {wxTopLevelWindow, isFullScreen, 0}}, + {294, {wxTopLevelWindow, isIconized, 0}}, + {295, {wxTopLevelWindow, isMaximized, 0}}, + {296, {wxTopLevelWindow, maximize, 1}}, + {297, {wxTopLevelWindow, requestUserAttention, 1}}, + {298, {wxTopLevelWindow, setIcon, 1}}, + {299, {wxTopLevelWindow, setIcons, 1}}, + {300, {wxTopLevelWindow, centerOnScreen, 1}}, + {301, {wxTopLevelWindow, centreOnScreen, 1}}, + {303, {wxTopLevelWindow, setShape, 1}}, + {304, {wxTopLevelWindow, setTitle, 1}}, + {305, {wxTopLevelWindow, showFullScreen, 2}}, + {307, {wxFrame, new_4, 4}}, + {308, {wxFrame, new_0, 0}}, + {310, {wxFrame, destruct, 0}}, + {311, {wxFrame, create, 4}}, + {312, {wxFrame, createStatusBar, 1}}, + {313, {wxFrame, createToolBar, 1}}, + {314, {wxFrame, getClientAreaOrigin, 0}}, + {315, {wxFrame, getMenuBar, 0}}, + {316, {wxFrame, getStatusBar, 0}}, + {317, {wxFrame, getStatusBarPane, 0}}, + {318, {wxFrame, getToolBar, 0}}, + {319, {wxFrame, processCommand, 1}}, + {320, {wxFrame, sendSizeEvent, 0}}, + {321, {wxFrame, setMenuBar, 1}}, + {322, {wxFrame, setStatusBar, 1}}, + {323, {wxFrame, setStatusBarPane, 1}}, + {324, {wxFrame, setStatusText, 2}}, + {325, {wxFrame, setStatusWidths, 2}}, + {326, {wxFrame, setToolBar, 1}}, + {327, {wxMiniFrame, new_0, 0}}, + {328, {wxMiniFrame, new_4, 4}}, + {329, {wxMiniFrame, create, 4}}, + {330, {wxMiniFrame, 'Destroy', undefined}}, + {331, {wxSplashScreen, new_0, 0}}, + {332, {wxSplashScreen, new_6, 6}}, + {333, {wxSplashScreen, destruct, 0}}, + {334, {wxSplashScreen, getSplashStyle, 0}}, + {335, {wxSplashScreen, getTimeout, 0}}, + {336, {wxPanel, new_0, 0}}, + {337, {wxPanel, new_6, 6}}, + {338, {wxPanel, new_2, 2}}, + {339, {wxPanel, destruct, 0}}, + {340, {wxPanel, initDialog, 0}}, + {341, {wxPanel, setFocusIgnoringChildren, 0}}, + {342, {wxScrolledWindow, new_0, 0}}, + {343, {wxScrolledWindow, new_2, 2}}, + {344, {wxScrolledWindow, destruct, 0}}, + {345, {wxScrolledWindow, calcScrolledPosition_4, 4}}, + {346, {wxScrolledWindow, calcScrolledPosition_1, 1}}, + {347, {wxScrolledWindow, calcUnscrolledPosition_4, 4}}, + {348, {wxScrolledWindow, calcUnscrolledPosition_1, 1}}, + {349, {wxScrolledWindow, enableScrolling, 2}}, + {350, {wxScrolledWindow, getScrollPixelsPerUnit, 2}}, + {351, {wxScrolledWindow, getViewStart, 2}}, + {352, {wxScrolledWindow, doPrepareDC, 1}}, + {353, {wxScrolledWindow, prepareDC, 1}}, + {354, {wxScrolledWindow, scroll, 2}}, + {355, {wxScrolledWindow, setScrollbars, 5}}, + {356, {wxScrolledWindow, setScrollRate, 2}}, + {357, {wxScrolledWindow, setTargetWindow, 1}}, + {358, {wxSashWindow, new_0, 0}}, + {359, {wxSashWindow, new_2, 2}}, + {360, {wxSashWindow, destruct, 0}}, + {361, {wxSashWindow, getSashVisible, 1}}, + {362, {wxSashWindow, getMaximumSizeX, 0}}, + {363, {wxSashWindow, getMaximumSizeY, 0}}, + {364, {wxSashWindow, getMinimumSizeX, 0}}, + {365, {wxSashWindow, getMinimumSizeY, 0}}, + {366, {wxSashWindow, setMaximumSizeX, 1}}, + {367, {wxSashWindow, setMaximumSizeY, 1}}, + {368, {wxSashWindow, setMinimumSizeX, 1}}, + {369, {wxSashWindow, setMinimumSizeY, 1}}, + {370, {wxSashWindow, setSashVisible, 2}}, + {371, {wxSashLayoutWindow, new_0, 0}}, + {372, {wxSashLayoutWindow, new_2, 2}}, + {373, {wxSashLayoutWindow, create, 2}}, + {374, {wxSashLayoutWindow, getAlignment, 0}}, + {375, {wxSashLayoutWindow, getOrientation, 0}}, + {376, {wxSashLayoutWindow, setAlignment, 1}}, + {377, {wxSashLayoutWindow, setDefaultSize, 1}}, + {378, {wxSashLayoutWindow, setOrientation, 1}}, + {379, {wxSashLayoutWindow, 'Destroy', undefined}}, + {380, {wxGrid, new_0, 0}}, + {381, {wxGrid, new_3, 3}}, + {382, {wxGrid, new_4, 4}}, + {383, {wxGrid, destruct, 0}}, + {384, {wxGrid, appendCols, 1}}, + {385, {wxGrid, appendRows, 1}}, + {386, {wxGrid, autoSize, 0}}, + {387, {wxGrid, autoSizeColumn, 2}}, + {388, {wxGrid, autoSizeColumns, 1}}, + {389, {wxGrid, autoSizeRow, 2}}, + {390, {wxGrid, autoSizeRows, 1}}, + {391, {wxGrid, beginBatch, 0}}, + {392, {wxGrid, blockToDeviceRect, 2}}, + {393, {wxGrid, canDragColSize, 0}}, + {394, {wxGrid, canDragRowSize, 0}}, + {395, {wxGrid, canDragGridSize, 0}}, + {396, {wxGrid, canEnableCellControl, 0}}, + {397, {wxGrid, cellToRect_2, 2}}, + {398, {wxGrid, cellToRect_1, 1}}, + {399, {wxGrid, clearGrid, 0}}, + {400, {wxGrid, clearSelection, 0}}, + {401, {wxGrid, createGrid, 3}}, + {402, {wxGrid, deleteCols, 1}}, + {403, {wxGrid, deleteRows, 1}}, + {404, {wxGrid, disableCellEditControl, 0}}, + {405, {wxGrid, disableDragColSize, 0}}, + {406, {wxGrid, disableDragGridSize, 0}}, + {407, {wxGrid, disableDragRowSize, 0}}, + {408, {wxGrid, enableCellEditControl, 1}}, + {409, {wxGrid, enableDragColSize, 1}}, + {410, {wxGrid, enableDragGridSize, 1}}, + {411, {wxGrid, enableDragRowSize, 1}}, + {412, {wxGrid, enableEditing, 1}}, + {413, {wxGrid, enableGridLines, 1}}, + {414, {wxGrid, endBatch, 0}}, + {415, {wxGrid, fit, 0}}, + {416, {wxGrid, forceRefresh, 0}}, + {417, {wxGrid, getBatchCount, 0}}, + {418, {wxGrid, getCellAlignment, 4}}, + {419, {wxGrid, getCellBackgroundColour, 2}}, + {420, {wxGrid, getCellEditor, 2}}, + {421, {wxGrid, getCellFont, 2}}, + {422, {wxGrid, getCellRenderer, 2}}, + {423, {wxGrid, getCellTextColour, 2}}, + {424, {wxGrid, getCellValue_2, 2}}, + {425, {wxGrid, getCellValue_1, 1}}, + {426, {wxGrid, getColLabelAlignment, 2}}, + {427, {wxGrid, getColLabelSize, 0}}, + {428, {wxGrid, getColLabelValue, 1}}, + {429, {wxGrid, getColMinimalAcceptableWidth, 0}}, + {430, {wxGrid, getDefaultCellAlignment, 2}}, + {431, {wxGrid, getDefaultCellBackgroundColour, 0}}, + {432, {wxGrid, getDefaultCellFont, 0}}, + {433, {wxGrid, getDefaultCellTextColour, 0}}, + {434, {wxGrid, getDefaultColLabelSize, 0}}, + {435, {wxGrid, getDefaultColSize, 0}}, + {436, {wxGrid, getDefaultEditor, 0}}, + {437, {wxGrid, getDefaultEditorForCell_2, 2}}, + {438, {wxGrid, getDefaultEditorForCell_1, 1}}, + {439, {wxGrid, getDefaultEditorForType, 1}}, + {440, {wxGrid, getDefaultRenderer, 0}}, + {441, {wxGrid, getDefaultRendererForCell, 2}}, + {442, {wxGrid, getDefaultRendererForType, 1}}, + {443, {wxGrid, getDefaultRowLabelSize, 0}}, + {444, {wxGrid, getDefaultRowSize, 0}}, + {445, {wxGrid, getGridCursorCol, 0}}, + {446, {wxGrid, getGridCursorRow, 0}}, + {447, {wxGrid, getGridLineColour, 0}}, + {448, {wxGrid, gridLinesEnabled, 0}}, + {449, {wxGrid, getLabelBackgroundColour, 0}}, + {450, {wxGrid, getLabelFont, 0}}, + {451, {wxGrid, getLabelTextColour, 0}}, + {452, {wxGrid, getNumberCols, 0}}, + {453, {wxGrid, getNumberRows, 0}}, + {454, {wxGrid, getOrCreateCellAttr, 2}}, + {455, {wxGrid, getRowMinimalAcceptableHeight, 0}}, + {456, {wxGrid, getRowLabelAlignment, 2}}, + {457, {wxGrid, getRowLabelSize, 0}}, + {458, {wxGrid, getRowLabelValue, 1}}, + {459, {wxGrid, getRowSize, 1}}, + {460, {wxGrid, getScrollLineX, 0}}, + {461, {wxGrid, getScrollLineY, 0}}, + {462, {wxGrid, getSelectedCells, 0}}, + {463, {wxGrid, getSelectedCols, 0}}, + {464, {wxGrid, getSelectedRows, 0}}, + {465, {wxGrid, getSelectionBackground, 0}}, + {466, {wxGrid, getSelectionBlockTopLeft, 0}}, + {467, {wxGrid, getSelectionBlockBottomRight, 0}}, + {468, {wxGrid, getSelectionForeground, 0}}, + {469, {wxGrid, getViewWidth, 0}}, + {470, {wxGrid, getGridWindow, 0}}, + {471, {wxGrid, getGridRowLabelWindow, 0}}, + {472, {wxGrid, getGridColLabelWindow, 0}}, + {473, {wxGrid, getGridCornerLabelWindow, 0}}, + {474, {wxGrid, hideCellEditControl, 0}}, + {475, {wxGrid, insertCols, 1}}, + {476, {wxGrid, insertRows, 1}}, + {477, {wxGrid, isCellEditControlEnabled, 0}}, + {478, {wxGrid, isCurrentCellReadOnly, 0}}, + {479, {wxGrid, isEditable, 0}}, + {480, {wxGrid, isInSelection_2, 2}}, + {481, {wxGrid, isInSelection_1, 1}}, + {482, {wxGrid, isReadOnly, 2}}, + {483, {wxGrid, isSelection, 0}}, + {484, {wxGrid, isVisible_3, 3}}, + {485, {wxGrid, isVisible_2, 2}}, + {486, {wxGrid, makeCellVisible_2, 2}}, + {487, {wxGrid, makeCellVisible_1, 1}}, + {488, {wxGrid, moveCursorDown, 1}}, + {489, {wxGrid, moveCursorLeft, 1}}, + {490, {wxGrid, moveCursorRight, 1}}, + {491, {wxGrid, moveCursorUp, 1}}, + {492, {wxGrid, moveCursorDownBlock, 1}}, + {493, {wxGrid, moveCursorLeftBlock, 1}}, + {494, {wxGrid, moveCursorRightBlock, 1}}, + {495, {wxGrid, moveCursorUpBlock, 1}}, + {496, {wxGrid, movePageDown, 0}}, + {497, {wxGrid, movePageUp, 0}}, + {498, {wxGrid, registerDataType, 3}}, + {499, {wxGrid, saveEditControlValue, 0}}, + {500, {wxGrid, selectAll, 0}}, + {501, {wxGrid, selectBlock_5, 5}}, + {502, {wxGrid, selectBlock_3, 3}}, + {503, {wxGrid, selectCol, 2}}, + {504, {wxGrid, selectRow, 2}}, + {505, {wxGrid, setCellAlignment_4, 4}}, + {506, {wxGrid, setCellAlignment_3, 3}}, + {507, {wxGrid, setCellAlignment_1, 1}}, + {508, {wxGrid, setCellBackgroundColour_3_0, 3}}, + {509, {wxGrid, setCellBackgroundColour_1, 1}}, + {510, {wxGrid, setCellBackgroundColour_3_1, 3}}, + {511, {wxGrid, setCellEditor, 3}}, + {512, {wxGrid, setCellFont, 3}}, + {513, {wxGrid, setCellRenderer, 3}}, + {514, {wxGrid, setCellTextColour_3_0, 3}}, + {515, {wxGrid, setCellTextColour_3_1, 3}}, + {516, {wxGrid, setCellTextColour_1, 1}}, + {517, {wxGrid, setCellValue_3_0, 3}}, + {518, {wxGrid, setCellValue_2, 2}}, + {519, {wxGrid, setCellValue_3_1, 3}}, + {520, {wxGrid, setColAttr, 2}}, + {521, {wxGrid, setColFormatBool, 1}}, + {522, {wxGrid, setColFormatNumber, 1}}, + {523, {wxGrid, setColFormatFloat, 2}}, + {524, {wxGrid, setColFormatCustom, 2}}, + {525, {wxGrid, setColLabelAlignment, 2}}, + {526, {wxGrid, setColLabelSize, 1}}, + {527, {wxGrid, setColLabelValue, 2}}, + {528, {wxGrid, setColMinimalWidth, 2}}, + {529, {wxGrid, setColMinimalAcceptableWidth, 1}}, + {530, {wxGrid, setColSize, 2}}, + {531, {wxGrid, setDefaultCellAlignment, 2}}, + {532, {wxGrid, setDefaultCellBackgroundColour, 1}}, + {533, {wxGrid, setDefaultCellFont, 1}}, + {534, {wxGrid, setDefaultCellTextColour, 1}}, + {535, {wxGrid, setDefaultEditor, 1}}, + {536, {wxGrid, setDefaultRenderer, 1}}, + {537, {wxGrid, setDefaultColSize, 2}}, + {538, {wxGrid, setDefaultRowSize, 2}}, + {539, {wxGrid, setGridCursor, 2}}, + {540, {wxGrid, setGridLineColour, 1}}, + {541, {wxGrid, setLabelBackgroundColour, 1}}, + {542, {wxGrid, setLabelFont, 1}}, + {543, {wxGrid, setLabelTextColour, 1}}, + {544, {wxGrid, setMargins, 2}}, + {545, {wxGrid, setReadOnly, 3}}, + {546, {wxGrid, setRowAttr, 2}}, + {547, {wxGrid, setRowLabelAlignment, 2}}, + {548, {wxGrid, setRowLabelSize, 1}}, + {549, {wxGrid, setRowLabelValue, 2}}, + {550, {wxGrid, setRowMinimalHeight, 2}}, + {551, {wxGrid, setRowMinimalAcceptableHeight, 1}}, + {552, {wxGrid, setRowSize, 2}}, + {553, {wxGrid, setScrollLineX, 1}}, + {554, {wxGrid, setScrollLineY, 1}}, + {555, {wxGrid, setSelectionBackground, 1}}, + {556, {wxGrid, setSelectionForeground, 1}}, + {557, {wxGrid, setSelectionMode, 1}}, + {558, {wxGrid, showCellEditControl, 0}}, + {559, {wxGrid, xToCol, 2}}, + {560, {wxGrid, xToEdgeOfCol, 1}}, + {561, {wxGrid, yToEdgeOfRow, 1}}, + {562, {wxGrid, yToRow, 1}}, + {563, {wxGridCellRenderer, draw, 7}}, + {564, {wxGridCellRenderer, getBestSize, 5}}, + {565, {wxGridCellEditor, create, 3}}, + {566, {wxGridCellEditor, isCreated, 0}}, + {567, {wxGridCellEditor, setSize, 1}}, + {568, {wxGridCellEditor, show, 2}}, + {569, {wxGridCellEditor, paintBackground, 2}}, + {570, {wxGridCellEditor, beginEdit, 3}}, + {571, {wxGridCellEditor, endEdit, 3}}, + {572, {wxGridCellEditor, reset, 0}}, + {573, {wxGridCellEditor, startingKey, 1}}, + {574, {wxGridCellEditor, startingClick, 0}}, + {575, {wxGridCellEditor, handleReturn, 1}}, + {576, {wxGridCellBoolRenderer, new, 0}}, + {577, {wxGridCellBoolRenderer, 'Destroy', undefined}}, + {578, {wxGridCellBoolEditor, new, 0}}, + {579, {wxGridCellBoolEditor, isTrueValue, 1}}, + {580, {wxGridCellBoolEditor, useStringValues, 1}}, + {581, {wxGridCellBoolEditor, 'Destroy', undefined}}, + {582, {wxGridCellFloatRenderer, new, 1}}, + {583, {wxGridCellFloatRenderer, getPrecision, 0}}, + {584, {wxGridCellFloatRenderer, getWidth, 0}}, + {585, {wxGridCellFloatRenderer, setParameters, 1}}, + {586, {wxGridCellFloatRenderer, setPrecision, 1}}, + {587, {wxGridCellFloatRenderer, setWidth, 1}}, + {588, {wxGridCellFloatRenderer, 'Destroy', undefined}}, + {589, {wxGridCellFloatEditor, new, 1}}, + {590, {wxGridCellFloatEditor, setParameters, 1}}, + {591, {wxGridCellFloatEditor, 'Destroy', undefined}}, + {592, {wxGridCellStringRenderer, new, 0}}, + {593, {wxGridCellStringRenderer, 'Destroy', undefined}}, + {594, {wxGridCellTextEditor, new, 0}}, + {595, {wxGridCellTextEditor, setParameters, 1}}, + {596, {wxGridCellTextEditor, 'Destroy', undefined}}, + {598, {wxGridCellChoiceEditor, new, 2}}, + {599, {wxGridCellChoiceEditor, setParameters, 1}}, + {600, {wxGridCellChoiceEditor, 'Destroy', undefined}}, + {601, {wxGridCellNumberRenderer, new, 0}}, + {602, {wxGridCellNumberRenderer, 'Destroy', undefined}}, + {603, {wxGridCellNumberEditor, new, 1}}, + {604, {wxGridCellNumberEditor, getValue, 0}}, + {605, {wxGridCellNumberEditor, setParameters, 1}}, + {606, {wxGridCellNumberEditor, 'Destroy', undefined}}, + {607, {wxGridCellAttr, setTextColour, 1}}, + {608, {wxGridCellAttr, setBackgroundColour, 1}}, + {609, {wxGridCellAttr, setFont, 1}}, + {610, {wxGridCellAttr, setAlignment, 2}}, + {611, {wxGridCellAttr, setReadOnly, 1}}, + {612, {wxGridCellAttr, setRenderer, 1}}, + {613, {wxGridCellAttr, setEditor, 1}}, + {614, {wxGridCellAttr, hasTextColour, 0}}, + {615, {wxGridCellAttr, hasBackgroundColour, 0}}, + {616, {wxGridCellAttr, hasFont, 0}}, + {617, {wxGridCellAttr, hasAlignment, 0}}, + {618, {wxGridCellAttr, hasRenderer, 0}}, + {619, {wxGridCellAttr, hasEditor, 0}}, + {620, {wxGridCellAttr, getTextColour, 0}}, + {621, {wxGridCellAttr, getBackgroundColour, 0}}, + {622, {wxGridCellAttr, getFont, 0}}, + {623, {wxGridCellAttr, getAlignment, 2}}, + {624, {wxGridCellAttr, getRenderer, 3}}, + {625, {wxGridCellAttr, getEditor, 3}}, + {626, {wxGridCellAttr, isReadOnly, 0}}, + {627, {wxGridCellAttr, setDefAttr, 1}}, + {628, {wxDC, blit, 5}}, + {629, {wxDC, calcBoundingBox, 2}}, + {630, {wxDC, clear, 0}}, + {631, {wxDC, computeScaleAndOrigin, 0}}, + {632, {wxDC, crossHair, 1}}, + {633, {wxDC, destroyClippingRegion, 0}}, + {634, {wxDC, deviceToLogicalX, 1}}, + {635, {wxDC, deviceToLogicalXRel, 1}}, + {636, {wxDC, deviceToLogicalY, 1}}, + {637, {wxDC, deviceToLogicalYRel, 1}}, + {638, {wxDC, drawArc, 3}}, + {639, {wxDC, drawBitmap, 3}}, + {640, {wxDC, drawCheckMark, 1}}, + {641, {wxDC, drawCircle, 2}}, + {643, {wxDC, drawEllipse_2, 2}}, + {644, {wxDC, drawEllipse_1, 1}}, + {645, {wxDC, drawEllipticArc, 4}}, + {646, {wxDC, drawIcon, 2}}, + {647, {wxDC, drawLabel, 3}}, + {648, {wxDC, drawLine, 2}}, + {649, {wxDC, drawLines, 3}}, + {651, {wxDC, drawPolygon, 3}}, + {653, {wxDC, drawPoint, 1}}, + {655, {wxDC, drawRectangle_2, 2}}, + {656, {wxDC, drawRectangle_1, 1}}, + {657, {wxDC, drawRotatedText, 3}}, + {659, {wxDC, drawRoundedRectangle_3, 3}}, + {660, {wxDC, drawRoundedRectangle_2, 2}}, + {661, {wxDC, drawText, 2}}, + {662, {wxDC, endDoc, 0}}, + {663, {wxDC, endPage, 0}}, + {664, {wxDC, floodFill, 3}}, + {665, {wxDC, getBackground, 0}}, + {666, {wxDC, getBackgroundMode, 0}}, + {667, {wxDC, getBrush, 0}}, + {668, {wxDC, getCharHeight, 0}}, + {669, {wxDC, getCharWidth, 0}}, + {670, {wxDC, getClippingBox, 4}}, + {672, {wxDC, getFont, 0}}, + {673, {wxDC, getLayoutDirection, 0}}, + {674, {wxDC, getLogicalFunction, 0}}, + {675, {wxDC, getMapMode, 0}}, + {676, {wxDC, getMultiLineTextExtent_4, 4}}, + {677, {wxDC, getMultiLineTextExtent_1, 1}}, + {678, {wxDC, getPartialTextExtents, 2}}, + {679, {wxDC, getPen, 0}}, + {680, {wxDC, getPixel, 2}}, + {681, {wxDC, getPPI, 0}}, + {683, {wxDC, getSize, 0}}, + {685, {wxDC, getSizeMM, 0}}, + {686, {wxDC, getTextBackground, 0}}, + {687, {wxDC, getTextExtent_4, 4}}, + {688, {wxDC, getTextExtent_1, 1}}, + {690, {wxDC, getTextForeground, 0}}, + {691, {wxDC, getUserScale, 2}}, + {692, {wxDC, gradientFillConcentric_3, 3}}, + {693, {wxDC, gradientFillConcentric_4, 4}}, + {694, {wxDC, gradientFillLinear, 4}}, + {695, {wxDC, logicalToDeviceX, 1}}, + {696, {wxDC, logicalToDeviceXRel, 1}}, + {697, {wxDC, logicalToDeviceY, 1}}, + {698, {wxDC, logicalToDeviceYRel, 1}}, + {699, {wxDC, maxX, 0}}, + {700, {wxDC, maxY, 0}}, + {701, {wxDC, minX, 0}}, + {702, {wxDC, minY, 0}}, + {703, {wxDC, isOk, 0}}, + {704, {wxDC, resetBoundingBox, 0}}, + {705, {wxDC, setAxisOrientation, 2}}, + {706, {wxDC, setBackground, 1}}, + {707, {wxDC, setBackgroundMode, 1}}, + {708, {wxDC, setBrush, 1}}, + {710, {wxDC, setClippingRegion_2, 2}}, + {711, {wxDC, setClippingRegion_1_1, 1}}, + {712, {wxDC, setClippingRegion_1_0, 1}}, + {713, {wxDC, setDeviceOrigin, 2}}, + {714, {wxDC, setFont, 1}}, + {715, {wxDC, setLayoutDirection, 1}}, + {716, {wxDC, setLogicalFunction, 1}}, + {717, {wxDC, setMapMode, 1}}, + {718, {wxDC, setPalette, 1}}, + {719, {wxDC, setPen, 1}}, + {720, {wxDC, setTextBackground, 1}}, + {721, {wxDC, setTextForeground, 1}}, + {722, {wxDC, setUserScale, 2}}, + {723, {wxDC, startDoc, 1}}, + {724, {wxDC, startPage, 0}}, + {725, {wxMirrorDC, new, 2}}, + {726, {wxMirrorDC, 'Destroy', undefined}}, + {727, {wxScreenDC, new, 0}}, + {728, {wxScreenDC, destruct, 0}}, + {729, {wxPostScriptDC, new_0, 0}}, + {730, {wxPostScriptDC, new_1, 1}}, + {731, {wxPostScriptDC, destruct, 0}}, + {732, {wxPostScriptDC, setResolution, 1}}, + {733, {wxPostScriptDC, getResolution, 0}}, + {734, {wxWindowDC, new_0, 0}}, + {735, {wxWindowDC, new_1, 1}}, + {736, {wxWindowDC, destruct, 0}}, + {737, {wxClientDC, new_0, 0}}, + {738, {wxClientDC, new_1, 1}}, + {739, {wxClientDC, 'Destroy', undefined}}, + {740, {wxPaintDC, new_0, 0}}, + {741, {wxPaintDC, new_1, 1}}, + {742, {wxPaintDC, 'Destroy', undefined}}, + {744, {wxMemoryDC, new_1_0, 1}}, + {745, {wxMemoryDC, new_1_1, 1}}, + {746, {wxMemoryDC, new_0, 0}}, + {748, {wxMemoryDC, destruct, 0}}, + {749, {wxMemoryDC, selectObject, 1}}, + {750, {wxMemoryDC, selectObjectAsSource, 1}}, + {751, {wxBufferedDC, new_0, 0}}, + {752, {wxBufferedDC, new_2, 2}}, + {753, {wxBufferedDC, new_3, 3}}, + {754, {wxBufferedDC, destruct, 0}}, + {755, {wxBufferedDC, init_2, 2}}, + {756, {wxBufferedDC, init_3, 3}}, + {757, {wxBufferedPaintDC, new_3, 3}}, + {758, {wxBufferedPaintDC, new_2, 2}}, + {759, {wxBufferedPaintDC, destruct, 0}}, + {760, {wxGraphicsObject, destruct, 0}}, + {761, {wxGraphicsObject, getRenderer, 0}}, + {762, {wxGraphicsObject, isNull, 0}}, + {763, {wxGraphicsContext, destruct, 0}}, + {764, {wxGraphicsContext, create_1_1, 1}}, + {765, {wxGraphicsContext, create_1_0, 1}}, + {766, {wxGraphicsContext, create_0, 0}}, + {767, {wxGraphicsContext, createPen, 1}}, + {768, {wxGraphicsContext, createBrush, 1}}, + {769, {wxGraphicsContext, createRadialGradientBrush, 7}}, + {770, {wxGraphicsContext, createLinearGradientBrush, 6}}, + {771, {wxGraphicsContext, createFont, 2}}, + {772, {wxGraphicsContext, createMatrix, 1}}, + {773, {wxGraphicsContext, createPath, 0}}, + {774, {wxGraphicsContext, clip_1, 1}}, + {775, {wxGraphicsContext, clip_4, 4}}, + {776, {wxGraphicsContext, resetClip, 0}}, + {777, {wxGraphicsContext, drawBitmap, 5}}, + {778, {wxGraphicsContext, drawEllipse, 4}}, + {779, {wxGraphicsContext, drawIcon, 5}}, + {780, {wxGraphicsContext, drawLines, 3}}, + {781, {wxGraphicsContext, drawPath, 2}}, + {782, {wxGraphicsContext, drawRectangle, 4}}, + {783, {wxGraphicsContext, drawRoundedRectangle, 5}}, + {784, {wxGraphicsContext, drawText_3, 3}}, + {785, {wxGraphicsContext, drawText_4_0, 4}}, + {786, {wxGraphicsContext, drawText_4_1, 4}}, + {787, {wxGraphicsContext, drawText_5, 5}}, + {788, {wxGraphicsContext, fillPath, 2}}, + {789, {wxGraphicsContext, strokePath, 1}}, + {790, {wxGraphicsContext, getPartialTextExtents, 2}}, + {791, {wxGraphicsContext, getTextExtent, 5}}, + {792, {wxGraphicsContext, rotate, 1}}, + {793, {wxGraphicsContext, scale, 2}}, + {794, {wxGraphicsContext, translate, 2}}, + {795, {wxGraphicsContext, getTransform, 0}}, + {796, {wxGraphicsContext, setTransform, 1}}, + {797, {wxGraphicsContext, concatTransform, 1}}, + {798, {wxGraphicsContext, setBrush_1_1, 1}}, + {799, {wxGraphicsContext, setBrush_1_0, 1}}, + {800, {wxGraphicsContext, setFont_1, 1}}, + {801, {wxGraphicsContext, setFont_2, 2}}, + {802, {wxGraphicsContext, setPen_1_0, 1}}, + {803, {wxGraphicsContext, setPen_1_1, 1}}, + {804, {wxGraphicsContext, strokeLine, 4}}, + {805, {wxGraphicsContext, strokeLines, 2}}, + {807, {wxGraphicsMatrix, concat, 1}}, + {809, {wxGraphicsMatrix, get, 1}}, + {810, {wxGraphicsMatrix, invert, 0}}, + {811, {wxGraphicsMatrix, isEqual, 1}}, + {813, {wxGraphicsMatrix, isIdentity, 0}}, + {814, {wxGraphicsMatrix, rotate, 1}}, + {815, {wxGraphicsMatrix, scale, 2}}, + {816, {wxGraphicsMatrix, translate, 2}}, + {817, {wxGraphicsMatrix, set, 1}}, + {818, {wxGraphicsMatrix, transformPoint, 2}}, + {819, {wxGraphicsMatrix, transformDistance, 2}}, + {820, {wxGraphicsPath, moveToPoint_2, 2}}, + {821, {wxGraphicsPath, moveToPoint_1, 1}}, + {822, {wxGraphicsPath, addArc_6, 6}}, + {823, {wxGraphicsPath, addArc_5, 5}}, + {824, {wxGraphicsPath, addArcToPoint, 5}}, + {825, {wxGraphicsPath, addCircle, 3}}, + {826, {wxGraphicsPath, addCurveToPoint_6, 6}}, + {827, {wxGraphicsPath, addCurveToPoint_3, 3}}, + {828, {wxGraphicsPath, addEllipse, 4}}, + {829, {wxGraphicsPath, addLineToPoint_2, 2}}, + {830, {wxGraphicsPath, addLineToPoint_1, 1}}, + {831, {wxGraphicsPath, addPath, 1}}, + {832, {wxGraphicsPath, addQuadCurveToPoint, 4}}, + {833, {wxGraphicsPath, addRectangle, 4}}, + {834, {wxGraphicsPath, addRoundedRectangle, 5}}, + {835, {wxGraphicsPath, closeSubpath, 0}}, + {836, {wxGraphicsPath, contains_3, 3}}, + {837, {wxGraphicsPath, contains_2, 2}}, + {839, {wxGraphicsPath, getBox, 0}}, + {841, {wxGraphicsPath, getCurrentPoint, 0}}, + {842, {wxGraphicsPath, transform, 1}}, + {843, {wxGraphicsRenderer, getDefaultRenderer, 0}}, + {844, {wxGraphicsRenderer, createContext_1_1, 1}}, + {845, {wxGraphicsRenderer, createContext_1_0, 1}}, + {846, {wxGraphicsRenderer, createPen, 1}}, + {847, {wxGraphicsRenderer, createBrush, 1}}, + {848, {wxGraphicsRenderer, createLinearGradientBrush, 6}}, + {849, {wxGraphicsRenderer, createRadialGradientBrush, 7}}, + {850, {wxGraphicsRenderer, createFont, 2}}, + {851, {wxGraphicsRenderer, createMatrix, 1}}, + {852, {wxGraphicsRenderer, createPath, 0}}, + {854, {wxMenuBar, new_1, 1}}, + {856, {wxMenuBar, new_0, 0}}, + {858, {wxMenuBar, destruct, 0}}, + {859, {wxMenuBar, append, 2}}, + {860, {wxMenuBar, check, 2}}, + {861, {wxMenuBar, enable_2, 2}}, + {862, {wxMenuBar, enable_1, 1}}, + {863, {wxMenuBar, enableTop, 2}}, + {864, {wxMenuBar, findMenu, 1}}, + {865, {wxMenuBar, findMenuItem, 2}}, + {866, {wxMenuBar, findItem, 2}}, + {867, {wxMenuBar, getHelpString, 1}}, + {868, {wxMenuBar, getLabel_1, 1}}, + {869, {wxMenuBar, getLabel_0, 0}}, + {870, {wxMenuBar, getLabelTop, 1}}, + {871, {wxMenuBar, getMenu, 1}}, + {872, {wxMenuBar, getMenuCount, 0}}, + {873, {wxMenuBar, insert, 3}}, + {874, {wxMenuBar, isChecked, 1}}, + {875, {wxMenuBar, isEnabled_1, 1}}, + {876, {wxMenuBar, isEnabled_0, 0}}, + {877, {wxMenuBar, remove, 1}}, + {878, {wxMenuBar, replace, 3}}, + {879, {wxMenuBar, setHelpString, 2}}, + {880, {wxMenuBar, setLabel_2, 2}}, + {881, {wxMenuBar, setLabel_1, 1}}, + {882, {wxMenuBar, setLabelTop, 2}}, + {883, {wxControl, getLabel, 0}}, + {884, {wxControl, setLabel, 1}}, + {885, {wxControlWithItems, append_1, 1}}, + {886, {wxControlWithItems, append_2, 2}}, + {887, {wxControlWithItems, appendStrings_1, 1}}, + {888, {wxControlWithItems, clear, 0}}, + {889, {wxControlWithItems, delete, 1}}, + {890, {wxControlWithItems, findString, 2}}, + {891, {wxControlWithItems, getClientData, 1}}, + {892, {wxControlWithItems, setClientData, 2}}, + {893, {wxControlWithItems, getCount, 0}}, + {894, {wxControlWithItems, getSelection, 0}}, + {895, {wxControlWithItems, getString, 1}}, + {896, {wxControlWithItems, getStringSelection, 0}}, + {897, {wxControlWithItems, insert_2, 2}}, + {898, {wxControlWithItems, insert_3, 3}}, + {899, {wxControlWithItems, isEmpty, 0}}, + {900, {wxControlWithItems, select, 1}}, + {901, {wxControlWithItems, setSelection, 1}}, + {902, {wxControlWithItems, setString, 2}}, + {903, {wxControlWithItems, setStringSelection, 1}}, + {906, {wxMenu, new_2, 2}}, + {907, {wxMenu, new_1, 1}}, + {909, {wxMenu, destruct, 0}}, + {910, {wxMenu, append_3, 3}}, + {911, {wxMenu, append_1, 1}}, + {912, {wxMenu, append_4_0, 4}}, + {913, {wxMenu, append_4_1, 4}}, + {914, {wxMenu, appendCheckItem, 3}}, + {915, {wxMenu, appendRadioItem, 3}}, + {916, {wxMenu, appendSeparator, 0}}, + {917, {wxMenu, break, 0}}, + {918, {wxMenu, check, 2}}, + {919, {wxMenu, delete_1_0, 1}}, + {920, {wxMenu, delete_1_1, 1}}, + {921, {wxMenu, destroy_1_0, 1}}, + {922, {wxMenu, destroy_1_1, 1}}, + {923, {wxMenu, enable, 2}}, + {924, {wxMenu, findItem_1, 1}}, + {925, {wxMenu, findItem_2, 2}}, + {926, {wxMenu, findItemByPosition, 1}}, + {927, {wxMenu, getHelpString, 1}}, + {928, {wxMenu, getLabel, 1}}, + {929, {wxMenu, getMenuItemCount, 0}}, + {930, {wxMenu, getMenuItems, 0}}, + {932, {wxMenu, getTitle, 0}}, + {933, {wxMenu, insert_2, 2}}, + {934, {wxMenu, insert_3, 3}}, + {935, {wxMenu, insert_5_1, 5}}, + {936, {wxMenu, insert_5_0, 5}}, + {937, {wxMenu, insertCheckItem, 4}}, + {938, {wxMenu, insertRadioItem, 4}}, + {939, {wxMenu, insertSeparator, 1}}, + {940, {wxMenu, isChecked, 1}}, + {941, {wxMenu, isEnabled, 1}}, + {942, {wxMenu, prepend_1, 1}}, + {943, {wxMenu, prepend_2, 2}}, + {944, {wxMenu, prepend_4_1, 4}}, + {945, {wxMenu, prepend_4_0, 4}}, + {946, {wxMenu, prependCheckItem, 3}}, + {947, {wxMenu, prependRadioItem, 3}}, + {948, {wxMenu, prependSeparator, 0}}, + {949, {wxMenu, remove_1_0, 1}}, + {950, {wxMenu, remove_1_1, 1}}, + {951, {wxMenu, setHelpString, 2}}, + {952, {wxMenu, setLabel, 2}}, + {953, {wxMenu, setTitle, 1}}, + {954, {wxMenuItem, new, 1}}, + {956, {wxMenuItem, destruct, 0}}, + {957, {wxMenuItem, check, 1}}, + {958, {wxMenuItem, enable, 1}}, + {959, {wxMenuItem, getBitmap, 0}}, + {960, {wxMenuItem, getHelp, 0}}, + {961, {wxMenuItem, getId, 0}}, + {962, {wxMenuItem, getKind, 0}}, + {963, {wxMenuItem, getLabel, 0}}, + {964, {wxMenuItem, getLabelFromText, 1}}, + {965, {wxMenuItem, getMenu, 0}}, + {966, {wxMenuItem, getText, 0}}, + {967, {wxMenuItem, getSubMenu, 0}}, + {968, {wxMenuItem, isCheckable, 0}}, + {969, {wxMenuItem, isChecked, 0}}, + {970, {wxMenuItem, isEnabled, 0}}, + {971, {wxMenuItem, isSeparator, 0}}, + {972, {wxMenuItem, isSubMenu, 0}}, + {973, {wxMenuItem, setBitmap, 1}}, + {974, {wxMenuItem, setHelp, 1}}, + {975, {wxMenuItem, setMenu, 1}}, + {976, {wxMenuItem, setSubMenu, 1}}, + {977, {wxMenuItem, setText, 1}}, + {978, {wxToolBar, addControl, 1}}, + {979, {wxToolBar, addSeparator, 0}}, + {980, {wxToolBar, addTool_5, 5}}, + {981, {wxToolBar, addTool_4_0, 4}}, + {982, {wxToolBar, addTool_1, 1}}, + {983, {wxToolBar, addTool_4_1, 4}}, + {984, {wxToolBar, addTool_3, 3}}, + {985, {wxToolBar, addTool_6, 6}}, + {986, {wxToolBar, addCheckTool, 4}}, + {987, {wxToolBar, addRadioTool, 4}}, + {988, {wxToolBar, addStretchableSpace, 0}}, + {989, {wxToolBar, insertStretchableSpace, 1}}, + {990, {wxToolBar, deleteTool, 1}}, + {991, {wxToolBar, deleteToolByPos, 1}}, + {992, {wxToolBar, enableTool, 2}}, + {993, {wxToolBar, findById, 1}}, + {994, {wxToolBar, findControl, 1}}, + {995, {wxToolBar, findToolForPosition, 2}}, + {996, {wxToolBar, getToolSize, 0}}, + {997, {wxToolBar, getToolBitmapSize, 0}}, + {998, {wxToolBar, getMargins, 0}}, + {999, {wxToolBar, getToolEnabled, 1}}, + {1000, {wxToolBar, getToolLongHelp, 1}}, + {1001, {wxToolBar, getToolPacking, 0}}, + {1002, {wxToolBar, getToolPos, 1}}, + {1003, {wxToolBar, getToolSeparation, 0}}, + {1004, {wxToolBar, getToolShortHelp, 1}}, + {1005, {wxToolBar, getToolState, 1}}, + {1006, {wxToolBar, insertControl, 2}}, + {1007, {wxToolBar, insertSeparator, 1}}, + {1008, {wxToolBar, insertTool_5, 5}}, + {1009, {wxToolBar, insertTool_2, 2}}, + {1010, {wxToolBar, insertTool_4, 4}}, + {1011, {wxToolBar, realize, 0}}, + {1012, {wxToolBar, removeTool, 1}}, + {1013, {wxToolBar, setMargins, 2}}, + {1014, {wxToolBar, setToolBitmapSize, 1}}, + {1015, {wxToolBar, setToolLongHelp, 2}}, + {1016, {wxToolBar, setToolPacking, 1}}, + {1017, {wxToolBar, setToolShortHelp, 2}}, + {1018, {wxToolBar, setToolSeparation, 1}}, + {1019, {wxToolBar, toggleTool, 2}}, + {1021, {wxStatusBar, new_0, 0}}, + {1022, {wxStatusBar, new_2, 2}}, + {1024, {wxStatusBar, destruct, 0}}, + {1025, {wxStatusBar, create, 2}}, + {1026, {wxStatusBar, getFieldRect, 2}}, + {1027, {wxStatusBar, getFieldsCount, 0}}, + {1028, {wxStatusBar, getStatusText, 1}}, + {1029, {wxStatusBar, popStatusText, 1}}, + {1030, {wxStatusBar, pushStatusText, 2}}, + {1031, {wxStatusBar, setFieldsCount, 2}}, + {1032, {wxStatusBar, setMinHeight, 1}}, + {1033, {wxStatusBar, setStatusText, 2}}, + {1034, {wxStatusBar, setStatusWidths, 2}}, + {1035, {wxStatusBar, setStatusStyles, 2}}, + {1036, {wxBitmap, new_0, 0}}, + {1037, {wxBitmap, new_3, 3}}, + {1038, {wxBitmap, new_4, 4}}, + {1039, {wxBitmap, new_2_0, 2}}, + {1040, {wxBitmap, new_2_1, 2}}, + {1041, {wxBitmap, destruct, 0}}, + {1042, {wxBitmap, convertToImage, 0}}, + {1043, {wxBitmap, copyFromIcon, 1}}, + {1044, {wxBitmap, create, 3}}, + {1045, {wxBitmap, getDepth, 0}}, + {1046, {wxBitmap, getHeight, 0}}, + {1047, {wxBitmap, getPalette, 0}}, + {1048, {wxBitmap, getMask, 0}}, + {1049, {wxBitmap, getWidth, 0}}, + {1050, {wxBitmap, getSubBitmap, 1}}, + {1051, {wxBitmap, loadFile, 2}}, + {1052, {wxBitmap, ok, 0}}, + {1053, {wxBitmap, saveFile, 3}}, + {1054, {wxBitmap, setDepth, 1}}, + {1055, {wxBitmap, setHeight, 1}}, + {1056, {wxBitmap, setMask, 1}}, + {1057, {wxBitmap, setPalette, 1}}, + {1058, {wxBitmap, setWidth, 1}}, + {1059, {wxIcon, new_0, 0}}, + {1060, {wxIcon, new_2, 2}}, + {1061, {wxIcon, new_1, 1}}, + {1062, {wxIcon, copyFromBitmap, 1}}, + {1063, {wxIcon, 'Destroy', undefined}}, + {1064, {wxIconBundle, new_0, 0}}, + {1065, {wxIconBundle, new_2, 2}}, + {1066, {wxIconBundle, new_1_0, 1}}, + {1067, {wxIconBundle, new_1_1, 1}}, + {1068, {wxIconBundle, destruct, 0}}, + {1069, {wxIconBundle, addIcon_2, 2}}, + {1070, {wxIconBundle, addIcon_1, 1}}, + {1071, {wxIconBundle, getIcon_1_1, 1}}, + {1072, {wxIconBundle, getIcon_1_0, 1}}, + {1073, {wxCursor, new_0, 0}}, + {1074, {wxCursor, new_1_0, 1}}, + {1075, {wxCursor, new_1_1, 1}}, + {1076, {wxCursor, new_4, 4}}, + {1077, {wxCursor, destruct, 0}}, + {1078, {wxCursor, ok, 0}}, + {1079, {wxMask, new_0, 0}}, + {1080, {wxMask, new_2_1, 2}}, + {1081, {wxMask, new_2_0, 2}}, + {1082, {wxMask, new_1, 1}}, + {1083, {wxMask, destruct, 0}}, + {1084, {wxMask, create_2_1, 2}}, + {1085, {wxMask, create_2_0, 2}}, + {1086, {wxMask, create_1, 1}}, + {1087, {wxImage, new_0, 0}}, + {1088, {wxImage, new_3_0, 3}}, + {1089, {wxImage, new_4, 4}}, + {1090, {wxImage, new_5, 5}}, + {1091, {wxImage, new_2, 2}}, + {1092, {wxImage, new_3_1, 3}}, + {1093, {wxImage, blur, 1}}, + {1094, {wxImage, blurHorizontal, 1}}, + {1095, {wxImage, blurVertical, 1}}, + {1096, {wxImage, convertAlphaToMask, 1}}, + {1097, {wxImage, convertToGreyscale, 1}}, + {1098, {wxImage, convertToMono, 3}}, + {1099, {wxImage, copy, 0}}, + {1100, {wxImage, create_3, 3}}, + {1101, {wxImage, create_4, 4}}, + {1102, {wxImage, create_5, 5}}, + {1103, {wxImage, 'Destroy', 0}}, + {1104, {wxImage, findFirstUnusedColour, 4}}, + {1105, {wxImage, getImageExtWildcard, 0}}, + {1106, {wxImage, getAlpha_2, 2}}, + {1107, {wxImage, getAlpha_0, 0}}, + {1108, {wxImage, getBlue, 2}}, + {1109, {wxImage, getData, 0}}, + {1110, {wxImage, getGreen, 2}}, + {1111, {wxImage, getImageCount, 2}}, + {1112, {wxImage, getHeight, 0}}, + {1113, {wxImage, getMaskBlue, 0}}, + {1114, {wxImage, getMaskGreen, 0}}, + {1115, {wxImage, getMaskRed, 0}}, + {1116, {wxImage, getOrFindMaskColour, 3}}, + {1117, {wxImage, getPalette, 0}}, + {1118, {wxImage, getRed, 2}}, + {1119, {wxImage, getSubImage, 1}}, + {1120, {wxImage, getWidth, 0}}, + {1121, {wxImage, hasAlpha, 0}}, + {1122, {wxImage, hasMask, 0}}, + {1123, {wxImage, getOption, 1}}, + {1124, {wxImage, getOptionInt, 1}}, + {1125, {wxImage, hasOption, 1}}, + {1126, {wxImage, initAlpha, 0}}, + {1127, {wxImage, initStandardHandlers, 0}}, + {1128, {wxImage, isTransparent, 3}}, + {1129, {wxImage, loadFile_2, 2}}, + {1130, {wxImage, loadFile_3, 3}}, + {1131, {wxImage, ok, 0}}, + {1132, {wxImage, removeHandler, 1}}, + {1133, {wxImage, mirror, 1}}, + {1134, {wxImage, replace, 6}}, + {1135, {wxImage, rescale, 3}}, + {1136, {wxImage, resize, 3}}, + {1137, {wxImage, rotate, 3}}, + {1138, {wxImage, rotateHue, 1}}, + {1139, {wxImage, rotate90, 1}}, + {1140, {wxImage, saveFile_1, 1}}, + {1141, {wxImage, saveFile_2_0, 2}}, + {1142, {wxImage, saveFile_2_1, 2}}, + {1143, {wxImage, scale, 3}}, + {1144, {wxImage, size, 3}}, + {1145, {wxImage, setAlpha_3, 3}}, + {1146, {wxImage, setAlpha_2, 2}}, + {1147, {wxImage, setData_2, 2}}, + {1148, {wxImage, setData_4, 4}}, + {1149, {wxImage, setMask, 1}}, + {1150, {wxImage, setMaskColour, 3}}, + {1151, {wxImage, setMaskFromImage, 4}}, + {1152, {wxImage, setOption_2_1, 2}}, + {1153, {wxImage, setOption_2_0, 2}}, + {1154, {wxImage, setPalette, 1}}, + {1155, {wxImage, setRGB_5, 5}}, + {1156, {wxImage, setRGB_4, 4}}, + {1157, {wxImage, 'Destroy', undefined}}, + {1158, {wxBrush, new_0, 0}}, + {1159, {wxBrush, new_2, 2}}, + {1160, {wxBrush, new_1, 1}}, + {1162, {wxBrush, destruct, 0}}, + {1163, {wxBrush, getColour, 0}}, + {1164, {wxBrush, getStipple, 0}}, + {1165, {wxBrush, getStyle, 0}}, + {1166, {wxBrush, isHatch, 0}}, + {1167, {wxBrush, isOk, 0}}, + {1168, {wxBrush, setColour_1, 1}}, + {1169, {wxBrush, setColour_3, 3}}, + {1170, {wxBrush, setStipple, 1}}, + {1171, {wxBrush, setStyle, 1}}, + {1172, {wxPen, new_0, 0}}, + {1173, {wxPen, new_2, 2}}, + {1174, {wxPen, destruct, 0}}, + {1175, {wxPen, getCap, 0}}, + {1176, {wxPen, getColour, 0}}, + {1177, {wxPen, getJoin, 0}}, + {1178, {wxPen, getStyle, 0}}, + {1179, {wxPen, getWidth, 0}}, + {1180, {wxPen, isOk, 0}}, + {1181, {wxPen, setCap, 1}}, + {1182, {wxPen, setColour_1, 1}}, + {1183, {wxPen, setColour_3, 3}}, + {1184, {wxPen, setJoin, 1}}, + {1185, {wxPen, setStyle, 1}}, + {1186, {wxPen, setWidth, 1}}, + {1187, {wxRegion, new_0, 0}}, + {1188, {wxRegion, new_4, 4}}, + {1189, {wxRegion, new_2, 2}}, + {1190, {wxRegion, new_1_1, 1}}, + {1192, {wxRegion, new_1_0, 1}}, + {1194, {wxRegion, destruct, 0}}, + {1195, {wxRegion, clear, 0}}, + {1196, {wxRegion, contains_2, 2}}, + {1197, {wxRegion, contains_1_0, 1}}, + {1198, {wxRegion, contains_4, 4}}, + {1199, {wxRegion, contains_1_1, 1}}, + {1200, {wxRegion, convertToBitmap, 0}}, + {1201, {wxRegion, getBox, 0}}, + {1202, {wxRegion, intersect_4, 4}}, + {1203, {wxRegion, intersect_1_1, 1}}, + {1204, {wxRegion, intersect_1_0, 1}}, + {1205, {wxRegion, isEmpty, 0}}, + {1206, {wxRegion, subtract_4, 4}}, + {1207, {wxRegion, subtract_1_1, 1}}, + {1208, {wxRegion, subtract_1_0, 1}}, + {1209, {wxRegion, offset_2, 2}}, + {1210, {wxRegion, offset_1, 1}}, + {1211, {wxRegion, union_4, 4}}, + {1212, {wxRegion, union_1_2, 1}}, + {1213, {wxRegion, union_1_1, 1}}, + {1214, {wxRegion, union_1_0, 1}}, + {1215, {wxRegion, union_3, 3}}, + {1216, {wxRegion, xor_4, 4}}, + {1217, {wxRegion, xor_1_1, 1}}, + {1218, {wxRegion, xor_1_0, 1}}, + {1219, {wxAcceleratorTable, new_0, 0}}, + {1220, {wxAcceleratorTable, new_2, 2}}, + {1221, {wxAcceleratorTable, destruct, 0}}, + {1222, {wxAcceleratorTable, ok, 0}}, + {1223, {wxAcceleratorEntry, new_1_0, 1}}, + {1224, {wxAcceleratorEntry, new_1_1, 1}}, + {1225, {wxAcceleratorEntry, getCommand, 0}}, + {1226, {wxAcceleratorEntry, getFlags, 0}}, + {1227, {wxAcceleratorEntry, getKeyCode, 0}}, + {1228, {wxAcceleratorEntry, set, 4}}, + {1229, {wxAcceleratorEntry, 'Destroy', undefined}}, + {1234, {wxCaret, new_3, 3}}, + {1235, {wxCaret, new_2, 2}}, + {1237, {wxCaret, destruct, 0}}, + {1238, {wxCaret, create_3, 3}}, + {1239, {wxCaret, create_2, 2}}, + {1240, {wxCaret, getBlinkTime, 0}}, + {1242, {wxCaret, getPosition, 0}}, + {1244, {wxCaret, getSize, 0}}, + {1245, {wxCaret, getWindow, 0}}, + {1246, {wxCaret, hide, 0}}, + {1247, {wxCaret, isOk, 0}}, + {1248, {wxCaret, isVisible, 0}}, + {1249, {wxCaret, move_2, 2}}, + {1250, {wxCaret, move_1, 1}}, + {1251, {wxCaret, setBlinkTime, 1}}, + {1252, {wxCaret, setSize_2, 2}}, + {1253, {wxCaret, setSize_1, 1}}, + {1254, {wxCaret, show, 1}}, + {1255, {wxSizer, add_2_1, 2}}, + {1256, {wxSizer, add_2_0, 2}}, + {1257, {wxSizer, add_3, 3}}, + {1258, {wxSizer, add_2_3, 2}}, + {1259, {wxSizer, add_2_2, 2}}, + {1260, {wxSizer, addSpacer, 1}}, + {1261, {wxSizer, addStretchSpacer, 1}}, + {1262, {wxSizer, calcMin, 0}}, + {1263, {wxSizer, clear, 1}}, + {1264, {wxSizer, detach_1_2, 1}}, + {1265, {wxSizer, detach_1_1, 1}}, + {1266, {wxSizer, detach_1_0, 1}}, + {1267, {wxSizer, fit, 1}}, + {1268, {wxSizer, fitInside, 1}}, + {1269, {wxSizer, getChildren, 0}}, + {1270, {wxSizer, getItem_2_1, 2}}, + {1271, {wxSizer, getItem_2_0, 2}}, + {1272, {wxSizer, getItem_1, 1}}, + {1273, {wxSizer, getSize, 0}}, + {1274, {wxSizer, getPosition, 0}}, + {1275, {wxSizer, getMinSize, 0}}, + {1276, {wxSizer, hide_2_0, 2}}, + {1277, {wxSizer, hide_2_1, 2}}, + {1278, {wxSizer, hide_1, 1}}, + {1279, {wxSizer, insert_3_1, 3}}, + {1280, {wxSizer, insert_3_0, 3}}, + {1281, {wxSizer, insert_4, 4}}, + {1282, {wxSizer, insert_3_3, 3}}, + {1283, {wxSizer, insert_3_2, 3}}, + {1284, {wxSizer, insert_2, 2}}, + {1285, {wxSizer, insertSpacer, 2}}, + {1286, {wxSizer, insertStretchSpacer, 2}}, + {1287, {wxSizer, isShown_1_2, 1}}, + {1288, {wxSizer, isShown_1_1, 1}}, + {1289, {wxSizer, isShown_1_0, 1}}, + {1290, {wxSizer, layout, 0}}, + {1291, {wxSizer, prepend_2_1, 2}}, + {1292, {wxSizer, prepend_2_0, 2}}, + {1293, {wxSizer, prepend_3, 3}}, + {1294, {wxSizer, prepend_2_3, 2}}, + {1295, {wxSizer, prepend_2_2, 2}}, + {1296, {wxSizer, prepend_1, 1}}, + {1297, {wxSizer, prependSpacer, 1}}, + {1298, {wxSizer, prependStretchSpacer, 1}}, + {1299, {wxSizer, recalcSizes, 0}}, + {1300, {wxSizer, remove_1_1, 1}}, + {1301, {wxSizer, remove_1_0, 1}}, + {1302, {wxSizer, replace_3_1, 3}}, + {1303, {wxSizer, replace_3_0, 3}}, + {1304, {wxSizer, replace_2, 2}}, + {1305, {wxSizer, setDimension, 4}}, + {1306, {wxSizer, setMinSize_2, 2}}, + {1307, {wxSizer, setMinSize_1, 1}}, + {1308, {wxSizer, setItemMinSize_3_2, 3}}, + {1309, {wxSizer, setItemMinSize_2_2, 2}}, + {1310, {wxSizer, setItemMinSize_3_1, 3}}, + {1311, {wxSizer, setItemMinSize_2_1, 2}}, + {1312, {wxSizer, setItemMinSize_3_0, 3}}, + {1313, {wxSizer, setItemMinSize_2_0, 2}}, + {1314, {wxSizer, setSizeHints, 1}}, + {1315, {wxSizer, setVirtualSizeHints, 1}}, + {1316, {wxSizer, show_2_2, 2}}, + {1317, {wxSizer, show_2_1, 2}}, + {1318, {wxSizer, show_2_0, 2}}, + {1319, {wxSizer, show_1, 1}}, + {1320, {wxSizerFlags, new, 1}}, + {1321, {wxSizerFlags, align, 1}}, + {1322, {wxSizerFlags, border_2, 2}}, + {1323, {wxSizerFlags, border_1, 1}}, + {1324, {wxSizerFlags, center, 0}}, + {1325, {wxSizerFlags, centre, 0}}, + {1326, {wxSizerFlags, expand, 0}}, + {1327, {wxSizerFlags, left, 0}}, + {1328, {wxSizerFlags, proportion, 1}}, + {1329, {wxSizerFlags, right, 0}}, + {1330, {wxSizerFlags, 'Destroy', undefined}}, + {1331, {wxSizerItem, new_5_1, 5}}, + {1332, {wxSizerItem, new_2_1, 2}}, + {1333, {wxSizerItem, new_5_0, 5}}, + {1334, {wxSizerItem, new_2_0, 2}}, + {1335, {wxSizerItem, new_6, 6}}, + {1336, {wxSizerItem, new_3, 3}}, + {1337, {wxSizerItem, new_0, 0}}, + {1338, {wxSizerItem, destruct, 0}}, + {1339, {wxSizerItem, calcMin, 0}}, + {1340, {wxSizerItem, deleteWindows, 0}}, + {1341, {wxSizerItem, detachSizer, 0}}, + {1342, {wxSizerItem, getBorder, 0}}, + {1343, {wxSizerItem, getFlag, 0}}, + {1344, {wxSizerItem, getMinSize, 0}}, + {1345, {wxSizerItem, getPosition, 0}}, + {1346, {wxSizerItem, getProportion, 0}}, + {1347, {wxSizerItem, getRatio, 0}}, + {1348, {wxSizerItem, getRect, 0}}, + {1349, {wxSizerItem, getSize, 0}}, + {1350, {wxSizerItem, getSizer, 0}}, + {1351, {wxSizerItem, getSpacer, 0}}, + {1352, {wxSizerItem, getUserData, 0}}, + {1353, {wxSizerItem, getWindow, 0}}, + {1354, {wxSizerItem, isSizer, 0}}, + {1355, {wxSizerItem, isShown, 0}}, + {1356, {wxSizerItem, isSpacer, 0}}, + {1357, {wxSizerItem, isWindow, 0}}, + {1358, {wxSizerItem, setBorder, 1}}, + {1359, {wxSizerItem, setDimension, 2}}, + {1360, {wxSizerItem, setFlag, 1}}, + {1361, {wxSizerItem, setInitSize, 2}}, + {1362, {wxSizerItem, setMinSize_1, 1}}, + {1363, {wxSizerItem, setMinSize_2, 2}}, + {1364, {wxSizerItem, setProportion, 1}}, + {1365, {wxSizerItem, setRatio_2, 2}}, + {1366, {wxSizerItem, setRatio_1_1, 1}}, + {1367, {wxSizerItem, setRatio_1_0, 1}}, + {1368, {wxSizerItem, setSizer, 1}}, + {1369, {wxSizerItem, setSpacer_1, 1}}, + {1370, {wxSizerItem, setSpacer_2, 2}}, + {1371, {wxSizerItem, setWindow, 1}}, + {1372, {wxSizerItem, show, 1}}, + {1373, {wxBoxSizer, new, 1}}, + {1374, {wxBoxSizer, getOrientation, 0}}, + {1375, {wxBoxSizer, 'Destroy', undefined}}, + {1376, {wxStaticBoxSizer, new_2, 2}}, + {1377, {wxStaticBoxSizer, new_3, 3}}, + {1378, {wxStaticBoxSizer, getStaticBox, 0}}, + {1379, {wxStaticBoxSizer, 'Destroy', undefined}}, + {1380, {wxGridSizer, new_4, 4}}, + {1381, {wxGridSizer, new_2, 2}}, + {1382, {wxGridSizer, getCols, 0}}, + {1383, {wxGridSizer, getHGap, 0}}, + {1384, {wxGridSizer, getRows, 0}}, + {1385, {wxGridSizer, getVGap, 0}}, + {1386, {wxGridSizer, setCols, 1}}, + {1387, {wxGridSizer, setHGap, 1}}, + {1388, {wxGridSizer, setRows, 1}}, + {1389, {wxGridSizer, setVGap, 1}}, + {1390, {wxGridSizer, 'Destroy', undefined}}, + {1391, {wxFlexGridSizer, new_4, 4}}, + {1392, {wxFlexGridSizer, new_2, 2}}, + {1393, {wxFlexGridSizer, addGrowableCol, 2}}, + {1394, {wxFlexGridSizer, addGrowableRow, 2}}, + {1395, {wxFlexGridSizer, getFlexibleDirection, 0}}, + {1396, {wxFlexGridSizer, getNonFlexibleGrowMode, 0}}, + {1397, {wxFlexGridSizer, removeGrowableCol, 1}}, + {1398, {wxFlexGridSizer, removeGrowableRow, 1}}, + {1399, {wxFlexGridSizer, setFlexibleDirection, 1}}, + {1400, {wxFlexGridSizer, setNonFlexibleGrowMode, 1}}, + {1401, {wxFlexGridSizer, 'Destroy', undefined}}, + {1402, {wxGridBagSizer, new, 1}}, + {1403, {wxGridBagSizer, add_3_2, 3}}, + {1404, {wxGridBagSizer, add_3_1, 3}}, + {1405, {wxGridBagSizer, add_4, 4}}, + {1406, {wxGridBagSizer, add_1_0, 1}}, + {1407, {wxGridBagSizer, add_2_1, 2}}, + {1408, {wxGridBagSizer, add_2_0, 2}}, + {1409, {wxGridBagSizer, add_3_0, 3}}, + {1410, {wxGridBagSizer, add_1_1, 1}}, + {1411, {wxGridBagSizer, calcMin, 0}}, + {1412, {wxGridBagSizer, checkForIntersection_2, 2}}, + {1413, {wxGridBagSizer, checkForIntersection_3, 3}}, + {1414, {wxGridBagSizer, findItem_1_1, 1}}, + {1415, {wxGridBagSizer, findItem_1_0, 1}}, + {1416, {wxGridBagSizer, findItemAtPoint, 1}}, + {1417, {wxGridBagSizer, findItemAtPosition, 1}}, + {1418, {wxGridBagSizer, findItemWithData, 1}}, + {1419, {wxGridBagSizer, getCellSize, 2}}, + {1420, {wxGridBagSizer, getEmptyCellSize, 0}}, + {1421, {wxGridBagSizer, getItemPosition_1_2, 1}}, + {1422, {wxGridBagSizer, getItemPosition_1_1, 1}}, + {1423, {wxGridBagSizer, getItemPosition_1_0, 1}}, + {1424, {wxGridBagSizer, getItemSpan_1_2, 1}}, + {1425, {wxGridBagSizer, getItemSpan_1_1, 1}}, + {1426, {wxGridBagSizer, getItemSpan_1_0, 1}}, + {1427, {wxGridBagSizer, setEmptyCellSize, 1}}, + {1428, {wxGridBagSizer, setItemPosition_2_2, 2}}, + {1429, {wxGridBagSizer, setItemPosition_2_1, 2}}, + {1430, {wxGridBagSizer, setItemPosition_2_0, 2}}, + {1431, {wxGridBagSizer, setItemSpan_2_2, 2}}, + {1432, {wxGridBagSizer, setItemSpan_2_1, 2}}, + {1433, {wxGridBagSizer, setItemSpan_2_0, 2}}, + {1434, {wxGridBagSizer, 'Destroy', undefined}}, + {1435, {wxStdDialogButtonSizer, new, 0}}, + {1436, {wxStdDialogButtonSizer, addButton, 1}}, + {1437, {wxStdDialogButtonSizer, realize, 0}}, + {1438, {wxStdDialogButtonSizer, setAffirmativeButton, 1}}, + {1439, {wxStdDialogButtonSizer, setCancelButton, 1}}, + {1440, {wxStdDialogButtonSizer, setNegativeButton, 1}}, + {1441, {wxStdDialogButtonSizer, 'Destroy', undefined}}, + {1442, {wxFont, new_0, 0}}, + {1443, {wxFont, new_1, 1}}, + {1444, {wxFont, new_5, 5}}, + {1446, {wxFont, destruct, 0}}, + {1447, {wxFont, isFixedWidth, 0}}, + {1448, {wxFont, getDefaultEncoding, 0}}, + {1449, {wxFont, getFaceName, 0}}, + {1450, {wxFont, getFamily, 0}}, + {1451, {wxFont, getNativeFontInfoDesc, 0}}, + {1452, {wxFont, getNativeFontInfoUserDesc, 0}}, + {1453, {wxFont, getPointSize, 0}}, + {1454, {wxFont, getStyle, 0}}, + {1455, {wxFont, getUnderlined, 0}}, + {1456, {wxFont, getWeight, 0}}, + {1457, {wxFont, ok, 0}}, + {1458, {wxFont, setDefaultEncoding, 1}}, + {1459, {wxFont, setFaceName, 1}}, + {1460, {wxFont, setFamily, 1}}, + {1461, {wxFont, setPointSize, 1}}, + {1462, {wxFont, setStyle, 1}}, + {1463, {wxFont, setUnderlined, 1}}, + {1464, {wxFont, setWeight, 1}}, + {1465, {wxToolTip, enable, 1}}, + {1466, {wxToolTip, setDelay, 1}}, + {1467, {wxToolTip, new, 1}}, + {1468, {wxToolTip, setTip, 1}}, + {1469, {wxToolTip, getTip, 0}}, + {1470, {wxToolTip, getWindow, 0}}, + {1471, {wxToolTip, 'Destroy', undefined}}, + {1473, {wxButton, new_3, 3}}, + {1474, {wxButton, new_0, 0}}, + {1475, {wxButton, destruct, 0}}, + {1476, {wxButton, create, 3}}, + {1477, {wxButton, getDefaultSize, 0}}, + {1478, {wxButton, setDefault, 0}}, + {1479, {wxButton, setLabel, 1}}, + {1481, {wxBitmapButton, new_4, 4}}, + {1482, {wxBitmapButton, new_0, 0}}, + {1483, {wxBitmapButton, create, 4}}, + {1484, {wxBitmapButton, getBitmapDisabled, 0}}, + {1486, {wxBitmapButton, getBitmapFocus, 0}}, + {1488, {wxBitmapButton, getBitmapLabel, 0}}, + {1490, {wxBitmapButton, getBitmapSelected, 0}}, + {1492, {wxBitmapButton, setBitmapDisabled, 1}}, + {1493, {wxBitmapButton, setBitmapFocus, 1}}, + {1494, {wxBitmapButton, setBitmapLabel, 1}}, + {1495, {wxBitmapButton, setBitmapSelected, 1}}, + {1496, {wxBitmapButton, 'Destroy', undefined}}, + {1497, {wxToggleButton, new_0, 0}}, + {1498, {wxToggleButton, new_4, 4}}, + {1499, {wxToggleButton, create, 4}}, + {1500, {wxToggleButton, getValue, 0}}, + {1501, {wxToggleButton, setValue, 1}}, + {1502, {wxToggleButton, 'Destroy', undefined}}, + {1503, {wxCalendarCtrl, new_0, 0}}, + {1504, {wxCalendarCtrl, new_3, 3}}, + {1505, {wxCalendarCtrl, create, 3}}, + {1506, {wxCalendarCtrl, destruct, 0}}, + {1507, {wxCalendarCtrl, setDate, 1}}, + {1508, {wxCalendarCtrl, getDate, 0}}, + {1509, {wxCalendarCtrl, enableYearChange, 1}}, + {1510, {wxCalendarCtrl, enableMonthChange, 1}}, + {1511, {wxCalendarCtrl, enableHolidayDisplay, 1}}, + {1512, {wxCalendarCtrl, setHeaderColours, 2}}, + {1513, {wxCalendarCtrl, getHeaderColourFg, 0}}, + {1514, {wxCalendarCtrl, getHeaderColourBg, 0}}, + {1515, {wxCalendarCtrl, setHighlightColours, 2}}, + {1516, {wxCalendarCtrl, getHighlightColourFg, 0}}, + {1517, {wxCalendarCtrl, getHighlightColourBg, 0}}, + {1518, {wxCalendarCtrl, setHolidayColours, 2}}, + {1519, {wxCalendarCtrl, getHolidayColourFg, 0}}, + {1520, {wxCalendarCtrl, getHolidayColourBg, 0}}, + {1521, {wxCalendarCtrl, getAttr, 1}}, + {1522, {wxCalendarCtrl, setAttr, 2}}, + {1523, {wxCalendarCtrl, setHoliday, 1}}, + {1524, {wxCalendarCtrl, resetAttr, 1}}, + {1525, {wxCalendarCtrl, hitTest, 2}}, + {1526, {wxCalendarDateAttr, new_0, 0}}, + {1527, {wxCalendarDateAttr, new_2_1, 2}}, + {1528, {wxCalendarDateAttr, new_2_0, 2}}, + {1529, {wxCalendarDateAttr, setTextColour, 1}}, + {1530, {wxCalendarDateAttr, setBackgroundColour, 1}}, + {1531, {wxCalendarDateAttr, setBorderColour, 1}}, + {1532, {wxCalendarDateAttr, setFont, 1}}, + {1533, {wxCalendarDateAttr, setBorder, 1}}, + {1534, {wxCalendarDateAttr, setHoliday, 1}}, + {1535, {wxCalendarDateAttr, hasTextColour, 0}}, + {1536, {wxCalendarDateAttr, hasBackgroundColour, 0}}, + {1537, {wxCalendarDateAttr, hasBorderColour, 0}}, + {1538, {wxCalendarDateAttr, hasFont, 0}}, + {1539, {wxCalendarDateAttr, hasBorder, 0}}, + {1540, {wxCalendarDateAttr, isHoliday, 0}}, + {1541, {wxCalendarDateAttr, getTextColour, 0}}, + {1542, {wxCalendarDateAttr, getBackgroundColour, 0}}, + {1543, {wxCalendarDateAttr, getBorderColour, 0}}, + {1544, {wxCalendarDateAttr, getFont, 0}}, + {1545, {wxCalendarDateAttr, getBorder, 0}}, + {1546, {wxCalendarDateAttr, 'Destroy', undefined}}, + {1548, {wxCheckBox, new_4, 4}}, + {1549, {wxCheckBox, new_0, 0}}, + {1550, {wxCheckBox, create, 4}}, + {1551, {wxCheckBox, getValue, 0}}, + {1552, {wxCheckBox, get3StateValue, 0}}, + {1553, {wxCheckBox, is3rdStateAllowedForUser, 0}}, + {1554, {wxCheckBox, is3State, 0}}, + {1555, {wxCheckBox, isChecked, 0}}, + {1556, {wxCheckBox, setValue, 1}}, + {1557, {wxCheckBox, set3StateValue, 1}}, + {1558, {wxCheckBox, 'Destroy', undefined}}, + {1559, {wxCheckListBox, new_0, 0}}, + {1561, {wxCheckListBox, new_3, 3}}, + {1562, {wxCheckListBox, check, 2}}, + {1563, {wxCheckListBox, isChecked, 1}}, + {1564, {wxCheckListBox, 'Destroy', undefined}}, + {1567, {wxChoice, new_3, 3}}, + {1568, {wxChoice, new_0, 0}}, + {1570, {wxChoice, destruct, 0}}, + {1572, {wxChoice, create, 6}}, + {1573, {wxChoice, delete, 1}}, + {1574, {wxChoice, getColumns, 0}}, + {1575, {wxChoice, setColumns, 1}}, + {1576, {wxComboBox, new_0, 0}}, + {1578, {wxComboBox, new_3, 3}}, + {1579, {wxComboBox, destruct, 0}}, + {1581, {wxComboBox, create, 7}}, + {1582, {wxComboBox, canCopy, 0}}, + {1583, {wxComboBox, canCut, 0}}, + {1584, {wxComboBox, canPaste, 0}}, + {1585, {wxComboBox, canRedo, 0}}, + {1586, {wxComboBox, canUndo, 0}}, + {1587, {wxComboBox, copy, 0}}, + {1588, {wxComboBox, cut, 0}}, + {1589, {wxComboBox, getInsertionPoint, 0}}, + {1590, {wxComboBox, getLastPosition, 0}}, + {1591, {wxComboBox, getValue, 0}}, + {1592, {wxComboBox, paste, 0}}, + {1593, {wxComboBox, redo, 0}}, + {1594, {wxComboBox, replace, 3}}, + {1595, {wxComboBox, remove, 2}}, + {1596, {wxComboBox, setInsertionPoint, 1}}, + {1597, {wxComboBox, setInsertionPointEnd, 0}}, + {1598, {wxComboBox, setSelection_1, 1}}, + {1599, {wxComboBox, setSelection_2, 2}}, + {1600, {wxComboBox, setValue, 1}}, + {1601, {wxComboBox, undo, 0}}, + {1602, {wxGauge, new_0, 0}}, + {1603, {wxGauge, new_4, 4}}, + {1604, {wxGauge, create, 4}}, + {1605, {wxGauge, getBezelFace, 0}}, + {1606, {wxGauge, getRange, 0}}, + {1607, {wxGauge, getShadowWidth, 0}}, + {1608, {wxGauge, getValue, 0}}, + {1609, {wxGauge, isVertical, 0}}, + {1610, {wxGauge, setBezelFace, 1}}, + {1611, {wxGauge, setRange, 1}}, + {1612, {wxGauge, setShadowWidth, 1}}, + {1613, {wxGauge, setValue, 1}}, + {1614, {wxGauge, pulse, 0}}, + {1615, {wxGauge, 'Destroy', undefined}}, + {1616, {wxGenericDirCtrl, new_0, 0}}, + {1617, {wxGenericDirCtrl, new_2, 2}}, + {1618, {wxGenericDirCtrl, destruct, 0}}, + {1619, {wxGenericDirCtrl, create, 2}}, + {1620, {wxGenericDirCtrl, init, 0}}, + {1621, {wxGenericDirCtrl, collapseTree, 0}}, + {1622, {wxGenericDirCtrl, expandPath, 1}}, + {1623, {wxGenericDirCtrl, getDefaultPath, 0}}, + {1624, {wxGenericDirCtrl, getPath, 0}}, + {1625, {wxGenericDirCtrl, getFilePath, 0}}, + {1626, {wxGenericDirCtrl, getFilter, 0}}, + {1627, {wxGenericDirCtrl, getFilterIndex, 0}}, + {1628, {wxGenericDirCtrl, getRootId, 0}}, + {1629, {wxGenericDirCtrl, getTreeCtrl, 0}}, + {1630, {wxGenericDirCtrl, reCreateTree, 0}}, + {1631, {wxGenericDirCtrl, setDefaultPath, 1}}, + {1632, {wxGenericDirCtrl, setFilter, 1}}, + {1633, {wxGenericDirCtrl, setFilterIndex, 1}}, + {1634, {wxGenericDirCtrl, setPath, 1}}, + {1636, {wxStaticBox, new_4, 4}}, + {1637, {wxStaticBox, new_0, 0}}, + {1638, {wxStaticBox, create, 4}}, + {1639, {wxStaticBox, 'Destroy', undefined}}, + {1641, {wxStaticLine, new_2, 2}}, + {1642, {wxStaticLine, new_0, 0}}, + {1643, {wxStaticLine, create, 2}}, + {1644, {wxStaticLine, isVertical, 0}}, + {1645, {wxStaticLine, getDefaultSize, 0}}, + {1646, {wxStaticLine, 'Destroy', undefined}}, + {1649, {wxListBox, new_3, 3}}, + {1650, {wxListBox, new_0, 0}}, + {1652, {wxListBox, destruct, 0}}, + {1654, {wxListBox, create, 6}}, + {1655, {wxListBox, deselect, 1}}, + {1656, {wxListBox, getSelections, 1}}, + {1657, {wxListBox, insertItems, 2}}, + {1658, {wxListBox, isSelected, 1}}, + {1659, {wxListBox, set, 1}}, + {1660, {wxListBox, hitTest, 1}}, + {1661, {wxListBox, setFirstItem_1_0, 1}}, + {1662, {wxListBox, setFirstItem_1_1, 1}}, + {1663, {wxListCtrl, new_0, 0}}, + {1664, {wxListCtrl, new_2, 2}}, + {1665, {wxListCtrl, arrange, 1}}, + {1666, {wxListCtrl, assignImageList, 2}}, + {1667, {wxListCtrl, clearAll, 0}}, + {1668, {wxListCtrl, create, 2}}, + {1669, {wxListCtrl, deleteAllItems, 0}}, + {1670, {wxListCtrl, deleteColumn, 1}}, + {1671, {wxListCtrl, deleteItem, 1}}, + {1672, {wxListCtrl, editLabel, 1}}, + {1673, {wxListCtrl, ensureVisible, 1}}, + {1674, {wxListCtrl, findItem_3_0, 3}}, + {1675, {wxListCtrl, findItem_3_1, 3}}, + {1676, {wxListCtrl, getColumn, 2}}, + {1677, {wxListCtrl, getColumnCount, 0}}, + {1678, {wxListCtrl, getColumnWidth, 1}}, + {1679, {wxListCtrl, getCountPerPage, 0}}, + {1680, {wxListCtrl, getEditControl, 0}}, + {1681, {wxListCtrl, getImageList, 1}}, + {1682, {wxListCtrl, getItem, 1}}, + {1683, {wxListCtrl, getItemBackgroundColour, 1}}, + {1684, {wxListCtrl, getItemCount, 0}}, + {1685, {wxListCtrl, getItemData, 1}}, + {1686, {wxListCtrl, getItemFont, 1}}, + {1687, {wxListCtrl, getItemPosition, 2}}, + {1688, {wxListCtrl, getItemRect, 3}}, + {1689, {wxListCtrl, getItemSpacing, 0}}, + {1690, {wxListCtrl, getItemState, 2}}, + {1691, {wxListCtrl, getItemText, 1}}, + {1692, {wxListCtrl, getItemTextColour, 1}}, + {1693, {wxListCtrl, getNextItem, 2}}, + {1694, {wxListCtrl, getSelectedItemCount, 0}}, + {1695, {wxListCtrl, getTextColour, 0}}, + {1696, {wxListCtrl, getTopItem, 0}}, + {1697, {wxListCtrl, getViewRect, 0}}, + {1698, {wxListCtrl, hitTest, 2}}, + {1699, {wxListCtrl, insertColumn_2, 2}}, + {1700, {wxListCtrl, insertColumn_3, 3}}, + {1701, {wxListCtrl, insertItem_1, 1}}, + {1702, {wxListCtrl, insertItem_2_1, 2}}, + {1703, {wxListCtrl, insertItem_2_0, 2}}, + {1704, {wxListCtrl, insertItem_3, 3}}, + {1705, {wxListCtrl, refreshItem, 1}}, + {1706, {wxListCtrl, refreshItems, 2}}, + {1707, {wxListCtrl, scrollList, 2}}, + {1708, {wxListCtrl, setBackgroundColour, 1}}, + {1709, {wxListCtrl, setColumn, 2}}, + {1710, {wxListCtrl, setColumnWidth, 2}}, + {1711, {wxListCtrl, setImageList, 2}}, + {1712, {wxListCtrl, setItem_1, 1}}, + {1713, {wxListCtrl, setItem_4, 4}}, + {1714, {wxListCtrl, setItemBackgroundColour, 2}}, + {1715, {wxListCtrl, setItemCount, 1}}, + {1716, {wxListCtrl, setItemData, 2}}, + {1717, {wxListCtrl, setItemFont, 2}}, + {1718, {wxListCtrl, setItemImage, 3}}, + {1719, {wxListCtrl, setItemColumnImage, 3}}, + {1720, {wxListCtrl, setItemPosition, 2}}, + {1721, {wxListCtrl, setItemState, 3}}, + {1722, {wxListCtrl, setItemText, 2}}, + {1723, {wxListCtrl, setItemTextColour, 2}}, + {1724, {wxListCtrl, setSingleStyle, 2}}, + {1725, {wxListCtrl, setTextColour, 1}}, + {1726, {wxListCtrl, setWindowStyleFlag, 1}}, + {1727, {wxListCtrl, sortItems, 2}}, + {1728, {wxListCtrl, 'Destroy', undefined}}, + {1729, {wxListView, clearColumnImage, 1}}, + {1730, {wxListView, focus, 1}}, + {1731, {wxListView, getFirstSelected, 0}}, + {1732, {wxListView, getFocusedItem, 0}}, + {1733, {wxListView, getNextSelected, 1}}, + {1734, {wxListView, isSelected, 1}}, + {1735, {wxListView, select, 2}}, + {1736, {wxListView, setColumnImage, 2}}, + {1737, {wxListItem, new_0, 0}}, + {1738, {wxListItem, new_1, 1}}, + {1739, {wxListItem, destruct, 0}}, + {1740, {wxListItem, clear, 0}}, + {1741, {wxListItem, getAlign, 0}}, + {1742, {wxListItem, getBackgroundColour, 0}}, + {1743, {wxListItem, getColumn, 0}}, + {1744, {wxListItem, getFont, 0}}, + {1745, {wxListItem, getId, 0}}, + {1746, {wxListItem, getImage, 0}}, + {1747, {wxListItem, getMask, 0}}, + {1748, {wxListItem, getState, 0}}, + {1749, {wxListItem, getText, 0}}, + {1750, {wxListItem, getTextColour, 0}}, + {1751, {wxListItem, getWidth, 0}}, + {1752, {wxListItem, setAlign, 1}}, + {1753, {wxListItem, setBackgroundColour, 1}}, + {1754, {wxListItem, setColumn, 1}}, + {1755, {wxListItem, setFont, 1}}, + {1756, {wxListItem, setId, 1}}, + {1757, {wxListItem, setImage, 1}}, + {1758, {wxListItem, setMask, 1}}, + {1759, {wxListItem, setState, 1}}, + {1760, {wxListItem, setStateMask, 1}}, + {1761, {wxListItem, setText, 1}}, + {1762, {wxListItem, setTextColour, 1}}, + {1763, {wxListItem, setWidth, 1}}, + {1764, {wxListItemAttr, new_0, 0}}, + {1765, {wxListItemAttr, new_3, 3}}, + {1766, {wxListItemAttr, getBackgroundColour, 0}}, + {1767, {wxListItemAttr, getFont, 0}}, + {1768, {wxListItemAttr, getTextColour, 0}}, + {1769, {wxListItemAttr, hasBackgroundColour, 0}}, + {1770, {wxListItemAttr, hasFont, 0}}, + {1771, {wxListItemAttr, hasTextColour, 0}}, + {1772, {wxListItemAttr, setBackgroundColour, 1}}, + {1773, {wxListItemAttr, setFont, 1}}, + {1774, {wxListItemAttr, setTextColour, 1}}, + {1775, {wxListItemAttr, 'Destroy', undefined}}, + {1776, {wxImageList, new_0, 0}}, + {1777, {wxImageList, new_3, 3}}, + {1778, {wxImageList, add_1, 1}}, + {1779, {wxImageList, add_2_0, 2}}, + {1780, {wxImageList, add_2_1, 2}}, + {1781, {wxImageList, create, 3}}, + {1783, {wxImageList, draw, 5}}, + {1784, {wxImageList, getBitmap, 1}}, + {1785, {wxImageList, getIcon, 1}}, + {1786, {wxImageList, getImageCount, 0}}, + {1787, {wxImageList, getSize, 3}}, + {1788, {wxImageList, remove, 1}}, + {1789, {wxImageList, removeAll, 0}}, + {1790, {wxImageList, replace_2, 2}}, + {1791, {wxImageList, replace_3, 3}}, + {1792, {wxImageList, 'Destroy', undefined}}, + {1793, {wxTextAttr, new_0, 0}}, + {1794, {wxTextAttr, new_2, 2}}, + {1795, {wxTextAttr, getAlignment, 0}}, + {1796, {wxTextAttr, getBackgroundColour, 0}}, + {1797, {wxTextAttr, getFont, 0}}, + {1798, {wxTextAttr, getLeftIndent, 0}}, + {1799, {wxTextAttr, getLeftSubIndent, 0}}, + {1800, {wxTextAttr, getRightIndent, 0}}, + {1801, {wxTextAttr, getTabs, 0}}, + {1802, {wxTextAttr, getTextColour, 0}}, + {1803, {wxTextAttr, hasBackgroundColour, 0}}, + {1804, {wxTextAttr, hasFont, 0}}, + {1805, {wxTextAttr, hasTextColour, 0}}, + {1806, {wxTextAttr, getFlags, 0}}, + {1807, {wxTextAttr, isDefault, 0}}, + {1808, {wxTextAttr, setAlignment, 1}}, + {1809, {wxTextAttr, setBackgroundColour, 1}}, + {1810, {wxTextAttr, setFlags, 1}}, + {1811, {wxTextAttr, setFont, 2}}, + {1812, {wxTextAttr, setLeftIndent, 2}}, + {1813, {wxTextAttr, setRightIndent, 1}}, + {1814, {wxTextAttr, setTabs, 1}}, + {1815, {wxTextAttr, setTextColour, 1}}, + {1816, {wxTextAttr, 'Destroy', undefined}}, + {1818, {wxTextCtrl, new_3, 3}}, + {1819, {wxTextCtrl, new_0, 0}}, + {1821, {wxTextCtrl, destruct, 0}}, + {1822, {wxTextCtrl, appendText, 1}}, + {1823, {wxTextCtrl, canCopy, 0}}, + {1824, {wxTextCtrl, canCut, 0}}, + {1825, {wxTextCtrl, canPaste, 0}}, + {1826, {wxTextCtrl, canRedo, 0}}, + {1827, {wxTextCtrl, canUndo, 0}}, + {1828, {wxTextCtrl, clear, 0}}, + {1829, {wxTextCtrl, copy, 0}}, + {1830, {wxTextCtrl, create, 3}}, + {1831, {wxTextCtrl, cut, 0}}, + {1832, {wxTextCtrl, discardEdits, 0}}, + {1833, {wxTextCtrl, changeValue, 1}}, + {1834, {wxTextCtrl, emulateKeyPress, 1}}, + {1835, {wxTextCtrl, getDefaultStyle, 0}}, + {1836, {wxTextCtrl, getInsertionPoint, 0}}, + {1837, {wxTextCtrl, getLastPosition, 0}}, + {1838, {wxTextCtrl, getLineLength, 1}}, + {1839, {wxTextCtrl, getLineText, 1}}, + {1840, {wxTextCtrl, getNumberOfLines, 0}}, + {1841, {wxTextCtrl, getRange, 2}}, + {1842, {wxTextCtrl, getSelection, 2}}, + {1843, {wxTextCtrl, getStringSelection, 0}}, + {1844, {wxTextCtrl, getStyle, 2}}, + {1845, {wxTextCtrl, getValue, 0}}, + {1846, {wxTextCtrl, isEditable, 0}}, + {1847, {wxTextCtrl, isModified, 0}}, + {1848, {wxTextCtrl, isMultiLine, 0}}, + {1849, {wxTextCtrl, isSingleLine, 0}}, + {1850, {wxTextCtrl, loadFile, 2}}, + {1851, {wxTextCtrl, markDirty, 0}}, + {1852, {wxTextCtrl, paste, 0}}, + {1853, {wxTextCtrl, positionToXY, 3}}, + {1854, {wxTextCtrl, redo, 0}}, + {1855, {wxTextCtrl, remove, 2}}, + {1856, {wxTextCtrl, replace, 3}}, + {1857, {wxTextCtrl, saveFile, 1}}, + {1858, {wxTextCtrl, setDefaultStyle, 1}}, + {1859, {wxTextCtrl, setEditable, 1}}, + {1860, {wxTextCtrl, setInsertionPoint, 1}}, + {1861, {wxTextCtrl, setInsertionPointEnd, 0}}, + {1863, {wxTextCtrl, setMaxLength, 1}}, + {1864, {wxTextCtrl, setSelection, 2}}, + {1865, {wxTextCtrl, setStyle, 3}}, + {1866, {wxTextCtrl, setValue, 1}}, + {1867, {wxTextCtrl, showPosition, 1}}, + {1868, {wxTextCtrl, undo, 0}}, + {1869, {wxTextCtrl, writeText, 1}}, + {1870, {wxTextCtrl, xYToPosition, 2}}, + {1873, {wxNotebook, new_0, 0}}, + {1874, {wxNotebook, new_3, 3}}, + {1875, {wxNotebook, destruct, 0}}, + {1876, {wxNotebook, addPage, 3}}, + {1877, {wxNotebook, advanceSelection, 1}}, + {1878, {wxNotebook, assignImageList, 1}}, + {1879, {wxNotebook, create, 3}}, + {1880, {wxNotebook, deleteAllPages, 0}}, + {1881, {wxNotebook, deletePage, 1}}, + {1882, {wxNotebook, removePage, 1}}, + {1883, {wxNotebook, getCurrentPage, 0}}, + {1884, {wxNotebook, getImageList, 0}}, + {1886, {wxNotebook, getPage, 1}}, + {1887, {wxNotebook, getPageCount, 0}}, + {1888, {wxNotebook, getPageImage, 1}}, + {1889, {wxNotebook, getPageText, 1}}, + {1890, {wxNotebook, getRowCount, 0}}, + {1891, {wxNotebook, getSelection, 0}}, + {1892, {wxNotebook, getThemeBackgroundColour, 0}}, + {1894, {wxNotebook, hitTest, 2}}, + {1896, {wxNotebook, insertPage, 4}}, + {1897, {wxNotebook, setImageList, 1}}, + {1898, {wxNotebook, setPadding, 1}}, + {1899, {wxNotebook, setPageSize, 1}}, + {1900, {wxNotebook, setPageImage, 2}}, + {1901, {wxNotebook, setPageText, 2}}, + {1902, {wxNotebook, setSelection, 1}}, + {1903, {wxNotebook, changeSelection, 1}}, + {1904, {wxChoicebook, new_0, 0}}, + {1905, {wxChoicebook, new_3, 3}}, + {1906, {wxChoicebook, addPage, 3}}, + {1907, {wxChoicebook, advanceSelection, 1}}, + {1908, {wxChoicebook, assignImageList, 1}}, + {1909, {wxChoicebook, create, 3}}, + {1910, {wxChoicebook, deleteAllPages, 0}}, + {1911, {wxChoicebook, deletePage, 1}}, + {1912, {wxChoicebook, removePage, 1}}, + {1913, {wxChoicebook, getCurrentPage, 0}}, + {1914, {wxChoicebook, getImageList, 0}}, + {1916, {wxChoicebook, getPage, 1}}, + {1917, {wxChoicebook, getPageCount, 0}}, + {1918, {wxChoicebook, getPageImage, 1}}, + {1919, {wxChoicebook, getPageText, 1}}, + {1920, {wxChoicebook, getSelection, 0}}, + {1921, {wxChoicebook, hitTest, 2}}, + {1922, {wxChoicebook, insertPage, 4}}, + {1923, {wxChoicebook, setImageList, 1}}, + {1924, {wxChoicebook, setPageSize, 1}}, + {1925, {wxChoicebook, setPageImage, 2}}, + {1926, {wxChoicebook, setPageText, 2}}, + {1927, {wxChoicebook, setSelection, 1}}, + {1928, {wxChoicebook, changeSelection, 1}}, + {1929, {wxChoicebook, 'Destroy', undefined}}, + {1930, {wxToolbook, new_0, 0}}, + {1931, {wxToolbook, new_3, 3}}, + {1932, {wxToolbook, addPage, 3}}, + {1933, {wxToolbook, advanceSelection, 1}}, + {1934, {wxToolbook, assignImageList, 1}}, + {1935, {wxToolbook, create, 3}}, + {1936, {wxToolbook, deleteAllPages, 0}}, + {1937, {wxToolbook, deletePage, 1}}, + {1938, {wxToolbook, removePage, 1}}, + {1939, {wxToolbook, getCurrentPage, 0}}, + {1940, {wxToolbook, getImageList, 0}}, + {1942, {wxToolbook, getPage, 1}}, + {1943, {wxToolbook, getPageCount, 0}}, + {1944, {wxToolbook, getPageImage, 1}}, + {1945, {wxToolbook, getPageText, 1}}, + {1946, {wxToolbook, getSelection, 0}}, + {1948, {wxToolbook, hitTest, 2}}, + {1949, {wxToolbook, insertPage, 4}}, + {1950, {wxToolbook, setImageList, 1}}, + {1951, {wxToolbook, setPageSize, 1}}, + {1952, {wxToolbook, setPageImage, 2}}, + {1953, {wxToolbook, setPageText, 2}}, + {1954, {wxToolbook, setSelection, 1}}, + {1955, {wxToolbook, changeSelection, 1}}, + {1956, {wxToolbook, 'Destroy', undefined}}, + {1957, {wxListbook, new_0, 0}}, + {1958, {wxListbook, new_3, 3}}, + {1959, {wxListbook, addPage, 3}}, + {1960, {wxListbook, advanceSelection, 1}}, + {1961, {wxListbook, assignImageList, 1}}, + {1962, {wxListbook, create, 3}}, + {1963, {wxListbook, deleteAllPages, 0}}, + {1964, {wxListbook, deletePage, 1}}, + {1965, {wxListbook, removePage, 1}}, + {1966, {wxListbook, getCurrentPage, 0}}, + {1967, {wxListbook, getImageList, 0}}, + {1969, {wxListbook, getPage, 1}}, + {1970, {wxListbook, getPageCount, 0}}, + {1971, {wxListbook, getPageImage, 1}}, + {1972, {wxListbook, getPageText, 1}}, + {1973, {wxListbook, getSelection, 0}}, + {1975, {wxListbook, hitTest, 2}}, + {1976, {wxListbook, insertPage, 4}}, + {1977, {wxListbook, setImageList, 1}}, + {1978, {wxListbook, setPageSize, 1}}, + {1979, {wxListbook, setPageImage, 2}}, + {1980, {wxListbook, setPageText, 2}}, + {1981, {wxListbook, setSelection, 1}}, + {1982, {wxListbook, changeSelection, 1}}, + {1983, {wxListbook, 'Destroy', undefined}}, + {1984, {wxTreebook, new_0, 0}}, + {1985, {wxTreebook, new_3, 3}}, + {1986, {wxTreebook, addPage, 3}}, + {1987, {wxTreebook, advanceSelection, 1}}, + {1988, {wxTreebook, assignImageList, 1}}, + {1989, {wxTreebook, create, 3}}, + {1990, {wxTreebook, deleteAllPages, 0}}, + {1991, {wxTreebook, deletePage, 1}}, + {1992, {wxTreebook, removePage, 1}}, + {1993, {wxTreebook, getCurrentPage, 0}}, + {1994, {wxTreebook, getImageList, 0}}, + {1996, {wxTreebook, getPage, 1}}, + {1997, {wxTreebook, getPageCount, 0}}, + {1998, {wxTreebook, getPageImage, 1}}, + {1999, {wxTreebook, getPageText, 1}}, + {2000, {wxTreebook, getSelection, 0}}, + {2001, {wxTreebook, expandNode, 2}}, + {2002, {wxTreebook, isNodeExpanded, 1}}, + {2004, {wxTreebook, hitTest, 2}}, + {2005, {wxTreebook, insertPage, 4}}, + {2006, {wxTreebook, insertSubPage, 4}}, + {2007, {wxTreebook, setImageList, 1}}, + {2008, {wxTreebook, setPageSize, 1}}, + {2009, {wxTreebook, setPageImage, 2}}, + {2010, {wxTreebook, setPageText, 2}}, + {2011, {wxTreebook, setSelection, 1}}, + {2012, {wxTreebook, changeSelection, 1}}, + {2013, {wxTreebook, 'Destroy', undefined}}, + {2016, {wxTreeCtrl, new_2, 2}}, + {2017, {wxTreeCtrl, new_0, 0}}, + {2019, {wxTreeCtrl, destruct, 0}}, + {2020, {wxTreeCtrl, addRoot, 2}}, + {2021, {wxTreeCtrl, appendItem, 3}}, + {2022, {wxTreeCtrl, assignImageList, 1}}, + {2023, {wxTreeCtrl, assignStateImageList, 1}}, + {2024, {wxTreeCtrl, collapse, 1}}, + {2025, {wxTreeCtrl, collapseAndReset, 1}}, + {2026, {wxTreeCtrl, create, 2}}, + {2027, {wxTreeCtrl, delete, 1}}, + {2028, {wxTreeCtrl, deleteAllItems, 0}}, + {2029, {wxTreeCtrl, deleteChildren, 1}}, + {2030, {wxTreeCtrl, editLabel, 1}}, + {2031, {wxTreeCtrl, ensureVisible, 1}}, + {2032, {wxTreeCtrl, expand, 1}}, + {2033, {wxTreeCtrl, getBoundingRect, 3}}, + {2035, {wxTreeCtrl, getChildrenCount, 2}}, + {2036, {wxTreeCtrl, getCount, 0}}, + {2037, {wxTreeCtrl, getEditControl, 0}}, + {2038, {wxTreeCtrl, getFirstChild, 2}}, + {2039, {wxTreeCtrl, getNextChild, 2}}, + {2040, {wxTreeCtrl, getFirstVisibleItem, 0}}, + {2041, {wxTreeCtrl, getImageList, 0}}, + {2042, {wxTreeCtrl, getIndent, 0}}, + {2043, {wxTreeCtrl, getItemBackgroundColour, 1}}, + {2044, {wxTreeCtrl, getItemData, 1}}, + {2045, {wxTreeCtrl, getItemFont, 1}}, + {2046, {wxTreeCtrl, getItemImage_1, 1}}, + {2047, {wxTreeCtrl, getItemImage_2, 2}}, + {2048, {wxTreeCtrl, getItemText, 1}}, + {2049, {wxTreeCtrl, getItemTextColour, 1}}, + {2050, {wxTreeCtrl, getLastChild, 1}}, + {2051, {wxTreeCtrl, getNextSibling, 1}}, + {2052, {wxTreeCtrl, getNextVisible, 1}}, + {2053, {wxTreeCtrl, getItemParent, 1}}, + {2054, {wxTreeCtrl, getPrevSibling, 1}}, + {2055, {wxTreeCtrl, getPrevVisible, 1}}, + {2056, {wxTreeCtrl, getRootItem, 0}}, + {2057, {wxTreeCtrl, getSelection, 0}}, + {2058, {wxTreeCtrl, getSelections, 1}}, + {2059, {wxTreeCtrl, getStateImageList, 0}}, + {2060, {wxTreeCtrl, hitTest, 2}}, + {2062, {wxTreeCtrl, insertItem, 4}}, + {2063, {wxTreeCtrl, isBold, 1}}, + {2064, {wxTreeCtrl, isExpanded, 1}}, + {2065, {wxTreeCtrl, isSelected, 1}}, + {2066, {wxTreeCtrl, isVisible, 1}}, + {2067, {wxTreeCtrl, itemHasChildren, 1}}, + {2068, {wxTreeCtrl, isTreeItemIdOk, 1}}, + {2069, {wxTreeCtrl, prependItem, 3}}, + {2070, {wxTreeCtrl, scrollTo, 1}}, + {2071, {wxTreeCtrl, selectItem_1, 1}}, + {2072, {wxTreeCtrl, selectItem_2, 2}}, + {2073, {wxTreeCtrl, setIndent, 1}}, + {2074, {wxTreeCtrl, setImageList, 1}}, + {2075, {wxTreeCtrl, setItemBackgroundColour, 2}}, + {2076, {wxTreeCtrl, setItemBold, 2}}, + {2077, {wxTreeCtrl, setItemData, 2}}, + {2078, {wxTreeCtrl, setItemDropHighlight, 2}}, + {2079, {wxTreeCtrl, setItemFont, 2}}, + {2080, {wxTreeCtrl, setItemHasChildren, 2}}, + {2081, {wxTreeCtrl, setItemImage_2, 2}}, + {2082, {wxTreeCtrl, setItemImage_3, 3}}, + {2083, {wxTreeCtrl, setItemText, 2}}, + {2084, {wxTreeCtrl, setItemTextColour, 2}}, + {2085, {wxTreeCtrl, setStateImageList, 1}}, + {2086, {wxTreeCtrl, setWindowStyle, 1}}, + {2087, {wxTreeCtrl, sortChildren, 1}}, + {2088, {wxTreeCtrl, toggle, 1}}, + {2089, {wxTreeCtrl, toggleItemSelection, 1}}, + {2090, {wxTreeCtrl, unselect, 0}}, + {2091, {wxTreeCtrl, unselectAll, 0}}, + {2092, {wxTreeCtrl, unselectItem, 1}}, + {2093, {wxScrollBar, new_0, 0}}, + {2094, {wxScrollBar, new_3, 3}}, + {2095, {wxScrollBar, destruct, 0}}, + {2096, {wxScrollBar, create, 3}}, + {2097, {wxScrollBar, getRange, 0}}, + {2098, {wxScrollBar, getPageSize, 0}}, + {2099, {wxScrollBar, getThumbPosition, 0}}, + {2100, {wxScrollBar, getThumbSize, 0}}, + {2101, {wxScrollBar, setThumbPosition, 1}}, + {2102, {wxScrollBar, setScrollbar, 5}}, + {2104, {wxSpinButton, new_2, 2}}, + {2105, {wxSpinButton, new_0, 0}}, + {2106, {wxSpinButton, create, 2}}, + {2107, {wxSpinButton, getMax, 0}}, + {2108, {wxSpinButton, getMin, 0}}, + {2109, {wxSpinButton, getValue, 0}}, + {2110, {wxSpinButton, setRange, 2}}, + {2111, {wxSpinButton, setValue, 1}}, + {2112, {wxSpinButton, 'Destroy', undefined}}, + {2113, {wxSpinCtrl, new_0, 0}}, + {2114, {wxSpinCtrl, new_2, 2}}, + {2116, {wxSpinCtrl, create, 2}}, + {2119, {wxSpinCtrl, setValue_1_1, 1}}, + {2120, {wxSpinCtrl, setValue_1_0, 1}}, + {2122, {wxSpinCtrl, getValue, 0}}, + {2124, {wxSpinCtrl, setRange, 2}}, + {2125, {wxSpinCtrl, setSelection, 2}}, + {2127, {wxSpinCtrl, getMin, 0}}, + {2129, {wxSpinCtrl, getMax, 0}}, + {2130, {wxSpinCtrl, 'Destroy', undefined}}, + {2131, {wxStaticText, new_0, 0}}, + {2132, {wxStaticText, new_4, 4}}, + {2133, {wxStaticText, create, 4}}, + {2134, {wxStaticText, getLabel, 0}}, + {2135, {wxStaticText, setLabel, 1}}, + {2136, {wxStaticText, wrap, 1}}, + {2137, {wxStaticText, 'Destroy', undefined}}, + {2138, {wxStaticBitmap, new_0, 0}}, + {2139, {wxStaticBitmap, new_4, 4}}, + {2140, {wxStaticBitmap, create, 4}}, + {2141, {wxStaticBitmap, getBitmap, 0}}, + {2142, {wxStaticBitmap, setBitmap, 1}}, + {2143, {wxStaticBitmap, 'Destroy', undefined}}, + {2144, {wxRadioBox, new, 7}}, + {2146, {wxRadioBox, destruct, 0}}, + {2147, {wxRadioBox, create, 7}}, + {2148, {wxRadioBox, enable_2, 2}}, + {2149, {wxRadioBox, enable_1, 1}}, + {2150, {wxRadioBox, getSelection, 0}}, + {2151, {wxRadioBox, getString, 1}}, + {2152, {wxRadioBox, setSelection, 1}}, + {2153, {wxRadioBox, show_2, 2}}, + {2154, {wxRadioBox, show_1, 1}}, + {2155, {wxRadioBox, getColumnCount, 0}}, + {2156, {wxRadioBox, getItemHelpText, 1}}, + {2157, {wxRadioBox, getItemToolTip, 1}}, + {2159, {wxRadioBox, getItemFromPoint, 1}}, + {2160, {wxRadioBox, getRowCount, 0}}, + {2161, {wxRadioBox, isItemEnabled, 1}}, + {2162, {wxRadioBox, isItemShown, 1}}, + {2163, {wxRadioBox, setItemHelpText, 2}}, + {2164, {wxRadioBox, setItemToolTip, 2}}, + {2165, {wxRadioButton, new_0, 0}}, + {2166, {wxRadioButton, new_4, 4}}, + {2167, {wxRadioButton, create, 4}}, + {2168, {wxRadioButton, getValue, 0}}, + {2169, {wxRadioButton, setValue, 1}}, + {2170, {wxRadioButton, 'Destroy', undefined}}, + {2172, {wxSlider, new_6, 6}}, + {2173, {wxSlider, new_0, 0}}, + {2174, {wxSlider, create, 6}}, + {2175, {wxSlider, getLineSize, 0}}, + {2176, {wxSlider, getMax, 0}}, + {2177, {wxSlider, getMin, 0}}, + {2178, {wxSlider, getPageSize, 0}}, + {2179, {wxSlider, getThumbLength, 0}}, + {2180, {wxSlider, getValue, 0}}, + {2181, {wxSlider, setLineSize, 1}}, + {2182, {wxSlider, setPageSize, 1}}, + {2183, {wxSlider, setRange, 2}}, + {2184, {wxSlider, setThumbLength, 1}}, + {2185, {wxSlider, setValue, 1}}, + {2186, {wxSlider, 'Destroy', undefined}}, + {2188, {wxDialog, new_4, 4}}, + {2189, {wxDialog, new_0, 0}}, + {2191, {wxDialog, destruct, 0}}, + {2192, {wxDialog, create, 4}}, + {2193, {wxDialog, createButtonSizer, 1}}, + {2194, {wxDialog, createStdDialogButtonSizer, 1}}, + {2195, {wxDialog, endModal, 1}}, + {2196, {wxDialog, getAffirmativeId, 0}}, + {2197, {wxDialog, getReturnCode, 0}}, + {2198, {wxDialog, isModal, 0}}, + {2199, {wxDialog, setAffirmativeId, 1}}, + {2200, {wxDialog, setReturnCode, 1}}, + {2201, {wxDialog, show, 1}}, + {2202, {wxDialog, showModal, 0}}, + {2203, {wxColourDialog, new_0, 0}}, + {2204, {wxColourDialog, new_2, 2}}, + {2205, {wxColourDialog, destruct, 0}}, + {2206, {wxColourDialog, create, 2}}, + {2207, {wxColourDialog, getColourData, 0}}, + {2208, {wxColourData, new_0, 0}}, + {2209, {wxColourData, new_1, 1}}, + {2210, {wxColourData, destruct, 0}}, + {2211, {wxColourData, getChooseFull, 0}}, + {2212, {wxColourData, getColour, 0}}, + {2214, {wxColourData, getCustomColour, 1}}, + {2215, {wxColourData, setChooseFull, 1}}, + {2216, {wxColourData, setColour, 1}}, + {2217, {wxColourData, setCustomColour, 2}}, + {2218, {wxPalette, new_0, 0}}, + {2219, {wxPalette, new_4, 4}}, + {2221, {wxPalette, destruct, 0}}, + {2222, {wxPalette, create, 4}}, + {2223, {wxPalette, getColoursCount, 0}}, + {2224, {wxPalette, getPixel, 3}}, + {2225, {wxPalette, getRGB, 4}}, + {2226, {wxPalette, isOk, 0}}, + {2230, {wxDirDialog, new, 2}}, + {2231, {wxDirDialog, destruct, 0}}, + {2232, {wxDirDialog, getPath, 0}}, + {2233, {wxDirDialog, getMessage, 0}}, + {2234, {wxDirDialog, setMessage, 1}}, + {2235, {wxDirDialog, setPath, 1}}, + {2239, {wxFileDialog, new, 2}}, + {2240, {wxFileDialog, destruct, 0}}, + {2241, {wxFileDialog, getDirectory, 0}}, + {2242, {wxFileDialog, getFilename, 0}}, + {2243, {wxFileDialog, getFilenames, 1}}, + {2244, {wxFileDialog, getFilterIndex, 0}}, + {2245, {wxFileDialog, getMessage, 0}}, + {2246, {wxFileDialog, getPath, 0}}, + {2247, {wxFileDialog, getPaths, 1}}, + {2248, {wxFileDialog, getWildcard, 0}}, + {2249, {wxFileDialog, setDirectory, 1}}, + {2250, {wxFileDialog, setFilename, 1}}, + {2251, {wxFileDialog, setFilterIndex, 1}}, + {2252, {wxFileDialog, setMessage, 1}}, + {2253, {wxFileDialog, setPath, 1}}, + {2254, {wxFileDialog, setWildcard, 1}}, + {2255, {wxPickerBase, setInternalMargin, 1}}, + {2256, {wxPickerBase, getInternalMargin, 0}}, + {2257, {wxPickerBase, setTextCtrlProportion, 1}}, + {2258, {wxPickerBase, setPickerCtrlProportion, 1}}, + {2259, {wxPickerBase, getTextCtrlProportion, 0}}, + {2260, {wxPickerBase, getPickerCtrlProportion, 0}}, + {2261, {wxPickerBase, hasTextCtrl, 0}}, + {2262, {wxPickerBase, getTextCtrl, 0}}, + {2263, {wxPickerBase, isTextCtrlGrowable, 0}}, + {2264, {wxPickerBase, setPickerCtrlGrowable, 1}}, + {2265, {wxPickerBase, setTextCtrlGrowable, 1}}, + {2266, {wxPickerBase, isPickerCtrlGrowable, 0}}, + {2267, {wxFilePickerCtrl, new_0, 0}}, + {2268, {wxFilePickerCtrl, new_3, 3}}, + {2269, {wxFilePickerCtrl, create, 3}}, + {2270, {wxFilePickerCtrl, getPath, 0}}, + {2271, {wxFilePickerCtrl, setPath, 1}}, + {2272, {wxFilePickerCtrl, 'Destroy', undefined}}, + {2273, {wxDirPickerCtrl, new_0, 0}}, + {2274, {wxDirPickerCtrl, new_3, 3}}, + {2275, {wxDirPickerCtrl, create, 3}}, + {2276, {wxDirPickerCtrl, getPath, 0}}, + {2277, {wxDirPickerCtrl, setPath, 1}}, + {2278, {wxDirPickerCtrl, 'Destroy', undefined}}, + {2279, {wxColourPickerCtrl, new_0, 0}}, + {2280, {wxColourPickerCtrl, new_3, 3}}, + {2281, {wxColourPickerCtrl, create, 3}}, + {2282, {wxColourPickerCtrl, getColour, 0}}, + {2283, {wxColourPickerCtrl, setColour_1_1, 1}}, + {2284, {wxColourPickerCtrl, setColour_1_0, 1}}, + {2285, {wxColourPickerCtrl, 'Destroy', undefined}}, + {2286, {wxDatePickerCtrl, new_0, 0}}, + {2287, {wxDatePickerCtrl, new_3, 3}}, + {2288, {wxDatePickerCtrl, getRange, 2}}, + {2289, {wxDatePickerCtrl, getValue, 0}}, + {2290, {wxDatePickerCtrl, setRange, 2}}, + {2291, {wxDatePickerCtrl, setValue, 1}}, + {2292, {wxDatePickerCtrl, 'Destroy', undefined}}, + {2293, {wxFontPickerCtrl, new_0, 0}}, + {2294, {wxFontPickerCtrl, new_3, 3}}, + {2295, {wxFontPickerCtrl, create, 3}}, + {2296, {wxFontPickerCtrl, getSelectedFont, 0}}, + {2297, {wxFontPickerCtrl, setSelectedFont, 1}}, + {2298, {wxFontPickerCtrl, getMaxPointSize, 0}}, + {2299, {wxFontPickerCtrl, setMaxPointSize, 1}}, + {2300, {wxFontPickerCtrl, 'Destroy', undefined}}, + {2303, {wxFindReplaceDialog, new_0, 0}}, + {2304, {wxFindReplaceDialog, new_4, 4}}, + {2305, {wxFindReplaceDialog, destruct, 0}}, + {2306, {wxFindReplaceDialog, create, 4}}, + {2307, {wxFindReplaceDialog, getData, 0}}, + {2308, {wxFindReplaceData, new_0, 0}}, + {2309, {wxFindReplaceData, new_1, 1}}, + {2310, {wxFindReplaceData, getFindString, 0}}, + {2311, {wxFindReplaceData, getReplaceString, 0}}, + {2312, {wxFindReplaceData, getFlags, 0}}, + {2313, {wxFindReplaceData, setFlags, 1}}, + {2314, {wxFindReplaceData, setFindString, 1}}, + {2315, {wxFindReplaceData, setReplaceString, 1}}, + {2316, {wxFindReplaceData, 'Destroy', undefined}}, + {2317, {wxMultiChoiceDialog, new_0, 0}}, + {2319, {wxMultiChoiceDialog, new_5, 5}}, + {2320, {wxMultiChoiceDialog, getSelections, 0}}, + {2321, {wxMultiChoiceDialog, setSelections, 1}}, + {2322, {wxMultiChoiceDialog, 'Destroy', undefined}}, + {2323, {wxSingleChoiceDialog, new_0, 0}}, + {2325, {wxSingleChoiceDialog, new_5, 5}}, + {2326, {wxSingleChoiceDialog, getSelection, 0}}, + {2327, {wxSingleChoiceDialog, getStringSelection, 0}}, + {2328, {wxSingleChoiceDialog, setSelection, 1}}, + {2329, {wxSingleChoiceDialog, 'Destroy', undefined}}, + {2330, {wxTextEntryDialog, new, 3}}, + {2331, {wxTextEntryDialog, getValue, 0}}, + {2332, {wxTextEntryDialog, setValue, 1}}, + {2333, {wxTextEntryDialog, 'Destroy', undefined}}, + {2334, {wxPasswordEntryDialog, new, 3}}, + {2335, {wxPasswordEntryDialog, 'Destroy', undefined}}, + {2336, {wxFontData, new_0, 0}}, + {2337, {wxFontData, new_1, 1}}, + {2338, {wxFontData, destruct, 0}}, + {2339, {wxFontData, enableEffects, 1}}, + {2340, {wxFontData, getAllowSymbols, 0}}, + {2341, {wxFontData, getColour, 0}}, + {2342, {wxFontData, getChosenFont, 0}}, + {2343, {wxFontData, getEnableEffects, 0}}, + {2344, {wxFontData, getInitialFont, 0}}, + {2345, {wxFontData, getShowHelp, 0}}, + {2346, {wxFontData, setAllowSymbols, 1}}, + {2347, {wxFontData, setChosenFont, 1}}, + {2348, {wxFontData, setColour, 1}}, + {2349, {wxFontData, setInitialFont, 1}}, + {2350, {wxFontData, setRange, 2}}, + {2351, {wxFontData, setShowHelp, 1}}, + {2355, {wxFontDialog, new_0, 0}}, + {2357, {wxFontDialog, new_2, 2}}, + {2359, {wxFontDialog, create, 2}}, + {2360, {wxFontDialog, getFontData, 0}}, + {2362, {wxFontDialog, 'Destroy', undefined}}, + {2363, {wxProgressDialog, new, 3}}, + {2364, {wxProgressDialog, destruct, 0}}, + {2365, {wxProgressDialog, resume, 0}}, + {2366, {wxProgressDialog, update_2, 2}}, + {2367, {wxProgressDialog, update_0, 0}}, + {2368, {wxMessageDialog, new, 3}}, + {2369, {wxMessageDialog, destruct, 0}}, + {2370, {wxPageSetupDialog, new, 2}}, + {2371, {wxPageSetupDialog, destruct, 0}}, + {2372, {wxPageSetupDialog, getPageSetupData, 0}}, + {2373, {wxPageSetupDialog, showModal, 0}}, + {2374, {wxPageSetupDialogData, new_0, 0}}, + {2375, {wxPageSetupDialogData, new_1_0, 1}}, + {2376, {wxPageSetupDialogData, new_1_1, 1}}, + {2377, {wxPageSetupDialogData, destruct, 0}}, + {2378, {wxPageSetupDialogData, enableHelp, 1}}, + {2379, {wxPageSetupDialogData, enableMargins, 1}}, + {2380, {wxPageSetupDialogData, enableOrientation, 1}}, + {2381, {wxPageSetupDialogData, enablePaper, 1}}, + {2382, {wxPageSetupDialogData, enablePrinter, 1}}, + {2383, {wxPageSetupDialogData, getDefaultMinMargins, 0}}, + {2384, {wxPageSetupDialogData, getEnableMargins, 0}}, + {2385, {wxPageSetupDialogData, getEnableOrientation, 0}}, + {2386, {wxPageSetupDialogData, getEnablePaper, 0}}, + {2387, {wxPageSetupDialogData, getEnablePrinter, 0}}, + {2388, {wxPageSetupDialogData, getEnableHelp, 0}}, + {2389, {wxPageSetupDialogData, getDefaultInfo, 0}}, + {2390, {wxPageSetupDialogData, getMarginTopLeft, 0}}, + {2391, {wxPageSetupDialogData, getMarginBottomRight, 0}}, + {2392, {wxPageSetupDialogData, getMinMarginTopLeft, 0}}, + {2393, {wxPageSetupDialogData, getMinMarginBottomRight, 0}}, + {2394, {wxPageSetupDialogData, getPaperId, 0}}, + {2395, {wxPageSetupDialogData, getPaperSize, 0}}, + {2397, {wxPageSetupDialogData, getPrintData, 0}}, + {2398, {wxPageSetupDialogData, isOk, 0}}, + {2399, {wxPageSetupDialogData, setDefaultInfo, 1}}, + {2400, {wxPageSetupDialogData, setDefaultMinMargins, 1}}, + {2401, {wxPageSetupDialogData, setMarginTopLeft, 1}}, + {2402, {wxPageSetupDialogData, setMarginBottomRight, 1}}, + {2403, {wxPageSetupDialogData, setMinMarginTopLeft, 1}}, + {2404, {wxPageSetupDialogData, setMinMarginBottomRight, 1}}, + {2405, {wxPageSetupDialogData, setPaperId, 1}}, + {2406, {wxPageSetupDialogData, setPaperSize_1_1, 1}}, + {2407, {wxPageSetupDialogData, setPaperSize_1_0, 1}}, + {2408, {wxPageSetupDialogData, setPrintData, 1}}, + {2409, {wxPrintDialog, new_2_0, 2}}, + {2410, {wxPrintDialog, new_2_1, 2}}, + {2411, {wxPrintDialog, destruct, 0}}, + {2412, {wxPrintDialog, getPrintDialogData, 0}}, + {2413, {wxPrintDialog, getPrintDC, 0}}, + {2414, {wxPrintDialogData, new_0, 0}}, + {2415, {wxPrintDialogData, new_1_1, 1}}, + {2416, {wxPrintDialogData, new_1_0, 1}}, + {2417, {wxPrintDialogData, destruct, 0}}, + {2418, {wxPrintDialogData, enableHelp, 1}}, + {2419, {wxPrintDialogData, enablePageNumbers, 1}}, + {2420, {wxPrintDialogData, enablePrintToFile, 1}}, + {2421, {wxPrintDialogData, enableSelection, 1}}, + {2422, {wxPrintDialogData, getAllPages, 0}}, + {2423, {wxPrintDialogData, getCollate, 0}}, + {2424, {wxPrintDialogData, getFromPage, 0}}, + {2425, {wxPrintDialogData, getMaxPage, 0}}, + {2426, {wxPrintDialogData, getMinPage, 0}}, + {2427, {wxPrintDialogData, getNoCopies, 0}}, + {2428, {wxPrintDialogData, getPrintData, 0}}, + {2429, {wxPrintDialogData, getPrintToFile, 0}}, + {2430, {wxPrintDialogData, getSelection, 0}}, + {2431, {wxPrintDialogData, getToPage, 0}}, + {2432, {wxPrintDialogData, isOk, 0}}, + {2433, {wxPrintDialogData, setCollate, 1}}, + {2434, {wxPrintDialogData, setFromPage, 1}}, + {2435, {wxPrintDialogData, setMaxPage, 1}}, + {2436, {wxPrintDialogData, setMinPage, 1}}, + {2437, {wxPrintDialogData, setNoCopies, 1}}, + {2438, {wxPrintDialogData, setPrintData, 1}}, + {2439, {wxPrintDialogData, setPrintToFile, 1}}, + {2440, {wxPrintDialogData, setSelection, 1}}, + {2441, {wxPrintDialogData, setToPage, 1}}, + {2442, {wxPrintData, new_0, 0}}, + {2443, {wxPrintData, new_1, 1}}, + {2444, {wxPrintData, destruct, 0}}, + {2445, {wxPrintData, getCollate, 0}}, + {2446, {wxPrintData, getBin, 0}}, + {2447, {wxPrintData, getColour, 0}}, + {2448, {wxPrintData, getDuplex, 0}}, + {2449, {wxPrintData, getNoCopies, 0}}, + {2450, {wxPrintData, getOrientation, 0}}, + {2451, {wxPrintData, getPaperId, 0}}, + {2452, {wxPrintData, getPrinterName, 0}}, + {2453, {wxPrintData, getQuality, 0}}, + {2454, {wxPrintData, isOk, 0}}, + {2455, {wxPrintData, setBin, 1}}, + {2456, {wxPrintData, setCollate, 1}}, + {2457, {wxPrintData, setColour, 1}}, + {2458, {wxPrintData, setDuplex, 1}}, + {2459, {wxPrintData, setNoCopies, 1}}, + {2460, {wxPrintData, setOrientation, 1}}, + {2461, {wxPrintData, setPaperId, 1}}, + {2462, {wxPrintData, setPrinterName, 1}}, + {2463, {wxPrintData, setQuality, 1}}, + {2466, {wxPrintPreview, new_2, 2}}, + {2467, {wxPrintPreview, new_3, 3}}, + {2469, {wxPrintPreview, destruct, 0}}, + {2470, {wxPrintPreview, getCanvas, 0}}, + {2471, {wxPrintPreview, getCurrentPage, 0}}, + {2472, {wxPrintPreview, getFrame, 0}}, + {2473, {wxPrintPreview, getMaxPage, 0}}, + {2474, {wxPrintPreview, getMinPage, 0}}, + {2475, {wxPrintPreview, getPrintout, 0}}, + {2476, {wxPrintPreview, getPrintoutForPrinting, 0}}, + {2477, {wxPrintPreview, isOk, 0}}, + {2478, {wxPrintPreview, paintPage, 2}}, + {2479, {wxPrintPreview, print, 1}}, + {2480, {wxPrintPreview, renderPage, 1}}, + {2481, {wxPrintPreview, setCanvas, 1}}, + {2482, {wxPrintPreview, setCurrentPage, 1}}, + {2483, {wxPrintPreview, setFrame, 1}}, + {2484, {wxPrintPreview, setPrintout, 1}}, + {2485, {wxPrintPreview, setZoom, 1}}, + {2486, {wxPreviewFrame, new, 3}}, + {2487, {wxPreviewFrame, destruct, 0}}, + {2488, {wxPreviewFrame, createControlBar, 0}}, + {2489, {wxPreviewFrame, createCanvas, 0}}, + {2490, {wxPreviewFrame, initialize, 0}}, + {2491, {wxPreviewFrame, onCloseWindow, 1}}, + {2492, {wxPreviewControlBar, new, 4}}, + {2493, {wxPreviewControlBar, destruct, 0}}, + {2494, {wxPreviewControlBar, createButtons, 0}}, + {2495, {wxPreviewControlBar, getPrintPreview, 0}}, + {2496, {wxPreviewControlBar, getZoomControl, 0}}, + {2497, {wxPreviewControlBar, setZoomControl, 1}}, + {2499, {wxPrinter, new, 1}}, + {2500, {wxPrinter, createAbortWindow, 2}}, + {2501, {wxPrinter, getAbort, 0}}, + {2502, {wxPrinter, getLastError, 0}}, + {2503, {wxPrinter, getPrintDialogData, 0}}, + {2504, {wxPrinter, print, 3}}, + {2505, {wxPrinter, printDialog, 1}}, + {2506, {wxPrinter, reportError, 3}}, + {2507, {wxPrinter, setup, 1}}, + {2508, {wxPrinter, 'Destroy', undefined}}, + {2509, {wxXmlResource, new_1, 1}}, + {2510, {wxXmlResource, new_2, 2}}, + {2511, {wxXmlResource, destruct, 0}}, + {2512, {wxXmlResource, attachUnknownControl, 3}}, + {2513, {wxXmlResource, clearHandlers, 0}}, + {2514, {wxXmlResource, compareVersion, 4}}, + {2515, {wxXmlResource, get, 0}}, + {2516, {wxXmlResource, getFlags, 0}}, + {2517, {wxXmlResource, getVersion, 0}}, + {2518, {wxXmlResource, getXRCID, 2}}, + {2519, {wxXmlResource, initAllHandlers, 0}}, + {2520, {wxXmlResource, load, 1}}, + {2521, {wxXmlResource, loadBitmap, 1}}, + {2522, {wxXmlResource, loadDialog_2, 2}}, + {2523, {wxXmlResource, loadDialog_3, 3}}, + {2524, {wxXmlResource, loadFrame_2, 2}}, + {2525, {wxXmlResource, loadFrame_3, 3}}, + {2526, {wxXmlResource, loadIcon, 1}}, + {2527, {wxXmlResource, loadMenu, 1}}, + {2528, {wxXmlResource, loadMenuBar_2, 2}}, + {2529, {wxXmlResource, loadMenuBar_1, 1}}, + {2530, {wxXmlResource, loadPanel_2, 2}}, + {2531, {wxXmlResource, loadPanel_3, 3}}, + {2532, {wxXmlResource, loadToolBar, 2}}, + {2533, {wxXmlResource, set, 1}}, + {2534, {wxXmlResource, setFlags, 1}}, + {2535, {wxXmlResource, unload, 1}}, + {2536, {wxXmlResource, xrcctrl, 3}}, + {2537, {wxHtmlEasyPrinting, new, 1}}, + {2538, {wxHtmlEasyPrinting, destruct, 0}}, + {2539, {wxHtmlEasyPrinting, getPrintData, 0}}, + {2540, {wxHtmlEasyPrinting, getPageSetupData, 0}}, + {2541, {wxHtmlEasyPrinting, previewFile, 1}}, + {2542, {wxHtmlEasyPrinting, previewText, 2}}, + {2543, {wxHtmlEasyPrinting, printFile, 1}}, + {2544, {wxHtmlEasyPrinting, printText, 2}}, + {2545, {wxHtmlEasyPrinting, pageSetup, 0}}, + {2546, {wxHtmlEasyPrinting, setFonts, 3}}, + {2547, {wxHtmlEasyPrinting, setHeader, 2}}, + {2548, {wxHtmlEasyPrinting, setFooter, 2}}, + {2550, {wxGLCanvas, new_2, 2}}, + {2551, {wxGLCanvas, new_3_1, 3}}, + {2552, {wxGLCanvas, new_3_0, 3}}, + {2553, {wxGLCanvas, getContext, 0}}, + {2555, {wxGLCanvas, setCurrent, 0}}, + {2556, {wxGLCanvas, swapBuffers, 0}}, + {2557, {wxGLCanvas, 'Destroy', undefined}}, + {2558, {wxAuiManager, new, 1}}, + {2559, {wxAuiManager, destruct, 0}}, + {2560, {wxAuiManager, addPane_2_1, 2}}, + {2561, {wxAuiManager, addPane_3, 3}}, + {2562, {wxAuiManager, addPane_2_0, 2}}, + {2563, {wxAuiManager, detachPane, 1}}, + {2564, {wxAuiManager, getAllPanes, 0}}, + {2565, {wxAuiManager, getArtProvider, 0}}, + {2566, {wxAuiManager, getDockSizeConstraint, 2}}, + {2567, {wxAuiManager, getFlags, 0}}, + {2568, {wxAuiManager, getManagedWindow, 0}}, + {2569, {wxAuiManager, getManager, 1}}, + {2570, {wxAuiManager, getPane_1_1, 1}}, + {2571, {wxAuiManager, getPane_1_0, 1}}, + {2572, {wxAuiManager, hideHint, 0}}, + {2573, {wxAuiManager, insertPane, 3}}, + {2574, {wxAuiManager, loadPaneInfo, 2}}, + {2575, {wxAuiManager, loadPerspective, 2}}, + {2576, {wxAuiManager, savePaneInfo, 1}}, + {2577, {wxAuiManager, savePerspective, 0}}, + {2578, {wxAuiManager, setArtProvider, 1}}, + {2579, {wxAuiManager, setDockSizeConstraint, 2}}, + {2580, {wxAuiManager, setFlags, 1}}, + {2581, {wxAuiManager, setManagedWindow, 1}}, + {2582, {wxAuiManager, showHint, 1}}, + {2583, {wxAuiManager, unInit, 0}}, + {2584, {wxAuiManager, update, 0}}, + {2585, {wxAuiPaneInfo, new_0, 0}}, + {2586, {wxAuiPaneInfo, new_1, 1}}, + {2587, {wxAuiPaneInfo, destruct, 0}}, + {2588, {wxAuiPaneInfo, bestSize_1, 1}}, + {2589, {wxAuiPaneInfo, bestSize_2, 2}}, + {2590, {wxAuiPaneInfo, bottom, 0}}, + {2591, {wxAuiPaneInfo, bottomDockable, 1}}, + {2592, {wxAuiPaneInfo, caption, 1}}, + {2593, {wxAuiPaneInfo, captionVisible, 1}}, + {2594, {wxAuiPaneInfo, centre, 0}}, + {2595, {wxAuiPaneInfo, centrePane, 0}}, + {2596, {wxAuiPaneInfo, closeButton, 1}}, + {2597, {wxAuiPaneInfo, defaultPane, 0}}, + {2598, {wxAuiPaneInfo, destroyOnClose, 1}}, + {2599, {wxAuiPaneInfo, direction, 1}}, + {2600, {wxAuiPaneInfo, dock, 0}}, + {2601, {wxAuiPaneInfo, dockable, 1}}, + {2602, {wxAuiPaneInfo, fixed, 0}}, + {2603, {wxAuiPaneInfo, float, 0}}, + {2604, {wxAuiPaneInfo, floatable, 1}}, + {2605, {wxAuiPaneInfo, floatingPosition_1, 1}}, + {2606, {wxAuiPaneInfo, floatingPosition_2, 2}}, + {2607, {wxAuiPaneInfo, floatingSize_1, 1}}, + {2608, {wxAuiPaneInfo, floatingSize_2, 2}}, + {2609, {wxAuiPaneInfo, gripper, 1}}, + {2610, {wxAuiPaneInfo, gripperTop, 1}}, + {2611, {wxAuiPaneInfo, hasBorder, 0}}, + {2612, {wxAuiPaneInfo, hasCaption, 0}}, + {2613, {wxAuiPaneInfo, hasCloseButton, 0}}, + {2614, {wxAuiPaneInfo, hasFlag, 1}}, + {2615, {wxAuiPaneInfo, hasGripper, 0}}, + {2616, {wxAuiPaneInfo, hasGripperTop, 0}}, + {2617, {wxAuiPaneInfo, hasMaximizeButton, 0}}, + {2618, {wxAuiPaneInfo, hasMinimizeButton, 0}}, + {2619, {wxAuiPaneInfo, hasPinButton, 0}}, + {2620, {wxAuiPaneInfo, hide, 0}}, + {2621, {wxAuiPaneInfo, isBottomDockable, 0}}, + {2622, {wxAuiPaneInfo, isDocked, 0}}, + {2623, {wxAuiPaneInfo, isFixed, 0}}, + {2624, {wxAuiPaneInfo, isFloatable, 0}}, + {2625, {wxAuiPaneInfo, isFloating, 0}}, + {2626, {wxAuiPaneInfo, isLeftDockable, 0}}, + {2627, {wxAuiPaneInfo, isMovable, 0}}, + {2628, {wxAuiPaneInfo, isOk, 0}}, + {2629, {wxAuiPaneInfo, isResizable, 0}}, + {2630, {wxAuiPaneInfo, isRightDockable, 0}}, + {2631, {wxAuiPaneInfo, isShown, 0}}, + {2632, {wxAuiPaneInfo, isToolbar, 0}}, + {2633, {wxAuiPaneInfo, isTopDockable, 0}}, + {2634, {wxAuiPaneInfo, layer, 1}}, + {2635, {wxAuiPaneInfo, left, 0}}, + {2636, {wxAuiPaneInfo, leftDockable, 1}}, + {2637, {wxAuiPaneInfo, maxSize_1, 1}}, + {2638, {wxAuiPaneInfo, maxSize_2, 2}}, + {2639, {wxAuiPaneInfo, maximizeButton, 1}}, + {2640, {wxAuiPaneInfo, minSize_1, 1}}, + {2641, {wxAuiPaneInfo, minSize_2, 2}}, + {2642, {wxAuiPaneInfo, minimizeButton, 1}}, + {2643, {wxAuiPaneInfo, movable, 1}}, + {2644, {wxAuiPaneInfo, name, 1}}, + {2645, {wxAuiPaneInfo, paneBorder, 1}}, + {2646, {wxAuiPaneInfo, pinButton, 1}}, + {2647, {wxAuiPaneInfo, position, 1}}, + {2648, {wxAuiPaneInfo, resizable, 1}}, + {2649, {wxAuiPaneInfo, right, 0}}, + {2650, {wxAuiPaneInfo, rightDockable, 1}}, + {2651, {wxAuiPaneInfo, row, 1}}, + {2652, {wxAuiPaneInfo, safeSet, 1}}, + {2653, {wxAuiPaneInfo, setFlag, 2}}, + {2654, {wxAuiPaneInfo, show, 1}}, + {2655, {wxAuiPaneInfo, toolbarPane, 0}}, + {2656, {wxAuiPaneInfo, top, 0}}, + {2657, {wxAuiPaneInfo, topDockable, 1}}, + {2658, {wxAuiPaneInfo, window, 1}}, + {2659, {wxAuiPaneInfo, getWindow, 0}}, + {2660, {wxAuiPaneInfo, getFrame, 0}}, + {2661, {wxAuiPaneInfo, getDirection, 0}}, + {2662, {wxAuiPaneInfo, getLayer, 0}}, + {2663, {wxAuiPaneInfo, getRow, 0}}, + {2664, {wxAuiPaneInfo, getPosition, 0}}, + {2665, {wxAuiPaneInfo, getFloatingPosition, 0}}, + {2666, {wxAuiPaneInfo, getFloatingSize, 0}}, + {2667, {wxAuiNotebook, new_0, 0}}, + {2668, {wxAuiNotebook, new_2, 2}}, + {2669, {wxAuiNotebook, addPage, 3}}, + {2670, {wxAuiNotebook, create, 2}}, + {2671, {wxAuiNotebook, deletePage, 1}}, + {2672, {wxAuiNotebook, getArtProvider, 0}}, + {2673, {wxAuiNotebook, getPage, 1}}, + {2674, {wxAuiNotebook, getPageBitmap, 1}}, + {2675, {wxAuiNotebook, getPageCount, 0}}, + {2676, {wxAuiNotebook, getPageIndex, 1}}, + {2677, {wxAuiNotebook, getPageText, 1}}, + {2678, {wxAuiNotebook, getSelection, 0}}, + {2679, {wxAuiNotebook, insertPage, 4}}, + {2680, {wxAuiNotebook, removePage, 1}}, + {2681, {wxAuiNotebook, setArtProvider, 1}}, + {2682, {wxAuiNotebook, setFont, 1}}, + {2683, {wxAuiNotebook, setPageBitmap, 2}}, + {2684, {wxAuiNotebook, setPageText, 2}}, + {2685, {wxAuiNotebook, setSelection, 1}}, + {2686, {wxAuiNotebook, setTabCtrlHeight, 1}}, + {2687, {wxAuiNotebook, setUniformBitmapSize, 1}}, + {2688, {wxAuiNotebook, 'Destroy', undefined}}, + {2689, {wxAuiTabArt, setFlags, 1}}, + {2690, {wxAuiTabArt, setMeasuringFont, 1}}, + {2691, {wxAuiTabArt, setNormalFont, 1}}, + {2692, {wxAuiTabArt, setSelectedFont, 1}}, + {2693, {wxAuiTabArt, setColour, 1}}, + {2694, {wxAuiTabArt, setActiveColour, 1}}, + {2695, {wxAuiDockArt, getColour, 1}}, + {2696, {wxAuiDockArt, getFont, 1}}, + {2697, {wxAuiDockArt, getMetric, 1}}, + {2698, {wxAuiDockArt, setColour, 2}}, + {2699, {wxAuiDockArt, setFont, 2}}, + {2700, {wxAuiDockArt, setMetric, 2}}, + {2701, {wxAuiSimpleTabArt, new, 0}}, + {2702, {wxAuiSimpleTabArt, 'Destroy', undefined}}, + {2703, {wxMDIParentFrame, new_0, 0}}, + {2704, {wxMDIParentFrame, new_4, 4}}, + {2705, {wxMDIParentFrame, destruct, 0}}, + {2706, {wxMDIParentFrame, activateNext, 0}}, + {2707, {wxMDIParentFrame, activatePrevious, 0}}, + {2708, {wxMDIParentFrame, arrangeIcons, 0}}, + {2709, {wxMDIParentFrame, cascade, 0}}, + {2710, {wxMDIParentFrame, create, 4}}, + {2711, {wxMDIParentFrame, getActiveChild, 0}}, + {2712, {wxMDIParentFrame, getClientWindow, 0}}, + {2713, {wxMDIParentFrame, tile, 1}}, + {2714, {wxMDIChildFrame, new_0, 0}}, + {2715, {wxMDIChildFrame, new_4, 4}}, + {2716, {wxMDIChildFrame, destruct, 0}}, + {2717, {wxMDIChildFrame, activate, 0}}, + {2718, {wxMDIChildFrame, create, 4}}, + {2719, {wxMDIChildFrame, maximize, 1}}, + {2720, {wxMDIChildFrame, restore, 0}}, + {2721, {wxMDIClientWindow, new_0, 0}}, + {2722, {wxMDIClientWindow, new_2, 2}}, + {2723, {wxMDIClientWindow, destruct, 0}}, + {2724, {wxMDIClientWindow, createClient, 2}}, + {2725, {wxLayoutAlgorithm, new, 0}}, + {2726, {wxLayoutAlgorithm, layoutFrame, 2}}, + {2727, {wxLayoutAlgorithm, layoutMDIFrame, 2}}, + {2728, {wxLayoutAlgorithm, layoutWindow, 2}}, + {2729, {wxLayoutAlgorithm, 'Destroy', undefined}}, + {2730, {wxEvent, getId, 0}}, + {2731, {wxEvent, getSkipped, 0}}, + {2732, {wxEvent, getTimestamp, 0}}, + {2733, {wxEvent, isCommandEvent, 0}}, + {2734, {wxEvent, resumePropagation, 1}}, + {2735, {wxEvent, shouldPropagate, 0}}, + {2736, {wxEvent, skip, 1}}, + {2737, {wxEvent, stopPropagation, 0}}, + {2738, {wxCommandEvent, getClientData, 0}}, + {2739, {wxCommandEvent, getExtraLong, 0}}, + {2740, {wxCommandEvent, getInt, 0}}, + {2741, {wxCommandEvent, getSelection, 0}}, + {2742, {wxCommandEvent, getString, 0}}, + {2743, {wxCommandEvent, isChecked, 0}}, + {2744, {wxCommandEvent, isSelection, 0}}, + {2745, {wxCommandEvent, setInt, 1}}, + {2746, {wxCommandEvent, setString, 1}}, + {2747, {wxScrollEvent, getOrientation, 0}}, + {2748, {wxScrollEvent, getPosition, 0}}, + {2749, {wxScrollWinEvent, getOrientation, 0}}, + {2750, {wxScrollWinEvent, getPosition, 0}}, + {2751, {wxMouseEvent, altDown, 0}}, + {2752, {wxMouseEvent, button, 1}}, + {2753, {wxMouseEvent, buttonDClick, 1}}, + {2754, {wxMouseEvent, buttonDown, 1}}, + {2755, {wxMouseEvent, buttonUp, 1}}, + {2756, {wxMouseEvent, cmdDown, 0}}, + {2757, {wxMouseEvent, controlDown, 0}}, + {2758, {wxMouseEvent, dragging, 0}}, + {2759, {wxMouseEvent, entering, 0}}, + {2760, {wxMouseEvent, getButton, 0}}, + {2763, {wxMouseEvent, getPosition, 0}}, + {2764, {wxMouseEvent, getLogicalPosition, 1}}, + {2765, {wxMouseEvent, getLinesPerAction, 0}}, + {2766, {wxMouseEvent, getWheelRotation, 0}}, + {2767, {wxMouseEvent, getWheelDelta, 0}}, + {2768, {wxMouseEvent, getX, 0}}, + {2769, {wxMouseEvent, getY, 0}}, + {2770, {wxMouseEvent, isButton, 0}}, + {2771, {wxMouseEvent, isPageScroll, 0}}, + {2772, {wxMouseEvent, leaving, 0}}, + {2773, {wxMouseEvent, leftDClick, 0}}, + {2774, {wxMouseEvent, leftDown, 0}}, + {2775, {wxMouseEvent, leftIsDown, 0}}, + {2776, {wxMouseEvent, leftUp, 0}}, + {2777, {wxMouseEvent, metaDown, 0}}, + {2778, {wxMouseEvent, middleDClick, 0}}, + {2779, {wxMouseEvent, middleDown, 0}}, + {2780, {wxMouseEvent, middleIsDown, 0}}, + {2781, {wxMouseEvent, middleUp, 0}}, + {2782, {wxMouseEvent, moving, 0}}, + {2783, {wxMouseEvent, rightDClick, 0}}, + {2784, {wxMouseEvent, rightDown, 0}}, + {2785, {wxMouseEvent, rightIsDown, 0}}, + {2786, {wxMouseEvent, rightUp, 0}}, + {2787, {wxMouseEvent, shiftDown, 0}}, + {2788, {wxSetCursorEvent, getCursor, 0}}, + {2789, {wxSetCursorEvent, getX, 0}}, + {2790, {wxSetCursorEvent, getY, 0}}, + {2791, {wxSetCursorEvent, hasCursor, 0}}, + {2792, {wxSetCursorEvent, setCursor, 1}}, + {2793, {wxKeyEvent, altDown, 0}}, + {2794, {wxKeyEvent, cmdDown, 0}}, + {2795, {wxKeyEvent, controlDown, 0}}, + {2796, {wxKeyEvent, getKeyCode, 0}}, + {2797, {wxKeyEvent, getModifiers, 0}}, + {2800, {wxKeyEvent, getPosition, 0}}, + {2801, {wxKeyEvent, getRawKeyCode, 0}}, + {2802, {wxKeyEvent, getRawKeyFlags, 0}}, + {2803, {wxKeyEvent, getUnicodeKey, 0}}, + {2804, {wxKeyEvent, getX, 0}}, + {2805, {wxKeyEvent, getY, 0}}, + {2806, {wxKeyEvent, hasModifiers, 0}}, + {2807, {wxKeyEvent, metaDown, 0}}, + {2808, {wxKeyEvent, shiftDown, 0}}, + {2809, {wxSizeEvent, getSize, 0}}, + {2810, {wxMoveEvent, getPosition, 0}}, + {2811, {wxEraseEvent, getDC, 0}}, + {2812, {wxFocusEvent, getWindow, 0}}, + {2813, {wxChildFocusEvent, getWindow, 0}}, + {2814, {wxMenuEvent, getMenu, 0}}, + {2815, {wxMenuEvent, getMenuId, 0}}, + {2816, {wxMenuEvent, isPopup, 0}}, + {2817, {wxCloseEvent, canVeto, 0}}, + {2818, {wxCloseEvent, getLoggingOff, 0}}, + {2819, {wxCloseEvent, setCanVeto, 1}}, + {2820, {wxCloseEvent, setLoggingOff, 1}}, + {2821, {wxCloseEvent, veto, 1}}, + {2822, {wxShowEvent, setShow, 1}}, + {2823, {wxShowEvent, getShow, 0}}, + {2824, {wxIconizeEvent, iconized, 0}}, + {2825, {wxJoystickEvent, buttonDown, 1}}, + {2826, {wxJoystickEvent, buttonIsDown, 1}}, + {2827, {wxJoystickEvent, buttonUp, 1}}, + {2828, {wxJoystickEvent, getButtonChange, 0}}, + {2829, {wxJoystickEvent, getButtonState, 0}}, + {2830, {wxJoystickEvent, getJoystick, 0}}, + {2831, {wxJoystickEvent, getPosition, 0}}, + {2832, {wxJoystickEvent, getZPosition, 0}}, + {2833, {wxJoystickEvent, isButton, 0}}, + {2834, {wxJoystickEvent, isMove, 0}}, + {2835, {wxJoystickEvent, isZMove, 0}}, + {2836, {wxUpdateUIEvent, canUpdate, 1}}, + {2837, {wxUpdateUIEvent, check, 1}}, + {2838, {wxUpdateUIEvent, enable, 1}}, + {2839, {wxUpdateUIEvent, show, 1}}, + {2840, {wxUpdateUIEvent, getChecked, 0}}, + {2841, {wxUpdateUIEvent, getEnabled, 0}}, + {2842, {wxUpdateUIEvent, getShown, 0}}, + {2843, {wxUpdateUIEvent, getSetChecked, 0}}, + {2844, {wxUpdateUIEvent, getSetEnabled, 0}}, + {2845, {wxUpdateUIEvent, getSetShown, 0}}, + {2846, {wxUpdateUIEvent, getSetText, 0}}, + {2847, {wxUpdateUIEvent, getText, 0}}, + {2848, {wxUpdateUIEvent, getMode, 0}}, + {2849, {wxUpdateUIEvent, getUpdateInterval, 0}}, + {2850, {wxUpdateUIEvent, resetUpdateTime, 0}}, + {2851, {wxUpdateUIEvent, setMode, 1}}, + {2852, {wxUpdateUIEvent, setText, 1}}, + {2853, {wxUpdateUIEvent, setUpdateInterval, 1}}, + {2854, {wxMouseCaptureChangedEvent, getCapturedWindow, 0}}, + {2855, {wxPaletteChangedEvent, setChangedWindow, 1}}, + {2856, {wxPaletteChangedEvent, getChangedWindow, 0}}, + {2857, {wxQueryNewPaletteEvent, setPaletteRealized, 1}}, + {2858, {wxQueryNewPaletteEvent, getPaletteRealized, 0}}, + {2859, {wxNavigationKeyEvent, getDirection, 0}}, + {2860, {wxNavigationKeyEvent, setDirection, 1}}, + {2861, {wxNavigationKeyEvent, isWindowChange, 0}}, + {2862, {wxNavigationKeyEvent, setWindowChange, 1}}, + {2863, {wxNavigationKeyEvent, isFromTab, 0}}, + {2864, {wxNavigationKeyEvent, setFromTab, 1}}, + {2865, {wxNavigationKeyEvent, getCurrentFocus, 0}}, + {2866, {wxNavigationKeyEvent, setCurrentFocus, 1}}, + {2867, {wxHelpEvent, getOrigin, 0}}, + {2868, {wxHelpEvent, getPosition, 0}}, + {2869, {wxHelpEvent, setOrigin, 1}}, + {2870, {wxHelpEvent, setPosition, 1}}, + {2871, {wxContextMenuEvent, getPosition, 0}}, + {2872, {wxContextMenuEvent, setPosition, 1}}, + {2873, {wxIdleEvent, canSend, 1}}, + {2874, {wxIdleEvent, getMode, 0}}, + {2875, {wxIdleEvent, requestMore, 1}}, + {2876, {wxIdleEvent, moreRequested, 0}}, + {2877, {wxIdleEvent, setMode, 1}}, + {2878, {wxGridEvent, altDown, 0}}, + {2879, {wxGridEvent, controlDown, 0}}, + {2880, {wxGridEvent, getCol, 0}}, + {2881, {wxGridEvent, getPosition, 0}}, + {2882, {wxGridEvent, getRow, 0}}, + {2883, {wxGridEvent, metaDown, 0}}, + {2884, {wxGridEvent, selecting, 0}}, + {2885, {wxGridEvent, shiftDown, 0}}, + {2886, {wxNotifyEvent, allow, 0}}, + {2887, {wxNotifyEvent, isAllowed, 0}}, + {2888, {wxNotifyEvent, veto, 0}}, + {2889, {wxSashEvent, getEdge, 0}}, + {2890, {wxSashEvent, getDragRect, 0}}, + {2891, {wxSashEvent, getDragStatus, 0}}, + {2892, {wxListEvent, getCacheFrom, 0}}, + {2893, {wxListEvent, getCacheTo, 0}}, + {2894, {wxListEvent, getKeyCode, 0}}, + {2895, {wxListEvent, getIndex, 0}}, + {2896, {wxListEvent, getColumn, 0}}, + {2897, {wxListEvent, getPoint, 0}}, + {2898, {wxListEvent, getLabel, 0}}, + {2899, {wxListEvent, getText, 0}}, + {2900, {wxListEvent, getImage, 0}}, + {2901, {wxListEvent, getData, 0}}, + {2902, {wxListEvent, getMask, 0}}, + {2903, {wxListEvent, getItem, 0}}, + {2904, {wxListEvent, isEditCancelled, 0}}, + {2905, {wxDateEvent, getDate, 0}}, + {2906, {wxCalendarEvent, getWeekDay, 0}}, + {2907, {wxFileDirPickerEvent, getPath, 0}}, + {2908, {wxColourPickerEvent, getColour, 0}}, + {2909, {wxFontPickerEvent, getFont, 0}}, + {2910, {wxStyledTextEvent, getPosition, 0}}, + {2911, {wxStyledTextEvent, getKey, 0}}, + {2912, {wxStyledTextEvent, getModifiers, 0}}, + {2913, {wxStyledTextEvent, getModificationType, 0}}, + {2914, {wxStyledTextEvent, getText, 0}}, + {2915, {wxStyledTextEvent, getLength, 0}}, + {2916, {wxStyledTextEvent, getLinesAdded, 0}}, + {2917, {wxStyledTextEvent, getLine, 0}}, + {2918, {wxStyledTextEvent, getFoldLevelNow, 0}}, + {2919, {wxStyledTextEvent, getFoldLevelPrev, 0}}, + {2920, {wxStyledTextEvent, getMargin, 0}}, + {2921, {wxStyledTextEvent, getMessage, 0}}, + {2922, {wxStyledTextEvent, getWParam, 0}}, + {2923, {wxStyledTextEvent, getLParam, 0}}, + {2924, {wxStyledTextEvent, getListType, 0}}, + {2925, {wxStyledTextEvent, getX, 0}}, + {2926, {wxStyledTextEvent, getY, 0}}, + {2927, {wxStyledTextEvent, getDragText, 0}}, + {2928, {wxStyledTextEvent, getDragAllowMove, 0}}, + {2929, {wxStyledTextEvent, getDragResult, 0}}, + {2930, {wxStyledTextEvent, getShift, 0}}, + {2931, {wxStyledTextEvent, getControl, 0}}, + {2932, {wxStyledTextEvent, getAlt, 0}}, + {2933, {utils, getKeyState, 1}}, + {2934, {utils, getMousePosition, 2}}, + {2935, {utils, getMouseState, 0}}, + {2936, {utils, setDetectableAutoRepeat, 1}}, + {2937, {utils, bell, 0}}, + {2938, {utils, findMenuItemId, 3}}, + {2939, {utils, genericFindWindowAtPoint, 1}}, + {2940, {utils, findWindowAtPoint, 1}}, + {2941, {utils, beginBusyCursor, 1}}, + {2942, {utils, endBusyCursor, 0}}, + {2943, {utils, isBusy, 0}}, + {2944, {utils, shutdown, 1}}, + {2945, {utils, shell, 1}}, + {2946, {utils, launchDefaultBrowser, 2}}, + {2947, {utils, getEmailAddress, 0}}, + {2948, {utils, getUserId, 0}}, + {2949, {utils, getHomeDir, 0}}, + {2950, {utils, newId, 0}}, + {2951, {utils, registerId, 1}}, + {2952, {utils, getCurrentId, 0}}, + {2953, {utils, getOsDescription, 0}}, + {2954, {utils, isPlatformLittleEndian, 0}}, + {2955, {utils, isPlatform64Bit, 0}}, + {2956, {gdicmn, displaySize, 2}}, + {2957, {gdicmn, setCursor, 1}}, + {2958, {wxPrintout, new, 1}}, + {2959, {wxPrintout, destruct, 0}}, + {2960, {wxPrintout, getDC, 0}}, + {2961, {wxPrintout, getPageSizeMM, 2}}, + {2962, {wxPrintout, getPageSizePixels, 2}}, + {2963, {wxPrintout, getPaperRectPixels, 0}}, + {2964, {wxPrintout, getPPIPrinter, 2}}, + {2965, {wxPrintout, getPPIScreen, 2}}, + {2966, {wxPrintout, getTitle, 0}}, + {2967, {wxPrintout, isPreview, 0}}, + {2968, {wxPrintout, fitThisSizeToPaper, 1}}, + {2969, {wxPrintout, fitThisSizeToPage, 1}}, + {2970, {wxPrintout, fitThisSizeToPageMargins, 2}}, + {2971, {wxPrintout, mapScreenSizeToPaper, 0}}, + {2972, {wxPrintout, mapScreenSizeToPage, 0}}, + {2973, {wxPrintout, mapScreenSizeToPageMargins, 1}}, + {2974, {wxPrintout, mapScreenSizeToDevice, 0}}, + {2975, {wxPrintout, getLogicalPaperRect, 0}}, + {2976, {wxPrintout, getLogicalPageRect, 0}}, + {2977, {wxPrintout, getLogicalPageMarginsRect, 1}}, + {2978, {wxPrintout, setLogicalOrigin, 2}}, + {2979, {wxPrintout, offsetLogicalOrigin, 2}}, + {2980, {wxStyledTextCtrl, new_2, 2}}, + {2981, {wxStyledTextCtrl, new_0, 0}}, + {2982, {wxStyledTextCtrl, destruct, 0}}, + {2983, {wxStyledTextCtrl, create, 2}}, + {2984, {wxStyledTextCtrl, addText, 1}}, + {2985, {wxStyledTextCtrl, addStyledText, 1}}, + {2986, {wxStyledTextCtrl, insertText, 2}}, + {2987, {wxStyledTextCtrl, clearAll, 0}}, + {2988, {wxStyledTextCtrl, clearDocumentStyle, 0}}, + {2989, {wxStyledTextCtrl, getLength, 0}}, + {2990, {wxStyledTextCtrl, getCharAt, 1}}, + {2991, {wxStyledTextCtrl, getCurrentPos, 0}}, + {2992, {wxStyledTextCtrl, getAnchor, 0}}, + {2993, {wxStyledTextCtrl, getStyleAt, 1}}, + {2994, {wxStyledTextCtrl, redo, 0}}, + {2995, {wxStyledTextCtrl, setUndoCollection, 1}}, + {2996, {wxStyledTextCtrl, selectAll, 0}}, + {2997, {wxStyledTextCtrl, setSavePoint, 0}}, + {2998, {wxStyledTextCtrl, getStyledText, 2}}, + {2999, {wxStyledTextCtrl, canRedo, 0}}, + {3000, {wxStyledTextCtrl, markerLineFromHandle, 1}}, + {3001, {wxStyledTextCtrl, markerDeleteHandle, 1}}, + {3002, {wxStyledTextCtrl, getUndoCollection, 0}}, + {3003, {wxStyledTextCtrl, getViewWhiteSpace, 0}}, + {3004, {wxStyledTextCtrl, setViewWhiteSpace, 1}}, + {3005, {wxStyledTextCtrl, positionFromPoint, 1}}, + {3006, {wxStyledTextCtrl, positionFromPointClose, 2}}, + {3007, {wxStyledTextCtrl, gotoLine, 1}}, + {3008, {wxStyledTextCtrl, gotoPos, 1}}, + {3009, {wxStyledTextCtrl, setAnchor, 1}}, + {3010, {wxStyledTextCtrl, getCurLine, 1}}, + {3011, {wxStyledTextCtrl, getEndStyled, 0}}, + {3012, {wxStyledTextCtrl, convertEOLs, 1}}, + {3013, {wxStyledTextCtrl, getEOLMode, 0}}, + {3014, {wxStyledTextCtrl, setEOLMode, 1}}, + {3015, {wxStyledTextCtrl, startStyling, 2}}, + {3016, {wxStyledTextCtrl, setStyling, 2}}, + {3017, {wxStyledTextCtrl, getBufferedDraw, 0}}, + {3018, {wxStyledTextCtrl, setBufferedDraw, 1}}, + {3019, {wxStyledTextCtrl, setTabWidth, 1}}, + {3020, {wxStyledTextCtrl, getTabWidth, 0}}, + {3021, {wxStyledTextCtrl, setCodePage, 1}}, + {3022, {wxStyledTextCtrl, markerDefine, 3}}, + {3023, {wxStyledTextCtrl, markerSetForeground, 2}}, + {3024, {wxStyledTextCtrl, markerSetBackground, 2}}, + {3025, {wxStyledTextCtrl, markerAdd, 2}}, + {3026, {wxStyledTextCtrl, markerDelete, 2}}, + {3027, {wxStyledTextCtrl, markerDeleteAll, 1}}, + {3028, {wxStyledTextCtrl, markerGet, 1}}, + {3029, {wxStyledTextCtrl, markerNext, 2}}, + {3030, {wxStyledTextCtrl, markerPrevious, 2}}, + {3031, {wxStyledTextCtrl, markerDefineBitmap, 2}}, + {3032, {wxStyledTextCtrl, markerAddSet, 2}}, + {3033, {wxStyledTextCtrl, markerSetAlpha, 2}}, + {3034, {wxStyledTextCtrl, setMarginType, 2}}, + {3035, {wxStyledTextCtrl, getMarginType, 1}}, + {3036, {wxStyledTextCtrl, setMarginWidth, 2}}, + {3037, {wxStyledTextCtrl, getMarginWidth, 1}}, + {3038, {wxStyledTextCtrl, setMarginMask, 2}}, + {3039, {wxStyledTextCtrl, getMarginMask, 1}}, + {3040, {wxStyledTextCtrl, setMarginSensitive, 2}}, + {3041, {wxStyledTextCtrl, getMarginSensitive, 1}}, + {3042, {wxStyledTextCtrl, styleClearAll, 0}}, + {3043, {wxStyledTextCtrl, styleSetForeground, 2}}, + {3044, {wxStyledTextCtrl, styleSetBackground, 2}}, + {3045, {wxStyledTextCtrl, styleSetBold, 2}}, + {3046, {wxStyledTextCtrl, styleSetItalic, 2}}, + {3047, {wxStyledTextCtrl, styleSetSize, 2}}, + {3048, {wxStyledTextCtrl, styleSetFaceName, 2}}, + {3049, {wxStyledTextCtrl, styleSetEOLFilled, 2}}, + {3050, {wxStyledTextCtrl, styleResetDefault, 0}}, + {3051, {wxStyledTextCtrl, styleSetUnderline, 2}}, + {3052, {wxStyledTextCtrl, styleSetCase, 2}}, + {3053, {wxStyledTextCtrl, styleSetHotSpot, 2}}, + {3054, {wxStyledTextCtrl, setSelForeground, 2}}, + {3055, {wxStyledTextCtrl, setSelBackground, 2}}, + {3056, {wxStyledTextCtrl, getSelAlpha, 0}}, + {3057, {wxStyledTextCtrl, setSelAlpha, 1}}, + {3058, {wxStyledTextCtrl, setCaretForeground, 1}}, + {3059, {wxStyledTextCtrl, cmdKeyAssign, 3}}, + {3060, {wxStyledTextCtrl, cmdKeyClear, 2}}, + {3061, {wxStyledTextCtrl, cmdKeyClearAll, 0}}, + {3062, {wxStyledTextCtrl, setStyleBytes, 2}}, + {3063, {wxStyledTextCtrl, styleSetVisible, 2}}, + {3064, {wxStyledTextCtrl, getCaretPeriod, 0}}, + {3065, {wxStyledTextCtrl, setCaretPeriod, 1}}, + {3066, {wxStyledTextCtrl, setWordChars, 1}}, + {3067, {wxStyledTextCtrl, beginUndoAction, 0}}, + {3068, {wxStyledTextCtrl, endUndoAction, 0}}, + {3069, {wxStyledTextCtrl, indicatorSetStyle, 2}}, + {3070, {wxStyledTextCtrl, indicatorGetStyle, 1}}, + {3071, {wxStyledTextCtrl, indicatorSetForeground, 2}}, + {3072, {wxStyledTextCtrl, indicatorGetForeground, 1}}, + {3073, {wxStyledTextCtrl, setWhitespaceForeground, 2}}, + {3074, {wxStyledTextCtrl, setWhitespaceBackground, 2}}, + {3075, {wxStyledTextCtrl, getStyleBits, 0}}, + {3076, {wxStyledTextCtrl, setLineState, 2}}, + {3077, {wxStyledTextCtrl, getLineState, 1}}, + {3078, {wxStyledTextCtrl, getMaxLineState, 0}}, + {3079, {wxStyledTextCtrl, getCaretLineVisible, 0}}, + {3080, {wxStyledTextCtrl, setCaretLineVisible, 1}}, + {3081, {wxStyledTextCtrl, getCaretLineBackground, 0}}, + {3082, {wxStyledTextCtrl, setCaretLineBackground, 1}}, + {3083, {wxStyledTextCtrl, autoCompShow, 2}}, + {3084, {wxStyledTextCtrl, autoCompCancel, 0}}, + {3085, {wxStyledTextCtrl, autoCompActive, 0}}, + {3086, {wxStyledTextCtrl, autoCompPosStart, 0}}, + {3087, {wxStyledTextCtrl, autoCompComplete, 0}}, + {3088, {wxStyledTextCtrl, autoCompStops, 1}}, + {3089, {wxStyledTextCtrl, autoCompSetSeparator, 1}}, + {3090, {wxStyledTextCtrl, autoCompGetSeparator, 0}}, + {3091, {wxStyledTextCtrl, autoCompSelect, 1}}, + {3092, {wxStyledTextCtrl, autoCompSetCancelAtStart, 1}}, + {3093, {wxStyledTextCtrl, autoCompGetCancelAtStart, 0}}, + {3094, {wxStyledTextCtrl, autoCompSetFillUps, 1}}, + {3095, {wxStyledTextCtrl, autoCompSetChooseSingle, 1}}, + {3096, {wxStyledTextCtrl, autoCompGetChooseSingle, 0}}, + {3097, {wxStyledTextCtrl, autoCompSetIgnoreCase, 1}}, + {3098, {wxStyledTextCtrl, autoCompGetIgnoreCase, 0}}, + {3099, {wxStyledTextCtrl, userListShow, 2}}, + {3100, {wxStyledTextCtrl, autoCompSetAutoHide, 1}}, + {3101, {wxStyledTextCtrl, autoCompGetAutoHide, 0}}, + {3102, {wxStyledTextCtrl, autoCompSetDropRestOfWord, 1}}, + {3103, {wxStyledTextCtrl, autoCompGetDropRestOfWord, 0}}, + {3104, {wxStyledTextCtrl, registerImage, 2}}, + {3105, {wxStyledTextCtrl, clearRegisteredImages, 0}}, + {3106, {wxStyledTextCtrl, autoCompGetTypeSeparator, 0}}, + {3107, {wxStyledTextCtrl, autoCompSetTypeSeparator, 1}}, + {3108, {wxStyledTextCtrl, autoCompSetMaxWidth, 1}}, + {3109, {wxStyledTextCtrl, autoCompGetMaxWidth, 0}}, + {3110, {wxStyledTextCtrl, autoCompSetMaxHeight, 1}}, + {3111, {wxStyledTextCtrl, autoCompGetMaxHeight, 0}}, + {3112, {wxStyledTextCtrl, setIndent, 1}}, + {3113, {wxStyledTextCtrl, getIndent, 0}}, + {3114, {wxStyledTextCtrl, setUseTabs, 1}}, + {3115, {wxStyledTextCtrl, getUseTabs, 0}}, + {3116, {wxStyledTextCtrl, setLineIndentation, 2}}, + {3117, {wxStyledTextCtrl, getLineIndentation, 1}}, + {3118, {wxStyledTextCtrl, getLineIndentPosition, 1}}, + {3119, {wxStyledTextCtrl, getColumn, 1}}, + {3120, {wxStyledTextCtrl, setUseHorizontalScrollBar, 1}}, + {3121, {wxStyledTextCtrl, getUseHorizontalScrollBar, 0}}, + {3122, {wxStyledTextCtrl, setIndentationGuides, 1}}, + {3123, {wxStyledTextCtrl, getIndentationGuides, 0}}, + {3124, {wxStyledTextCtrl, setHighlightGuide, 1}}, + {3125, {wxStyledTextCtrl, getHighlightGuide, 0}}, + {3126, {wxStyledTextCtrl, getLineEndPosition, 1}}, + {3127, {wxStyledTextCtrl, getCodePage, 0}}, + {3128, {wxStyledTextCtrl, getCaretForeground, 0}}, + {3129, {wxStyledTextCtrl, getReadOnly, 0}}, + {3130, {wxStyledTextCtrl, setCurrentPos, 1}}, + {3131, {wxStyledTextCtrl, setSelectionStart, 1}}, + {3132, {wxStyledTextCtrl, getSelectionStart, 0}}, + {3133, {wxStyledTextCtrl, setSelectionEnd, 1}}, + {3134, {wxStyledTextCtrl, getSelectionEnd, 0}}, + {3135, {wxStyledTextCtrl, setPrintMagnification, 1}}, + {3136, {wxStyledTextCtrl, getPrintMagnification, 0}}, + {3137, {wxStyledTextCtrl, setPrintColourMode, 1}}, + {3138, {wxStyledTextCtrl, getPrintColourMode, 0}}, + {3139, {wxStyledTextCtrl, findText, 4}}, + {3140, {wxStyledTextCtrl, formatRange, 7}}, + {3141, {wxStyledTextCtrl, getFirstVisibleLine, 0}}, + {3142, {wxStyledTextCtrl, getLine, 1}}, + {3143, {wxStyledTextCtrl, getLineCount, 0}}, + {3144, {wxStyledTextCtrl, setMarginLeft, 1}}, + {3145, {wxStyledTextCtrl, getMarginLeft, 0}}, + {3146, {wxStyledTextCtrl, setMarginRight, 1}}, + {3147, {wxStyledTextCtrl, getMarginRight, 0}}, + {3148, {wxStyledTextCtrl, getModify, 0}}, + {3149, {wxStyledTextCtrl, setSelection, 2}}, + {3150, {wxStyledTextCtrl, getSelectedText, 0}}, + {3151, {wxStyledTextCtrl, getTextRange, 2}}, + {3152, {wxStyledTextCtrl, hideSelection, 1}}, + {3153, {wxStyledTextCtrl, lineFromPosition, 1}}, + {3154, {wxStyledTextCtrl, positionFromLine, 1}}, + {3155, {wxStyledTextCtrl, lineScroll, 2}}, + {3156, {wxStyledTextCtrl, ensureCaretVisible, 0}}, + {3157, {wxStyledTextCtrl, replaceSelection, 1}}, + {3158, {wxStyledTextCtrl, setReadOnly, 1}}, + {3159, {wxStyledTextCtrl, canPaste, 0}}, + {3160, {wxStyledTextCtrl, canUndo, 0}}, + {3161, {wxStyledTextCtrl, emptyUndoBuffer, 0}}, + {3162, {wxStyledTextCtrl, undo, 0}}, + {3163, {wxStyledTextCtrl, cut, 0}}, + {3164, {wxStyledTextCtrl, copy, 0}}, + {3165, {wxStyledTextCtrl, paste, 0}}, + {3166, {wxStyledTextCtrl, clear, 0}}, + {3167, {wxStyledTextCtrl, setText, 1}}, + {3168, {wxStyledTextCtrl, getText, 0}}, + {3169, {wxStyledTextCtrl, getTextLength, 0}}, + {3170, {wxStyledTextCtrl, getOvertype, 0}}, + {3171, {wxStyledTextCtrl, setCaretWidth, 1}}, + {3172, {wxStyledTextCtrl, getCaretWidth, 0}}, + {3173, {wxStyledTextCtrl, setTargetStart, 1}}, + {3174, {wxStyledTextCtrl, getTargetStart, 0}}, + {3175, {wxStyledTextCtrl, setTargetEnd, 1}}, + {3176, {wxStyledTextCtrl, getTargetEnd, 0}}, + {3177, {wxStyledTextCtrl, replaceTarget, 1}}, + {3178, {wxStyledTextCtrl, searchInTarget, 1}}, + {3179, {wxStyledTextCtrl, setSearchFlags, 1}}, + {3180, {wxStyledTextCtrl, getSearchFlags, 0}}, + {3181, {wxStyledTextCtrl, callTipShow, 2}}, + {3182, {wxStyledTextCtrl, callTipCancel, 0}}, + {3183, {wxStyledTextCtrl, callTipActive, 0}}, + {3184, {wxStyledTextCtrl, callTipPosAtStart, 0}}, + {3185, {wxStyledTextCtrl, callTipSetHighlight, 2}}, + {3186, {wxStyledTextCtrl, callTipSetBackground, 1}}, + {3187, {wxStyledTextCtrl, callTipSetForeground, 1}}, + {3188, {wxStyledTextCtrl, callTipSetForegroundHighlight, 1}}, + {3189, {wxStyledTextCtrl, callTipUseStyle, 1}}, + {3190, {wxStyledTextCtrl, visibleFromDocLine, 1}}, + {3191, {wxStyledTextCtrl, docLineFromVisible, 1}}, + {3192, {wxStyledTextCtrl, wrapCount, 1}}, + {3193, {wxStyledTextCtrl, setFoldLevel, 2}}, + {3194, {wxStyledTextCtrl, getFoldLevel, 1}}, + {3195, {wxStyledTextCtrl, getLastChild, 2}}, + {3196, {wxStyledTextCtrl, getFoldParent, 1}}, + {3197, {wxStyledTextCtrl, showLines, 2}}, + {3198, {wxStyledTextCtrl, hideLines, 2}}, + {3199, {wxStyledTextCtrl, getLineVisible, 1}}, + {3200, {wxStyledTextCtrl, setFoldExpanded, 2}}, + {3201, {wxStyledTextCtrl, getFoldExpanded, 1}}, + {3202, {wxStyledTextCtrl, toggleFold, 1}}, + {3203, {wxStyledTextCtrl, ensureVisible, 1}}, + {3204, {wxStyledTextCtrl, setFoldFlags, 1}}, + {3205, {wxStyledTextCtrl, ensureVisibleEnforcePolicy, 1}}, + {3206, {wxStyledTextCtrl, setTabIndents, 1}}, + {3207, {wxStyledTextCtrl, getTabIndents, 0}}, + {3208, {wxStyledTextCtrl, setBackSpaceUnIndents, 1}}, + {3209, {wxStyledTextCtrl, getBackSpaceUnIndents, 0}}, + {3210, {wxStyledTextCtrl, setMouseDwellTime, 1}}, + {3211, {wxStyledTextCtrl, getMouseDwellTime, 0}}, + {3212, {wxStyledTextCtrl, wordStartPosition, 2}}, + {3213, {wxStyledTextCtrl, wordEndPosition, 2}}, + {3214, {wxStyledTextCtrl, setWrapMode, 1}}, + {3215, {wxStyledTextCtrl, getWrapMode, 0}}, + {3216, {wxStyledTextCtrl, setWrapVisualFlags, 1}}, + {3217, {wxStyledTextCtrl, getWrapVisualFlags, 0}}, + {3218, {wxStyledTextCtrl, setWrapVisualFlagsLocation, 1}}, + {3219, {wxStyledTextCtrl, getWrapVisualFlagsLocation, 0}}, + {3220, {wxStyledTextCtrl, setWrapStartIndent, 1}}, + {3221, {wxStyledTextCtrl, getWrapStartIndent, 0}}, + {3222, {wxStyledTextCtrl, setLayoutCache, 1}}, + {3223, {wxStyledTextCtrl, getLayoutCache, 0}}, + {3224, {wxStyledTextCtrl, setScrollWidth, 1}}, + {3225, {wxStyledTextCtrl, getScrollWidth, 0}}, + {3226, {wxStyledTextCtrl, textWidth, 2}}, + {3227, {wxStyledTextCtrl, getEndAtLastLine, 0}}, + {3228, {wxStyledTextCtrl, textHeight, 1}}, + {3229, {wxStyledTextCtrl, setUseVerticalScrollBar, 1}}, + {3230, {wxStyledTextCtrl, getUseVerticalScrollBar, 0}}, + {3231, {wxStyledTextCtrl, appendText, 1}}, + {3232, {wxStyledTextCtrl, getTwoPhaseDraw, 0}}, + {3233, {wxStyledTextCtrl, setTwoPhaseDraw, 1}}, + {3234, {wxStyledTextCtrl, targetFromSelection, 0}}, + {3235, {wxStyledTextCtrl, linesJoin, 0}}, + {3236, {wxStyledTextCtrl, linesSplit, 1}}, + {3237, {wxStyledTextCtrl, setFoldMarginColour, 2}}, + {3238, {wxStyledTextCtrl, setFoldMarginHiColour, 2}}, + {3239, {wxStyledTextCtrl, lineDown, 0}}, + {3240, {wxStyledTextCtrl, lineDownExtend, 0}}, + {3241, {wxStyledTextCtrl, lineUp, 0}}, + {3242, {wxStyledTextCtrl, lineUpExtend, 0}}, + {3243, {wxStyledTextCtrl, charLeft, 0}}, + {3244, {wxStyledTextCtrl, charLeftExtend, 0}}, + {3245, {wxStyledTextCtrl, charRight, 0}}, + {3246, {wxStyledTextCtrl, charRightExtend, 0}}, + {3247, {wxStyledTextCtrl, wordLeft, 0}}, + {3248, {wxStyledTextCtrl, wordLeftExtend, 0}}, + {3249, {wxStyledTextCtrl, wordRight, 0}}, + {3250, {wxStyledTextCtrl, wordRightExtend, 0}}, + {3251, {wxStyledTextCtrl, home, 0}}, + {3252, {wxStyledTextCtrl, homeExtend, 0}}, + {3253, {wxStyledTextCtrl, lineEnd, 0}}, + {3254, {wxStyledTextCtrl, lineEndExtend, 0}}, + {3255, {wxStyledTextCtrl, documentStart, 0}}, + {3256, {wxStyledTextCtrl, documentStartExtend, 0}}, + {3257, {wxStyledTextCtrl, documentEnd, 0}}, + {3258, {wxStyledTextCtrl, documentEndExtend, 0}}, + {3259, {wxStyledTextCtrl, pageUp, 0}}, + {3260, {wxStyledTextCtrl, pageUpExtend, 0}}, + {3261, {wxStyledTextCtrl, pageDown, 0}}, + {3262, {wxStyledTextCtrl, pageDownExtend, 0}}, + {3263, {wxStyledTextCtrl, editToggleOvertype, 0}}, + {3264, {wxStyledTextCtrl, cancel, 0}}, + {3265, {wxStyledTextCtrl, deleteBack, 0}}, + {3266, {wxStyledTextCtrl, tab, 0}}, + {3267, {wxStyledTextCtrl, backTab, 0}}, + {3268, {wxStyledTextCtrl, newLine, 0}}, + {3269, {wxStyledTextCtrl, formFeed, 0}}, + {3270, {wxStyledTextCtrl, vCHome, 0}}, + {3271, {wxStyledTextCtrl, vCHomeExtend, 0}}, + {3272, {wxStyledTextCtrl, zoomIn, 0}}, + {3273, {wxStyledTextCtrl, zoomOut, 0}}, + {3274, {wxStyledTextCtrl, delWordLeft, 0}}, + {3275, {wxStyledTextCtrl, delWordRight, 0}}, + {3276, {wxStyledTextCtrl, lineCut, 0}}, + {3277, {wxStyledTextCtrl, lineDelete, 0}}, + {3278, {wxStyledTextCtrl, lineTranspose, 0}}, + {3279, {wxStyledTextCtrl, lineDuplicate, 0}}, + {3280, {wxStyledTextCtrl, lowerCase, 0}}, + {3281, {wxStyledTextCtrl, upperCase, 0}}, + {3282, {wxStyledTextCtrl, lineScrollDown, 0}}, + {3283, {wxStyledTextCtrl, lineScrollUp, 0}}, + {3284, {wxStyledTextCtrl, deleteBackNotLine, 0}}, + {3285, {wxStyledTextCtrl, homeDisplay, 0}}, + {3286, {wxStyledTextCtrl, homeDisplayExtend, 0}}, + {3287, {wxStyledTextCtrl, lineEndDisplay, 0}}, + {3288, {wxStyledTextCtrl, lineEndDisplayExtend, 0}}, + {3289, {wxStyledTextCtrl, homeWrapExtend, 0}}, + {3290, {wxStyledTextCtrl, lineEndWrap, 0}}, + {3291, {wxStyledTextCtrl, lineEndWrapExtend, 0}}, + {3292, {wxStyledTextCtrl, vCHomeWrap, 0}}, + {3293, {wxStyledTextCtrl, vCHomeWrapExtend, 0}}, + {3294, {wxStyledTextCtrl, lineCopy, 0}}, + {3295, {wxStyledTextCtrl, moveCaretInsideView, 0}}, + {3296, {wxStyledTextCtrl, lineLength, 1}}, + {3297, {wxStyledTextCtrl, braceHighlight, 2}}, + {3298, {wxStyledTextCtrl, braceBadLight, 1}}, + {3299, {wxStyledTextCtrl, braceMatch, 1}}, + {3300, {wxStyledTextCtrl, getViewEOL, 0}}, + {3301, {wxStyledTextCtrl, setViewEOL, 1}}, + {3302, {wxStyledTextCtrl, setModEventMask, 1}}, + {3303, {wxStyledTextCtrl, getEdgeColumn, 0}}, + {3304, {wxStyledTextCtrl, setEdgeColumn, 1}}, + {3305, {wxStyledTextCtrl, setEdgeMode, 1}}, + {3306, {wxStyledTextCtrl, getEdgeMode, 0}}, + {3307, {wxStyledTextCtrl, getEdgeColour, 0}}, + {3308, {wxStyledTextCtrl, setEdgeColour, 1}}, + {3309, {wxStyledTextCtrl, searchAnchor, 0}}, + {3310, {wxStyledTextCtrl, searchNext, 2}}, + {3311, {wxStyledTextCtrl, searchPrev, 2}}, + {3312, {wxStyledTextCtrl, linesOnScreen, 0}}, + {3313, {wxStyledTextCtrl, usePopUp, 1}}, + {3314, {wxStyledTextCtrl, selectionIsRectangle, 0}}, + {3315, {wxStyledTextCtrl, setZoom, 1}}, + {3316, {wxStyledTextCtrl, getZoom, 0}}, + {3317, {wxStyledTextCtrl, getModEventMask, 0}}, + {3318, {wxStyledTextCtrl, setSTCFocus, 1}}, + {3319, {wxStyledTextCtrl, getSTCFocus, 0}}, + {3320, {wxStyledTextCtrl, setStatus, 1}}, + {3321, {wxStyledTextCtrl, getStatus, 0}}, + {3322, {wxStyledTextCtrl, setMouseDownCaptures, 1}}, + {3323, {wxStyledTextCtrl, getMouseDownCaptures, 0}}, + {3324, {wxStyledTextCtrl, setSTCCursor, 1}}, + {3325, {wxStyledTextCtrl, getSTCCursor, 0}}, + {3326, {wxStyledTextCtrl, setControlCharSymbol, 1}}, + {3327, {wxStyledTextCtrl, getControlCharSymbol, 0}}, + {3328, {wxStyledTextCtrl, wordPartLeft, 0}}, + {3329, {wxStyledTextCtrl, wordPartLeftExtend, 0}}, + {3330, {wxStyledTextCtrl, wordPartRight, 0}}, + {3331, {wxStyledTextCtrl, wordPartRightExtend, 0}}, + {3332, {wxStyledTextCtrl, setVisiblePolicy, 2}}, + {3333, {wxStyledTextCtrl, delLineLeft, 0}}, + {3334, {wxStyledTextCtrl, delLineRight, 0}}, + {3335, {wxStyledTextCtrl, getXOffset, 0}}, + {3336, {wxStyledTextCtrl, chooseCaretX, 0}}, + {3337, {wxStyledTextCtrl, setXCaretPolicy, 2}}, + {3338, {wxStyledTextCtrl, setYCaretPolicy, 2}}, + {3339, {wxStyledTextCtrl, getPrintWrapMode, 0}}, + {3340, {wxStyledTextCtrl, setHotspotActiveForeground, 2}}, + {3341, {wxStyledTextCtrl, setHotspotActiveBackground, 2}}, + {3342, {wxStyledTextCtrl, setHotspotActiveUnderline, 1}}, + {3343, {wxStyledTextCtrl, setHotspotSingleLine, 1}}, + {3344, {wxStyledTextCtrl, paraDownExtend, 0}}, + {3345, {wxStyledTextCtrl, paraUp, 0}}, + {3346, {wxStyledTextCtrl, paraUpExtend, 0}}, + {3347, {wxStyledTextCtrl, positionBefore, 1}}, + {3348, {wxStyledTextCtrl, positionAfter, 1}}, + {3349, {wxStyledTextCtrl, copyRange, 2}}, + {3350, {wxStyledTextCtrl, copyText, 2}}, + {3351, {wxStyledTextCtrl, setSelectionMode, 1}}, + {3352, {wxStyledTextCtrl, getSelectionMode, 0}}, + {3353, {wxStyledTextCtrl, lineDownRectExtend, 0}}, + {3354, {wxStyledTextCtrl, lineUpRectExtend, 0}}, + {3355, {wxStyledTextCtrl, charLeftRectExtend, 0}}, + {3356, {wxStyledTextCtrl, charRightRectExtend, 0}}, + {3357, {wxStyledTextCtrl, homeRectExtend, 0}}, + {3358, {wxStyledTextCtrl, vCHomeRectExtend, 0}}, + {3359, {wxStyledTextCtrl, lineEndRectExtend, 0}}, + {3360, {wxStyledTextCtrl, pageUpRectExtend, 0}}, + {3361, {wxStyledTextCtrl, pageDownRectExtend, 0}}, + {3362, {wxStyledTextCtrl, stutteredPageUp, 0}}, + {3363, {wxStyledTextCtrl, stutteredPageUpExtend, 0}}, + {3364, {wxStyledTextCtrl, stutteredPageDown, 0}}, + {3365, {wxStyledTextCtrl, stutteredPageDownExtend, 0}}, + {3366, {wxStyledTextCtrl, wordLeftEnd, 0}}, + {3367, {wxStyledTextCtrl, wordLeftEndExtend, 0}}, + {3368, {wxStyledTextCtrl, wordRightEnd, 0}}, + {3369, {wxStyledTextCtrl, wordRightEndExtend, 0}}, + {3370, {wxStyledTextCtrl, setWhitespaceChars, 1}}, + {3371, {wxStyledTextCtrl, setCharsDefault, 0}}, + {3372, {wxStyledTextCtrl, autoCompGetCurrent, 0}}, + {3373, {wxStyledTextCtrl, allocate, 1}}, + {3374, {wxStyledTextCtrl, findColumn, 2}}, + {3375, {wxStyledTextCtrl, getCaretSticky, 0}}, + {3376, {wxStyledTextCtrl, setCaretSticky, 1}}, + {3377, {wxStyledTextCtrl, toggleCaretSticky, 0}}, + {3378, {wxStyledTextCtrl, setPasteConvertEndings, 1}}, + {3379, {wxStyledTextCtrl, getPasteConvertEndings, 0}}, + {3380, {wxStyledTextCtrl, selectionDuplicate, 0}}, + {3381, {wxStyledTextCtrl, setCaretLineBackAlpha, 1}}, + {3382, {wxStyledTextCtrl, getCaretLineBackAlpha, 0}}, + {3383, {wxStyledTextCtrl, startRecord, 0}}, + {3384, {wxStyledTextCtrl, stopRecord, 0}}, + {3385, {wxStyledTextCtrl, setLexer, 1}}, + {3386, {wxStyledTextCtrl, getLexer, 0}}, + {3387, {wxStyledTextCtrl, colourise, 2}}, + {3388, {wxStyledTextCtrl, setProperty, 2}}, + {3389, {wxStyledTextCtrl, setKeyWords, 2}}, + {3390, {wxStyledTextCtrl, setLexerLanguage, 1}}, + {3391, {wxStyledTextCtrl, getProperty, 1}}, + {3392, {wxStyledTextCtrl, getStyleBitsNeeded, 0}}, + {3393, {wxStyledTextCtrl, getCurrentLine, 0}}, + {3394, {wxStyledTextCtrl, styleSetSpec, 2}}, + {3395, {wxStyledTextCtrl, styleSetFont, 2}}, + {3396, {wxStyledTextCtrl, styleSetFontAttr, 7}}, + {3397, {wxStyledTextCtrl, styleSetCharacterSet, 2}}, + {3398, {wxStyledTextCtrl, styleSetFontEncoding, 2}}, + {3399, {wxStyledTextCtrl, cmdKeyExecute, 1}}, + {3400, {wxStyledTextCtrl, setMargins, 2}}, + {3401, {wxStyledTextCtrl, getSelection, 2}}, + {3402, {wxStyledTextCtrl, pointFromPosition, 1}}, + {3403, {wxStyledTextCtrl, scrollToLine, 1}}, + {3404, {wxStyledTextCtrl, scrollToColumn, 1}}, + {3405, {wxStyledTextCtrl, setVScrollBar, 1}}, + {3406, {wxStyledTextCtrl, setHScrollBar, 1}}, + {3407, {wxStyledTextCtrl, getLastKeydownProcessed, 0}}, + {3408, {wxStyledTextCtrl, setLastKeydownProcessed, 1}}, + {3409, {wxStyledTextCtrl, saveFile, 1}}, + {3410, {wxStyledTextCtrl, loadFile, 1}}, + {3411, {wxStyledTextCtrl, doDragOver, 3}}, + {3412, {wxStyledTextCtrl, doDropText, 3}}, + {3413, {wxStyledTextCtrl, getUseAntiAliasing, 0}}, + {3414, {wxStyledTextCtrl, addTextRaw, 1}}, + {3415, {wxStyledTextCtrl, insertTextRaw, 2}}, + {3416, {wxStyledTextCtrl, getCurLineRaw, 1}}, + {3417, {wxStyledTextCtrl, getLineRaw, 1}}, + {3418, {wxStyledTextCtrl, getSelectedTextRaw, 0}}, + {3419, {wxStyledTextCtrl, getTextRangeRaw, 2}}, + {3420, {wxStyledTextCtrl, setTextRaw, 1}}, + {3421, {wxStyledTextCtrl, getTextRaw, 0}}, + {3422, {wxStyledTextCtrl, appendTextRaw, 1}}, + {3423, {wxArtProvider, getBitmap, 2}}, + {3424, {wxArtProvider, getIcon, 2}}, + {3425, {wxTreeEvent, getKeyCode, 0}}, + {3426, {wxTreeEvent, getItem, 0}}, + {3427, {wxTreeEvent, getKeyEvent, 0}}, + {3428, {wxTreeEvent, getLabel, 0}}, + {3429, {wxTreeEvent, getOldItem, 0}}, + {3430, {wxTreeEvent, getPoint, 0}}, + {3431, {wxTreeEvent, isEditCancelled, 0}}, + {3432, {wxTreeEvent, setToolTip, 1}}, + {3433, {wxNotebookEvent, getOldSelection, 0}}, + {3434, {wxNotebookEvent, getSelection, 0}}, + {3435, {wxNotebookEvent, setOldSelection, 1}}, + {3436, {wxNotebookEvent, setSelection, 1}}, + {3437, {wxFileDataObject, new, 0}}, + {3438, {wxFileDataObject, addFile, 1}}, + {3439, {wxFileDataObject, getFilenames, 0}}, + {3440, {wxFileDataObject, 'Destroy', undefined}}, + {3441, {wxTextDataObject, new, 1}}, + {3442, {wxTextDataObject, getTextLength, 0}}, + {3443, {wxTextDataObject, getText, 0}}, + {3444, {wxTextDataObject, setText, 1}}, + {3445, {wxTextDataObject, 'Destroy', undefined}}, + {3446, {wxBitmapDataObject, new_1_1, 1}}, + {3447, {wxBitmapDataObject, new_1_0, 1}}, + {3448, {wxBitmapDataObject, getBitmap, 0}}, + {3449, {wxBitmapDataObject, setBitmap, 1}}, + {3450, {wxBitmapDataObject, 'Destroy', undefined}}, + {3452, {wxClipboard, new, 0}}, + {3453, {wxClipboard, destruct, 0}}, + {3454, {wxClipboard, addData, 1}}, + {3455, {wxClipboard, clear, 0}}, + {3456, {wxClipboard, close, 0}}, + {3457, {wxClipboard, flush, 0}}, + {3458, {wxClipboard, getData, 1}}, + {3459, {wxClipboard, isOpened, 0}}, + {3460, {wxClipboard, open, 0}}, + {3461, {wxClipboard, setData, 1}}, + {3463, {wxClipboard, usePrimarySelection, 1}}, + {3464, {wxClipboard, isSupported, 1}}, + {3465, {wxClipboard, get, 0}}, + {3466, {wxSpinEvent, getPosition, 0}}, + {3467, {wxSpinEvent, setPosition, 1}}, + {3468, {wxSplitterWindow, new_0, 0}}, + {3469, {wxSplitterWindow, new_2, 2}}, + {3470, {wxSplitterWindow, destruct, 0}}, + {3471, {wxSplitterWindow, create, 2}}, + {3472, {wxSplitterWindow, getMinimumPaneSize, 0}}, + {3473, {wxSplitterWindow, getSashGravity, 0}}, + {3474, {wxSplitterWindow, getSashPosition, 0}}, + {3475, {wxSplitterWindow, getSplitMode, 0}}, + {3476, {wxSplitterWindow, getWindow1, 0}}, + {3477, {wxSplitterWindow, getWindow2, 0}}, + {3478, {wxSplitterWindow, initialize, 1}}, + {3479, {wxSplitterWindow, isSplit, 0}}, + {3480, {wxSplitterWindow, replaceWindow, 2}}, + {3481, {wxSplitterWindow, setSashGravity, 1}}, + {3482, {wxSplitterWindow, setSashPosition, 2}}, + {3483, {wxSplitterWindow, setSashSize, 1}}, + {3484, {wxSplitterWindow, setMinimumPaneSize, 1}}, + {3485, {wxSplitterWindow, setSplitMode, 1}}, + {3486, {wxSplitterWindow, splitHorizontally, 3}}, + {3487, {wxSplitterWindow, splitVertically, 3}}, + {3488, {wxSplitterWindow, unsplit, 1}}, + {3489, {wxSplitterWindow, updateSize, 0}}, + {3490, {wxSplitterEvent, getSashPosition, 0}}, + {3491, {wxSplitterEvent, getX, 0}}, + {3492, {wxSplitterEvent, getY, 0}}, + {3493, {wxSplitterEvent, getWindowBeingRemoved, 0}}, + {3494, {wxSplitterEvent, setSashPosition, 1}}, + {3495, {wxHtmlWindow, new_0, 0}}, + {3496, {wxHtmlWindow, new_2, 2}}, + {3497, {wxHtmlWindow, appendToPage, 1}}, + {3498, {wxHtmlWindow, getOpenedAnchor, 0}}, + {3499, {wxHtmlWindow, getOpenedPage, 0}}, + {3500, {wxHtmlWindow, getOpenedPageTitle, 0}}, + {3501, {wxHtmlWindow, getRelatedFrame, 0}}, + {3502, {wxHtmlWindow, historyBack, 0}}, + {3503, {wxHtmlWindow, historyCanBack, 0}}, + {3504, {wxHtmlWindow, historyCanForward, 0}}, + {3505, {wxHtmlWindow, historyClear, 0}}, + {3506, {wxHtmlWindow, historyForward, 0}}, + {3507, {wxHtmlWindow, loadFile, 1}}, + {3508, {wxHtmlWindow, loadPage, 1}}, + {3509, {wxHtmlWindow, selectAll, 0}}, + {3510, {wxHtmlWindow, selectionToText, 0}}, + {3511, {wxHtmlWindow, selectLine, 1}}, + {3512, {wxHtmlWindow, selectWord, 1}}, + {3513, {wxHtmlWindow, setBorders, 1}}, + {3514, {wxHtmlWindow, setFonts, 3}}, + {3515, {wxHtmlWindow, setPage, 1}}, + {3516, {wxHtmlWindow, setRelatedFrame, 2}}, + {3517, {wxHtmlWindow, setRelatedStatusBar, 1}}, + {3518, {wxHtmlWindow, toText, 0}}, + {3519, {wxHtmlWindow, 'Destroy', undefined}}, + {3520, {wxHtmlLinkEvent, getLinkInfo, 0}}, + {3521, {wxSystemSettings, getColour, 1}}, + {3522, {wxSystemSettings, getFont, 1}}, + {3523, {wxSystemSettings, getMetric, 2}}, + {3524, {wxSystemSettings, getScreenType, 0}}, + {3525, {wxSystemOptions, getOption, 1}}, + {3526, {wxSystemOptions, getOptionInt, 1}}, + {3527, {wxSystemOptions, hasOption, 1}}, + {3528, {wxSystemOptions, isFalse, 1}}, + {3529, {wxSystemOptions, setOption_2_1, 2}}, + {3530, {wxSystemOptions, setOption_2_0, 2}}, + {3531, {wxAuiNotebookEvent, setSelection, 1}}, + {3532, {wxAuiNotebookEvent, getSelection, 0}}, + {3533, {wxAuiNotebookEvent, setOldSelection, 1}}, + {3534, {wxAuiNotebookEvent, getOldSelection, 0}}, + {3535, {wxAuiNotebookEvent, setDragSource, 1}}, + {3536, {wxAuiNotebookEvent, getDragSource, 0}}, + {3537, {wxAuiManagerEvent, setManager, 1}}, + {3538, {wxAuiManagerEvent, getManager, 0}}, + {3539, {wxAuiManagerEvent, setPane, 1}}, + {3540, {wxAuiManagerEvent, getPane, 0}}, + {3541, {wxAuiManagerEvent, setButton, 1}}, + {3542, {wxAuiManagerEvent, getButton, 0}}, + {3543, {wxAuiManagerEvent, setDC, 1}}, + {3544, {wxAuiManagerEvent, getDC, 0}}, + {3545, {wxAuiManagerEvent, veto, 1}}, + {3546, {wxAuiManagerEvent, getVeto, 0}}, + {3547, {wxAuiManagerEvent, setCanVeto, 1}}, + {3548, {wxAuiManagerEvent, canVeto, 0}}, + {3549, {wxLogNull, new, 0}}, + {3550, {wxLogNull, 'Destroy', undefined}}, + {3551, {wxTaskBarIcon, new, 0}}, + {3552, {wxTaskBarIcon, destruct, 0}}, + {3553, {wxTaskBarIcon, popupMenu, 1}}, + {3554, {wxTaskBarIcon, removeIcon, 0}}, + {3555, {wxTaskBarIcon, setIcon, 2}}, + {3556, {wxLocale, new_0, 0}}, + {3558, {wxLocale, new_2, 2}}, + {3559, {wxLocale, destruct, 0}}, + {3561, {wxLocale, init, 1}}, + {3562, {wxLocale, addCatalog_1, 1}}, + {3563, {wxLocale, addCatalog_3, 3}}, + {3564, {wxLocale, addCatalogLookupPathPrefix, 1}}, + {3565, {wxLocale, getCanonicalName, 0}}, + {3566, {wxLocale, getLanguage, 0}}, + {3567, {wxLocale, getLanguageName, 1}}, + {3568, {wxLocale, getLocale, 0}}, + {3569, {wxLocale, getName, 0}}, + {3570, {wxLocale, getString_2, 2}}, + {3571, {wxLocale, getString_4, 4}}, + {3572, {wxLocale, getHeaderValue, 2}}, + {3573, {wxLocale, getSysName, 0}}, + {3574, {wxLocale, getSystemEncoding, 0}}, + {3575, {wxLocale, getSystemEncodingName, 0}}, + {3576, {wxLocale, getSystemLanguage, 0}}, + {3577, {wxLocale, isLoaded, 1}}, + {3578, {wxLocale, isOk, 0}}, + {3579, {wxActivateEvent, getActive, 0}}, + {3581, {wxPopupWindow, new_2, 2}}, + {3582, {wxPopupWindow, new_0, 0}}, + {3584, {wxPopupWindow, destruct, 0}}, + {3585, {wxPopupWindow, create, 2}}, + {3586, {wxPopupWindow, position, 2}}, + {3587, {wxPopupTransientWindow, new_0, 0}}, + {3588, {wxPopupTransientWindow, new_2, 2}}, + {3589, {wxPopupTransientWindow, destruct, 0}}, + {3590, {wxPopupTransientWindow, popup, 1}}, + {3591, {wxPopupTransientWindow, dismiss, 0}}, + {3592, {wxOverlay, new, 0}}, + {3593, {wxOverlay, destruct, 0}}, + {3594, {wxOverlay, reset, 0}}, + {3595, {wxDCOverlay, new_6, 6}}, + {3596, {wxDCOverlay, new_2, 2}}, + {3597, {wxDCOverlay, destruct, 0}}, + {3598, {wxDCOverlay, clear, 0}}, {-1, {mod, func, -1}} ]. diff --git a/lib/wx/src/gen/wxe_funcs.hrl b/lib/wx/src/gen/wxe_funcs.hrl index 35688f3869..f5f839ac67 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-2015. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -189,3183 +189,3187 @@ -define(wxWindow_UpdateWindowUI, 281). -define(wxWindow_Validate, 282). -define(wxWindow_WarpPointer, 283). --define(wxTopLevelWindow_GetIcon, 284). --define(wxTopLevelWindow_GetIcons, 285). --define(wxTopLevelWindow_GetTitle, 286). --define(wxTopLevelWindow_IsActive, 287). --define(wxTopLevelWindow_Iconize, 288). --define(wxTopLevelWindow_IsFullScreen, 289). --define(wxTopLevelWindow_IsIconized, 290). --define(wxTopLevelWindow_IsMaximized, 291). --define(wxTopLevelWindow_Maximize, 292). --define(wxTopLevelWindow_RequestUserAttention, 293). --define(wxTopLevelWindow_SetIcon, 294). --define(wxTopLevelWindow_SetIcons, 295). --define(wxTopLevelWindow_CenterOnScreen, 296). --define(wxTopLevelWindow_CentreOnScreen, 297). --define(wxTopLevelWindow_SetShape, 299). --define(wxTopLevelWindow_SetTitle, 300). --define(wxTopLevelWindow_ShowFullScreen, 301). --define(wxFrame_new_4, 303). --define(wxFrame_new_0, 304). --define(wxFrame_destruct, 306). --define(wxFrame_Create, 307). --define(wxFrame_CreateStatusBar, 308). --define(wxFrame_CreateToolBar, 309). --define(wxFrame_GetClientAreaOrigin, 310). --define(wxFrame_GetMenuBar, 311). --define(wxFrame_GetStatusBar, 312). --define(wxFrame_GetStatusBarPane, 313). --define(wxFrame_GetToolBar, 314). --define(wxFrame_ProcessCommand, 315). --define(wxFrame_SendSizeEvent, 316). --define(wxFrame_SetMenuBar, 317). --define(wxFrame_SetStatusBar, 318). --define(wxFrame_SetStatusBarPane, 319). --define(wxFrame_SetStatusText, 320). --define(wxFrame_SetStatusWidths, 321). --define(wxFrame_SetToolBar, 322). --define(wxMiniFrame_new_0, 323). --define(wxMiniFrame_new_4, 324). --define(wxMiniFrame_Create, 325). --define(wxMiniFrame_destroy, 326). --define(wxSplashScreen_new_0, 327). --define(wxSplashScreen_new_6, 328). --define(wxSplashScreen_destruct, 329). --define(wxSplashScreen_GetSplashStyle, 330). --define(wxSplashScreen_GetTimeout, 331). --define(wxPanel_new_0, 332). --define(wxPanel_new_6, 333). --define(wxPanel_new_2, 334). --define(wxPanel_destruct, 335). --define(wxPanel_InitDialog, 336). --define(wxPanel_SetFocusIgnoringChildren, 337). --define(wxScrolledWindow_new_0, 338). --define(wxScrolledWindow_new_2, 339). --define(wxScrolledWindow_destruct, 340). --define(wxScrolledWindow_CalcScrolledPosition_4, 341). --define(wxScrolledWindow_CalcScrolledPosition_1, 342). --define(wxScrolledWindow_CalcUnscrolledPosition_4, 343). --define(wxScrolledWindow_CalcUnscrolledPosition_1, 344). --define(wxScrolledWindow_EnableScrolling, 345). --define(wxScrolledWindow_GetScrollPixelsPerUnit, 346). --define(wxScrolledWindow_GetViewStart, 347). --define(wxScrolledWindow_DoPrepareDC, 348). --define(wxScrolledWindow_PrepareDC, 349). --define(wxScrolledWindow_Scroll, 350). --define(wxScrolledWindow_SetScrollbars, 351). --define(wxScrolledWindow_SetScrollRate, 352). --define(wxScrolledWindow_SetTargetWindow, 353). --define(wxSashWindow_new_0, 354). --define(wxSashWindow_new_2, 355). --define(wxSashWindow_destruct, 356). --define(wxSashWindow_GetSashVisible, 357). --define(wxSashWindow_GetMaximumSizeX, 358). --define(wxSashWindow_GetMaximumSizeY, 359). --define(wxSashWindow_GetMinimumSizeX, 360). --define(wxSashWindow_GetMinimumSizeY, 361). --define(wxSashWindow_SetMaximumSizeX, 362). --define(wxSashWindow_SetMaximumSizeY, 363). --define(wxSashWindow_SetMinimumSizeX, 364). --define(wxSashWindow_SetMinimumSizeY, 365). --define(wxSashWindow_SetSashVisible, 366). --define(wxSashLayoutWindow_new_0, 367). --define(wxSashLayoutWindow_new_2, 368). --define(wxSashLayoutWindow_Create, 369). --define(wxSashLayoutWindow_GetAlignment, 370). --define(wxSashLayoutWindow_GetOrientation, 371). --define(wxSashLayoutWindow_SetAlignment, 372). --define(wxSashLayoutWindow_SetDefaultSize, 373). --define(wxSashLayoutWindow_SetOrientation, 374). --define(wxSashLayoutWindow_destroy, 375). --define(wxGrid_new_0, 376). --define(wxGrid_new_3, 377). --define(wxGrid_new_4, 378). --define(wxGrid_destruct, 379). --define(wxGrid_AppendCols, 380). --define(wxGrid_AppendRows, 381). --define(wxGrid_AutoSize, 382). --define(wxGrid_AutoSizeColumn, 383). --define(wxGrid_AutoSizeColumns, 384). --define(wxGrid_AutoSizeRow, 385). --define(wxGrid_AutoSizeRows, 386). --define(wxGrid_BeginBatch, 387). --define(wxGrid_BlockToDeviceRect, 388). --define(wxGrid_CanDragColSize, 389). --define(wxGrid_CanDragRowSize, 390). --define(wxGrid_CanDragGridSize, 391). --define(wxGrid_CanEnableCellControl, 392). --define(wxGrid_CellToRect_2, 393). --define(wxGrid_CellToRect_1, 394). --define(wxGrid_ClearGrid, 395). --define(wxGrid_ClearSelection, 396). --define(wxGrid_CreateGrid, 397). --define(wxGrid_DeleteCols, 398). --define(wxGrid_DeleteRows, 399). --define(wxGrid_DisableCellEditControl, 400). --define(wxGrid_DisableDragColSize, 401). --define(wxGrid_DisableDragGridSize, 402). --define(wxGrid_DisableDragRowSize, 403). --define(wxGrid_EnableCellEditControl, 404). --define(wxGrid_EnableDragColSize, 405). --define(wxGrid_EnableDragGridSize, 406). --define(wxGrid_EnableDragRowSize, 407). --define(wxGrid_EnableEditing, 408). --define(wxGrid_EnableGridLines, 409). --define(wxGrid_EndBatch, 410). --define(wxGrid_Fit, 411). --define(wxGrid_ForceRefresh, 412). --define(wxGrid_GetBatchCount, 413). --define(wxGrid_GetCellAlignment, 414). --define(wxGrid_GetCellBackgroundColour, 415). --define(wxGrid_GetCellEditor, 416). --define(wxGrid_GetCellFont, 417). --define(wxGrid_GetCellRenderer, 418). --define(wxGrid_GetCellTextColour, 419). --define(wxGrid_GetCellValue_2, 420). --define(wxGrid_GetCellValue_1, 421). --define(wxGrid_GetColLabelAlignment, 422). --define(wxGrid_GetColLabelSize, 423). --define(wxGrid_GetColLabelValue, 424). --define(wxGrid_GetColMinimalAcceptableWidth, 425). --define(wxGrid_GetDefaultCellAlignment, 426). --define(wxGrid_GetDefaultCellBackgroundColour, 427). --define(wxGrid_GetDefaultCellFont, 428). --define(wxGrid_GetDefaultCellTextColour, 429). --define(wxGrid_GetDefaultColLabelSize, 430). --define(wxGrid_GetDefaultColSize, 431). --define(wxGrid_GetDefaultEditor, 432). --define(wxGrid_GetDefaultEditorForCell_2, 433). --define(wxGrid_GetDefaultEditorForCell_1, 434). --define(wxGrid_GetDefaultEditorForType, 435). --define(wxGrid_GetDefaultRenderer, 436). --define(wxGrid_GetDefaultRendererForCell, 437). --define(wxGrid_GetDefaultRendererForType, 438). --define(wxGrid_GetDefaultRowLabelSize, 439). --define(wxGrid_GetDefaultRowSize, 440). --define(wxGrid_GetGridCursorCol, 441). --define(wxGrid_GetGridCursorRow, 442). --define(wxGrid_GetGridLineColour, 443). --define(wxGrid_GridLinesEnabled, 444). --define(wxGrid_GetLabelBackgroundColour, 445). --define(wxGrid_GetLabelFont, 446). --define(wxGrid_GetLabelTextColour, 447). --define(wxGrid_GetNumberCols, 448). --define(wxGrid_GetNumberRows, 449). --define(wxGrid_GetOrCreateCellAttr, 450). --define(wxGrid_GetRowMinimalAcceptableHeight, 451). --define(wxGrid_GetRowLabelAlignment, 452). --define(wxGrid_GetRowLabelSize, 453). --define(wxGrid_GetRowLabelValue, 454). --define(wxGrid_GetRowSize, 455). --define(wxGrid_GetScrollLineX, 456). --define(wxGrid_GetScrollLineY, 457). --define(wxGrid_GetSelectedCells, 458). --define(wxGrid_GetSelectedCols, 459). --define(wxGrid_GetSelectedRows, 460). --define(wxGrid_GetSelectionBackground, 461). --define(wxGrid_GetSelectionBlockTopLeft, 462). --define(wxGrid_GetSelectionBlockBottomRight, 463). --define(wxGrid_GetSelectionForeground, 464). --define(wxGrid_GetViewWidth, 465). --define(wxGrid_GetGridWindow, 466). --define(wxGrid_GetGridRowLabelWindow, 467). --define(wxGrid_GetGridColLabelWindow, 468). --define(wxGrid_GetGridCornerLabelWindow, 469). --define(wxGrid_HideCellEditControl, 470). --define(wxGrid_InsertCols, 471). --define(wxGrid_InsertRows, 472). --define(wxGrid_IsCellEditControlEnabled, 473). --define(wxGrid_IsCurrentCellReadOnly, 474). --define(wxGrid_IsEditable, 475). --define(wxGrid_IsInSelection_2, 476). --define(wxGrid_IsInSelection_1, 477). --define(wxGrid_IsReadOnly, 478). --define(wxGrid_IsSelection, 479). --define(wxGrid_IsVisible_3, 480). --define(wxGrid_IsVisible_2, 481). --define(wxGrid_MakeCellVisible_2, 482). --define(wxGrid_MakeCellVisible_1, 483). --define(wxGrid_MoveCursorDown, 484). --define(wxGrid_MoveCursorLeft, 485). --define(wxGrid_MoveCursorRight, 486). --define(wxGrid_MoveCursorUp, 487). --define(wxGrid_MoveCursorDownBlock, 488). --define(wxGrid_MoveCursorLeftBlock, 489). --define(wxGrid_MoveCursorRightBlock, 490). --define(wxGrid_MoveCursorUpBlock, 491). --define(wxGrid_MovePageDown, 492). --define(wxGrid_MovePageUp, 493). --define(wxGrid_RegisterDataType, 494). --define(wxGrid_SaveEditControlValue, 495). --define(wxGrid_SelectAll, 496). --define(wxGrid_SelectBlock_5, 497). --define(wxGrid_SelectBlock_3, 498). --define(wxGrid_SelectCol, 499). --define(wxGrid_SelectRow, 500). --define(wxGrid_SetCellAlignment_4, 501). --define(wxGrid_SetCellAlignment_3, 502). --define(wxGrid_SetCellAlignment_1, 503). --define(wxGrid_SetCellBackgroundColour_3_0, 504). --define(wxGrid_SetCellBackgroundColour_1, 505). --define(wxGrid_SetCellBackgroundColour_3_1, 506). --define(wxGrid_SetCellEditor, 507). --define(wxGrid_SetCellFont, 508). --define(wxGrid_SetCellRenderer, 509). --define(wxGrid_SetCellTextColour_3_0, 510). --define(wxGrid_SetCellTextColour_3_1, 511). --define(wxGrid_SetCellTextColour_1, 512). --define(wxGrid_SetCellValue_3_0, 513). --define(wxGrid_SetCellValue_2, 514). --define(wxGrid_SetCellValue_3_1, 515). --define(wxGrid_SetColAttr, 516). --define(wxGrid_SetColFormatBool, 517). --define(wxGrid_SetColFormatNumber, 518). --define(wxGrid_SetColFormatFloat, 519). --define(wxGrid_SetColFormatCustom, 520). --define(wxGrid_SetColLabelAlignment, 521). --define(wxGrid_SetColLabelSize, 522). --define(wxGrid_SetColLabelValue, 523). --define(wxGrid_SetColMinimalWidth, 524). --define(wxGrid_SetColMinimalAcceptableWidth, 525). --define(wxGrid_SetColSize, 526). --define(wxGrid_SetDefaultCellAlignment, 527). --define(wxGrid_SetDefaultCellBackgroundColour, 528). --define(wxGrid_SetDefaultCellFont, 529). --define(wxGrid_SetDefaultCellTextColour, 530). --define(wxGrid_SetDefaultEditor, 531). --define(wxGrid_SetDefaultRenderer, 532). --define(wxGrid_SetDefaultColSize, 533). --define(wxGrid_SetDefaultRowSize, 534). --define(wxGrid_SetGridCursor, 535). --define(wxGrid_SetGridLineColour, 536). --define(wxGrid_SetLabelBackgroundColour, 537). --define(wxGrid_SetLabelFont, 538). --define(wxGrid_SetLabelTextColour, 539). --define(wxGrid_SetMargins, 540). --define(wxGrid_SetReadOnly, 541). --define(wxGrid_SetRowAttr, 542). --define(wxGrid_SetRowLabelAlignment, 543). --define(wxGrid_SetRowLabelSize, 544). --define(wxGrid_SetRowLabelValue, 545). --define(wxGrid_SetRowMinimalHeight, 546). --define(wxGrid_SetRowMinimalAcceptableHeight, 547). --define(wxGrid_SetRowSize, 548). --define(wxGrid_SetScrollLineX, 549). --define(wxGrid_SetScrollLineY, 550). --define(wxGrid_SetSelectionBackground, 551). --define(wxGrid_SetSelectionForeground, 552). --define(wxGrid_SetSelectionMode, 553). --define(wxGrid_ShowCellEditControl, 554). --define(wxGrid_XToCol, 555). --define(wxGrid_XToEdgeOfCol, 556). --define(wxGrid_YToEdgeOfRow, 557). --define(wxGrid_YToRow, 558). --define(wxGridCellRenderer_Draw, 559). --define(wxGridCellRenderer_GetBestSize, 560). --define(wxGridCellEditor_Create, 561). --define(wxGridCellEditor_IsCreated, 562). --define(wxGridCellEditor_SetSize, 563). --define(wxGridCellEditor_Show, 564). --define(wxGridCellEditor_PaintBackground, 565). --define(wxGridCellEditor_BeginEdit, 566). --define(wxGridCellEditor_EndEdit, 567). --define(wxGridCellEditor_Reset, 568). --define(wxGridCellEditor_StartingKey, 569). --define(wxGridCellEditor_StartingClick, 570). --define(wxGridCellEditor_HandleReturn, 571). --define(wxGridCellBoolRenderer_new, 572). --define(wxGridCellBoolRenderer_destroy, 573). --define(wxGridCellBoolEditor_new, 574). --define(wxGridCellBoolEditor_IsTrueValue, 575). --define(wxGridCellBoolEditor_UseStringValues, 576). --define(wxGridCellBoolEditor_destroy, 577). --define(wxGridCellFloatRenderer_new, 578). --define(wxGridCellFloatRenderer_GetPrecision, 579). --define(wxGridCellFloatRenderer_GetWidth, 580). --define(wxGridCellFloatRenderer_SetParameters, 581). --define(wxGridCellFloatRenderer_SetPrecision, 582). --define(wxGridCellFloatRenderer_SetWidth, 583). --define(wxGridCellFloatRenderer_destroy, 584). --define(wxGridCellFloatEditor_new, 585). --define(wxGridCellFloatEditor_SetParameters, 586). --define(wxGridCellFloatEditor_destroy, 587). --define(wxGridCellStringRenderer_new, 588). --define(wxGridCellStringRenderer_destroy, 589). --define(wxGridCellTextEditor_new, 590). --define(wxGridCellTextEditor_SetParameters, 591). --define(wxGridCellTextEditor_destroy, 592). --define(wxGridCellChoiceEditor_new, 594). --define(wxGridCellChoiceEditor_SetParameters, 595). --define(wxGridCellChoiceEditor_destroy, 596). --define(wxGridCellNumberRenderer_new, 597). --define(wxGridCellNumberRenderer_destroy, 598). --define(wxGridCellNumberEditor_new, 599). --define(wxGridCellNumberEditor_GetValue, 600). --define(wxGridCellNumberEditor_SetParameters, 601). --define(wxGridCellNumberEditor_destroy, 602). --define(wxGridCellAttr_SetTextColour, 603). --define(wxGridCellAttr_SetBackgroundColour, 604). --define(wxGridCellAttr_SetFont, 605). --define(wxGridCellAttr_SetAlignment, 606). --define(wxGridCellAttr_SetReadOnly, 607). --define(wxGridCellAttr_SetRenderer, 608). --define(wxGridCellAttr_SetEditor, 609). --define(wxGridCellAttr_HasTextColour, 610). --define(wxGridCellAttr_HasBackgroundColour, 611). --define(wxGridCellAttr_HasFont, 612). --define(wxGridCellAttr_HasAlignment, 613). --define(wxGridCellAttr_HasRenderer, 614). --define(wxGridCellAttr_HasEditor, 615). --define(wxGridCellAttr_GetTextColour, 616). --define(wxGridCellAttr_GetBackgroundColour, 617). --define(wxGridCellAttr_GetFont, 618). --define(wxGridCellAttr_GetAlignment, 619). --define(wxGridCellAttr_GetRenderer, 620). --define(wxGridCellAttr_GetEditor, 621). --define(wxGridCellAttr_IsReadOnly, 622). --define(wxGridCellAttr_SetDefAttr, 623). --define(wxDC_Blit, 624). --define(wxDC_CalcBoundingBox, 625). --define(wxDC_Clear, 626). --define(wxDC_ComputeScaleAndOrigin, 627). --define(wxDC_CrossHair, 628). --define(wxDC_DestroyClippingRegion, 629). --define(wxDC_DeviceToLogicalX, 630). --define(wxDC_DeviceToLogicalXRel, 631). --define(wxDC_DeviceToLogicalY, 632). --define(wxDC_DeviceToLogicalYRel, 633). --define(wxDC_DrawArc, 634). --define(wxDC_DrawBitmap, 635). --define(wxDC_DrawCheckMark, 636). --define(wxDC_DrawCircle, 637). --define(wxDC_DrawEllipse_2, 639). --define(wxDC_DrawEllipse_1, 640). --define(wxDC_DrawEllipticArc, 641). --define(wxDC_DrawIcon, 642). --define(wxDC_DrawLabel, 643). --define(wxDC_DrawLine, 644). --define(wxDC_DrawLines, 645). --define(wxDC_DrawPolygon, 647). --define(wxDC_DrawPoint, 649). --define(wxDC_DrawRectangle_2, 651). --define(wxDC_DrawRectangle_1, 652). --define(wxDC_DrawRotatedText, 653). --define(wxDC_DrawRoundedRectangle_3, 655). --define(wxDC_DrawRoundedRectangle_2, 656). --define(wxDC_DrawText, 657). --define(wxDC_EndDoc, 658). --define(wxDC_EndPage, 659). --define(wxDC_FloodFill, 660). --define(wxDC_GetBackground, 661). --define(wxDC_GetBackgroundMode, 662). --define(wxDC_GetBrush, 663). --define(wxDC_GetCharHeight, 664). --define(wxDC_GetCharWidth, 665). --define(wxDC_GetClippingBox, 666). --define(wxDC_GetFont, 668). --define(wxDC_GetLayoutDirection, 669). --define(wxDC_GetLogicalFunction, 670). --define(wxDC_GetMapMode, 671). --define(wxDC_GetMultiLineTextExtent_4, 672). --define(wxDC_GetMultiLineTextExtent_1, 673). --define(wxDC_GetPartialTextExtents, 674). --define(wxDC_GetPen, 675). --define(wxDC_GetPixel, 676). --define(wxDC_GetPPI, 677). --define(wxDC_GetSize, 679). --define(wxDC_GetSizeMM, 681). --define(wxDC_GetTextBackground, 682). --define(wxDC_GetTextExtent_4, 683). --define(wxDC_GetTextExtent_1, 684). --define(wxDC_GetTextForeground, 686). --define(wxDC_GetUserScale, 687). --define(wxDC_GradientFillConcentric_3, 688). --define(wxDC_GradientFillConcentric_4, 689). --define(wxDC_GradientFillLinear, 690). --define(wxDC_LogicalToDeviceX, 691). --define(wxDC_LogicalToDeviceXRel, 692). --define(wxDC_LogicalToDeviceY, 693). --define(wxDC_LogicalToDeviceYRel, 694). --define(wxDC_MaxX, 695). --define(wxDC_MaxY, 696). --define(wxDC_MinX, 697). --define(wxDC_MinY, 698). --define(wxDC_IsOk, 699). --define(wxDC_ResetBoundingBox, 700). --define(wxDC_SetAxisOrientation, 701). --define(wxDC_SetBackground, 702). --define(wxDC_SetBackgroundMode, 703). --define(wxDC_SetBrush, 704). --define(wxDC_SetClippingRegion_2, 706). --define(wxDC_SetClippingRegion_1_1, 707). --define(wxDC_SetClippingRegion_1_0, 708). --define(wxDC_SetDeviceOrigin, 709). --define(wxDC_SetFont, 710). --define(wxDC_SetLayoutDirection, 711). --define(wxDC_SetLogicalFunction, 712). --define(wxDC_SetMapMode, 713). --define(wxDC_SetPalette, 714). --define(wxDC_SetPen, 715). --define(wxDC_SetTextBackground, 716). --define(wxDC_SetTextForeground, 717). --define(wxDC_SetUserScale, 718). --define(wxDC_StartDoc, 719). --define(wxDC_StartPage, 720). --define(wxMirrorDC_new, 721). --define(wxMirrorDC_destroy, 722). --define(wxScreenDC_new, 723). --define(wxScreenDC_destruct, 724). --define(wxPostScriptDC_new_0, 725). --define(wxPostScriptDC_new_1, 726). --define(wxPostScriptDC_destruct, 727). --define(wxPostScriptDC_SetResolution, 728). --define(wxPostScriptDC_GetResolution, 729). --define(wxWindowDC_new_0, 730). --define(wxWindowDC_new_1, 731). --define(wxWindowDC_destruct, 732). --define(wxClientDC_new_0, 733). --define(wxClientDC_new_1, 734). --define(wxClientDC_destroy, 735). --define(wxPaintDC_new_0, 736). --define(wxPaintDC_new_1, 737). --define(wxPaintDC_destroy, 738). --define(wxMemoryDC_new_1_0, 740). --define(wxMemoryDC_new_1_1, 741). --define(wxMemoryDC_new_0, 742). --define(wxMemoryDC_destruct, 744). --define(wxMemoryDC_SelectObject, 745). --define(wxMemoryDC_SelectObjectAsSource, 746). --define(wxBufferedDC_new_0, 747). --define(wxBufferedDC_new_2, 748). --define(wxBufferedDC_new_3, 749). --define(wxBufferedDC_destruct, 750). --define(wxBufferedDC_Init_2, 751). --define(wxBufferedDC_Init_3, 752). --define(wxBufferedPaintDC_new_3, 753). --define(wxBufferedPaintDC_new_2, 754). --define(wxBufferedPaintDC_destruct, 755). --define(wxGraphicsObject_destruct, 756). --define(wxGraphicsObject_GetRenderer, 757). --define(wxGraphicsObject_IsNull, 758). --define(wxGraphicsContext_destruct, 759). --define(wxGraphicsContext_Create_1_1, 760). --define(wxGraphicsContext_Create_1_0, 761). --define(wxGraphicsContext_Create_0, 762). --define(wxGraphicsContext_CreatePen, 763). --define(wxGraphicsContext_CreateBrush, 764). --define(wxGraphicsContext_CreateRadialGradientBrush, 765). --define(wxGraphicsContext_CreateLinearGradientBrush, 766). --define(wxGraphicsContext_CreateFont, 767). --define(wxGraphicsContext_CreateMatrix, 768). --define(wxGraphicsContext_CreatePath, 769). --define(wxGraphicsContext_Clip_1, 770). --define(wxGraphicsContext_Clip_4, 771). --define(wxGraphicsContext_ResetClip, 772). --define(wxGraphicsContext_DrawBitmap, 773). --define(wxGraphicsContext_DrawEllipse, 774). --define(wxGraphicsContext_DrawIcon, 775). --define(wxGraphicsContext_DrawLines, 776). --define(wxGraphicsContext_DrawPath, 777). --define(wxGraphicsContext_DrawRectangle, 778). --define(wxGraphicsContext_DrawRoundedRectangle, 779). --define(wxGraphicsContext_DrawText_3, 780). --define(wxGraphicsContext_DrawText_4_0, 781). --define(wxGraphicsContext_DrawText_4_1, 782). --define(wxGraphicsContext_DrawText_5, 783). --define(wxGraphicsContext_FillPath, 784). --define(wxGraphicsContext_StrokePath, 785). --define(wxGraphicsContext_GetPartialTextExtents, 786). --define(wxGraphicsContext_GetTextExtent, 787). --define(wxGraphicsContext_Rotate, 788). --define(wxGraphicsContext_Scale, 789). --define(wxGraphicsContext_Translate, 790). --define(wxGraphicsContext_GetTransform, 791). --define(wxGraphicsContext_SetTransform, 792). --define(wxGraphicsContext_ConcatTransform, 793). --define(wxGraphicsContext_SetBrush_1_1, 794). --define(wxGraphicsContext_SetBrush_1_0, 795). --define(wxGraphicsContext_SetFont_1, 796). --define(wxGraphicsContext_SetFont_2, 797). --define(wxGraphicsContext_SetPen_1_0, 798). --define(wxGraphicsContext_SetPen_1_1, 799). --define(wxGraphicsContext_StrokeLine, 800). --define(wxGraphicsContext_StrokeLines, 801). --define(wxGraphicsMatrix_Concat, 803). --define(wxGraphicsMatrix_Get, 805). --define(wxGraphicsMatrix_Invert, 806). --define(wxGraphicsMatrix_IsEqual, 807). --define(wxGraphicsMatrix_IsIdentity, 809). --define(wxGraphicsMatrix_Rotate, 810). --define(wxGraphicsMatrix_Scale, 811). --define(wxGraphicsMatrix_Translate, 812). --define(wxGraphicsMatrix_Set, 813). --define(wxGraphicsMatrix_TransformPoint, 814). --define(wxGraphicsMatrix_TransformDistance, 815). --define(wxGraphicsPath_MoveToPoint_2, 816). --define(wxGraphicsPath_MoveToPoint_1, 817). --define(wxGraphicsPath_AddArc_6, 818). --define(wxGraphicsPath_AddArc_5, 819). --define(wxGraphicsPath_AddArcToPoint, 820). --define(wxGraphicsPath_AddCircle, 821). --define(wxGraphicsPath_AddCurveToPoint_6, 822). --define(wxGraphicsPath_AddCurveToPoint_3, 823). --define(wxGraphicsPath_AddEllipse, 824). --define(wxGraphicsPath_AddLineToPoint_2, 825). --define(wxGraphicsPath_AddLineToPoint_1, 826). --define(wxGraphicsPath_AddPath, 827). --define(wxGraphicsPath_AddQuadCurveToPoint, 828). --define(wxGraphicsPath_AddRectangle, 829). --define(wxGraphicsPath_AddRoundedRectangle, 830). --define(wxGraphicsPath_CloseSubpath, 831). --define(wxGraphicsPath_Contains_3, 832). --define(wxGraphicsPath_Contains_2, 833). --define(wxGraphicsPath_GetBox, 835). --define(wxGraphicsPath_GetCurrentPoint, 837). --define(wxGraphicsPath_Transform, 838). --define(wxGraphicsRenderer_GetDefaultRenderer, 839). --define(wxGraphicsRenderer_CreateContext_1_1, 840). --define(wxGraphicsRenderer_CreateContext_1_0, 841). --define(wxGraphicsRenderer_CreatePen, 842). --define(wxGraphicsRenderer_CreateBrush, 843). --define(wxGraphicsRenderer_CreateLinearGradientBrush, 844). --define(wxGraphicsRenderer_CreateRadialGradientBrush, 845). --define(wxGraphicsRenderer_CreateFont, 846). --define(wxGraphicsRenderer_CreateMatrix, 847). --define(wxGraphicsRenderer_CreatePath, 848). --define(wxMenuBar_new_1, 850). --define(wxMenuBar_new_0, 852). --define(wxMenuBar_destruct, 854). --define(wxMenuBar_Append, 855). --define(wxMenuBar_Check, 856). --define(wxMenuBar_Enable_2, 857). --define(wxMenuBar_Enable_1, 858). --define(wxMenuBar_EnableTop, 859). --define(wxMenuBar_FindMenu, 860). --define(wxMenuBar_FindMenuItem, 861). --define(wxMenuBar_FindItem, 862). --define(wxMenuBar_GetHelpString, 863). --define(wxMenuBar_GetLabel_1, 864). --define(wxMenuBar_GetLabel_0, 865). --define(wxMenuBar_GetLabelTop, 866). --define(wxMenuBar_GetMenu, 867). --define(wxMenuBar_GetMenuCount, 868). --define(wxMenuBar_Insert, 869). --define(wxMenuBar_IsChecked, 870). --define(wxMenuBar_IsEnabled_1, 871). --define(wxMenuBar_IsEnabled_0, 872). --define(wxMenuBar_Remove, 873). --define(wxMenuBar_Replace, 874). --define(wxMenuBar_SetHelpString, 875). --define(wxMenuBar_SetLabel_2, 876). --define(wxMenuBar_SetLabel_1, 877). --define(wxMenuBar_SetLabelTop, 878). --define(wxControl_GetLabel, 879). --define(wxControl_SetLabel, 880). --define(wxControlWithItems_Append_1, 881). --define(wxControlWithItems_Append_2, 882). --define(wxControlWithItems_appendStrings_1, 883). --define(wxControlWithItems_Clear, 884). --define(wxControlWithItems_Delete, 885). --define(wxControlWithItems_FindString, 886). --define(wxControlWithItems_getClientData, 887). --define(wxControlWithItems_setClientData, 888). --define(wxControlWithItems_GetCount, 889). --define(wxControlWithItems_GetSelection, 890). --define(wxControlWithItems_GetString, 891). --define(wxControlWithItems_GetStringSelection, 892). --define(wxControlWithItems_Insert_2, 893). --define(wxControlWithItems_Insert_3, 894). --define(wxControlWithItems_IsEmpty, 895). --define(wxControlWithItems_Select, 896). --define(wxControlWithItems_SetSelection, 897). --define(wxControlWithItems_SetString, 898). --define(wxControlWithItems_SetStringSelection, 899). --define(wxMenu_new_2, 902). --define(wxMenu_new_1, 903). --define(wxMenu_destruct, 905). --define(wxMenu_Append_3, 906). --define(wxMenu_Append_1, 907). --define(wxMenu_Append_4_0, 908). --define(wxMenu_Append_4_1, 909). --define(wxMenu_AppendCheckItem, 910). --define(wxMenu_AppendRadioItem, 911). --define(wxMenu_AppendSeparator, 912). --define(wxMenu_Break, 913). --define(wxMenu_Check, 914). --define(wxMenu_Delete_1_0, 915). --define(wxMenu_Delete_1_1, 916). --define(wxMenu_Destroy_1_0, 917). --define(wxMenu_Destroy_1_1, 918). --define(wxMenu_Enable, 919). --define(wxMenu_FindItem_1, 920). --define(wxMenu_FindItem_2, 921). --define(wxMenu_FindItemByPosition, 922). --define(wxMenu_GetHelpString, 923). --define(wxMenu_GetLabel, 924). --define(wxMenu_GetMenuItemCount, 925). --define(wxMenu_GetMenuItems, 926). --define(wxMenu_GetTitle, 928). --define(wxMenu_Insert_2, 929). --define(wxMenu_Insert_3, 930). --define(wxMenu_Insert_5_1, 931). --define(wxMenu_Insert_5_0, 932). --define(wxMenu_InsertCheckItem, 933). --define(wxMenu_InsertRadioItem, 934). --define(wxMenu_InsertSeparator, 935). --define(wxMenu_IsChecked, 936). --define(wxMenu_IsEnabled, 937). --define(wxMenu_Prepend_1, 938). --define(wxMenu_Prepend_2, 939). --define(wxMenu_Prepend_4_1, 940). --define(wxMenu_Prepend_4_0, 941). --define(wxMenu_PrependCheckItem, 942). --define(wxMenu_PrependRadioItem, 943). --define(wxMenu_PrependSeparator, 944). --define(wxMenu_Remove_1_0, 945). --define(wxMenu_Remove_1_1, 946). --define(wxMenu_SetHelpString, 947). --define(wxMenu_SetLabel, 948). --define(wxMenu_SetTitle, 949). --define(wxMenuItem_new, 950). --define(wxMenuItem_destruct, 952). --define(wxMenuItem_Check, 953). --define(wxMenuItem_Enable, 954). --define(wxMenuItem_GetBitmap, 955). --define(wxMenuItem_GetHelp, 956). --define(wxMenuItem_GetId, 957). --define(wxMenuItem_GetKind, 958). --define(wxMenuItem_GetLabel, 959). --define(wxMenuItem_GetLabelFromText, 960). --define(wxMenuItem_GetMenu, 961). --define(wxMenuItem_GetText, 962). --define(wxMenuItem_GetSubMenu, 963). --define(wxMenuItem_IsCheckable, 964). --define(wxMenuItem_IsChecked, 965). --define(wxMenuItem_IsEnabled, 966). --define(wxMenuItem_IsSeparator, 967). --define(wxMenuItem_IsSubMenu, 968). --define(wxMenuItem_SetBitmap, 969). --define(wxMenuItem_SetHelp, 970). --define(wxMenuItem_SetMenu, 971). --define(wxMenuItem_SetSubMenu, 972). --define(wxMenuItem_SetText, 973). --define(wxToolBar_AddControl, 974). --define(wxToolBar_AddSeparator, 975). --define(wxToolBar_AddTool_5, 976). --define(wxToolBar_AddTool_4_0, 977). --define(wxToolBar_AddTool_1, 978). --define(wxToolBar_AddTool_4_1, 979). --define(wxToolBar_AddTool_3, 980). --define(wxToolBar_AddTool_6, 981). --define(wxToolBar_AddCheckTool, 982). --define(wxToolBar_AddRadioTool, 983). --define(wxToolBar_AddStretchableSpace, 984). --define(wxToolBar_InsertStretchableSpace, 985). --define(wxToolBar_DeleteTool, 986). --define(wxToolBar_DeleteToolByPos, 987). --define(wxToolBar_EnableTool, 988). --define(wxToolBar_FindById, 989). --define(wxToolBar_FindControl, 990). --define(wxToolBar_FindToolForPosition, 991). --define(wxToolBar_GetToolSize, 992). --define(wxToolBar_GetToolBitmapSize, 993). --define(wxToolBar_GetMargins, 994). --define(wxToolBar_GetToolEnabled, 995). --define(wxToolBar_GetToolLongHelp, 996). --define(wxToolBar_GetToolPacking, 997). --define(wxToolBar_GetToolPos, 998). --define(wxToolBar_GetToolSeparation, 999). --define(wxToolBar_GetToolShortHelp, 1000). --define(wxToolBar_GetToolState, 1001). --define(wxToolBar_InsertControl, 1002). --define(wxToolBar_InsertSeparator, 1003). --define(wxToolBar_InsertTool_5, 1004). --define(wxToolBar_InsertTool_2, 1005). --define(wxToolBar_InsertTool_4, 1006). --define(wxToolBar_Realize, 1007). --define(wxToolBar_RemoveTool, 1008). --define(wxToolBar_SetMargins, 1009). --define(wxToolBar_SetToolBitmapSize, 1010). --define(wxToolBar_SetToolLongHelp, 1011). --define(wxToolBar_SetToolPacking, 1012). --define(wxToolBar_SetToolShortHelp, 1013). --define(wxToolBar_SetToolSeparation, 1014). --define(wxToolBar_ToggleTool, 1015). --define(wxStatusBar_new_0, 1017). --define(wxStatusBar_new_2, 1018). --define(wxStatusBar_destruct, 1020). --define(wxStatusBar_Create, 1021). --define(wxStatusBar_GetFieldRect, 1022). --define(wxStatusBar_GetFieldsCount, 1023). --define(wxStatusBar_GetStatusText, 1024). --define(wxStatusBar_PopStatusText, 1025). --define(wxStatusBar_PushStatusText, 1026). --define(wxStatusBar_SetFieldsCount, 1027). --define(wxStatusBar_SetMinHeight, 1028). --define(wxStatusBar_SetStatusText, 1029). --define(wxStatusBar_SetStatusWidths, 1030). --define(wxStatusBar_SetStatusStyles, 1031). --define(wxBitmap_new_0, 1032). --define(wxBitmap_new_3, 1033). --define(wxBitmap_new_4, 1034). --define(wxBitmap_new_2_0, 1035). --define(wxBitmap_new_2_1, 1036). --define(wxBitmap_destruct, 1037). --define(wxBitmap_ConvertToImage, 1038). --define(wxBitmap_CopyFromIcon, 1039). --define(wxBitmap_Create, 1040). --define(wxBitmap_GetDepth, 1041). --define(wxBitmap_GetHeight, 1042). --define(wxBitmap_GetPalette, 1043). --define(wxBitmap_GetMask, 1044). --define(wxBitmap_GetWidth, 1045). --define(wxBitmap_GetSubBitmap, 1046). --define(wxBitmap_LoadFile, 1047). --define(wxBitmap_Ok, 1048). --define(wxBitmap_SaveFile, 1049). --define(wxBitmap_SetDepth, 1050). --define(wxBitmap_SetHeight, 1051). --define(wxBitmap_SetMask, 1052). --define(wxBitmap_SetPalette, 1053). --define(wxBitmap_SetWidth, 1054). --define(wxIcon_new_0, 1055). --define(wxIcon_new_2, 1056). --define(wxIcon_new_1, 1057). --define(wxIcon_CopyFromBitmap, 1058). --define(wxIcon_destroy, 1059). --define(wxIconBundle_new_0, 1060). --define(wxIconBundle_new_2, 1061). --define(wxIconBundle_new_1_0, 1062). --define(wxIconBundle_new_1_1, 1063). --define(wxIconBundle_destruct, 1064). --define(wxIconBundle_AddIcon_2, 1065). --define(wxIconBundle_AddIcon_1, 1066). --define(wxIconBundle_GetIcon_1_1, 1067). --define(wxIconBundle_GetIcon_1_0, 1068). --define(wxCursor_new_0, 1069). --define(wxCursor_new_1_0, 1070). --define(wxCursor_new_1_1, 1071). --define(wxCursor_new_4, 1072). --define(wxCursor_destruct, 1073). --define(wxCursor_Ok, 1074). --define(wxMask_new_0, 1075). --define(wxMask_new_2_1, 1076). --define(wxMask_new_2_0, 1077). --define(wxMask_new_1, 1078). --define(wxMask_destruct, 1079). --define(wxMask_Create_2_1, 1080). --define(wxMask_Create_2_0, 1081). --define(wxMask_Create_1, 1082). --define(wxImage_new_0, 1083). --define(wxImage_new_3_0, 1084). --define(wxImage_new_4, 1085). --define(wxImage_new_5, 1086). --define(wxImage_new_2, 1087). --define(wxImage_new_3_1, 1088). --define(wxImage_Blur, 1089). --define(wxImage_BlurHorizontal, 1090). --define(wxImage_BlurVertical, 1091). --define(wxImage_ConvertAlphaToMask, 1092). --define(wxImage_ConvertToGreyscale, 1093). --define(wxImage_ConvertToMono, 1094). --define(wxImage_Copy, 1095). --define(wxImage_Create_3, 1096). --define(wxImage_Create_4, 1097). --define(wxImage_Create_5, 1098). --define(wxImage_Destroy, 1099). --define(wxImage_FindFirstUnusedColour, 1100). --define(wxImage_GetImageExtWildcard, 1101). --define(wxImage_GetAlpha_2, 1102). --define(wxImage_GetAlpha_0, 1103). --define(wxImage_GetBlue, 1104). --define(wxImage_GetData, 1105). --define(wxImage_GetGreen, 1106). --define(wxImage_GetImageCount, 1107). --define(wxImage_GetHeight, 1108). --define(wxImage_GetMaskBlue, 1109). --define(wxImage_GetMaskGreen, 1110). --define(wxImage_GetMaskRed, 1111). --define(wxImage_GetOrFindMaskColour, 1112). --define(wxImage_GetPalette, 1113). --define(wxImage_GetRed, 1114). --define(wxImage_GetSubImage, 1115). --define(wxImage_GetWidth, 1116). --define(wxImage_HasAlpha, 1117). --define(wxImage_HasMask, 1118). --define(wxImage_GetOption, 1119). --define(wxImage_GetOptionInt, 1120). --define(wxImage_HasOption, 1121). --define(wxImage_InitAlpha, 1122). --define(wxImage_InitStandardHandlers, 1123). --define(wxImage_IsTransparent, 1124). --define(wxImage_LoadFile_2, 1125). --define(wxImage_LoadFile_3, 1126). --define(wxImage_Ok, 1127). --define(wxImage_RemoveHandler, 1128). --define(wxImage_Mirror, 1129). --define(wxImage_Replace, 1130). --define(wxImage_Rescale, 1131). --define(wxImage_Resize, 1132). --define(wxImage_Rotate, 1133). --define(wxImage_RotateHue, 1134). --define(wxImage_Rotate90, 1135). --define(wxImage_SaveFile_1, 1136). --define(wxImage_SaveFile_2_0, 1137). --define(wxImage_SaveFile_2_1, 1138). --define(wxImage_Scale, 1139). --define(wxImage_Size, 1140). --define(wxImage_SetAlpha_3, 1141). --define(wxImage_SetAlpha_2, 1142). --define(wxImage_SetData_2, 1143). --define(wxImage_SetData_4, 1144). --define(wxImage_SetMask, 1145). --define(wxImage_SetMaskColour, 1146). --define(wxImage_SetMaskFromImage, 1147). --define(wxImage_SetOption_2_1, 1148). --define(wxImage_SetOption_2_0, 1149). --define(wxImage_SetPalette, 1150). --define(wxImage_SetRGB_5, 1151). --define(wxImage_SetRGB_4, 1152). --define(wxImage_destroy, 1153). --define(wxBrush_new_0, 1154). --define(wxBrush_new_2, 1155). --define(wxBrush_new_1, 1156). --define(wxBrush_destruct, 1158). --define(wxBrush_GetColour, 1159). --define(wxBrush_GetStipple, 1160). --define(wxBrush_GetStyle, 1161). --define(wxBrush_IsHatch, 1162). --define(wxBrush_IsOk, 1163). --define(wxBrush_SetColour_1, 1164). --define(wxBrush_SetColour_3, 1165). --define(wxBrush_SetStipple, 1166). --define(wxBrush_SetStyle, 1167). --define(wxPen_new_0, 1168). --define(wxPen_new_2, 1169). --define(wxPen_destruct, 1170). --define(wxPen_GetCap, 1171). --define(wxPen_GetColour, 1172). --define(wxPen_GetJoin, 1173). --define(wxPen_GetStyle, 1174). --define(wxPen_GetWidth, 1175). --define(wxPen_IsOk, 1176). --define(wxPen_SetCap, 1177). --define(wxPen_SetColour_1, 1178). --define(wxPen_SetColour_3, 1179). --define(wxPen_SetJoin, 1180). --define(wxPen_SetStyle, 1181). --define(wxPen_SetWidth, 1182). --define(wxRegion_new_0, 1183). --define(wxRegion_new_4, 1184). --define(wxRegion_new_2, 1185). --define(wxRegion_new_1_1, 1186). --define(wxRegion_new_1_0, 1188). --define(wxRegion_destruct, 1190). --define(wxRegion_Clear, 1191). --define(wxRegion_Contains_2, 1192). --define(wxRegion_Contains_1_0, 1193). --define(wxRegion_Contains_4, 1194). --define(wxRegion_Contains_1_1, 1195). --define(wxRegion_ConvertToBitmap, 1196). --define(wxRegion_GetBox, 1197). --define(wxRegion_Intersect_4, 1198). --define(wxRegion_Intersect_1_1, 1199). --define(wxRegion_Intersect_1_0, 1200). --define(wxRegion_IsEmpty, 1201). --define(wxRegion_Subtract_4, 1202). --define(wxRegion_Subtract_1_1, 1203). --define(wxRegion_Subtract_1_0, 1204). --define(wxRegion_Offset_2, 1205). --define(wxRegion_Offset_1, 1206). --define(wxRegion_Union_4, 1207). --define(wxRegion_Union_1_2, 1208). --define(wxRegion_Union_1_1, 1209). --define(wxRegion_Union_1_0, 1210). --define(wxRegion_Union_3, 1211). --define(wxRegion_Xor_4, 1212). --define(wxRegion_Xor_1_1, 1213). --define(wxRegion_Xor_1_0, 1214). --define(wxAcceleratorTable_new_0, 1215). --define(wxAcceleratorTable_new_2, 1216). --define(wxAcceleratorTable_destruct, 1217). --define(wxAcceleratorTable_Ok, 1218). --define(wxAcceleratorEntry_new_1_0, 1219). --define(wxAcceleratorEntry_new_1_1, 1220). --define(wxAcceleratorEntry_GetCommand, 1221). --define(wxAcceleratorEntry_GetFlags, 1222). --define(wxAcceleratorEntry_GetKeyCode, 1223). --define(wxAcceleratorEntry_Set, 1224). --define(wxAcceleratorEntry_destroy, 1225). --define(wxCaret_new_3, 1230). --define(wxCaret_new_2, 1231). --define(wxCaret_destruct, 1233). --define(wxCaret_Create_3, 1234). --define(wxCaret_Create_2, 1235). --define(wxCaret_GetBlinkTime, 1236). --define(wxCaret_GetPosition, 1238). --define(wxCaret_GetSize, 1240). --define(wxCaret_GetWindow, 1241). --define(wxCaret_Hide, 1242). --define(wxCaret_IsOk, 1243). --define(wxCaret_IsVisible, 1244). --define(wxCaret_Move_2, 1245). --define(wxCaret_Move_1, 1246). --define(wxCaret_SetBlinkTime, 1247). --define(wxCaret_SetSize_2, 1248). --define(wxCaret_SetSize_1, 1249). --define(wxCaret_Show, 1250). --define(wxSizer_Add_2_1, 1251). --define(wxSizer_Add_2_0, 1252). --define(wxSizer_Add_3, 1253). --define(wxSizer_Add_2_3, 1254). --define(wxSizer_Add_2_2, 1255). --define(wxSizer_AddSpacer, 1256). --define(wxSizer_AddStretchSpacer, 1257). --define(wxSizer_CalcMin, 1258). --define(wxSizer_Clear, 1259). --define(wxSizer_Detach_1_2, 1260). --define(wxSizer_Detach_1_1, 1261). --define(wxSizer_Detach_1_0, 1262). --define(wxSizer_Fit, 1263). --define(wxSizer_FitInside, 1264). --define(wxSizer_GetChildren, 1265). --define(wxSizer_GetItem_2_1, 1266). --define(wxSizer_GetItem_2_0, 1267). --define(wxSizer_GetItem_1, 1268). --define(wxSizer_GetSize, 1269). --define(wxSizer_GetPosition, 1270). --define(wxSizer_GetMinSize, 1271). --define(wxSizer_Hide_2_0, 1272). --define(wxSizer_Hide_2_1, 1273). --define(wxSizer_Hide_1, 1274). --define(wxSizer_Insert_3_1, 1275). --define(wxSizer_Insert_3_0, 1276). --define(wxSizer_Insert_4, 1277). --define(wxSizer_Insert_3_3, 1278). --define(wxSizer_Insert_3_2, 1279). --define(wxSizer_Insert_2, 1280). --define(wxSizer_InsertSpacer, 1281). --define(wxSizer_InsertStretchSpacer, 1282). --define(wxSizer_IsShown_1_2, 1283). --define(wxSizer_IsShown_1_1, 1284). --define(wxSizer_IsShown_1_0, 1285). --define(wxSizer_Layout, 1286). --define(wxSizer_Prepend_2_1, 1287). --define(wxSizer_Prepend_2_0, 1288). --define(wxSizer_Prepend_3, 1289). --define(wxSizer_Prepend_2_3, 1290). --define(wxSizer_Prepend_2_2, 1291). --define(wxSizer_Prepend_1, 1292). --define(wxSizer_PrependSpacer, 1293). --define(wxSizer_PrependStretchSpacer, 1294). --define(wxSizer_RecalcSizes, 1295). --define(wxSizer_Remove_1_1, 1296). --define(wxSizer_Remove_1_0, 1297). --define(wxSizer_Replace_3_1, 1298). --define(wxSizer_Replace_3_0, 1299). --define(wxSizer_Replace_2, 1300). --define(wxSizer_SetDimension, 1301). --define(wxSizer_SetMinSize_2, 1302). --define(wxSizer_SetMinSize_1, 1303). --define(wxSizer_SetItemMinSize_3_2, 1304). --define(wxSizer_SetItemMinSize_2_2, 1305). --define(wxSizer_SetItemMinSize_3_1, 1306). --define(wxSizer_SetItemMinSize_2_1, 1307). --define(wxSizer_SetItemMinSize_3_0, 1308). --define(wxSizer_SetItemMinSize_2_0, 1309). --define(wxSizer_SetSizeHints, 1310). --define(wxSizer_SetVirtualSizeHints, 1311). --define(wxSizer_Show_2_2, 1312). --define(wxSizer_Show_2_1, 1313). --define(wxSizer_Show_2_0, 1314). --define(wxSizer_Show_1, 1315). --define(wxSizerFlags_new, 1316). --define(wxSizerFlags_Align, 1317). --define(wxSizerFlags_Border_2, 1318). --define(wxSizerFlags_Border_1, 1319). --define(wxSizerFlags_Center, 1320). --define(wxSizerFlags_Centre, 1321). --define(wxSizerFlags_Expand, 1322). --define(wxSizerFlags_Left, 1323). --define(wxSizerFlags_Proportion, 1324). --define(wxSizerFlags_Right, 1325). --define(wxSizerFlags_destroy, 1326). --define(wxSizerItem_new_5_1, 1327). --define(wxSizerItem_new_2_1, 1328). --define(wxSizerItem_new_5_0, 1329). --define(wxSizerItem_new_2_0, 1330). --define(wxSizerItem_new_6, 1331). --define(wxSizerItem_new_3, 1332). --define(wxSizerItem_new_0, 1333). --define(wxSizerItem_destruct, 1334). --define(wxSizerItem_CalcMin, 1335). --define(wxSizerItem_DeleteWindows, 1336). --define(wxSizerItem_DetachSizer, 1337). --define(wxSizerItem_GetBorder, 1338). --define(wxSizerItem_GetFlag, 1339). --define(wxSizerItem_GetMinSize, 1340). --define(wxSizerItem_GetPosition, 1341). --define(wxSizerItem_GetProportion, 1342). --define(wxSizerItem_GetRatio, 1343). --define(wxSizerItem_GetRect, 1344). --define(wxSizerItem_GetSize, 1345). --define(wxSizerItem_GetSizer, 1346). --define(wxSizerItem_GetSpacer, 1347). --define(wxSizerItem_GetUserData, 1348). --define(wxSizerItem_GetWindow, 1349). --define(wxSizerItem_IsSizer, 1350). --define(wxSizerItem_IsShown, 1351). --define(wxSizerItem_IsSpacer, 1352). --define(wxSizerItem_IsWindow, 1353). --define(wxSizerItem_SetBorder, 1354). --define(wxSizerItem_SetDimension, 1355). --define(wxSizerItem_SetFlag, 1356). --define(wxSizerItem_SetInitSize, 1357). --define(wxSizerItem_SetMinSize_1, 1358). --define(wxSizerItem_SetMinSize_2, 1359). --define(wxSizerItem_SetProportion, 1360). --define(wxSizerItem_SetRatio_2, 1361). --define(wxSizerItem_SetRatio_1_1, 1362). --define(wxSizerItem_SetRatio_1_0, 1363). --define(wxSizerItem_SetSizer, 1364). --define(wxSizerItem_SetSpacer_1, 1365). --define(wxSizerItem_SetSpacer_2, 1366). --define(wxSizerItem_SetWindow, 1367). --define(wxSizerItem_Show, 1368). --define(wxBoxSizer_new, 1369). --define(wxBoxSizer_GetOrientation, 1370). --define(wxBoxSizer_destroy, 1371). --define(wxStaticBoxSizer_new_2, 1372). --define(wxStaticBoxSizer_new_3, 1373). --define(wxStaticBoxSizer_GetStaticBox, 1374). --define(wxStaticBoxSizer_destroy, 1375). --define(wxGridSizer_new_4, 1376). --define(wxGridSizer_new_2, 1377). --define(wxGridSizer_GetCols, 1378). --define(wxGridSizer_GetHGap, 1379). --define(wxGridSizer_GetRows, 1380). --define(wxGridSizer_GetVGap, 1381). --define(wxGridSizer_SetCols, 1382). --define(wxGridSizer_SetHGap, 1383). --define(wxGridSizer_SetRows, 1384). --define(wxGridSizer_SetVGap, 1385). --define(wxGridSizer_destroy, 1386). --define(wxFlexGridSizer_new_4, 1387). --define(wxFlexGridSizer_new_2, 1388). --define(wxFlexGridSizer_AddGrowableCol, 1389). --define(wxFlexGridSizer_AddGrowableRow, 1390). --define(wxFlexGridSizer_GetFlexibleDirection, 1391). --define(wxFlexGridSizer_GetNonFlexibleGrowMode, 1392). --define(wxFlexGridSizer_RemoveGrowableCol, 1393). --define(wxFlexGridSizer_RemoveGrowableRow, 1394). --define(wxFlexGridSizer_SetFlexibleDirection, 1395). --define(wxFlexGridSizer_SetNonFlexibleGrowMode, 1396). --define(wxFlexGridSizer_destroy, 1397). --define(wxGridBagSizer_new, 1398). --define(wxGridBagSizer_Add_3_2, 1399). --define(wxGridBagSizer_Add_3_1, 1400). --define(wxGridBagSizer_Add_4, 1401). --define(wxGridBagSizer_Add_1_0, 1402). --define(wxGridBagSizer_Add_2_1, 1403). --define(wxGridBagSizer_Add_2_0, 1404). --define(wxGridBagSizer_Add_3_0, 1405). --define(wxGridBagSizer_Add_1_1, 1406). --define(wxGridBagSizer_CalcMin, 1407). --define(wxGridBagSizer_CheckForIntersection_2, 1408). --define(wxGridBagSizer_CheckForIntersection_3, 1409). --define(wxGridBagSizer_FindItem_1_1, 1410). --define(wxGridBagSizer_FindItem_1_0, 1411). --define(wxGridBagSizer_FindItemAtPoint, 1412). --define(wxGridBagSizer_FindItemAtPosition, 1413). --define(wxGridBagSizer_FindItemWithData, 1414). --define(wxGridBagSizer_GetCellSize, 1415). --define(wxGridBagSizer_GetEmptyCellSize, 1416). --define(wxGridBagSizer_GetItemPosition_1_2, 1417). --define(wxGridBagSizer_GetItemPosition_1_1, 1418). --define(wxGridBagSizer_GetItemPosition_1_0, 1419). --define(wxGridBagSizer_GetItemSpan_1_2, 1420). --define(wxGridBagSizer_GetItemSpan_1_1, 1421). --define(wxGridBagSizer_GetItemSpan_1_0, 1422). --define(wxGridBagSizer_SetEmptyCellSize, 1423). --define(wxGridBagSizer_SetItemPosition_2_2, 1424). --define(wxGridBagSizer_SetItemPosition_2_1, 1425). --define(wxGridBagSizer_SetItemPosition_2_0, 1426). --define(wxGridBagSizer_SetItemSpan_2_2, 1427). --define(wxGridBagSizer_SetItemSpan_2_1, 1428). --define(wxGridBagSizer_SetItemSpan_2_0, 1429). --define(wxGridBagSizer_destroy, 1430). --define(wxStdDialogButtonSizer_new, 1431). --define(wxStdDialogButtonSizer_AddButton, 1432). --define(wxStdDialogButtonSizer_Realize, 1433). --define(wxStdDialogButtonSizer_SetAffirmativeButton, 1434). --define(wxStdDialogButtonSizer_SetCancelButton, 1435). --define(wxStdDialogButtonSizer_SetNegativeButton, 1436). --define(wxStdDialogButtonSizer_destroy, 1437). --define(wxFont_new_0, 1438). --define(wxFont_new_1, 1439). --define(wxFont_new_5, 1440). --define(wxFont_destruct, 1442). --define(wxFont_IsFixedWidth, 1443). --define(wxFont_GetDefaultEncoding, 1444). --define(wxFont_GetFaceName, 1445). --define(wxFont_GetFamily, 1446). --define(wxFont_GetNativeFontInfoDesc, 1447). --define(wxFont_GetNativeFontInfoUserDesc, 1448). --define(wxFont_GetPointSize, 1449). --define(wxFont_GetStyle, 1450). --define(wxFont_GetUnderlined, 1451). --define(wxFont_GetWeight, 1452). --define(wxFont_Ok, 1453). --define(wxFont_SetDefaultEncoding, 1454). --define(wxFont_SetFaceName, 1455). --define(wxFont_SetFamily, 1456). --define(wxFont_SetPointSize, 1457). --define(wxFont_SetStyle, 1458). --define(wxFont_SetUnderlined, 1459). --define(wxFont_SetWeight, 1460). --define(wxToolTip_Enable, 1461). --define(wxToolTip_SetDelay, 1462). --define(wxToolTip_new, 1463). --define(wxToolTip_SetTip, 1464). --define(wxToolTip_GetTip, 1465). --define(wxToolTip_GetWindow, 1466). --define(wxToolTip_destroy, 1467). --define(wxButton_new_3, 1469). --define(wxButton_new_0, 1470). --define(wxButton_destruct, 1471). --define(wxButton_Create, 1472). --define(wxButton_GetDefaultSize, 1473). --define(wxButton_SetDefault, 1474). --define(wxButton_SetLabel, 1475). --define(wxBitmapButton_new_4, 1477). --define(wxBitmapButton_new_0, 1478). --define(wxBitmapButton_Create, 1479). --define(wxBitmapButton_GetBitmapDisabled, 1480). --define(wxBitmapButton_GetBitmapFocus, 1482). --define(wxBitmapButton_GetBitmapLabel, 1484). --define(wxBitmapButton_GetBitmapSelected, 1486). --define(wxBitmapButton_SetBitmapDisabled, 1488). --define(wxBitmapButton_SetBitmapFocus, 1489). --define(wxBitmapButton_SetBitmapLabel, 1490). --define(wxBitmapButton_SetBitmapSelected, 1491). --define(wxBitmapButton_destroy, 1492). --define(wxToggleButton_new_0, 1493). --define(wxToggleButton_new_4, 1494). --define(wxToggleButton_Create, 1495). --define(wxToggleButton_GetValue, 1496). --define(wxToggleButton_SetValue, 1497). --define(wxToggleButton_destroy, 1498). --define(wxCalendarCtrl_new_0, 1499). --define(wxCalendarCtrl_new_3, 1500). --define(wxCalendarCtrl_Create, 1501). --define(wxCalendarCtrl_destruct, 1502). --define(wxCalendarCtrl_SetDate, 1503). --define(wxCalendarCtrl_GetDate, 1504). --define(wxCalendarCtrl_EnableYearChange, 1505). --define(wxCalendarCtrl_EnableMonthChange, 1506). --define(wxCalendarCtrl_EnableHolidayDisplay, 1507). --define(wxCalendarCtrl_SetHeaderColours, 1508). --define(wxCalendarCtrl_GetHeaderColourFg, 1509). --define(wxCalendarCtrl_GetHeaderColourBg, 1510). --define(wxCalendarCtrl_SetHighlightColours, 1511). --define(wxCalendarCtrl_GetHighlightColourFg, 1512). --define(wxCalendarCtrl_GetHighlightColourBg, 1513). --define(wxCalendarCtrl_SetHolidayColours, 1514). --define(wxCalendarCtrl_GetHolidayColourFg, 1515). --define(wxCalendarCtrl_GetHolidayColourBg, 1516). --define(wxCalendarCtrl_GetAttr, 1517). --define(wxCalendarCtrl_SetAttr, 1518). --define(wxCalendarCtrl_SetHoliday, 1519). --define(wxCalendarCtrl_ResetAttr, 1520). --define(wxCalendarCtrl_HitTest, 1521). --define(wxCalendarDateAttr_new_0, 1522). --define(wxCalendarDateAttr_new_2_1, 1523). --define(wxCalendarDateAttr_new_2_0, 1524). --define(wxCalendarDateAttr_SetTextColour, 1525). --define(wxCalendarDateAttr_SetBackgroundColour, 1526). --define(wxCalendarDateAttr_SetBorderColour, 1527). --define(wxCalendarDateAttr_SetFont, 1528). --define(wxCalendarDateAttr_SetBorder, 1529). --define(wxCalendarDateAttr_SetHoliday, 1530). --define(wxCalendarDateAttr_HasTextColour, 1531). --define(wxCalendarDateAttr_HasBackgroundColour, 1532). --define(wxCalendarDateAttr_HasBorderColour, 1533). --define(wxCalendarDateAttr_HasFont, 1534). --define(wxCalendarDateAttr_HasBorder, 1535). --define(wxCalendarDateAttr_IsHoliday, 1536). --define(wxCalendarDateAttr_GetTextColour, 1537). --define(wxCalendarDateAttr_GetBackgroundColour, 1538). --define(wxCalendarDateAttr_GetBorderColour, 1539). --define(wxCalendarDateAttr_GetFont, 1540). --define(wxCalendarDateAttr_GetBorder, 1541). --define(wxCalendarDateAttr_destroy, 1542). --define(wxCheckBox_new_4, 1544). --define(wxCheckBox_new_0, 1545). --define(wxCheckBox_Create, 1546). --define(wxCheckBox_GetValue, 1547). --define(wxCheckBox_Get3StateValue, 1548). --define(wxCheckBox_Is3rdStateAllowedForUser, 1549). --define(wxCheckBox_Is3State, 1550). --define(wxCheckBox_IsChecked, 1551). --define(wxCheckBox_SetValue, 1552). --define(wxCheckBox_Set3StateValue, 1553). --define(wxCheckBox_destroy, 1554). --define(wxCheckListBox_new_0, 1555). --define(wxCheckListBox_new_3, 1557). --define(wxCheckListBox_Check, 1558). --define(wxCheckListBox_IsChecked, 1559). --define(wxCheckListBox_destroy, 1560). --define(wxChoice_new_3, 1563). --define(wxChoice_new_0, 1564). --define(wxChoice_destruct, 1566). --define(wxChoice_Create, 1568). --define(wxChoice_Delete, 1569). --define(wxChoice_GetColumns, 1570). --define(wxChoice_SetColumns, 1571). --define(wxComboBox_new_0, 1572). --define(wxComboBox_new_3, 1574). --define(wxComboBox_destruct, 1575). --define(wxComboBox_Create, 1577). --define(wxComboBox_CanCopy, 1578). --define(wxComboBox_CanCut, 1579). --define(wxComboBox_CanPaste, 1580). --define(wxComboBox_CanRedo, 1581). --define(wxComboBox_CanUndo, 1582). --define(wxComboBox_Copy, 1583). --define(wxComboBox_Cut, 1584). --define(wxComboBox_GetInsertionPoint, 1585). --define(wxComboBox_GetLastPosition, 1586). --define(wxComboBox_GetValue, 1587). --define(wxComboBox_Paste, 1588). --define(wxComboBox_Redo, 1589). --define(wxComboBox_Replace, 1590). --define(wxComboBox_Remove, 1591). --define(wxComboBox_SetInsertionPoint, 1592). --define(wxComboBox_SetInsertionPointEnd, 1593). --define(wxComboBox_SetSelection_1, 1594). --define(wxComboBox_SetSelection_2, 1595). --define(wxComboBox_SetValue, 1596). --define(wxComboBox_Undo, 1597). --define(wxGauge_new_0, 1598). --define(wxGauge_new_4, 1599). --define(wxGauge_Create, 1600). --define(wxGauge_GetBezelFace, 1601). --define(wxGauge_GetRange, 1602). --define(wxGauge_GetShadowWidth, 1603). --define(wxGauge_GetValue, 1604). --define(wxGauge_IsVertical, 1605). --define(wxGauge_SetBezelFace, 1606). --define(wxGauge_SetRange, 1607). --define(wxGauge_SetShadowWidth, 1608). --define(wxGauge_SetValue, 1609). --define(wxGauge_Pulse, 1610). --define(wxGauge_destroy, 1611). --define(wxGenericDirCtrl_new_0, 1612). --define(wxGenericDirCtrl_new_2, 1613). --define(wxGenericDirCtrl_destruct, 1614). --define(wxGenericDirCtrl_Create, 1615). --define(wxGenericDirCtrl_Init, 1616). --define(wxGenericDirCtrl_CollapseTree, 1617). --define(wxGenericDirCtrl_ExpandPath, 1618). --define(wxGenericDirCtrl_GetDefaultPath, 1619). --define(wxGenericDirCtrl_GetPath, 1620). --define(wxGenericDirCtrl_GetFilePath, 1621). --define(wxGenericDirCtrl_GetFilter, 1622). --define(wxGenericDirCtrl_GetFilterIndex, 1623). --define(wxGenericDirCtrl_GetRootId, 1624). --define(wxGenericDirCtrl_GetTreeCtrl, 1625). --define(wxGenericDirCtrl_ReCreateTree, 1626). --define(wxGenericDirCtrl_SetDefaultPath, 1627). --define(wxGenericDirCtrl_SetFilter, 1628). --define(wxGenericDirCtrl_SetFilterIndex, 1629). --define(wxGenericDirCtrl_SetPath, 1630). --define(wxStaticBox_new_4, 1632). --define(wxStaticBox_new_0, 1633). --define(wxStaticBox_Create, 1634). --define(wxStaticBox_destroy, 1635). --define(wxStaticLine_new_2, 1637). --define(wxStaticLine_new_0, 1638). --define(wxStaticLine_Create, 1639). --define(wxStaticLine_IsVertical, 1640). --define(wxStaticLine_GetDefaultSize, 1641). --define(wxStaticLine_destroy, 1642). --define(wxListBox_new_3, 1645). --define(wxListBox_new_0, 1646). --define(wxListBox_destruct, 1648). --define(wxListBox_Create, 1650). --define(wxListBox_Deselect, 1651). --define(wxListBox_GetSelections, 1652). --define(wxListBox_InsertItems, 1653). --define(wxListBox_IsSelected, 1654). --define(wxListBox_Set, 1655). --define(wxListBox_HitTest, 1656). --define(wxListBox_SetFirstItem_1_0, 1657). --define(wxListBox_SetFirstItem_1_1, 1658). --define(wxListCtrl_new_0, 1659). --define(wxListCtrl_new_2, 1660). --define(wxListCtrl_Arrange, 1661). --define(wxListCtrl_AssignImageList, 1662). --define(wxListCtrl_ClearAll, 1663). --define(wxListCtrl_Create, 1664). --define(wxListCtrl_DeleteAllItems, 1665). --define(wxListCtrl_DeleteColumn, 1666). --define(wxListCtrl_DeleteItem, 1667). --define(wxListCtrl_EditLabel, 1668). --define(wxListCtrl_EnsureVisible, 1669). --define(wxListCtrl_FindItem_3_0, 1670). --define(wxListCtrl_FindItem_3_1, 1671). --define(wxListCtrl_GetColumn, 1672). --define(wxListCtrl_GetColumnCount, 1673). --define(wxListCtrl_GetColumnWidth, 1674). --define(wxListCtrl_GetCountPerPage, 1675). --define(wxListCtrl_GetEditControl, 1676). --define(wxListCtrl_GetImageList, 1677). --define(wxListCtrl_GetItem, 1678). --define(wxListCtrl_GetItemBackgroundColour, 1679). --define(wxListCtrl_GetItemCount, 1680). --define(wxListCtrl_GetItemData, 1681). --define(wxListCtrl_GetItemFont, 1682). --define(wxListCtrl_GetItemPosition, 1683). --define(wxListCtrl_GetItemRect, 1684). --define(wxListCtrl_GetItemSpacing, 1685). --define(wxListCtrl_GetItemState, 1686). --define(wxListCtrl_GetItemText, 1687). --define(wxListCtrl_GetItemTextColour, 1688). --define(wxListCtrl_GetNextItem, 1689). --define(wxListCtrl_GetSelectedItemCount, 1690). --define(wxListCtrl_GetTextColour, 1691). --define(wxListCtrl_GetTopItem, 1692). --define(wxListCtrl_GetViewRect, 1693). --define(wxListCtrl_HitTest, 1694). --define(wxListCtrl_InsertColumn_2, 1695). --define(wxListCtrl_InsertColumn_3, 1696). --define(wxListCtrl_InsertItem_1, 1697). --define(wxListCtrl_InsertItem_2_1, 1698). --define(wxListCtrl_InsertItem_2_0, 1699). --define(wxListCtrl_InsertItem_3, 1700). --define(wxListCtrl_RefreshItem, 1701). --define(wxListCtrl_RefreshItems, 1702). --define(wxListCtrl_ScrollList, 1703). --define(wxListCtrl_SetBackgroundColour, 1704). --define(wxListCtrl_SetColumn, 1705). --define(wxListCtrl_SetColumnWidth, 1706). --define(wxListCtrl_SetImageList, 1707). --define(wxListCtrl_SetItem_1, 1708). --define(wxListCtrl_SetItem_4, 1709). --define(wxListCtrl_SetItemBackgroundColour, 1710). --define(wxListCtrl_SetItemCount, 1711). --define(wxListCtrl_SetItemData, 1712). --define(wxListCtrl_SetItemFont, 1713). --define(wxListCtrl_SetItemImage, 1714). --define(wxListCtrl_SetItemColumnImage, 1715). --define(wxListCtrl_SetItemPosition, 1716). --define(wxListCtrl_SetItemState, 1717). --define(wxListCtrl_SetItemText, 1718). --define(wxListCtrl_SetItemTextColour, 1719). --define(wxListCtrl_SetSingleStyle, 1720). --define(wxListCtrl_SetTextColour, 1721). --define(wxListCtrl_SetWindowStyleFlag, 1722). --define(wxListCtrl_SortItems, 1723). --define(wxListCtrl_destroy, 1724). --define(wxListView_ClearColumnImage, 1725). --define(wxListView_Focus, 1726). --define(wxListView_GetFirstSelected, 1727). --define(wxListView_GetFocusedItem, 1728). --define(wxListView_GetNextSelected, 1729). --define(wxListView_IsSelected, 1730). --define(wxListView_Select, 1731). --define(wxListView_SetColumnImage, 1732). --define(wxListItem_new_0, 1733). --define(wxListItem_new_1, 1734). --define(wxListItem_destruct, 1735). --define(wxListItem_Clear, 1736). --define(wxListItem_GetAlign, 1737). --define(wxListItem_GetBackgroundColour, 1738). --define(wxListItem_GetColumn, 1739). --define(wxListItem_GetFont, 1740). --define(wxListItem_GetId, 1741). --define(wxListItem_GetImage, 1742). --define(wxListItem_GetMask, 1743). --define(wxListItem_GetState, 1744). --define(wxListItem_GetText, 1745). --define(wxListItem_GetTextColour, 1746). --define(wxListItem_GetWidth, 1747). --define(wxListItem_SetAlign, 1748). --define(wxListItem_SetBackgroundColour, 1749). --define(wxListItem_SetColumn, 1750). --define(wxListItem_SetFont, 1751). --define(wxListItem_SetId, 1752). --define(wxListItem_SetImage, 1753). --define(wxListItem_SetMask, 1754). --define(wxListItem_SetState, 1755). --define(wxListItem_SetStateMask, 1756). --define(wxListItem_SetText, 1757). --define(wxListItem_SetTextColour, 1758). --define(wxListItem_SetWidth, 1759). --define(wxListItemAttr_new_0, 1760). --define(wxListItemAttr_new_3, 1761). --define(wxListItemAttr_GetBackgroundColour, 1762). --define(wxListItemAttr_GetFont, 1763). --define(wxListItemAttr_GetTextColour, 1764). --define(wxListItemAttr_HasBackgroundColour, 1765). --define(wxListItemAttr_HasFont, 1766). --define(wxListItemAttr_HasTextColour, 1767). --define(wxListItemAttr_SetBackgroundColour, 1768). --define(wxListItemAttr_SetFont, 1769). --define(wxListItemAttr_SetTextColour, 1770). --define(wxListItemAttr_destroy, 1771). --define(wxImageList_new_0, 1772). --define(wxImageList_new_3, 1773). --define(wxImageList_Add_1, 1774). --define(wxImageList_Add_2_0, 1775). --define(wxImageList_Add_2_1, 1776). --define(wxImageList_Create, 1777). --define(wxImageList_Draw, 1779). --define(wxImageList_GetBitmap, 1780). --define(wxImageList_GetIcon, 1781). --define(wxImageList_GetImageCount, 1782). --define(wxImageList_GetSize, 1783). --define(wxImageList_Remove, 1784). --define(wxImageList_RemoveAll, 1785). --define(wxImageList_Replace_2, 1786). --define(wxImageList_Replace_3, 1787). --define(wxImageList_destroy, 1788). --define(wxTextAttr_new_0, 1789). --define(wxTextAttr_new_2, 1790). --define(wxTextAttr_GetAlignment, 1791). --define(wxTextAttr_GetBackgroundColour, 1792). --define(wxTextAttr_GetFont, 1793). --define(wxTextAttr_GetLeftIndent, 1794). --define(wxTextAttr_GetLeftSubIndent, 1795). --define(wxTextAttr_GetRightIndent, 1796). --define(wxTextAttr_GetTabs, 1797). --define(wxTextAttr_GetTextColour, 1798). --define(wxTextAttr_HasBackgroundColour, 1799). --define(wxTextAttr_HasFont, 1800). --define(wxTextAttr_HasTextColour, 1801). --define(wxTextAttr_GetFlags, 1802). --define(wxTextAttr_IsDefault, 1803). --define(wxTextAttr_SetAlignment, 1804). --define(wxTextAttr_SetBackgroundColour, 1805). --define(wxTextAttr_SetFlags, 1806). --define(wxTextAttr_SetFont, 1807). --define(wxTextAttr_SetLeftIndent, 1808). --define(wxTextAttr_SetRightIndent, 1809). --define(wxTextAttr_SetTabs, 1810). --define(wxTextAttr_SetTextColour, 1811). --define(wxTextAttr_destroy, 1812). --define(wxTextCtrl_new_3, 1814). --define(wxTextCtrl_new_0, 1815). --define(wxTextCtrl_destruct, 1817). --define(wxTextCtrl_AppendText, 1818). --define(wxTextCtrl_CanCopy, 1819). --define(wxTextCtrl_CanCut, 1820). --define(wxTextCtrl_CanPaste, 1821). --define(wxTextCtrl_CanRedo, 1822). --define(wxTextCtrl_CanUndo, 1823). --define(wxTextCtrl_Clear, 1824). --define(wxTextCtrl_Copy, 1825). --define(wxTextCtrl_Create, 1826). --define(wxTextCtrl_Cut, 1827). --define(wxTextCtrl_DiscardEdits, 1828). --define(wxTextCtrl_ChangeValue, 1829). --define(wxTextCtrl_EmulateKeyPress, 1830). --define(wxTextCtrl_GetDefaultStyle, 1831). --define(wxTextCtrl_GetInsertionPoint, 1832). --define(wxTextCtrl_GetLastPosition, 1833). --define(wxTextCtrl_GetLineLength, 1834). --define(wxTextCtrl_GetLineText, 1835). --define(wxTextCtrl_GetNumberOfLines, 1836). --define(wxTextCtrl_GetRange, 1837). --define(wxTextCtrl_GetSelection, 1838). --define(wxTextCtrl_GetStringSelection, 1839). --define(wxTextCtrl_GetStyle, 1840). --define(wxTextCtrl_GetValue, 1841). --define(wxTextCtrl_IsEditable, 1842). --define(wxTextCtrl_IsModified, 1843). --define(wxTextCtrl_IsMultiLine, 1844). --define(wxTextCtrl_IsSingleLine, 1845). --define(wxTextCtrl_LoadFile, 1846). --define(wxTextCtrl_MarkDirty, 1847). --define(wxTextCtrl_Paste, 1848). --define(wxTextCtrl_PositionToXY, 1849). --define(wxTextCtrl_Redo, 1850). --define(wxTextCtrl_Remove, 1851). --define(wxTextCtrl_Replace, 1852). --define(wxTextCtrl_SaveFile, 1853). --define(wxTextCtrl_SetDefaultStyle, 1854). --define(wxTextCtrl_SetEditable, 1855). --define(wxTextCtrl_SetInsertionPoint, 1856). --define(wxTextCtrl_SetInsertionPointEnd, 1857). --define(wxTextCtrl_SetMaxLength, 1859). --define(wxTextCtrl_SetSelection, 1860). --define(wxTextCtrl_SetStyle, 1861). --define(wxTextCtrl_SetValue, 1862). --define(wxTextCtrl_ShowPosition, 1863). --define(wxTextCtrl_Undo, 1864). --define(wxTextCtrl_WriteText, 1865). --define(wxTextCtrl_XYToPosition, 1866). --define(wxNotebook_new_0, 1869). --define(wxNotebook_new_3, 1870). --define(wxNotebook_destruct, 1871). --define(wxNotebook_AddPage, 1872). --define(wxNotebook_AdvanceSelection, 1873). --define(wxNotebook_AssignImageList, 1874). --define(wxNotebook_Create, 1875). --define(wxNotebook_DeleteAllPages, 1876). --define(wxNotebook_DeletePage, 1877). --define(wxNotebook_RemovePage, 1878). --define(wxNotebook_GetCurrentPage, 1879). --define(wxNotebook_GetImageList, 1880). --define(wxNotebook_GetPage, 1882). --define(wxNotebook_GetPageCount, 1883). --define(wxNotebook_GetPageImage, 1884). --define(wxNotebook_GetPageText, 1885). --define(wxNotebook_GetRowCount, 1886). --define(wxNotebook_GetSelection, 1887). --define(wxNotebook_GetThemeBackgroundColour, 1888). --define(wxNotebook_HitTest, 1890). --define(wxNotebook_InsertPage, 1892). --define(wxNotebook_SetImageList, 1893). --define(wxNotebook_SetPadding, 1894). --define(wxNotebook_SetPageSize, 1895). --define(wxNotebook_SetPageImage, 1896). --define(wxNotebook_SetPageText, 1897). --define(wxNotebook_SetSelection, 1898). --define(wxNotebook_ChangeSelection, 1899). --define(wxChoicebook_new_0, 1900). --define(wxChoicebook_new_3, 1901). --define(wxChoicebook_AddPage, 1902). --define(wxChoicebook_AdvanceSelection, 1903). --define(wxChoicebook_AssignImageList, 1904). --define(wxChoicebook_Create, 1905). --define(wxChoicebook_DeleteAllPages, 1906). --define(wxChoicebook_DeletePage, 1907). --define(wxChoicebook_RemovePage, 1908). --define(wxChoicebook_GetCurrentPage, 1909). --define(wxChoicebook_GetImageList, 1910). --define(wxChoicebook_GetPage, 1912). --define(wxChoicebook_GetPageCount, 1913). --define(wxChoicebook_GetPageImage, 1914). --define(wxChoicebook_GetPageText, 1915). --define(wxChoicebook_GetSelection, 1916). --define(wxChoicebook_HitTest, 1917). --define(wxChoicebook_InsertPage, 1918). --define(wxChoicebook_SetImageList, 1919). --define(wxChoicebook_SetPageSize, 1920). --define(wxChoicebook_SetPageImage, 1921). --define(wxChoicebook_SetPageText, 1922). --define(wxChoicebook_SetSelection, 1923). --define(wxChoicebook_ChangeSelection, 1924). --define(wxChoicebook_destroy, 1925). --define(wxToolbook_new_0, 1926). --define(wxToolbook_new_3, 1927). --define(wxToolbook_AddPage, 1928). --define(wxToolbook_AdvanceSelection, 1929). --define(wxToolbook_AssignImageList, 1930). --define(wxToolbook_Create, 1931). --define(wxToolbook_DeleteAllPages, 1932). --define(wxToolbook_DeletePage, 1933). --define(wxToolbook_RemovePage, 1934). --define(wxToolbook_GetCurrentPage, 1935). --define(wxToolbook_GetImageList, 1936). --define(wxToolbook_GetPage, 1938). --define(wxToolbook_GetPageCount, 1939). --define(wxToolbook_GetPageImage, 1940). --define(wxToolbook_GetPageText, 1941). --define(wxToolbook_GetSelection, 1942). --define(wxToolbook_HitTest, 1944). --define(wxToolbook_InsertPage, 1945). --define(wxToolbook_SetImageList, 1946). --define(wxToolbook_SetPageSize, 1947). --define(wxToolbook_SetPageImage, 1948). --define(wxToolbook_SetPageText, 1949). --define(wxToolbook_SetSelection, 1950). --define(wxToolbook_ChangeSelection, 1951). --define(wxToolbook_destroy, 1952). --define(wxListbook_new_0, 1953). --define(wxListbook_new_3, 1954). --define(wxListbook_AddPage, 1955). --define(wxListbook_AdvanceSelection, 1956). --define(wxListbook_AssignImageList, 1957). --define(wxListbook_Create, 1958). --define(wxListbook_DeleteAllPages, 1959). --define(wxListbook_DeletePage, 1960). --define(wxListbook_RemovePage, 1961). --define(wxListbook_GetCurrentPage, 1962). --define(wxListbook_GetImageList, 1963). --define(wxListbook_GetPage, 1965). --define(wxListbook_GetPageCount, 1966). --define(wxListbook_GetPageImage, 1967). --define(wxListbook_GetPageText, 1968). --define(wxListbook_GetSelection, 1969). --define(wxListbook_HitTest, 1971). --define(wxListbook_InsertPage, 1972). --define(wxListbook_SetImageList, 1973). --define(wxListbook_SetPageSize, 1974). --define(wxListbook_SetPageImage, 1975). --define(wxListbook_SetPageText, 1976). --define(wxListbook_SetSelection, 1977). --define(wxListbook_ChangeSelection, 1978). --define(wxListbook_destroy, 1979). --define(wxTreebook_new_0, 1980). --define(wxTreebook_new_3, 1981). --define(wxTreebook_AddPage, 1982). --define(wxTreebook_AdvanceSelection, 1983). --define(wxTreebook_AssignImageList, 1984). --define(wxTreebook_Create, 1985). --define(wxTreebook_DeleteAllPages, 1986). --define(wxTreebook_DeletePage, 1987). --define(wxTreebook_RemovePage, 1988). --define(wxTreebook_GetCurrentPage, 1989). --define(wxTreebook_GetImageList, 1990). --define(wxTreebook_GetPage, 1992). --define(wxTreebook_GetPageCount, 1993). --define(wxTreebook_GetPageImage, 1994). --define(wxTreebook_GetPageText, 1995). --define(wxTreebook_GetSelection, 1996). --define(wxTreebook_ExpandNode, 1997). --define(wxTreebook_IsNodeExpanded, 1998). --define(wxTreebook_HitTest, 2000). --define(wxTreebook_InsertPage, 2001). --define(wxTreebook_InsertSubPage, 2002). --define(wxTreebook_SetImageList, 2003). --define(wxTreebook_SetPageSize, 2004). --define(wxTreebook_SetPageImage, 2005). --define(wxTreebook_SetPageText, 2006). --define(wxTreebook_SetSelection, 2007). --define(wxTreebook_ChangeSelection, 2008). --define(wxTreebook_destroy, 2009). --define(wxTreeCtrl_new_2, 2012). --define(wxTreeCtrl_new_0, 2013). --define(wxTreeCtrl_destruct, 2015). --define(wxTreeCtrl_AddRoot, 2016). --define(wxTreeCtrl_AppendItem, 2017). --define(wxTreeCtrl_AssignImageList, 2018). --define(wxTreeCtrl_AssignStateImageList, 2019). --define(wxTreeCtrl_Collapse, 2020). --define(wxTreeCtrl_CollapseAndReset, 2021). --define(wxTreeCtrl_Create, 2022). --define(wxTreeCtrl_Delete, 2023). --define(wxTreeCtrl_DeleteAllItems, 2024). --define(wxTreeCtrl_DeleteChildren, 2025). --define(wxTreeCtrl_EditLabel, 2026). --define(wxTreeCtrl_EnsureVisible, 2027). --define(wxTreeCtrl_Expand, 2028). --define(wxTreeCtrl_GetBoundingRect, 2029). --define(wxTreeCtrl_GetChildrenCount, 2031). --define(wxTreeCtrl_GetCount, 2032). --define(wxTreeCtrl_GetEditControl, 2033). --define(wxTreeCtrl_GetFirstChild, 2034). --define(wxTreeCtrl_GetNextChild, 2035). --define(wxTreeCtrl_GetFirstVisibleItem, 2036). --define(wxTreeCtrl_GetImageList, 2037). --define(wxTreeCtrl_GetIndent, 2038). --define(wxTreeCtrl_GetItemBackgroundColour, 2039). --define(wxTreeCtrl_GetItemData, 2040). --define(wxTreeCtrl_GetItemFont, 2041). --define(wxTreeCtrl_GetItemImage_1, 2042). --define(wxTreeCtrl_GetItemImage_2, 2043). --define(wxTreeCtrl_GetItemText, 2044). --define(wxTreeCtrl_GetItemTextColour, 2045). --define(wxTreeCtrl_GetLastChild, 2046). --define(wxTreeCtrl_GetNextSibling, 2047). --define(wxTreeCtrl_GetNextVisible, 2048). --define(wxTreeCtrl_GetItemParent, 2049). --define(wxTreeCtrl_GetPrevSibling, 2050). --define(wxTreeCtrl_GetPrevVisible, 2051). --define(wxTreeCtrl_GetRootItem, 2052). --define(wxTreeCtrl_GetSelection, 2053). --define(wxTreeCtrl_GetSelections, 2054). --define(wxTreeCtrl_GetStateImageList, 2055). --define(wxTreeCtrl_HitTest, 2056). --define(wxTreeCtrl_InsertItem, 2058). --define(wxTreeCtrl_IsBold, 2059). --define(wxTreeCtrl_IsExpanded, 2060). --define(wxTreeCtrl_IsSelected, 2061). --define(wxTreeCtrl_IsVisible, 2062). --define(wxTreeCtrl_ItemHasChildren, 2063). --define(wxTreeCtrl_IsTreeItemIdOk, 2064). --define(wxTreeCtrl_PrependItem, 2065). --define(wxTreeCtrl_ScrollTo, 2066). --define(wxTreeCtrl_SelectItem_1, 2067). --define(wxTreeCtrl_SelectItem_2, 2068). --define(wxTreeCtrl_SetIndent, 2069). --define(wxTreeCtrl_SetImageList, 2070). --define(wxTreeCtrl_SetItemBackgroundColour, 2071). --define(wxTreeCtrl_SetItemBold, 2072). --define(wxTreeCtrl_SetItemData, 2073). --define(wxTreeCtrl_SetItemDropHighlight, 2074). --define(wxTreeCtrl_SetItemFont, 2075). --define(wxTreeCtrl_SetItemHasChildren, 2076). --define(wxTreeCtrl_SetItemImage_2, 2077). --define(wxTreeCtrl_SetItemImage_3, 2078). --define(wxTreeCtrl_SetItemText, 2079). --define(wxTreeCtrl_SetItemTextColour, 2080). --define(wxTreeCtrl_SetStateImageList, 2081). --define(wxTreeCtrl_SetWindowStyle, 2082). --define(wxTreeCtrl_SortChildren, 2083). --define(wxTreeCtrl_Toggle, 2084). --define(wxTreeCtrl_ToggleItemSelection, 2085). --define(wxTreeCtrl_Unselect, 2086). --define(wxTreeCtrl_UnselectAll, 2087). --define(wxTreeCtrl_UnselectItem, 2088). --define(wxScrollBar_new_0, 2089). --define(wxScrollBar_new_3, 2090). --define(wxScrollBar_destruct, 2091). --define(wxScrollBar_Create, 2092). --define(wxScrollBar_GetRange, 2093). --define(wxScrollBar_GetPageSize, 2094). --define(wxScrollBar_GetThumbPosition, 2095). --define(wxScrollBar_GetThumbSize, 2096). --define(wxScrollBar_SetThumbPosition, 2097). --define(wxScrollBar_SetScrollbar, 2098). --define(wxSpinButton_new_2, 2100). --define(wxSpinButton_new_0, 2101). --define(wxSpinButton_Create, 2102). --define(wxSpinButton_GetMax, 2103). --define(wxSpinButton_GetMin, 2104). --define(wxSpinButton_GetValue, 2105). --define(wxSpinButton_SetRange, 2106). --define(wxSpinButton_SetValue, 2107). --define(wxSpinButton_destroy, 2108). --define(wxSpinCtrl_new_0, 2109). --define(wxSpinCtrl_new_2, 2110). --define(wxSpinCtrl_Create, 2112). --define(wxSpinCtrl_SetValue_1_1, 2115). --define(wxSpinCtrl_SetValue_1_0, 2116). --define(wxSpinCtrl_GetValue, 2118). --define(wxSpinCtrl_SetRange, 2120). --define(wxSpinCtrl_SetSelection, 2121). --define(wxSpinCtrl_GetMin, 2123). --define(wxSpinCtrl_GetMax, 2125). --define(wxSpinCtrl_destroy, 2126). --define(wxStaticText_new_0, 2127). --define(wxStaticText_new_4, 2128). --define(wxStaticText_Create, 2129). --define(wxStaticText_GetLabel, 2130). --define(wxStaticText_SetLabel, 2131). --define(wxStaticText_Wrap, 2132). --define(wxStaticText_destroy, 2133). --define(wxStaticBitmap_new_0, 2134). --define(wxStaticBitmap_new_4, 2135). --define(wxStaticBitmap_Create, 2136). --define(wxStaticBitmap_GetBitmap, 2137). --define(wxStaticBitmap_SetBitmap, 2138). --define(wxStaticBitmap_destroy, 2139). --define(wxRadioBox_new, 2140). --define(wxRadioBox_destruct, 2142). --define(wxRadioBox_Create, 2143). --define(wxRadioBox_Enable_2, 2144). --define(wxRadioBox_Enable_1, 2145). --define(wxRadioBox_GetSelection, 2146). --define(wxRadioBox_GetString, 2147). --define(wxRadioBox_SetSelection, 2148). --define(wxRadioBox_Show_2, 2149). --define(wxRadioBox_Show_1, 2150). --define(wxRadioBox_GetColumnCount, 2151). --define(wxRadioBox_GetItemHelpText, 2152). --define(wxRadioBox_GetItemToolTip, 2153). --define(wxRadioBox_GetItemFromPoint, 2155). --define(wxRadioBox_GetRowCount, 2156). --define(wxRadioBox_IsItemEnabled, 2157). --define(wxRadioBox_IsItemShown, 2158). --define(wxRadioBox_SetItemHelpText, 2159). --define(wxRadioBox_SetItemToolTip, 2160). --define(wxRadioButton_new_0, 2161). --define(wxRadioButton_new_4, 2162). --define(wxRadioButton_Create, 2163). --define(wxRadioButton_GetValue, 2164). --define(wxRadioButton_SetValue, 2165). --define(wxRadioButton_destroy, 2166). --define(wxSlider_new_6, 2168). --define(wxSlider_new_0, 2169). --define(wxSlider_Create, 2170). --define(wxSlider_GetLineSize, 2171). --define(wxSlider_GetMax, 2172). --define(wxSlider_GetMin, 2173). --define(wxSlider_GetPageSize, 2174). --define(wxSlider_GetThumbLength, 2175). --define(wxSlider_GetValue, 2176). --define(wxSlider_SetLineSize, 2177). --define(wxSlider_SetPageSize, 2178). --define(wxSlider_SetRange, 2179). --define(wxSlider_SetThumbLength, 2180). --define(wxSlider_SetValue, 2181). --define(wxSlider_destroy, 2182). --define(wxDialog_new_4, 2184). --define(wxDialog_new_0, 2185). --define(wxDialog_destruct, 2187). --define(wxDialog_Create, 2188). --define(wxDialog_CreateButtonSizer, 2189). --define(wxDialog_CreateStdDialogButtonSizer, 2190). --define(wxDialog_EndModal, 2191). --define(wxDialog_GetAffirmativeId, 2192). --define(wxDialog_GetReturnCode, 2193). --define(wxDialog_IsModal, 2194). --define(wxDialog_SetAffirmativeId, 2195). --define(wxDialog_SetReturnCode, 2196). --define(wxDialog_Show, 2197). --define(wxDialog_ShowModal, 2198). --define(wxColourDialog_new_0, 2199). --define(wxColourDialog_new_2, 2200). --define(wxColourDialog_destruct, 2201). --define(wxColourDialog_Create, 2202). --define(wxColourDialog_GetColourData, 2203). --define(wxColourData_new_0, 2204). --define(wxColourData_new_1, 2205). --define(wxColourData_destruct, 2206). --define(wxColourData_GetChooseFull, 2207). --define(wxColourData_GetColour, 2208). --define(wxColourData_GetCustomColour, 2210). --define(wxColourData_SetChooseFull, 2211). --define(wxColourData_SetColour, 2212). --define(wxColourData_SetCustomColour, 2213). --define(wxPalette_new_0, 2214). --define(wxPalette_new_4, 2215). --define(wxPalette_destruct, 2217). --define(wxPalette_Create, 2218). --define(wxPalette_GetColoursCount, 2219). --define(wxPalette_GetPixel, 2220). --define(wxPalette_GetRGB, 2221). --define(wxPalette_IsOk, 2222). --define(wxDirDialog_new, 2226). --define(wxDirDialog_destruct, 2227). --define(wxDirDialog_GetPath, 2228). --define(wxDirDialog_GetMessage, 2229). --define(wxDirDialog_SetMessage, 2230). --define(wxDirDialog_SetPath, 2231). --define(wxFileDialog_new, 2235). --define(wxFileDialog_destruct, 2236). --define(wxFileDialog_GetDirectory, 2237). --define(wxFileDialog_GetFilename, 2238). --define(wxFileDialog_GetFilenames, 2239). --define(wxFileDialog_GetFilterIndex, 2240). --define(wxFileDialog_GetMessage, 2241). --define(wxFileDialog_GetPath, 2242). --define(wxFileDialog_GetPaths, 2243). --define(wxFileDialog_GetWildcard, 2244). --define(wxFileDialog_SetDirectory, 2245). --define(wxFileDialog_SetFilename, 2246). --define(wxFileDialog_SetFilterIndex, 2247). --define(wxFileDialog_SetMessage, 2248). --define(wxFileDialog_SetPath, 2249). --define(wxFileDialog_SetWildcard, 2250). --define(wxPickerBase_SetInternalMargin, 2251). --define(wxPickerBase_GetInternalMargin, 2252). --define(wxPickerBase_SetTextCtrlProportion, 2253). --define(wxPickerBase_SetPickerCtrlProportion, 2254). --define(wxPickerBase_GetTextCtrlProportion, 2255). --define(wxPickerBase_GetPickerCtrlProportion, 2256). --define(wxPickerBase_HasTextCtrl, 2257). --define(wxPickerBase_GetTextCtrl, 2258). --define(wxPickerBase_IsTextCtrlGrowable, 2259). --define(wxPickerBase_SetPickerCtrlGrowable, 2260). --define(wxPickerBase_SetTextCtrlGrowable, 2261). --define(wxPickerBase_IsPickerCtrlGrowable, 2262). --define(wxFilePickerCtrl_new_0, 2263). --define(wxFilePickerCtrl_new_3, 2264). --define(wxFilePickerCtrl_Create, 2265). --define(wxFilePickerCtrl_GetPath, 2266). --define(wxFilePickerCtrl_SetPath, 2267). --define(wxFilePickerCtrl_destroy, 2268). --define(wxDirPickerCtrl_new_0, 2269). --define(wxDirPickerCtrl_new_3, 2270). --define(wxDirPickerCtrl_Create, 2271). --define(wxDirPickerCtrl_GetPath, 2272). --define(wxDirPickerCtrl_SetPath, 2273). --define(wxDirPickerCtrl_destroy, 2274). --define(wxColourPickerCtrl_new_0, 2275). --define(wxColourPickerCtrl_new_3, 2276). --define(wxColourPickerCtrl_Create, 2277). --define(wxColourPickerCtrl_GetColour, 2278). --define(wxColourPickerCtrl_SetColour_1_1, 2279). --define(wxColourPickerCtrl_SetColour_1_0, 2280). --define(wxColourPickerCtrl_destroy, 2281). --define(wxDatePickerCtrl_new_0, 2282). --define(wxDatePickerCtrl_new_3, 2283). --define(wxDatePickerCtrl_GetRange, 2284). --define(wxDatePickerCtrl_GetValue, 2285). --define(wxDatePickerCtrl_SetRange, 2286). --define(wxDatePickerCtrl_SetValue, 2287). --define(wxDatePickerCtrl_destroy, 2288). --define(wxFontPickerCtrl_new_0, 2289). --define(wxFontPickerCtrl_new_3, 2290). --define(wxFontPickerCtrl_Create, 2291). --define(wxFontPickerCtrl_GetSelectedFont, 2292). --define(wxFontPickerCtrl_SetSelectedFont, 2293). --define(wxFontPickerCtrl_GetMaxPointSize, 2294). --define(wxFontPickerCtrl_SetMaxPointSize, 2295). --define(wxFontPickerCtrl_destroy, 2296). --define(wxFindReplaceDialog_new_0, 2299). --define(wxFindReplaceDialog_new_4, 2300). --define(wxFindReplaceDialog_destruct, 2301). --define(wxFindReplaceDialog_Create, 2302). --define(wxFindReplaceDialog_GetData, 2303). --define(wxFindReplaceData_new_0, 2304). --define(wxFindReplaceData_new_1, 2305). --define(wxFindReplaceData_GetFindString, 2306). --define(wxFindReplaceData_GetReplaceString, 2307). --define(wxFindReplaceData_GetFlags, 2308). --define(wxFindReplaceData_SetFlags, 2309). --define(wxFindReplaceData_SetFindString, 2310). --define(wxFindReplaceData_SetReplaceString, 2311). --define(wxFindReplaceData_destroy, 2312). --define(wxMultiChoiceDialog_new_0, 2313). --define(wxMultiChoiceDialog_new_5, 2315). --define(wxMultiChoiceDialog_GetSelections, 2316). --define(wxMultiChoiceDialog_SetSelections, 2317). --define(wxMultiChoiceDialog_destroy, 2318). --define(wxSingleChoiceDialog_new_0, 2319). --define(wxSingleChoiceDialog_new_5, 2321). --define(wxSingleChoiceDialog_GetSelection, 2322). --define(wxSingleChoiceDialog_GetStringSelection, 2323). --define(wxSingleChoiceDialog_SetSelection, 2324). --define(wxSingleChoiceDialog_destroy, 2325). --define(wxTextEntryDialog_new, 2326). --define(wxTextEntryDialog_GetValue, 2327). --define(wxTextEntryDialog_SetValue, 2328). --define(wxTextEntryDialog_destroy, 2329). --define(wxPasswordEntryDialog_new, 2330). --define(wxPasswordEntryDialog_destroy, 2331). --define(wxFontData_new_0, 2332). --define(wxFontData_new_1, 2333). --define(wxFontData_destruct, 2334). --define(wxFontData_EnableEffects, 2335). --define(wxFontData_GetAllowSymbols, 2336). --define(wxFontData_GetColour, 2337). --define(wxFontData_GetChosenFont, 2338). --define(wxFontData_GetEnableEffects, 2339). --define(wxFontData_GetInitialFont, 2340). --define(wxFontData_GetShowHelp, 2341). --define(wxFontData_SetAllowSymbols, 2342). --define(wxFontData_SetChosenFont, 2343). --define(wxFontData_SetColour, 2344). --define(wxFontData_SetInitialFont, 2345). --define(wxFontData_SetRange, 2346). --define(wxFontData_SetShowHelp, 2347). --define(wxFontDialog_new_0, 2351). --define(wxFontDialog_new_2, 2353). --define(wxFontDialog_Create, 2355). --define(wxFontDialog_GetFontData, 2356). --define(wxFontDialog_destroy, 2358). --define(wxProgressDialog_new, 2359). --define(wxProgressDialog_destruct, 2360). --define(wxProgressDialog_Resume, 2361). --define(wxProgressDialog_Update_2, 2362). --define(wxProgressDialog_Update_0, 2363). --define(wxMessageDialog_new, 2364). --define(wxMessageDialog_destruct, 2365). --define(wxPageSetupDialog_new, 2366). --define(wxPageSetupDialog_destruct, 2367). --define(wxPageSetupDialog_GetPageSetupData, 2368). --define(wxPageSetupDialog_ShowModal, 2369). --define(wxPageSetupDialogData_new_0, 2370). --define(wxPageSetupDialogData_new_1_0, 2371). --define(wxPageSetupDialogData_new_1_1, 2372). --define(wxPageSetupDialogData_destruct, 2373). --define(wxPageSetupDialogData_EnableHelp, 2374). --define(wxPageSetupDialogData_EnableMargins, 2375). --define(wxPageSetupDialogData_EnableOrientation, 2376). --define(wxPageSetupDialogData_EnablePaper, 2377). --define(wxPageSetupDialogData_EnablePrinter, 2378). --define(wxPageSetupDialogData_GetDefaultMinMargins, 2379). --define(wxPageSetupDialogData_GetEnableMargins, 2380). --define(wxPageSetupDialogData_GetEnableOrientation, 2381). --define(wxPageSetupDialogData_GetEnablePaper, 2382). --define(wxPageSetupDialogData_GetEnablePrinter, 2383). --define(wxPageSetupDialogData_GetEnableHelp, 2384). --define(wxPageSetupDialogData_GetDefaultInfo, 2385). --define(wxPageSetupDialogData_GetMarginTopLeft, 2386). --define(wxPageSetupDialogData_GetMarginBottomRight, 2387). --define(wxPageSetupDialogData_GetMinMarginTopLeft, 2388). --define(wxPageSetupDialogData_GetMinMarginBottomRight, 2389). --define(wxPageSetupDialogData_GetPaperId, 2390). --define(wxPageSetupDialogData_GetPaperSize, 2391). --define(wxPageSetupDialogData_GetPrintData, 2393). --define(wxPageSetupDialogData_IsOk, 2394). --define(wxPageSetupDialogData_SetDefaultInfo, 2395). --define(wxPageSetupDialogData_SetDefaultMinMargins, 2396). --define(wxPageSetupDialogData_SetMarginTopLeft, 2397). --define(wxPageSetupDialogData_SetMarginBottomRight, 2398). --define(wxPageSetupDialogData_SetMinMarginTopLeft, 2399). --define(wxPageSetupDialogData_SetMinMarginBottomRight, 2400). --define(wxPageSetupDialogData_SetPaperId, 2401). --define(wxPageSetupDialogData_SetPaperSize_1_1, 2402). --define(wxPageSetupDialogData_SetPaperSize_1_0, 2403). --define(wxPageSetupDialogData_SetPrintData, 2404). --define(wxPrintDialog_new_2_0, 2405). --define(wxPrintDialog_new_2_1, 2406). --define(wxPrintDialog_destruct, 2407). --define(wxPrintDialog_GetPrintDialogData, 2408). --define(wxPrintDialog_GetPrintDC, 2409). --define(wxPrintDialogData_new_0, 2410). --define(wxPrintDialogData_new_1_1, 2411). --define(wxPrintDialogData_new_1_0, 2412). --define(wxPrintDialogData_destruct, 2413). --define(wxPrintDialogData_EnableHelp, 2414). --define(wxPrintDialogData_EnablePageNumbers, 2415). --define(wxPrintDialogData_EnablePrintToFile, 2416). --define(wxPrintDialogData_EnableSelection, 2417). --define(wxPrintDialogData_GetAllPages, 2418). --define(wxPrintDialogData_GetCollate, 2419). --define(wxPrintDialogData_GetFromPage, 2420). --define(wxPrintDialogData_GetMaxPage, 2421). --define(wxPrintDialogData_GetMinPage, 2422). --define(wxPrintDialogData_GetNoCopies, 2423). --define(wxPrintDialogData_GetPrintData, 2424). --define(wxPrintDialogData_GetPrintToFile, 2425). --define(wxPrintDialogData_GetSelection, 2426). --define(wxPrintDialogData_GetToPage, 2427). --define(wxPrintDialogData_IsOk, 2428). --define(wxPrintDialogData_SetCollate, 2429). --define(wxPrintDialogData_SetFromPage, 2430). --define(wxPrintDialogData_SetMaxPage, 2431). --define(wxPrintDialogData_SetMinPage, 2432). --define(wxPrintDialogData_SetNoCopies, 2433). --define(wxPrintDialogData_SetPrintData, 2434). --define(wxPrintDialogData_SetPrintToFile, 2435). --define(wxPrintDialogData_SetSelection, 2436). --define(wxPrintDialogData_SetToPage, 2437). --define(wxPrintData_new_0, 2438). --define(wxPrintData_new_1, 2439). --define(wxPrintData_destruct, 2440). --define(wxPrintData_GetCollate, 2441). --define(wxPrintData_GetBin, 2442). --define(wxPrintData_GetColour, 2443). --define(wxPrintData_GetDuplex, 2444). --define(wxPrintData_GetNoCopies, 2445). --define(wxPrintData_GetOrientation, 2446). --define(wxPrintData_GetPaperId, 2447). --define(wxPrintData_GetPrinterName, 2448). --define(wxPrintData_GetQuality, 2449). --define(wxPrintData_IsOk, 2450). --define(wxPrintData_SetBin, 2451). --define(wxPrintData_SetCollate, 2452). --define(wxPrintData_SetColour, 2453). --define(wxPrintData_SetDuplex, 2454). --define(wxPrintData_SetNoCopies, 2455). --define(wxPrintData_SetOrientation, 2456). --define(wxPrintData_SetPaperId, 2457). --define(wxPrintData_SetPrinterName, 2458). --define(wxPrintData_SetQuality, 2459). --define(wxPrintPreview_new_2, 2462). --define(wxPrintPreview_new_3, 2463). --define(wxPrintPreview_destruct, 2465). --define(wxPrintPreview_GetCanvas, 2466). --define(wxPrintPreview_GetCurrentPage, 2467). --define(wxPrintPreview_GetFrame, 2468). --define(wxPrintPreview_GetMaxPage, 2469). --define(wxPrintPreview_GetMinPage, 2470). --define(wxPrintPreview_GetPrintout, 2471). --define(wxPrintPreview_GetPrintoutForPrinting, 2472). --define(wxPrintPreview_IsOk, 2473). --define(wxPrintPreview_PaintPage, 2474). --define(wxPrintPreview_Print, 2475). --define(wxPrintPreview_RenderPage, 2476). --define(wxPrintPreview_SetCanvas, 2477). --define(wxPrintPreview_SetCurrentPage, 2478). --define(wxPrintPreview_SetFrame, 2479). --define(wxPrintPreview_SetPrintout, 2480). --define(wxPrintPreview_SetZoom, 2481). --define(wxPreviewFrame_new, 2482). --define(wxPreviewFrame_destruct, 2483). --define(wxPreviewFrame_CreateControlBar, 2484). --define(wxPreviewFrame_CreateCanvas, 2485). --define(wxPreviewFrame_Initialize, 2486). --define(wxPreviewFrame_OnCloseWindow, 2487). --define(wxPreviewControlBar_new, 2488). --define(wxPreviewControlBar_destruct, 2489). --define(wxPreviewControlBar_CreateButtons, 2490). --define(wxPreviewControlBar_GetPrintPreview, 2491). --define(wxPreviewControlBar_GetZoomControl, 2492). --define(wxPreviewControlBar_SetZoomControl, 2493). --define(wxPrinter_new, 2495). --define(wxPrinter_CreateAbortWindow, 2496). --define(wxPrinter_GetAbort, 2497). --define(wxPrinter_GetLastError, 2498). --define(wxPrinter_GetPrintDialogData, 2499). --define(wxPrinter_Print, 2500). --define(wxPrinter_PrintDialog, 2501). --define(wxPrinter_ReportError, 2502). --define(wxPrinter_Setup, 2503). --define(wxPrinter_destroy, 2504). --define(wxXmlResource_new_1, 2505). --define(wxXmlResource_new_2, 2506). --define(wxXmlResource_destruct, 2507). --define(wxXmlResource_AttachUnknownControl, 2508). --define(wxXmlResource_ClearHandlers, 2509). --define(wxXmlResource_CompareVersion, 2510). --define(wxXmlResource_Get, 2511). --define(wxXmlResource_GetFlags, 2512). --define(wxXmlResource_GetVersion, 2513). --define(wxXmlResource_GetXRCID, 2514). --define(wxXmlResource_InitAllHandlers, 2515). --define(wxXmlResource_Load, 2516). --define(wxXmlResource_LoadBitmap, 2517). --define(wxXmlResource_LoadDialog_2, 2518). --define(wxXmlResource_LoadDialog_3, 2519). --define(wxXmlResource_LoadFrame_2, 2520). --define(wxXmlResource_LoadFrame_3, 2521). --define(wxXmlResource_LoadIcon, 2522). --define(wxXmlResource_LoadMenu, 2523). --define(wxXmlResource_LoadMenuBar_2, 2524). --define(wxXmlResource_LoadMenuBar_1, 2525). --define(wxXmlResource_LoadPanel_2, 2526). --define(wxXmlResource_LoadPanel_3, 2527). --define(wxXmlResource_LoadToolBar, 2528). --define(wxXmlResource_Set, 2529). --define(wxXmlResource_SetFlags, 2530). --define(wxXmlResource_Unload, 2531). --define(wxXmlResource_xrcctrl, 2532). --define(wxHtmlEasyPrinting_new, 2533). --define(wxHtmlEasyPrinting_destruct, 2534). --define(wxHtmlEasyPrinting_GetPrintData, 2535). --define(wxHtmlEasyPrinting_GetPageSetupData, 2536). --define(wxHtmlEasyPrinting_PreviewFile, 2537). --define(wxHtmlEasyPrinting_PreviewText, 2538). --define(wxHtmlEasyPrinting_PrintFile, 2539). --define(wxHtmlEasyPrinting_PrintText, 2540). --define(wxHtmlEasyPrinting_PageSetup, 2541). --define(wxHtmlEasyPrinting_SetFonts, 2542). --define(wxHtmlEasyPrinting_SetHeader, 2543). --define(wxHtmlEasyPrinting_SetFooter, 2544). --define(wxGLCanvas_new_2, 2546). --define(wxGLCanvas_new_3_1, 2547). --define(wxGLCanvas_new_3_0, 2548). --define(wxGLCanvas_GetContext, 2549). --define(wxGLCanvas_SetCurrent, 2551). --define(wxGLCanvas_SwapBuffers, 2552). --define(wxGLCanvas_destroy, 2553). --define(wxAuiManager_new, 2554). --define(wxAuiManager_destruct, 2555). --define(wxAuiManager_AddPane_2_1, 2556). --define(wxAuiManager_AddPane_3, 2557). --define(wxAuiManager_AddPane_2_0, 2558). --define(wxAuiManager_DetachPane, 2559). --define(wxAuiManager_GetAllPanes, 2560). --define(wxAuiManager_GetArtProvider, 2561). --define(wxAuiManager_GetDockSizeConstraint, 2562). --define(wxAuiManager_GetFlags, 2563). --define(wxAuiManager_GetManagedWindow, 2564). --define(wxAuiManager_GetManager, 2565). --define(wxAuiManager_GetPane_1_1, 2566). --define(wxAuiManager_GetPane_1_0, 2567). --define(wxAuiManager_HideHint, 2568). --define(wxAuiManager_InsertPane, 2569). --define(wxAuiManager_LoadPaneInfo, 2570). --define(wxAuiManager_LoadPerspective, 2571). --define(wxAuiManager_SavePaneInfo, 2572). --define(wxAuiManager_SavePerspective, 2573). --define(wxAuiManager_SetArtProvider, 2574). --define(wxAuiManager_SetDockSizeConstraint, 2575). --define(wxAuiManager_SetFlags, 2576). --define(wxAuiManager_SetManagedWindow, 2577). --define(wxAuiManager_ShowHint, 2578). --define(wxAuiManager_UnInit, 2579). --define(wxAuiManager_Update, 2580). --define(wxAuiPaneInfo_new_0, 2581). --define(wxAuiPaneInfo_new_1, 2582). --define(wxAuiPaneInfo_destruct, 2583). --define(wxAuiPaneInfo_BestSize_1, 2584). --define(wxAuiPaneInfo_BestSize_2, 2585). --define(wxAuiPaneInfo_Bottom, 2586). --define(wxAuiPaneInfo_BottomDockable, 2587). --define(wxAuiPaneInfo_Caption, 2588). --define(wxAuiPaneInfo_CaptionVisible, 2589). --define(wxAuiPaneInfo_Centre, 2590). --define(wxAuiPaneInfo_CentrePane, 2591). --define(wxAuiPaneInfo_CloseButton, 2592). --define(wxAuiPaneInfo_DefaultPane, 2593). --define(wxAuiPaneInfo_DestroyOnClose, 2594). --define(wxAuiPaneInfo_Direction, 2595). --define(wxAuiPaneInfo_Dock, 2596). --define(wxAuiPaneInfo_Dockable, 2597). --define(wxAuiPaneInfo_Fixed, 2598). --define(wxAuiPaneInfo_Float, 2599). --define(wxAuiPaneInfo_Floatable, 2600). --define(wxAuiPaneInfo_FloatingPosition_1, 2601). --define(wxAuiPaneInfo_FloatingPosition_2, 2602). --define(wxAuiPaneInfo_FloatingSize_1, 2603). --define(wxAuiPaneInfo_FloatingSize_2, 2604). --define(wxAuiPaneInfo_Gripper, 2605). --define(wxAuiPaneInfo_GripperTop, 2606). --define(wxAuiPaneInfo_HasBorder, 2607). --define(wxAuiPaneInfo_HasCaption, 2608). --define(wxAuiPaneInfo_HasCloseButton, 2609). --define(wxAuiPaneInfo_HasFlag, 2610). --define(wxAuiPaneInfo_HasGripper, 2611). --define(wxAuiPaneInfo_HasGripperTop, 2612). --define(wxAuiPaneInfo_HasMaximizeButton, 2613). --define(wxAuiPaneInfo_HasMinimizeButton, 2614). --define(wxAuiPaneInfo_HasPinButton, 2615). --define(wxAuiPaneInfo_Hide, 2616). --define(wxAuiPaneInfo_IsBottomDockable, 2617). --define(wxAuiPaneInfo_IsDocked, 2618). --define(wxAuiPaneInfo_IsFixed, 2619). --define(wxAuiPaneInfo_IsFloatable, 2620). --define(wxAuiPaneInfo_IsFloating, 2621). --define(wxAuiPaneInfo_IsLeftDockable, 2622). --define(wxAuiPaneInfo_IsMovable, 2623). --define(wxAuiPaneInfo_IsOk, 2624). --define(wxAuiPaneInfo_IsResizable, 2625). --define(wxAuiPaneInfo_IsRightDockable, 2626). --define(wxAuiPaneInfo_IsShown, 2627). --define(wxAuiPaneInfo_IsToolbar, 2628). --define(wxAuiPaneInfo_IsTopDockable, 2629). --define(wxAuiPaneInfo_Layer, 2630). --define(wxAuiPaneInfo_Left, 2631). --define(wxAuiPaneInfo_LeftDockable, 2632). --define(wxAuiPaneInfo_MaxSize_1, 2633). --define(wxAuiPaneInfo_MaxSize_2, 2634). --define(wxAuiPaneInfo_MaximizeButton, 2635). --define(wxAuiPaneInfo_MinSize_1, 2636). --define(wxAuiPaneInfo_MinSize_2, 2637). --define(wxAuiPaneInfo_MinimizeButton, 2638). --define(wxAuiPaneInfo_Movable, 2639). --define(wxAuiPaneInfo_Name, 2640). --define(wxAuiPaneInfo_PaneBorder, 2641). --define(wxAuiPaneInfo_PinButton, 2642). --define(wxAuiPaneInfo_Position, 2643). --define(wxAuiPaneInfo_Resizable, 2644). --define(wxAuiPaneInfo_Right, 2645). --define(wxAuiPaneInfo_RightDockable, 2646). --define(wxAuiPaneInfo_Row, 2647). --define(wxAuiPaneInfo_SafeSet, 2648). --define(wxAuiPaneInfo_SetFlag, 2649). --define(wxAuiPaneInfo_Show, 2650). --define(wxAuiPaneInfo_ToolbarPane, 2651). --define(wxAuiPaneInfo_Top, 2652). --define(wxAuiPaneInfo_TopDockable, 2653). --define(wxAuiPaneInfo_Window, 2654). --define(wxAuiPaneInfo_GetWindow, 2655). --define(wxAuiPaneInfo_GetFrame, 2656). --define(wxAuiPaneInfo_GetDirection, 2657). --define(wxAuiPaneInfo_GetLayer, 2658). --define(wxAuiPaneInfo_GetRow, 2659). --define(wxAuiPaneInfo_GetPosition, 2660). --define(wxAuiPaneInfo_GetFloatingPosition, 2661). --define(wxAuiPaneInfo_GetFloatingSize, 2662). --define(wxAuiNotebook_new_0, 2663). --define(wxAuiNotebook_new_2, 2664). --define(wxAuiNotebook_AddPage, 2665). --define(wxAuiNotebook_Create, 2666). --define(wxAuiNotebook_DeletePage, 2667). --define(wxAuiNotebook_GetArtProvider, 2668). --define(wxAuiNotebook_GetPage, 2669). --define(wxAuiNotebook_GetPageBitmap, 2670). --define(wxAuiNotebook_GetPageCount, 2671). --define(wxAuiNotebook_GetPageIndex, 2672). --define(wxAuiNotebook_GetPageText, 2673). --define(wxAuiNotebook_GetSelection, 2674). --define(wxAuiNotebook_InsertPage, 2675). --define(wxAuiNotebook_RemovePage, 2676). --define(wxAuiNotebook_SetArtProvider, 2677). --define(wxAuiNotebook_SetFont, 2678). --define(wxAuiNotebook_SetPageBitmap, 2679). --define(wxAuiNotebook_SetPageText, 2680). --define(wxAuiNotebook_SetSelection, 2681). --define(wxAuiNotebook_SetTabCtrlHeight, 2682). --define(wxAuiNotebook_SetUniformBitmapSize, 2683). --define(wxAuiNotebook_destroy, 2684). --define(wxAuiTabArt_SetFlags, 2685). --define(wxAuiTabArt_SetMeasuringFont, 2686). --define(wxAuiTabArt_SetNormalFont, 2687). --define(wxAuiTabArt_SetSelectedFont, 2688). --define(wxAuiTabArt_SetColour, 2689). --define(wxAuiTabArt_SetActiveColour, 2690). --define(wxAuiDockArt_GetColour, 2691). --define(wxAuiDockArt_GetFont, 2692). --define(wxAuiDockArt_GetMetric, 2693). --define(wxAuiDockArt_SetColour, 2694). --define(wxAuiDockArt_SetFont, 2695). --define(wxAuiDockArt_SetMetric, 2696). --define(wxAuiSimpleTabArt_new, 2697). --define(wxAuiSimpleTabArt_destroy, 2698). --define(wxMDIParentFrame_new_0, 2699). --define(wxMDIParentFrame_new_4, 2700). --define(wxMDIParentFrame_destruct, 2701). --define(wxMDIParentFrame_ActivateNext, 2702). --define(wxMDIParentFrame_ActivatePrevious, 2703). --define(wxMDIParentFrame_ArrangeIcons, 2704). --define(wxMDIParentFrame_Cascade, 2705). --define(wxMDIParentFrame_Create, 2706). --define(wxMDIParentFrame_GetActiveChild, 2707). --define(wxMDIParentFrame_GetClientWindow, 2708). --define(wxMDIParentFrame_Tile, 2709). --define(wxMDIChildFrame_new_0, 2710). --define(wxMDIChildFrame_new_4, 2711). --define(wxMDIChildFrame_destruct, 2712). --define(wxMDIChildFrame_Activate, 2713). --define(wxMDIChildFrame_Create, 2714). --define(wxMDIChildFrame_Maximize, 2715). --define(wxMDIChildFrame_Restore, 2716). --define(wxMDIClientWindow_new_0, 2717). --define(wxMDIClientWindow_new_2, 2718). --define(wxMDIClientWindow_destruct, 2719). --define(wxMDIClientWindow_CreateClient, 2720). --define(wxLayoutAlgorithm_new, 2721). --define(wxLayoutAlgorithm_LayoutFrame, 2722). --define(wxLayoutAlgorithm_LayoutMDIFrame, 2723). --define(wxLayoutAlgorithm_LayoutWindow, 2724). --define(wxLayoutAlgorithm_destroy, 2725). --define(wxEvent_GetId, 2726). --define(wxEvent_GetSkipped, 2727). --define(wxEvent_GetTimestamp, 2728). --define(wxEvent_IsCommandEvent, 2729). --define(wxEvent_ResumePropagation, 2730). --define(wxEvent_ShouldPropagate, 2731). --define(wxEvent_Skip, 2732). --define(wxEvent_StopPropagation, 2733). --define(wxCommandEvent_getClientData, 2734). --define(wxCommandEvent_GetExtraLong, 2735). --define(wxCommandEvent_GetInt, 2736). --define(wxCommandEvent_GetSelection, 2737). --define(wxCommandEvent_GetString, 2738). --define(wxCommandEvent_IsChecked, 2739). --define(wxCommandEvent_IsSelection, 2740). --define(wxCommandEvent_SetInt, 2741). --define(wxCommandEvent_SetString, 2742). --define(wxScrollEvent_GetOrientation, 2743). --define(wxScrollEvent_GetPosition, 2744). --define(wxScrollWinEvent_GetOrientation, 2745). --define(wxScrollWinEvent_GetPosition, 2746). --define(wxMouseEvent_AltDown, 2747). --define(wxMouseEvent_Button, 2748). --define(wxMouseEvent_ButtonDClick, 2749). --define(wxMouseEvent_ButtonDown, 2750). --define(wxMouseEvent_ButtonUp, 2751). --define(wxMouseEvent_CmdDown, 2752). --define(wxMouseEvent_ControlDown, 2753). --define(wxMouseEvent_Dragging, 2754). --define(wxMouseEvent_Entering, 2755). --define(wxMouseEvent_GetButton, 2756). --define(wxMouseEvent_GetPosition, 2759). --define(wxMouseEvent_GetLogicalPosition, 2760). --define(wxMouseEvent_GetLinesPerAction, 2761). --define(wxMouseEvent_GetWheelRotation, 2762). --define(wxMouseEvent_GetWheelDelta, 2763). --define(wxMouseEvent_GetX, 2764). --define(wxMouseEvent_GetY, 2765). --define(wxMouseEvent_IsButton, 2766). --define(wxMouseEvent_IsPageScroll, 2767). --define(wxMouseEvent_Leaving, 2768). --define(wxMouseEvent_LeftDClick, 2769). --define(wxMouseEvent_LeftDown, 2770). --define(wxMouseEvent_LeftIsDown, 2771). --define(wxMouseEvent_LeftUp, 2772). --define(wxMouseEvent_MetaDown, 2773). --define(wxMouseEvent_MiddleDClick, 2774). --define(wxMouseEvent_MiddleDown, 2775). --define(wxMouseEvent_MiddleIsDown, 2776). --define(wxMouseEvent_MiddleUp, 2777). --define(wxMouseEvent_Moving, 2778). --define(wxMouseEvent_RightDClick, 2779). --define(wxMouseEvent_RightDown, 2780). --define(wxMouseEvent_RightIsDown, 2781). --define(wxMouseEvent_RightUp, 2782). --define(wxMouseEvent_ShiftDown, 2783). --define(wxSetCursorEvent_GetCursor, 2784). --define(wxSetCursorEvent_GetX, 2785). --define(wxSetCursorEvent_GetY, 2786). --define(wxSetCursorEvent_HasCursor, 2787). --define(wxSetCursorEvent_SetCursor, 2788). --define(wxKeyEvent_AltDown, 2789). --define(wxKeyEvent_CmdDown, 2790). --define(wxKeyEvent_ControlDown, 2791). --define(wxKeyEvent_GetKeyCode, 2792). --define(wxKeyEvent_GetModifiers, 2793). --define(wxKeyEvent_GetPosition, 2796). --define(wxKeyEvent_GetRawKeyCode, 2797). --define(wxKeyEvent_GetRawKeyFlags, 2798). --define(wxKeyEvent_GetUnicodeKey, 2799). --define(wxKeyEvent_GetX, 2800). --define(wxKeyEvent_GetY, 2801). --define(wxKeyEvent_HasModifiers, 2802). --define(wxKeyEvent_MetaDown, 2803). --define(wxKeyEvent_ShiftDown, 2804). --define(wxSizeEvent_GetSize, 2805). --define(wxMoveEvent_GetPosition, 2806). --define(wxEraseEvent_GetDC, 2807). --define(wxFocusEvent_GetWindow, 2808). --define(wxChildFocusEvent_GetWindow, 2809). --define(wxMenuEvent_GetMenu, 2810). --define(wxMenuEvent_GetMenuId, 2811). --define(wxMenuEvent_IsPopup, 2812). --define(wxCloseEvent_CanVeto, 2813). --define(wxCloseEvent_GetLoggingOff, 2814). --define(wxCloseEvent_SetCanVeto, 2815). --define(wxCloseEvent_SetLoggingOff, 2816). --define(wxCloseEvent_Veto, 2817). --define(wxShowEvent_SetShow, 2818). --define(wxShowEvent_GetShow, 2819). --define(wxIconizeEvent_Iconized, 2820). --define(wxJoystickEvent_ButtonDown, 2821). --define(wxJoystickEvent_ButtonIsDown, 2822). --define(wxJoystickEvent_ButtonUp, 2823). --define(wxJoystickEvent_GetButtonChange, 2824). --define(wxJoystickEvent_GetButtonState, 2825). --define(wxJoystickEvent_GetJoystick, 2826). --define(wxJoystickEvent_GetPosition, 2827). --define(wxJoystickEvent_GetZPosition, 2828). --define(wxJoystickEvent_IsButton, 2829). --define(wxJoystickEvent_IsMove, 2830). --define(wxJoystickEvent_IsZMove, 2831). --define(wxUpdateUIEvent_CanUpdate, 2832). --define(wxUpdateUIEvent_Check, 2833). --define(wxUpdateUIEvent_Enable, 2834). --define(wxUpdateUIEvent_Show, 2835). --define(wxUpdateUIEvent_GetChecked, 2836). --define(wxUpdateUIEvent_GetEnabled, 2837). --define(wxUpdateUIEvent_GetShown, 2838). --define(wxUpdateUIEvent_GetSetChecked, 2839). --define(wxUpdateUIEvent_GetSetEnabled, 2840). --define(wxUpdateUIEvent_GetSetShown, 2841). --define(wxUpdateUIEvent_GetSetText, 2842). --define(wxUpdateUIEvent_GetText, 2843). --define(wxUpdateUIEvent_GetMode, 2844). --define(wxUpdateUIEvent_GetUpdateInterval, 2845). --define(wxUpdateUIEvent_ResetUpdateTime, 2846). --define(wxUpdateUIEvent_SetMode, 2847). --define(wxUpdateUIEvent_SetText, 2848). --define(wxUpdateUIEvent_SetUpdateInterval, 2849). --define(wxMouseCaptureChangedEvent_GetCapturedWindow, 2850). --define(wxPaletteChangedEvent_SetChangedWindow, 2851). --define(wxPaletteChangedEvent_GetChangedWindow, 2852). --define(wxQueryNewPaletteEvent_SetPaletteRealized, 2853). --define(wxQueryNewPaletteEvent_GetPaletteRealized, 2854). --define(wxNavigationKeyEvent_GetDirection, 2855). --define(wxNavigationKeyEvent_SetDirection, 2856). --define(wxNavigationKeyEvent_IsWindowChange, 2857). --define(wxNavigationKeyEvent_SetWindowChange, 2858). --define(wxNavigationKeyEvent_IsFromTab, 2859). --define(wxNavigationKeyEvent_SetFromTab, 2860). --define(wxNavigationKeyEvent_GetCurrentFocus, 2861). --define(wxNavigationKeyEvent_SetCurrentFocus, 2862). --define(wxHelpEvent_GetOrigin, 2863). --define(wxHelpEvent_GetPosition, 2864). --define(wxHelpEvent_SetOrigin, 2865). --define(wxHelpEvent_SetPosition, 2866). --define(wxContextMenuEvent_GetPosition, 2867). --define(wxContextMenuEvent_SetPosition, 2868). --define(wxIdleEvent_CanSend, 2869). --define(wxIdleEvent_GetMode, 2870). --define(wxIdleEvent_RequestMore, 2871). --define(wxIdleEvent_MoreRequested, 2872). --define(wxIdleEvent_SetMode, 2873). --define(wxGridEvent_AltDown, 2874). --define(wxGridEvent_ControlDown, 2875). --define(wxGridEvent_GetCol, 2876). --define(wxGridEvent_GetPosition, 2877). --define(wxGridEvent_GetRow, 2878). --define(wxGridEvent_MetaDown, 2879). --define(wxGridEvent_Selecting, 2880). --define(wxGridEvent_ShiftDown, 2881). --define(wxNotifyEvent_Allow, 2882). --define(wxNotifyEvent_IsAllowed, 2883). --define(wxNotifyEvent_Veto, 2884). --define(wxSashEvent_GetEdge, 2885). --define(wxSashEvent_GetDragRect, 2886). --define(wxSashEvent_GetDragStatus, 2887). --define(wxListEvent_GetCacheFrom, 2888). --define(wxListEvent_GetCacheTo, 2889). --define(wxListEvent_GetKeyCode, 2890). --define(wxListEvent_GetIndex, 2891). --define(wxListEvent_GetColumn, 2892). --define(wxListEvent_GetPoint, 2893). --define(wxListEvent_GetLabel, 2894). --define(wxListEvent_GetText, 2895). --define(wxListEvent_GetImage, 2896). --define(wxListEvent_GetData, 2897). --define(wxListEvent_GetMask, 2898). --define(wxListEvent_GetItem, 2899). --define(wxListEvent_IsEditCancelled, 2900). --define(wxDateEvent_GetDate, 2901). --define(wxCalendarEvent_GetWeekDay, 2902). --define(wxFileDirPickerEvent_GetPath, 2903). --define(wxColourPickerEvent_GetColour, 2904). --define(wxFontPickerEvent_GetFont, 2905). --define(wxStyledTextEvent_GetPosition, 2906). --define(wxStyledTextEvent_GetKey, 2907). --define(wxStyledTextEvent_GetModifiers, 2908). --define(wxStyledTextEvent_GetModificationType, 2909). --define(wxStyledTextEvent_GetText, 2910). --define(wxStyledTextEvent_GetLength, 2911). --define(wxStyledTextEvent_GetLinesAdded, 2912). --define(wxStyledTextEvent_GetLine, 2913). --define(wxStyledTextEvent_GetFoldLevelNow, 2914). --define(wxStyledTextEvent_GetFoldLevelPrev, 2915). --define(wxStyledTextEvent_GetMargin, 2916). --define(wxStyledTextEvent_GetMessage, 2917). --define(wxStyledTextEvent_GetWParam, 2918). --define(wxStyledTextEvent_GetLParam, 2919). --define(wxStyledTextEvent_GetListType, 2920). --define(wxStyledTextEvent_GetX, 2921). --define(wxStyledTextEvent_GetY, 2922). --define(wxStyledTextEvent_GetDragText, 2923). --define(wxStyledTextEvent_GetDragAllowMove, 2924). --define(wxStyledTextEvent_GetDragResult, 2925). --define(wxStyledTextEvent_GetShift, 2926). --define(wxStyledTextEvent_GetControl, 2927). --define(wxStyledTextEvent_GetAlt, 2928). --define(utils_wxGetKeyState, 2929). --define(utils_wxGetMousePosition, 2930). --define(utils_wxGetMouseState, 2931). --define(utils_wxSetDetectableAutoRepeat, 2932). --define(utils_wxBell, 2933). --define(utils_wxFindMenuItemId, 2934). --define(utils_wxGenericFindWindowAtPoint, 2935). --define(utils_wxFindWindowAtPoint, 2936). --define(utils_wxBeginBusyCursor, 2937). --define(utils_wxEndBusyCursor, 2938). --define(utils_wxIsBusy, 2939). --define(utils_wxShutdown, 2940). --define(utils_wxShell, 2941). --define(utils_wxLaunchDefaultBrowser, 2942). --define(utils_wxGetEmailAddress, 2943). --define(utils_wxGetUserId, 2944). --define(utils_wxGetHomeDir, 2945). --define(utils_wxNewId, 2946). --define(utils_wxRegisterId, 2947). --define(utils_wxGetCurrentId, 2948). --define(utils_wxGetOsDescription, 2949). --define(utils_wxIsPlatformLittleEndian, 2950). --define(utils_wxIsPlatform64Bit, 2951). --define(gdicmn_wxDisplaySize, 2952). --define(gdicmn_wxSetCursor, 2953). --define(wxPrintout_new, 2954). --define(wxPrintout_destruct, 2955). --define(wxPrintout_GetDC, 2956). --define(wxPrintout_GetPageSizeMM, 2957). --define(wxPrintout_GetPageSizePixels, 2958). --define(wxPrintout_GetPaperRectPixels, 2959). --define(wxPrintout_GetPPIPrinter, 2960). --define(wxPrintout_GetPPIScreen, 2961). --define(wxPrintout_GetTitle, 2962). --define(wxPrintout_IsPreview, 2963). --define(wxPrintout_FitThisSizeToPaper, 2964). --define(wxPrintout_FitThisSizeToPage, 2965). --define(wxPrintout_FitThisSizeToPageMargins, 2966). --define(wxPrintout_MapScreenSizeToPaper, 2967). --define(wxPrintout_MapScreenSizeToPage, 2968). --define(wxPrintout_MapScreenSizeToPageMargins, 2969). --define(wxPrintout_MapScreenSizeToDevice, 2970). --define(wxPrintout_GetLogicalPaperRect, 2971). --define(wxPrintout_GetLogicalPageRect, 2972). --define(wxPrintout_GetLogicalPageMarginsRect, 2973). --define(wxPrintout_SetLogicalOrigin, 2974). --define(wxPrintout_OffsetLogicalOrigin, 2975). --define(wxStyledTextCtrl_new_2, 2976). --define(wxStyledTextCtrl_new_0, 2977). --define(wxStyledTextCtrl_destruct, 2978). --define(wxStyledTextCtrl_Create, 2979). --define(wxStyledTextCtrl_AddText, 2980). --define(wxStyledTextCtrl_AddStyledText, 2981). --define(wxStyledTextCtrl_InsertText, 2982). --define(wxStyledTextCtrl_ClearAll, 2983). --define(wxStyledTextCtrl_ClearDocumentStyle, 2984). --define(wxStyledTextCtrl_GetLength, 2985). --define(wxStyledTextCtrl_GetCharAt, 2986). --define(wxStyledTextCtrl_GetCurrentPos, 2987). --define(wxStyledTextCtrl_GetAnchor, 2988). --define(wxStyledTextCtrl_GetStyleAt, 2989). --define(wxStyledTextCtrl_Redo, 2990). --define(wxStyledTextCtrl_SetUndoCollection, 2991). --define(wxStyledTextCtrl_SelectAll, 2992). --define(wxStyledTextCtrl_SetSavePoint, 2993). --define(wxStyledTextCtrl_GetStyledText, 2994). --define(wxStyledTextCtrl_CanRedo, 2995). --define(wxStyledTextCtrl_MarkerLineFromHandle, 2996). --define(wxStyledTextCtrl_MarkerDeleteHandle, 2997). --define(wxStyledTextCtrl_GetUndoCollection, 2998). --define(wxStyledTextCtrl_GetViewWhiteSpace, 2999). --define(wxStyledTextCtrl_SetViewWhiteSpace, 3000). --define(wxStyledTextCtrl_PositionFromPoint, 3001). --define(wxStyledTextCtrl_PositionFromPointClose, 3002). --define(wxStyledTextCtrl_GotoLine, 3003). --define(wxStyledTextCtrl_GotoPos, 3004). --define(wxStyledTextCtrl_SetAnchor, 3005). --define(wxStyledTextCtrl_GetCurLine, 3006). --define(wxStyledTextCtrl_GetEndStyled, 3007). --define(wxStyledTextCtrl_ConvertEOLs, 3008). --define(wxStyledTextCtrl_GetEOLMode, 3009). --define(wxStyledTextCtrl_SetEOLMode, 3010). --define(wxStyledTextCtrl_StartStyling, 3011). --define(wxStyledTextCtrl_SetStyling, 3012). --define(wxStyledTextCtrl_GetBufferedDraw, 3013). --define(wxStyledTextCtrl_SetBufferedDraw, 3014). --define(wxStyledTextCtrl_SetTabWidth, 3015). --define(wxStyledTextCtrl_GetTabWidth, 3016). --define(wxStyledTextCtrl_SetCodePage, 3017). --define(wxStyledTextCtrl_MarkerDefine, 3018). --define(wxStyledTextCtrl_MarkerSetForeground, 3019). --define(wxStyledTextCtrl_MarkerSetBackground, 3020). --define(wxStyledTextCtrl_MarkerAdd, 3021). --define(wxStyledTextCtrl_MarkerDelete, 3022). --define(wxStyledTextCtrl_MarkerDeleteAll, 3023). --define(wxStyledTextCtrl_MarkerGet, 3024). --define(wxStyledTextCtrl_MarkerNext, 3025). --define(wxStyledTextCtrl_MarkerPrevious, 3026). --define(wxStyledTextCtrl_MarkerDefineBitmap, 3027). --define(wxStyledTextCtrl_MarkerAddSet, 3028). --define(wxStyledTextCtrl_MarkerSetAlpha, 3029). --define(wxStyledTextCtrl_SetMarginType, 3030). --define(wxStyledTextCtrl_GetMarginType, 3031). --define(wxStyledTextCtrl_SetMarginWidth, 3032). --define(wxStyledTextCtrl_GetMarginWidth, 3033). --define(wxStyledTextCtrl_SetMarginMask, 3034). --define(wxStyledTextCtrl_GetMarginMask, 3035). --define(wxStyledTextCtrl_SetMarginSensitive, 3036). --define(wxStyledTextCtrl_GetMarginSensitive, 3037). --define(wxStyledTextCtrl_StyleClearAll, 3038). --define(wxStyledTextCtrl_StyleSetForeground, 3039). --define(wxStyledTextCtrl_StyleSetBackground, 3040). --define(wxStyledTextCtrl_StyleSetBold, 3041). --define(wxStyledTextCtrl_StyleSetItalic, 3042). --define(wxStyledTextCtrl_StyleSetSize, 3043). --define(wxStyledTextCtrl_StyleSetFaceName, 3044). --define(wxStyledTextCtrl_StyleSetEOLFilled, 3045). --define(wxStyledTextCtrl_StyleResetDefault, 3046). --define(wxStyledTextCtrl_StyleSetUnderline, 3047). --define(wxStyledTextCtrl_StyleSetCase, 3048). --define(wxStyledTextCtrl_StyleSetHotSpot, 3049). --define(wxStyledTextCtrl_SetSelForeground, 3050). --define(wxStyledTextCtrl_SetSelBackground, 3051). --define(wxStyledTextCtrl_GetSelAlpha, 3052). --define(wxStyledTextCtrl_SetSelAlpha, 3053). --define(wxStyledTextCtrl_SetCaretForeground, 3054). --define(wxStyledTextCtrl_CmdKeyAssign, 3055). --define(wxStyledTextCtrl_CmdKeyClear, 3056). --define(wxStyledTextCtrl_CmdKeyClearAll, 3057). --define(wxStyledTextCtrl_SetStyleBytes, 3058). --define(wxStyledTextCtrl_StyleSetVisible, 3059). --define(wxStyledTextCtrl_GetCaretPeriod, 3060). --define(wxStyledTextCtrl_SetCaretPeriod, 3061). --define(wxStyledTextCtrl_SetWordChars, 3062). --define(wxStyledTextCtrl_BeginUndoAction, 3063). --define(wxStyledTextCtrl_EndUndoAction, 3064). --define(wxStyledTextCtrl_IndicatorSetStyle, 3065). --define(wxStyledTextCtrl_IndicatorGetStyle, 3066). --define(wxStyledTextCtrl_IndicatorSetForeground, 3067). --define(wxStyledTextCtrl_IndicatorGetForeground, 3068). --define(wxStyledTextCtrl_SetWhitespaceForeground, 3069). --define(wxStyledTextCtrl_SetWhitespaceBackground, 3070). --define(wxStyledTextCtrl_GetStyleBits, 3071). --define(wxStyledTextCtrl_SetLineState, 3072). --define(wxStyledTextCtrl_GetLineState, 3073). --define(wxStyledTextCtrl_GetMaxLineState, 3074). --define(wxStyledTextCtrl_GetCaretLineVisible, 3075). --define(wxStyledTextCtrl_SetCaretLineVisible, 3076). --define(wxStyledTextCtrl_GetCaretLineBackground, 3077). --define(wxStyledTextCtrl_SetCaretLineBackground, 3078). --define(wxStyledTextCtrl_AutoCompShow, 3079). --define(wxStyledTextCtrl_AutoCompCancel, 3080). --define(wxStyledTextCtrl_AutoCompActive, 3081). --define(wxStyledTextCtrl_AutoCompPosStart, 3082). --define(wxStyledTextCtrl_AutoCompComplete, 3083). --define(wxStyledTextCtrl_AutoCompStops, 3084). --define(wxStyledTextCtrl_AutoCompSetSeparator, 3085). --define(wxStyledTextCtrl_AutoCompGetSeparator, 3086). --define(wxStyledTextCtrl_AutoCompSelect, 3087). --define(wxStyledTextCtrl_AutoCompSetCancelAtStart, 3088). --define(wxStyledTextCtrl_AutoCompGetCancelAtStart, 3089). --define(wxStyledTextCtrl_AutoCompSetFillUps, 3090). --define(wxStyledTextCtrl_AutoCompSetChooseSingle, 3091). --define(wxStyledTextCtrl_AutoCompGetChooseSingle, 3092). --define(wxStyledTextCtrl_AutoCompSetIgnoreCase, 3093). --define(wxStyledTextCtrl_AutoCompGetIgnoreCase, 3094). --define(wxStyledTextCtrl_UserListShow, 3095). --define(wxStyledTextCtrl_AutoCompSetAutoHide, 3096). --define(wxStyledTextCtrl_AutoCompGetAutoHide, 3097). --define(wxStyledTextCtrl_AutoCompSetDropRestOfWord, 3098). --define(wxStyledTextCtrl_AutoCompGetDropRestOfWord, 3099). --define(wxStyledTextCtrl_RegisterImage, 3100). --define(wxStyledTextCtrl_ClearRegisteredImages, 3101). --define(wxStyledTextCtrl_AutoCompGetTypeSeparator, 3102). --define(wxStyledTextCtrl_AutoCompSetTypeSeparator, 3103). --define(wxStyledTextCtrl_AutoCompSetMaxWidth, 3104). --define(wxStyledTextCtrl_AutoCompGetMaxWidth, 3105). --define(wxStyledTextCtrl_AutoCompSetMaxHeight, 3106). --define(wxStyledTextCtrl_AutoCompGetMaxHeight, 3107). --define(wxStyledTextCtrl_SetIndent, 3108). --define(wxStyledTextCtrl_GetIndent, 3109). --define(wxStyledTextCtrl_SetUseTabs, 3110). --define(wxStyledTextCtrl_GetUseTabs, 3111). --define(wxStyledTextCtrl_SetLineIndentation, 3112). --define(wxStyledTextCtrl_GetLineIndentation, 3113). --define(wxStyledTextCtrl_GetLineIndentPosition, 3114). --define(wxStyledTextCtrl_GetColumn, 3115). --define(wxStyledTextCtrl_SetUseHorizontalScrollBar, 3116). --define(wxStyledTextCtrl_GetUseHorizontalScrollBar, 3117). --define(wxStyledTextCtrl_SetIndentationGuides, 3118). --define(wxStyledTextCtrl_GetIndentationGuides, 3119). --define(wxStyledTextCtrl_SetHighlightGuide, 3120). --define(wxStyledTextCtrl_GetHighlightGuide, 3121). --define(wxStyledTextCtrl_GetLineEndPosition, 3122). --define(wxStyledTextCtrl_GetCodePage, 3123). --define(wxStyledTextCtrl_GetCaretForeground, 3124). --define(wxStyledTextCtrl_GetReadOnly, 3125). --define(wxStyledTextCtrl_SetCurrentPos, 3126). --define(wxStyledTextCtrl_SetSelectionStart, 3127). --define(wxStyledTextCtrl_GetSelectionStart, 3128). --define(wxStyledTextCtrl_SetSelectionEnd, 3129). --define(wxStyledTextCtrl_GetSelectionEnd, 3130). --define(wxStyledTextCtrl_SetPrintMagnification, 3131). --define(wxStyledTextCtrl_GetPrintMagnification, 3132). --define(wxStyledTextCtrl_SetPrintColourMode, 3133). --define(wxStyledTextCtrl_GetPrintColourMode, 3134). --define(wxStyledTextCtrl_FindText, 3135). --define(wxStyledTextCtrl_FormatRange, 3136). --define(wxStyledTextCtrl_GetFirstVisibleLine, 3137). --define(wxStyledTextCtrl_GetLine, 3138). --define(wxStyledTextCtrl_GetLineCount, 3139). --define(wxStyledTextCtrl_SetMarginLeft, 3140). --define(wxStyledTextCtrl_GetMarginLeft, 3141). --define(wxStyledTextCtrl_SetMarginRight, 3142). --define(wxStyledTextCtrl_GetMarginRight, 3143). --define(wxStyledTextCtrl_GetModify, 3144). --define(wxStyledTextCtrl_SetSelection, 3145). --define(wxStyledTextCtrl_GetSelectedText, 3146). --define(wxStyledTextCtrl_GetTextRange, 3147). --define(wxStyledTextCtrl_HideSelection, 3148). --define(wxStyledTextCtrl_LineFromPosition, 3149). --define(wxStyledTextCtrl_PositionFromLine, 3150). --define(wxStyledTextCtrl_LineScroll, 3151). --define(wxStyledTextCtrl_EnsureCaretVisible, 3152). --define(wxStyledTextCtrl_ReplaceSelection, 3153). --define(wxStyledTextCtrl_SetReadOnly, 3154). --define(wxStyledTextCtrl_CanPaste, 3155). --define(wxStyledTextCtrl_CanUndo, 3156). --define(wxStyledTextCtrl_EmptyUndoBuffer, 3157). --define(wxStyledTextCtrl_Undo, 3158). --define(wxStyledTextCtrl_Cut, 3159). --define(wxStyledTextCtrl_Copy, 3160). --define(wxStyledTextCtrl_Paste, 3161). --define(wxStyledTextCtrl_Clear, 3162). --define(wxStyledTextCtrl_SetText, 3163). --define(wxStyledTextCtrl_GetText, 3164). --define(wxStyledTextCtrl_GetTextLength, 3165). --define(wxStyledTextCtrl_GetOvertype, 3166). --define(wxStyledTextCtrl_SetCaretWidth, 3167). --define(wxStyledTextCtrl_GetCaretWidth, 3168). --define(wxStyledTextCtrl_SetTargetStart, 3169). --define(wxStyledTextCtrl_GetTargetStart, 3170). --define(wxStyledTextCtrl_SetTargetEnd, 3171). --define(wxStyledTextCtrl_GetTargetEnd, 3172). --define(wxStyledTextCtrl_ReplaceTarget, 3173). --define(wxStyledTextCtrl_SearchInTarget, 3174). --define(wxStyledTextCtrl_SetSearchFlags, 3175). --define(wxStyledTextCtrl_GetSearchFlags, 3176). --define(wxStyledTextCtrl_CallTipShow, 3177). --define(wxStyledTextCtrl_CallTipCancel, 3178). --define(wxStyledTextCtrl_CallTipActive, 3179). --define(wxStyledTextCtrl_CallTipPosAtStart, 3180). --define(wxStyledTextCtrl_CallTipSetHighlight, 3181). --define(wxStyledTextCtrl_CallTipSetBackground, 3182). --define(wxStyledTextCtrl_CallTipSetForeground, 3183). --define(wxStyledTextCtrl_CallTipSetForegroundHighlight, 3184). --define(wxStyledTextCtrl_CallTipUseStyle, 3185). --define(wxStyledTextCtrl_VisibleFromDocLine, 3186). --define(wxStyledTextCtrl_DocLineFromVisible, 3187). --define(wxStyledTextCtrl_WrapCount, 3188). --define(wxStyledTextCtrl_SetFoldLevel, 3189). --define(wxStyledTextCtrl_GetFoldLevel, 3190). --define(wxStyledTextCtrl_GetLastChild, 3191). --define(wxStyledTextCtrl_GetFoldParent, 3192). --define(wxStyledTextCtrl_ShowLines, 3193). --define(wxStyledTextCtrl_HideLines, 3194). --define(wxStyledTextCtrl_GetLineVisible, 3195). --define(wxStyledTextCtrl_SetFoldExpanded, 3196). --define(wxStyledTextCtrl_GetFoldExpanded, 3197). --define(wxStyledTextCtrl_ToggleFold, 3198). --define(wxStyledTextCtrl_EnsureVisible, 3199). --define(wxStyledTextCtrl_SetFoldFlags, 3200). --define(wxStyledTextCtrl_EnsureVisibleEnforcePolicy, 3201). --define(wxStyledTextCtrl_SetTabIndents, 3202). --define(wxStyledTextCtrl_GetTabIndents, 3203). --define(wxStyledTextCtrl_SetBackSpaceUnIndents, 3204). --define(wxStyledTextCtrl_GetBackSpaceUnIndents, 3205). --define(wxStyledTextCtrl_SetMouseDwellTime, 3206). --define(wxStyledTextCtrl_GetMouseDwellTime, 3207). --define(wxStyledTextCtrl_WordStartPosition, 3208). --define(wxStyledTextCtrl_WordEndPosition, 3209). --define(wxStyledTextCtrl_SetWrapMode, 3210). --define(wxStyledTextCtrl_GetWrapMode, 3211). --define(wxStyledTextCtrl_SetWrapVisualFlags, 3212). --define(wxStyledTextCtrl_GetWrapVisualFlags, 3213). --define(wxStyledTextCtrl_SetWrapVisualFlagsLocation, 3214). --define(wxStyledTextCtrl_GetWrapVisualFlagsLocation, 3215). --define(wxStyledTextCtrl_SetWrapStartIndent, 3216). --define(wxStyledTextCtrl_GetWrapStartIndent, 3217). --define(wxStyledTextCtrl_SetLayoutCache, 3218). --define(wxStyledTextCtrl_GetLayoutCache, 3219). --define(wxStyledTextCtrl_SetScrollWidth, 3220). --define(wxStyledTextCtrl_GetScrollWidth, 3221). --define(wxStyledTextCtrl_TextWidth, 3222). --define(wxStyledTextCtrl_GetEndAtLastLine, 3223). --define(wxStyledTextCtrl_TextHeight, 3224). --define(wxStyledTextCtrl_SetUseVerticalScrollBar, 3225). --define(wxStyledTextCtrl_GetUseVerticalScrollBar, 3226). --define(wxStyledTextCtrl_AppendText, 3227). --define(wxStyledTextCtrl_GetTwoPhaseDraw, 3228). --define(wxStyledTextCtrl_SetTwoPhaseDraw, 3229). --define(wxStyledTextCtrl_TargetFromSelection, 3230). --define(wxStyledTextCtrl_LinesJoin, 3231). --define(wxStyledTextCtrl_LinesSplit, 3232). --define(wxStyledTextCtrl_SetFoldMarginColour, 3233). --define(wxStyledTextCtrl_SetFoldMarginHiColour, 3234). --define(wxStyledTextCtrl_LineDown, 3235). --define(wxStyledTextCtrl_LineDownExtend, 3236). --define(wxStyledTextCtrl_LineUp, 3237). --define(wxStyledTextCtrl_LineUpExtend, 3238). --define(wxStyledTextCtrl_CharLeft, 3239). --define(wxStyledTextCtrl_CharLeftExtend, 3240). --define(wxStyledTextCtrl_CharRight, 3241). --define(wxStyledTextCtrl_CharRightExtend, 3242). --define(wxStyledTextCtrl_WordLeft, 3243). --define(wxStyledTextCtrl_WordLeftExtend, 3244). --define(wxStyledTextCtrl_WordRight, 3245). --define(wxStyledTextCtrl_WordRightExtend, 3246). --define(wxStyledTextCtrl_Home, 3247). --define(wxStyledTextCtrl_HomeExtend, 3248). --define(wxStyledTextCtrl_LineEnd, 3249). --define(wxStyledTextCtrl_LineEndExtend, 3250). --define(wxStyledTextCtrl_DocumentStart, 3251). --define(wxStyledTextCtrl_DocumentStartExtend, 3252). --define(wxStyledTextCtrl_DocumentEnd, 3253). --define(wxStyledTextCtrl_DocumentEndExtend, 3254). --define(wxStyledTextCtrl_PageUp, 3255). --define(wxStyledTextCtrl_PageUpExtend, 3256). --define(wxStyledTextCtrl_PageDown, 3257). --define(wxStyledTextCtrl_PageDownExtend, 3258). --define(wxStyledTextCtrl_EditToggleOvertype, 3259). --define(wxStyledTextCtrl_Cancel, 3260). --define(wxStyledTextCtrl_DeleteBack, 3261). --define(wxStyledTextCtrl_Tab, 3262). --define(wxStyledTextCtrl_BackTab, 3263). --define(wxStyledTextCtrl_NewLine, 3264). --define(wxStyledTextCtrl_FormFeed, 3265). --define(wxStyledTextCtrl_VCHome, 3266). --define(wxStyledTextCtrl_VCHomeExtend, 3267). --define(wxStyledTextCtrl_ZoomIn, 3268). --define(wxStyledTextCtrl_ZoomOut, 3269). --define(wxStyledTextCtrl_DelWordLeft, 3270). --define(wxStyledTextCtrl_DelWordRight, 3271). --define(wxStyledTextCtrl_LineCut, 3272). --define(wxStyledTextCtrl_LineDelete, 3273). --define(wxStyledTextCtrl_LineTranspose, 3274). --define(wxStyledTextCtrl_LineDuplicate, 3275). --define(wxStyledTextCtrl_LowerCase, 3276). --define(wxStyledTextCtrl_UpperCase, 3277). --define(wxStyledTextCtrl_LineScrollDown, 3278). --define(wxStyledTextCtrl_LineScrollUp, 3279). --define(wxStyledTextCtrl_DeleteBackNotLine, 3280). --define(wxStyledTextCtrl_HomeDisplay, 3281). --define(wxStyledTextCtrl_HomeDisplayExtend, 3282). --define(wxStyledTextCtrl_LineEndDisplay, 3283). --define(wxStyledTextCtrl_LineEndDisplayExtend, 3284). --define(wxStyledTextCtrl_HomeWrapExtend, 3285). --define(wxStyledTextCtrl_LineEndWrap, 3286). --define(wxStyledTextCtrl_LineEndWrapExtend, 3287). --define(wxStyledTextCtrl_VCHomeWrap, 3288). --define(wxStyledTextCtrl_VCHomeWrapExtend, 3289). --define(wxStyledTextCtrl_LineCopy, 3290). --define(wxStyledTextCtrl_MoveCaretInsideView, 3291). --define(wxStyledTextCtrl_LineLength, 3292). --define(wxStyledTextCtrl_BraceHighlight, 3293). --define(wxStyledTextCtrl_BraceBadLight, 3294). --define(wxStyledTextCtrl_BraceMatch, 3295). --define(wxStyledTextCtrl_GetViewEOL, 3296). --define(wxStyledTextCtrl_SetViewEOL, 3297). --define(wxStyledTextCtrl_SetModEventMask, 3298). --define(wxStyledTextCtrl_GetEdgeColumn, 3299). --define(wxStyledTextCtrl_SetEdgeColumn, 3300). --define(wxStyledTextCtrl_SetEdgeMode, 3301). --define(wxStyledTextCtrl_GetEdgeMode, 3302). --define(wxStyledTextCtrl_GetEdgeColour, 3303). --define(wxStyledTextCtrl_SetEdgeColour, 3304). --define(wxStyledTextCtrl_SearchAnchor, 3305). --define(wxStyledTextCtrl_SearchNext, 3306). --define(wxStyledTextCtrl_SearchPrev, 3307). --define(wxStyledTextCtrl_LinesOnScreen, 3308). --define(wxStyledTextCtrl_UsePopUp, 3309). --define(wxStyledTextCtrl_SelectionIsRectangle, 3310). --define(wxStyledTextCtrl_SetZoom, 3311). --define(wxStyledTextCtrl_GetZoom, 3312). --define(wxStyledTextCtrl_GetModEventMask, 3313). --define(wxStyledTextCtrl_SetSTCFocus, 3314). --define(wxStyledTextCtrl_GetSTCFocus, 3315). --define(wxStyledTextCtrl_SetStatus, 3316). --define(wxStyledTextCtrl_GetStatus, 3317). --define(wxStyledTextCtrl_SetMouseDownCaptures, 3318). --define(wxStyledTextCtrl_GetMouseDownCaptures, 3319). --define(wxStyledTextCtrl_SetSTCCursor, 3320). --define(wxStyledTextCtrl_GetSTCCursor, 3321). --define(wxStyledTextCtrl_SetControlCharSymbol, 3322). --define(wxStyledTextCtrl_GetControlCharSymbol, 3323). --define(wxStyledTextCtrl_WordPartLeft, 3324). --define(wxStyledTextCtrl_WordPartLeftExtend, 3325). --define(wxStyledTextCtrl_WordPartRight, 3326). --define(wxStyledTextCtrl_WordPartRightExtend, 3327). --define(wxStyledTextCtrl_SetVisiblePolicy, 3328). --define(wxStyledTextCtrl_DelLineLeft, 3329). --define(wxStyledTextCtrl_DelLineRight, 3330). --define(wxStyledTextCtrl_GetXOffset, 3331). --define(wxStyledTextCtrl_ChooseCaretX, 3332). --define(wxStyledTextCtrl_SetXCaretPolicy, 3333). --define(wxStyledTextCtrl_SetYCaretPolicy, 3334). --define(wxStyledTextCtrl_GetPrintWrapMode, 3335). --define(wxStyledTextCtrl_SetHotspotActiveForeground, 3336). --define(wxStyledTextCtrl_SetHotspotActiveBackground, 3337). --define(wxStyledTextCtrl_SetHotspotActiveUnderline, 3338). --define(wxStyledTextCtrl_SetHotspotSingleLine, 3339). --define(wxStyledTextCtrl_ParaDownExtend, 3340). --define(wxStyledTextCtrl_ParaUp, 3341). --define(wxStyledTextCtrl_ParaUpExtend, 3342). --define(wxStyledTextCtrl_PositionBefore, 3343). --define(wxStyledTextCtrl_PositionAfter, 3344). --define(wxStyledTextCtrl_CopyRange, 3345). --define(wxStyledTextCtrl_CopyText, 3346). --define(wxStyledTextCtrl_SetSelectionMode, 3347). --define(wxStyledTextCtrl_GetSelectionMode, 3348). --define(wxStyledTextCtrl_LineDownRectExtend, 3349). --define(wxStyledTextCtrl_LineUpRectExtend, 3350). --define(wxStyledTextCtrl_CharLeftRectExtend, 3351). --define(wxStyledTextCtrl_CharRightRectExtend, 3352). --define(wxStyledTextCtrl_HomeRectExtend, 3353). --define(wxStyledTextCtrl_VCHomeRectExtend, 3354). --define(wxStyledTextCtrl_LineEndRectExtend, 3355). --define(wxStyledTextCtrl_PageUpRectExtend, 3356). --define(wxStyledTextCtrl_PageDownRectExtend, 3357). --define(wxStyledTextCtrl_StutteredPageUp, 3358). --define(wxStyledTextCtrl_StutteredPageUpExtend, 3359). --define(wxStyledTextCtrl_StutteredPageDown, 3360). --define(wxStyledTextCtrl_StutteredPageDownExtend, 3361). --define(wxStyledTextCtrl_WordLeftEnd, 3362). --define(wxStyledTextCtrl_WordLeftEndExtend, 3363). --define(wxStyledTextCtrl_WordRightEnd, 3364). --define(wxStyledTextCtrl_WordRightEndExtend, 3365). --define(wxStyledTextCtrl_SetWhitespaceChars, 3366). --define(wxStyledTextCtrl_SetCharsDefault, 3367). --define(wxStyledTextCtrl_AutoCompGetCurrent, 3368). --define(wxStyledTextCtrl_Allocate, 3369). --define(wxStyledTextCtrl_FindColumn, 3370). --define(wxStyledTextCtrl_GetCaretSticky, 3371). --define(wxStyledTextCtrl_SetCaretSticky, 3372). --define(wxStyledTextCtrl_ToggleCaretSticky, 3373). --define(wxStyledTextCtrl_SetPasteConvertEndings, 3374). --define(wxStyledTextCtrl_GetPasteConvertEndings, 3375). --define(wxStyledTextCtrl_SelectionDuplicate, 3376). --define(wxStyledTextCtrl_SetCaretLineBackAlpha, 3377). --define(wxStyledTextCtrl_GetCaretLineBackAlpha, 3378). --define(wxStyledTextCtrl_StartRecord, 3379). --define(wxStyledTextCtrl_StopRecord, 3380). --define(wxStyledTextCtrl_SetLexer, 3381). --define(wxStyledTextCtrl_GetLexer, 3382). --define(wxStyledTextCtrl_Colourise, 3383). --define(wxStyledTextCtrl_SetProperty, 3384). --define(wxStyledTextCtrl_SetKeyWords, 3385). --define(wxStyledTextCtrl_SetLexerLanguage, 3386). --define(wxStyledTextCtrl_GetProperty, 3387). --define(wxStyledTextCtrl_GetStyleBitsNeeded, 3388). --define(wxStyledTextCtrl_GetCurrentLine, 3389). --define(wxStyledTextCtrl_StyleSetSpec, 3390). --define(wxStyledTextCtrl_StyleSetFont, 3391). --define(wxStyledTextCtrl_StyleSetFontAttr, 3392). --define(wxStyledTextCtrl_StyleSetCharacterSet, 3393). --define(wxStyledTextCtrl_StyleSetFontEncoding, 3394). --define(wxStyledTextCtrl_CmdKeyExecute, 3395). --define(wxStyledTextCtrl_SetMargins, 3396). --define(wxStyledTextCtrl_GetSelection, 3397). --define(wxStyledTextCtrl_PointFromPosition, 3398). --define(wxStyledTextCtrl_ScrollToLine, 3399). --define(wxStyledTextCtrl_ScrollToColumn, 3400). --define(wxStyledTextCtrl_SetVScrollBar, 3401). --define(wxStyledTextCtrl_SetHScrollBar, 3402). --define(wxStyledTextCtrl_GetLastKeydownProcessed, 3403). --define(wxStyledTextCtrl_SetLastKeydownProcessed, 3404). --define(wxStyledTextCtrl_SaveFile, 3405). --define(wxStyledTextCtrl_LoadFile, 3406). --define(wxStyledTextCtrl_DoDragOver, 3407). --define(wxStyledTextCtrl_DoDropText, 3408). --define(wxStyledTextCtrl_GetUseAntiAliasing, 3409). --define(wxStyledTextCtrl_AddTextRaw, 3410). --define(wxStyledTextCtrl_InsertTextRaw, 3411). --define(wxStyledTextCtrl_GetCurLineRaw, 3412). --define(wxStyledTextCtrl_GetLineRaw, 3413). --define(wxStyledTextCtrl_GetSelectedTextRaw, 3414). --define(wxStyledTextCtrl_GetTextRangeRaw, 3415). --define(wxStyledTextCtrl_SetTextRaw, 3416). --define(wxStyledTextCtrl_GetTextRaw, 3417). --define(wxStyledTextCtrl_AppendTextRaw, 3418). --define(wxArtProvider_GetBitmap, 3419). --define(wxArtProvider_GetIcon, 3420). --define(wxTreeEvent_GetKeyCode, 3421). --define(wxTreeEvent_GetItem, 3422). --define(wxTreeEvent_GetKeyEvent, 3423). --define(wxTreeEvent_GetLabel, 3424). --define(wxTreeEvent_GetOldItem, 3425). --define(wxTreeEvent_GetPoint, 3426). --define(wxTreeEvent_IsEditCancelled, 3427). --define(wxTreeEvent_SetToolTip, 3428). --define(wxNotebookEvent_GetOldSelection, 3429). --define(wxNotebookEvent_GetSelection, 3430). --define(wxNotebookEvent_SetOldSelection, 3431). --define(wxNotebookEvent_SetSelection, 3432). --define(wxFileDataObject_new, 3433). --define(wxFileDataObject_AddFile, 3434). --define(wxFileDataObject_GetFilenames, 3435). --define(wxFileDataObject_destroy, 3436). --define(wxTextDataObject_new, 3437). --define(wxTextDataObject_GetTextLength, 3438). --define(wxTextDataObject_GetText, 3439). --define(wxTextDataObject_SetText, 3440). --define(wxTextDataObject_destroy, 3441). --define(wxBitmapDataObject_new_1_1, 3442). --define(wxBitmapDataObject_new_1_0, 3443). --define(wxBitmapDataObject_GetBitmap, 3444). --define(wxBitmapDataObject_SetBitmap, 3445). --define(wxBitmapDataObject_destroy, 3446). --define(wxClipboard_new, 3448). --define(wxClipboard_destruct, 3449). --define(wxClipboard_AddData, 3450). --define(wxClipboard_Clear, 3451). --define(wxClipboard_Close, 3452). --define(wxClipboard_Flush, 3453). --define(wxClipboard_GetData, 3454). --define(wxClipboard_IsOpened, 3455). --define(wxClipboard_Open, 3456). --define(wxClipboard_SetData, 3457). --define(wxClipboard_UsePrimarySelection, 3459). --define(wxClipboard_IsSupported, 3460). --define(wxClipboard_Get, 3461). --define(wxSpinEvent_GetPosition, 3462). --define(wxSpinEvent_SetPosition, 3463). --define(wxSplitterWindow_new_0, 3464). --define(wxSplitterWindow_new_2, 3465). --define(wxSplitterWindow_destruct, 3466). --define(wxSplitterWindow_Create, 3467). --define(wxSplitterWindow_GetMinimumPaneSize, 3468). --define(wxSplitterWindow_GetSashGravity, 3469). --define(wxSplitterWindow_GetSashPosition, 3470). --define(wxSplitterWindow_GetSplitMode, 3471). --define(wxSplitterWindow_GetWindow1, 3472). --define(wxSplitterWindow_GetWindow2, 3473). --define(wxSplitterWindow_Initialize, 3474). --define(wxSplitterWindow_IsSplit, 3475). --define(wxSplitterWindow_ReplaceWindow, 3476). --define(wxSplitterWindow_SetSashGravity, 3477). --define(wxSplitterWindow_SetSashPosition, 3478). --define(wxSplitterWindow_SetSashSize, 3479). --define(wxSplitterWindow_SetMinimumPaneSize, 3480). --define(wxSplitterWindow_SetSplitMode, 3481). --define(wxSplitterWindow_SplitHorizontally, 3482). --define(wxSplitterWindow_SplitVertically, 3483). --define(wxSplitterWindow_Unsplit, 3484). --define(wxSplitterWindow_UpdateSize, 3485). --define(wxSplitterEvent_GetSashPosition, 3486). --define(wxSplitterEvent_GetX, 3487). --define(wxSplitterEvent_GetY, 3488). --define(wxSplitterEvent_GetWindowBeingRemoved, 3489). --define(wxSplitterEvent_SetSashPosition, 3490). --define(wxHtmlWindow_new_0, 3491). --define(wxHtmlWindow_new_2, 3492). --define(wxHtmlWindow_AppendToPage, 3493). --define(wxHtmlWindow_GetOpenedAnchor, 3494). --define(wxHtmlWindow_GetOpenedPage, 3495). --define(wxHtmlWindow_GetOpenedPageTitle, 3496). --define(wxHtmlWindow_GetRelatedFrame, 3497). --define(wxHtmlWindow_HistoryBack, 3498). --define(wxHtmlWindow_HistoryCanBack, 3499). --define(wxHtmlWindow_HistoryCanForward, 3500). --define(wxHtmlWindow_HistoryClear, 3501). --define(wxHtmlWindow_HistoryForward, 3502). --define(wxHtmlWindow_LoadFile, 3503). --define(wxHtmlWindow_LoadPage, 3504). --define(wxHtmlWindow_SelectAll, 3505). --define(wxHtmlWindow_SelectionToText, 3506). --define(wxHtmlWindow_SelectLine, 3507). --define(wxHtmlWindow_SelectWord, 3508). --define(wxHtmlWindow_SetBorders, 3509). --define(wxHtmlWindow_SetFonts, 3510). --define(wxHtmlWindow_SetPage, 3511). --define(wxHtmlWindow_SetRelatedFrame, 3512). --define(wxHtmlWindow_SetRelatedStatusBar, 3513). --define(wxHtmlWindow_ToText, 3514). --define(wxHtmlWindow_destroy, 3515). --define(wxHtmlLinkEvent_GetLinkInfo, 3516). --define(wxSystemSettings_GetColour, 3517). --define(wxSystemSettings_GetFont, 3518). --define(wxSystemSettings_GetMetric, 3519). --define(wxSystemSettings_GetScreenType, 3520). --define(wxSystemOptions_GetOption, 3521). --define(wxSystemOptions_GetOptionInt, 3522). --define(wxSystemOptions_HasOption, 3523). --define(wxSystemOptions_IsFalse, 3524). --define(wxSystemOptions_SetOption_2_1, 3525). --define(wxSystemOptions_SetOption_2_0, 3526). --define(wxAuiNotebookEvent_SetSelection, 3527). --define(wxAuiNotebookEvent_GetSelection, 3528). --define(wxAuiNotebookEvent_SetOldSelection, 3529). --define(wxAuiNotebookEvent_GetOldSelection, 3530). --define(wxAuiNotebookEvent_SetDragSource, 3531). --define(wxAuiNotebookEvent_GetDragSource, 3532). --define(wxAuiManagerEvent_SetManager, 3533). --define(wxAuiManagerEvent_GetManager, 3534). --define(wxAuiManagerEvent_SetPane, 3535). --define(wxAuiManagerEvent_GetPane, 3536). --define(wxAuiManagerEvent_SetButton, 3537). --define(wxAuiManagerEvent_GetButton, 3538). --define(wxAuiManagerEvent_SetDC, 3539). --define(wxAuiManagerEvent_GetDC, 3540). --define(wxAuiManagerEvent_Veto, 3541). --define(wxAuiManagerEvent_GetVeto, 3542). --define(wxAuiManagerEvent_SetCanVeto, 3543). --define(wxAuiManagerEvent_CanVeto, 3544). --define(wxLogNull_new, 3545). --define(wxLogNull_destroy, 3546). --define(wxTaskBarIcon_new, 3547). --define(wxTaskBarIcon_destruct, 3548). --define(wxTaskBarIcon_PopupMenu, 3549). --define(wxTaskBarIcon_RemoveIcon, 3550). --define(wxTaskBarIcon_SetIcon, 3551). --define(wxLocale_new_0, 3552). --define(wxLocale_new_2, 3554). --define(wxLocale_destruct, 3555). --define(wxLocale_Init, 3557). --define(wxLocale_AddCatalog_1, 3558). --define(wxLocale_AddCatalog_3, 3559). --define(wxLocale_AddCatalogLookupPathPrefix, 3560). --define(wxLocale_GetCanonicalName, 3561). --define(wxLocale_GetLanguage, 3562). --define(wxLocale_GetLanguageName, 3563). --define(wxLocale_GetLocale, 3564). --define(wxLocale_GetName, 3565). --define(wxLocale_GetString_2, 3566). --define(wxLocale_GetString_4, 3567). --define(wxLocale_GetHeaderValue, 3568). --define(wxLocale_GetSysName, 3569). --define(wxLocale_GetSystemEncoding, 3570). --define(wxLocale_GetSystemEncodingName, 3571). --define(wxLocale_GetSystemLanguage, 3572). --define(wxLocale_IsLoaded, 3573). --define(wxLocale_IsOk, 3574). --define(wxActivateEvent_GetActive, 3575). --define(wxPopupWindow_new_2, 3577). --define(wxPopupWindow_new_0, 3578). --define(wxPopupWindow_destruct, 3580). --define(wxPopupWindow_Create, 3581). --define(wxPopupWindow_Position, 3582). --define(wxPopupTransientWindow_new_0, 3583). --define(wxPopupTransientWindow_new_2, 3584). --define(wxPopupTransientWindow_destruct, 3585). --define(wxPopupTransientWindow_Popup, 3586). --define(wxPopupTransientWindow_Dismiss, 3587). --define(wxOverlay_new, 3588). --define(wxOverlay_destruct, 3589). --define(wxOverlay_Reset, 3590). --define(wxDCOverlay_new_6, 3591). --define(wxDCOverlay_new_2, 3592). --define(wxDCOverlay_destruct, 3593). --define(wxDCOverlay_Clear, 3594). +-define(wxWindow_SetTransparent, 284). +-define(wxWindow_CanSetTransparent, 285). +-define(wxWindow_IsDoubleBuffered, 286). +-define(wxWindow_SetDoubleBuffered, 287). +-define(wxTopLevelWindow_GetIcon, 288). +-define(wxTopLevelWindow_GetIcons, 289). +-define(wxTopLevelWindow_GetTitle, 290). +-define(wxTopLevelWindow_IsActive, 291). +-define(wxTopLevelWindow_Iconize, 292). +-define(wxTopLevelWindow_IsFullScreen, 293). +-define(wxTopLevelWindow_IsIconized, 294). +-define(wxTopLevelWindow_IsMaximized, 295). +-define(wxTopLevelWindow_Maximize, 296). +-define(wxTopLevelWindow_RequestUserAttention, 297). +-define(wxTopLevelWindow_SetIcon, 298). +-define(wxTopLevelWindow_SetIcons, 299). +-define(wxTopLevelWindow_CenterOnScreen, 300). +-define(wxTopLevelWindow_CentreOnScreen, 301). +-define(wxTopLevelWindow_SetShape, 303). +-define(wxTopLevelWindow_SetTitle, 304). +-define(wxTopLevelWindow_ShowFullScreen, 305). +-define(wxFrame_new_4, 307). +-define(wxFrame_new_0, 308). +-define(wxFrame_destruct, 310). +-define(wxFrame_Create, 311). +-define(wxFrame_CreateStatusBar, 312). +-define(wxFrame_CreateToolBar, 313). +-define(wxFrame_GetClientAreaOrigin, 314). +-define(wxFrame_GetMenuBar, 315). +-define(wxFrame_GetStatusBar, 316). +-define(wxFrame_GetStatusBarPane, 317). +-define(wxFrame_GetToolBar, 318). +-define(wxFrame_ProcessCommand, 319). +-define(wxFrame_SendSizeEvent, 320). +-define(wxFrame_SetMenuBar, 321). +-define(wxFrame_SetStatusBar, 322). +-define(wxFrame_SetStatusBarPane, 323). +-define(wxFrame_SetStatusText, 324). +-define(wxFrame_SetStatusWidths, 325). +-define(wxFrame_SetToolBar, 326). +-define(wxMiniFrame_new_0, 327). +-define(wxMiniFrame_new_4, 328). +-define(wxMiniFrame_Create, 329). +-define(wxMiniFrame_destroy, 330). +-define(wxSplashScreen_new_0, 331). +-define(wxSplashScreen_new_6, 332). +-define(wxSplashScreen_destruct, 333). +-define(wxSplashScreen_GetSplashStyle, 334). +-define(wxSplashScreen_GetTimeout, 335). +-define(wxPanel_new_0, 336). +-define(wxPanel_new_6, 337). +-define(wxPanel_new_2, 338). +-define(wxPanel_destruct, 339). +-define(wxPanel_InitDialog, 340). +-define(wxPanel_SetFocusIgnoringChildren, 341). +-define(wxScrolledWindow_new_0, 342). +-define(wxScrolledWindow_new_2, 343). +-define(wxScrolledWindow_destruct, 344). +-define(wxScrolledWindow_CalcScrolledPosition_4, 345). +-define(wxScrolledWindow_CalcScrolledPosition_1, 346). +-define(wxScrolledWindow_CalcUnscrolledPosition_4, 347). +-define(wxScrolledWindow_CalcUnscrolledPosition_1, 348). +-define(wxScrolledWindow_EnableScrolling, 349). +-define(wxScrolledWindow_GetScrollPixelsPerUnit, 350). +-define(wxScrolledWindow_GetViewStart, 351). +-define(wxScrolledWindow_DoPrepareDC, 352). +-define(wxScrolledWindow_PrepareDC, 353). +-define(wxScrolledWindow_Scroll, 354). +-define(wxScrolledWindow_SetScrollbars, 355). +-define(wxScrolledWindow_SetScrollRate, 356). +-define(wxScrolledWindow_SetTargetWindow, 357). +-define(wxSashWindow_new_0, 358). +-define(wxSashWindow_new_2, 359). +-define(wxSashWindow_destruct, 360). +-define(wxSashWindow_GetSashVisible, 361). +-define(wxSashWindow_GetMaximumSizeX, 362). +-define(wxSashWindow_GetMaximumSizeY, 363). +-define(wxSashWindow_GetMinimumSizeX, 364). +-define(wxSashWindow_GetMinimumSizeY, 365). +-define(wxSashWindow_SetMaximumSizeX, 366). +-define(wxSashWindow_SetMaximumSizeY, 367). +-define(wxSashWindow_SetMinimumSizeX, 368). +-define(wxSashWindow_SetMinimumSizeY, 369). +-define(wxSashWindow_SetSashVisible, 370). +-define(wxSashLayoutWindow_new_0, 371). +-define(wxSashLayoutWindow_new_2, 372). +-define(wxSashLayoutWindow_Create, 373). +-define(wxSashLayoutWindow_GetAlignment, 374). +-define(wxSashLayoutWindow_GetOrientation, 375). +-define(wxSashLayoutWindow_SetAlignment, 376). +-define(wxSashLayoutWindow_SetDefaultSize, 377). +-define(wxSashLayoutWindow_SetOrientation, 378). +-define(wxSashLayoutWindow_destroy, 379). +-define(wxGrid_new_0, 380). +-define(wxGrid_new_3, 381). +-define(wxGrid_new_4, 382). +-define(wxGrid_destruct, 383). +-define(wxGrid_AppendCols, 384). +-define(wxGrid_AppendRows, 385). +-define(wxGrid_AutoSize, 386). +-define(wxGrid_AutoSizeColumn, 387). +-define(wxGrid_AutoSizeColumns, 388). +-define(wxGrid_AutoSizeRow, 389). +-define(wxGrid_AutoSizeRows, 390). +-define(wxGrid_BeginBatch, 391). +-define(wxGrid_BlockToDeviceRect, 392). +-define(wxGrid_CanDragColSize, 393). +-define(wxGrid_CanDragRowSize, 394). +-define(wxGrid_CanDragGridSize, 395). +-define(wxGrid_CanEnableCellControl, 396). +-define(wxGrid_CellToRect_2, 397). +-define(wxGrid_CellToRect_1, 398). +-define(wxGrid_ClearGrid, 399). +-define(wxGrid_ClearSelection, 400). +-define(wxGrid_CreateGrid, 401). +-define(wxGrid_DeleteCols, 402). +-define(wxGrid_DeleteRows, 403). +-define(wxGrid_DisableCellEditControl, 404). +-define(wxGrid_DisableDragColSize, 405). +-define(wxGrid_DisableDragGridSize, 406). +-define(wxGrid_DisableDragRowSize, 407). +-define(wxGrid_EnableCellEditControl, 408). +-define(wxGrid_EnableDragColSize, 409). +-define(wxGrid_EnableDragGridSize, 410). +-define(wxGrid_EnableDragRowSize, 411). +-define(wxGrid_EnableEditing, 412). +-define(wxGrid_EnableGridLines, 413). +-define(wxGrid_EndBatch, 414). +-define(wxGrid_Fit, 415). +-define(wxGrid_ForceRefresh, 416). +-define(wxGrid_GetBatchCount, 417). +-define(wxGrid_GetCellAlignment, 418). +-define(wxGrid_GetCellBackgroundColour, 419). +-define(wxGrid_GetCellEditor, 420). +-define(wxGrid_GetCellFont, 421). +-define(wxGrid_GetCellRenderer, 422). +-define(wxGrid_GetCellTextColour, 423). +-define(wxGrid_GetCellValue_2, 424). +-define(wxGrid_GetCellValue_1, 425). +-define(wxGrid_GetColLabelAlignment, 426). +-define(wxGrid_GetColLabelSize, 427). +-define(wxGrid_GetColLabelValue, 428). +-define(wxGrid_GetColMinimalAcceptableWidth, 429). +-define(wxGrid_GetDefaultCellAlignment, 430). +-define(wxGrid_GetDefaultCellBackgroundColour, 431). +-define(wxGrid_GetDefaultCellFont, 432). +-define(wxGrid_GetDefaultCellTextColour, 433). +-define(wxGrid_GetDefaultColLabelSize, 434). +-define(wxGrid_GetDefaultColSize, 435). +-define(wxGrid_GetDefaultEditor, 436). +-define(wxGrid_GetDefaultEditorForCell_2, 437). +-define(wxGrid_GetDefaultEditorForCell_1, 438). +-define(wxGrid_GetDefaultEditorForType, 439). +-define(wxGrid_GetDefaultRenderer, 440). +-define(wxGrid_GetDefaultRendererForCell, 441). +-define(wxGrid_GetDefaultRendererForType, 442). +-define(wxGrid_GetDefaultRowLabelSize, 443). +-define(wxGrid_GetDefaultRowSize, 444). +-define(wxGrid_GetGridCursorCol, 445). +-define(wxGrid_GetGridCursorRow, 446). +-define(wxGrid_GetGridLineColour, 447). +-define(wxGrid_GridLinesEnabled, 448). +-define(wxGrid_GetLabelBackgroundColour, 449). +-define(wxGrid_GetLabelFont, 450). +-define(wxGrid_GetLabelTextColour, 451). +-define(wxGrid_GetNumberCols, 452). +-define(wxGrid_GetNumberRows, 453). +-define(wxGrid_GetOrCreateCellAttr, 454). +-define(wxGrid_GetRowMinimalAcceptableHeight, 455). +-define(wxGrid_GetRowLabelAlignment, 456). +-define(wxGrid_GetRowLabelSize, 457). +-define(wxGrid_GetRowLabelValue, 458). +-define(wxGrid_GetRowSize, 459). +-define(wxGrid_GetScrollLineX, 460). +-define(wxGrid_GetScrollLineY, 461). +-define(wxGrid_GetSelectedCells, 462). +-define(wxGrid_GetSelectedCols, 463). +-define(wxGrid_GetSelectedRows, 464). +-define(wxGrid_GetSelectionBackground, 465). +-define(wxGrid_GetSelectionBlockTopLeft, 466). +-define(wxGrid_GetSelectionBlockBottomRight, 467). +-define(wxGrid_GetSelectionForeground, 468). +-define(wxGrid_GetViewWidth, 469). +-define(wxGrid_GetGridWindow, 470). +-define(wxGrid_GetGridRowLabelWindow, 471). +-define(wxGrid_GetGridColLabelWindow, 472). +-define(wxGrid_GetGridCornerLabelWindow, 473). +-define(wxGrid_HideCellEditControl, 474). +-define(wxGrid_InsertCols, 475). +-define(wxGrid_InsertRows, 476). +-define(wxGrid_IsCellEditControlEnabled, 477). +-define(wxGrid_IsCurrentCellReadOnly, 478). +-define(wxGrid_IsEditable, 479). +-define(wxGrid_IsInSelection_2, 480). +-define(wxGrid_IsInSelection_1, 481). +-define(wxGrid_IsReadOnly, 482). +-define(wxGrid_IsSelection, 483). +-define(wxGrid_IsVisible_3, 484). +-define(wxGrid_IsVisible_2, 485). +-define(wxGrid_MakeCellVisible_2, 486). +-define(wxGrid_MakeCellVisible_1, 487). +-define(wxGrid_MoveCursorDown, 488). +-define(wxGrid_MoveCursorLeft, 489). +-define(wxGrid_MoveCursorRight, 490). +-define(wxGrid_MoveCursorUp, 491). +-define(wxGrid_MoveCursorDownBlock, 492). +-define(wxGrid_MoveCursorLeftBlock, 493). +-define(wxGrid_MoveCursorRightBlock, 494). +-define(wxGrid_MoveCursorUpBlock, 495). +-define(wxGrid_MovePageDown, 496). +-define(wxGrid_MovePageUp, 497). +-define(wxGrid_RegisterDataType, 498). +-define(wxGrid_SaveEditControlValue, 499). +-define(wxGrid_SelectAll, 500). +-define(wxGrid_SelectBlock_5, 501). +-define(wxGrid_SelectBlock_3, 502). +-define(wxGrid_SelectCol, 503). +-define(wxGrid_SelectRow, 504). +-define(wxGrid_SetCellAlignment_4, 505). +-define(wxGrid_SetCellAlignment_3, 506). +-define(wxGrid_SetCellAlignment_1, 507). +-define(wxGrid_SetCellBackgroundColour_3_0, 508). +-define(wxGrid_SetCellBackgroundColour_1, 509). +-define(wxGrid_SetCellBackgroundColour_3_1, 510). +-define(wxGrid_SetCellEditor, 511). +-define(wxGrid_SetCellFont, 512). +-define(wxGrid_SetCellRenderer, 513). +-define(wxGrid_SetCellTextColour_3_0, 514). +-define(wxGrid_SetCellTextColour_3_1, 515). +-define(wxGrid_SetCellTextColour_1, 516). +-define(wxGrid_SetCellValue_3_0, 517). +-define(wxGrid_SetCellValue_2, 518). +-define(wxGrid_SetCellValue_3_1, 519). +-define(wxGrid_SetColAttr, 520). +-define(wxGrid_SetColFormatBool, 521). +-define(wxGrid_SetColFormatNumber, 522). +-define(wxGrid_SetColFormatFloat, 523). +-define(wxGrid_SetColFormatCustom, 524). +-define(wxGrid_SetColLabelAlignment, 525). +-define(wxGrid_SetColLabelSize, 526). +-define(wxGrid_SetColLabelValue, 527). +-define(wxGrid_SetColMinimalWidth, 528). +-define(wxGrid_SetColMinimalAcceptableWidth, 529). +-define(wxGrid_SetColSize, 530). +-define(wxGrid_SetDefaultCellAlignment, 531). +-define(wxGrid_SetDefaultCellBackgroundColour, 532). +-define(wxGrid_SetDefaultCellFont, 533). +-define(wxGrid_SetDefaultCellTextColour, 534). +-define(wxGrid_SetDefaultEditor, 535). +-define(wxGrid_SetDefaultRenderer, 536). +-define(wxGrid_SetDefaultColSize, 537). +-define(wxGrid_SetDefaultRowSize, 538). +-define(wxGrid_SetGridCursor, 539). +-define(wxGrid_SetGridLineColour, 540). +-define(wxGrid_SetLabelBackgroundColour, 541). +-define(wxGrid_SetLabelFont, 542). +-define(wxGrid_SetLabelTextColour, 543). +-define(wxGrid_SetMargins, 544). +-define(wxGrid_SetReadOnly, 545). +-define(wxGrid_SetRowAttr, 546). +-define(wxGrid_SetRowLabelAlignment, 547). +-define(wxGrid_SetRowLabelSize, 548). +-define(wxGrid_SetRowLabelValue, 549). +-define(wxGrid_SetRowMinimalHeight, 550). +-define(wxGrid_SetRowMinimalAcceptableHeight, 551). +-define(wxGrid_SetRowSize, 552). +-define(wxGrid_SetScrollLineX, 553). +-define(wxGrid_SetScrollLineY, 554). +-define(wxGrid_SetSelectionBackground, 555). +-define(wxGrid_SetSelectionForeground, 556). +-define(wxGrid_SetSelectionMode, 557). +-define(wxGrid_ShowCellEditControl, 558). +-define(wxGrid_XToCol, 559). +-define(wxGrid_XToEdgeOfCol, 560). +-define(wxGrid_YToEdgeOfRow, 561). +-define(wxGrid_YToRow, 562). +-define(wxGridCellRenderer_Draw, 563). +-define(wxGridCellRenderer_GetBestSize, 564). +-define(wxGridCellEditor_Create, 565). +-define(wxGridCellEditor_IsCreated, 566). +-define(wxGridCellEditor_SetSize, 567). +-define(wxGridCellEditor_Show, 568). +-define(wxGridCellEditor_PaintBackground, 569). +-define(wxGridCellEditor_BeginEdit, 570). +-define(wxGridCellEditor_EndEdit, 571). +-define(wxGridCellEditor_Reset, 572). +-define(wxGridCellEditor_StartingKey, 573). +-define(wxGridCellEditor_StartingClick, 574). +-define(wxGridCellEditor_HandleReturn, 575). +-define(wxGridCellBoolRenderer_new, 576). +-define(wxGridCellBoolRenderer_destroy, 577). +-define(wxGridCellBoolEditor_new, 578). +-define(wxGridCellBoolEditor_IsTrueValue, 579). +-define(wxGridCellBoolEditor_UseStringValues, 580). +-define(wxGridCellBoolEditor_destroy, 581). +-define(wxGridCellFloatRenderer_new, 582). +-define(wxGridCellFloatRenderer_GetPrecision, 583). +-define(wxGridCellFloatRenderer_GetWidth, 584). +-define(wxGridCellFloatRenderer_SetParameters, 585). +-define(wxGridCellFloatRenderer_SetPrecision, 586). +-define(wxGridCellFloatRenderer_SetWidth, 587). +-define(wxGridCellFloatRenderer_destroy, 588). +-define(wxGridCellFloatEditor_new, 589). +-define(wxGridCellFloatEditor_SetParameters, 590). +-define(wxGridCellFloatEditor_destroy, 591). +-define(wxGridCellStringRenderer_new, 592). +-define(wxGridCellStringRenderer_destroy, 593). +-define(wxGridCellTextEditor_new, 594). +-define(wxGridCellTextEditor_SetParameters, 595). +-define(wxGridCellTextEditor_destroy, 596). +-define(wxGridCellChoiceEditor_new, 598). +-define(wxGridCellChoiceEditor_SetParameters, 599). +-define(wxGridCellChoiceEditor_destroy, 600). +-define(wxGridCellNumberRenderer_new, 601). +-define(wxGridCellNumberRenderer_destroy, 602). +-define(wxGridCellNumberEditor_new, 603). +-define(wxGridCellNumberEditor_GetValue, 604). +-define(wxGridCellNumberEditor_SetParameters, 605). +-define(wxGridCellNumberEditor_destroy, 606). +-define(wxGridCellAttr_SetTextColour, 607). +-define(wxGridCellAttr_SetBackgroundColour, 608). +-define(wxGridCellAttr_SetFont, 609). +-define(wxGridCellAttr_SetAlignment, 610). +-define(wxGridCellAttr_SetReadOnly, 611). +-define(wxGridCellAttr_SetRenderer, 612). +-define(wxGridCellAttr_SetEditor, 613). +-define(wxGridCellAttr_HasTextColour, 614). +-define(wxGridCellAttr_HasBackgroundColour, 615). +-define(wxGridCellAttr_HasFont, 616). +-define(wxGridCellAttr_HasAlignment, 617). +-define(wxGridCellAttr_HasRenderer, 618). +-define(wxGridCellAttr_HasEditor, 619). +-define(wxGridCellAttr_GetTextColour, 620). +-define(wxGridCellAttr_GetBackgroundColour, 621). +-define(wxGridCellAttr_GetFont, 622). +-define(wxGridCellAttr_GetAlignment, 623). +-define(wxGridCellAttr_GetRenderer, 624). +-define(wxGridCellAttr_GetEditor, 625). +-define(wxGridCellAttr_IsReadOnly, 626). +-define(wxGridCellAttr_SetDefAttr, 627). +-define(wxDC_Blit, 628). +-define(wxDC_CalcBoundingBox, 629). +-define(wxDC_Clear, 630). +-define(wxDC_ComputeScaleAndOrigin, 631). +-define(wxDC_CrossHair, 632). +-define(wxDC_DestroyClippingRegion, 633). +-define(wxDC_DeviceToLogicalX, 634). +-define(wxDC_DeviceToLogicalXRel, 635). +-define(wxDC_DeviceToLogicalY, 636). +-define(wxDC_DeviceToLogicalYRel, 637). +-define(wxDC_DrawArc, 638). +-define(wxDC_DrawBitmap, 639). +-define(wxDC_DrawCheckMark, 640). +-define(wxDC_DrawCircle, 641). +-define(wxDC_DrawEllipse_2, 643). +-define(wxDC_DrawEllipse_1, 644). +-define(wxDC_DrawEllipticArc, 645). +-define(wxDC_DrawIcon, 646). +-define(wxDC_DrawLabel, 647). +-define(wxDC_DrawLine, 648). +-define(wxDC_DrawLines, 649). +-define(wxDC_DrawPolygon, 651). +-define(wxDC_DrawPoint, 653). +-define(wxDC_DrawRectangle_2, 655). +-define(wxDC_DrawRectangle_1, 656). +-define(wxDC_DrawRotatedText, 657). +-define(wxDC_DrawRoundedRectangle_3, 659). +-define(wxDC_DrawRoundedRectangle_2, 660). +-define(wxDC_DrawText, 661). +-define(wxDC_EndDoc, 662). +-define(wxDC_EndPage, 663). +-define(wxDC_FloodFill, 664). +-define(wxDC_GetBackground, 665). +-define(wxDC_GetBackgroundMode, 666). +-define(wxDC_GetBrush, 667). +-define(wxDC_GetCharHeight, 668). +-define(wxDC_GetCharWidth, 669). +-define(wxDC_GetClippingBox, 670). +-define(wxDC_GetFont, 672). +-define(wxDC_GetLayoutDirection, 673). +-define(wxDC_GetLogicalFunction, 674). +-define(wxDC_GetMapMode, 675). +-define(wxDC_GetMultiLineTextExtent_4, 676). +-define(wxDC_GetMultiLineTextExtent_1, 677). +-define(wxDC_GetPartialTextExtents, 678). +-define(wxDC_GetPen, 679). +-define(wxDC_GetPixel, 680). +-define(wxDC_GetPPI, 681). +-define(wxDC_GetSize, 683). +-define(wxDC_GetSizeMM, 685). +-define(wxDC_GetTextBackground, 686). +-define(wxDC_GetTextExtent_4, 687). +-define(wxDC_GetTextExtent_1, 688). +-define(wxDC_GetTextForeground, 690). +-define(wxDC_GetUserScale, 691). +-define(wxDC_GradientFillConcentric_3, 692). +-define(wxDC_GradientFillConcentric_4, 693). +-define(wxDC_GradientFillLinear, 694). +-define(wxDC_LogicalToDeviceX, 695). +-define(wxDC_LogicalToDeviceXRel, 696). +-define(wxDC_LogicalToDeviceY, 697). +-define(wxDC_LogicalToDeviceYRel, 698). +-define(wxDC_MaxX, 699). +-define(wxDC_MaxY, 700). +-define(wxDC_MinX, 701). +-define(wxDC_MinY, 702). +-define(wxDC_IsOk, 703). +-define(wxDC_ResetBoundingBox, 704). +-define(wxDC_SetAxisOrientation, 705). +-define(wxDC_SetBackground, 706). +-define(wxDC_SetBackgroundMode, 707). +-define(wxDC_SetBrush, 708). +-define(wxDC_SetClippingRegion_2, 710). +-define(wxDC_SetClippingRegion_1_1, 711). +-define(wxDC_SetClippingRegion_1_0, 712). +-define(wxDC_SetDeviceOrigin, 713). +-define(wxDC_SetFont, 714). +-define(wxDC_SetLayoutDirection, 715). +-define(wxDC_SetLogicalFunction, 716). +-define(wxDC_SetMapMode, 717). +-define(wxDC_SetPalette, 718). +-define(wxDC_SetPen, 719). +-define(wxDC_SetTextBackground, 720). +-define(wxDC_SetTextForeground, 721). +-define(wxDC_SetUserScale, 722). +-define(wxDC_StartDoc, 723). +-define(wxDC_StartPage, 724). +-define(wxMirrorDC_new, 725). +-define(wxMirrorDC_destroy, 726). +-define(wxScreenDC_new, 727). +-define(wxScreenDC_destruct, 728). +-define(wxPostScriptDC_new_0, 729). +-define(wxPostScriptDC_new_1, 730). +-define(wxPostScriptDC_destruct, 731). +-define(wxPostScriptDC_SetResolution, 732). +-define(wxPostScriptDC_GetResolution, 733). +-define(wxWindowDC_new_0, 734). +-define(wxWindowDC_new_1, 735). +-define(wxWindowDC_destruct, 736). +-define(wxClientDC_new_0, 737). +-define(wxClientDC_new_1, 738). +-define(wxClientDC_destroy, 739). +-define(wxPaintDC_new_0, 740). +-define(wxPaintDC_new_1, 741). +-define(wxPaintDC_destroy, 742). +-define(wxMemoryDC_new_1_0, 744). +-define(wxMemoryDC_new_1_1, 745). +-define(wxMemoryDC_new_0, 746). +-define(wxMemoryDC_destruct, 748). +-define(wxMemoryDC_SelectObject, 749). +-define(wxMemoryDC_SelectObjectAsSource, 750). +-define(wxBufferedDC_new_0, 751). +-define(wxBufferedDC_new_2, 752). +-define(wxBufferedDC_new_3, 753). +-define(wxBufferedDC_destruct, 754). +-define(wxBufferedDC_Init_2, 755). +-define(wxBufferedDC_Init_3, 756). +-define(wxBufferedPaintDC_new_3, 757). +-define(wxBufferedPaintDC_new_2, 758). +-define(wxBufferedPaintDC_destruct, 759). +-define(wxGraphicsObject_destruct, 760). +-define(wxGraphicsObject_GetRenderer, 761). +-define(wxGraphicsObject_IsNull, 762). +-define(wxGraphicsContext_destruct, 763). +-define(wxGraphicsContext_Create_1_1, 764). +-define(wxGraphicsContext_Create_1_0, 765). +-define(wxGraphicsContext_Create_0, 766). +-define(wxGraphicsContext_CreatePen, 767). +-define(wxGraphicsContext_CreateBrush, 768). +-define(wxGraphicsContext_CreateRadialGradientBrush, 769). +-define(wxGraphicsContext_CreateLinearGradientBrush, 770). +-define(wxGraphicsContext_CreateFont, 771). +-define(wxGraphicsContext_CreateMatrix, 772). +-define(wxGraphicsContext_CreatePath, 773). +-define(wxGraphicsContext_Clip_1, 774). +-define(wxGraphicsContext_Clip_4, 775). +-define(wxGraphicsContext_ResetClip, 776). +-define(wxGraphicsContext_DrawBitmap, 777). +-define(wxGraphicsContext_DrawEllipse, 778). +-define(wxGraphicsContext_DrawIcon, 779). +-define(wxGraphicsContext_DrawLines, 780). +-define(wxGraphicsContext_DrawPath, 781). +-define(wxGraphicsContext_DrawRectangle, 782). +-define(wxGraphicsContext_DrawRoundedRectangle, 783). +-define(wxGraphicsContext_DrawText_3, 784). +-define(wxGraphicsContext_DrawText_4_0, 785). +-define(wxGraphicsContext_DrawText_4_1, 786). +-define(wxGraphicsContext_DrawText_5, 787). +-define(wxGraphicsContext_FillPath, 788). +-define(wxGraphicsContext_StrokePath, 789). +-define(wxGraphicsContext_GetPartialTextExtents, 790). +-define(wxGraphicsContext_GetTextExtent, 791). +-define(wxGraphicsContext_Rotate, 792). +-define(wxGraphicsContext_Scale, 793). +-define(wxGraphicsContext_Translate, 794). +-define(wxGraphicsContext_GetTransform, 795). +-define(wxGraphicsContext_SetTransform, 796). +-define(wxGraphicsContext_ConcatTransform, 797). +-define(wxGraphicsContext_SetBrush_1_1, 798). +-define(wxGraphicsContext_SetBrush_1_0, 799). +-define(wxGraphicsContext_SetFont_1, 800). +-define(wxGraphicsContext_SetFont_2, 801). +-define(wxGraphicsContext_SetPen_1_0, 802). +-define(wxGraphicsContext_SetPen_1_1, 803). +-define(wxGraphicsContext_StrokeLine, 804). +-define(wxGraphicsContext_StrokeLines, 805). +-define(wxGraphicsMatrix_Concat, 807). +-define(wxGraphicsMatrix_Get, 809). +-define(wxGraphicsMatrix_Invert, 810). +-define(wxGraphicsMatrix_IsEqual, 811). +-define(wxGraphicsMatrix_IsIdentity, 813). +-define(wxGraphicsMatrix_Rotate, 814). +-define(wxGraphicsMatrix_Scale, 815). +-define(wxGraphicsMatrix_Translate, 816). +-define(wxGraphicsMatrix_Set, 817). +-define(wxGraphicsMatrix_TransformPoint, 818). +-define(wxGraphicsMatrix_TransformDistance, 819). +-define(wxGraphicsPath_MoveToPoint_2, 820). +-define(wxGraphicsPath_MoveToPoint_1, 821). +-define(wxGraphicsPath_AddArc_6, 822). +-define(wxGraphicsPath_AddArc_5, 823). +-define(wxGraphicsPath_AddArcToPoint, 824). +-define(wxGraphicsPath_AddCircle, 825). +-define(wxGraphicsPath_AddCurveToPoint_6, 826). +-define(wxGraphicsPath_AddCurveToPoint_3, 827). +-define(wxGraphicsPath_AddEllipse, 828). +-define(wxGraphicsPath_AddLineToPoint_2, 829). +-define(wxGraphicsPath_AddLineToPoint_1, 830). +-define(wxGraphicsPath_AddPath, 831). +-define(wxGraphicsPath_AddQuadCurveToPoint, 832). +-define(wxGraphicsPath_AddRectangle, 833). +-define(wxGraphicsPath_AddRoundedRectangle, 834). +-define(wxGraphicsPath_CloseSubpath, 835). +-define(wxGraphicsPath_Contains_3, 836). +-define(wxGraphicsPath_Contains_2, 837). +-define(wxGraphicsPath_GetBox, 839). +-define(wxGraphicsPath_GetCurrentPoint, 841). +-define(wxGraphicsPath_Transform, 842). +-define(wxGraphicsRenderer_GetDefaultRenderer, 843). +-define(wxGraphicsRenderer_CreateContext_1_1, 844). +-define(wxGraphicsRenderer_CreateContext_1_0, 845). +-define(wxGraphicsRenderer_CreatePen, 846). +-define(wxGraphicsRenderer_CreateBrush, 847). +-define(wxGraphicsRenderer_CreateLinearGradientBrush, 848). +-define(wxGraphicsRenderer_CreateRadialGradientBrush, 849). +-define(wxGraphicsRenderer_CreateFont, 850). +-define(wxGraphicsRenderer_CreateMatrix, 851). +-define(wxGraphicsRenderer_CreatePath, 852). +-define(wxMenuBar_new_1, 854). +-define(wxMenuBar_new_0, 856). +-define(wxMenuBar_destruct, 858). +-define(wxMenuBar_Append, 859). +-define(wxMenuBar_Check, 860). +-define(wxMenuBar_Enable_2, 861). +-define(wxMenuBar_Enable_1, 862). +-define(wxMenuBar_EnableTop, 863). +-define(wxMenuBar_FindMenu, 864). +-define(wxMenuBar_FindMenuItem, 865). +-define(wxMenuBar_FindItem, 866). +-define(wxMenuBar_GetHelpString, 867). +-define(wxMenuBar_GetLabel_1, 868). +-define(wxMenuBar_GetLabel_0, 869). +-define(wxMenuBar_GetLabelTop, 870). +-define(wxMenuBar_GetMenu, 871). +-define(wxMenuBar_GetMenuCount, 872). +-define(wxMenuBar_Insert, 873). +-define(wxMenuBar_IsChecked, 874). +-define(wxMenuBar_IsEnabled_1, 875). +-define(wxMenuBar_IsEnabled_0, 876). +-define(wxMenuBar_Remove, 877). +-define(wxMenuBar_Replace, 878). +-define(wxMenuBar_SetHelpString, 879). +-define(wxMenuBar_SetLabel_2, 880). +-define(wxMenuBar_SetLabel_1, 881). +-define(wxMenuBar_SetLabelTop, 882). +-define(wxControl_GetLabel, 883). +-define(wxControl_SetLabel, 884). +-define(wxControlWithItems_Append_1, 885). +-define(wxControlWithItems_Append_2, 886). +-define(wxControlWithItems_appendStrings_1, 887). +-define(wxControlWithItems_Clear, 888). +-define(wxControlWithItems_Delete, 889). +-define(wxControlWithItems_FindString, 890). +-define(wxControlWithItems_getClientData, 891). +-define(wxControlWithItems_setClientData, 892). +-define(wxControlWithItems_GetCount, 893). +-define(wxControlWithItems_GetSelection, 894). +-define(wxControlWithItems_GetString, 895). +-define(wxControlWithItems_GetStringSelection, 896). +-define(wxControlWithItems_Insert_2, 897). +-define(wxControlWithItems_Insert_3, 898). +-define(wxControlWithItems_IsEmpty, 899). +-define(wxControlWithItems_Select, 900). +-define(wxControlWithItems_SetSelection, 901). +-define(wxControlWithItems_SetString, 902). +-define(wxControlWithItems_SetStringSelection, 903). +-define(wxMenu_new_2, 906). +-define(wxMenu_new_1, 907). +-define(wxMenu_destruct, 909). +-define(wxMenu_Append_3, 910). +-define(wxMenu_Append_1, 911). +-define(wxMenu_Append_4_0, 912). +-define(wxMenu_Append_4_1, 913). +-define(wxMenu_AppendCheckItem, 914). +-define(wxMenu_AppendRadioItem, 915). +-define(wxMenu_AppendSeparator, 916). +-define(wxMenu_Break, 917). +-define(wxMenu_Check, 918). +-define(wxMenu_Delete_1_0, 919). +-define(wxMenu_Delete_1_1, 920). +-define(wxMenu_Destroy_1_0, 921). +-define(wxMenu_Destroy_1_1, 922). +-define(wxMenu_Enable, 923). +-define(wxMenu_FindItem_1, 924). +-define(wxMenu_FindItem_2, 925). +-define(wxMenu_FindItemByPosition, 926). +-define(wxMenu_GetHelpString, 927). +-define(wxMenu_GetLabel, 928). +-define(wxMenu_GetMenuItemCount, 929). +-define(wxMenu_GetMenuItems, 930). +-define(wxMenu_GetTitle, 932). +-define(wxMenu_Insert_2, 933). +-define(wxMenu_Insert_3, 934). +-define(wxMenu_Insert_5_1, 935). +-define(wxMenu_Insert_5_0, 936). +-define(wxMenu_InsertCheckItem, 937). +-define(wxMenu_InsertRadioItem, 938). +-define(wxMenu_InsertSeparator, 939). +-define(wxMenu_IsChecked, 940). +-define(wxMenu_IsEnabled, 941). +-define(wxMenu_Prepend_1, 942). +-define(wxMenu_Prepend_2, 943). +-define(wxMenu_Prepend_4_1, 944). +-define(wxMenu_Prepend_4_0, 945). +-define(wxMenu_PrependCheckItem, 946). +-define(wxMenu_PrependRadioItem, 947). +-define(wxMenu_PrependSeparator, 948). +-define(wxMenu_Remove_1_0, 949). +-define(wxMenu_Remove_1_1, 950). +-define(wxMenu_SetHelpString, 951). +-define(wxMenu_SetLabel, 952). +-define(wxMenu_SetTitle, 953). +-define(wxMenuItem_new, 954). +-define(wxMenuItem_destruct, 956). +-define(wxMenuItem_Check, 957). +-define(wxMenuItem_Enable, 958). +-define(wxMenuItem_GetBitmap, 959). +-define(wxMenuItem_GetHelp, 960). +-define(wxMenuItem_GetId, 961). +-define(wxMenuItem_GetKind, 962). +-define(wxMenuItem_GetLabel, 963). +-define(wxMenuItem_GetLabelFromText, 964). +-define(wxMenuItem_GetMenu, 965). +-define(wxMenuItem_GetText, 966). +-define(wxMenuItem_GetSubMenu, 967). +-define(wxMenuItem_IsCheckable, 968). +-define(wxMenuItem_IsChecked, 969). +-define(wxMenuItem_IsEnabled, 970). +-define(wxMenuItem_IsSeparator, 971). +-define(wxMenuItem_IsSubMenu, 972). +-define(wxMenuItem_SetBitmap, 973). +-define(wxMenuItem_SetHelp, 974). +-define(wxMenuItem_SetMenu, 975). +-define(wxMenuItem_SetSubMenu, 976). +-define(wxMenuItem_SetText, 977). +-define(wxToolBar_AddControl, 978). +-define(wxToolBar_AddSeparator, 979). +-define(wxToolBar_AddTool_5, 980). +-define(wxToolBar_AddTool_4_0, 981). +-define(wxToolBar_AddTool_1, 982). +-define(wxToolBar_AddTool_4_1, 983). +-define(wxToolBar_AddTool_3, 984). +-define(wxToolBar_AddTool_6, 985). +-define(wxToolBar_AddCheckTool, 986). +-define(wxToolBar_AddRadioTool, 987). +-define(wxToolBar_AddStretchableSpace, 988). +-define(wxToolBar_InsertStretchableSpace, 989). +-define(wxToolBar_DeleteTool, 990). +-define(wxToolBar_DeleteToolByPos, 991). +-define(wxToolBar_EnableTool, 992). +-define(wxToolBar_FindById, 993). +-define(wxToolBar_FindControl, 994). +-define(wxToolBar_FindToolForPosition, 995). +-define(wxToolBar_GetToolSize, 996). +-define(wxToolBar_GetToolBitmapSize, 997). +-define(wxToolBar_GetMargins, 998). +-define(wxToolBar_GetToolEnabled, 999). +-define(wxToolBar_GetToolLongHelp, 1000). +-define(wxToolBar_GetToolPacking, 1001). +-define(wxToolBar_GetToolPos, 1002). +-define(wxToolBar_GetToolSeparation, 1003). +-define(wxToolBar_GetToolShortHelp, 1004). +-define(wxToolBar_GetToolState, 1005). +-define(wxToolBar_InsertControl, 1006). +-define(wxToolBar_InsertSeparator, 1007). +-define(wxToolBar_InsertTool_5, 1008). +-define(wxToolBar_InsertTool_2, 1009). +-define(wxToolBar_InsertTool_4, 1010). +-define(wxToolBar_Realize, 1011). +-define(wxToolBar_RemoveTool, 1012). +-define(wxToolBar_SetMargins, 1013). +-define(wxToolBar_SetToolBitmapSize, 1014). +-define(wxToolBar_SetToolLongHelp, 1015). +-define(wxToolBar_SetToolPacking, 1016). +-define(wxToolBar_SetToolShortHelp, 1017). +-define(wxToolBar_SetToolSeparation, 1018). +-define(wxToolBar_ToggleTool, 1019). +-define(wxStatusBar_new_0, 1021). +-define(wxStatusBar_new_2, 1022). +-define(wxStatusBar_destruct, 1024). +-define(wxStatusBar_Create, 1025). +-define(wxStatusBar_GetFieldRect, 1026). +-define(wxStatusBar_GetFieldsCount, 1027). +-define(wxStatusBar_GetStatusText, 1028). +-define(wxStatusBar_PopStatusText, 1029). +-define(wxStatusBar_PushStatusText, 1030). +-define(wxStatusBar_SetFieldsCount, 1031). +-define(wxStatusBar_SetMinHeight, 1032). +-define(wxStatusBar_SetStatusText, 1033). +-define(wxStatusBar_SetStatusWidths, 1034). +-define(wxStatusBar_SetStatusStyles, 1035). +-define(wxBitmap_new_0, 1036). +-define(wxBitmap_new_3, 1037). +-define(wxBitmap_new_4, 1038). +-define(wxBitmap_new_2_0, 1039). +-define(wxBitmap_new_2_1, 1040). +-define(wxBitmap_destruct, 1041). +-define(wxBitmap_ConvertToImage, 1042). +-define(wxBitmap_CopyFromIcon, 1043). +-define(wxBitmap_Create, 1044). +-define(wxBitmap_GetDepth, 1045). +-define(wxBitmap_GetHeight, 1046). +-define(wxBitmap_GetPalette, 1047). +-define(wxBitmap_GetMask, 1048). +-define(wxBitmap_GetWidth, 1049). +-define(wxBitmap_GetSubBitmap, 1050). +-define(wxBitmap_LoadFile, 1051). +-define(wxBitmap_Ok, 1052). +-define(wxBitmap_SaveFile, 1053). +-define(wxBitmap_SetDepth, 1054). +-define(wxBitmap_SetHeight, 1055). +-define(wxBitmap_SetMask, 1056). +-define(wxBitmap_SetPalette, 1057). +-define(wxBitmap_SetWidth, 1058). +-define(wxIcon_new_0, 1059). +-define(wxIcon_new_2, 1060). +-define(wxIcon_new_1, 1061). +-define(wxIcon_CopyFromBitmap, 1062). +-define(wxIcon_destroy, 1063). +-define(wxIconBundle_new_0, 1064). +-define(wxIconBundle_new_2, 1065). +-define(wxIconBundle_new_1_0, 1066). +-define(wxIconBundle_new_1_1, 1067). +-define(wxIconBundle_destruct, 1068). +-define(wxIconBundle_AddIcon_2, 1069). +-define(wxIconBundle_AddIcon_1, 1070). +-define(wxIconBundle_GetIcon_1_1, 1071). +-define(wxIconBundle_GetIcon_1_0, 1072). +-define(wxCursor_new_0, 1073). +-define(wxCursor_new_1_0, 1074). +-define(wxCursor_new_1_1, 1075). +-define(wxCursor_new_4, 1076). +-define(wxCursor_destruct, 1077). +-define(wxCursor_Ok, 1078). +-define(wxMask_new_0, 1079). +-define(wxMask_new_2_1, 1080). +-define(wxMask_new_2_0, 1081). +-define(wxMask_new_1, 1082). +-define(wxMask_destruct, 1083). +-define(wxMask_Create_2_1, 1084). +-define(wxMask_Create_2_0, 1085). +-define(wxMask_Create_1, 1086). +-define(wxImage_new_0, 1087). +-define(wxImage_new_3_0, 1088). +-define(wxImage_new_4, 1089). +-define(wxImage_new_5, 1090). +-define(wxImage_new_2, 1091). +-define(wxImage_new_3_1, 1092). +-define(wxImage_Blur, 1093). +-define(wxImage_BlurHorizontal, 1094). +-define(wxImage_BlurVertical, 1095). +-define(wxImage_ConvertAlphaToMask, 1096). +-define(wxImage_ConvertToGreyscale, 1097). +-define(wxImage_ConvertToMono, 1098). +-define(wxImage_Copy, 1099). +-define(wxImage_Create_3, 1100). +-define(wxImage_Create_4, 1101). +-define(wxImage_Create_5, 1102). +-define(wxImage_Destroy, 1103). +-define(wxImage_FindFirstUnusedColour, 1104). +-define(wxImage_GetImageExtWildcard, 1105). +-define(wxImage_GetAlpha_2, 1106). +-define(wxImage_GetAlpha_0, 1107). +-define(wxImage_GetBlue, 1108). +-define(wxImage_GetData, 1109). +-define(wxImage_GetGreen, 1110). +-define(wxImage_GetImageCount, 1111). +-define(wxImage_GetHeight, 1112). +-define(wxImage_GetMaskBlue, 1113). +-define(wxImage_GetMaskGreen, 1114). +-define(wxImage_GetMaskRed, 1115). +-define(wxImage_GetOrFindMaskColour, 1116). +-define(wxImage_GetPalette, 1117). +-define(wxImage_GetRed, 1118). +-define(wxImage_GetSubImage, 1119). +-define(wxImage_GetWidth, 1120). +-define(wxImage_HasAlpha, 1121). +-define(wxImage_HasMask, 1122). +-define(wxImage_GetOption, 1123). +-define(wxImage_GetOptionInt, 1124). +-define(wxImage_HasOption, 1125). +-define(wxImage_InitAlpha, 1126). +-define(wxImage_InitStandardHandlers, 1127). +-define(wxImage_IsTransparent, 1128). +-define(wxImage_LoadFile_2, 1129). +-define(wxImage_LoadFile_3, 1130). +-define(wxImage_Ok, 1131). +-define(wxImage_RemoveHandler, 1132). +-define(wxImage_Mirror, 1133). +-define(wxImage_Replace, 1134). +-define(wxImage_Rescale, 1135). +-define(wxImage_Resize, 1136). +-define(wxImage_Rotate, 1137). +-define(wxImage_RotateHue, 1138). +-define(wxImage_Rotate90, 1139). +-define(wxImage_SaveFile_1, 1140). +-define(wxImage_SaveFile_2_0, 1141). +-define(wxImage_SaveFile_2_1, 1142). +-define(wxImage_Scale, 1143). +-define(wxImage_Size, 1144). +-define(wxImage_SetAlpha_3, 1145). +-define(wxImage_SetAlpha_2, 1146). +-define(wxImage_SetData_2, 1147). +-define(wxImage_SetData_4, 1148). +-define(wxImage_SetMask, 1149). +-define(wxImage_SetMaskColour, 1150). +-define(wxImage_SetMaskFromImage, 1151). +-define(wxImage_SetOption_2_1, 1152). +-define(wxImage_SetOption_2_0, 1153). +-define(wxImage_SetPalette, 1154). +-define(wxImage_SetRGB_5, 1155). +-define(wxImage_SetRGB_4, 1156). +-define(wxImage_destroy, 1157). +-define(wxBrush_new_0, 1158). +-define(wxBrush_new_2, 1159). +-define(wxBrush_new_1, 1160). +-define(wxBrush_destruct, 1162). +-define(wxBrush_GetColour, 1163). +-define(wxBrush_GetStipple, 1164). +-define(wxBrush_GetStyle, 1165). +-define(wxBrush_IsHatch, 1166). +-define(wxBrush_IsOk, 1167). +-define(wxBrush_SetColour_1, 1168). +-define(wxBrush_SetColour_3, 1169). +-define(wxBrush_SetStipple, 1170). +-define(wxBrush_SetStyle, 1171). +-define(wxPen_new_0, 1172). +-define(wxPen_new_2, 1173). +-define(wxPen_destruct, 1174). +-define(wxPen_GetCap, 1175). +-define(wxPen_GetColour, 1176). +-define(wxPen_GetJoin, 1177). +-define(wxPen_GetStyle, 1178). +-define(wxPen_GetWidth, 1179). +-define(wxPen_IsOk, 1180). +-define(wxPen_SetCap, 1181). +-define(wxPen_SetColour_1, 1182). +-define(wxPen_SetColour_3, 1183). +-define(wxPen_SetJoin, 1184). +-define(wxPen_SetStyle, 1185). +-define(wxPen_SetWidth, 1186). +-define(wxRegion_new_0, 1187). +-define(wxRegion_new_4, 1188). +-define(wxRegion_new_2, 1189). +-define(wxRegion_new_1_1, 1190). +-define(wxRegion_new_1_0, 1192). +-define(wxRegion_destruct, 1194). +-define(wxRegion_Clear, 1195). +-define(wxRegion_Contains_2, 1196). +-define(wxRegion_Contains_1_0, 1197). +-define(wxRegion_Contains_4, 1198). +-define(wxRegion_Contains_1_1, 1199). +-define(wxRegion_ConvertToBitmap, 1200). +-define(wxRegion_GetBox, 1201). +-define(wxRegion_Intersect_4, 1202). +-define(wxRegion_Intersect_1_1, 1203). +-define(wxRegion_Intersect_1_0, 1204). +-define(wxRegion_IsEmpty, 1205). +-define(wxRegion_Subtract_4, 1206). +-define(wxRegion_Subtract_1_1, 1207). +-define(wxRegion_Subtract_1_0, 1208). +-define(wxRegion_Offset_2, 1209). +-define(wxRegion_Offset_1, 1210). +-define(wxRegion_Union_4, 1211). +-define(wxRegion_Union_1_2, 1212). +-define(wxRegion_Union_1_1, 1213). +-define(wxRegion_Union_1_0, 1214). +-define(wxRegion_Union_3, 1215). +-define(wxRegion_Xor_4, 1216). +-define(wxRegion_Xor_1_1, 1217). +-define(wxRegion_Xor_1_0, 1218). +-define(wxAcceleratorTable_new_0, 1219). +-define(wxAcceleratorTable_new_2, 1220). +-define(wxAcceleratorTable_destruct, 1221). +-define(wxAcceleratorTable_Ok, 1222). +-define(wxAcceleratorEntry_new_1_0, 1223). +-define(wxAcceleratorEntry_new_1_1, 1224). +-define(wxAcceleratorEntry_GetCommand, 1225). +-define(wxAcceleratorEntry_GetFlags, 1226). +-define(wxAcceleratorEntry_GetKeyCode, 1227). +-define(wxAcceleratorEntry_Set, 1228). +-define(wxAcceleratorEntry_destroy, 1229). +-define(wxCaret_new_3, 1234). +-define(wxCaret_new_2, 1235). +-define(wxCaret_destruct, 1237). +-define(wxCaret_Create_3, 1238). +-define(wxCaret_Create_2, 1239). +-define(wxCaret_GetBlinkTime, 1240). +-define(wxCaret_GetPosition, 1242). +-define(wxCaret_GetSize, 1244). +-define(wxCaret_GetWindow, 1245). +-define(wxCaret_Hide, 1246). +-define(wxCaret_IsOk, 1247). +-define(wxCaret_IsVisible, 1248). +-define(wxCaret_Move_2, 1249). +-define(wxCaret_Move_1, 1250). +-define(wxCaret_SetBlinkTime, 1251). +-define(wxCaret_SetSize_2, 1252). +-define(wxCaret_SetSize_1, 1253). +-define(wxCaret_Show, 1254). +-define(wxSizer_Add_2_1, 1255). +-define(wxSizer_Add_2_0, 1256). +-define(wxSizer_Add_3, 1257). +-define(wxSizer_Add_2_3, 1258). +-define(wxSizer_Add_2_2, 1259). +-define(wxSizer_AddSpacer, 1260). +-define(wxSizer_AddStretchSpacer, 1261). +-define(wxSizer_CalcMin, 1262). +-define(wxSizer_Clear, 1263). +-define(wxSizer_Detach_1_2, 1264). +-define(wxSizer_Detach_1_1, 1265). +-define(wxSizer_Detach_1_0, 1266). +-define(wxSizer_Fit, 1267). +-define(wxSizer_FitInside, 1268). +-define(wxSizer_GetChildren, 1269). +-define(wxSizer_GetItem_2_1, 1270). +-define(wxSizer_GetItem_2_0, 1271). +-define(wxSizer_GetItem_1, 1272). +-define(wxSizer_GetSize, 1273). +-define(wxSizer_GetPosition, 1274). +-define(wxSizer_GetMinSize, 1275). +-define(wxSizer_Hide_2_0, 1276). +-define(wxSizer_Hide_2_1, 1277). +-define(wxSizer_Hide_1, 1278). +-define(wxSizer_Insert_3_1, 1279). +-define(wxSizer_Insert_3_0, 1280). +-define(wxSizer_Insert_4, 1281). +-define(wxSizer_Insert_3_3, 1282). +-define(wxSizer_Insert_3_2, 1283). +-define(wxSizer_Insert_2, 1284). +-define(wxSizer_InsertSpacer, 1285). +-define(wxSizer_InsertStretchSpacer, 1286). +-define(wxSizer_IsShown_1_2, 1287). +-define(wxSizer_IsShown_1_1, 1288). +-define(wxSizer_IsShown_1_0, 1289). +-define(wxSizer_Layout, 1290). +-define(wxSizer_Prepend_2_1, 1291). +-define(wxSizer_Prepend_2_0, 1292). +-define(wxSizer_Prepend_3, 1293). +-define(wxSizer_Prepend_2_3, 1294). +-define(wxSizer_Prepend_2_2, 1295). +-define(wxSizer_Prepend_1, 1296). +-define(wxSizer_PrependSpacer, 1297). +-define(wxSizer_PrependStretchSpacer, 1298). +-define(wxSizer_RecalcSizes, 1299). +-define(wxSizer_Remove_1_1, 1300). +-define(wxSizer_Remove_1_0, 1301). +-define(wxSizer_Replace_3_1, 1302). +-define(wxSizer_Replace_3_0, 1303). +-define(wxSizer_Replace_2, 1304). +-define(wxSizer_SetDimension, 1305). +-define(wxSizer_SetMinSize_2, 1306). +-define(wxSizer_SetMinSize_1, 1307). +-define(wxSizer_SetItemMinSize_3_2, 1308). +-define(wxSizer_SetItemMinSize_2_2, 1309). +-define(wxSizer_SetItemMinSize_3_1, 1310). +-define(wxSizer_SetItemMinSize_2_1, 1311). +-define(wxSizer_SetItemMinSize_3_0, 1312). +-define(wxSizer_SetItemMinSize_2_0, 1313). +-define(wxSizer_SetSizeHints, 1314). +-define(wxSizer_SetVirtualSizeHints, 1315). +-define(wxSizer_Show_2_2, 1316). +-define(wxSizer_Show_2_1, 1317). +-define(wxSizer_Show_2_0, 1318). +-define(wxSizer_Show_1, 1319). +-define(wxSizerFlags_new, 1320). +-define(wxSizerFlags_Align, 1321). +-define(wxSizerFlags_Border_2, 1322). +-define(wxSizerFlags_Border_1, 1323). +-define(wxSizerFlags_Center, 1324). +-define(wxSizerFlags_Centre, 1325). +-define(wxSizerFlags_Expand, 1326). +-define(wxSizerFlags_Left, 1327). +-define(wxSizerFlags_Proportion, 1328). +-define(wxSizerFlags_Right, 1329). +-define(wxSizerFlags_destroy, 1330). +-define(wxSizerItem_new_5_1, 1331). +-define(wxSizerItem_new_2_1, 1332). +-define(wxSizerItem_new_5_0, 1333). +-define(wxSizerItem_new_2_0, 1334). +-define(wxSizerItem_new_6, 1335). +-define(wxSizerItem_new_3, 1336). +-define(wxSizerItem_new_0, 1337). +-define(wxSizerItem_destruct, 1338). +-define(wxSizerItem_CalcMin, 1339). +-define(wxSizerItem_DeleteWindows, 1340). +-define(wxSizerItem_DetachSizer, 1341). +-define(wxSizerItem_GetBorder, 1342). +-define(wxSizerItem_GetFlag, 1343). +-define(wxSizerItem_GetMinSize, 1344). +-define(wxSizerItem_GetPosition, 1345). +-define(wxSizerItem_GetProportion, 1346). +-define(wxSizerItem_GetRatio, 1347). +-define(wxSizerItem_GetRect, 1348). +-define(wxSizerItem_GetSize, 1349). +-define(wxSizerItem_GetSizer, 1350). +-define(wxSizerItem_GetSpacer, 1351). +-define(wxSizerItem_GetUserData, 1352). +-define(wxSizerItem_GetWindow, 1353). +-define(wxSizerItem_IsSizer, 1354). +-define(wxSizerItem_IsShown, 1355). +-define(wxSizerItem_IsSpacer, 1356). +-define(wxSizerItem_IsWindow, 1357). +-define(wxSizerItem_SetBorder, 1358). +-define(wxSizerItem_SetDimension, 1359). +-define(wxSizerItem_SetFlag, 1360). +-define(wxSizerItem_SetInitSize, 1361). +-define(wxSizerItem_SetMinSize_1, 1362). +-define(wxSizerItem_SetMinSize_2, 1363). +-define(wxSizerItem_SetProportion, 1364). +-define(wxSizerItem_SetRatio_2, 1365). +-define(wxSizerItem_SetRatio_1_1, 1366). +-define(wxSizerItem_SetRatio_1_0, 1367). +-define(wxSizerItem_SetSizer, 1368). +-define(wxSizerItem_SetSpacer_1, 1369). +-define(wxSizerItem_SetSpacer_2, 1370). +-define(wxSizerItem_SetWindow, 1371). +-define(wxSizerItem_Show, 1372). +-define(wxBoxSizer_new, 1373). +-define(wxBoxSizer_GetOrientation, 1374). +-define(wxBoxSizer_destroy, 1375). +-define(wxStaticBoxSizer_new_2, 1376). +-define(wxStaticBoxSizer_new_3, 1377). +-define(wxStaticBoxSizer_GetStaticBox, 1378). +-define(wxStaticBoxSizer_destroy, 1379). +-define(wxGridSizer_new_4, 1380). +-define(wxGridSizer_new_2, 1381). +-define(wxGridSizer_GetCols, 1382). +-define(wxGridSizer_GetHGap, 1383). +-define(wxGridSizer_GetRows, 1384). +-define(wxGridSizer_GetVGap, 1385). +-define(wxGridSizer_SetCols, 1386). +-define(wxGridSizer_SetHGap, 1387). +-define(wxGridSizer_SetRows, 1388). +-define(wxGridSizer_SetVGap, 1389). +-define(wxGridSizer_destroy, 1390). +-define(wxFlexGridSizer_new_4, 1391). +-define(wxFlexGridSizer_new_2, 1392). +-define(wxFlexGridSizer_AddGrowableCol, 1393). +-define(wxFlexGridSizer_AddGrowableRow, 1394). +-define(wxFlexGridSizer_GetFlexibleDirection, 1395). +-define(wxFlexGridSizer_GetNonFlexibleGrowMode, 1396). +-define(wxFlexGridSizer_RemoveGrowableCol, 1397). +-define(wxFlexGridSizer_RemoveGrowableRow, 1398). +-define(wxFlexGridSizer_SetFlexibleDirection, 1399). +-define(wxFlexGridSizer_SetNonFlexibleGrowMode, 1400). +-define(wxFlexGridSizer_destroy, 1401). +-define(wxGridBagSizer_new, 1402). +-define(wxGridBagSizer_Add_3_2, 1403). +-define(wxGridBagSizer_Add_3_1, 1404). +-define(wxGridBagSizer_Add_4, 1405). +-define(wxGridBagSizer_Add_1_0, 1406). +-define(wxGridBagSizer_Add_2_1, 1407). +-define(wxGridBagSizer_Add_2_0, 1408). +-define(wxGridBagSizer_Add_3_0, 1409). +-define(wxGridBagSizer_Add_1_1, 1410). +-define(wxGridBagSizer_CalcMin, 1411). +-define(wxGridBagSizer_CheckForIntersection_2, 1412). +-define(wxGridBagSizer_CheckForIntersection_3, 1413). +-define(wxGridBagSizer_FindItem_1_1, 1414). +-define(wxGridBagSizer_FindItem_1_0, 1415). +-define(wxGridBagSizer_FindItemAtPoint, 1416). +-define(wxGridBagSizer_FindItemAtPosition, 1417). +-define(wxGridBagSizer_FindItemWithData, 1418). +-define(wxGridBagSizer_GetCellSize, 1419). +-define(wxGridBagSizer_GetEmptyCellSize, 1420). +-define(wxGridBagSizer_GetItemPosition_1_2, 1421). +-define(wxGridBagSizer_GetItemPosition_1_1, 1422). +-define(wxGridBagSizer_GetItemPosition_1_0, 1423). +-define(wxGridBagSizer_GetItemSpan_1_2, 1424). +-define(wxGridBagSizer_GetItemSpan_1_1, 1425). +-define(wxGridBagSizer_GetItemSpan_1_0, 1426). +-define(wxGridBagSizer_SetEmptyCellSize, 1427). +-define(wxGridBagSizer_SetItemPosition_2_2, 1428). +-define(wxGridBagSizer_SetItemPosition_2_1, 1429). +-define(wxGridBagSizer_SetItemPosition_2_0, 1430). +-define(wxGridBagSizer_SetItemSpan_2_2, 1431). +-define(wxGridBagSizer_SetItemSpan_2_1, 1432). +-define(wxGridBagSizer_SetItemSpan_2_0, 1433). +-define(wxGridBagSizer_destroy, 1434). +-define(wxStdDialogButtonSizer_new, 1435). +-define(wxStdDialogButtonSizer_AddButton, 1436). +-define(wxStdDialogButtonSizer_Realize, 1437). +-define(wxStdDialogButtonSizer_SetAffirmativeButton, 1438). +-define(wxStdDialogButtonSizer_SetCancelButton, 1439). +-define(wxStdDialogButtonSizer_SetNegativeButton, 1440). +-define(wxStdDialogButtonSizer_destroy, 1441). +-define(wxFont_new_0, 1442). +-define(wxFont_new_1, 1443). +-define(wxFont_new_5, 1444). +-define(wxFont_destruct, 1446). +-define(wxFont_IsFixedWidth, 1447). +-define(wxFont_GetDefaultEncoding, 1448). +-define(wxFont_GetFaceName, 1449). +-define(wxFont_GetFamily, 1450). +-define(wxFont_GetNativeFontInfoDesc, 1451). +-define(wxFont_GetNativeFontInfoUserDesc, 1452). +-define(wxFont_GetPointSize, 1453). +-define(wxFont_GetStyle, 1454). +-define(wxFont_GetUnderlined, 1455). +-define(wxFont_GetWeight, 1456). +-define(wxFont_Ok, 1457). +-define(wxFont_SetDefaultEncoding, 1458). +-define(wxFont_SetFaceName, 1459). +-define(wxFont_SetFamily, 1460). +-define(wxFont_SetPointSize, 1461). +-define(wxFont_SetStyle, 1462). +-define(wxFont_SetUnderlined, 1463). +-define(wxFont_SetWeight, 1464). +-define(wxToolTip_Enable, 1465). +-define(wxToolTip_SetDelay, 1466). +-define(wxToolTip_new, 1467). +-define(wxToolTip_SetTip, 1468). +-define(wxToolTip_GetTip, 1469). +-define(wxToolTip_GetWindow, 1470). +-define(wxToolTip_destroy, 1471). +-define(wxButton_new_3, 1473). +-define(wxButton_new_0, 1474). +-define(wxButton_destruct, 1475). +-define(wxButton_Create, 1476). +-define(wxButton_GetDefaultSize, 1477). +-define(wxButton_SetDefault, 1478). +-define(wxButton_SetLabel, 1479). +-define(wxBitmapButton_new_4, 1481). +-define(wxBitmapButton_new_0, 1482). +-define(wxBitmapButton_Create, 1483). +-define(wxBitmapButton_GetBitmapDisabled, 1484). +-define(wxBitmapButton_GetBitmapFocus, 1486). +-define(wxBitmapButton_GetBitmapLabel, 1488). +-define(wxBitmapButton_GetBitmapSelected, 1490). +-define(wxBitmapButton_SetBitmapDisabled, 1492). +-define(wxBitmapButton_SetBitmapFocus, 1493). +-define(wxBitmapButton_SetBitmapLabel, 1494). +-define(wxBitmapButton_SetBitmapSelected, 1495). +-define(wxBitmapButton_destroy, 1496). +-define(wxToggleButton_new_0, 1497). +-define(wxToggleButton_new_4, 1498). +-define(wxToggleButton_Create, 1499). +-define(wxToggleButton_GetValue, 1500). +-define(wxToggleButton_SetValue, 1501). +-define(wxToggleButton_destroy, 1502). +-define(wxCalendarCtrl_new_0, 1503). +-define(wxCalendarCtrl_new_3, 1504). +-define(wxCalendarCtrl_Create, 1505). +-define(wxCalendarCtrl_destruct, 1506). +-define(wxCalendarCtrl_SetDate, 1507). +-define(wxCalendarCtrl_GetDate, 1508). +-define(wxCalendarCtrl_EnableYearChange, 1509). +-define(wxCalendarCtrl_EnableMonthChange, 1510). +-define(wxCalendarCtrl_EnableHolidayDisplay, 1511). +-define(wxCalendarCtrl_SetHeaderColours, 1512). +-define(wxCalendarCtrl_GetHeaderColourFg, 1513). +-define(wxCalendarCtrl_GetHeaderColourBg, 1514). +-define(wxCalendarCtrl_SetHighlightColours, 1515). +-define(wxCalendarCtrl_GetHighlightColourFg, 1516). +-define(wxCalendarCtrl_GetHighlightColourBg, 1517). +-define(wxCalendarCtrl_SetHolidayColours, 1518). +-define(wxCalendarCtrl_GetHolidayColourFg, 1519). +-define(wxCalendarCtrl_GetHolidayColourBg, 1520). +-define(wxCalendarCtrl_GetAttr, 1521). +-define(wxCalendarCtrl_SetAttr, 1522). +-define(wxCalendarCtrl_SetHoliday, 1523). +-define(wxCalendarCtrl_ResetAttr, 1524). +-define(wxCalendarCtrl_HitTest, 1525). +-define(wxCalendarDateAttr_new_0, 1526). +-define(wxCalendarDateAttr_new_2_1, 1527). +-define(wxCalendarDateAttr_new_2_0, 1528). +-define(wxCalendarDateAttr_SetTextColour, 1529). +-define(wxCalendarDateAttr_SetBackgroundColour, 1530). +-define(wxCalendarDateAttr_SetBorderColour, 1531). +-define(wxCalendarDateAttr_SetFont, 1532). +-define(wxCalendarDateAttr_SetBorder, 1533). +-define(wxCalendarDateAttr_SetHoliday, 1534). +-define(wxCalendarDateAttr_HasTextColour, 1535). +-define(wxCalendarDateAttr_HasBackgroundColour, 1536). +-define(wxCalendarDateAttr_HasBorderColour, 1537). +-define(wxCalendarDateAttr_HasFont, 1538). +-define(wxCalendarDateAttr_HasBorder, 1539). +-define(wxCalendarDateAttr_IsHoliday, 1540). +-define(wxCalendarDateAttr_GetTextColour, 1541). +-define(wxCalendarDateAttr_GetBackgroundColour, 1542). +-define(wxCalendarDateAttr_GetBorderColour, 1543). +-define(wxCalendarDateAttr_GetFont, 1544). +-define(wxCalendarDateAttr_GetBorder, 1545). +-define(wxCalendarDateAttr_destroy, 1546). +-define(wxCheckBox_new_4, 1548). +-define(wxCheckBox_new_0, 1549). +-define(wxCheckBox_Create, 1550). +-define(wxCheckBox_GetValue, 1551). +-define(wxCheckBox_Get3StateValue, 1552). +-define(wxCheckBox_Is3rdStateAllowedForUser, 1553). +-define(wxCheckBox_Is3State, 1554). +-define(wxCheckBox_IsChecked, 1555). +-define(wxCheckBox_SetValue, 1556). +-define(wxCheckBox_Set3StateValue, 1557). +-define(wxCheckBox_destroy, 1558). +-define(wxCheckListBox_new_0, 1559). +-define(wxCheckListBox_new_3, 1561). +-define(wxCheckListBox_Check, 1562). +-define(wxCheckListBox_IsChecked, 1563). +-define(wxCheckListBox_destroy, 1564). +-define(wxChoice_new_3, 1567). +-define(wxChoice_new_0, 1568). +-define(wxChoice_destruct, 1570). +-define(wxChoice_Create, 1572). +-define(wxChoice_Delete, 1573). +-define(wxChoice_GetColumns, 1574). +-define(wxChoice_SetColumns, 1575). +-define(wxComboBox_new_0, 1576). +-define(wxComboBox_new_3, 1578). +-define(wxComboBox_destruct, 1579). +-define(wxComboBox_Create, 1581). +-define(wxComboBox_CanCopy, 1582). +-define(wxComboBox_CanCut, 1583). +-define(wxComboBox_CanPaste, 1584). +-define(wxComboBox_CanRedo, 1585). +-define(wxComboBox_CanUndo, 1586). +-define(wxComboBox_Copy, 1587). +-define(wxComboBox_Cut, 1588). +-define(wxComboBox_GetInsertionPoint, 1589). +-define(wxComboBox_GetLastPosition, 1590). +-define(wxComboBox_GetValue, 1591). +-define(wxComboBox_Paste, 1592). +-define(wxComboBox_Redo, 1593). +-define(wxComboBox_Replace, 1594). +-define(wxComboBox_Remove, 1595). +-define(wxComboBox_SetInsertionPoint, 1596). +-define(wxComboBox_SetInsertionPointEnd, 1597). +-define(wxComboBox_SetSelection_1, 1598). +-define(wxComboBox_SetSelection_2, 1599). +-define(wxComboBox_SetValue, 1600). +-define(wxComboBox_Undo, 1601). +-define(wxGauge_new_0, 1602). +-define(wxGauge_new_4, 1603). +-define(wxGauge_Create, 1604). +-define(wxGauge_GetBezelFace, 1605). +-define(wxGauge_GetRange, 1606). +-define(wxGauge_GetShadowWidth, 1607). +-define(wxGauge_GetValue, 1608). +-define(wxGauge_IsVertical, 1609). +-define(wxGauge_SetBezelFace, 1610). +-define(wxGauge_SetRange, 1611). +-define(wxGauge_SetShadowWidth, 1612). +-define(wxGauge_SetValue, 1613). +-define(wxGauge_Pulse, 1614). +-define(wxGauge_destroy, 1615). +-define(wxGenericDirCtrl_new_0, 1616). +-define(wxGenericDirCtrl_new_2, 1617). +-define(wxGenericDirCtrl_destruct, 1618). +-define(wxGenericDirCtrl_Create, 1619). +-define(wxGenericDirCtrl_Init, 1620). +-define(wxGenericDirCtrl_CollapseTree, 1621). +-define(wxGenericDirCtrl_ExpandPath, 1622). +-define(wxGenericDirCtrl_GetDefaultPath, 1623). +-define(wxGenericDirCtrl_GetPath, 1624). +-define(wxGenericDirCtrl_GetFilePath, 1625). +-define(wxGenericDirCtrl_GetFilter, 1626). +-define(wxGenericDirCtrl_GetFilterIndex, 1627). +-define(wxGenericDirCtrl_GetRootId, 1628). +-define(wxGenericDirCtrl_GetTreeCtrl, 1629). +-define(wxGenericDirCtrl_ReCreateTree, 1630). +-define(wxGenericDirCtrl_SetDefaultPath, 1631). +-define(wxGenericDirCtrl_SetFilter, 1632). +-define(wxGenericDirCtrl_SetFilterIndex, 1633). +-define(wxGenericDirCtrl_SetPath, 1634). +-define(wxStaticBox_new_4, 1636). +-define(wxStaticBox_new_0, 1637). +-define(wxStaticBox_Create, 1638). +-define(wxStaticBox_destroy, 1639). +-define(wxStaticLine_new_2, 1641). +-define(wxStaticLine_new_0, 1642). +-define(wxStaticLine_Create, 1643). +-define(wxStaticLine_IsVertical, 1644). +-define(wxStaticLine_GetDefaultSize, 1645). +-define(wxStaticLine_destroy, 1646). +-define(wxListBox_new_3, 1649). +-define(wxListBox_new_0, 1650). +-define(wxListBox_destruct, 1652). +-define(wxListBox_Create, 1654). +-define(wxListBox_Deselect, 1655). +-define(wxListBox_GetSelections, 1656). +-define(wxListBox_InsertItems, 1657). +-define(wxListBox_IsSelected, 1658). +-define(wxListBox_Set, 1659). +-define(wxListBox_HitTest, 1660). +-define(wxListBox_SetFirstItem_1_0, 1661). +-define(wxListBox_SetFirstItem_1_1, 1662). +-define(wxListCtrl_new_0, 1663). +-define(wxListCtrl_new_2, 1664). +-define(wxListCtrl_Arrange, 1665). +-define(wxListCtrl_AssignImageList, 1666). +-define(wxListCtrl_ClearAll, 1667). +-define(wxListCtrl_Create, 1668). +-define(wxListCtrl_DeleteAllItems, 1669). +-define(wxListCtrl_DeleteColumn, 1670). +-define(wxListCtrl_DeleteItem, 1671). +-define(wxListCtrl_EditLabel, 1672). +-define(wxListCtrl_EnsureVisible, 1673). +-define(wxListCtrl_FindItem_3_0, 1674). +-define(wxListCtrl_FindItem_3_1, 1675). +-define(wxListCtrl_GetColumn, 1676). +-define(wxListCtrl_GetColumnCount, 1677). +-define(wxListCtrl_GetColumnWidth, 1678). +-define(wxListCtrl_GetCountPerPage, 1679). +-define(wxListCtrl_GetEditControl, 1680). +-define(wxListCtrl_GetImageList, 1681). +-define(wxListCtrl_GetItem, 1682). +-define(wxListCtrl_GetItemBackgroundColour, 1683). +-define(wxListCtrl_GetItemCount, 1684). +-define(wxListCtrl_GetItemData, 1685). +-define(wxListCtrl_GetItemFont, 1686). +-define(wxListCtrl_GetItemPosition, 1687). +-define(wxListCtrl_GetItemRect, 1688). +-define(wxListCtrl_GetItemSpacing, 1689). +-define(wxListCtrl_GetItemState, 1690). +-define(wxListCtrl_GetItemText, 1691). +-define(wxListCtrl_GetItemTextColour, 1692). +-define(wxListCtrl_GetNextItem, 1693). +-define(wxListCtrl_GetSelectedItemCount, 1694). +-define(wxListCtrl_GetTextColour, 1695). +-define(wxListCtrl_GetTopItem, 1696). +-define(wxListCtrl_GetViewRect, 1697). +-define(wxListCtrl_HitTest, 1698). +-define(wxListCtrl_InsertColumn_2, 1699). +-define(wxListCtrl_InsertColumn_3, 1700). +-define(wxListCtrl_InsertItem_1, 1701). +-define(wxListCtrl_InsertItem_2_1, 1702). +-define(wxListCtrl_InsertItem_2_0, 1703). +-define(wxListCtrl_InsertItem_3, 1704). +-define(wxListCtrl_RefreshItem, 1705). +-define(wxListCtrl_RefreshItems, 1706). +-define(wxListCtrl_ScrollList, 1707). +-define(wxListCtrl_SetBackgroundColour, 1708). +-define(wxListCtrl_SetColumn, 1709). +-define(wxListCtrl_SetColumnWidth, 1710). +-define(wxListCtrl_SetImageList, 1711). +-define(wxListCtrl_SetItem_1, 1712). +-define(wxListCtrl_SetItem_4, 1713). +-define(wxListCtrl_SetItemBackgroundColour, 1714). +-define(wxListCtrl_SetItemCount, 1715). +-define(wxListCtrl_SetItemData, 1716). +-define(wxListCtrl_SetItemFont, 1717). +-define(wxListCtrl_SetItemImage, 1718). +-define(wxListCtrl_SetItemColumnImage, 1719). +-define(wxListCtrl_SetItemPosition, 1720). +-define(wxListCtrl_SetItemState, 1721). +-define(wxListCtrl_SetItemText, 1722). +-define(wxListCtrl_SetItemTextColour, 1723). +-define(wxListCtrl_SetSingleStyle, 1724). +-define(wxListCtrl_SetTextColour, 1725). +-define(wxListCtrl_SetWindowStyleFlag, 1726). +-define(wxListCtrl_SortItems, 1727). +-define(wxListCtrl_destroy, 1728). +-define(wxListView_ClearColumnImage, 1729). +-define(wxListView_Focus, 1730). +-define(wxListView_GetFirstSelected, 1731). +-define(wxListView_GetFocusedItem, 1732). +-define(wxListView_GetNextSelected, 1733). +-define(wxListView_IsSelected, 1734). +-define(wxListView_Select, 1735). +-define(wxListView_SetColumnImage, 1736). +-define(wxListItem_new_0, 1737). +-define(wxListItem_new_1, 1738). +-define(wxListItem_destruct, 1739). +-define(wxListItem_Clear, 1740). +-define(wxListItem_GetAlign, 1741). +-define(wxListItem_GetBackgroundColour, 1742). +-define(wxListItem_GetColumn, 1743). +-define(wxListItem_GetFont, 1744). +-define(wxListItem_GetId, 1745). +-define(wxListItem_GetImage, 1746). +-define(wxListItem_GetMask, 1747). +-define(wxListItem_GetState, 1748). +-define(wxListItem_GetText, 1749). +-define(wxListItem_GetTextColour, 1750). +-define(wxListItem_GetWidth, 1751). +-define(wxListItem_SetAlign, 1752). +-define(wxListItem_SetBackgroundColour, 1753). +-define(wxListItem_SetColumn, 1754). +-define(wxListItem_SetFont, 1755). +-define(wxListItem_SetId, 1756). +-define(wxListItem_SetImage, 1757). +-define(wxListItem_SetMask, 1758). +-define(wxListItem_SetState, 1759). +-define(wxListItem_SetStateMask, 1760). +-define(wxListItem_SetText, 1761). +-define(wxListItem_SetTextColour, 1762). +-define(wxListItem_SetWidth, 1763). +-define(wxListItemAttr_new_0, 1764). +-define(wxListItemAttr_new_3, 1765). +-define(wxListItemAttr_GetBackgroundColour, 1766). +-define(wxListItemAttr_GetFont, 1767). +-define(wxListItemAttr_GetTextColour, 1768). +-define(wxListItemAttr_HasBackgroundColour, 1769). +-define(wxListItemAttr_HasFont, 1770). +-define(wxListItemAttr_HasTextColour, 1771). +-define(wxListItemAttr_SetBackgroundColour, 1772). +-define(wxListItemAttr_SetFont, 1773). +-define(wxListItemAttr_SetTextColour, 1774). +-define(wxListItemAttr_destroy, 1775). +-define(wxImageList_new_0, 1776). +-define(wxImageList_new_3, 1777). +-define(wxImageList_Add_1, 1778). +-define(wxImageList_Add_2_0, 1779). +-define(wxImageList_Add_2_1, 1780). +-define(wxImageList_Create, 1781). +-define(wxImageList_Draw, 1783). +-define(wxImageList_GetBitmap, 1784). +-define(wxImageList_GetIcon, 1785). +-define(wxImageList_GetImageCount, 1786). +-define(wxImageList_GetSize, 1787). +-define(wxImageList_Remove, 1788). +-define(wxImageList_RemoveAll, 1789). +-define(wxImageList_Replace_2, 1790). +-define(wxImageList_Replace_3, 1791). +-define(wxImageList_destroy, 1792). +-define(wxTextAttr_new_0, 1793). +-define(wxTextAttr_new_2, 1794). +-define(wxTextAttr_GetAlignment, 1795). +-define(wxTextAttr_GetBackgroundColour, 1796). +-define(wxTextAttr_GetFont, 1797). +-define(wxTextAttr_GetLeftIndent, 1798). +-define(wxTextAttr_GetLeftSubIndent, 1799). +-define(wxTextAttr_GetRightIndent, 1800). +-define(wxTextAttr_GetTabs, 1801). +-define(wxTextAttr_GetTextColour, 1802). +-define(wxTextAttr_HasBackgroundColour, 1803). +-define(wxTextAttr_HasFont, 1804). +-define(wxTextAttr_HasTextColour, 1805). +-define(wxTextAttr_GetFlags, 1806). +-define(wxTextAttr_IsDefault, 1807). +-define(wxTextAttr_SetAlignment, 1808). +-define(wxTextAttr_SetBackgroundColour, 1809). +-define(wxTextAttr_SetFlags, 1810). +-define(wxTextAttr_SetFont, 1811). +-define(wxTextAttr_SetLeftIndent, 1812). +-define(wxTextAttr_SetRightIndent, 1813). +-define(wxTextAttr_SetTabs, 1814). +-define(wxTextAttr_SetTextColour, 1815). +-define(wxTextAttr_destroy, 1816). +-define(wxTextCtrl_new_3, 1818). +-define(wxTextCtrl_new_0, 1819). +-define(wxTextCtrl_destruct, 1821). +-define(wxTextCtrl_AppendText, 1822). +-define(wxTextCtrl_CanCopy, 1823). +-define(wxTextCtrl_CanCut, 1824). +-define(wxTextCtrl_CanPaste, 1825). +-define(wxTextCtrl_CanRedo, 1826). +-define(wxTextCtrl_CanUndo, 1827). +-define(wxTextCtrl_Clear, 1828). +-define(wxTextCtrl_Copy, 1829). +-define(wxTextCtrl_Create, 1830). +-define(wxTextCtrl_Cut, 1831). +-define(wxTextCtrl_DiscardEdits, 1832). +-define(wxTextCtrl_ChangeValue, 1833). +-define(wxTextCtrl_EmulateKeyPress, 1834). +-define(wxTextCtrl_GetDefaultStyle, 1835). +-define(wxTextCtrl_GetInsertionPoint, 1836). +-define(wxTextCtrl_GetLastPosition, 1837). +-define(wxTextCtrl_GetLineLength, 1838). +-define(wxTextCtrl_GetLineText, 1839). +-define(wxTextCtrl_GetNumberOfLines, 1840). +-define(wxTextCtrl_GetRange, 1841). +-define(wxTextCtrl_GetSelection, 1842). +-define(wxTextCtrl_GetStringSelection, 1843). +-define(wxTextCtrl_GetStyle, 1844). +-define(wxTextCtrl_GetValue, 1845). +-define(wxTextCtrl_IsEditable, 1846). +-define(wxTextCtrl_IsModified, 1847). +-define(wxTextCtrl_IsMultiLine, 1848). +-define(wxTextCtrl_IsSingleLine, 1849). +-define(wxTextCtrl_LoadFile, 1850). +-define(wxTextCtrl_MarkDirty, 1851). +-define(wxTextCtrl_Paste, 1852). +-define(wxTextCtrl_PositionToXY, 1853). +-define(wxTextCtrl_Redo, 1854). +-define(wxTextCtrl_Remove, 1855). +-define(wxTextCtrl_Replace, 1856). +-define(wxTextCtrl_SaveFile, 1857). +-define(wxTextCtrl_SetDefaultStyle, 1858). +-define(wxTextCtrl_SetEditable, 1859). +-define(wxTextCtrl_SetInsertionPoint, 1860). +-define(wxTextCtrl_SetInsertionPointEnd, 1861). +-define(wxTextCtrl_SetMaxLength, 1863). +-define(wxTextCtrl_SetSelection, 1864). +-define(wxTextCtrl_SetStyle, 1865). +-define(wxTextCtrl_SetValue, 1866). +-define(wxTextCtrl_ShowPosition, 1867). +-define(wxTextCtrl_Undo, 1868). +-define(wxTextCtrl_WriteText, 1869). +-define(wxTextCtrl_XYToPosition, 1870). +-define(wxNotebook_new_0, 1873). +-define(wxNotebook_new_3, 1874). +-define(wxNotebook_destruct, 1875). +-define(wxNotebook_AddPage, 1876). +-define(wxNotebook_AdvanceSelection, 1877). +-define(wxNotebook_AssignImageList, 1878). +-define(wxNotebook_Create, 1879). +-define(wxNotebook_DeleteAllPages, 1880). +-define(wxNotebook_DeletePage, 1881). +-define(wxNotebook_RemovePage, 1882). +-define(wxNotebook_GetCurrentPage, 1883). +-define(wxNotebook_GetImageList, 1884). +-define(wxNotebook_GetPage, 1886). +-define(wxNotebook_GetPageCount, 1887). +-define(wxNotebook_GetPageImage, 1888). +-define(wxNotebook_GetPageText, 1889). +-define(wxNotebook_GetRowCount, 1890). +-define(wxNotebook_GetSelection, 1891). +-define(wxNotebook_GetThemeBackgroundColour, 1892). +-define(wxNotebook_HitTest, 1894). +-define(wxNotebook_InsertPage, 1896). +-define(wxNotebook_SetImageList, 1897). +-define(wxNotebook_SetPadding, 1898). +-define(wxNotebook_SetPageSize, 1899). +-define(wxNotebook_SetPageImage, 1900). +-define(wxNotebook_SetPageText, 1901). +-define(wxNotebook_SetSelection, 1902). +-define(wxNotebook_ChangeSelection, 1903). +-define(wxChoicebook_new_0, 1904). +-define(wxChoicebook_new_3, 1905). +-define(wxChoicebook_AddPage, 1906). +-define(wxChoicebook_AdvanceSelection, 1907). +-define(wxChoicebook_AssignImageList, 1908). +-define(wxChoicebook_Create, 1909). +-define(wxChoicebook_DeleteAllPages, 1910). +-define(wxChoicebook_DeletePage, 1911). +-define(wxChoicebook_RemovePage, 1912). +-define(wxChoicebook_GetCurrentPage, 1913). +-define(wxChoicebook_GetImageList, 1914). +-define(wxChoicebook_GetPage, 1916). +-define(wxChoicebook_GetPageCount, 1917). +-define(wxChoicebook_GetPageImage, 1918). +-define(wxChoicebook_GetPageText, 1919). +-define(wxChoicebook_GetSelection, 1920). +-define(wxChoicebook_HitTest, 1921). +-define(wxChoicebook_InsertPage, 1922). +-define(wxChoicebook_SetImageList, 1923). +-define(wxChoicebook_SetPageSize, 1924). +-define(wxChoicebook_SetPageImage, 1925). +-define(wxChoicebook_SetPageText, 1926). +-define(wxChoicebook_SetSelection, 1927). +-define(wxChoicebook_ChangeSelection, 1928). +-define(wxChoicebook_destroy, 1929). +-define(wxToolbook_new_0, 1930). +-define(wxToolbook_new_3, 1931). +-define(wxToolbook_AddPage, 1932). +-define(wxToolbook_AdvanceSelection, 1933). +-define(wxToolbook_AssignImageList, 1934). +-define(wxToolbook_Create, 1935). +-define(wxToolbook_DeleteAllPages, 1936). +-define(wxToolbook_DeletePage, 1937). +-define(wxToolbook_RemovePage, 1938). +-define(wxToolbook_GetCurrentPage, 1939). +-define(wxToolbook_GetImageList, 1940). +-define(wxToolbook_GetPage, 1942). +-define(wxToolbook_GetPageCount, 1943). +-define(wxToolbook_GetPageImage, 1944). +-define(wxToolbook_GetPageText, 1945). +-define(wxToolbook_GetSelection, 1946). +-define(wxToolbook_HitTest, 1948). +-define(wxToolbook_InsertPage, 1949). +-define(wxToolbook_SetImageList, 1950). +-define(wxToolbook_SetPageSize, 1951). +-define(wxToolbook_SetPageImage, 1952). +-define(wxToolbook_SetPageText, 1953). +-define(wxToolbook_SetSelection, 1954). +-define(wxToolbook_ChangeSelection, 1955). +-define(wxToolbook_destroy, 1956). +-define(wxListbook_new_0, 1957). +-define(wxListbook_new_3, 1958). +-define(wxListbook_AddPage, 1959). +-define(wxListbook_AdvanceSelection, 1960). +-define(wxListbook_AssignImageList, 1961). +-define(wxListbook_Create, 1962). +-define(wxListbook_DeleteAllPages, 1963). +-define(wxListbook_DeletePage, 1964). +-define(wxListbook_RemovePage, 1965). +-define(wxListbook_GetCurrentPage, 1966). +-define(wxListbook_GetImageList, 1967). +-define(wxListbook_GetPage, 1969). +-define(wxListbook_GetPageCount, 1970). +-define(wxListbook_GetPageImage, 1971). +-define(wxListbook_GetPageText, 1972). +-define(wxListbook_GetSelection, 1973). +-define(wxListbook_HitTest, 1975). +-define(wxListbook_InsertPage, 1976). +-define(wxListbook_SetImageList, 1977). +-define(wxListbook_SetPageSize, 1978). +-define(wxListbook_SetPageImage, 1979). +-define(wxListbook_SetPageText, 1980). +-define(wxListbook_SetSelection, 1981). +-define(wxListbook_ChangeSelection, 1982). +-define(wxListbook_destroy, 1983). +-define(wxTreebook_new_0, 1984). +-define(wxTreebook_new_3, 1985). +-define(wxTreebook_AddPage, 1986). +-define(wxTreebook_AdvanceSelection, 1987). +-define(wxTreebook_AssignImageList, 1988). +-define(wxTreebook_Create, 1989). +-define(wxTreebook_DeleteAllPages, 1990). +-define(wxTreebook_DeletePage, 1991). +-define(wxTreebook_RemovePage, 1992). +-define(wxTreebook_GetCurrentPage, 1993). +-define(wxTreebook_GetImageList, 1994). +-define(wxTreebook_GetPage, 1996). +-define(wxTreebook_GetPageCount, 1997). +-define(wxTreebook_GetPageImage, 1998). +-define(wxTreebook_GetPageText, 1999). +-define(wxTreebook_GetSelection, 2000). +-define(wxTreebook_ExpandNode, 2001). +-define(wxTreebook_IsNodeExpanded, 2002). +-define(wxTreebook_HitTest, 2004). +-define(wxTreebook_InsertPage, 2005). +-define(wxTreebook_InsertSubPage, 2006). +-define(wxTreebook_SetImageList, 2007). +-define(wxTreebook_SetPageSize, 2008). +-define(wxTreebook_SetPageImage, 2009). +-define(wxTreebook_SetPageText, 2010). +-define(wxTreebook_SetSelection, 2011). +-define(wxTreebook_ChangeSelection, 2012). +-define(wxTreebook_destroy, 2013). +-define(wxTreeCtrl_new_2, 2016). +-define(wxTreeCtrl_new_0, 2017). +-define(wxTreeCtrl_destruct, 2019). +-define(wxTreeCtrl_AddRoot, 2020). +-define(wxTreeCtrl_AppendItem, 2021). +-define(wxTreeCtrl_AssignImageList, 2022). +-define(wxTreeCtrl_AssignStateImageList, 2023). +-define(wxTreeCtrl_Collapse, 2024). +-define(wxTreeCtrl_CollapseAndReset, 2025). +-define(wxTreeCtrl_Create, 2026). +-define(wxTreeCtrl_Delete, 2027). +-define(wxTreeCtrl_DeleteAllItems, 2028). +-define(wxTreeCtrl_DeleteChildren, 2029). +-define(wxTreeCtrl_EditLabel, 2030). +-define(wxTreeCtrl_EnsureVisible, 2031). +-define(wxTreeCtrl_Expand, 2032). +-define(wxTreeCtrl_GetBoundingRect, 2033). +-define(wxTreeCtrl_GetChildrenCount, 2035). +-define(wxTreeCtrl_GetCount, 2036). +-define(wxTreeCtrl_GetEditControl, 2037). +-define(wxTreeCtrl_GetFirstChild, 2038). +-define(wxTreeCtrl_GetNextChild, 2039). +-define(wxTreeCtrl_GetFirstVisibleItem, 2040). +-define(wxTreeCtrl_GetImageList, 2041). +-define(wxTreeCtrl_GetIndent, 2042). +-define(wxTreeCtrl_GetItemBackgroundColour, 2043). +-define(wxTreeCtrl_GetItemData, 2044). +-define(wxTreeCtrl_GetItemFont, 2045). +-define(wxTreeCtrl_GetItemImage_1, 2046). +-define(wxTreeCtrl_GetItemImage_2, 2047). +-define(wxTreeCtrl_GetItemText, 2048). +-define(wxTreeCtrl_GetItemTextColour, 2049). +-define(wxTreeCtrl_GetLastChild, 2050). +-define(wxTreeCtrl_GetNextSibling, 2051). +-define(wxTreeCtrl_GetNextVisible, 2052). +-define(wxTreeCtrl_GetItemParent, 2053). +-define(wxTreeCtrl_GetPrevSibling, 2054). +-define(wxTreeCtrl_GetPrevVisible, 2055). +-define(wxTreeCtrl_GetRootItem, 2056). +-define(wxTreeCtrl_GetSelection, 2057). +-define(wxTreeCtrl_GetSelections, 2058). +-define(wxTreeCtrl_GetStateImageList, 2059). +-define(wxTreeCtrl_HitTest, 2060). +-define(wxTreeCtrl_InsertItem, 2062). +-define(wxTreeCtrl_IsBold, 2063). +-define(wxTreeCtrl_IsExpanded, 2064). +-define(wxTreeCtrl_IsSelected, 2065). +-define(wxTreeCtrl_IsVisible, 2066). +-define(wxTreeCtrl_ItemHasChildren, 2067). +-define(wxTreeCtrl_IsTreeItemIdOk, 2068). +-define(wxTreeCtrl_PrependItem, 2069). +-define(wxTreeCtrl_ScrollTo, 2070). +-define(wxTreeCtrl_SelectItem_1, 2071). +-define(wxTreeCtrl_SelectItem_2, 2072). +-define(wxTreeCtrl_SetIndent, 2073). +-define(wxTreeCtrl_SetImageList, 2074). +-define(wxTreeCtrl_SetItemBackgroundColour, 2075). +-define(wxTreeCtrl_SetItemBold, 2076). +-define(wxTreeCtrl_SetItemData, 2077). +-define(wxTreeCtrl_SetItemDropHighlight, 2078). +-define(wxTreeCtrl_SetItemFont, 2079). +-define(wxTreeCtrl_SetItemHasChildren, 2080). +-define(wxTreeCtrl_SetItemImage_2, 2081). +-define(wxTreeCtrl_SetItemImage_3, 2082). +-define(wxTreeCtrl_SetItemText, 2083). +-define(wxTreeCtrl_SetItemTextColour, 2084). +-define(wxTreeCtrl_SetStateImageList, 2085). +-define(wxTreeCtrl_SetWindowStyle, 2086). +-define(wxTreeCtrl_SortChildren, 2087). +-define(wxTreeCtrl_Toggle, 2088). +-define(wxTreeCtrl_ToggleItemSelection, 2089). +-define(wxTreeCtrl_Unselect, 2090). +-define(wxTreeCtrl_UnselectAll, 2091). +-define(wxTreeCtrl_UnselectItem, 2092). +-define(wxScrollBar_new_0, 2093). +-define(wxScrollBar_new_3, 2094). +-define(wxScrollBar_destruct, 2095). +-define(wxScrollBar_Create, 2096). +-define(wxScrollBar_GetRange, 2097). +-define(wxScrollBar_GetPageSize, 2098). +-define(wxScrollBar_GetThumbPosition, 2099). +-define(wxScrollBar_GetThumbSize, 2100). +-define(wxScrollBar_SetThumbPosition, 2101). +-define(wxScrollBar_SetScrollbar, 2102). +-define(wxSpinButton_new_2, 2104). +-define(wxSpinButton_new_0, 2105). +-define(wxSpinButton_Create, 2106). +-define(wxSpinButton_GetMax, 2107). +-define(wxSpinButton_GetMin, 2108). +-define(wxSpinButton_GetValue, 2109). +-define(wxSpinButton_SetRange, 2110). +-define(wxSpinButton_SetValue, 2111). +-define(wxSpinButton_destroy, 2112). +-define(wxSpinCtrl_new_0, 2113). +-define(wxSpinCtrl_new_2, 2114). +-define(wxSpinCtrl_Create, 2116). +-define(wxSpinCtrl_SetValue_1_1, 2119). +-define(wxSpinCtrl_SetValue_1_0, 2120). +-define(wxSpinCtrl_GetValue, 2122). +-define(wxSpinCtrl_SetRange, 2124). +-define(wxSpinCtrl_SetSelection, 2125). +-define(wxSpinCtrl_GetMin, 2127). +-define(wxSpinCtrl_GetMax, 2129). +-define(wxSpinCtrl_destroy, 2130). +-define(wxStaticText_new_0, 2131). +-define(wxStaticText_new_4, 2132). +-define(wxStaticText_Create, 2133). +-define(wxStaticText_GetLabel, 2134). +-define(wxStaticText_SetLabel, 2135). +-define(wxStaticText_Wrap, 2136). +-define(wxStaticText_destroy, 2137). +-define(wxStaticBitmap_new_0, 2138). +-define(wxStaticBitmap_new_4, 2139). +-define(wxStaticBitmap_Create, 2140). +-define(wxStaticBitmap_GetBitmap, 2141). +-define(wxStaticBitmap_SetBitmap, 2142). +-define(wxStaticBitmap_destroy, 2143). +-define(wxRadioBox_new, 2144). +-define(wxRadioBox_destruct, 2146). +-define(wxRadioBox_Create, 2147). +-define(wxRadioBox_Enable_2, 2148). +-define(wxRadioBox_Enable_1, 2149). +-define(wxRadioBox_GetSelection, 2150). +-define(wxRadioBox_GetString, 2151). +-define(wxRadioBox_SetSelection, 2152). +-define(wxRadioBox_Show_2, 2153). +-define(wxRadioBox_Show_1, 2154). +-define(wxRadioBox_GetColumnCount, 2155). +-define(wxRadioBox_GetItemHelpText, 2156). +-define(wxRadioBox_GetItemToolTip, 2157). +-define(wxRadioBox_GetItemFromPoint, 2159). +-define(wxRadioBox_GetRowCount, 2160). +-define(wxRadioBox_IsItemEnabled, 2161). +-define(wxRadioBox_IsItemShown, 2162). +-define(wxRadioBox_SetItemHelpText, 2163). +-define(wxRadioBox_SetItemToolTip, 2164). +-define(wxRadioButton_new_0, 2165). +-define(wxRadioButton_new_4, 2166). +-define(wxRadioButton_Create, 2167). +-define(wxRadioButton_GetValue, 2168). +-define(wxRadioButton_SetValue, 2169). +-define(wxRadioButton_destroy, 2170). +-define(wxSlider_new_6, 2172). +-define(wxSlider_new_0, 2173). +-define(wxSlider_Create, 2174). +-define(wxSlider_GetLineSize, 2175). +-define(wxSlider_GetMax, 2176). +-define(wxSlider_GetMin, 2177). +-define(wxSlider_GetPageSize, 2178). +-define(wxSlider_GetThumbLength, 2179). +-define(wxSlider_GetValue, 2180). +-define(wxSlider_SetLineSize, 2181). +-define(wxSlider_SetPageSize, 2182). +-define(wxSlider_SetRange, 2183). +-define(wxSlider_SetThumbLength, 2184). +-define(wxSlider_SetValue, 2185). +-define(wxSlider_destroy, 2186). +-define(wxDialog_new_4, 2188). +-define(wxDialog_new_0, 2189). +-define(wxDialog_destruct, 2191). +-define(wxDialog_Create, 2192). +-define(wxDialog_CreateButtonSizer, 2193). +-define(wxDialog_CreateStdDialogButtonSizer, 2194). +-define(wxDialog_EndModal, 2195). +-define(wxDialog_GetAffirmativeId, 2196). +-define(wxDialog_GetReturnCode, 2197). +-define(wxDialog_IsModal, 2198). +-define(wxDialog_SetAffirmativeId, 2199). +-define(wxDialog_SetReturnCode, 2200). +-define(wxDialog_Show, 2201). +-define(wxDialog_ShowModal, 2202). +-define(wxColourDialog_new_0, 2203). +-define(wxColourDialog_new_2, 2204). +-define(wxColourDialog_destruct, 2205). +-define(wxColourDialog_Create, 2206). +-define(wxColourDialog_GetColourData, 2207). +-define(wxColourData_new_0, 2208). +-define(wxColourData_new_1, 2209). +-define(wxColourData_destruct, 2210). +-define(wxColourData_GetChooseFull, 2211). +-define(wxColourData_GetColour, 2212). +-define(wxColourData_GetCustomColour, 2214). +-define(wxColourData_SetChooseFull, 2215). +-define(wxColourData_SetColour, 2216). +-define(wxColourData_SetCustomColour, 2217). +-define(wxPalette_new_0, 2218). +-define(wxPalette_new_4, 2219). +-define(wxPalette_destruct, 2221). +-define(wxPalette_Create, 2222). +-define(wxPalette_GetColoursCount, 2223). +-define(wxPalette_GetPixel, 2224). +-define(wxPalette_GetRGB, 2225). +-define(wxPalette_IsOk, 2226). +-define(wxDirDialog_new, 2230). +-define(wxDirDialog_destruct, 2231). +-define(wxDirDialog_GetPath, 2232). +-define(wxDirDialog_GetMessage, 2233). +-define(wxDirDialog_SetMessage, 2234). +-define(wxDirDialog_SetPath, 2235). +-define(wxFileDialog_new, 2239). +-define(wxFileDialog_destruct, 2240). +-define(wxFileDialog_GetDirectory, 2241). +-define(wxFileDialog_GetFilename, 2242). +-define(wxFileDialog_GetFilenames, 2243). +-define(wxFileDialog_GetFilterIndex, 2244). +-define(wxFileDialog_GetMessage, 2245). +-define(wxFileDialog_GetPath, 2246). +-define(wxFileDialog_GetPaths, 2247). +-define(wxFileDialog_GetWildcard, 2248). +-define(wxFileDialog_SetDirectory, 2249). +-define(wxFileDialog_SetFilename, 2250). +-define(wxFileDialog_SetFilterIndex, 2251). +-define(wxFileDialog_SetMessage, 2252). +-define(wxFileDialog_SetPath, 2253). +-define(wxFileDialog_SetWildcard, 2254). +-define(wxPickerBase_SetInternalMargin, 2255). +-define(wxPickerBase_GetInternalMargin, 2256). +-define(wxPickerBase_SetTextCtrlProportion, 2257). +-define(wxPickerBase_SetPickerCtrlProportion, 2258). +-define(wxPickerBase_GetTextCtrlProportion, 2259). +-define(wxPickerBase_GetPickerCtrlProportion, 2260). +-define(wxPickerBase_HasTextCtrl, 2261). +-define(wxPickerBase_GetTextCtrl, 2262). +-define(wxPickerBase_IsTextCtrlGrowable, 2263). +-define(wxPickerBase_SetPickerCtrlGrowable, 2264). +-define(wxPickerBase_SetTextCtrlGrowable, 2265). +-define(wxPickerBase_IsPickerCtrlGrowable, 2266). +-define(wxFilePickerCtrl_new_0, 2267). +-define(wxFilePickerCtrl_new_3, 2268). +-define(wxFilePickerCtrl_Create, 2269). +-define(wxFilePickerCtrl_GetPath, 2270). +-define(wxFilePickerCtrl_SetPath, 2271). +-define(wxFilePickerCtrl_destroy, 2272). +-define(wxDirPickerCtrl_new_0, 2273). +-define(wxDirPickerCtrl_new_3, 2274). +-define(wxDirPickerCtrl_Create, 2275). +-define(wxDirPickerCtrl_GetPath, 2276). +-define(wxDirPickerCtrl_SetPath, 2277). +-define(wxDirPickerCtrl_destroy, 2278). +-define(wxColourPickerCtrl_new_0, 2279). +-define(wxColourPickerCtrl_new_3, 2280). +-define(wxColourPickerCtrl_Create, 2281). +-define(wxColourPickerCtrl_GetColour, 2282). +-define(wxColourPickerCtrl_SetColour_1_1, 2283). +-define(wxColourPickerCtrl_SetColour_1_0, 2284). +-define(wxColourPickerCtrl_destroy, 2285). +-define(wxDatePickerCtrl_new_0, 2286). +-define(wxDatePickerCtrl_new_3, 2287). +-define(wxDatePickerCtrl_GetRange, 2288). +-define(wxDatePickerCtrl_GetValue, 2289). +-define(wxDatePickerCtrl_SetRange, 2290). +-define(wxDatePickerCtrl_SetValue, 2291). +-define(wxDatePickerCtrl_destroy, 2292). +-define(wxFontPickerCtrl_new_0, 2293). +-define(wxFontPickerCtrl_new_3, 2294). +-define(wxFontPickerCtrl_Create, 2295). +-define(wxFontPickerCtrl_GetSelectedFont, 2296). +-define(wxFontPickerCtrl_SetSelectedFont, 2297). +-define(wxFontPickerCtrl_GetMaxPointSize, 2298). +-define(wxFontPickerCtrl_SetMaxPointSize, 2299). +-define(wxFontPickerCtrl_destroy, 2300). +-define(wxFindReplaceDialog_new_0, 2303). +-define(wxFindReplaceDialog_new_4, 2304). +-define(wxFindReplaceDialog_destruct, 2305). +-define(wxFindReplaceDialog_Create, 2306). +-define(wxFindReplaceDialog_GetData, 2307). +-define(wxFindReplaceData_new_0, 2308). +-define(wxFindReplaceData_new_1, 2309). +-define(wxFindReplaceData_GetFindString, 2310). +-define(wxFindReplaceData_GetReplaceString, 2311). +-define(wxFindReplaceData_GetFlags, 2312). +-define(wxFindReplaceData_SetFlags, 2313). +-define(wxFindReplaceData_SetFindString, 2314). +-define(wxFindReplaceData_SetReplaceString, 2315). +-define(wxFindReplaceData_destroy, 2316). +-define(wxMultiChoiceDialog_new_0, 2317). +-define(wxMultiChoiceDialog_new_5, 2319). +-define(wxMultiChoiceDialog_GetSelections, 2320). +-define(wxMultiChoiceDialog_SetSelections, 2321). +-define(wxMultiChoiceDialog_destroy, 2322). +-define(wxSingleChoiceDialog_new_0, 2323). +-define(wxSingleChoiceDialog_new_5, 2325). +-define(wxSingleChoiceDialog_GetSelection, 2326). +-define(wxSingleChoiceDialog_GetStringSelection, 2327). +-define(wxSingleChoiceDialog_SetSelection, 2328). +-define(wxSingleChoiceDialog_destroy, 2329). +-define(wxTextEntryDialog_new, 2330). +-define(wxTextEntryDialog_GetValue, 2331). +-define(wxTextEntryDialog_SetValue, 2332). +-define(wxTextEntryDialog_destroy, 2333). +-define(wxPasswordEntryDialog_new, 2334). +-define(wxPasswordEntryDialog_destroy, 2335). +-define(wxFontData_new_0, 2336). +-define(wxFontData_new_1, 2337). +-define(wxFontData_destruct, 2338). +-define(wxFontData_EnableEffects, 2339). +-define(wxFontData_GetAllowSymbols, 2340). +-define(wxFontData_GetColour, 2341). +-define(wxFontData_GetChosenFont, 2342). +-define(wxFontData_GetEnableEffects, 2343). +-define(wxFontData_GetInitialFont, 2344). +-define(wxFontData_GetShowHelp, 2345). +-define(wxFontData_SetAllowSymbols, 2346). +-define(wxFontData_SetChosenFont, 2347). +-define(wxFontData_SetColour, 2348). +-define(wxFontData_SetInitialFont, 2349). +-define(wxFontData_SetRange, 2350). +-define(wxFontData_SetShowHelp, 2351). +-define(wxFontDialog_new_0, 2355). +-define(wxFontDialog_new_2, 2357). +-define(wxFontDialog_Create, 2359). +-define(wxFontDialog_GetFontData, 2360). +-define(wxFontDialog_destroy, 2362). +-define(wxProgressDialog_new, 2363). +-define(wxProgressDialog_destruct, 2364). +-define(wxProgressDialog_Resume, 2365). +-define(wxProgressDialog_Update_2, 2366). +-define(wxProgressDialog_Update_0, 2367). +-define(wxMessageDialog_new, 2368). +-define(wxMessageDialog_destruct, 2369). +-define(wxPageSetupDialog_new, 2370). +-define(wxPageSetupDialog_destruct, 2371). +-define(wxPageSetupDialog_GetPageSetupData, 2372). +-define(wxPageSetupDialog_ShowModal, 2373). +-define(wxPageSetupDialogData_new_0, 2374). +-define(wxPageSetupDialogData_new_1_0, 2375). +-define(wxPageSetupDialogData_new_1_1, 2376). +-define(wxPageSetupDialogData_destruct, 2377). +-define(wxPageSetupDialogData_EnableHelp, 2378). +-define(wxPageSetupDialogData_EnableMargins, 2379). +-define(wxPageSetupDialogData_EnableOrientation, 2380). +-define(wxPageSetupDialogData_EnablePaper, 2381). +-define(wxPageSetupDialogData_EnablePrinter, 2382). +-define(wxPageSetupDialogData_GetDefaultMinMargins, 2383). +-define(wxPageSetupDialogData_GetEnableMargins, 2384). +-define(wxPageSetupDialogData_GetEnableOrientation, 2385). +-define(wxPageSetupDialogData_GetEnablePaper, 2386). +-define(wxPageSetupDialogData_GetEnablePrinter, 2387). +-define(wxPageSetupDialogData_GetEnableHelp, 2388). +-define(wxPageSetupDialogData_GetDefaultInfo, 2389). +-define(wxPageSetupDialogData_GetMarginTopLeft, 2390). +-define(wxPageSetupDialogData_GetMarginBottomRight, 2391). +-define(wxPageSetupDialogData_GetMinMarginTopLeft, 2392). +-define(wxPageSetupDialogData_GetMinMarginBottomRight, 2393). +-define(wxPageSetupDialogData_GetPaperId, 2394). +-define(wxPageSetupDialogData_GetPaperSize, 2395). +-define(wxPageSetupDialogData_GetPrintData, 2397). +-define(wxPageSetupDialogData_IsOk, 2398). +-define(wxPageSetupDialogData_SetDefaultInfo, 2399). +-define(wxPageSetupDialogData_SetDefaultMinMargins, 2400). +-define(wxPageSetupDialogData_SetMarginTopLeft, 2401). +-define(wxPageSetupDialogData_SetMarginBottomRight, 2402). +-define(wxPageSetupDialogData_SetMinMarginTopLeft, 2403). +-define(wxPageSetupDialogData_SetMinMarginBottomRight, 2404). +-define(wxPageSetupDialogData_SetPaperId, 2405). +-define(wxPageSetupDialogData_SetPaperSize_1_1, 2406). +-define(wxPageSetupDialogData_SetPaperSize_1_0, 2407). +-define(wxPageSetupDialogData_SetPrintData, 2408). +-define(wxPrintDialog_new_2_0, 2409). +-define(wxPrintDialog_new_2_1, 2410). +-define(wxPrintDialog_destruct, 2411). +-define(wxPrintDialog_GetPrintDialogData, 2412). +-define(wxPrintDialog_GetPrintDC, 2413). +-define(wxPrintDialogData_new_0, 2414). +-define(wxPrintDialogData_new_1_1, 2415). +-define(wxPrintDialogData_new_1_0, 2416). +-define(wxPrintDialogData_destruct, 2417). +-define(wxPrintDialogData_EnableHelp, 2418). +-define(wxPrintDialogData_EnablePageNumbers, 2419). +-define(wxPrintDialogData_EnablePrintToFile, 2420). +-define(wxPrintDialogData_EnableSelection, 2421). +-define(wxPrintDialogData_GetAllPages, 2422). +-define(wxPrintDialogData_GetCollate, 2423). +-define(wxPrintDialogData_GetFromPage, 2424). +-define(wxPrintDialogData_GetMaxPage, 2425). +-define(wxPrintDialogData_GetMinPage, 2426). +-define(wxPrintDialogData_GetNoCopies, 2427). +-define(wxPrintDialogData_GetPrintData, 2428). +-define(wxPrintDialogData_GetPrintToFile, 2429). +-define(wxPrintDialogData_GetSelection, 2430). +-define(wxPrintDialogData_GetToPage, 2431). +-define(wxPrintDialogData_IsOk, 2432). +-define(wxPrintDialogData_SetCollate, 2433). +-define(wxPrintDialogData_SetFromPage, 2434). +-define(wxPrintDialogData_SetMaxPage, 2435). +-define(wxPrintDialogData_SetMinPage, 2436). +-define(wxPrintDialogData_SetNoCopies, 2437). +-define(wxPrintDialogData_SetPrintData, 2438). +-define(wxPrintDialogData_SetPrintToFile, 2439). +-define(wxPrintDialogData_SetSelection, 2440). +-define(wxPrintDialogData_SetToPage, 2441). +-define(wxPrintData_new_0, 2442). +-define(wxPrintData_new_1, 2443). +-define(wxPrintData_destruct, 2444). +-define(wxPrintData_GetCollate, 2445). +-define(wxPrintData_GetBin, 2446). +-define(wxPrintData_GetColour, 2447). +-define(wxPrintData_GetDuplex, 2448). +-define(wxPrintData_GetNoCopies, 2449). +-define(wxPrintData_GetOrientation, 2450). +-define(wxPrintData_GetPaperId, 2451). +-define(wxPrintData_GetPrinterName, 2452). +-define(wxPrintData_GetQuality, 2453). +-define(wxPrintData_IsOk, 2454). +-define(wxPrintData_SetBin, 2455). +-define(wxPrintData_SetCollate, 2456). +-define(wxPrintData_SetColour, 2457). +-define(wxPrintData_SetDuplex, 2458). +-define(wxPrintData_SetNoCopies, 2459). +-define(wxPrintData_SetOrientation, 2460). +-define(wxPrintData_SetPaperId, 2461). +-define(wxPrintData_SetPrinterName, 2462). +-define(wxPrintData_SetQuality, 2463). +-define(wxPrintPreview_new_2, 2466). +-define(wxPrintPreview_new_3, 2467). +-define(wxPrintPreview_destruct, 2469). +-define(wxPrintPreview_GetCanvas, 2470). +-define(wxPrintPreview_GetCurrentPage, 2471). +-define(wxPrintPreview_GetFrame, 2472). +-define(wxPrintPreview_GetMaxPage, 2473). +-define(wxPrintPreview_GetMinPage, 2474). +-define(wxPrintPreview_GetPrintout, 2475). +-define(wxPrintPreview_GetPrintoutForPrinting, 2476). +-define(wxPrintPreview_IsOk, 2477). +-define(wxPrintPreview_PaintPage, 2478). +-define(wxPrintPreview_Print, 2479). +-define(wxPrintPreview_RenderPage, 2480). +-define(wxPrintPreview_SetCanvas, 2481). +-define(wxPrintPreview_SetCurrentPage, 2482). +-define(wxPrintPreview_SetFrame, 2483). +-define(wxPrintPreview_SetPrintout, 2484). +-define(wxPrintPreview_SetZoom, 2485). +-define(wxPreviewFrame_new, 2486). +-define(wxPreviewFrame_destruct, 2487). +-define(wxPreviewFrame_CreateControlBar, 2488). +-define(wxPreviewFrame_CreateCanvas, 2489). +-define(wxPreviewFrame_Initialize, 2490). +-define(wxPreviewFrame_OnCloseWindow, 2491). +-define(wxPreviewControlBar_new, 2492). +-define(wxPreviewControlBar_destruct, 2493). +-define(wxPreviewControlBar_CreateButtons, 2494). +-define(wxPreviewControlBar_GetPrintPreview, 2495). +-define(wxPreviewControlBar_GetZoomControl, 2496). +-define(wxPreviewControlBar_SetZoomControl, 2497). +-define(wxPrinter_new, 2499). +-define(wxPrinter_CreateAbortWindow, 2500). +-define(wxPrinter_GetAbort, 2501). +-define(wxPrinter_GetLastError, 2502). +-define(wxPrinter_GetPrintDialogData, 2503). +-define(wxPrinter_Print, 2504). +-define(wxPrinter_PrintDialog, 2505). +-define(wxPrinter_ReportError, 2506). +-define(wxPrinter_Setup, 2507). +-define(wxPrinter_destroy, 2508). +-define(wxXmlResource_new_1, 2509). +-define(wxXmlResource_new_2, 2510). +-define(wxXmlResource_destruct, 2511). +-define(wxXmlResource_AttachUnknownControl, 2512). +-define(wxXmlResource_ClearHandlers, 2513). +-define(wxXmlResource_CompareVersion, 2514). +-define(wxXmlResource_Get, 2515). +-define(wxXmlResource_GetFlags, 2516). +-define(wxXmlResource_GetVersion, 2517). +-define(wxXmlResource_GetXRCID, 2518). +-define(wxXmlResource_InitAllHandlers, 2519). +-define(wxXmlResource_Load, 2520). +-define(wxXmlResource_LoadBitmap, 2521). +-define(wxXmlResource_LoadDialog_2, 2522). +-define(wxXmlResource_LoadDialog_3, 2523). +-define(wxXmlResource_LoadFrame_2, 2524). +-define(wxXmlResource_LoadFrame_3, 2525). +-define(wxXmlResource_LoadIcon, 2526). +-define(wxXmlResource_LoadMenu, 2527). +-define(wxXmlResource_LoadMenuBar_2, 2528). +-define(wxXmlResource_LoadMenuBar_1, 2529). +-define(wxXmlResource_LoadPanel_2, 2530). +-define(wxXmlResource_LoadPanel_3, 2531). +-define(wxXmlResource_LoadToolBar, 2532). +-define(wxXmlResource_Set, 2533). +-define(wxXmlResource_SetFlags, 2534). +-define(wxXmlResource_Unload, 2535). +-define(wxXmlResource_xrcctrl, 2536). +-define(wxHtmlEasyPrinting_new, 2537). +-define(wxHtmlEasyPrinting_destruct, 2538). +-define(wxHtmlEasyPrinting_GetPrintData, 2539). +-define(wxHtmlEasyPrinting_GetPageSetupData, 2540). +-define(wxHtmlEasyPrinting_PreviewFile, 2541). +-define(wxHtmlEasyPrinting_PreviewText, 2542). +-define(wxHtmlEasyPrinting_PrintFile, 2543). +-define(wxHtmlEasyPrinting_PrintText, 2544). +-define(wxHtmlEasyPrinting_PageSetup, 2545). +-define(wxHtmlEasyPrinting_SetFonts, 2546). +-define(wxHtmlEasyPrinting_SetHeader, 2547). +-define(wxHtmlEasyPrinting_SetFooter, 2548). +-define(wxGLCanvas_new_2, 2550). +-define(wxGLCanvas_new_3_1, 2551). +-define(wxGLCanvas_new_3_0, 2552). +-define(wxGLCanvas_GetContext, 2553). +-define(wxGLCanvas_SetCurrent, 2555). +-define(wxGLCanvas_SwapBuffers, 2556). +-define(wxGLCanvas_destroy, 2557). +-define(wxAuiManager_new, 2558). +-define(wxAuiManager_destruct, 2559). +-define(wxAuiManager_AddPane_2_1, 2560). +-define(wxAuiManager_AddPane_3, 2561). +-define(wxAuiManager_AddPane_2_0, 2562). +-define(wxAuiManager_DetachPane, 2563). +-define(wxAuiManager_GetAllPanes, 2564). +-define(wxAuiManager_GetArtProvider, 2565). +-define(wxAuiManager_GetDockSizeConstraint, 2566). +-define(wxAuiManager_GetFlags, 2567). +-define(wxAuiManager_GetManagedWindow, 2568). +-define(wxAuiManager_GetManager, 2569). +-define(wxAuiManager_GetPane_1_1, 2570). +-define(wxAuiManager_GetPane_1_0, 2571). +-define(wxAuiManager_HideHint, 2572). +-define(wxAuiManager_InsertPane, 2573). +-define(wxAuiManager_LoadPaneInfo, 2574). +-define(wxAuiManager_LoadPerspective, 2575). +-define(wxAuiManager_SavePaneInfo, 2576). +-define(wxAuiManager_SavePerspective, 2577). +-define(wxAuiManager_SetArtProvider, 2578). +-define(wxAuiManager_SetDockSizeConstraint, 2579). +-define(wxAuiManager_SetFlags, 2580). +-define(wxAuiManager_SetManagedWindow, 2581). +-define(wxAuiManager_ShowHint, 2582). +-define(wxAuiManager_UnInit, 2583). +-define(wxAuiManager_Update, 2584). +-define(wxAuiPaneInfo_new_0, 2585). +-define(wxAuiPaneInfo_new_1, 2586). +-define(wxAuiPaneInfo_destruct, 2587). +-define(wxAuiPaneInfo_BestSize_1, 2588). +-define(wxAuiPaneInfo_BestSize_2, 2589). +-define(wxAuiPaneInfo_Bottom, 2590). +-define(wxAuiPaneInfo_BottomDockable, 2591). +-define(wxAuiPaneInfo_Caption, 2592). +-define(wxAuiPaneInfo_CaptionVisible, 2593). +-define(wxAuiPaneInfo_Centre, 2594). +-define(wxAuiPaneInfo_CentrePane, 2595). +-define(wxAuiPaneInfo_CloseButton, 2596). +-define(wxAuiPaneInfo_DefaultPane, 2597). +-define(wxAuiPaneInfo_DestroyOnClose, 2598). +-define(wxAuiPaneInfo_Direction, 2599). +-define(wxAuiPaneInfo_Dock, 2600). +-define(wxAuiPaneInfo_Dockable, 2601). +-define(wxAuiPaneInfo_Fixed, 2602). +-define(wxAuiPaneInfo_Float, 2603). +-define(wxAuiPaneInfo_Floatable, 2604). +-define(wxAuiPaneInfo_FloatingPosition_1, 2605). +-define(wxAuiPaneInfo_FloatingPosition_2, 2606). +-define(wxAuiPaneInfo_FloatingSize_1, 2607). +-define(wxAuiPaneInfo_FloatingSize_2, 2608). +-define(wxAuiPaneInfo_Gripper, 2609). +-define(wxAuiPaneInfo_GripperTop, 2610). +-define(wxAuiPaneInfo_HasBorder, 2611). +-define(wxAuiPaneInfo_HasCaption, 2612). +-define(wxAuiPaneInfo_HasCloseButton, 2613). +-define(wxAuiPaneInfo_HasFlag, 2614). +-define(wxAuiPaneInfo_HasGripper, 2615). +-define(wxAuiPaneInfo_HasGripperTop, 2616). +-define(wxAuiPaneInfo_HasMaximizeButton, 2617). +-define(wxAuiPaneInfo_HasMinimizeButton, 2618). +-define(wxAuiPaneInfo_HasPinButton, 2619). +-define(wxAuiPaneInfo_Hide, 2620). +-define(wxAuiPaneInfo_IsBottomDockable, 2621). +-define(wxAuiPaneInfo_IsDocked, 2622). +-define(wxAuiPaneInfo_IsFixed, 2623). +-define(wxAuiPaneInfo_IsFloatable, 2624). +-define(wxAuiPaneInfo_IsFloating, 2625). +-define(wxAuiPaneInfo_IsLeftDockable, 2626). +-define(wxAuiPaneInfo_IsMovable, 2627). +-define(wxAuiPaneInfo_IsOk, 2628). +-define(wxAuiPaneInfo_IsResizable, 2629). +-define(wxAuiPaneInfo_IsRightDockable, 2630). +-define(wxAuiPaneInfo_IsShown, 2631). +-define(wxAuiPaneInfo_IsToolbar, 2632). +-define(wxAuiPaneInfo_IsTopDockable, 2633). +-define(wxAuiPaneInfo_Layer, 2634). +-define(wxAuiPaneInfo_Left, 2635). +-define(wxAuiPaneInfo_LeftDockable, 2636). +-define(wxAuiPaneInfo_MaxSize_1, 2637). +-define(wxAuiPaneInfo_MaxSize_2, 2638). +-define(wxAuiPaneInfo_MaximizeButton, 2639). +-define(wxAuiPaneInfo_MinSize_1, 2640). +-define(wxAuiPaneInfo_MinSize_2, 2641). +-define(wxAuiPaneInfo_MinimizeButton, 2642). +-define(wxAuiPaneInfo_Movable, 2643). +-define(wxAuiPaneInfo_Name, 2644). +-define(wxAuiPaneInfo_PaneBorder, 2645). +-define(wxAuiPaneInfo_PinButton, 2646). +-define(wxAuiPaneInfo_Position, 2647). +-define(wxAuiPaneInfo_Resizable, 2648). +-define(wxAuiPaneInfo_Right, 2649). +-define(wxAuiPaneInfo_RightDockable, 2650). +-define(wxAuiPaneInfo_Row, 2651). +-define(wxAuiPaneInfo_SafeSet, 2652). +-define(wxAuiPaneInfo_SetFlag, 2653). +-define(wxAuiPaneInfo_Show, 2654). +-define(wxAuiPaneInfo_ToolbarPane, 2655). +-define(wxAuiPaneInfo_Top, 2656). +-define(wxAuiPaneInfo_TopDockable, 2657). +-define(wxAuiPaneInfo_Window, 2658). +-define(wxAuiPaneInfo_GetWindow, 2659). +-define(wxAuiPaneInfo_GetFrame, 2660). +-define(wxAuiPaneInfo_GetDirection, 2661). +-define(wxAuiPaneInfo_GetLayer, 2662). +-define(wxAuiPaneInfo_GetRow, 2663). +-define(wxAuiPaneInfo_GetPosition, 2664). +-define(wxAuiPaneInfo_GetFloatingPosition, 2665). +-define(wxAuiPaneInfo_GetFloatingSize, 2666). +-define(wxAuiNotebook_new_0, 2667). +-define(wxAuiNotebook_new_2, 2668). +-define(wxAuiNotebook_AddPage, 2669). +-define(wxAuiNotebook_Create, 2670). +-define(wxAuiNotebook_DeletePage, 2671). +-define(wxAuiNotebook_GetArtProvider, 2672). +-define(wxAuiNotebook_GetPage, 2673). +-define(wxAuiNotebook_GetPageBitmap, 2674). +-define(wxAuiNotebook_GetPageCount, 2675). +-define(wxAuiNotebook_GetPageIndex, 2676). +-define(wxAuiNotebook_GetPageText, 2677). +-define(wxAuiNotebook_GetSelection, 2678). +-define(wxAuiNotebook_InsertPage, 2679). +-define(wxAuiNotebook_RemovePage, 2680). +-define(wxAuiNotebook_SetArtProvider, 2681). +-define(wxAuiNotebook_SetFont, 2682). +-define(wxAuiNotebook_SetPageBitmap, 2683). +-define(wxAuiNotebook_SetPageText, 2684). +-define(wxAuiNotebook_SetSelection, 2685). +-define(wxAuiNotebook_SetTabCtrlHeight, 2686). +-define(wxAuiNotebook_SetUniformBitmapSize, 2687). +-define(wxAuiNotebook_destroy, 2688). +-define(wxAuiTabArt_SetFlags, 2689). +-define(wxAuiTabArt_SetMeasuringFont, 2690). +-define(wxAuiTabArt_SetNormalFont, 2691). +-define(wxAuiTabArt_SetSelectedFont, 2692). +-define(wxAuiTabArt_SetColour, 2693). +-define(wxAuiTabArt_SetActiveColour, 2694). +-define(wxAuiDockArt_GetColour, 2695). +-define(wxAuiDockArt_GetFont, 2696). +-define(wxAuiDockArt_GetMetric, 2697). +-define(wxAuiDockArt_SetColour, 2698). +-define(wxAuiDockArt_SetFont, 2699). +-define(wxAuiDockArt_SetMetric, 2700). +-define(wxAuiSimpleTabArt_new, 2701). +-define(wxAuiSimpleTabArt_destroy, 2702). +-define(wxMDIParentFrame_new_0, 2703). +-define(wxMDIParentFrame_new_4, 2704). +-define(wxMDIParentFrame_destruct, 2705). +-define(wxMDIParentFrame_ActivateNext, 2706). +-define(wxMDIParentFrame_ActivatePrevious, 2707). +-define(wxMDIParentFrame_ArrangeIcons, 2708). +-define(wxMDIParentFrame_Cascade, 2709). +-define(wxMDIParentFrame_Create, 2710). +-define(wxMDIParentFrame_GetActiveChild, 2711). +-define(wxMDIParentFrame_GetClientWindow, 2712). +-define(wxMDIParentFrame_Tile, 2713). +-define(wxMDIChildFrame_new_0, 2714). +-define(wxMDIChildFrame_new_4, 2715). +-define(wxMDIChildFrame_destruct, 2716). +-define(wxMDIChildFrame_Activate, 2717). +-define(wxMDIChildFrame_Create, 2718). +-define(wxMDIChildFrame_Maximize, 2719). +-define(wxMDIChildFrame_Restore, 2720). +-define(wxMDIClientWindow_new_0, 2721). +-define(wxMDIClientWindow_new_2, 2722). +-define(wxMDIClientWindow_destruct, 2723). +-define(wxMDIClientWindow_CreateClient, 2724). +-define(wxLayoutAlgorithm_new, 2725). +-define(wxLayoutAlgorithm_LayoutFrame, 2726). +-define(wxLayoutAlgorithm_LayoutMDIFrame, 2727). +-define(wxLayoutAlgorithm_LayoutWindow, 2728). +-define(wxLayoutAlgorithm_destroy, 2729). +-define(wxEvent_GetId, 2730). +-define(wxEvent_GetSkipped, 2731). +-define(wxEvent_GetTimestamp, 2732). +-define(wxEvent_IsCommandEvent, 2733). +-define(wxEvent_ResumePropagation, 2734). +-define(wxEvent_ShouldPropagate, 2735). +-define(wxEvent_Skip, 2736). +-define(wxEvent_StopPropagation, 2737). +-define(wxCommandEvent_getClientData, 2738). +-define(wxCommandEvent_GetExtraLong, 2739). +-define(wxCommandEvent_GetInt, 2740). +-define(wxCommandEvent_GetSelection, 2741). +-define(wxCommandEvent_GetString, 2742). +-define(wxCommandEvent_IsChecked, 2743). +-define(wxCommandEvent_IsSelection, 2744). +-define(wxCommandEvent_SetInt, 2745). +-define(wxCommandEvent_SetString, 2746). +-define(wxScrollEvent_GetOrientation, 2747). +-define(wxScrollEvent_GetPosition, 2748). +-define(wxScrollWinEvent_GetOrientation, 2749). +-define(wxScrollWinEvent_GetPosition, 2750). +-define(wxMouseEvent_AltDown, 2751). +-define(wxMouseEvent_Button, 2752). +-define(wxMouseEvent_ButtonDClick, 2753). +-define(wxMouseEvent_ButtonDown, 2754). +-define(wxMouseEvent_ButtonUp, 2755). +-define(wxMouseEvent_CmdDown, 2756). +-define(wxMouseEvent_ControlDown, 2757). +-define(wxMouseEvent_Dragging, 2758). +-define(wxMouseEvent_Entering, 2759). +-define(wxMouseEvent_GetButton, 2760). +-define(wxMouseEvent_GetPosition, 2763). +-define(wxMouseEvent_GetLogicalPosition, 2764). +-define(wxMouseEvent_GetLinesPerAction, 2765). +-define(wxMouseEvent_GetWheelRotation, 2766). +-define(wxMouseEvent_GetWheelDelta, 2767). +-define(wxMouseEvent_GetX, 2768). +-define(wxMouseEvent_GetY, 2769). +-define(wxMouseEvent_IsButton, 2770). +-define(wxMouseEvent_IsPageScroll, 2771). +-define(wxMouseEvent_Leaving, 2772). +-define(wxMouseEvent_LeftDClick, 2773). +-define(wxMouseEvent_LeftDown, 2774). +-define(wxMouseEvent_LeftIsDown, 2775). +-define(wxMouseEvent_LeftUp, 2776). +-define(wxMouseEvent_MetaDown, 2777). +-define(wxMouseEvent_MiddleDClick, 2778). +-define(wxMouseEvent_MiddleDown, 2779). +-define(wxMouseEvent_MiddleIsDown, 2780). +-define(wxMouseEvent_MiddleUp, 2781). +-define(wxMouseEvent_Moving, 2782). +-define(wxMouseEvent_RightDClick, 2783). +-define(wxMouseEvent_RightDown, 2784). +-define(wxMouseEvent_RightIsDown, 2785). +-define(wxMouseEvent_RightUp, 2786). +-define(wxMouseEvent_ShiftDown, 2787). +-define(wxSetCursorEvent_GetCursor, 2788). +-define(wxSetCursorEvent_GetX, 2789). +-define(wxSetCursorEvent_GetY, 2790). +-define(wxSetCursorEvent_HasCursor, 2791). +-define(wxSetCursorEvent_SetCursor, 2792). +-define(wxKeyEvent_AltDown, 2793). +-define(wxKeyEvent_CmdDown, 2794). +-define(wxKeyEvent_ControlDown, 2795). +-define(wxKeyEvent_GetKeyCode, 2796). +-define(wxKeyEvent_GetModifiers, 2797). +-define(wxKeyEvent_GetPosition, 2800). +-define(wxKeyEvent_GetRawKeyCode, 2801). +-define(wxKeyEvent_GetRawKeyFlags, 2802). +-define(wxKeyEvent_GetUnicodeKey, 2803). +-define(wxKeyEvent_GetX, 2804). +-define(wxKeyEvent_GetY, 2805). +-define(wxKeyEvent_HasModifiers, 2806). +-define(wxKeyEvent_MetaDown, 2807). +-define(wxKeyEvent_ShiftDown, 2808). +-define(wxSizeEvent_GetSize, 2809). +-define(wxMoveEvent_GetPosition, 2810). +-define(wxEraseEvent_GetDC, 2811). +-define(wxFocusEvent_GetWindow, 2812). +-define(wxChildFocusEvent_GetWindow, 2813). +-define(wxMenuEvent_GetMenu, 2814). +-define(wxMenuEvent_GetMenuId, 2815). +-define(wxMenuEvent_IsPopup, 2816). +-define(wxCloseEvent_CanVeto, 2817). +-define(wxCloseEvent_GetLoggingOff, 2818). +-define(wxCloseEvent_SetCanVeto, 2819). +-define(wxCloseEvent_SetLoggingOff, 2820). +-define(wxCloseEvent_Veto, 2821). +-define(wxShowEvent_SetShow, 2822). +-define(wxShowEvent_GetShow, 2823). +-define(wxIconizeEvent_Iconized, 2824). +-define(wxJoystickEvent_ButtonDown, 2825). +-define(wxJoystickEvent_ButtonIsDown, 2826). +-define(wxJoystickEvent_ButtonUp, 2827). +-define(wxJoystickEvent_GetButtonChange, 2828). +-define(wxJoystickEvent_GetButtonState, 2829). +-define(wxJoystickEvent_GetJoystick, 2830). +-define(wxJoystickEvent_GetPosition, 2831). +-define(wxJoystickEvent_GetZPosition, 2832). +-define(wxJoystickEvent_IsButton, 2833). +-define(wxJoystickEvent_IsMove, 2834). +-define(wxJoystickEvent_IsZMove, 2835). +-define(wxUpdateUIEvent_CanUpdate, 2836). +-define(wxUpdateUIEvent_Check, 2837). +-define(wxUpdateUIEvent_Enable, 2838). +-define(wxUpdateUIEvent_Show, 2839). +-define(wxUpdateUIEvent_GetChecked, 2840). +-define(wxUpdateUIEvent_GetEnabled, 2841). +-define(wxUpdateUIEvent_GetShown, 2842). +-define(wxUpdateUIEvent_GetSetChecked, 2843). +-define(wxUpdateUIEvent_GetSetEnabled, 2844). +-define(wxUpdateUIEvent_GetSetShown, 2845). +-define(wxUpdateUIEvent_GetSetText, 2846). +-define(wxUpdateUIEvent_GetText, 2847). +-define(wxUpdateUIEvent_GetMode, 2848). +-define(wxUpdateUIEvent_GetUpdateInterval, 2849). +-define(wxUpdateUIEvent_ResetUpdateTime, 2850). +-define(wxUpdateUIEvent_SetMode, 2851). +-define(wxUpdateUIEvent_SetText, 2852). +-define(wxUpdateUIEvent_SetUpdateInterval, 2853). +-define(wxMouseCaptureChangedEvent_GetCapturedWindow, 2854). +-define(wxPaletteChangedEvent_SetChangedWindow, 2855). +-define(wxPaletteChangedEvent_GetChangedWindow, 2856). +-define(wxQueryNewPaletteEvent_SetPaletteRealized, 2857). +-define(wxQueryNewPaletteEvent_GetPaletteRealized, 2858). +-define(wxNavigationKeyEvent_GetDirection, 2859). +-define(wxNavigationKeyEvent_SetDirection, 2860). +-define(wxNavigationKeyEvent_IsWindowChange, 2861). +-define(wxNavigationKeyEvent_SetWindowChange, 2862). +-define(wxNavigationKeyEvent_IsFromTab, 2863). +-define(wxNavigationKeyEvent_SetFromTab, 2864). +-define(wxNavigationKeyEvent_GetCurrentFocus, 2865). +-define(wxNavigationKeyEvent_SetCurrentFocus, 2866). +-define(wxHelpEvent_GetOrigin, 2867). +-define(wxHelpEvent_GetPosition, 2868). +-define(wxHelpEvent_SetOrigin, 2869). +-define(wxHelpEvent_SetPosition, 2870). +-define(wxContextMenuEvent_GetPosition, 2871). +-define(wxContextMenuEvent_SetPosition, 2872). +-define(wxIdleEvent_CanSend, 2873). +-define(wxIdleEvent_GetMode, 2874). +-define(wxIdleEvent_RequestMore, 2875). +-define(wxIdleEvent_MoreRequested, 2876). +-define(wxIdleEvent_SetMode, 2877). +-define(wxGridEvent_AltDown, 2878). +-define(wxGridEvent_ControlDown, 2879). +-define(wxGridEvent_GetCol, 2880). +-define(wxGridEvent_GetPosition, 2881). +-define(wxGridEvent_GetRow, 2882). +-define(wxGridEvent_MetaDown, 2883). +-define(wxGridEvent_Selecting, 2884). +-define(wxGridEvent_ShiftDown, 2885). +-define(wxNotifyEvent_Allow, 2886). +-define(wxNotifyEvent_IsAllowed, 2887). +-define(wxNotifyEvent_Veto, 2888). +-define(wxSashEvent_GetEdge, 2889). +-define(wxSashEvent_GetDragRect, 2890). +-define(wxSashEvent_GetDragStatus, 2891). +-define(wxListEvent_GetCacheFrom, 2892). +-define(wxListEvent_GetCacheTo, 2893). +-define(wxListEvent_GetKeyCode, 2894). +-define(wxListEvent_GetIndex, 2895). +-define(wxListEvent_GetColumn, 2896). +-define(wxListEvent_GetPoint, 2897). +-define(wxListEvent_GetLabel, 2898). +-define(wxListEvent_GetText, 2899). +-define(wxListEvent_GetImage, 2900). +-define(wxListEvent_GetData, 2901). +-define(wxListEvent_GetMask, 2902). +-define(wxListEvent_GetItem, 2903). +-define(wxListEvent_IsEditCancelled, 2904). +-define(wxDateEvent_GetDate, 2905). +-define(wxCalendarEvent_GetWeekDay, 2906). +-define(wxFileDirPickerEvent_GetPath, 2907). +-define(wxColourPickerEvent_GetColour, 2908). +-define(wxFontPickerEvent_GetFont, 2909). +-define(wxStyledTextEvent_GetPosition, 2910). +-define(wxStyledTextEvent_GetKey, 2911). +-define(wxStyledTextEvent_GetModifiers, 2912). +-define(wxStyledTextEvent_GetModificationType, 2913). +-define(wxStyledTextEvent_GetText, 2914). +-define(wxStyledTextEvent_GetLength, 2915). +-define(wxStyledTextEvent_GetLinesAdded, 2916). +-define(wxStyledTextEvent_GetLine, 2917). +-define(wxStyledTextEvent_GetFoldLevelNow, 2918). +-define(wxStyledTextEvent_GetFoldLevelPrev, 2919). +-define(wxStyledTextEvent_GetMargin, 2920). +-define(wxStyledTextEvent_GetMessage, 2921). +-define(wxStyledTextEvent_GetWParam, 2922). +-define(wxStyledTextEvent_GetLParam, 2923). +-define(wxStyledTextEvent_GetListType, 2924). +-define(wxStyledTextEvent_GetX, 2925). +-define(wxStyledTextEvent_GetY, 2926). +-define(wxStyledTextEvent_GetDragText, 2927). +-define(wxStyledTextEvent_GetDragAllowMove, 2928). +-define(wxStyledTextEvent_GetDragResult, 2929). +-define(wxStyledTextEvent_GetShift, 2930). +-define(wxStyledTextEvent_GetControl, 2931). +-define(wxStyledTextEvent_GetAlt, 2932). +-define(utils_wxGetKeyState, 2933). +-define(utils_wxGetMousePosition, 2934). +-define(utils_wxGetMouseState, 2935). +-define(utils_wxSetDetectableAutoRepeat, 2936). +-define(utils_wxBell, 2937). +-define(utils_wxFindMenuItemId, 2938). +-define(utils_wxGenericFindWindowAtPoint, 2939). +-define(utils_wxFindWindowAtPoint, 2940). +-define(utils_wxBeginBusyCursor, 2941). +-define(utils_wxEndBusyCursor, 2942). +-define(utils_wxIsBusy, 2943). +-define(utils_wxShutdown, 2944). +-define(utils_wxShell, 2945). +-define(utils_wxLaunchDefaultBrowser, 2946). +-define(utils_wxGetEmailAddress, 2947). +-define(utils_wxGetUserId, 2948). +-define(utils_wxGetHomeDir, 2949). +-define(utils_wxNewId, 2950). +-define(utils_wxRegisterId, 2951). +-define(utils_wxGetCurrentId, 2952). +-define(utils_wxGetOsDescription, 2953). +-define(utils_wxIsPlatformLittleEndian, 2954). +-define(utils_wxIsPlatform64Bit, 2955). +-define(gdicmn_wxDisplaySize, 2956). +-define(gdicmn_wxSetCursor, 2957). +-define(wxPrintout_new, 2958). +-define(wxPrintout_destruct, 2959). +-define(wxPrintout_GetDC, 2960). +-define(wxPrintout_GetPageSizeMM, 2961). +-define(wxPrintout_GetPageSizePixels, 2962). +-define(wxPrintout_GetPaperRectPixels, 2963). +-define(wxPrintout_GetPPIPrinter, 2964). +-define(wxPrintout_GetPPIScreen, 2965). +-define(wxPrintout_GetTitle, 2966). +-define(wxPrintout_IsPreview, 2967). +-define(wxPrintout_FitThisSizeToPaper, 2968). +-define(wxPrintout_FitThisSizeToPage, 2969). +-define(wxPrintout_FitThisSizeToPageMargins, 2970). +-define(wxPrintout_MapScreenSizeToPaper, 2971). +-define(wxPrintout_MapScreenSizeToPage, 2972). +-define(wxPrintout_MapScreenSizeToPageMargins, 2973). +-define(wxPrintout_MapScreenSizeToDevice, 2974). +-define(wxPrintout_GetLogicalPaperRect, 2975). +-define(wxPrintout_GetLogicalPageRect, 2976). +-define(wxPrintout_GetLogicalPageMarginsRect, 2977). +-define(wxPrintout_SetLogicalOrigin, 2978). +-define(wxPrintout_OffsetLogicalOrigin, 2979). +-define(wxStyledTextCtrl_new_2, 2980). +-define(wxStyledTextCtrl_new_0, 2981). +-define(wxStyledTextCtrl_destruct, 2982). +-define(wxStyledTextCtrl_Create, 2983). +-define(wxStyledTextCtrl_AddText, 2984). +-define(wxStyledTextCtrl_AddStyledText, 2985). +-define(wxStyledTextCtrl_InsertText, 2986). +-define(wxStyledTextCtrl_ClearAll, 2987). +-define(wxStyledTextCtrl_ClearDocumentStyle, 2988). +-define(wxStyledTextCtrl_GetLength, 2989). +-define(wxStyledTextCtrl_GetCharAt, 2990). +-define(wxStyledTextCtrl_GetCurrentPos, 2991). +-define(wxStyledTextCtrl_GetAnchor, 2992). +-define(wxStyledTextCtrl_GetStyleAt, 2993). +-define(wxStyledTextCtrl_Redo, 2994). +-define(wxStyledTextCtrl_SetUndoCollection, 2995). +-define(wxStyledTextCtrl_SelectAll, 2996). +-define(wxStyledTextCtrl_SetSavePoint, 2997). +-define(wxStyledTextCtrl_GetStyledText, 2998). +-define(wxStyledTextCtrl_CanRedo, 2999). +-define(wxStyledTextCtrl_MarkerLineFromHandle, 3000). +-define(wxStyledTextCtrl_MarkerDeleteHandle, 3001). +-define(wxStyledTextCtrl_GetUndoCollection, 3002). +-define(wxStyledTextCtrl_GetViewWhiteSpace, 3003). +-define(wxStyledTextCtrl_SetViewWhiteSpace, 3004). +-define(wxStyledTextCtrl_PositionFromPoint, 3005). +-define(wxStyledTextCtrl_PositionFromPointClose, 3006). +-define(wxStyledTextCtrl_GotoLine, 3007). +-define(wxStyledTextCtrl_GotoPos, 3008). +-define(wxStyledTextCtrl_SetAnchor, 3009). +-define(wxStyledTextCtrl_GetCurLine, 3010). +-define(wxStyledTextCtrl_GetEndStyled, 3011). +-define(wxStyledTextCtrl_ConvertEOLs, 3012). +-define(wxStyledTextCtrl_GetEOLMode, 3013). +-define(wxStyledTextCtrl_SetEOLMode, 3014). +-define(wxStyledTextCtrl_StartStyling, 3015). +-define(wxStyledTextCtrl_SetStyling, 3016). +-define(wxStyledTextCtrl_GetBufferedDraw, 3017). +-define(wxStyledTextCtrl_SetBufferedDraw, 3018). +-define(wxStyledTextCtrl_SetTabWidth, 3019). +-define(wxStyledTextCtrl_GetTabWidth, 3020). +-define(wxStyledTextCtrl_SetCodePage, 3021). +-define(wxStyledTextCtrl_MarkerDefine, 3022). +-define(wxStyledTextCtrl_MarkerSetForeground, 3023). +-define(wxStyledTextCtrl_MarkerSetBackground, 3024). +-define(wxStyledTextCtrl_MarkerAdd, 3025). +-define(wxStyledTextCtrl_MarkerDelete, 3026). +-define(wxStyledTextCtrl_MarkerDeleteAll, 3027). +-define(wxStyledTextCtrl_MarkerGet, 3028). +-define(wxStyledTextCtrl_MarkerNext, 3029). +-define(wxStyledTextCtrl_MarkerPrevious, 3030). +-define(wxStyledTextCtrl_MarkerDefineBitmap, 3031). +-define(wxStyledTextCtrl_MarkerAddSet, 3032). +-define(wxStyledTextCtrl_MarkerSetAlpha, 3033). +-define(wxStyledTextCtrl_SetMarginType, 3034). +-define(wxStyledTextCtrl_GetMarginType, 3035). +-define(wxStyledTextCtrl_SetMarginWidth, 3036). +-define(wxStyledTextCtrl_GetMarginWidth, 3037). +-define(wxStyledTextCtrl_SetMarginMask, 3038). +-define(wxStyledTextCtrl_GetMarginMask, 3039). +-define(wxStyledTextCtrl_SetMarginSensitive, 3040). +-define(wxStyledTextCtrl_GetMarginSensitive, 3041). +-define(wxStyledTextCtrl_StyleClearAll, 3042). +-define(wxStyledTextCtrl_StyleSetForeground, 3043). +-define(wxStyledTextCtrl_StyleSetBackground, 3044). +-define(wxStyledTextCtrl_StyleSetBold, 3045). +-define(wxStyledTextCtrl_StyleSetItalic, 3046). +-define(wxStyledTextCtrl_StyleSetSize, 3047). +-define(wxStyledTextCtrl_StyleSetFaceName, 3048). +-define(wxStyledTextCtrl_StyleSetEOLFilled, 3049). +-define(wxStyledTextCtrl_StyleResetDefault, 3050). +-define(wxStyledTextCtrl_StyleSetUnderline, 3051). +-define(wxStyledTextCtrl_StyleSetCase, 3052). +-define(wxStyledTextCtrl_StyleSetHotSpot, 3053). +-define(wxStyledTextCtrl_SetSelForeground, 3054). +-define(wxStyledTextCtrl_SetSelBackground, 3055). +-define(wxStyledTextCtrl_GetSelAlpha, 3056). +-define(wxStyledTextCtrl_SetSelAlpha, 3057). +-define(wxStyledTextCtrl_SetCaretForeground, 3058). +-define(wxStyledTextCtrl_CmdKeyAssign, 3059). +-define(wxStyledTextCtrl_CmdKeyClear, 3060). +-define(wxStyledTextCtrl_CmdKeyClearAll, 3061). +-define(wxStyledTextCtrl_SetStyleBytes, 3062). +-define(wxStyledTextCtrl_StyleSetVisible, 3063). +-define(wxStyledTextCtrl_GetCaretPeriod, 3064). +-define(wxStyledTextCtrl_SetCaretPeriod, 3065). +-define(wxStyledTextCtrl_SetWordChars, 3066). +-define(wxStyledTextCtrl_BeginUndoAction, 3067). +-define(wxStyledTextCtrl_EndUndoAction, 3068). +-define(wxStyledTextCtrl_IndicatorSetStyle, 3069). +-define(wxStyledTextCtrl_IndicatorGetStyle, 3070). +-define(wxStyledTextCtrl_IndicatorSetForeground, 3071). +-define(wxStyledTextCtrl_IndicatorGetForeground, 3072). +-define(wxStyledTextCtrl_SetWhitespaceForeground, 3073). +-define(wxStyledTextCtrl_SetWhitespaceBackground, 3074). +-define(wxStyledTextCtrl_GetStyleBits, 3075). +-define(wxStyledTextCtrl_SetLineState, 3076). +-define(wxStyledTextCtrl_GetLineState, 3077). +-define(wxStyledTextCtrl_GetMaxLineState, 3078). +-define(wxStyledTextCtrl_GetCaretLineVisible, 3079). +-define(wxStyledTextCtrl_SetCaretLineVisible, 3080). +-define(wxStyledTextCtrl_GetCaretLineBackground, 3081). +-define(wxStyledTextCtrl_SetCaretLineBackground, 3082). +-define(wxStyledTextCtrl_AutoCompShow, 3083). +-define(wxStyledTextCtrl_AutoCompCancel, 3084). +-define(wxStyledTextCtrl_AutoCompActive, 3085). +-define(wxStyledTextCtrl_AutoCompPosStart, 3086). +-define(wxStyledTextCtrl_AutoCompComplete, 3087). +-define(wxStyledTextCtrl_AutoCompStops, 3088). +-define(wxStyledTextCtrl_AutoCompSetSeparator, 3089). +-define(wxStyledTextCtrl_AutoCompGetSeparator, 3090). +-define(wxStyledTextCtrl_AutoCompSelect, 3091). +-define(wxStyledTextCtrl_AutoCompSetCancelAtStart, 3092). +-define(wxStyledTextCtrl_AutoCompGetCancelAtStart, 3093). +-define(wxStyledTextCtrl_AutoCompSetFillUps, 3094). +-define(wxStyledTextCtrl_AutoCompSetChooseSingle, 3095). +-define(wxStyledTextCtrl_AutoCompGetChooseSingle, 3096). +-define(wxStyledTextCtrl_AutoCompSetIgnoreCase, 3097). +-define(wxStyledTextCtrl_AutoCompGetIgnoreCase, 3098). +-define(wxStyledTextCtrl_UserListShow, 3099). +-define(wxStyledTextCtrl_AutoCompSetAutoHide, 3100). +-define(wxStyledTextCtrl_AutoCompGetAutoHide, 3101). +-define(wxStyledTextCtrl_AutoCompSetDropRestOfWord, 3102). +-define(wxStyledTextCtrl_AutoCompGetDropRestOfWord, 3103). +-define(wxStyledTextCtrl_RegisterImage, 3104). +-define(wxStyledTextCtrl_ClearRegisteredImages, 3105). +-define(wxStyledTextCtrl_AutoCompGetTypeSeparator, 3106). +-define(wxStyledTextCtrl_AutoCompSetTypeSeparator, 3107). +-define(wxStyledTextCtrl_AutoCompSetMaxWidth, 3108). +-define(wxStyledTextCtrl_AutoCompGetMaxWidth, 3109). +-define(wxStyledTextCtrl_AutoCompSetMaxHeight, 3110). +-define(wxStyledTextCtrl_AutoCompGetMaxHeight, 3111). +-define(wxStyledTextCtrl_SetIndent, 3112). +-define(wxStyledTextCtrl_GetIndent, 3113). +-define(wxStyledTextCtrl_SetUseTabs, 3114). +-define(wxStyledTextCtrl_GetUseTabs, 3115). +-define(wxStyledTextCtrl_SetLineIndentation, 3116). +-define(wxStyledTextCtrl_GetLineIndentation, 3117). +-define(wxStyledTextCtrl_GetLineIndentPosition, 3118). +-define(wxStyledTextCtrl_GetColumn, 3119). +-define(wxStyledTextCtrl_SetUseHorizontalScrollBar, 3120). +-define(wxStyledTextCtrl_GetUseHorizontalScrollBar, 3121). +-define(wxStyledTextCtrl_SetIndentationGuides, 3122). +-define(wxStyledTextCtrl_GetIndentationGuides, 3123). +-define(wxStyledTextCtrl_SetHighlightGuide, 3124). +-define(wxStyledTextCtrl_GetHighlightGuide, 3125). +-define(wxStyledTextCtrl_GetLineEndPosition, 3126). +-define(wxStyledTextCtrl_GetCodePage, 3127). +-define(wxStyledTextCtrl_GetCaretForeground, 3128). +-define(wxStyledTextCtrl_GetReadOnly, 3129). +-define(wxStyledTextCtrl_SetCurrentPos, 3130). +-define(wxStyledTextCtrl_SetSelectionStart, 3131). +-define(wxStyledTextCtrl_GetSelectionStart, 3132). +-define(wxStyledTextCtrl_SetSelectionEnd, 3133). +-define(wxStyledTextCtrl_GetSelectionEnd, 3134). +-define(wxStyledTextCtrl_SetPrintMagnification, 3135). +-define(wxStyledTextCtrl_GetPrintMagnification, 3136). +-define(wxStyledTextCtrl_SetPrintColourMode, 3137). +-define(wxStyledTextCtrl_GetPrintColourMode, 3138). +-define(wxStyledTextCtrl_FindText, 3139). +-define(wxStyledTextCtrl_FormatRange, 3140). +-define(wxStyledTextCtrl_GetFirstVisibleLine, 3141). +-define(wxStyledTextCtrl_GetLine, 3142). +-define(wxStyledTextCtrl_GetLineCount, 3143). +-define(wxStyledTextCtrl_SetMarginLeft, 3144). +-define(wxStyledTextCtrl_GetMarginLeft, 3145). +-define(wxStyledTextCtrl_SetMarginRight, 3146). +-define(wxStyledTextCtrl_GetMarginRight, 3147). +-define(wxStyledTextCtrl_GetModify, 3148). +-define(wxStyledTextCtrl_SetSelection, 3149). +-define(wxStyledTextCtrl_GetSelectedText, 3150). +-define(wxStyledTextCtrl_GetTextRange, 3151). +-define(wxStyledTextCtrl_HideSelection, 3152). +-define(wxStyledTextCtrl_LineFromPosition, 3153). +-define(wxStyledTextCtrl_PositionFromLine, 3154). +-define(wxStyledTextCtrl_LineScroll, 3155). +-define(wxStyledTextCtrl_EnsureCaretVisible, 3156). +-define(wxStyledTextCtrl_ReplaceSelection, 3157). +-define(wxStyledTextCtrl_SetReadOnly, 3158). +-define(wxStyledTextCtrl_CanPaste, 3159). +-define(wxStyledTextCtrl_CanUndo, 3160). +-define(wxStyledTextCtrl_EmptyUndoBuffer, 3161). +-define(wxStyledTextCtrl_Undo, 3162). +-define(wxStyledTextCtrl_Cut, 3163). +-define(wxStyledTextCtrl_Copy, 3164). +-define(wxStyledTextCtrl_Paste, 3165). +-define(wxStyledTextCtrl_Clear, 3166). +-define(wxStyledTextCtrl_SetText, 3167). +-define(wxStyledTextCtrl_GetText, 3168). +-define(wxStyledTextCtrl_GetTextLength, 3169). +-define(wxStyledTextCtrl_GetOvertype, 3170). +-define(wxStyledTextCtrl_SetCaretWidth, 3171). +-define(wxStyledTextCtrl_GetCaretWidth, 3172). +-define(wxStyledTextCtrl_SetTargetStart, 3173). +-define(wxStyledTextCtrl_GetTargetStart, 3174). +-define(wxStyledTextCtrl_SetTargetEnd, 3175). +-define(wxStyledTextCtrl_GetTargetEnd, 3176). +-define(wxStyledTextCtrl_ReplaceTarget, 3177). +-define(wxStyledTextCtrl_SearchInTarget, 3178). +-define(wxStyledTextCtrl_SetSearchFlags, 3179). +-define(wxStyledTextCtrl_GetSearchFlags, 3180). +-define(wxStyledTextCtrl_CallTipShow, 3181). +-define(wxStyledTextCtrl_CallTipCancel, 3182). +-define(wxStyledTextCtrl_CallTipActive, 3183). +-define(wxStyledTextCtrl_CallTipPosAtStart, 3184). +-define(wxStyledTextCtrl_CallTipSetHighlight, 3185). +-define(wxStyledTextCtrl_CallTipSetBackground, 3186). +-define(wxStyledTextCtrl_CallTipSetForeground, 3187). +-define(wxStyledTextCtrl_CallTipSetForegroundHighlight, 3188). +-define(wxStyledTextCtrl_CallTipUseStyle, 3189). +-define(wxStyledTextCtrl_VisibleFromDocLine, 3190). +-define(wxStyledTextCtrl_DocLineFromVisible, 3191). +-define(wxStyledTextCtrl_WrapCount, 3192). +-define(wxStyledTextCtrl_SetFoldLevel, 3193). +-define(wxStyledTextCtrl_GetFoldLevel, 3194). +-define(wxStyledTextCtrl_GetLastChild, 3195). +-define(wxStyledTextCtrl_GetFoldParent, 3196). +-define(wxStyledTextCtrl_ShowLines, 3197). +-define(wxStyledTextCtrl_HideLines, 3198). +-define(wxStyledTextCtrl_GetLineVisible, 3199). +-define(wxStyledTextCtrl_SetFoldExpanded, 3200). +-define(wxStyledTextCtrl_GetFoldExpanded, 3201). +-define(wxStyledTextCtrl_ToggleFold, 3202). +-define(wxStyledTextCtrl_EnsureVisible, 3203). +-define(wxStyledTextCtrl_SetFoldFlags, 3204). +-define(wxStyledTextCtrl_EnsureVisibleEnforcePolicy, 3205). +-define(wxStyledTextCtrl_SetTabIndents, 3206). +-define(wxStyledTextCtrl_GetTabIndents, 3207). +-define(wxStyledTextCtrl_SetBackSpaceUnIndents, 3208). +-define(wxStyledTextCtrl_GetBackSpaceUnIndents, 3209). +-define(wxStyledTextCtrl_SetMouseDwellTime, 3210). +-define(wxStyledTextCtrl_GetMouseDwellTime, 3211). +-define(wxStyledTextCtrl_WordStartPosition, 3212). +-define(wxStyledTextCtrl_WordEndPosition, 3213). +-define(wxStyledTextCtrl_SetWrapMode, 3214). +-define(wxStyledTextCtrl_GetWrapMode, 3215). +-define(wxStyledTextCtrl_SetWrapVisualFlags, 3216). +-define(wxStyledTextCtrl_GetWrapVisualFlags, 3217). +-define(wxStyledTextCtrl_SetWrapVisualFlagsLocation, 3218). +-define(wxStyledTextCtrl_GetWrapVisualFlagsLocation, 3219). +-define(wxStyledTextCtrl_SetWrapStartIndent, 3220). +-define(wxStyledTextCtrl_GetWrapStartIndent, 3221). +-define(wxStyledTextCtrl_SetLayoutCache, 3222). +-define(wxStyledTextCtrl_GetLayoutCache, 3223). +-define(wxStyledTextCtrl_SetScrollWidth, 3224). +-define(wxStyledTextCtrl_GetScrollWidth, 3225). +-define(wxStyledTextCtrl_TextWidth, 3226). +-define(wxStyledTextCtrl_GetEndAtLastLine, 3227). +-define(wxStyledTextCtrl_TextHeight, 3228). +-define(wxStyledTextCtrl_SetUseVerticalScrollBar, 3229). +-define(wxStyledTextCtrl_GetUseVerticalScrollBar, 3230). +-define(wxStyledTextCtrl_AppendText, 3231). +-define(wxStyledTextCtrl_GetTwoPhaseDraw, 3232). +-define(wxStyledTextCtrl_SetTwoPhaseDraw, 3233). +-define(wxStyledTextCtrl_TargetFromSelection, 3234). +-define(wxStyledTextCtrl_LinesJoin, 3235). +-define(wxStyledTextCtrl_LinesSplit, 3236). +-define(wxStyledTextCtrl_SetFoldMarginColour, 3237). +-define(wxStyledTextCtrl_SetFoldMarginHiColour, 3238). +-define(wxStyledTextCtrl_LineDown, 3239). +-define(wxStyledTextCtrl_LineDownExtend, 3240). +-define(wxStyledTextCtrl_LineUp, 3241). +-define(wxStyledTextCtrl_LineUpExtend, 3242). +-define(wxStyledTextCtrl_CharLeft, 3243). +-define(wxStyledTextCtrl_CharLeftExtend, 3244). +-define(wxStyledTextCtrl_CharRight, 3245). +-define(wxStyledTextCtrl_CharRightExtend, 3246). +-define(wxStyledTextCtrl_WordLeft, 3247). +-define(wxStyledTextCtrl_WordLeftExtend, 3248). +-define(wxStyledTextCtrl_WordRight, 3249). +-define(wxStyledTextCtrl_WordRightExtend, 3250). +-define(wxStyledTextCtrl_Home, 3251). +-define(wxStyledTextCtrl_HomeExtend, 3252). +-define(wxStyledTextCtrl_LineEnd, 3253). +-define(wxStyledTextCtrl_LineEndExtend, 3254). +-define(wxStyledTextCtrl_DocumentStart, 3255). +-define(wxStyledTextCtrl_DocumentStartExtend, 3256). +-define(wxStyledTextCtrl_DocumentEnd, 3257). +-define(wxStyledTextCtrl_DocumentEndExtend, 3258). +-define(wxStyledTextCtrl_PageUp, 3259). +-define(wxStyledTextCtrl_PageUpExtend, 3260). +-define(wxStyledTextCtrl_PageDown, 3261). +-define(wxStyledTextCtrl_PageDownExtend, 3262). +-define(wxStyledTextCtrl_EditToggleOvertype, 3263). +-define(wxStyledTextCtrl_Cancel, 3264). +-define(wxStyledTextCtrl_DeleteBack, 3265). +-define(wxStyledTextCtrl_Tab, 3266). +-define(wxStyledTextCtrl_BackTab, 3267). +-define(wxStyledTextCtrl_NewLine, 3268). +-define(wxStyledTextCtrl_FormFeed, 3269). +-define(wxStyledTextCtrl_VCHome, 3270). +-define(wxStyledTextCtrl_VCHomeExtend, 3271). +-define(wxStyledTextCtrl_ZoomIn, 3272). +-define(wxStyledTextCtrl_ZoomOut, 3273). +-define(wxStyledTextCtrl_DelWordLeft, 3274). +-define(wxStyledTextCtrl_DelWordRight, 3275). +-define(wxStyledTextCtrl_LineCut, 3276). +-define(wxStyledTextCtrl_LineDelete, 3277). +-define(wxStyledTextCtrl_LineTranspose, 3278). +-define(wxStyledTextCtrl_LineDuplicate, 3279). +-define(wxStyledTextCtrl_LowerCase, 3280). +-define(wxStyledTextCtrl_UpperCase, 3281). +-define(wxStyledTextCtrl_LineScrollDown, 3282). +-define(wxStyledTextCtrl_LineScrollUp, 3283). +-define(wxStyledTextCtrl_DeleteBackNotLine, 3284). +-define(wxStyledTextCtrl_HomeDisplay, 3285). +-define(wxStyledTextCtrl_HomeDisplayExtend, 3286). +-define(wxStyledTextCtrl_LineEndDisplay, 3287). +-define(wxStyledTextCtrl_LineEndDisplayExtend, 3288). +-define(wxStyledTextCtrl_HomeWrapExtend, 3289). +-define(wxStyledTextCtrl_LineEndWrap, 3290). +-define(wxStyledTextCtrl_LineEndWrapExtend, 3291). +-define(wxStyledTextCtrl_VCHomeWrap, 3292). +-define(wxStyledTextCtrl_VCHomeWrapExtend, 3293). +-define(wxStyledTextCtrl_LineCopy, 3294). +-define(wxStyledTextCtrl_MoveCaretInsideView, 3295). +-define(wxStyledTextCtrl_LineLength, 3296). +-define(wxStyledTextCtrl_BraceHighlight, 3297). +-define(wxStyledTextCtrl_BraceBadLight, 3298). +-define(wxStyledTextCtrl_BraceMatch, 3299). +-define(wxStyledTextCtrl_GetViewEOL, 3300). +-define(wxStyledTextCtrl_SetViewEOL, 3301). +-define(wxStyledTextCtrl_SetModEventMask, 3302). +-define(wxStyledTextCtrl_GetEdgeColumn, 3303). +-define(wxStyledTextCtrl_SetEdgeColumn, 3304). +-define(wxStyledTextCtrl_SetEdgeMode, 3305). +-define(wxStyledTextCtrl_GetEdgeMode, 3306). +-define(wxStyledTextCtrl_GetEdgeColour, 3307). +-define(wxStyledTextCtrl_SetEdgeColour, 3308). +-define(wxStyledTextCtrl_SearchAnchor, 3309). +-define(wxStyledTextCtrl_SearchNext, 3310). +-define(wxStyledTextCtrl_SearchPrev, 3311). +-define(wxStyledTextCtrl_LinesOnScreen, 3312). +-define(wxStyledTextCtrl_UsePopUp, 3313). +-define(wxStyledTextCtrl_SelectionIsRectangle, 3314). +-define(wxStyledTextCtrl_SetZoom, 3315). +-define(wxStyledTextCtrl_GetZoom, 3316). +-define(wxStyledTextCtrl_GetModEventMask, 3317). +-define(wxStyledTextCtrl_SetSTCFocus, 3318). +-define(wxStyledTextCtrl_GetSTCFocus, 3319). +-define(wxStyledTextCtrl_SetStatus, 3320). +-define(wxStyledTextCtrl_GetStatus, 3321). +-define(wxStyledTextCtrl_SetMouseDownCaptures, 3322). +-define(wxStyledTextCtrl_GetMouseDownCaptures, 3323). +-define(wxStyledTextCtrl_SetSTCCursor, 3324). +-define(wxStyledTextCtrl_GetSTCCursor, 3325). +-define(wxStyledTextCtrl_SetControlCharSymbol, 3326). +-define(wxStyledTextCtrl_GetControlCharSymbol, 3327). +-define(wxStyledTextCtrl_WordPartLeft, 3328). +-define(wxStyledTextCtrl_WordPartLeftExtend, 3329). +-define(wxStyledTextCtrl_WordPartRight, 3330). +-define(wxStyledTextCtrl_WordPartRightExtend, 3331). +-define(wxStyledTextCtrl_SetVisiblePolicy, 3332). +-define(wxStyledTextCtrl_DelLineLeft, 3333). +-define(wxStyledTextCtrl_DelLineRight, 3334). +-define(wxStyledTextCtrl_GetXOffset, 3335). +-define(wxStyledTextCtrl_ChooseCaretX, 3336). +-define(wxStyledTextCtrl_SetXCaretPolicy, 3337). +-define(wxStyledTextCtrl_SetYCaretPolicy, 3338). +-define(wxStyledTextCtrl_GetPrintWrapMode, 3339). +-define(wxStyledTextCtrl_SetHotspotActiveForeground, 3340). +-define(wxStyledTextCtrl_SetHotspotActiveBackground, 3341). +-define(wxStyledTextCtrl_SetHotspotActiveUnderline, 3342). +-define(wxStyledTextCtrl_SetHotspotSingleLine, 3343). +-define(wxStyledTextCtrl_ParaDownExtend, 3344). +-define(wxStyledTextCtrl_ParaUp, 3345). +-define(wxStyledTextCtrl_ParaUpExtend, 3346). +-define(wxStyledTextCtrl_PositionBefore, 3347). +-define(wxStyledTextCtrl_PositionAfter, 3348). +-define(wxStyledTextCtrl_CopyRange, 3349). +-define(wxStyledTextCtrl_CopyText, 3350). +-define(wxStyledTextCtrl_SetSelectionMode, 3351). +-define(wxStyledTextCtrl_GetSelectionMode, 3352). +-define(wxStyledTextCtrl_LineDownRectExtend, 3353). +-define(wxStyledTextCtrl_LineUpRectExtend, 3354). +-define(wxStyledTextCtrl_CharLeftRectExtend, 3355). +-define(wxStyledTextCtrl_CharRightRectExtend, 3356). +-define(wxStyledTextCtrl_HomeRectExtend, 3357). +-define(wxStyledTextCtrl_VCHomeRectExtend, 3358). +-define(wxStyledTextCtrl_LineEndRectExtend, 3359). +-define(wxStyledTextCtrl_PageUpRectExtend, 3360). +-define(wxStyledTextCtrl_PageDownRectExtend, 3361). +-define(wxStyledTextCtrl_StutteredPageUp, 3362). +-define(wxStyledTextCtrl_StutteredPageUpExtend, 3363). +-define(wxStyledTextCtrl_StutteredPageDown, 3364). +-define(wxStyledTextCtrl_StutteredPageDownExtend, 3365). +-define(wxStyledTextCtrl_WordLeftEnd, 3366). +-define(wxStyledTextCtrl_WordLeftEndExtend, 3367). +-define(wxStyledTextCtrl_WordRightEnd, 3368). +-define(wxStyledTextCtrl_WordRightEndExtend, 3369). +-define(wxStyledTextCtrl_SetWhitespaceChars, 3370). +-define(wxStyledTextCtrl_SetCharsDefault, 3371). +-define(wxStyledTextCtrl_AutoCompGetCurrent, 3372). +-define(wxStyledTextCtrl_Allocate, 3373). +-define(wxStyledTextCtrl_FindColumn, 3374). +-define(wxStyledTextCtrl_GetCaretSticky, 3375). +-define(wxStyledTextCtrl_SetCaretSticky, 3376). +-define(wxStyledTextCtrl_ToggleCaretSticky, 3377). +-define(wxStyledTextCtrl_SetPasteConvertEndings, 3378). +-define(wxStyledTextCtrl_GetPasteConvertEndings, 3379). +-define(wxStyledTextCtrl_SelectionDuplicate, 3380). +-define(wxStyledTextCtrl_SetCaretLineBackAlpha, 3381). +-define(wxStyledTextCtrl_GetCaretLineBackAlpha, 3382). +-define(wxStyledTextCtrl_StartRecord, 3383). +-define(wxStyledTextCtrl_StopRecord, 3384). +-define(wxStyledTextCtrl_SetLexer, 3385). +-define(wxStyledTextCtrl_GetLexer, 3386). +-define(wxStyledTextCtrl_Colourise, 3387). +-define(wxStyledTextCtrl_SetProperty, 3388). +-define(wxStyledTextCtrl_SetKeyWords, 3389). +-define(wxStyledTextCtrl_SetLexerLanguage, 3390). +-define(wxStyledTextCtrl_GetProperty, 3391). +-define(wxStyledTextCtrl_GetStyleBitsNeeded, 3392). +-define(wxStyledTextCtrl_GetCurrentLine, 3393). +-define(wxStyledTextCtrl_StyleSetSpec, 3394). +-define(wxStyledTextCtrl_StyleSetFont, 3395). +-define(wxStyledTextCtrl_StyleSetFontAttr, 3396). +-define(wxStyledTextCtrl_StyleSetCharacterSet, 3397). +-define(wxStyledTextCtrl_StyleSetFontEncoding, 3398). +-define(wxStyledTextCtrl_CmdKeyExecute, 3399). +-define(wxStyledTextCtrl_SetMargins, 3400). +-define(wxStyledTextCtrl_GetSelection, 3401). +-define(wxStyledTextCtrl_PointFromPosition, 3402). +-define(wxStyledTextCtrl_ScrollToLine, 3403). +-define(wxStyledTextCtrl_ScrollToColumn, 3404). +-define(wxStyledTextCtrl_SetVScrollBar, 3405). +-define(wxStyledTextCtrl_SetHScrollBar, 3406). +-define(wxStyledTextCtrl_GetLastKeydownProcessed, 3407). +-define(wxStyledTextCtrl_SetLastKeydownProcessed, 3408). +-define(wxStyledTextCtrl_SaveFile, 3409). +-define(wxStyledTextCtrl_LoadFile, 3410). +-define(wxStyledTextCtrl_DoDragOver, 3411). +-define(wxStyledTextCtrl_DoDropText, 3412). +-define(wxStyledTextCtrl_GetUseAntiAliasing, 3413). +-define(wxStyledTextCtrl_AddTextRaw, 3414). +-define(wxStyledTextCtrl_InsertTextRaw, 3415). +-define(wxStyledTextCtrl_GetCurLineRaw, 3416). +-define(wxStyledTextCtrl_GetLineRaw, 3417). +-define(wxStyledTextCtrl_GetSelectedTextRaw, 3418). +-define(wxStyledTextCtrl_GetTextRangeRaw, 3419). +-define(wxStyledTextCtrl_SetTextRaw, 3420). +-define(wxStyledTextCtrl_GetTextRaw, 3421). +-define(wxStyledTextCtrl_AppendTextRaw, 3422). +-define(wxArtProvider_GetBitmap, 3423). +-define(wxArtProvider_GetIcon, 3424). +-define(wxTreeEvent_GetKeyCode, 3425). +-define(wxTreeEvent_GetItem, 3426). +-define(wxTreeEvent_GetKeyEvent, 3427). +-define(wxTreeEvent_GetLabel, 3428). +-define(wxTreeEvent_GetOldItem, 3429). +-define(wxTreeEvent_GetPoint, 3430). +-define(wxTreeEvent_IsEditCancelled, 3431). +-define(wxTreeEvent_SetToolTip, 3432). +-define(wxNotebookEvent_GetOldSelection, 3433). +-define(wxNotebookEvent_GetSelection, 3434). +-define(wxNotebookEvent_SetOldSelection, 3435). +-define(wxNotebookEvent_SetSelection, 3436). +-define(wxFileDataObject_new, 3437). +-define(wxFileDataObject_AddFile, 3438). +-define(wxFileDataObject_GetFilenames, 3439). +-define(wxFileDataObject_destroy, 3440). +-define(wxTextDataObject_new, 3441). +-define(wxTextDataObject_GetTextLength, 3442). +-define(wxTextDataObject_GetText, 3443). +-define(wxTextDataObject_SetText, 3444). +-define(wxTextDataObject_destroy, 3445). +-define(wxBitmapDataObject_new_1_1, 3446). +-define(wxBitmapDataObject_new_1_0, 3447). +-define(wxBitmapDataObject_GetBitmap, 3448). +-define(wxBitmapDataObject_SetBitmap, 3449). +-define(wxBitmapDataObject_destroy, 3450). +-define(wxClipboard_new, 3452). +-define(wxClipboard_destruct, 3453). +-define(wxClipboard_AddData, 3454). +-define(wxClipboard_Clear, 3455). +-define(wxClipboard_Close, 3456). +-define(wxClipboard_Flush, 3457). +-define(wxClipboard_GetData, 3458). +-define(wxClipboard_IsOpened, 3459). +-define(wxClipboard_Open, 3460). +-define(wxClipboard_SetData, 3461). +-define(wxClipboard_UsePrimarySelection, 3463). +-define(wxClipboard_IsSupported, 3464). +-define(wxClipboard_Get, 3465). +-define(wxSpinEvent_GetPosition, 3466). +-define(wxSpinEvent_SetPosition, 3467). +-define(wxSplitterWindow_new_0, 3468). +-define(wxSplitterWindow_new_2, 3469). +-define(wxSplitterWindow_destruct, 3470). +-define(wxSplitterWindow_Create, 3471). +-define(wxSplitterWindow_GetMinimumPaneSize, 3472). +-define(wxSplitterWindow_GetSashGravity, 3473). +-define(wxSplitterWindow_GetSashPosition, 3474). +-define(wxSplitterWindow_GetSplitMode, 3475). +-define(wxSplitterWindow_GetWindow1, 3476). +-define(wxSplitterWindow_GetWindow2, 3477). +-define(wxSplitterWindow_Initialize, 3478). +-define(wxSplitterWindow_IsSplit, 3479). +-define(wxSplitterWindow_ReplaceWindow, 3480). +-define(wxSplitterWindow_SetSashGravity, 3481). +-define(wxSplitterWindow_SetSashPosition, 3482). +-define(wxSplitterWindow_SetSashSize, 3483). +-define(wxSplitterWindow_SetMinimumPaneSize, 3484). +-define(wxSplitterWindow_SetSplitMode, 3485). +-define(wxSplitterWindow_SplitHorizontally, 3486). +-define(wxSplitterWindow_SplitVertically, 3487). +-define(wxSplitterWindow_Unsplit, 3488). +-define(wxSplitterWindow_UpdateSize, 3489). +-define(wxSplitterEvent_GetSashPosition, 3490). +-define(wxSplitterEvent_GetX, 3491). +-define(wxSplitterEvent_GetY, 3492). +-define(wxSplitterEvent_GetWindowBeingRemoved, 3493). +-define(wxSplitterEvent_SetSashPosition, 3494). +-define(wxHtmlWindow_new_0, 3495). +-define(wxHtmlWindow_new_2, 3496). +-define(wxHtmlWindow_AppendToPage, 3497). +-define(wxHtmlWindow_GetOpenedAnchor, 3498). +-define(wxHtmlWindow_GetOpenedPage, 3499). +-define(wxHtmlWindow_GetOpenedPageTitle, 3500). +-define(wxHtmlWindow_GetRelatedFrame, 3501). +-define(wxHtmlWindow_HistoryBack, 3502). +-define(wxHtmlWindow_HistoryCanBack, 3503). +-define(wxHtmlWindow_HistoryCanForward, 3504). +-define(wxHtmlWindow_HistoryClear, 3505). +-define(wxHtmlWindow_HistoryForward, 3506). +-define(wxHtmlWindow_LoadFile, 3507). +-define(wxHtmlWindow_LoadPage, 3508). +-define(wxHtmlWindow_SelectAll, 3509). +-define(wxHtmlWindow_SelectionToText, 3510). +-define(wxHtmlWindow_SelectLine, 3511). +-define(wxHtmlWindow_SelectWord, 3512). +-define(wxHtmlWindow_SetBorders, 3513). +-define(wxHtmlWindow_SetFonts, 3514). +-define(wxHtmlWindow_SetPage, 3515). +-define(wxHtmlWindow_SetRelatedFrame, 3516). +-define(wxHtmlWindow_SetRelatedStatusBar, 3517). +-define(wxHtmlWindow_ToText, 3518). +-define(wxHtmlWindow_destroy, 3519). +-define(wxHtmlLinkEvent_GetLinkInfo, 3520). +-define(wxSystemSettings_GetColour, 3521). +-define(wxSystemSettings_GetFont, 3522). +-define(wxSystemSettings_GetMetric, 3523). +-define(wxSystemSettings_GetScreenType, 3524). +-define(wxSystemOptions_GetOption, 3525). +-define(wxSystemOptions_GetOptionInt, 3526). +-define(wxSystemOptions_HasOption, 3527). +-define(wxSystemOptions_IsFalse, 3528). +-define(wxSystemOptions_SetOption_2_1, 3529). +-define(wxSystemOptions_SetOption_2_0, 3530). +-define(wxAuiNotebookEvent_SetSelection, 3531). +-define(wxAuiNotebookEvent_GetSelection, 3532). +-define(wxAuiNotebookEvent_SetOldSelection, 3533). +-define(wxAuiNotebookEvent_GetOldSelection, 3534). +-define(wxAuiNotebookEvent_SetDragSource, 3535). +-define(wxAuiNotebookEvent_GetDragSource, 3536). +-define(wxAuiManagerEvent_SetManager, 3537). +-define(wxAuiManagerEvent_GetManager, 3538). +-define(wxAuiManagerEvent_SetPane, 3539). +-define(wxAuiManagerEvent_GetPane, 3540). +-define(wxAuiManagerEvent_SetButton, 3541). +-define(wxAuiManagerEvent_GetButton, 3542). +-define(wxAuiManagerEvent_SetDC, 3543). +-define(wxAuiManagerEvent_GetDC, 3544). +-define(wxAuiManagerEvent_Veto, 3545). +-define(wxAuiManagerEvent_GetVeto, 3546). +-define(wxAuiManagerEvent_SetCanVeto, 3547). +-define(wxAuiManagerEvent_CanVeto, 3548). +-define(wxLogNull_new, 3549). +-define(wxLogNull_destroy, 3550). +-define(wxTaskBarIcon_new, 3551). +-define(wxTaskBarIcon_destruct, 3552). +-define(wxTaskBarIcon_PopupMenu, 3553). +-define(wxTaskBarIcon_RemoveIcon, 3554). +-define(wxTaskBarIcon_SetIcon, 3555). +-define(wxLocale_new_0, 3556). +-define(wxLocale_new_2, 3558). +-define(wxLocale_destruct, 3559). +-define(wxLocale_Init, 3561). +-define(wxLocale_AddCatalog_1, 3562). +-define(wxLocale_AddCatalog_3, 3563). +-define(wxLocale_AddCatalogLookupPathPrefix, 3564). +-define(wxLocale_GetCanonicalName, 3565). +-define(wxLocale_GetLanguage, 3566). +-define(wxLocale_GetLanguageName, 3567). +-define(wxLocale_GetLocale, 3568). +-define(wxLocale_GetName, 3569). +-define(wxLocale_GetString_2, 3570). +-define(wxLocale_GetString_4, 3571). +-define(wxLocale_GetHeaderValue, 3572). +-define(wxLocale_GetSysName, 3573). +-define(wxLocale_GetSystemEncoding, 3574). +-define(wxLocale_GetSystemEncodingName, 3575). +-define(wxLocale_GetSystemLanguage, 3576). +-define(wxLocale_IsLoaded, 3577). +-define(wxLocale_IsOk, 3578). +-define(wxActivateEvent_GetActive, 3579). +-define(wxPopupWindow_new_2, 3581). +-define(wxPopupWindow_new_0, 3582). +-define(wxPopupWindow_destruct, 3584). +-define(wxPopupWindow_Create, 3585). +-define(wxPopupWindow_Position, 3586). +-define(wxPopupTransientWindow_new_0, 3587). +-define(wxPopupTransientWindow_new_2, 3588). +-define(wxPopupTransientWindow_destruct, 3589). +-define(wxPopupTransientWindow_Popup, 3590). +-define(wxPopupTransientWindow_Dismiss, 3591). +-define(wxOverlay_new, 3592). +-define(wxOverlay_destruct, 3593). +-define(wxOverlay_Reset, 3594). +-define(wxDCOverlay_new_6, 3595). +-define(wxDCOverlay_new_2, 3596). +-define(wxDCOverlay_destruct, 3597). +-define(wxDCOverlay_Clear, 3598). diff --git a/lib/wx/src/wxe_server.erl b/lib/wx/src/wxe_server.erl index ae9440f890..693a008e3d 100644 --- a/lib/wx/src/wxe_server.erl +++ b/lib/wx/src/wxe_server.erl @@ -272,7 +272,7 @@ invoke_callback(Pid, Ev, Ref) -> wx:set_env(Env), wxe_util:cast(?WXE_CB_START, <<>>), try - case get_wx_object_state(Pid) of + case get_wx_object_state(Pid, 5) of ignore -> %% Ignore early events wxEvent:skip(Ref); @@ -307,16 +307,24 @@ invoke_callback_fun(Fun) -> wxe_util:cast(?WXE_CB_RETURN, Res). -get_wx_object_state(Pid) -> +get_wx_object_state(Pid, N) when N > 0 -> case process_info(Pid, dictionary) of {dictionary, Dict} -> case lists:keysearch('_wx_object_',1,Dict) of - {value, {'_wx_object_', {_Mod, '_wx_init_'}}} -> ignore; - {value, {'_wx_object_', Value}} -> Value; - _ -> ignore + {value, {'_wx_object_', {_Mod, '_wx_init_'}}} -> + timer:sleep(50), + get_wx_object_state(Pid, N-1); + {value, {'_wx_object_', Value}} -> + Value; + _ -> + ignore end; - _ -> ignore - end. + _ -> + ignore + end; +get_wx_object_state(_, _) -> + ignore. + attach_fun(Fun, S = #state{cb=CB,cb_cnt=Next}) -> case gb_trees:lookup(Fun,CB) of diff --git a/lib/wx/test/wx_basic_SUITE.erl b/lib/wx/test/wx_basic_SUITE.erl index 2c746158e5..0b919f6254 100644 --- a/lib/wx/test/wx_basic_SUITE.erl +++ b/lib/wx/test/wx_basic_SUITE.erl @@ -338,6 +338,20 @@ data_types(_Config) -> ?m(true, is_boolean(wxCalendarCtrl:setDate(Cal,DateTime))), ?m({Date,_}, wxCalendarCtrl:getDate(Cal)), + %% Images, test sending and reading binaries + Colors = << <<200:8, 199:8, 198:8 >> || _ <- lists:seq(1, 128*64) >>, + Alpha = << <<255:8>> || _ <- lists:seq(1, 128*64) >>, + ImgRGB = ?mt(wxImage, wxImage:new(128, 64, Colors)), + ?m(true, wxImage:ok(ImgRGB)), + ?m(false, wxImage:hasAlpha(ImgRGB)), + ?m(Colors, wxImage:getData(ImgRGB)), + + ImgRGBA = ?mt(wxImage, wxImage:new(128, 64, Colors, Alpha)), + ?m(true, wxImage:ok(ImgRGBA)), + ?m(true, wxImage:hasAlpha(ImgRGBA)), + ?m(Colors, wxImage:getData(ImgRGBA)), + ?m(Alpha, wxImage:getAlpha(ImgRGBA)), + wxClientDC:destroy(CDC), %%wx_test_lib:wx_destroy(Frame,Config). wx:destroy(). diff --git a/lib/wx/test/wx_event_SUITE.erl b/lib/wx/test/wx_event_SUITE.erl index 7e71d6ca69..516133e3e2 100644 --- a/lib/wx/test/wx_event_SUITE.erl +++ b/lib/wx/test/wx_event_SUITE.erl @@ -46,8 +46,8 @@ end_per_testcase(Func,Config) -> %% SUITE specification suite() -> [{ct_hooks,[ts_install_cth]}]. -all() -> - [connect, disconnect, connect_msg_20, connect_cb_20, +all() -> + [connect, disconnect, disconnect_cb, connect_msg_20, connect_cb_20, mouse_on_grid, spin_event, connect_in_callback, recursive, dialog, char_events, callback_clean ]. @@ -162,9 +162,33 @@ disconnect(Config) -> ?m([], wx_test_lib:flush()), wx_test_lib:wx_destroy(Frame, Config). - + +disconnect_cb(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo); +disconnect_cb(Config) -> + ?mr(wx_ref, wx:new()), + Frame = ?mt(wxFrame, wxFrame:new(wx:null(), 1, "Event Testing")), + Panel = ?mt(wxPanel, wxPanel:new(Frame)), + + Tester = self(), + CB = fun(#wx{event=#wxSize{},userData=UserD}, SizeEvent) -> + ?mt(wxSizeEvent, SizeEvent), + wxEvtHandler:disconnect(Frame, close_window), + Tester ! {got_size, UserD} + end, + ?m(ok, wxFrame:connect(Frame, close_window)), + ?m(ok, wxFrame:connect(Frame, size)), + ?m(ok, wxEvtHandler:connect(Panel, size, [{callback,CB},{userData, panel}])), + + ?m(true, wxFrame:show(Frame)), + + wxWindow:setSize(Panel, {200,100}), + get_size_messages(Frame, [frame, panel_cb]), + wx_test_lib:flush(), + + wx_test_lib:wx_destroy(Frame, Config). + %% Test that the msg events are forwarded as supposed to connect_msg_20(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo); diff --git a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc index 2bbe0eea1a..2c5caab07b 100644 --- a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc +++ b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc @@ -152,6 +152,7 @@ parse_document(Rest, State) when is_record(State, xmerl_sax_parser_state) -> %% [22] prolog ::= XMLDecl? Misc* (doctypedecl Misc*)? %% [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' %%---------------------------------------------------------------------- +-dialyzer({[no_fail_call, no_match], parse_xml_decl/2}). parse_xml_decl(?STRING_EMPTY, State) -> cf(?STRING_EMPTY, State, fun parse_xml_decl/2); parse_xml_decl(?BYTE_ORDER_MARK_1, State) -> @@ -1205,6 +1206,7 @@ send_character_event(_, true, String, State) -> %% Description: Parse whitespaces. %% [3] S ::= (#x20 | #x9 | #xD | #xA)+ %%---------------------------------------------------------------------- +-dialyzer({no_fail_call, whitespace/3}). whitespace(?STRING_EMPTY, State, Acc) -> case cf(?STRING_EMPTY, State, Acc, fun whitespace/3) of {?STRING_EMPTY, State} -> @@ -1716,6 +1718,7 @@ handle_external_entity({Tag, _Url}, State) -> %% Result : {Rest, State} %% Description: Parse the external entity. %%---------------------------------------------------------------------- +-dialyzer({[no_fail_call, no_match], parse_external_entity_1/2}). parse_external_entity_1(?STRING_EMPTY, #xmerl_sax_parser_state{file_type=Type} = State) -> case catch cf(?STRING_EMPTY, State, fun parse_external_entity_1/2) of {Rest, State1} when is_record(State1, xmerl_sax_parser_state) -> diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl index 2bf3172d87..829716dcdb 100644 --- a/lib/xmerl/src/xmerl_scan.erl +++ b/lib/xmerl/src/xmerl_scan.erl @@ -1010,7 +1010,7 @@ scan_optional_version(T,S) -> scan_enc_name([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_enc_name(MoreBytes, S1) end, - fun(S1) -> ?fatal(expected_encoding_name, S1) end, + fatal_fun(expected_encoding_name), S); scan_enc_name([H|T], S0) when H >= $"; H =< $' -> ?bump_col(1), @@ -1020,7 +1020,7 @@ scan_enc_name([H|T], S0) when H >= $"; H =< $' -> scan_enc_name([], S=#xmerl_scanner{continuation_fun = F}, Delim, Acc) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_enc_name(MoreBytes, S1, Delim, Acc) end, - fun(S1) -> ?fatal(expected_encoding_name, S1) end, + fatal_fun(expected_encoding_name), S); scan_enc_name([H|T], S0, Delim, Acc) when H >= $a, H =< $z -> ?bump_col(1), @@ -1034,7 +1034,7 @@ scan_enc_name([H|_T],S,_Delim,_Acc) -> scan_enc_name2([], S=#xmerl_scanner{continuation_fun = F}, Delim, Acc) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_enc_name2(MoreBytes, S1, Delim, Acc) end, - fun(S1) -> ?fatal(expected_encoding_name, S1) end, + fatal_fun(expected_encoding_name), S); scan_enc_name2([H|T], S0, H, Acc) -> ?bump_col(1), @@ -1058,7 +1058,7 @@ scan_enc_name2([H|T], S0, Delim, Acc) when H == $.; H == $_; H == $- -> scan_xml_vsn([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_xml_vsn(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_xml_vsn([H|T], S) when H==$"; H==$'-> xml_vsn(T, S#xmerl_scanner{col = S#xmerl_scanner.col+1}, H, []). @@ -1066,7 +1066,7 @@ scan_xml_vsn([H|T], S) when H==$"; H==$'-> xml_vsn([], S=#xmerl_scanner{continuation_fun = F}, Delim, Acc) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> xml_vsn(MoreBytes, S1, Delim, Acc) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); xml_vsn([H|T], S=#xmerl_scanner{col = C}, H, Acc) -> {lists:reverse(Acc), T, S#xmerl_scanner{col = C+1}}; @@ -1089,7 +1089,7 @@ xml_vsn([H|T], S=#xmerl_scanner{col = C}, Delim, Acc) -> scan_pi([], S=#xmerl_scanner{continuation_fun = F}, Pos, Ps) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_pi(MoreBytes, S1, Pos, Ps) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_pi(Str = [H1,H2,H3 | T],S0=#xmerl_scanner{line = L, col = C}, Pos, Ps) when H1==$x;H1==$X -> @@ -1125,7 +1125,7 @@ scan_pi([], S=#xmerl_scanner{continuation_fun = F}, Target, ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_pi(MoreBytes, S1, Target, L, C, Pos, Ps, Acc) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_pi("?>" ++ T, S0 = #xmerl_scanner{hook_fun = Hook, event_fun = Event}, @@ -1152,7 +1152,7 @@ scan_pi2([], S=#xmerl_scanner{continuation_fun = F}, Target, ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_pi2(MoreBytes, S1, Target, L, C, Pos, Ps, Acc) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_pi2("?>" ++ T, S0 = #xmerl_scanner{hook_fun = Hook, event_fun = Event}, @@ -1180,7 +1180,7 @@ scan_pi2(Str, S0, Target, L, C, Pos, Ps, Acc) -> scan_doctype([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_doctype(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_doctype(T, S) -> {_,T1,S1} = mandatory_strip(T,S), @@ -1194,7 +1194,7 @@ scan_doctype(T, S) -> scan_doctype1([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_doctype1(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_doctype1("PUBLIC" ++ T, S0) -> ?bump_col(6), @@ -1217,7 +1217,7 @@ scan_doctype1(T, S) -> scan_doctype2([], S=#xmerl_scanner{continuation_fun = F},DTD) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_doctype2(MoreBytes, S1, DTD) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_doctype2("[" ++ T, S0, DTD) -> ?bump_col(1), @@ -1237,7 +1237,7 @@ scan_doctype2(_T,S,_DTD) -> scan_doctype3([], S=#xmerl_scanner{continuation_fun = F},DTD) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_doctype3(MoreBytes, S1,DTD) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_doctype3("%" ++ T, S0, DTD) -> ?bump_col(1), @@ -1549,7 +1549,7 @@ scan_decl_sep(T,S) -> scan_conditional_sect([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_conditional_sect(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_conditional_sect("IGNORE" ++ T, S0) -> ?bump_col(6), @@ -1582,7 +1582,7 @@ scan_ignore(Str,S) -> scan_ignore([], S=#xmerl_scanner{continuation_fun = F},Level) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_ignore(MoreBytes, S1,Level) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_ignore("<![" ++ T, S0,Level) -> %% nested conditional section. Topmost condition is ignore, though @@ -1603,7 +1603,7 @@ scan_ignore([_H|T],S0,Level) -> scan_include([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_include(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_include("]]>" ++ T, S0) -> ?bump_col(3), @@ -1745,7 +1745,7 @@ update_attributes1([],Acc) -> scan_attdef([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_attdef(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_attdef(T, S) -> scan_attdef(T, S, _AttrAcc = []). @@ -1754,7 +1754,7 @@ scan_attdef(T, S) -> scan_attdef([], S=#xmerl_scanner{continuation_fun = F}, Attrs) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_attdef(MoreBytes, S1, Attrs) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_attdef(">" ++ T, S0, Attrs) -> ?bump_col(1), @@ -1798,7 +1798,7 @@ scan_attdef2(T, S, Attrs) -> scan_att_type([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_att_type(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_att_type("CDATA" ++ T, S0) -> ?bump_col(5), @@ -1856,7 +1856,7 @@ scan_att_type("%" ++ T, S0) -> scan_notation_type([], S=#xmerl_scanner{continuation_fun = F}, Acc) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_notation_type(MoreBytes, S1, Acc) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_notation_type(")" ++ T, S0, Acc) -> ?bump_col(1), @@ -1889,7 +1889,7 @@ notation_exists(Name, #xmerl_scanner{rules_read_fun = Read, scan_enumeration([], S=#xmerl_scanner{continuation_fun = F}, Acc) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_enumeration(MoreBytes, S1, Acc) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_enumeration(")" ++ T, S0, Acc) -> ?bump_col(1), @@ -1907,7 +1907,7 @@ scan_enumeration("|" ++ T, S0, Acc) -> scan_default_decl([], S=#xmerl_scanner{continuation_fun = F}, Type) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_default_decl(MoreBytes, S1, Type) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_default_decl("#REQUIRED" ++ T, S0, _Type) -> ?bump_col(9), @@ -1936,7 +1936,7 @@ default_value(T, S, Type) -> scan_entity([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_entity(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_entity("%" ++ T, #xmerl_scanner{rules_write_fun = Write} = S0) -> %% parameter entity @@ -1974,7 +1974,7 @@ scan_entity_completion(T,S) -> scan_entity_def([], S=#xmerl_scanner{continuation_fun = F}, EName) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_entity_def(MoreBytes, S1, EName) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_entity_def("'" ++ T, S0, EName) -> ?bump_col(1), @@ -2015,7 +2015,7 @@ scan_entity_def(Str, S, EName) -> scan_ndata_decl([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_ndata_decl(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_ndata_decl(Str = ">"++_T, S) -> {[], Str, S}; @@ -2062,7 +2062,7 @@ scan_element("/", S=#xmerl_scanner{continuation_fun = F}, F(fun(MoreBytes, S1) -> scan_element("/" ++ MoreBytes, S1, Pos, Name, StartL, StartC, Attrs, Lang,Parents,NSI,NS,SpaceDefault) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_element([], S=#xmerl_scanner{continuation_fun = F}, Pos, Name, StartL, StartC, Attrs, Lang, Parents, @@ -2071,7 +2071,7 @@ scan_element([], S=#xmerl_scanner{continuation_fun = F}, F(fun(MoreBytes, S1) -> scan_element(MoreBytes, S1, Pos, Name, StartL, StartC, Attrs, Lang,Parents,NSI,NS,SpaceDefault) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_element("/>" ++ T, S0 = #xmerl_scanner{hook_fun = Hook, event_fun = Event, @@ -2099,7 +2099,7 @@ scan_element(">", S=#xmerl_scanner{continuation_fun = F}, F(fun(MoreBytes, S1) -> scan_element(">" ++ MoreBytes, S1, Pos, Name, StartL, StartC, Attrs, Lang,Parents,NSI,NS,SpaceDefault) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_element(">" ++ T, S0 = #xmerl_scanner{event_fun = Event, hook_fun = Hook, @@ -2344,7 +2344,7 @@ keyreplaceadd(_K, _Pos, [], Obj) -> scan_att_value([], S=#xmerl_scanner{continuation_fun = F},AT) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_att_value(MoreBytes, S1, AT) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_att_value("%"++_T,S=#xmerl_scanner{environment=prolog},_AttType) -> ?fatal({error,{wfc_PEs_In_Internal_Subset}},S); @@ -2385,7 +2385,7 @@ scan_att_chars([],S=#xmerl_scanner{continuation_fun=F},H,Acc,TmpAcc,AT,IsNorm)-> F(fun(MoreBytes, S1) -> scan_att_chars(MoreBytes, S1, H, Acc,TmpAcc,AT,IsNorm) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_att_chars([H|T], S0, H, Acc, TmpAcc,AttType,IsNorm) -> % End quote ?bump_col(1), @@ -2518,7 +2518,7 @@ scan_content("<", S= #xmerl_scanner{continuation_fun = F}, F(fun(MoreBytes, S1) -> scan_content("<" ++ MoreBytes, S1, Pos, Name, Attrs, Space, Lang, Parents, NS, Acc,[]) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_content([], S=#xmerl_scanner{environment={external,{entity,_}}}, _Pos, _Name, _Attrs, _Space, _Lang, _Parents, _NS, Acc,_) -> @@ -2532,7 +2532,7 @@ scan_content([], S=#xmerl_scanner{continuation_fun = F}, F(fun(MoreBytes, S1) -> scan_content(MoreBytes, S1, Pos, Name, Attrs, Space, Lang, Parents, NS, Acc,[]) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_content("</" ++ T, S0, _Pos, Name, _Attrs, _Space, _Lang, _Parents, _NS, Acc,[]) -> @@ -2636,7 +2636,7 @@ scan_content_markup([], S=#xmerl_scanner{continuation_fun = F}, F(fun(MoreBytes, S1) -> scan_content_markup( MoreBytes,S1,Pos,Name, Attrs,Space,Lang,Parents,NS) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_content_markup("![CDATA[" ++ T, S0, Pos, _Name, _Attrs, _Space, _Lang, Parents, _NS) -> @@ -2664,7 +2664,7 @@ scan_char_data([], S=#xmerl_scanner{environment=internal_parsed_entity}, scan_char_data([], S=#xmerl_scanner{continuation_fun = F}, Space, _MUD,Acc) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_char_data(MoreBytes,S1,Space,_MUD,Acc) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_char_data([$&|T], S,Space,"&",Acc) -> scan_char_data(T, S, Space,[], [$&|Acc]); @@ -2716,7 +2716,7 @@ scan_cdata(Str, S, Pos, Parents) -> scan_cdata([], S=#xmerl_scanner{continuation_fun = F}, Pos, Parents, Acc) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_cdata(MoreBytes, S1, Pos, Parents, Acc) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_cdata("]]>" ++ T, S0, Pos, Parents, Acc) -> ?bump_col(3), @@ -2741,7 +2741,7 @@ scan_cdata(Str, S0, Pos, Parents, Acc) -> scan_reference([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_reference(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_reference("#x" ++ T, S0) -> %% [66] CharRef @@ -2783,7 +2783,7 @@ scan_reference(T, S) -> scan_entity_ref([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_entity_ref(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_entity_ref("amp;" ++ T, S0) -> ?bump_col(4), @@ -2868,7 +2868,7 @@ expand_reference(Name, #xmerl_scanner{rules_read_fun = Read} = S) -> scan_char_ref_dec([], S=#xmerl_scanner{continuation_fun = F}, Acc) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_char_ref_dec(MoreBytes, S1, Acc) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_char_ref_dec([H|T], S0, Acc) when H >= $0, H =< $9 -> ?bump_col(1), @@ -2883,7 +2883,7 @@ scan_char_ref_dec(";" ++ T, S0, Acc) -> scan_char_ref_hex([], S=#xmerl_scanner{continuation_fun = F}, Acc) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_char_ref_hex(MoreBytes, S1, Acc) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_char_ref_hex([H|T], S0, Acc) when H >= $0, H =< $9 -> ?bump_col(1), @@ -2957,7 +2957,7 @@ scan_name_no_colons(Str, S) -> scan_name([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_name(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_name(Str = [$:|T], S0 = #xmerl_scanner{namespace_conformant = NSC}) -> if NSC == false -> @@ -3007,7 +3007,7 @@ scan_nmtoken(Str, S, Acc, NSC) -> scan_nmtoken([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_nmtoken(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_nmtoken("%"++T, S0=#xmerl_scanner{environment={external,_}}) -> ?bump_col(1), @@ -3084,7 +3084,7 @@ isLatin1(_,_) -> scan_system_literal([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_system_literal(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_system_literal("\"" ++ T, S) -> scan_system_literal(T, S, $", []); @@ -3096,7 +3096,7 @@ scan_system_literal([], S=#xmerl_scanner{continuation_fun = F}, Delimiter, Acc) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_system_literal(MoreBytes,S1,Delimiter,Acc) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_system_literal([H|T], S, H, Acc) -> {lists:reverse(Acc), T, S#xmerl_scanner{col = S#xmerl_scanner.col+1}}; @@ -3114,7 +3114,7 @@ scan_system_literal(Str, S, Delimiter, Acc) -> scan_pubid_literal([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_pubid_literal(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_pubid_literal([H|T], S) when H == $"; H == $' -> scan_pubid_literal(T, S#xmerl_scanner{col = S#xmerl_scanner.col+1}, H, []); @@ -3126,7 +3126,7 @@ scan_pubid_literal([], S=#xmerl_scanner{continuation_fun = F}, Delimiter, Acc) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_pubid_literal(MoreBytes,S1,Delimiter,Acc) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_pubid_literal([H|T], S, H, Acc) -> {lists:reverse(Acc), T, S#xmerl_scanner{col = S#xmerl_scanner.col+1}}; @@ -3161,7 +3161,7 @@ is_pubid_char(X) -> scan_contentspec([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_contentspec(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_contentspec("EMPTY" ++ T, S0) -> ?bump_col(5), @@ -3195,7 +3195,7 @@ scan_elem_content([], S=#xmerl_scanner{continuation_fun = F}, Context, Mode, Acc) -> ?dbg("cont()...~n", []), F(fun(MoreBytes,S1) -> scan_elem_content(MoreBytes,S1,Context,Mode,Acc) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_elem_content(")" ++ T, S0, Context, Mode0, Acc0) -> ?bump_col(1), @@ -3282,7 +3282,7 @@ format_elem_content(Other) -> Other. scan_occurrence([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_occurrence(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_occurrence([$?|T], S0) -> ?bump_col(1), @@ -3433,7 +3433,7 @@ wfc_whitespace_betw_attrs([$> |_]=L,S) -> wfc_whitespace_betw_attrs([],S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> wfc_whitespace_betw_attrs(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); wfc_whitespace_betw_attrs(_,S) -> ?fatal({whitespace_required_between_attributes},S). @@ -3477,7 +3477,7 @@ vc_Element_valid(_,_) -> scan_pe_def([], S=#xmerl_scanner{continuation_fun = F}, PEName) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_pe_def(MoreBytes, S1, PEName) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_pe_def("'" ++ T, S0, PEName) -> ?bump_col(1), @@ -3510,7 +3510,7 @@ scan_notation_decl(T, #xmerl_scanner{rules_write_fun = Write, scan_notation_decl1([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_notation_decl1(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_notation_decl1("SYSTEM" ++ T, S0) -> ?bump_col(6), @@ -3536,7 +3536,7 @@ scan_notation_decl1("PUBLIC" ++ T, S0) -> scan_external_id([], S=#xmerl_scanner{continuation_fun = F}) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_external_id(MoreBytes, S1) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_external_id("SYSTEM" ++ T, S0) -> ?bump_col(6), @@ -3582,7 +3582,7 @@ scan_entity_value([], S=#xmerl_scanner{continuation_fun = F}, scan_entity_value(MoreBytes,S1, Delim,Acc,PEName,Namespace,PENesting) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_entity_value([Delim|T], S=#xmerl_scanner{validation=dtd}, Delim,_Acc,PEName,_NS,PENesting) when length(PENesting) /= 0 -> @@ -3850,7 +3850,7 @@ scan_comment1([], S=#xmerl_scanner{continuation_fun = F}, Pos, Comment, Acc) -> ?dbg("cont()...~n", []), F(fun(MoreBytes, S1) -> scan_comment1(MoreBytes, S1, Pos, Comment, Acc) end, - fun(S1) -> ?fatal(unexpected_end, S1) end, + fatal_fun(unexpected_end), S); scan_comment1("-->" ++ T, S0 = #xmerl_scanner{col = C, event_fun = Event, @@ -4100,6 +4100,13 @@ handle_schema_result({error,Reason},S5) -> %%% Helper functions +-compile({inline, [fatal_fun/1]}). + +-spec fatal_fun(_) -> fun((_) -> no_return()). + +fatal_fun(Reason) -> + fun(S) -> ?fatal(Reason, S) end. + fatal(Reason, S) -> exit({fatal, {Reason, {file,S#xmerl_scanner.filename}, diff --git a/otp_versions.table b/otp_versions.table index 50f1839b05..6aa367d6f1 100644 --- a/otp_versions.table +++ b/otp_versions.table @@ -1,3 +1,4 @@ +OTP-18.2.4 : common_test-1.11.2 # asn1-4.0.1 compiler-6.0.2 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6.2 debugger-4.1.1 dialyzer-2.8.2 diameter-1.11.1 edoc-0.7.17 eldap-1.2 erl_docgen-0.4.1 erl_interface-3.8.1 erts-7.2.1 et-1.5.1 eunit-2.2.12 gs-1.6 hipe-3.14 ic-4.4 inets-6.1.1 jinterface-1.6.1 kernel-4.1.1 megaco-3.18 mnesia-4.13.2 observer-2.1.1 odbc-2.11.1 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1 reltool-0.7 runtime_tools-1.9.2 sasl-2.6.1 snmp-5.2.1 ssh-4.2.1 ssl-7.2 stdlib-2.7 syntax_tools-1.7 test_server-3.9.1 tools-2.8.2 typer-0.9.10 webtool-0.9 wx-1.6 xmerl-1.3.9 : OTP-18.2.3 : inets-6.1.1 # asn1-4.0.1 common_test-1.11.1 compiler-6.0.2 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6.2 debugger-4.1.1 dialyzer-2.8.2 diameter-1.11.1 edoc-0.7.17 eldap-1.2 erl_docgen-0.4.1 erl_interface-3.8.1 erts-7.2.1 et-1.5.1 eunit-2.2.12 gs-1.6 hipe-3.14 ic-4.4 jinterface-1.6.1 kernel-4.1.1 megaco-3.18 mnesia-4.13.2 observer-2.1.1 odbc-2.11.1 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1 reltool-0.7 runtime_tools-1.9.2 sasl-2.6.1 snmp-5.2.1 ssh-4.2.1 ssl-7.2 stdlib-2.7 syntax_tools-1.7 test_server-3.9.1 tools-2.8.2 typer-0.9.10 webtool-0.9 wx-1.6 xmerl-1.3.9 : OTP-18.2.2 : ssh-4.2.1 # asn1-4.0.1 common_test-1.11.1 compiler-6.0.2 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6.2 debugger-4.1.1 dialyzer-2.8.2 diameter-1.11.1 edoc-0.7.17 eldap-1.2 erl_docgen-0.4.1 erl_interface-3.8.1 erts-7.2.1 et-1.5.1 eunit-2.2.12 gs-1.6 hipe-3.14 ic-4.4 inets-6.1 jinterface-1.6.1 kernel-4.1.1 megaco-3.18 mnesia-4.13.2 observer-2.1.1 odbc-2.11.1 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1 reltool-0.7 runtime_tools-1.9.2 sasl-2.6.1 snmp-5.2.1 ssl-7.2 stdlib-2.7 syntax_tools-1.7 test_server-3.9.1 tools-2.8.2 typer-0.9.10 webtool-0.9 wx-1.6 xmerl-1.3.9 : OTP-18.2.1 : erts-7.2.1 # asn1-4.0.1 common_test-1.11.1 compiler-6.0.2 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6.2 debugger-4.1.1 dialyzer-2.8.2 diameter-1.11.1 edoc-0.7.17 eldap-1.2 erl_docgen-0.4.1 erl_interface-3.8.1 et-1.5.1 eunit-2.2.12 gs-1.6 hipe-3.14 ic-4.4 inets-6.1 jinterface-1.6.1 kernel-4.1.1 megaco-3.18 mnesia-4.13.2 observer-2.1.1 odbc-2.11.1 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1 reltool-0.7 runtime_tools-1.9.2 sasl-2.6.1 snmp-5.2.1 ssh-4.2 ssl-7.2 stdlib-2.7 syntax_tools-1.7 test_server-3.9.1 tools-2.8.2 typer-0.9.10 webtool-0.9 wx-1.6 xmerl-1.3.9 : |