1 |
commit: 2bb3db1a1a28e3a76a5cde521f27298b1bd48562 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 25 11:50:23 2015 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 25 11:51:13 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bb3db1a |
7 |
|
8 |
dev-lang/erlang: Support wxGTK:3.0 (#563322) |
9 |
|
10 |
Package-Manager: portage-2.2.23 |
11 |
|
12 |
dev-lang/erlang/erlang-18.0-r2.ebuild | 166 ++++++++ |
13 |
dev-lang/erlang/files/erlang-18.0-wx3.0.patch | 531 ++++++++++++++++++++++++++ |
14 |
2 files changed, 697 insertions(+) |
15 |
|
16 |
diff --git a/dev-lang/erlang/erlang-18.0-r2.ebuild b/dev-lang/erlang/erlang-18.0-r2.ebuild |
17 |
new file mode 100644 |
18 |
index 0000000..e62e7a2 |
19 |
--- /dev/null |
20 |
+++ b/dev-lang/erlang/erlang-18.0-r2.ebuild |
21 |
@@ -0,0 +1,166 @@ |
22 |
+# Copyright 1999-2015 Gentoo Foundation |
23 |
+# Distributed under the terms of the GNU General Public License v2 |
24 |
+# $Id$ |
25 |
+ |
26 |
+EAPI=5 |
27 |
+WX_GTK_VER="3.0" |
28 |
+ |
29 |
+inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets |
30 |
+ |
31 |
+# NOTE: If you need symlinks for binaries please tell maintainers or |
32 |
+# open up a bug to let it be created. |
33 |
+ |
34 |
+DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries" |
35 |
+HOMEPAGE="http://www.erlang.org/" |
36 |
+SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz |
37 |
+ http://erlang.org/download/otp_doc_man_${PV}.tar.gz |
38 |
+ doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )" |
39 |
+ |
40 |
+LICENSE="ErlPL-1.1" |
41 |
+SLOT="0" |
42 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" |
43 |
+IUSE="compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets" |
44 |
+ |
45 |
+RDEPEND=" |
46 |
+ ssl? ( |
47 |
+ !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) |
48 |
+ libressl? ( dev-libs/libressl ) |
49 |
+ ) |
50 |
+ emacs? ( virtual/emacs ) |
51 |
+ java? ( >=virtual/jdk-1.2 ) |
52 |
+ odbc? ( dev-db/unixODBC )" |
53 |
+DEPEND="${RDEPEND} |
54 |
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu ) |
55 |
+ sctp? ( net-misc/lksctp-tools ) |
56 |
+ tk? ( dev-lang/tk )" |
57 |
+ |
58 |
+S="${WORKDIR}/otp_src_${PV}" |
59 |
+ |
60 |
+SITEFILE=50${PN}-gentoo.el |
61 |
+ |
62 |
+pkg_setup() { |
63 |
+ if use halfword ; then |
64 |
+ use amd64 || die "halfword support is limited to amd64" |
65 |
+ fi |
66 |
+} |
67 |
+ |
68 |
+src_prepare() { |
69 |
+ epatch "${FILESDIR}"/${PN}-18.0-wx3.0.patch |
70 |
+ |
71 |
+ use odbc || sed -i 's: odbc : :' lib/Makefile |
72 |
+ |
73 |
+ # bug 263129, don't ignore LDFLAGS, reported upstream |
74 |
+ sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in |
75 |
+ |
76 |
+ # don't ignore LDFLAGS, reported upstream |
77 |
+ sed -e 's:LDFLAGS = \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in |
78 |
+ |
79 |
+ if ! use wxwidgets; then |
80 |
+ sed -i 's: wx : :' lib/Makefile |
81 |
+ rm -rf lib/wx |
82 |
+ fi |
83 |
+ |
84 |
+ # Nasty workaround, reported upstream |
85 |
+ cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in |
86 |
+ |
87 |
+ # bug 383697 |
88 |
+ sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c |
89 |
+ |
90 |
+ cd erts && mv configure.in configure.ac && eautoreconf |
91 |
+} |
92 |
+ |
93 |
+src_configure() { |
94 |
+ use wxwidgets && need-wxwidgets unicode |
95 |
+ use java || export JAVAC=false |
96 |
+ |
97 |
+ econf \ |
98 |
+ --enable-threads \ |
99 |
+ $(use_enable sctp) \ |
100 |
+ $(use_enable systemd) \ |
101 |
+ $(use_enable halfword halfword-emulator) \ |
102 |
+ $(use_enable hipe) \ |
103 |
+ $(use_with ssl ssl "${EPREFIX}"/usr) \ |
104 |
+ $(use_enable ssl dynamic-ssl-lib) \ |
105 |
+ $(use_enable kpoll kernel-poll) \ |
106 |
+ $(use_enable smp smp-support) \ |
107 |
+ $(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \ |
108 |
+ $(use x64-macos && echo "--enable-darwin-64bit") |
109 |
+} |
110 |
+ |
111 |
+src_compile() { |
112 |
+ use java || export JAVAC=false |
113 |
+ emake |
114 |
+ |
115 |
+ if use emacs ; then |
116 |
+ pushd lib/tools/emacs |
117 |
+ elisp-compile *.el |
118 |
+ popd |
119 |
+ fi |
120 |
+} |
121 |
+ |
122 |
+extract_version() { |
123 |
+ sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk" |
124 |
+} |
125 |
+ |
126 |
+src_install() { |
127 |
+ local ERL_LIBDIR=/usr/$(get_libdir)/erlang |
128 |
+ local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN) |
129 |
+ local ERL_ERTS_VER=$(extract_version erts VSN) |
130 |
+ |
131 |
+ emake INSTALL_PREFIX="${D}" install |
132 |
+ dodoc AUTHORS README.md |
133 |
+ |
134 |
+ dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl |
135 |
+ dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc |
136 |
+ dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript |
137 |
+ dosym \ |
138 |
+ "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \ |
139 |
+ /usr/bin/erl_call |
140 |
+ dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam |
141 |
+ use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp |
142 |
+ |
143 |
+ ## Remove ${D} from the following files |
144 |
+ sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/erl" |
145 |
+ sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/start" |
146 |
+ grep -rle "${D}" "${ED}/${ERL_LIBDIR}/erts-${ERL_ERTS_VER}" | xargs sed -i -e "s:${D}::g" |
147 |
+ |
148 |
+ ## Clean up the no longer needed files |
149 |
+ rm "${ED}/${ERL_LIBDIR}/Install" |
150 |
+ |
151 |
+ for i in "${WORKDIR}"/man/man* ; do |
152 |
+ dodir "${ERL_LIBDIR}/${i##${WORKDIR}}" |
153 |
+ done |
154 |
+ for file in "${WORKDIR}"/man/man*/*.[1-9]; do |
155 |
+ # doman sucks so we can't use it |
156 |
+ cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/ |
157 |
+ done |
158 |
+ # extend MANPATH, so the normal man command can find it |
159 |
+ # see bug 189639 |
160 |
+ dodir /etc/env.d/ |
161 |
+ echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang" |
162 |
+ |
163 |
+ if use doc ; then |
164 |
+ dohtml -A README,erl,hrl,c,h,kwc,info -r \ |
165 |
+ "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* |
166 |
+ fi |
167 |
+ |
168 |
+ if use emacs ; then |
169 |
+ pushd "${S}" |
170 |
+ elisp-install erlang lib/tools/emacs/*.{el,elc} |
171 |
+ sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ |
172 |
+ "${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE} |
173 |
+ elisp-site-file-install "${T}"/${SITEFILE} |
174 |
+ popd |
175 |
+ fi |
176 |
+ |
177 |
+ newinitd "${FILESDIR}"/epmd.init epmd |
178 |
+ systemd_dounit "${FILESDIR}"/epmd.service |
179 |
+} |
180 |
+ |
181 |
+pkg_postinst() { |
182 |
+ use emacs && elisp-site-regen |
183 |
+} |
184 |
+ |
185 |
+pkg_postrm() { |
186 |
+ use emacs && elisp-site-regen |
187 |
+} |
188 |
|
189 |
diff --git a/dev-lang/erlang/files/erlang-18.0-wx3.0.patch b/dev-lang/erlang/files/erlang-18.0-wx3.0.patch |
190 |
new file mode 100644 |
191 |
index 0000000..0537134 |
192 |
--- /dev/null |
193 |
+++ b/dev-lang/erlang/files/erlang-18.0-wx3.0.patch |
194 |
@@ -0,0 +1,531 @@ |
195 |
+Description: Fix constants for wxwidgets3.0 |
196 |
+ The values of wx constants can change between stable release series (and |
197 |
+ some have between 2.8 and 3.0), but erlang seems to hardcode these values. |
198 |
+Author: Olly Betts <olly@××××××.com> |
199 |
+Bug-Debian: https://bugs.debian.org/766790 |
200 |
+Forwarded: no |
201 |
+Last-Update: 2014-11-25 |
202 |
+ |
203 |
+--- a/lib/wx/include/wx.hrl |
204 |
++++ b/lib/wx/include/wx.hrl |
205 |
+@@ -767,7 +767,7 @@ |
206 |
+ % From "checkbox.h" |
207 |
+ -define(wxCHK_ALLOW_3RD_STATE_FOR_USER, 8192). |
208 |
+ -define(wxCHK_3STATE, 4096). |
209 |
+--define(wxCHK_2STATE, 0). |
210 |
++-define(wxCHK_2STATE, 16384). |
211 |
+ % From "checkbox.h": wxCheckBoxState |
212 |
+ -define(wxCHK_UNCHECKED, 0). |
213 |
+ -define(wxCHK_CHECKED, 1). |
214 |
+@@ -1014,10 +1014,10 @@ |
215 |
+ -define(wxSIZE_AUTO_WIDTH, 1). |
216 |
+ -define(wxSETUP, 131072). |
217 |
+ -define(wxMORE, 65536). |
218 |
+--define(wxHELP, 32768). |
219 |
+--define(wxRESET, 16384). |
220 |
+--define(wxBACKWARD, 8192). |
221 |
+--define(wxFORWARD, 4096). |
222 |
++-define(wxHELP, 4096). |
223 |
++-define(wxRESET, 32768). |
224 |
++-define(wxBACKWARD, 16384). |
225 |
++-define(wxFORWARD, 8192). |
226 |
+ -define(wxICON_MASK, (16#00000100 bor 16#00000200 bor 16#00000400 bor 16#00000800)). |
227 |
+ -define(wxICON_ASTERISK, ?wxICON_INFORMATION). |
228 |
+ -define(wxICON_STOP, ?wxICON_HAND). |
229 |
+@@ -1049,8 +1049,8 @@ |
230 |
+ -define(wxTC_TOP, 0). |
231 |
+ -define(wxTC_FIXEDWIDTH, 32). |
232 |
+ -define(wxTC_RIGHTJUSTIFY, 16). |
233 |
+--define(wxSP_WRAP, 8192). |
234 |
+--define(wxSP_ARROW_KEYS, 4096). |
235 |
++-define(wxSP_WRAP, 32768). |
236 |
++-define(wxSP_ARROW_KEYS, 16384). |
237 |
+ -define(wxSP_VERTICAL, ?wxVERTICAL). |
238 |
+ -define(wxSP_HORIZONTAL, ?wxHORIZONTAL). |
239 |
+ -define(wxSB_VERTICAL, ?wxVERTICAL). |
240 |
+@@ -1071,8 +1071,8 @@ |
241 |
+ -define(wxCB_SIMPLE, 4). |
242 |
+ -define(wxLB_INT_HEIGHT, 2048). |
243 |
+ -define(wxLB_HSCROLL, ?wxHSCROLL). |
244 |
+--define(wxLB_ALWAYS_SB, 1024). |
245 |
+--define(wxLB_NEEDED_SB, 512). |
246 |
++-define(wxLB_ALWAYS_SB, 512). |
247 |
++-define(wxLB_NEEDED_SB, 0). |
248 |
+ -define(wxLB_OWNERDRAW, 256). |
249 |
+ -define(wxLB_EXTENDED, 128). |
250 |
+ -define(wxLB_MULTIPLE, 64). |
251 |
+@@ -1548,7 +1548,7 @@ |
252 |
+ -define(wxUPDATE_UI_FROMIDLE, 2). |
253 |
+ % From "dialog.h" |
254 |
+ -define(wxDEFAULT_DIALOG_STYLE, (?wxCAPTION bor ?wxSYSTEM_MENU bor ?wxCLOSE_BOX)). |
255 |
+--define(wxDIALOG_NO_PARENT, 1). |
256 |
++-define(wxDIALOG_NO_PARENT, 32). |
257 |
+ % From "dirctrlg.h" |
258 |
+ -define(wxDIRCTRL_DIR_ONLY, 16). |
259 |
+ -define(wxDIRCTRL_SELECT_FIRST, 32). |
260 |
+@@ -2036,212 +2036,212 @@ |
261 |
+ -define(wxLANGUAGE_ARABIC_YEMEN, 24). |
262 |
+ -define(wxLANGUAGE_ARMENIAN, 25). |
263 |
+ -define(wxLANGUAGE_ASSAMESE, 26). |
264 |
+--define(wxLANGUAGE_AYMARA, 27). |
265 |
+--define(wxLANGUAGE_AZERI, 28). |
266 |
+--define(wxLANGUAGE_AZERI_CYRILLIC, 29). |
267 |
+--define(wxLANGUAGE_AZERI_LATIN, 30). |
268 |
+--define(wxLANGUAGE_BASHKIR, 31). |
269 |
+--define(wxLANGUAGE_BASQUE, 32). |
270 |
+--define(wxLANGUAGE_BELARUSIAN, 33). |
271 |
+--define(wxLANGUAGE_BENGALI, 34). |
272 |
+--define(wxLANGUAGE_BHUTANI, 35). |
273 |
+--define(wxLANGUAGE_BIHARI, 36). |
274 |
+--define(wxLANGUAGE_BISLAMA, 37). |
275 |
+--define(wxLANGUAGE_BRETON, 38). |
276 |
+--define(wxLANGUAGE_BULGARIAN, 39). |
277 |
+--define(wxLANGUAGE_BURMESE, 40). |
278 |
+--define(wxLANGUAGE_CAMBODIAN, 41). |
279 |
+--define(wxLANGUAGE_CATALAN, 42). |
280 |
+--define(wxLANGUAGE_CHINESE, 43). |
281 |
+--define(wxLANGUAGE_CHINESE_SIMPLIFIED, 44). |
282 |
+--define(wxLANGUAGE_CHINESE_TRADITIONAL, 45). |
283 |
+--define(wxLANGUAGE_CHINESE_HONGKONG, 46). |
284 |
+--define(wxLANGUAGE_CHINESE_MACAU, 47). |
285 |
+--define(wxLANGUAGE_CHINESE_SINGAPORE, 48). |
286 |
+--define(wxLANGUAGE_CHINESE_TAIWAN, 49). |
287 |
+--define(wxLANGUAGE_CORSICAN, 50). |
288 |
+--define(wxLANGUAGE_CROATIAN, 51). |
289 |
+--define(wxLANGUAGE_CZECH, 52). |
290 |
+--define(wxLANGUAGE_DANISH, 53). |
291 |
+--define(wxLANGUAGE_DUTCH, 54). |
292 |
+--define(wxLANGUAGE_DUTCH_BELGIAN, 55). |
293 |
+--define(wxLANGUAGE_ENGLISH, 56). |
294 |
+--define(wxLANGUAGE_ENGLISH_UK, 57). |
295 |
+--define(wxLANGUAGE_ENGLISH_US, 58). |
296 |
+--define(wxLANGUAGE_ENGLISH_AUSTRALIA, 59). |
297 |
+--define(wxLANGUAGE_ENGLISH_BELIZE, 60). |
298 |
+--define(wxLANGUAGE_ENGLISH_BOTSWANA, 61). |
299 |
+--define(wxLANGUAGE_ENGLISH_CANADA, 62). |
300 |
+--define(wxLANGUAGE_ENGLISH_CARIBBEAN, 63). |
301 |
+--define(wxLANGUAGE_ENGLISH_DENMARK, 64). |
302 |
+--define(wxLANGUAGE_ENGLISH_EIRE, 65). |
303 |
+--define(wxLANGUAGE_ENGLISH_JAMAICA, 66). |
304 |
+--define(wxLANGUAGE_ENGLISH_NEW_ZEALAND, 67). |
305 |
+--define(wxLANGUAGE_ENGLISH_PHILIPPINES, 68). |
306 |
+--define(wxLANGUAGE_ENGLISH_SOUTH_AFRICA, 69). |
307 |
+--define(wxLANGUAGE_ENGLISH_TRINIDAD, 70). |
308 |
+--define(wxLANGUAGE_ENGLISH_ZIMBABWE, 71). |
309 |
+--define(wxLANGUAGE_ESPERANTO, 72). |
310 |
+--define(wxLANGUAGE_ESTONIAN, 73). |
311 |
+--define(wxLANGUAGE_FAEROESE, 74). |
312 |
+--define(wxLANGUAGE_FARSI, 75). |
313 |
+--define(wxLANGUAGE_FIJI, 76). |
314 |
+--define(wxLANGUAGE_FINNISH, 77). |
315 |
+--define(wxLANGUAGE_FRENCH, 78). |
316 |
+--define(wxLANGUAGE_FRENCH_BELGIAN, 79). |
317 |
+--define(wxLANGUAGE_FRENCH_CANADIAN, 80). |
318 |
+--define(wxLANGUAGE_FRENCH_LUXEMBOURG, 81). |
319 |
+--define(wxLANGUAGE_FRENCH_MONACO, 82). |
320 |
+--define(wxLANGUAGE_FRENCH_SWISS, 83). |
321 |
+--define(wxLANGUAGE_FRISIAN, 84). |
322 |
+--define(wxLANGUAGE_GALICIAN, 85). |
323 |
+--define(wxLANGUAGE_GEORGIAN, 86). |
324 |
+--define(wxLANGUAGE_GERMAN, 87). |
325 |
+--define(wxLANGUAGE_GERMAN_AUSTRIAN, 88). |
326 |
+--define(wxLANGUAGE_GERMAN_BELGIUM, 89). |
327 |
+--define(wxLANGUAGE_GERMAN_LIECHTENSTEIN, 90). |
328 |
+--define(wxLANGUAGE_GERMAN_LUXEMBOURG, 91). |
329 |
+--define(wxLANGUAGE_GERMAN_SWISS, 92). |
330 |
+--define(wxLANGUAGE_GREEK, 93). |
331 |
+--define(wxLANGUAGE_GREENLANDIC, 94). |
332 |
+--define(wxLANGUAGE_GUARANI, 95). |
333 |
+--define(wxLANGUAGE_GUJARATI, 96). |
334 |
+--define(wxLANGUAGE_HAUSA, 97). |
335 |
+--define(wxLANGUAGE_HEBREW, 98). |
336 |
+--define(wxLANGUAGE_HINDI, 99). |
337 |
+--define(wxLANGUAGE_HUNGARIAN, 100). |
338 |
+--define(wxLANGUAGE_ICELANDIC, 101). |
339 |
+--define(wxLANGUAGE_INDONESIAN, 102). |
340 |
+--define(wxLANGUAGE_INTERLINGUA, 103). |
341 |
+--define(wxLANGUAGE_INTERLINGUE, 104). |
342 |
+--define(wxLANGUAGE_INUKTITUT, 105). |
343 |
+--define(wxLANGUAGE_INUPIAK, 106). |
344 |
+--define(wxLANGUAGE_IRISH, 107). |
345 |
+--define(wxLANGUAGE_ITALIAN, 108). |
346 |
+--define(wxLANGUAGE_ITALIAN_SWISS, 109). |
347 |
+--define(wxLANGUAGE_JAPANESE, 110). |
348 |
+--define(wxLANGUAGE_JAVANESE, 111). |
349 |
+--define(wxLANGUAGE_KANNADA, 112). |
350 |
+--define(wxLANGUAGE_KASHMIRI, 113). |
351 |
+--define(wxLANGUAGE_KASHMIRI_INDIA, 114). |
352 |
+--define(wxLANGUAGE_KAZAKH, 115). |
353 |
+--define(wxLANGUAGE_KERNEWEK, 116). |
354 |
+--define(wxLANGUAGE_KINYARWANDA, 117). |
355 |
+--define(wxLANGUAGE_KIRGHIZ, 118). |
356 |
+--define(wxLANGUAGE_KIRUNDI, 119). |
357 |
+--define(wxLANGUAGE_KONKANI, 120). |
358 |
+--define(wxLANGUAGE_KOREAN, 121). |
359 |
+--define(wxLANGUAGE_KURDISH, 122). |
360 |
+--define(wxLANGUAGE_LAOTHIAN, 123). |
361 |
+--define(wxLANGUAGE_LATIN, 124). |
362 |
+--define(wxLANGUAGE_LATVIAN, 125). |
363 |
+--define(wxLANGUAGE_LINGALA, 126). |
364 |
+--define(wxLANGUAGE_LITHUANIAN, 127). |
365 |
+--define(wxLANGUAGE_MACEDONIAN, 128). |
366 |
+--define(wxLANGUAGE_MALAGASY, 129). |
367 |
+--define(wxLANGUAGE_MALAY, 130). |
368 |
+--define(wxLANGUAGE_MALAYALAM, 131). |
369 |
+--define(wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, 132). |
370 |
+--define(wxLANGUAGE_MALAY_MALAYSIA, 133). |
371 |
+--define(wxLANGUAGE_MALTESE, 134). |
372 |
+--define(wxLANGUAGE_MANIPURI, 135). |
373 |
+--define(wxLANGUAGE_MAORI, 136). |
374 |
+--define(wxLANGUAGE_MARATHI, 137). |
375 |
+--define(wxLANGUAGE_MOLDAVIAN, 138). |
376 |
+--define(wxLANGUAGE_MONGOLIAN, 139). |
377 |
+--define(wxLANGUAGE_NAURU, 140). |
378 |
+--define(wxLANGUAGE_NEPALI, 141). |
379 |
+--define(wxLANGUAGE_NEPALI_INDIA, 142). |
380 |
+--define(wxLANGUAGE_NORWEGIAN_BOKMAL, 143). |
381 |
+--define(wxLANGUAGE_NORWEGIAN_NYNORSK, 144). |
382 |
+--define(wxLANGUAGE_OCCITAN, 145). |
383 |
+--define(wxLANGUAGE_ORIYA, 146). |
384 |
+--define(wxLANGUAGE_OROMO, 147). |
385 |
+--define(wxLANGUAGE_PASHTO, 148). |
386 |
+--define(wxLANGUAGE_POLISH, 149). |
387 |
+--define(wxLANGUAGE_PORTUGUESE, 150). |
388 |
+--define(wxLANGUAGE_PORTUGUESE_BRAZILIAN, 151). |
389 |
+--define(wxLANGUAGE_PUNJABI, 152). |
390 |
+--define(wxLANGUAGE_QUECHUA, 153). |
391 |
+--define(wxLANGUAGE_RHAETO_ROMANCE, 154). |
392 |
+--define(wxLANGUAGE_ROMANIAN, 155). |
393 |
+--define(wxLANGUAGE_RUSSIAN, 156). |
394 |
+--define(wxLANGUAGE_RUSSIAN_UKRAINE, 157). |
395 |
+--define(wxLANGUAGE_SAMOAN, 158). |
396 |
+--define(wxLANGUAGE_SANGHO, 159). |
397 |
+--define(wxLANGUAGE_SANSKRIT, 160). |
398 |
+--define(wxLANGUAGE_SCOTS_GAELIC, 161). |
399 |
+--define(wxLANGUAGE_SERBIAN, 162). |
400 |
+--define(wxLANGUAGE_SERBIAN_CYRILLIC, 163). |
401 |
+--define(wxLANGUAGE_SERBIAN_LATIN, 164). |
402 |
+--define(wxLANGUAGE_SERBO_CROATIAN, 165). |
403 |
+--define(wxLANGUAGE_SESOTHO, 166). |
404 |
+--define(wxLANGUAGE_SETSWANA, 167). |
405 |
+--define(wxLANGUAGE_SHONA, 168). |
406 |
+--define(wxLANGUAGE_SINDHI, 169). |
407 |
+--define(wxLANGUAGE_SINHALESE, 170). |
408 |
+--define(wxLANGUAGE_SISWATI, 171). |
409 |
+--define(wxLANGUAGE_SLOVAK, 172). |
410 |
+--define(wxLANGUAGE_SLOVENIAN, 173). |
411 |
+--define(wxLANGUAGE_SOMALI, 174). |
412 |
+--define(wxLANGUAGE_SPANISH, 175). |
413 |
+--define(wxLANGUAGE_SPANISH_ARGENTINA, 176). |
414 |
+--define(wxLANGUAGE_SPANISH_BOLIVIA, 177). |
415 |
+--define(wxLANGUAGE_SPANISH_CHILE, 178). |
416 |
+--define(wxLANGUAGE_SPANISH_COLOMBIA, 179). |
417 |
+--define(wxLANGUAGE_SPANISH_COSTA_RICA, 180). |
418 |
+--define(wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, 181). |
419 |
+--define(wxLANGUAGE_SPANISH_ECUADOR, 182). |
420 |
+--define(wxLANGUAGE_SPANISH_EL_SALVADOR, 183). |
421 |
+--define(wxLANGUAGE_SPANISH_GUATEMALA, 184). |
422 |
+--define(wxLANGUAGE_SPANISH_HONDURAS, 185). |
423 |
+--define(wxLANGUAGE_SPANISH_MEXICAN, 186). |
424 |
+--define(wxLANGUAGE_SPANISH_MODERN, 187). |
425 |
+--define(wxLANGUAGE_SPANISH_NICARAGUA, 188). |
426 |
+--define(wxLANGUAGE_SPANISH_PANAMA, 189). |
427 |
+--define(wxLANGUAGE_SPANISH_PARAGUAY, 190). |
428 |
+--define(wxLANGUAGE_SPANISH_PERU, 191). |
429 |
+--define(wxLANGUAGE_SPANISH_PUERTO_RICO, 192). |
430 |
+--define(wxLANGUAGE_SPANISH_URUGUAY, 193). |
431 |
+--define(wxLANGUAGE_SPANISH_US, 194). |
432 |
+--define(wxLANGUAGE_SPANISH_VENEZUELA, 195). |
433 |
+--define(wxLANGUAGE_SUNDANESE, 196). |
434 |
+--define(wxLANGUAGE_SWAHILI, 197). |
435 |
+--define(wxLANGUAGE_SWEDISH, 198). |
436 |
+--define(wxLANGUAGE_SWEDISH_FINLAND, 199). |
437 |
+--define(wxLANGUAGE_TAGALOG, 200). |
438 |
+--define(wxLANGUAGE_TAJIK, 201). |
439 |
+--define(wxLANGUAGE_TAMIL, 202). |
440 |
+--define(wxLANGUAGE_TATAR, 203). |
441 |
+--define(wxLANGUAGE_TELUGU, 204). |
442 |
+--define(wxLANGUAGE_THAI, 205). |
443 |
+--define(wxLANGUAGE_TIBETAN, 206). |
444 |
+--define(wxLANGUAGE_TIGRINYA, 207). |
445 |
+--define(wxLANGUAGE_TONGA, 208). |
446 |
+--define(wxLANGUAGE_TSONGA, 209). |
447 |
+--define(wxLANGUAGE_TURKISH, 210). |
448 |
+--define(wxLANGUAGE_TURKMEN, 211). |
449 |
+--define(wxLANGUAGE_TWI, 212). |
450 |
+--define(wxLANGUAGE_UIGHUR, 213). |
451 |
+--define(wxLANGUAGE_UKRAINIAN, 214). |
452 |
+--define(wxLANGUAGE_URDU, 215). |
453 |
+--define(wxLANGUAGE_URDU_INDIA, 216). |
454 |
+--define(wxLANGUAGE_URDU_PAKISTAN, 217). |
455 |
+--define(wxLANGUAGE_UZBEK, 218). |
456 |
+--define(wxLANGUAGE_UZBEK_CYRILLIC, 219). |
457 |
+--define(wxLANGUAGE_UZBEK_LATIN, 220). |
458 |
+--define(wxLANGUAGE_VIETNAMESE, 221). |
459 |
+--define(wxLANGUAGE_VOLAPUK, 222). |
460 |
+--define(wxLANGUAGE_WELSH, 223). |
461 |
+--define(wxLANGUAGE_WOLOF, 224). |
462 |
+--define(wxLANGUAGE_XHOSA, 225). |
463 |
+--define(wxLANGUAGE_YIDDISH, 226). |
464 |
+--define(wxLANGUAGE_YORUBA, 227). |
465 |
+--define(wxLANGUAGE_ZHUANG, 228). |
466 |
+--define(wxLANGUAGE_ZULU, 229). |
467 |
++-define(wxLANGUAGE_AYMARA, 28). |
468 |
++-define(wxLANGUAGE_AZERI, 29). |
469 |
++-define(wxLANGUAGE_AZERI_CYRILLIC, 30). |
470 |
++-define(wxLANGUAGE_AZERI_LATIN, 31). |
471 |
++-define(wxLANGUAGE_BASHKIR, 32). |
472 |
++-define(wxLANGUAGE_BASQUE, 33). |
473 |
++-define(wxLANGUAGE_BELARUSIAN, 34). |
474 |
++-define(wxLANGUAGE_BENGALI, 35). |
475 |
++-define(wxLANGUAGE_BHUTANI, 36). |
476 |
++-define(wxLANGUAGE_BIHARI, 37). |
477 |
++-define(wxLANGUAGE_BISLAMA, 38). |
478 |
++-define(wxLANGUAGE_BRETON, 40). |
479 |
++-define(wxLANGUAGE_BULGARIAN, 41). |
480 |
++-define(wxLANGUAGE_BURMESE, 42). |
481 |
++-define(wxLANGUAGE_CAMBODIAN, 43). |
482 |
++-define(wxLANGUAGE_CATALAN, 44). |
483 |
++-define(wxLANGUAGE_CHINESE, 45). |
484 |
++-define(wxLANGUAGE_CHINESE_SIMPLIFIED, 46). |
485 |
++-define(wxLANGUAGE_CHINESE_TRADITIONAL, 47). |
486 |
++-define(wxLANGUAGE_CHINESE_HONGKONG, 48). |
487 |
++-define(wxLANGUAGE_CHINESE_MACAU, 49). |
488 |
++-define(wxLANGUAGE_CHINESE_SINGAPORE, 50). |
489 |
++-define(wxLANGUAGE_CHINESE_TAIWAN, 51). |
490 |
++-define(wxLANGUAGE_CORSICAN, 52). |
491 |
++-define(wxLANGUAGE_CROATIAN, 53). |
492 |
++-define(wxLANGUAGE_CZECH, 54). |
493 |
++-define(wxLANGUAGE_DANISH, 55). |
494 |
++-define(wxLANGUAGE_DUTCH, 56). |
495 |
++-define(wxLANGUAGE_DUTCH_BELGIAN, 57). |
496 |
++-define(wxLANGUAGE_ENGLISH, 58). |
497 |
++-define(wxLANGUAGE_ENGLISH_UK, 59). |
498 |
++-define(wxLANGUAGE_ENGLISH_US, 60). |
499 |
++-define(wxLANGUAGE_ENGLISH_AUSTRALIA, 61). |
500 |
++-define(wxLANGUAGE_ENGLISH_BELIZE, 62). |
501 |
++-define(wxLANGUAGE_ENGLISH_BOTSWANA, 63). |
502 |
++-define(wxLANGUAGE_ENGLISH_CANADA, 64). |
503 |
++-define(wxLANGUAGE_ENGLISH_CARIBBEAN, 65). |
504 |
++-define(wxLANGUAGE_ENGLISH_DENMARK, 66). |
505 |
++-define(wxLANGUAGE_ENGLISH_EIRE, 67). |
506 |
++-define(wxLANGUAGE_ENGLISH_JAMAICA, 68). |
507 |
++-define(wxLANGUAGE_ENGLISH_NEW_ZEALAND, 69). |
508 |
++-define(wxLANGUAGE_ENGLISH_PHILIPPINES, 70). |
509 |
++-define(wxLANGUAGE_ENGLISH_SOUTH_AFRICA, 71). |
510 |
++-define(wxLANGUAGE_ENGLISH_TRINIDAD, 72). |
511 |
++-define(wxLANGUAGE_ENGLISH_ZIMBABWE, 73). |
512 |
++-define(wxLANGUAGE_ESPERANTO, 74). |
513 |
++-define(wxLANGUAGE_ESTONIAN, 75). |
514 |
++-define(wxLANGUAGE_FAEROESE, 76). |
515 |
++-define(wxLANGUAGE_FARSI, 77). |
516 |
++-define(wxLANGUAGE_FIJI, 78). |
517 |
++-define(wxLANGUAGE_FINNISH, 79). |
518 |
++-define(wxLANGUAGE_FRENCH, 80). |
519 |
++-define(wxLANGUAGE_FRENCH_BELGIAN, 81). |
520 |
++-define(wxLANGUAGE_FRENCH_CANADIAN, 82). |
521 |
++-define(wxLANGUAGE_FRENCH_LUXEMBOURG, 83). |
522 |
++-define(wxLANGUAGE_FRENCH_MONACO, 84). |
523 |
++-define(wxLANGUAGE_FRENCH_SWISS, 85). |
524 |
++-define(wxLANGUAGE_FRISIAN, 86). |
525 |
++-define(wxLANGUAGE_GALICIAN, 87). |
526 |
++-define(wxLANGUAGE_GEORGIAN, 88). |
527 |
++-define(wxLANGUAGE_GERMAN, 89). |
528 |
++-define(wxLANGUAGE_GERMAN_AUSTRIAN, 90). |
529 |
++-define(wxLANGUAGE_GERMAN_BELGIUM, 91). |
530 |
++-define(wxLANGUAGE_GERMAN_LIECHTENSTEIN, 92). |
531 |
++-define(wxLANGUAGE_GERMAN_LUXEMBOURG, 93). |
532 |
++-define(wxLANGUAGE_GERMAN_SWISS, 94). |
533 |
++-define(wxLANGUAGE_GREEK, 95). |
534 |
++-define(wxLANGUAGE_GREENLANDIC, 96). |
535 |
++-define(wxLANGUAGE_GUARANI, 97). |
536 |
++-define(wxLANGUAGE_GUJARATI, 98). |
537 |
++-define(wxLANGUAGE_HAUSA, 99). |
538 |
++-define(wxLANGUAGE_HEBREW, 100). |
539 |
++-define(wxLANGUAGE_HINDI, 101). |
540 |
++-define(wxLANGUAGE_HUNGARIAN, 102). |
541 |
++-define(wxLANGUAGE_ICELANDIC, 103). |
542 |
++-define(wxLANGUAGE_INDONESIAN, 104). |
543 |
++-define(wxLANGUAGE_INTERLINGUA, 105). |
544 |
++-define(wxLANGUAGE_INTERLINGUE, 106). |
545 |
++-define(wxLANGUAGE_INUKTITUT, 107). |
546 |
++-define(wxLANGUAGE_INUPIAK, 108). |
547 |
++-define(wxLANGUAGE_IRISH, 109). |
548 |
++-define(wxLANGUAGE_ITALIAN, 110). |
549 |
++-define(wxLANGUAGE_ITALIAN_SWISS, 111). |
550 |
++-define(wxLANGUAGE_JAPANESE, 112). |
551 |
++-define(wxLANGUAGE_JAVANESE, 113). |
552 |
++-define(wxLANGUAGE_KANNADA, 114). |
553 |
++-define(wxLANGUAGE_KASHMIRI, 115). |
554 |
++-define(wxLANGUAGE_KASHMIRI_INDIA, 116). |
555 |
++-define(wxLANGUAGE_KAZAKH, 117). |
556 |
++-define(wxLANGUAGE_KERNEWEK, 118). |
557 |
++-define(wxLANGUAGE_KINYARWANDA, 119). |
558 |
++-define(wxLANGUAGE_KIRGHIZ, 120). |
559 |
++-define(wxLANGUAGE_KIRUNDI, 121). |
560 |
++-define(wxLANGUAGE_KONKANI, 122). |
561 |
++-define(wxLANGUAGE_KOREAN, 123). |
562 |
++-define(wxLANGUAGE_KURDISH, 124). |
563 |
++-define(wxLANGUAGE_LAOTHIAN, 125). |
564 |
++-define(wxLANGUAGE_LATIN, 126). |
565 |
++-define(wxLANGUAGE_LATVIAN, 127). |
566 |
++-define(wxLANGUAGE_LINGALA, 128). |
567 |
++-define(wxLANGUAGE_LITHUANIAN, 129). |
568 |
++-define(wxLANGUAGE_MACEDONIAN, 130). |
569 |
++-define(wxLANGUAGE_MALAGASY, 131). |
570 |
++-define(wxLANGUAGE_MALAY, 132). |
571 |
++-define(wxLANGUAGE_MALAYALAM, 133). |
572 |
++-define(wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM, 134). |
573 |
++-define(wxLANGUAGE_MALAY_MALAYSIA, 135). |
574 |
++-define(wxLANGUAGE_MALTESE, 136). |
575 |
++-define(wxLANGUAGE_MANIPURI, 137). |
576 |
++-define(wxLANGUAGE_MAORI, 138). |
577 |
++-define(wxLANGUAGE_MARATHI, 139). |
578 |
++-define(wxLANGUAGE_MOLDAVIAN, 140). |
579 |
++-define(wxLANGUAGE_MONGOLIAN, 141). |
580 |
++-define(wxLANGUAGE_NAURU, 142). |
581 |
++-define(wxLANGUAGE_NEPALI, 143). |
582 |
++-define(wxLANGUAGE_NEPALI_INDIA, 144). |
583 |
++-define(wxLANGUAGE_NORWEGIAN_BOKMAL, 145). |
584 |
++-define(wxLANGUAGE_NORWEGIAN_NYNORSK, 146). |
585 |
++-define(wxLANGUAGE_OCCITAN, 147). |
586 |
++-define(wxLANGUAGE_ORIYA, 148). |
587 |
++-define(wxLANGUAGE_OROMO, 149). |
588 |
++-define(wxLANGUAGE_PASHTO, 150). |
589 |
++-define(wxLANGUAGE_POLISH, 151). |
590 |
++-define(wxLANGUAGE_PORTUGUESE, 152). |
591 |
++-define(wxLANGUAGE_PORTUGUESE_BRAZILIAN, 153). |
592 |
++-define(wxLANGUAGE_PUNJABI, 154). |
593 |
++-define(wxLANGUAGE_QUECHUA, 155). |
594 |
++-define(wxLANGUAGE_RHAETO_ROMANCE, 156). |
595 |
++-define(wxLANGUAGE_ROMANIAN, 157). |
596 |
++-define(wxLANGUAGE_RUSSIAN, 158). |
597 |
++-define(wxLANGUAGE_RUSSIAN_UKRAINE, 159). |
598 |
++-define(wxLANGUAGE_SAMOAN, 161). |
599 |
++-define(wxLANGUAGE_SANGHO, 162). |
600 |
++-define(wxLANGUAGE_SANSKRIT, 163). |
601 |
++-define(wxLANGUAGE_SCOTS_GAELIC, 164). |
602 |
++-define(wxLANGUAGE_SERBIAN, 165). |
603 |
++-define(wxLANGUAGE_SERBIAN_CYRILLIC, 166). |
604 |
++-define(wxLANGUAGE_SERBIAN_LATIN, 167). |
605 |
++-define(wxLANGUAGE_SERBO_CROATIAN, 168). |
606 |
++-define(wxLANGUAGE_SESOTHO, 169). |
607 |
++-define(wxLANGUAGE_SETSWANA, 170). |
608 |
++-define(wxLANGUAGE_SHONA, 171). |
609 |
++-define(wxLANGUAGE_SINDHI, 172). |
610 |
++-define(wxLANGUAGE_SINHALESE, 173). |
611 |
++-define(wxLANGUAGE_SISWATI, 174). |
612 |
++-define(wxLANGUAGE_SLOVAK, 175). |
613 |
++-define(wxLANGUAGE_SLOVENIAN, 176). |
614 |
++-define(wxLANGUAGE_SOMALI, 177). |
615 |
++-define(wxLANGUAGE_SPANISH, 178). |
616 |
++-define(wxLANGUAGE_SPANISH_ARGENTINA, 179). |
617 |
++-define(wxLANGUAGE_SPANISH_BOLIVIA, 180). |
618 |
++-define(wxLANGUAGE_SPANISH_CHILE, 181). |
619 |
++-define(wxLANGUAGE_SPANISH_COLOMBIA, 182). |
620 |
++-define(wxLANGUAGE_SPANISH_COSTA_RICA, 183). |
621 |
++-define(wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, 184). |
622 |
++-define(wxLANGUAGE_SPANISH_ECUADOR, 185). |
623 |
++-define(wxLANGUAGE_SPANISH_EL_SALVADOR, 186). |
624 |
++-define(wxLANGUAGE_SPANISH_GUATEMALA, 187). |
625 |
++-define(wxLANGUAGE_SPANISH_HONDURAS, 188). |
626 |
++-define(wxLANGUAGE_SPANISH_MEXICAN, 189). |
627 |
++-define(wxLANGUAGE_SPANISH_MODERN, 190). |
628 |
++-define(wxLANGUAGE_SPANISH_NICARAGUA, 191). |
629 |
++-define(wxLANGUAGE_SPANISH_PANAMA, 192). |
630 |
++-define(wxLANGUAGE_SPANISH_PARAGUAY, 193). |
631 |
++-define(wxLANGUAGE_SPANISH_PERU, 194). |
632 |
++-define(wxLANGUAGE_SPANISH_PUERTO_RICO, 195). |
633 |
++-define(wxLANGUAGE_SPANISH_URUGUAY, 196). |
634 |
++-define(wxLANGUAGE_SPANISH_US, 197). |
635 |
++-define(wxLANGUAGE_SPANISH_VENEZUELA, 198). |
636 |
++-define(wxLANGUAGE_SUNDANESE, 199). |
637 |
++-define(wxLANGUAGE_SWAHILI, 200). |
638 |
++-define(wxLANGUAGE_SWEDISH, 201). |
639 |
++-define(wxLANGUAGE_SWEDISH_FINLAND, 202). |
640 |
++-define(wxLANGUAGE_TAGALOG, 203). |
641 |
++-define(wxLANGUAGE_TAJIK, 204). |
642 |
++-define(wxLANGUAGE_TAMIL, 205). |
643 |
++-define(wxLANGUAGE_TATAR, 206). |
644 |
++-define(wxLANGUAGE_TELUGU, 207). |
645 |
++-define(wxLANGUAGE_THAI, 208). |
646 |
++-define(wxLANGUAGE_TIBETAN, 209). |
647 |
++-define(wxLANGUAGE_TIGRINYA, 210). |
648 |
++-define(wxLANGUAGE_TONGA, 211). |
649 |
++-define(wxLANGUAGE_TSONGA, 212). |
650 |
++-define(wxLANGUAGE_TURKISH, 213). |
651 |
++-define(wxLANGUAGE_TURKMEN, 214). |
652 |
++-define(wxLANGUAGE_TWI, 215). |
653 |
++-define(wxLANGUAGE_UIGHUR, 216). |
654 |
++-define(wxLANGUAGE_UKRAINIAN, 217). |
655 |
++-define(wxLANGUAGE_URDU, 218). |
656 |
++-define(wxLANGUAGE_URDU_INDIA, 219). |
657 |
++-define(wxLANGUAGE_URDU_PAKISTAN, 220). |
658 |
++-define(wxLANGUAGE_UZBEK, 221). |
659 |
++-define(wxLANGUAGE_UZBEK_CYRILLIC, 222). |
660 |
++-define(wxLANGUAGE_UZBEK_LATIN, 223). |
661 |
++-define(wxLANGUAGE_VIETNAMESE, 225). |
662 |
++-define(wxLANGUAGE_VOLAPUK, 226). |
663 |
++-define(wxLANGUAGE_WELSH, 227). |
664 |
++-define(wxLANGUAGE_WOLOF, 228). |
665 |
++-define(wxLANGUAGE_XHOSA, 229). |
666 |
++-define(wxLANGUAGE_YIDDISH, 230). |
667 |
++-define(wxLANGUAGE_YORUBA, 231). |
668 |
++-define(wxLANGUAGE_ZHUANG, 232). |
669 |
++-define(wxLANGUAGE_ZULU, 233). |
670 |
+ -define(wxLANGUAGE_USER_DEFINED, 230). |
671 |
+--define(wxLANGUAGE_VALENCIAN, 536870911). |
672 |
+--define(wxLANGUAGE_SAMI, 536870912). |
673 |
++-define(wxLANGUAGE_VALENCIAN, 224). |
674 |
++-define(wxLANGUAGE_SAMI, 160). |
675 |
+ % From "intl.h": wxLayoutDirection |
676 |
+ -define(wxLayout_Default, 0). |
677 |
+ -define(wxLayout_LeftToRight, 1). |
678 |
+@@ -3728,7 +3728,7 @@ |
679 |
+ -define(wxSTC_KEY_LEFT, 302). |
680 |
+ -define(wxSTC_KEY_UP, 301). |
681 |
+ -define(wxSTC_KEY_DOWN, 300). |
682 |
+--define(wxSTC_MODEVENTMASKALL, 8191). |
683 |
++-define(wxSTC_MODEVENTMASKALL, 1048575). |
684 |
+ -define(wxSTC_MULTILINEUNDOREDO, 4096). |
685 |
+ -define(wxSTC_MOD_BEFOREDELETE, 2048). |
686 |
+ -define(wxSTC_MOD_BEFOREINSERT, 1024). |
687 |
+@@ -3810,7 +3810,7 @@ |
688 |
+ -define(wxSTC_INDIC_TT, 2). |
689 |
+ -define(wxSTC_INDIC_SQUIGGLE, 1). |
690 |
+ -define(wxSTC_INDIC_PLAIN, 0). |
691 |
+--define(wxSTC_INDIC_MAX, 7). |
692 |
++-define(wxSTC_INDIC_MAX, 31). |
693 |
+ -define(wxSTC_CASE_LOWER, 2). |
694 |
+ -define(wxSTC_CASE_UPPER, 1). |
695 |
+ -define(wxSTC_CASE_MIXED, 0). |
696 |
+@@ -3835,7 +3835,7 @@ |
697 |
+ -define(wxSTC_CHARSET_BALTIC, 186). |
698 |
+ -define(wxSTC_CHARSET_DEFAULT, 1). |
699 |
+ -define(wxSTC_CHARSET_ANSI, 0). |
700 |
+--define(wxSTC_STYLE_MAX, 127). |
701 |
++-define(wxSTC_STYLE_MAX, 255). |
702 |
+ -define(wxSTC_STYLE_LASTPREDEFINED, 39). |
703 |
+ -define(wxSTC_STYLE_CALLTIP, 38). |
704 |
+ -define(wxSTC_STYLE_INDENTGUIDE, 37). |
705 |
+@@ -3934,9 +3934,9 @@ |
706 |
+ -define(wxTE_PROCESS_TAB, 64). |
707 |
+ -define(wxTE_MULTILINE, 32). |
708 |
+ -define(wxTE_READONLY, 16). |
709 |
+--define(wxTE_AUTO_SCROLL, 8). |
710 |
++-define(wxTE_AUTO_SCROLL, 0). |
711 |
+ -define(wxTE_NO_VSCROLL, 2). |
712 |
+--define(wxHAS_TEXT_WINDOW_STREAM, 0). |
713 |
++-define(wxHAS_TEXT_WINDOW_STREAM, 1). |
714 |
+ % From "textctrl.h": wxTextAttrAlignment |
715 |
+ -define(wxTEXT_ALIGNMENT_DEFAULT, 0). |
716 |
+ -define(wxTEXT_ALIGNMENT_LEFT, 1). |
717 |
+@@ -3986,7 +3986,7 @@ |
718 |
+ -define(wxDEFAULT_FRAME_STYLE, (?wxSYSTEM_MENU bor ?wxRESIZE_BORDER bor ?wxMINIMIZE_BOX bor ?wxMAXIMIZE_BOX bor ?wxCLOSE_BOX bor ?wxCAPTION bor ?wxCLIP_CHILDREN)). |
719 |
+ -define(wxRESIZE_BORDER, 64). |
720 |
+ -define(wxTINY_CAPTION_VERT, 128). |
721 |
+--define(wxTINY_CAPTION_HORIZ, 256). |
722 |
++-define(wxTINY_CAPTION_HORIZ, 128). |
723 |
+ -define(wxMAXIMIZE_BOX, 512). |
724 |
+ -define(wxMINIMIZE_BOX, 1024). |
725 |
+ -define(wxSYSTEM_MENU, 2048). |